@haventech/supertype - npm Package Compare versions

Comparing version 5.0.2-beta.0 to 5.0.2-beta.1

dist/serializer.js

@@ -78,2 +78,6 @@ "use strict";
             obj = new template();
+            //Object id should be set by persistor at save.
+            if (obj && obj._id) {
+                obj._id = null;
+            }
             this.noInit = false;
@@ -85,6 +89,2 @@ }
     }
-    //Object id should be set by persistor at save.
-    if (obj && obj._id) {
-        obj._id = null;
-    }
     idMap[getId(pojo.__id__.toString())] = obj;
@@ -175,2 +175,2 @@ // Go through all the properties and transfer them to newly created object
 ;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * ObjectTemplate.toJSONString;\n */\n/**\n * Convert an object to JSON, stripping any recursive object references so they can be\n * reconstituted later\n *\n * @param {unknown} obj unknown\n * @param {unknown} cb unknown\n *\n * @returns {unknown}\n */\nexport function toJSONString(obj, cb?) {\n    var idMap = [];\n\n    try {\n        return JSON.stringify(obj, function a(key, value) {\n            if (key === '__objectTemplate__' || key === 'amorphic') {\n                return null;\n            }\n            if (value && value.__template__ && value.__id__) {\n                if (idMap[value.__id__]) {\n                    value = { __id__: value.__id__.toString() };\n                }\n                else {\n                    idMap[value.__id__.toString()] = value;\n                }\n            }\n\n            if (cb) {\n                return cb(key, value);\n            }\n\n            return value;\n        });\n    }\n    catch (e) {\n        throw e;\n    }\n}\n\nfunction propXfer(prop, pojo, obj) {\n    if (pojo[prop]) {\n        obj[prop] = pojo[prop];\n    }\n}\n\n/**\n * ObjectTemplate.fromPOJO\n */\nexport function fromPOJO(pojo, template, defineProperty?, idMap?, idQualifier?, parent?, prop?, creator?) {\n    function getId(id) {\n        if (typeof (idQualifier) !== 'undefined') {\n            return id + '-' + idQualifier;\n        }\n\n        return id;\n    }\n\n    // For recording back refs\n    if (!idMap) {\n        idMap = {};\n    }\n\n    if (!pojo.__id__) {\n        return;\n    }\n\n    var obj;\n\n    if (creator) {\n        obj = creator(parent, prop, template, idMap[pojo.__id__.toString()], pojo.__transient__);\n\n        if (obj instanceof Array) {\n            obj = obj[0];\n            idMap[obj.__id__.toString()] = obj;\n            return obj;\n        }\n\n        if (typeof (obj) === 'undefined') {\n            return null;\n        }\n\n        if (!obj) {\n            this.noInit = true;\n            obj = new template();\n            this.noInit = false;\n        }\n    }\n    else {\n        obj = this._createEmptyObject(template, getId(pojo.__id__.toString()), defineProperty, pojo.__transient__);\n    }\n\n    //Object id should be set by persistor at save.\n    if (obj && obj._id) {\n        obj._id = null;\n    }\n   \n    idMap[getId(pojo.__id__.toString())] = obj;\n\n    // Go through all the properties and transfer them to newly created object\n    var props = obj.__template__.getProperties();\n\n    for (var propb in pojo) {\n        propb = propb.replace(/^__/, '');\n        var defineProp = props[propb];\n        if (!defineProp)\n            continue;\n        var type = defineProp.type;\n\n        // Because semotus can serialize only the shadow properties we try and restore them\n        var pojoProp = (type && typeof pojo['__' + propb] !== 'undefined') ? '__' + propb : propb;\n\n        if (type && pojo[pojoProp] == null) {\n            obj[propb] = null;\n        }\n        else if (type && typeof (pojo[pojoProp]) !== 'undefined') {\n            if (type == Array && defineProp.of && defineProp.of.isObjectTemplate) { // Array of templated objects\n                var arrayDirections = null;\n\n                if (creator) {\n                    arrayDirections = creator(obj, propb, defineProp.of, idMap[pojo.__id__.toString()], pojo.__transient__);\n                }\n\n                if (typeof (arrayDirections) !== 'undefined') {\n                    obj[propb] = [];\n\n                    for (var ix = 0; ix < pojo[pojoProp].length; ++ix) {\n                        var atype = pojo[pojoProp][ix].__template__ || defineProp.of;\n                        if (pojo[pojoProp][ix]) {\n                            if (pojo[pojoProp][ix].__id__ && idMap[getId(pojo[pojoProp][ix].__id__.toString())]) {\n                                obj[propb][ix] = idMap[getId(pojo[pojoProp][ix].__id__.toString())];\n                            }\n                            else {\n                                obj[propb][ix] = this.fromPOJO(pojo[pojoProp][ix], atype, defineProp, idMap, idQualifier, obj, propb, creator);\n                            }\n                        }\n                        else {\n                            obj[propb][ix] = null;\n                        }\n                    }\n                }\n                else {\n                    obj[propb] = [];\n                }\n            }\n            else if (type.isObjectTemplate) { // Templated objects\n                var otype = pojo[pojoProp].__template__ || type;\n                if (pojo[pojoProp].__id__ && idMap[getId(pojo[pojoProp].__id__.toString())]) {\n                    obj[propb] = idMap[getId(pojo[pojoProp].__id__.toString())];\n                }\n                else {\n                    obj[propb] = this.fromPOJO(pojo[pojoProp], otype, defineProp, idMap, idQualifier, obj, propb, creator);\n                }\n            }\n            else if (type == Date) {\n                if (pojo[pojoProp]) {\n                    obj[propb] = new Date(pojo[pojoProp]);\n                }\n                else {\n                    obj[propb] = null;\n                }\n            }\n            else {\n                obj[propb] = pojo[pojoProp];\n            }\n        }\n    }\n\n    // For the benefit of persistObjectTemplate\n    if (!creator && pojo._id) {\n        obj._id = getId(pojo._id);\n    }\n\n    if (!creator) {\n        propXfer('__changed__', pojo, obj);\n        propXfer('__version__', pojo, obj);\n    }\n\n    propXfer('__toServer__', pojo, obj);\n    propXfer('__toClient__', pojo, obj);\n\n    return obj;\n};\n\n\n/**\n * ObjectTemplate.fromJSON\n */\nexport function fromJSON(str, template, idQualifier) {\n    return this.fromPOJO(JSON.parse(str), template, null, null, idQualifier);\n};\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * ObjectTemplate.toJSONString;\n */\n/**\n * Convert an object to JSON, stripping any recursive object references so they can be\n * reconstituted later\n *\n * @param {unknown} obj unknown\n * @param {unknown} cb unknown\n *\n * @returns {unknown}\n */\nexport function toJSONString(obj, cb?) {\n    var idMap = [];\n\n    try {\n        return JSON.stringify(obj, function a(key, value) {\n            if (key === '__objectTemplate__' || key === 'amorphic') {\n                return null;\n            }\n            if (value && value.__template__ && value.__id__) {\n                if (idMap[value.__id__]) {\n                    value = { __id__: value.__id__.toString() };\n                }\n                else {\n                    idMap[value.__id__.toString()] = value;\n                }\n            }\n\n            if (cb) {\n                return cb(key, value);\n            }\n\n            return value;\n        });\n    }\n    catch (e) {\n        throw e;\n    }\n}\n\nfunction propXfer(prop, pojo, obj) {\n    if (pojo[prop]) {\n        obj[prop] = pojo[prop];\n    }\n}\n\n/**\n * ObjectTemplate.fromPOJO\n */\nexport function fromPOJO(pojo, template, defineProperty?, idMap?, idQualifier?, parent?, prop?, creator?) {\n    function getId(id) {\n        if (typeof (idQualifier) !== 'undefined') {\n            return id + '-' + idQualifier;\n        }\n\n        return id;\n    }\n\n    // For recording back refs\n    if (!idMap) {\n        idMap = {};\n    }\n\n    if (!pojo.__id__) {\n        return;\n    }\n\n    var obj;\n\n    if (creator) {\n        obj = creator(parent, prop, template, idMap[pojo.__id__.toString()], pojo.__transient__);\n\n        if (obj instanceof Array) {\n            obj = obj[0];\n            idMap[obj.__id__.toString()] = obj;\n            return obj;\n        }\n\n        if (typeof (obj) === 'undefined') {\n            return null;\n        }\n\n        if (!obj) {\n            this.noInit = true;\n            obj = new template();\n            //Object id should be set by persistor at save.\n            if (obj && obj._id) {\n                obj._id = null;\n            }\n            this.noInit = false;\n        }\n    }\n    else {\n        obj = this._createEmptyObject(template, getId(pojo.__id__.toString()), defineProperty, pojo.__transient__);\n    }\n   \n    idMap[getId(pojo.__id__.toString())] = obj;\n\n    // Go through all the properties and transfer them to newly created object\n    var props = obj.__template__.getProperties();\n\n    for (var propb in pojo) {\n        propb = propb.replace(/^__/, '');\n        var defineProp = props[propb];\n        if (!defineProp)\n            continue;\n        var type = defineProp.type;\n\n        // Because semotus can serialize only the shadow properties we try and restore them\n        var pojoProp = (type && typeof pojo['__' + propb] !== 'undefined') ? '__' + propb : propb;\n\n        if (type && pojo[pojoProp] == null) {\n            obj[propb] = null;\n        }\n        else if (type && typeof (pojo[pojoProp]) !== 'undefined') {\n            if (type == Array && defineProp.of && defineProp.of.isObjectTemplate) { // Array of templated objects\n                var arrayDirections = null;\n\n                if (creator) {\n                    arrayDirections = creator(obj, propb, defineProp.of, idMap[pojo.__id__.toString()], pojo.__transient__);\n                }\n\n                if (typeof (arrayDirections) !== 'undefined') {\n                    obj[propb] = [];\n\n                    for (var ix = 0; ix < pojo[pojoProp].length; ++ix) {\n                        var atype = pojo[pojoProp][ix].__template__ || defineProp.of;\n                        if (pojo[pojoProp][ix]) {\n                            if (pojo[pojoProp][ix].__id__ && idMap[getId(pojo[pojoProp][ix].__id__.toString())]) {\n                                obj[propb][ix] = idMap[getId(pojo[pojoProp][ix].__id__.toString())];\n                            }\n                            else {\n                                obj[propb][ix] = this.fromPOJO(pojo[pojoProp][ix], atype, defineProp, idMap, idQualifier, obj, propb, creator);\n                            }\n                        }\n                        else {\n                            obj[propb][ix] = null;\n                        }\n                    }\n                }\n                else {\n                    obj[propb] = [];\n                }\n            }\n            else if (type.isObjectTemplate) { // Templated objects\n                var otype = pojo[pojoProp].__template__ || type;\n                if (pojo[pojoProp].__id__ && idMap[getId(pojo[pojoProp].__id__.toString())]) {\n                    obj[propb] = idMap[getId(pojo[pojoProp].__id__.toString())];\n                }\n                else {\n                    obj[propb] = this.fromPOJO(pojo[pojoProp], otype, defineProp, idMap, idQualifier, obj, propb, creator);\n                }\n            }\n            else if (type == Date) {\n                if (pojo[pojoProp]) {\n                    obj[propb] = new Date(pojo[pojoProp]);\n                }\n                else {\n                    obj[propb] = null;\n                }\n            }\n            else {\n                obj[propb] = pojo[pojoProp];\n            }\n        }\n    }\n\n    // For the benefit of persistObjectTemplate\n    if (!creator && pojo._id) {\n        obj._id = getId(pojo._id);\n    }\n\n    if (!creator) {\n        propXfer('__changed__', pojo, obj);\n        propXfer('__version__', pojo, obj);\n    }\n\n    propXfer('__toServer__', pojo, obj);\n    propXfer('__toClient__', pojo, obj);\n\n    return obj;\n};\n\n\n/**\n * ObjectTemplate.fromJSON\n */\nexport function fromJSON(str, template, idQualifier) {\n    return this.fromPOJO(JSON.parse(str), template, null, null, idQualifier);\n};\n"]}

package.json

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

src/serializer.ts

@@ -87,2 +87,6 @@ /**
             obj = new template();
+            //Object id should be set by persistor at save.
+            if (obj && obj._id) {
+                obj._id = null;
+            }
             this.noInit = false;
@@ -94,7 +98,2 @@ }
     }
-
-    //Object id should be set by persistor at save.
-    if (obj && obj._id) {
-        obj._id = null;
-    }
    
@@ -101,0 +100,0 @@ idMap[getId(pojo.__id__.toString())] = obj;

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

372527

increased by0.03%

No dependency changes