@haventech/supertype - npm Package Compare versions

Comparing version 6.0.0-beta.3 to 6.0.0-beta.4

dist/decorators.d.ts

 export { Supertype } from './Supertype';
+import 'reflect-metadata';
 /**
@@ -3,0 +4,0 @@ *

dist/decorators.js

@@ -7,2 +7,3 @@ "use strict";
 const ObjectTemplate_1 = require("./ObjectTemplate");
+require("reflect-metadata");
 /**
@@ -132,4 +133,14 @@ *
         target.__amorphicprops__ = target.hasOwnProperty('__amorphicprops__') ? target.__amorphicprops__ : {};
-        let type = props.type;
-        if (typeof props.getType === 'function') {
+        var reflectionType = Reflect.getMetadata('design:type', target, targetKey);
+        var declaredType = props.type;
+        var type = reflectionType !== Array ? declaredType || reflectionType : declaredType;
+        // Type mismatches
+        if (declaredType && reflectionType && reflectionType !== Array) {
+            target.__exceptions__ = target.__exceptions__ || {};
+            target.__exceptions__[targetKey] = function (className, prop) {
+                return className + '.' + prop + ' - decorator type does not match actual type';
+            };
+            // Deferred type
+        }
+        else if (typeof props.getType === 'function') {
             target.__deferredType__ = target.hasOwnProperty('__deferredType__') ? target.__deferredType__ : {};
@@ -147,2 +158,9 @@ target.__deferredType__[targetKey] = props.getType;
         }
+        if (reflectionType === Array) {
+            props.type = Array;
+            props.of = type;
+        }
+        else {
+            props.type = type;
+        }
         target.__amorphicprops__[targetKey] = props;
@@ -158,2 +176,2 @@ };
 exports.remote = remote;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"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","sourcesContent":["export { Supertype } from './Supertype';\nimport { ObjectTemplate } from './ObjectTemplate';\n\n/**\n    * \n    * @param {*} objectProps- optional property for passing params into supertypeclass, if no params, is undefined,\n    *                      first param of this function defaults to objectTemplate instead\n    * @param {*} objectTemplate \n    * \n    * @TODO: fix return types\n    * https://github.com/haven-life/supertype/issues/6\n    */\nexport function supertypeClass(objectProps?, objectTemplate?): any {\n\n    // When used as @supertypeClass({bla bla bla}), the decorator is first called as it is\n    // is being passed into the decorator processor and so it needs to return a function\n    // so that it will be called again when the decorators are actually processed.  Kinda spliffy.\n\n    // Called by decorator processor\n    if (objectProps.prototype) { // if objectProps is the class (second pass if passed with {toClient style params} or first pass when @supertypeClass no paren and args)\n        return decorator(objectProps);\n    }\n\n    // Called first time with parameter\n    var props = objectProps;\n    return decorator;\n\n    // Decorator Workerbee\n    function decorator(target) {\n        objectTemplate = objectTemplate || ObjectTemplate;\n\n        target.prototype.__template__ = target;\n        target.prototype.amorphicClass = target;\n        target.prototype.amorphicGetClassName = function () { return target.__name__ };\n        target.isObjectTemplate = true;\n        target.__injections__ = [];\n        target.__objectTemplate__ = objectTemplate;\n        var createProps = objectTemplate.getTemplateProperties(props || {});\n        target.__toClient__ = createProps.__toClient__;\n        target.__toServer__ = createProps.__toServer__;\n        target.__shadowChildren__ = [];\n\n        // Push an array of template references (we can't get at their names now).  Later we will\n        // use this to construct __dictionary__\n        objectTemplate.__templates__ = objectTemplate.__templates__ || [];\n        objectTemplate.__templates__.push(target);\n\n\n        // We can never reference template functions at compile time which is when this decorator is executed\n        // Therefore we have to setup getters for properties that need access to the template functions so\n        // that we can ensure they are fully resolved before accessing them\n        Object.defineProperty(target, 'defineProperties', { get: defineProperties });\n        Object.defineProperty(target, 'amorphicProperties', { get: defineProperties });\n        Object.defineProperty(target, '__name__', { get: getName });\n        Object.defineProperty(target, 'amorphicClassName', { get: getName });\n        Object.defineProperty(target, 'parentTemplate', { get: getParent });\n        Object.defineProperty(target, '__parent__', { get: getParent });\n        Object.defineProperty(target, '__children__', { get: getChildren });\n        Object.defineProperty(target, 'amorphicParentClass', { get: getParent });\n        Object.defineProperty(target, 'amorphicChildClasses', { get: getChildren });\n        Object.defineProperty(target, 'amorphicStatic', { get: function () { return objectTemplate } });\n\n        target.fromPOJO = function fromPOJO(pojo) {\n            return objectTemplate.fromPOJO(pojo, target);\n        };\n\n        target.fromJSON = // Legacy\n            target.amorphicFromJSON = function fromJSON(str, idPrefix) {\n                return objectTemplate.fromJSON(str, target, idPrefix);\n            };\n\n        target.getProperties = // Legacy\n            target.amorphicGetProperties = function getProperties(includeVirtual) {\n                return objectTemplate._getDefineProperties(target, undefined, includeVirtual);\n            };\n\n        target.createProperty = // Legacy\n            target.amorphicCreateProperty = function (propertyName, defineProperty) {\n                if (defineProperty.body) {\n                    target.prototype[propertyName] = objectTemplate._setupFunction(propertyName, defineProperty.body,\n                        defineProperty.on, defineProperty.validate);\n                }\n                else {\n                    target.prototype.__amorphicprops__[propertyName] = defineProperty;\n                    if (typeof defineProperty.value in ['string', 'number'] || defineProperty.value == null) {\n                        Object.defineProperty(target.prototype, propertyName,\n                            { enumerable: true, writable: true, value: defineProperty.value });\n                    }\n                    else {\n                        Object.defineProperty(target.prototype, propertyName, {\n                            enumerable: true,\n                            get: function () {\n                                if (!this['__' + propertyName]) {\n                                    this['__' + propertyName] =\n                                        ObjectTemplate.clone(defineProperty.value, defineProperty.of ||\n                                            defineProperty.type || null);\n                                }\n                                return this['__' + propertyName];\n                            },\n                            set: function (value) {\n                                this['__' + propertyName] = value;\n                            }\n                        });\n                    }\n                }\n            };\n\n        if (target.prototype.__exceptions__) {\n            objectTemplate.__exceptions__ = objectTemplate.__exceptions__ || [];\n            for (var exceptionKey in target.prototype.__exceptions__) {\n                objectTemplate.__exceptions__.push({\n                    func: target.prototype.__exceptions__[exceptionKey],\n                    class: getName,\n                    prop: exceptionKey\n                });\n            }\n        }\n\n        function defineProperties() {\n            return target.prototype.__amorphicprops__;\n        }\n        function getName() {\n            return ObjectTemplate.getName(target);\n        }\n        function getDictionary() {\n            objectTemplate.getClasses();\n        }\n        function getParent() {\n            getDictionary();\n            return target.__shadowParent__;\n        }\n        function getChildren() {\n            getDictionary();\n            return target.__shadowChildren__;\n        }\n    }\n}\n\n\nexport function property(props?): any {\n    return function (target, targetKey) {\n        props = props || {};\n        props.enumerable = true;\n        target.__amorphicprops__ = target.hasOwnProperty('__amorphicprops__') ? target.__amorphicprops__ : {};\n        let type = props.type;\n        if (typeof props.getType === 'function') {\n            target.__deferredType__ = target.hasOwnProperty('__deferredType__') ? target.__deferredType__ : {};\n            target.__deferredType__[targetKey] = props.getType;\n            delete props.getType;\n        }\n        else if (!type) {\n            target.__exceptions__ = target.__exceptions__ || {};\n            target.__exceptions__[targetKey] = function (className, prop) {\n                return className + '.' + prop +\n                ' - type is undefined. Circular reference? Try @property({getType: () => {return ' +\n                prop[0].toUpperCase() + prop.substr(1) + '}})';\n\n            };\n        }\n        target.__amorphicprops__[targetKey] = props;\n    };\n};\n\nexport function remote(defineProperty) {\n    return function (target, propertyName, descriptor) {\n    }\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"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","sourcesContent":["export { Supertype } from './Supertype';\nimport { ObjectTemplate } from './ObjectTemplate';\n\nimport 'reflect-metadata';\n\n/**\n    * \n    * @param {*} objectProps- optional property for passing params into supertypeclass, if no params, is undefined,\n    *                      first param of this function defaults to objectTemplate instead\n    * @param {*} objectTemplate \n    * \n    * @TODO: fix return types\n    * https://github.com/haven-life/supertype/issues/6\n    */\nexport function supertypeClass(objectProps?, objectTemplate?): any {\n\n    // When used as @supertypeClass({bla bla bla}), the decorator is first called as it is\n    // is being passed into the decorator processor and so it needs to return a function\n    // so that it will be called again when the decorators are actually processed.  Kinda spliffy.\n\n    // Called by decorator processor\n    if (objectProps.prototype) { // if objectProps is the class (second pass if passed with {toClient style params} or first pass when @supertypeClass no paren and args)\n        return decorator(objectProps);\n    }\n\n    // Called first time with parameter\n    var props = objectProps;\n    return decorator;\n\n    // Decorator Workerbee\n    function decorator(target) {\n        objectTemplate = objectTemplate || ObjectTemplate;\n\n        target.prototype.__template__ = target;\n        target.prototype.amorphicClass = target;\n        target.prototype.amorphicGetClassName = function () { return target.__name__ };\n        target.isObjectTemplate = true;\n        target.__injections__ = [];\n        target.__objectTemplate__ = objectTemplate;\n        var createProps = objectTemplate.getTemplateProperties(props || {});\n        target.__toClient__ = createProps.__toClient__;\n        target.__toServer__ = createProps.__toServer__;\n        target.__shadowChildren__ = [];\n\n        // Push an array of template references (we can't get at their names now).  Later we will\n        // use this to construct __dictionary__\n        objectTemplate.__templates__ = objectTemplate.__templates__ || [];\n        objectTemplate.__templates__.push(target);\n\n\n        // We can never reference template functions at compile time which is when this decorator is executed\n        // Therefore we have to setup getters for properties that need access to the template functions so\n        // that we can ensure they are fully resolved before accessing them\n        Object.defineProperty(target, 'defineProperties', { get: defineProperties });\n        Object.defineProperty(target, 'amorphicProperties', { get: defineProperties });\n        Object.defineProperty(target, '__name__', { get: getName });\n        Object.defineProperty(target, 'amorphicClassName', { get: getName });\n        Object.defineProperty(target, 'parentTemplate', { get: getParent });\n        Object.defineProperty(target, '__parent__', { get: getParent });\n        Object.defineProperty(target, '__children__', { get: getChildren });\n        Object.defineProperty(target, 'amorphicParentClass', { get: getParent });\n        Object.defineProperty(target, 'amorphicChildClasses', { get: getChildren });\n        Object.defineProperty(target, 'amorphicStatic', { get: function () { return objectTemplate } });\n\n        target.fromPOJO = function fromPOJO(pojo) {\n            return objectTemplate.fromPOJO(pojo, target);\n        };\n\n        target.fromJSON = // Legacy\n            target.amorphicFromJSON = function fromJSON(str, idPrefix) {\n                return objectTemplate.fromJSON(str, target, idPrefix);\n            };\n\n        target.getProperties = // Legacy\n            target.amorphicGetProperties = function getProperties(includeVirtual) {\n                return objectTemplate._getDefineProperties(target, undefined, includeVirtual);\n            };\n\n        target.createProperty = // Legacy\n            target.amorphicCreateProperty = function (propertyName, defineProperty) {\n                if (defineProperty.body) {\n                    target.prototype[propertyName] = objectTemplate._setupFunction(propertyName, defineProperty.body,\n                        defineProperty.on, defineProperty.validate);\n                }\n                else {\n                    target.prototype.__amorphicprops__[propertyName] = defineProperty;\n                    if (typeof defineProperty.value in ['string', 'number'] || defineProperty.value == null) {\n                        Object.defineProperty(target.prototype, propertyName,\n                            { enumerable: true, writable: true, value: defineProperty.value });\n                    }\n                    else {\n                        Object.defineProperty(target.prototype, propertyName, {\n                            enumerable: true,\n                            get: function () {\n                                if (!this['__' + propertyName]) {\n                                    this['__' + propertyName] =\n                                        ObjectTemplate.clone(defineProperty.value, defineProperty.of ||\n                                            defineProperty.type || null);\n                                }\n                                return this['__' + propertyName];\n                            },\n                            set: function (value) {\n                                this['__' + propertyName] = value;\n                            }\n                        });\n                    }\n                }\n            };\n\n        if (target.prototype.__exceptions__) {\n            objectTemplate.__exceptions__ = objectTemplate.__exceptions__ || [];\n            for (var exceptionKey in target.prototype.__exceptions__) {\n                objectTemplate.__exceptions__.push({\n                    func: target.prototype.__exceptions__[exceptionKey],\n                    class: getName,\n                    prop: exceptionKey\n                });\n            }\n        }\n\n        function defineProperties() {\n            return target.prototype.__amorphicprops__;\n        }\n        function getName() {\n            return ObjectTemplate.getName(target);\n        }\n        function getDictionary() {\n            objectTemplate.getClasses();\n        }\n        function getParent() {\n            getDictionary();\n            return target.__shadowParent__;\n        }\n        function getChildren() {\n            getDictionary();\n            return target.__shadowChildren__;\n        }\n    }\n}\n\n\nexport function property(props?): any {\n    return function (target, targetKey) {\n        props = props || {};\n        props.enumerable = true;\n        target.__amorphicprops__ = target.hasOwnProperty('__amorphicprops__') ? target.__amorphicprops__ : {};\n        var reflectionType = Reflect.getMetadata('design:type', target, targetKey);\n        var declaredType = props.type;\n        var type = reflectionType !== Array ? declaredType || reflectionType : declaredType;\n    // Type mismatches\n        if (declaredType && reflectionType && reflectionType !== Array) {\n            target.__exceptions__ = target.__exceptions__ || {};\n            target.__exceptions__[targetKey] = function (className, prop) {\n                return className + '.' + prop + ' - decorator type does not match actual type';\n            };\n    // Deferred type\n        }\n        else if (typeof props.getType === 'function') {\n            target.__deferredType__ = target.hasOwnProperty('__deferredType__') ? target.__deferredType__ : {};\n            target.__deferredType__[targetKey] = props.getType;\n            delete props.getType;\n        }\n        else if (!type) {\n            target.__exceptions__ = target.__exceptions__ || {};\n            target.__exceptions__[targetKey] = function (className, prop) {\n                return className + '.' + prop +\n                ' - type is undefined. Circular reference? Try @property({getType: () => {return ' +\n                prop[0].toUpperCase() + prop.substr(1) + '}})';\n\n            };\n        }\n        if (reflectionType === Array) {\n            props.type = Array;\n            props.of = type;\n        }\n        else {\n            props.type = type;\n        }\n        target.__amorphicprops__[targetKey] = props;\n    };\n};\n\nexport function remote(defineProperty) {\n    return function (target, propertyName, descriptor) {\n    }\n}"]}

package.json

 {
     "name": "@haventech/supertype",
     "description": "A type system for classical inheritence, mix-ins and composition.",
-    "version": "6.0.0-beta.3",
+    "version": "6.0.0-beta.4",
     "main": "dist/index.js",
@@ -6,0 +6,0 @@ "types": "dist/index.d.ts",

src/decorators.ts

 export { Supertype } from './Supertype';
 import { ObjectTemplate } from './ObjectTemplate';
 
+import 'reflect-metadata';
+
 /**
@@ -145,4 +147,14 @@ *
         target.__amorphicprops__ = target.hasOwnProperty('__amorphicprops__') ? target.__amorphicprops__ : {};
-        let type = props.type;
-        if (typeof props.getType === 'function') {
+        var reflectionType = Reflect.getMetadata('design:type', target, targetKey);
+        var declaredType = props.type;
+        var type = reflectionType !== Array ? declaredType || reflectionType : declaredType;
+    // Type mismatches
+        if (declaredType && reflectionType && reflectionType !== Array) {
+            target.__exceptions__ = target.__exceptions__ || {};
+            target.__exceptions__[targetKey] = function (className, prop) {
+                return className + '.' + prop + ' - decorator type does not match actual type';
+            };
+    // Deferred type
+        }
+        else if (typeof props.getType === 'function') {
             target.__deferredType__ = target.hasOwnProperty('__deferredType__') ? target.__deferredType__ : {};
@@ -161,2 +173,9 @@ target.__deferredType__[targetKey] = props.getType;
         }
+        if (reflectionType === Array) {
+            props.type = Array;
+            props.of = type;
+        }
+        else {
+            props.type = type;
+        }
         target.__amorphicprops__[targetKey] = props;
@@ -163,0 +182,0 @@ };

src/ObjectTemplate.ts

@@ -418,3 +418,3 @@ import * as serializer from './serializer';
      */
-     static createIfNeeded(template?, thisObj?) {
+    static createIfNeeded(template?, thisObj?) {
         if (template.__createParameters__) {
@@ -548,3 +548,3 @@ const createParameters = template.__createParameters__;
      */
-     static _setupProperty(propertyName, defineProperty, objectProperties, defineProperties) {
+    static _setupProperty(propertyName, defineProperty, objectProperties, defineProperties) {
         // Determine whether value needs to be re-initialized in constructor
@@ -793,3 +793,3 @@ const value = defineProperty.value;
      */
-     static _getBaseClass(template) {
+    static _getBaseClass(template) {
         while (template.__parent__) {
@@ -796,0 +796,0 @@ template = template.__parent__;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

368128

increased by0.93%

Lines of code

4525

increased by0.82%

No dependency changes