fixed review issues

Author: Gleb Ivanov

dist/vue-class-component.common.js

@@ -9,25 +9,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
-require('reflect-metadata');
 var Vue = _interopDefault(require('vue'));
 
-function copyReflectionMetadata(from, to, reflectionMap) {
-    shallowCopy(from.prototype, to.prototype, reflectionMap.instance);
-    shallowCopy(from, to, reflectionMap.static);
-}
-function shallowCopy(from, to, propertyKeys) {
-    var _loop_1 = function (propertyKey) {
-        propertyKeys[propertyKey].forEach(function (metadataKey) {
-            var metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey);
-            Reflect.defineMetadata(metadataKey, metadata, to, propertyKey);
-        });
-    };
-    for (var propertyKey in propertyKeys) {
-        _loop_1(propertyKey);
-    }
-}
-
 var hasProto = { __proto__: [] } instanceof Array;
 function createDecorator(factory) {
     return function (target, key, index) {
@@ -122,18 +105,13 @@ var $internalHooks = [
 ];
 function componentFactory(Component, options) {
     if (options === void 0) { options = {}; }
-    var reflectionMap = {
-        instance: {},
-        static: {}
-    };
     options.name = options.name || Component._componentTag || Component.name;
     // prototype props.
     var proto = Component.prototype;
     Object.getOwnPropertyNames(proto).forEach(function (key) {
         if (key === 'constructor') {
             return;
         }
-        reflectionMap.instance[key] = Reflect.getOwnMetadataKeys(proto, key);
         // hooks
         if ($internalHooks.indexOf(key) > -1) {
             options[key] = proto[key];
@@ -169,8 +147,7 @@ function componentFactory(Component, options) {
         ? superProto.constructor
         : Vue;
     var Extended = Super.extend(options);
-    forwardStaticMembersAndCollectReflection(Extended, Component, Super, reflectionMap);
-    copyReflectionMetadata(Component, Extended, reflectionMap);
+    forwardStaticMembers(Extended, Component, Super);
     return Extended;
 }
 var reservedPropertyNames = [
@@ -188,14 +165,13 @@ var reservedPropertyNames = [
     'directive',
     'filter'
 ];
-function forwardStaticMembersAndCollectReflection(Extended, Original, Super, reflectionMap) {
+function forwardStaticMembers(Extended, Original, Super) {
     // We have to use getOwnPropertyNames since Babel registers methods as non-enumerable
     Object.getOwnPropertyNames(Original).forEach(function (key) {
         // `prototype` should not be overwritten
         if (key === 'prototype') {
             return;
         }
-        reflectionMap.static[key] = Reflect.getOwnMetadataKeys(Original, key);
         // Some browsers does not allow reconfigure built-in properties
         var extendedDescriptor = Object.getOwnPropertyDescriptor(Extended, key);
         if (extendedDescriptor && !extendedDescriptor.configurable) {

dist/vue-class-component.js

@@ -4,29 +4,13 @@
   * @license MIT
   */
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('reflect-metadata'), require('vue')) :
-	typeof define === 'function' && define.amd ? define(['exports', 'reflect-metadata', 'vue'], factory) :
-	(factory((global.VueClassComponent = {}),null,global.Vue));
-}(this, (function (exports,reflectMetadata,Vue) { 'use strict';
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'vue'], factory) :
+	(factory((global.VueClassComponent = {}),global.Vue));
+}(this, (function (exports,Vue) { 'use strict';
 
 Vue = Vue && Vue.hasOwnProperty('default') ? Vue['default'] : Vue;
 
-function copyReflectionMetadata(from, to, reflectionMap) {
-    shallowCopy(from.prototype, to.prototype, reflectionMap.instance);
-    shallowCopy(from, to, reflectionMap.static);
-}
-function shallowCopy(from, to, propertyKeys) {
-    var _loop_1 = function (propertyKey) {
-        propertyKeys[propertyKey].forEach(function (metadataKey) {
-            var metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey);
-            Reflect.defineMetadata(metadataKey, metadata, to, propertyKey);
-        });
-    };
-    for (var propertyKey in propertyKeys) {
-        _loop_1(propertyKey);
-    }
-}
-
 var hasProto = { __proto__: [] } instanceof Array;
 function createDecorator(factory) {
     return function (target, key, index) {
@@ -121,18 +105,13 @@ var $internalHooks = [
 ];
 function componentFactory(Component, options) {
     if (options === void 0) { options = {}; }
-    var reflectionMap = {
-        instance: {},
-        static: {}
-    };
     options.name = options.name || Component._componentTag || Component.name;
     // prototype props.
     var proto = Component.prototype;
     Object.getOwnPropertyNames(proto).forEach(function (key) {
         if (key === 'constructor') {
             return;
         }
-        reflectionMap.instance[key] = Reflect.getOwnMetadataKeys(proto, key);
         // hooks
         if ($internalHooks.indexOf(key) > -1) {
             options[key] = proto[key];
@@ -168,8 +147,7 @@ function componentFactory(Component, options) {
         ? superProto.constructor
         : Vue;
     var Extended = Super.extend(options);
-    forwardStaticMembersAndCollectReflection(Extended, Component, Super, reflectionMap);
-    copyReflectionMetadata(Component, Extended, reflectionMap);
+    forwardStaticMembers(Extended, Component, Super);
     return Extended;
 }
 var reservedPropertyNames = [
@@ -187,14 +165,13 @@ var reservedPropertyNames = [
     'directive',
     'filter'
 ];
-function forwardStaticMembersAndCollectReflection(Extended, Original, Super, reflectionMap) {
+function forwardStaticMembers(Extended, Original, Super) {
     // We have to use getOwnPropertyNames since Babel registers methods as non-enumerable
     Object.getOwnPropertyNames(Original).forEach(function (key) {
         // `prototype` should not be overwritten
         if (key === 'prototype') {
             return;
         }
-        reflectionMap.static[key] = Reflect.getOwnMetadataKeys(Original, key);
         // Some browsers does not allow reconfigure built-in properties
         var extendedDescriptor = Object.getOwnPropertyDescriptor(Extended, key);
         if (extendedDescriptor && !extendedDescriptor.configurable) {

dist/vue-class-component.min.js

@@ -49,6 +49,7 @@
     "chai": "^4.1.2",
     "css-loader": "^0.28.9",
     "mocha": "^5.0.1",
+    "reflect-metadata": "^0.1.12",
     "rimraf": "^2.6.2",
     "rollup": "^0.55.5",
     "rollup-plugin-replace": "^2.0.0",
@@ -61,7 +62,5 @@
     "vue-template-compiler": "^2.5.13",
     "webpack": "^3.11.0"
   },
-  "dependencies": {
-    "reflect-metadata": "^0.1.12"
-  }
+  "dependencies": {}
 }

package.json

@@ -1,6 +1,5 @@
-import 'reflect-metadata'
 import Vue, { ComponentOptions } from 'vue'
-import { copyReflectionMetadata, ReflectionMap } from './reflect'
+import { copyReflectionMetadata, reflectionIsSupported, ReflectionMap } from './reflect'
 import { VueClass, DecoratedClass } from './declarations'
 import { collectDataFromConstructor } from './data'
 import { hasProto, isPrimitive, warn } from './util'
@@ -28,7 +27,7 @@ export function componentFactory (
   const reflectionMap: ReflectionMap = {
       instance: {},
       static: {}
-  };
+  }
 
   options.name = options.name || (Component as any)._componentTag || (Component as any).name
   // prototype props.
@@ -37,7 +36,11 @@ export function componentFactory (
     if (key === 'constructor') {
       return
     }
-    reflectionMap.instance[key] = Reflect.getOwnMetadataKeys(proto, key);
+
+    if (reflectionIsSupported()) {
+      reflectionMap.instance[key] = Reflect.getOwnMetadataKeys(proto, key)
+    }
+
     // hooks
     if ($internalHooks.indexOf(key) > -1) {
       options[key] = proto[key]
@@ -78,7 +81,10 @@ export function componentFactory (
   const Extended = Super.extend(options)
 
   forwardStaticMembersAndCollectReflection(Extended, Component, Super, reflectionMap)
-  copyReflectionMetadata(Component, Extended, reflectionMap)
+
+  if (reflectionIsSupported()) {
+    copyReflectionMetadata(Component, Extended, reflectionMap)
+  }
 
   return Extended
 }
@@ -115,7 +121,9 @@ function forwardStaticMembersAndCollectReflection (
       return
     }
 
-    reflectionMap.static[key] = Reflect.getOwnMetadataKeys(Original, key);
+    if (reflectionIsSupported()) {
+      reflectionMap.static[key] = Reflect.getOwnMetadataKeys(Original, key)
+    }
 
     // Some browsers does not allow reconfigure built-in properties
     const extendedDescriptor = Object.getOwnPropertyDescriptor(Extended, key)

src/component.ts

@@ -3,8 +3,33 @@
  * should not expose to userland
  */
 
+declare namespace Reflect {
+  function decorate(decorators: ClassDecorator[], target: Function): Function
+  function decorate(decorators: (PropertyDecorator | MethodDecorator)[], target: Object, propertyKey: string | symbol, attributes?: PropertyDescriptor): PropertyDescriptor
+  function metadata(metadataKey: any, metadataValue: any): {
+   (target: Function): void
+   (target: Object, propertyKey: string | symbol): void
+  }
+  function defineMetadata(metadataKey: any, metadataValue: any, target: Object): void
+  function defineMetadata(metadataKey: any, metadataValue: any, target: Object, propertyKey: string | symbol): void
+  function hasMetadata(metadataKey: any, target: Object): boolean
+  function hasMetadata(metadataKey: any, target: Object, propertyKey: string | symbol): boolean
+  function hasOwnMetadata(metadataKey: any, target: Object): boolean
+  function hasOwnMetadata(metadataKey: any, target: Object, propertyKey: string | symbol): boolean
+  function getMetadata(metadataKey: any, target: Object): any
+  function getMetadata(metadataKey: any, target: Object, propertyKey: string | symbol): any
+  function getOwnMetadata(metadataKey: any, target: Object): any
+  function getOwnMetadata(metadataKey: any, target: Object, propertyKey: string | symbol): any
+  function getMetadataKeys(target: Object): any[]
+  function getMetadataKeys(target: Object, propertyKey: string | symbol): any[]
+  function getOwnMetadataKeys(target: Object): any[]
+  function getOwnMetadataKeys(target: Object, propertyKey: string | symbol): any[]
+  function deleteMetadata(metadataKey: any, target: Object): boolean
+  function deleteMetadata(metadataKey: any, target: Object, propertyKey: string | symbol): boolean
+ }
+
 declare const process: {
   env: {
     NODE_ENV: string
   }
-}
+}

src/globals.d.ts

@@ -1,29 +1,32 @@
 import { VueConstructor } from 'vue'
-import 'reflect-metadata'
 
 export type StringToArrayMap = {
-    [key: string]: Array<string>
+  [key: string]: Array<string>
 }
 
 export type ReflectionMap = {
-    instance: StringToArrayMap,
-    static: StringToArrayMap
+  instance: StringToArrayMap,
+  static: StringToArrayMap
+}
+
+export function reflectionIsSupported() {
+  return (Reflect && Reflect.defineMetadata) !== undefined
 }
 
 export function copyReflectionMetadata(
-    from: VueConstructor,
-    to: VueConstructor,
-    reflectionMap: ReflectionMap
+  from: VueConstructor,
+  to: VueConstructor,
+  reflectionMap: ReflectionMap
 ) {
-  shallowCopy(from.prototype, to.prototype, reflectionMap.instance);
-  shallowCopy(from, to, reflectionMap.static);
+  shallowCopy(from.prototype, to.prototype, reflectionMap.instance)
+  shallowCopy(from, to, reflectionMap.static)
 }
 
 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)
-        })
-    }
+  for (const propertyKey in propertyKeys) {
+    propertyKeys[propertyKey].forEach((metadataKey) => {
+      const metadata = Reflect.getOwnMetadata(metadataKey, from, propertyKey)
+      Reflect.defineMetadata(metadataKey, metadata, to, propertyKey)
+    })
+  }
 }

src/reflect.ts

@@ -372,21 +372,21 @@ describe('vue-class-component', () => {
   })
 
   it('copies reflection metadata', function () {
-      @Component
-      class Test extends Vue {
-          @Reflect.metadata('worksStatic', true)
-          static staticValue: string = 'staticValue';
+    @Component
+    class Test extends Vue {
+      @Reflect.metadata('worksStatic', true)
+      static staticValue: string = 'staticValue'
 
-          @Reflect.metadata('worksMethod', true)
-          test(): void { }
+      @Reflect.metadata('worksMethod', true)
+      test(): void { }
 
-          @Reflect.metadata('worksAccessor', true)
-          get testAccessor(): boolean { return true; }
-          set testAccessor(value: boolean) { void(value) }
-      }
+      @Reflect.metadata('worksAccessor', true)
+      get testAccessor(): boolean { return true }
+      set testAccessor(value: boolean) { void(value) }
+    }
 
-      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);
+    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)
   })
 })