@singularsystems/neo-core 0.10.47 → 0.10.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -154,12 +154,15 @@ var Deserialiser = /** @class */ (function () {
|
|
|
154
154
|
for (var key in from) {
|
|
155
155
|
if (from.hasOwnProperty(key)) {
|
|
156
156
|
var propertyInfo = propertyInfoList[key];
|
|
157
|
-
|
|
158
|
-
if (
|
|
159
|
-
|
|
160
|
-
(propertyInfo.serialise === SerialiseType.Always ||
|
|
161
|
-
(propertyInfo.serialise === SerialiseType.
|
|
162
|
-
(propertyInfo.serialise === SerialiseType.
|
|
157
|
+
var canDeserialise = this.options.allowExtraProperties;
|
|
158
|
+
if (propertyInfo) {
|
|
159
|
+
canDeserialise = !propertyInfo.isComputed && !propertyInfo.isReadOnly &&
|
|
160
|
+
((propertyInfo.serialise === SerialiseType.Always) ||
|
|
161
|
+
(propertyInfo.serialise === SerialiseType.NotNull) ||
|
|
162
|
+
(propertyInfo.serialise === SerialiseType.MappingOnly && !!this.options.isMap) ||
|
|
163
|
+
(propertyInfo.serialise === SerialiseType.FullOnly && (this.options.removeOldItems || justCreated)));
|
|
164
|
+
}
|
|
165
|
+
if (canDeserialise) {
|
|
163
166
|
try {
|
|
164
167
|
var fromValue = from[key];
|
|
165
168
|
if (propertyInfo) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deserialiser.js","sourceRoot":"","sources":["../../src/Data/Deserialiser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,OAAO,MAAM,kBAAkB,CAAC;AA0BvC;IAAA;QAEY,eAAU,GAAgD,EAAE,CAAC;QAC7D,qBAAgB,GAAiB,EAAE,CAAC;QACpC,YAAO,GAAwB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Deserialiser.js","sourceRoot":"","sources":["../../src/Data/Deserialiser.ts"],"names":[],"mappings":"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"}
|
package/dist/Data/Serialiser.js
CHANGED
|
@@ -101,6 +101,7 @@ var Serialiser = /** @class */ (function () {
|
|
|
101
101
|
try {
|
|
102
102
|
var propertyInfo = isDictionary ? {} : propertyMap[key];
|
|
103
103
|
if (propertyInfo &&
|
|
104
|
+
!propertyInfo.isComputed && !propertyInfo.isReadOnly && // Safari seems to enumerate properties like isDirty, other browsers wont include these properties.
|
|
104
105
|
propertyInfo.serialise !== SerialiseType.Never &&
|
|
105
106
|
propertyInfo.serialise !== SerialiseType.MappingOnly &&
|
|
106
107
|
(propertyInfo.serialise !== SerialiseType.FullOnly || this.options.includeClean)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAErG,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAC;AACnE,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAE3C,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAmBvC;IAAA;IAwBA,CAAC;IAtBiB,qBAAS,GAAvB,UAAwB,MAAoD,EAAE,OAA+B;QAA/B,wBAAA,EAAA,YAA+B;QACzG,IAAI,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC;QACzB,OAAO,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;;OAOG;IACW,uBAAW,GAAzB,UAA0B,IAAS,EAAE,EAAsD,EAAE,QAAc,EAAE,OAAiC,EAAE,WAAmB;QAAtD,wBAAA,EAAA,YAAiC;QAAE,4BAAA,EAAA,mBAAmB;QAE/J,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,qCAAqC,CAAA;SAC9C;QAED,IAAI,CAAC,GAAG,IAAI,YAAY,EAAE,CAAC;QAC3B,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC;IACL,kBAAC;AAAD,CAAC,AAxBD,IAwBC;;AAED;IAAA;QAEY,eAAU,GAAgD,EAAE,CAAC;QAC7D,YAAO,GAAsB,EAAE,CAAC;QAEhC,cAAS,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,11 +80,16 @@ function invokeOnSelfAndChildren(model, state, callback, listCallback, relationT
|
|
|
80
80
|
return state;
|
|
81
81
|
}
|
|
82
82
|
else {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
83
|
+
try {
|
|
84
|
+
var child = model[cpi.propertyName];
|
|
85
|
+
if (child) {
|
|
86
|
+
state.pushState();
|
|
87
|
+
invokeOnSelfAndChildren(child, state, callback, listCallback, cpi.relationType);
|
|
88
|
+
state.popState();
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
throw "Error on property '" + cpi.propertyName + "' on type '" + model.constructor.name + "': " + error;
|
|
88
93
|
}
|
|
89
94
|
}
|
|
90
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelGraphTraverser.js","sourceRoot":"","sources":["../../src/Model/ModelGraphTraverser.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC;IAAA;QACI,SAAI,GAAG,KAAK,CAAC;QACb,eAAU,GAAG,UAAC,KAAiB,EAAE,QAAsB,IAAK,OAAA,CAAC,QAAQ,CAAC,OAAO,EAAjB,CAAiB,CAAC;IAgBlF,CAAC;IAdG,kCAAS,GAAT;IAEA,CAAC;IACD,iCAAQ,GAAR;IAEA,CAAC;IAED;;OAEG;IACI,oDAA2B,GAAlC;QACI,IAAI,CAAC,UAAU,GAAG,UAAC,KAAK,EAAE,QAAQ,IAAK,OAAA,IAAI,EAAJ,CAAI,CAAC;QAC5C,OAAO,IAAI,CAAC;IAChB,CAAC;IACL,qBAAC;AAAD,CAAC,AAlBD,IAkBC;;AAED;IAA2C,yCAAc;IAErD,+BAAmB,IAAY;QAAZ,qBAAA,EAAA,YAAY;QAA/B,YACI,iBAAO,SACV;QAFkB,UAAI,GAAJ,IAAI,CAAQ;;IAE/B,CAAC;IACL,4BAAC;AAAD,CAAC,AALD,CAA2C,cAAc,GAKxD;;AAoBD,MAAM,UAAU,aAAa,CAA2B,KAAiC,EAAE,eAAoC,EAAE,sBAAqE,EAAE,YAA8B;IAClO,IAAI,KAAQ,CAAC;IACb,IAAI,QAAyB,CAAC;IAE9B,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE;QACvC,KAAK,GAAG,IAAI,cAAc,EAAO,CAAC;QAClC,QAAQ,GAAG,eAAe,CAAC;QAC3B,YAAY,GAAG,sBAAyC,CAAC;KAC5D;SAAM;QACH,KAAK,GAAG,eAAe,CAAC;QACxB,QAAQ,GAAG,sBAAyC,CAAC;KACxD;IAED,IAAI,KAAK,YAAY,KAAK,EAAE;QACxB,OAAO,wBAAwB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;KACpF;SAAM;QACH,OAAO,uBAAuB,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;KACnF;AACL,CAAC;AAED,SAAS,wBAAwB,CAA2B,IAAmB,EAAE,KAAQ,EAAE,QAAyB,EAAE,YAA8B,EAAE,YAA2B;IAC7K,KAAiB,UAAI,EAAJ,aAAI,EAAJ,kBAAI,EAAJ,IAAI,EAAE;QAAlB,IAAI,IAAI,aAAA;QACT,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;QAC3E,IAAI,KAAK,CAAC,IAAI;YAAE,MAAM;KACzB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,SAAS,uBAAuB,CAA2B,KAAkB,EAAE,KAAQ,EAAE,QAAyB,EAAE,YAA8B,EAAE,YAA2B;IAE3K,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IAE7B,IAAI,IAAI,GAAG,KAAK,CAAC,WAAkC,CAAA;IACnD,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;QACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC/C,
|
|
1
|
+
{"version":3,"file":"ModelGraphTraverser.js","sourceRoot":"","sources":["../../src/Model/ModelGraphTraverser.ts"],"names":[],"mappings":"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"}
|