fixed corner case with constructor

Gleb Ivanov · Gleb Ivanov · commit 49e9c90f2550 · 2018-02-20T22:23:53.000+04:00
diff --git a/src/component.ts b/src/component.ts
@@ -26,9 +26,13 @@ export function componentFactory (
 ): VueClass<Vue> {
   const reflectionMap: ReflectionMap = {
       instance: {},
-      static: {}
+      static: {},
+      constructor: []
   }
 
+  if (reflectionIsSupported()) {
+    reflectionMap.constructor = Reflect.getOwnMetadataKeys(Component)
+  }
   options.name = options.name || (Component as any)._componentTag || (Component as any).name
   // prototype props.
   const proto = Component.prototype
diff --git a/src/reflect.ts b/src/reflect.ts
@@ -5,6 +5,7 @@ export type StringToArrayMap = {
 }
 
 export type ReflectionMap = {
+  constructor: Array<string>,
   instance: StringToArrayMap,
   static: StringToArrayMap
 }
@@ -20,13 +21,19 @@ export function copyReflectionMetadata(
 ) {
   shallowCopy(from.prototype, to.prototype, reflectionMap.instance)
   shallowCopy(from, to, reflectionMap.static)
+  shallowCopy(from, to, {'constructor': reflectionMap.constructor})
 }
 
 function shallowCopy(from: VueConstructor, to: VueConstructor, propertyKeys: StringToArrayMap) {
   for (const propertyKey in propertyKeys) {
     propertyKeys[propertyKey].forEach((metadataKey) => {
-      const metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey)
-      Reflect.defineMetadata(metadataKey, metadata, to, propertyKey)
+      if (propertyKey == 'constructor') {
+          const metadata = Reflect.getOwnMetadata(metadataKey, from)
+          Reflect.defineMetadata(metadataKey, metadata, to)
+      } else {
+          const metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey)
+          Reflect.defineMetadata(metadataKey, metadata, to, propertyKey)
+      }
     })
   }
 }
diff --git a/test/test.ts b/test/test.ts
@@ -372,8 +372,14 @@ describe('vue-class-component', () => {
   })
 
   it('copies reflection metadata', function () {
+    const trickyDecorator = (proto: Vue, _: string) =>
+        Reflect.defineMetadata('worksConstructor', true, proto.constructor);
+
     @Component
     class Test extends Vue {
+      @trickyDecorator
+      trickyCase: string = 'trickyCase'
+
       @Reflect.metadata('worksStatic', true)
       static staticValue: string = 'staticValue'
 
@@ -385,6 +391,7 @@ describe('vue-class-component', () => {
       set testAccessor(value: boolean) { void(value) }
     }
 
+    expect(Reflect.getOwnMetadata('worksConstructor', Test)).to.equal(true)
     expect(Reflect.getOwnMetadata('worksStatic', Test, 'staticValue')).to.equal(true)
     expect(Reflect.getOwnMetadata('worksMethod', Test.prototype, 'test')).to.equal(true)
     expect(Reflect.getOwnMetadata('worksAccessor', Test.prototype, 'testAccessor')).to.equal(true)

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ export type StringToArrayMap = {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`export type ReflectionMap = {`
	`8`	`+ constructor: Array<string>,`
`8`	`9`	`instance: StringToArrayMap,`
`9`	`10`	`static: StringToArrayMap`
`10`	`11`	`}`
`@@ -20,13 +21,19 @@ export function copyReflectionMetadata(`
`20`	`21`	`) {`
`21`	`22`	`shallowCopy(from.prototype, to.prototype, reflectionMap.instance)`
`22`	`23`	`shallowCopy(from, to, reflectionMap.static)`
	`24`	`+ shallowCopy(from, to, {'constructor': reflectionMap.constructor})`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`function shallowCopy(from: VueConstructor, to: VueConstructor, propertyKeys: StringToArrayMap) {`
`26`	`28`	`for (const propertyKey in propertyKeys) {`
`27`	`29`	`propertyKeys[propertyKey].forEach((metadataKey) => {`
`28`		`- const metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey)`
`29`		`- Reflect.defineMetadata(metadataKey, metadata, to, propertyKey)`
	`30`	`+ if (propertyKey == 'constructor') {`
	`31`	`+ const metadata = Reflect.getOwnMetadata(metadataKey, from)`
	`32`	`+ Reflect.defineMetadata(metadataKey, metadata, to)`
	`33`	`+ } else {`
	`34`	`+ const metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey)`
	`35`	`+ Reflect.defineMetadata(metadataKey, metadata, to, propertyKey)`
	`36`	`+ }`
`30`	`37`	`})`
`31`	`38`	`}`
`32`	`39`	`}`