@singularsystems/neo-core 0.10.21 → 0.10.22
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.
- package/dist/Data/Deserialiser.js +4 -7
- package/dist/Data/Deserialiser.js.map +1 -1
- package/dist/Model/Decorators.d.ts +2 -1
- package/dist/Model/Decorators.js +7 -5
- package/dist/Model/Decorators.js.map +1 -1
- package/dist/Model/List.js +2 -2
- package/dist/Model/List.js.map +1 -1
- package/dist/Model/ModelCreatorBase.js.map +1 -1
- package/dist/Model/NeoTypeInfo.js +7 -4
- package/dist/Model/NeoTypeInfo.js.map +1 -1
- package/dist/Model/PropertyInfo.d.ts +7 -2
- package/dist/Model/PropertyInfo.js +31 -0
- package/dist/Model/PropertyInfo.js.map +1 -1
- package/package.json +1 -1
|
@@ -121,7 +121,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
121
121
|
list.clearDeletedList();
|
|
122
122
|
}
|
|
123
123
|
};
|
|
124
|
-
Deserialiser.prototype.deserialiseDictionary = function (from, to,
|
|
124
|
+
Deserialiser.prototype.deserialiseDictionary = function (from, to, parentProperty) {
|
|
125
125
|
for (var key in from) {
|
|
126
126
|
var fromItem = from[key];
|
|
127
127
|
if (fromItem.$ref) {
|
|
@@ -130,7 +130,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
130
130
|
else {
|
|
131
131
|
var mustCreate = !to[key];
|
|
132
132
|
if (mustCreate) {
|
|
133
|
-
to[key] =
|
|
133
|
+
to[key] = parentProperty.createValueInstance();
|
|
134
134
|
}
|
|
135
135
|
this.deserialiseObject(fromItem, to[key], mustCreate);
|
|
136
136
|
}
|
|
@@ -184,7 +184,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
184
184
|
if (!to[key]) {
|
|
185
185
|
to[key] = {};
|
|
186
186
|
}
|
|
187
|
-
this.deserialiseDictionary(fromValue, to[key], propertyInfo
|
|
187
|
+
this.deserialiseDictionary(fromValue, to[key], propertyInfo);
|
|
188
188
|
}
|
|
189
189
|
else if (fromValue instanceof Object) {
|
|
190
190
|
// Properties of type Parent are ignored. Parent will be set when the item is added to a list.
|
|
@@ -195,10 +195,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
195
195
|
else {
|
|
196
196
|
var mustCreate = !to[key];
|
|
197
197
|
if (mustCreate) {
|
|
198
|
-
|
|
199
|
-
throw "Cannot create instance. Make sure the property is decorated with @Attributes.ChildObject.";
|
|
200
|
-
}
|
|
201
|
-
to[key] = new propertyInfo.type();
|
|
198
|
+
to[key] = propertyInfo.createValueInstance();
|
|
202
199
|
}
|
|
203
200
|
this.deserialiseObject(fromValue, to[key], mustCreate);
|
|
204
201
|
}
|
|
@@ -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;AA0BjC;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":"AAGA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AA0BjC;IAAA;QAEY,eAAU,GAAgD,EAAE,CAAC;QAC7D,qBAAgB,GAAiB,EAAE,CAAC;QACpC,YAAO,GAAwB,EAAE,CAAC;IAsQ9C,CAAC;IApQG;;OAEG;IACO,6CAAsB,GAAhC,UAAiC,MAAW;;QACxC,IAAM,WAAW,GAAI,MAAM,CAAC,WAAmC,CAAC,GAAG,CAAC;QAEpE,IAAI,CAAC,WAAW,EAAE;YACd,MAAM,kEAAkE,CAAC;SAC5E;QAED,IAAM,WAAW,SAAG,WAAW,0CAAE,WAAW,CAAC;QAC7C,IAAI,WAAW,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;YAChD,MAAqB,CAAC,WAAW,GAAG,IAAI,CAAC;YAC1C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACtC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;IAED;;OAEG;IACO,2CAAoB,GAA9B,UAA+B,MAAW,EAAE,UAAmB;QAE3D,IAAK,MAA6B,CAAC,sBAAsB,KAAK,SAAS,EAAE;YACpE,MAA6B,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;SACrE;IACL,CAAC;IAEM,kCAAW,GAAlB,UAAmB,IAAY,EAAE,EAAmC,EAAE,QAA+B,EAAE,OAAiC,EAAE,WAAmB;QAA7J,iBAkBC;QAlBsG,wBAAA,EAAA,YAAiC;QAAE,4BAAA,EAAA,mBAAmB;QACzJ,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAE3B,IAAI;YACA,KAAK,CAAC,WAAW,CAAC;gBACd,IAAI,IAAI,YAAY,KAAK,EAAE;oBACvB,KAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,EAAqB,EAAE,QAAQ,CAAC,CAAC;iBAChE;qBAAM;oBACH,KAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAmB,EAAE,WAAW,CAAC,CAAC;iBAClE;YACL,CAAC,CAAC,CAAC;SACN;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,wBAAsB,KAAO,CAAC;SACvC;gBAAS;YACN,IAAI,CAAC,OAAO,EAAE,CAAC;SAClB;IACL,CAAC;IAEO,8BAAO,GAAf;QAAA,iBAOC;QALG,KAAK,CAAC,QAAQ,CAAC;YACX,KAAkB,UAAqB,EAArB,KAAA,KAAI,CAAC,gBAAgB,EAArB,cAAqB,EAArB,IAAqB,EAAE;gBAApC,IAAM,GAAG,SAAA;gBACV,GAAG,CAAC,WAAW,GAAG,KAAK,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,uCAAgB,GAAxB,UAAyB,IAAW,EAAE,EAAmB,EAAE,IAA2B;QAElF,IAAI,CAAC,EAAE,EAAE;YACL,MAAM,2DAA2D,CAAC;SACrE;aAAM,IAAI,CAAC,CAAC,EAAE,YAAY,KAAK,CAAC,EAAE;YAC/B,MAAM,mDAAmD,CAAC;SAC7D;QAED,mCAAmC;QACnC,IAAM,OAAO,GAA8B,EAAE,CAAC;QAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChC,OAAO,CAAE,EAAE,CAAC,CAAC,CAAgB,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;SAC3D;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;YAC7B,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;SACjB;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClC,IAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,MAAM,GAAsB,IAAI,CAAC;YACrC,IAAI,SAAS,GAAG,IAAI,CAAC;YACrB,IAAI,WAAW,GAAG,IAAI,CAAC;YACvB,IAAI,aAAa,GAAG,KAAK,CAAC;YAE1B,wDAAwD;YACxD,IAAI,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC,gBAAgB,KAAK,KAAK,CAAC,SAAS,EAAE,EAAE;gBAC9E,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBAC5C,aAAa,GAAG,IAAI,CAAC;aACxB;YAED,IAAI,MAAM,EAAE;gBACR,0BAA0B;gBAC1B,SAAS,GAAG,KAAK,CAAC;aACrB;iBAAM;gBACH,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACf,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;oBAC3C,WAAW,GAAG,KAAK,CAAC;iBACvB;qBAAM;oBACH,IAAI,IAAI,EAAE;wBACN,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;qBACvB;yBAAM;wBACH,MAAM,GAAI,EAAuB,CAAC,WAAW,EAAE,CAAC;qBACnD;iBACJ;aACJ;YAED,IAAI,WAAW;gBAAE,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAO,EAAE,SAAS,CAAC,CAAC;YAEtE,IAAI,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC1C,EAAE,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC;gBACjB,IAAI,aAAa,EAAE;oBACf,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC;iBAC/C;aACJ;SACJ;QAED,IAAM,IAAI,GAAG,EAAe,CAAC;QAC7B,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC3B;IAEL,CAAC;IAEO,4CAAqB,GAA7B,UAA8B,IAAQ,EAAE,EAAM,EAAE,cAA4B;QAExE,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,IAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACf,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;aAC/C;iBAAM;gBACH,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;gBAC1B,IAAI,UAAU,EAAE;oBACZ,EAAE,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,mBAAmB,EAAE,CAAC;iBAClD;gBACD,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;aACzD;SACJ;IACL,CAAC;IAEO,wCAAiB,GAAzB,UAA0B,IAAS,EAAE,EAAiB,EAAE,WAAqB;QAEzE,IAAI,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE;YACd,MAAM,mCAAmC,CAAC;SAC7C;QACD,IAAI,EAAE,YAAY,KAAK,EAAE;YACrB,MAAM,iDAAiD,CAAC;SAC3D;QACD,IAAM,QAAQ,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;QAErC,IAAI,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QAEvD,IAAI,IAAI,CAAC,GAAG,EAAE;YACV,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;SACtD;QAED,IAAI,CAAC,gBAAgB;YAAE,gBAAgB,GAAG,EAAE,CAAC;QAE7C,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE;YAClB,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAE1B,IAAI,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBACzC,4CAA4C;gBAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB;oBACjC,CAAC,YAAY;wBACb,CAAC,YAAY,CAAC,SAAS,KAAK,aAAa,CAAC,MAAM,IAAI,YAAY,CAAC,SAAS,KAAK,aAAa,CAAC,OAAO;4BAChG,CAAC,YAAY,CAAC,SAAS,KAAK,aAAa,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;4BAC5E,CAAC,YAAY,CAAC,SAAS,KAAK,aAAa,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE;oBAE3G,IAAI;wBAEA,IAAI,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;wBAE1B,IAAI,YAAY,EAAE;4BAEd,IAAI,SAAS,IAAI,YAAY,CAAC,YAAY,KAAK,QAAQ,CAAC,IAAI,EAAE;gCAE1D,IAAM,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;gCACtC,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;gCACpB,IAAI,EAAE,CAAC,IAAI,EAAE;oCACT,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;iCAChD;6BAEJ;iCAAM;gCAEH,IAAI,SAAS,YAAY,KAAK,EAAE;oCAE5B,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,IAAK,EAAE,CAAC,GAAG,CAAsB,CAAC,eAAe,EAAE;wCAC1F,8BAA8B;wCAC9B,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;qCACxD;yCAAM;wCACH,cAAc;wCACd,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;qCACvB;iCAEJ;qCAAM,IAAI,YAAY,CAAC,YAAY,KAAK,YAAY,CAAC,UAAU,EAAE;oCAE9D,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;wCACV,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;qCAChB;oCACD,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;iCAGhE;qCAAM,IAAI,SAAS,YAAY,MAAM,EAAE;oCAEpC,8FAA8F;oCAC9F,IAAI,YAAY,CAAC,YAAY,KAAK,YAAY,CAAC,MAAM,EAAE;wCACnD,IAAI,SAAS,CAAC,IAAI,EAAE;4CAChB,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;yCAChD;6CAAM;4CACH,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;4CAC1B,IAAI,UAAU,EAAE;gDACZ,EAAE,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,mBAAmB,EAAE,CAAC;6CAChD;4CACD,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;yCAC1D;qCACJ;iCAEJ;qCAAM;oCACH,wBAAwB;oCACxB,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;iCACvB;6BACJ;yBAEJ;6BAAM;4BAEH,sCAAsC;4BACtC,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;yBACvB;qBAGJ;oBAAC,OAAO,KAAK,EAAE;wBACZ,MAAM,mCAAiC,GAAG,mBAAc,QAAQ,WAAM,KAAO,CAAC;qBACjF;iBACJ;aACJ;SACJ;QAED,oBAAoB;QACpB,IAAK,EAAiB,CAAC,gBAAgB,KAAK,SAAS,EAAE;YACnD,IAAM,OAAO,GAAG,EAAgB,CAAC;YAEjC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,IAAK,IAAI,CAAC,OAAO,CAAC,KAAqB,CAAC,wBAAwB,CAAC;gBACrF,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC/E,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;aACpD;YAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBACrB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACrB,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;oBAC5B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;iBACzB;qBAAM,IAAI,IAAI,CAAC,aAAa,KAAK,aAAa,CAAC,OAAO,EAAE;oBACtD,kDAAkD;iBACpD;qBAAM;oBACH,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;oBAC3B,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,KAAK,aAAa,CAAC,KAAK,CAAC;iBAC9D;aACJ;SACJ;QAED,IAAI,CAAC,oBAAoB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAC/C,CAAC;IACL,mBAAC;AAAD,CAAC,AA1QD,IA0QC"}
|
|
@@ -17,7 +17,8 @@ export declare function Serialisation(serialisation: SerialiseType): (type: any,
|
|
|
17
17
|
/** Indicates that this is a list property, and specifies the item type. This is not required if the list is initialised with a value. */
|
|
18
18
|
export declare function ChildList(childType: any): (type: any, propertyKey: string) => any;
|
|
19
19
|
/** Indicates that this is a child object property, and specifies the child type. This is not required if the property is initialised with a value. */
|
|
20
|
-
export declare function ChildObject(childType: any, isValueObject?: boolean):
|
|
20
|
+
export declare function ChildObject(childType: new () => any, isValueObject?: boolean): Function;
|
|
21
|
+
export declare function ChildObject(childType: () => any, isValueObject?: boolean): Function;
|
|
21
22
|
export declare function Dictionary(valueType: any): (type: any, propertyKey: string) => any;
|
|
22
23
|
export declare function Parent(parentType: () => any): (type: any, propertyKey: string) => void;
|
|
23
24
|
/** Registers an onChanged event handler for changes to this property
|
package/dist/Model/Decorators.js
CHANGED
|
@@ -73,7 +73,7 @@ export function Serialisation(serialisation) {
|
|
|
73
73
|
export function ChildList(childType) {
|
|
74
74
|
return function (type, propertyKey) {
|
|
75
75
|
var pi = getOrAddPropertyInfo(type, propertyKey);
|
|
76
|
-
pi.
|
|
76
|
+
pi.setPropertyType(childType);
|
|
77
77
|
if (pi.relationType === RelationType.None) {
|
|
78
78
|
pi.relationType = RelationType.ChildList;
|
|
79
79
|
pi.propertyType = DataType.Array;
|
|
@@ -83,12 +83,14 @@ export function ChildList(childType) {
|
|
|
83
83
|
}
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
-
/** Indicates that this is a child object property, and specifies the child type. This is not required if the property is initialised with a value. */
|
|
87
86
|
export function ChildObject(childType, isValueObject) {
|
|
88
87
|
if (isValueObject === void 0) { isValueObject = false; }
|
|
89
88
|
return function (type, propertyKey) {
|
|
90
89
|
var pi = getOrAddPropertyInfo(type, propertyKey);
|
|
91
|
-
|
|
90
|
+
if (childType === undefined) {
|
|
91
|
+
throw Error("Unknown child type on " + type.constructor.name + "." + propertyKey + ", you may have a circular dependency. Try use @Attributes.ChildObject(() => Type)");
|
|
92
|
+
}
|
|
93
|
+
pi.setPropertyType(childType);
|
|
92
94
|
if (pi.relationType === RelationType.None) {
|
|
93
95
|
pi.relationType = (isValueObject /*|| childType.prototype instanceof ValueObject* <- Causes circular dependency... */) ? RelationType.ValueObject : RelationType.ChildObject;
|
|
94
96
|
pi.propertyType = DataType.Object;
|
|
@@ -100,7 +102,7 @@ export function ChildObject(childType, isValueObject) {
|
|
|
100
102
|
export function Dictionary(valueType) {
|
|
101
103
|
return function (type, propertyKey) {
|
|
102
104
|
var pi = getOrAddPropertyInfo(type, propertyKey);
|
|
103
|
-
pi.
|
|
105
|
+
pi.setPropertyType(valueType);
|
|
104
106
|
if (pi.relationType === RelationType.None) {
|
|
105
107
|
pi.relationType = RelationType.Dictionary;
|
|
106
108
|
pi.propertyType = DataType.Object;
|
|
@@ -110,7 +112,7 @@ export function Dictionary(valueType) {
|
|
|
110
112
|
export function Parent(parentType) {
|
|
111
113
|
return function (type, propertyKey) {
|
|
112
114
|
var pi = getOrAddPropertyInfo(type, propertyKey);
|
|
113
|
-
pi.
|
|
115
|
+
pi.setPropertyType(parentType);
|
|
114
116
|
pi.relationType = RelationType.Parent;
|
|
115
117
|
pi.propertyType = DataType.Object;
|
|
116
118
|
// Also add parent properties to a dedicated list (Used by List to set the parent property to the actual parent object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../src/Model/Decorators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Decorators.js","sourceRoot":"","sources":["../../src/Model/Decorators.ts"],"names":[],"mappings":"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"}
|
package/dist/Model/List.js
CHANGED
|
@@ -123,14 +123,14 @@ var List = /** @class */ (function (_super) {
|
|
|
123
123
|
var parentConstructor = this.attachedTo.constructor.prototype.constructor;
|
|
124
124
|
var parentProperty = null;
|
|
125
125
|
// check default parent
|
|
126
|
-
if (itemConstructor.neo.parentProperty && Utils.sameTypes(parentConstructor, itemConstructor.neo.parentProperty.type
|
|
126
|
+
if (itemConstructor.neo.parentProperty && Utils.sameTypes(parentConstructor, itemConstructor.neo.parentProperty.type)) {
|
|
127
127
|
parentProperty = itemConstructor.neo.parentProperty;
|
|
128
128
|
}
|
|
129
129
|
// check for other parents
|
|
130
130
|
var parents = itemConstructor.neo.parentProperties;
|
|
131
131
|
if (!parentProperty && parents.length > 1) {
|
|
132
132
|
for (var i = 0; i < parents.length; i++) {
|
|
133
|
-
if (Utils.sameTypes(parentConstructor, parents[i].type
|
|
133
|
+
if (Utils.sameTypes(parentConstructor, parents[i].type)) {
|
|
134
134
|
parentProperty = parents[i];
|
|
135
135
|
break;
|
|
136
136
|
}
|
package/dist/Model/List.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"List.js","sourceRoot":"","sources":["../../src/Model/List.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAqB,MAAM,oBAAoB,CAAA;AAEnE,OAAO,EAAE,KAAK,EAAY,MAAM,UAAU,CAAC;AAG3C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD;IAAqC,wBAAQ;IAYzC,cAAmB,eAA8B;QAAjD,YACI,iBAAO,SAGV;QAJkB,qBAAe,GAAf,eAAe,CAAe;QARzC,kBAAY,GAAG,IAAI,eAAe,CAAC,EAAS,CAAC,CAAC;QAWlD,IAAI,CAAC,WAAW,CAAC,KAAI,CAAC,CAAC;;IAC3B,CAAC;IAVD,sBAAW,6BAAW;aAAtB;YACI,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;QACnC,CAAC;;;OAAA;IAUD;;;OAGG;IACI,gBAAW,GAAlB,UAAmB,UAAe;QAC9B,UAAU,CAAC,WAAW,GAAG,EAAE,CAAC;QAE5B,KAAyB,UAA0C,EAA1C,KAAA,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,EAA1C,cAA0C,EAA1C,IAA0C,EAAE;YAAhE,IAAI,YAAY,SAAA;YACjB,IAAI,YAAY,KAAK,aAAa,EAAE;gBAEhC,IAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAE,CAAA;gBACjF,IAAI,UAAU,CAAC,KAAK,KAAK,KAAK,CAAC,EAAE;oBAC7B,SAAS;oBACT,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE;wBAC1B,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;qBACnE;oBACD,UAAU,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;iBAC3D;qBAAM,IAAI,UAAU,CAAC,GAAG,EAAE;oBACvB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;iBAC/D;aACJ;SACJ;IACL,CAAC;IAEM,yBAAU,GAAjB,UAAkB,KAAU,EAAE,UAAe,EAAE,WAAmB;QAC9D,KAAK,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,KAAK,CAAC,YAAY,GAAG,IAAI,eAAe,CAAC,EAAS,CAAC,CAAC;QACpD,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;QAE9B,oDAAoD;QACpD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,UAAS,KAAK;gBAChE,IAAI,CAAC,KAAK,EAAE;oBACR,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;iBACpB;qBAAM;oBACH,IAAI,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC,SAAS,EAAE;wBAC1C,2GAA2G;wBAC3G,KAAK,CAAC,WAAW,CAAC;4BACd,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;4BACjB,KAAK,CAAC,IAAI,OAAV,KAAK,EAAS,KAAK,EAAE;wBACzB,CAAC,CAAC,CAAC;qBACN;yBAAM;wBACH,MAAM,iEAA+D,WAAW,qBAAgB,WAAW,iBAAc,CAAC;qBAC7H;iBACJ;YACL,CAAC,EAAE,CAAC,CAAC;IACT,CAAC;IAgBM,wBAAS,GAAhB,UAAiB,OAAgC;QAAhC,wBAAA,EAAA,YAAgC;QAC7C,OAAO,WAAW,CAAC,SAAS,CAAC,IAAmC,EAAE,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED;;;;;SAKK;IACE,kBAAG,GAAV,UAAW,OAAgC,EAAE,OAA6B;QACtE,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,IAAmC,EAAE,IAAI,CAAC,eAAe,aAAI,cAAc,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;IACtI,CAAC;IAED;;;;;SAKK;IACE,qBAAM,GAAb,UAAc,OAAgC,EAAE,OAA6B;QACzE,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,IAAmC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACzG,CAAC;IAED;;OAEG;IACW,gBAAW,GAAzB,UAA6B,SAAsB,EAAE,OAAgC,EAAE,OAA6B;QAChH,IAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mCAAmC;IAC5B,0BAAW,GAAlB;QACI,OAAO,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;IACtC,CAAC;IAEM,mBAAI,GAAX;QAAA,iBASC;QATW,eAAa;aAAb,UAAa,EAAb,qBAAa,EAAb,IAAa;YAAb,0BAAa;;QACrB,KAAK,CAAC,OAAO,CAAC,UAAA,IAAI;YACd,IAAI,CAAC,CAAC,IAAI,YAAY,KAAI,CAAC,eAAe,CAAC,EAAE;gBACzC,MAAM,sCAAsC,GAAG,KAAK,CAAC,WAAW,CAAE,IAAY,CAAC,WAAW,CAAC,GAAG,mBAAmB,GAAG,KAAK,CAAC,WAAW,CAAC,KAAI,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC;aACrK;YACD,KAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAEM,+BAAgB,GAAvB;QACI,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,EAAE,CAAC;IACjC,CAAC;IAEO,wBAAS,GAAjB,UAAkB,IAAQ;QAEtB,IAAI,IAAI,CAAC,UAAU,EAAE;YAEjB,IAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,WAAkC,CAAC;YAE1F,0BAA0B;YAC1B,IAAI,eAAe,CAAC,GAAG,EAAE;gBACrB,IAAM,iBAAiB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,WAAkC,CAAC;gBAEnG,IAAI,cAAc,GAA4B,IAAI,CAAC;gBAEnD,uBAAuB;gBACvB,IAAI,eAAe,CAAC,GAAG,CAAC,cAAc,IAAI,KAAK,CAAC,SAAS,CAAC,iBAAiB,EAAE,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"List.js","sourceRoot":"","sources":["../../src/Model/List.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelCreatorBase.js","sourceRoot":"","sources":["../../src/Model/ModelCreatorBase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ModelCreatorBase.js","sourceRoot":"","sources":["../../src/Model/ModelCreatorBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -229,10 +229,13 @@ function populateMetaItem(item, level) {
|
|
|
229
229
|
if (level < 5) {
|
|
230
230
|
for (var propertyKey in item.meta) {
|
|
231
231
|
var propertyInfo = item.meta[propertyKey].propertyInfo;
|
|
232
|
-
if ((propertyInfo.relationType === RelationType.ChildObject || propertyInfo.relationType === RelationType.ValueObject)
|
|
233
|
-
var
|
|
234
|
-
|
|
235
|
-
|
|
232
|
+
if ((propertyInfo.relationType === RelationType.ChildObject || propertyInfo.relationType === RelationType.ValueObject)) {
|
|
233
|
+
var propertyType = propertyInfo.type;
|
|
234
|
+
if (propertyType) {
|
|
235
|
+
var childItem = { meta: propertyType.neo.meta };
|
|
236
|
+
populateMetaItem(childItem, level + 1);
|
|
237
|
+
item[propertyKey] = childItem;
|
|
238
|
+
}
|
|
236
239
|
}
|
|
237
240
|
}
|
|
238
241
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeoTypeInfo.js","sourceRoot":"","sources":["../../src/Model/NeoTypeInfo.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NeoTypeInfo.js","sourceRoot":"","sources":["../../src/Model/NeoTypeInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,10 @@ export default class PropertyInfo {
|
|
|
13
13
|
private _parent?;
|
|
14
14
|
private _readableName;
|
|
15
15
|
private attributeRules;
|
|
16
|
+
/** The class type of child.*/
|
|
17
|
+
private _type?;
|
|
18
|
+
/** A function that returns the constructor of the property type. */
|
|
19
|
+
private typeCallback?;
|
|
16
20
|
/** Name to use on labels for this property */
|
|
17
21
|
displayName: string;
|
|
18
22
|
/** True if the property does not cause the object to become dirty. */
|
|
@@ -31,8 +35,6 @@ export default class PropertyInfo {
|
|
|
31
35
|
propertyType: DataType;
|
|
32
36
|
/** This will change the default behaviour about how a control sets this properties value. */
|
|
33
37
|
allowNulls: boolean;
|
|
34
|
-
/** The class type of child. (Function that returns a child if relationType is parent) */
|
|
35
|
-
type: any;
|
|
36
38
|
/** Options for the onChanged event */
|
|
37
39
|
onChangedOptions: OnChangedOptions;
|
|
38
40
|
/**
|
|
@@ -61,4 +63,7 @@ export default class PropertyInfo {
|
|
|
61
63
|
get parent(): PropertyInfo | undefined;
|
|
62
64
|
addAttributeRule(rule: Rule): void;
|
|
63
65
|
clone(): PropertyInfo;
|
|
66
|
+
setPropertyType(propertyType: (() => any) | (new () => any)): void;
|
|
67
|
+
get type(): new () => any;
|
|
68
|
+
createValueInstance(): any;
|
|
64
69
|
}
|
|
@@ -69,6 +69,37 @@ var PropertyInfo = /** @class */ (function () {
|
|
|
69
69
|
clone._parent = this;
|
|
70
70
|
return clone;
|
|
71
71
|
};
|
|
72
|
+
PropertyInfo.prototype.setPropertyType = function (propertyType) {
|
|
73
|
+
if (!propertyType.prototype || !propertyType.prototype.constructor.name) {
|
|
74
|
+
this.typeCallback = propertyType;
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
this._type = propertyType;
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
Object.defineProperty(PropertyInfo.prototype, "type", {
|
|
81
|
+
get: function () {
|
|
82
|
+
if (this.typeCallback !== undefined) {
|
|
83
|
+
return this.typeCallback();
|
|
84
|
+
}
|
|
85
|
+
else if (this._type) {
|
|
86
|
+
return this._type;
|
|
87
|
+
}
|
|
88
|
+
else {
|
|
89
|
+
throw this.propertyName + " has no property type defined. Make sure it is decorated with @Attributes.ChildObject.";
|
|
90
|
+
}
|
|
91
|
+
},
|
|
92
|
+
enumerable: true,
|
|
93
|
+
configurable: true
|
|
94
|
+
});
|
|
95
|
+
PropertyInfo.prototype.createValueInstance = function () {
|
|
96
|
+
try {
|
|
97
|
+
return new this.type();
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
throw "Cannot create instance of property " + this.propertyName + ": " + error;
|
|
101
|
+
}
|
|
102
|
+
};
|
|
72
103
|
return PropertyInfo;
|
|
73
104
|
}());
|
|
74
105
|
export default PropertyInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropertyInfo.js","sourceRoot":"","sources":["../../src/Model/PropertyInfo.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoB,QAAQ,EAAkB,MAAM,QAAQ,CAAC;AAQjG;
|
|
1
|
+
{"version":3,"file":"PropertyInfo.js","sourceRoot":"","sources":["../../src/Model/PropertyInfo.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAoB,QAAQ,EAAkB,MAAM,QAAQ,CAAC;AAQjG;IAkEI,sBAAmB,YAAqB;QAArB,iBAAY,GAAZ,YAAY,CAAS;QA9DhC,mBAAc,GAAW,EAAE,CAAC;QAQpC,8CAA8C;QACvC,gBAAW,GAAG,EAAE,CAAC;QAExB,mEAAmE;QAEnE,sEAAsE;QAC/D,YAAO,GAAG,KAAK,CAAC;QAEvB;;;WAGG;QACI,iBAAY,GAAsB,IAAI,CAAC;QAE9C,wBAAwB;QACjB,cAAS,GAAG,aAAa,CAAC,MAAM,CAAC;QAIxC,8HAA8H;QACvH,iBAAY,GAAG,YAAY,CAAC,IAAI,CAAC;QAExC,iCAAiC;QAC1B,iBAAY,GAAG,QAAQ,CAAC,MAAM,CAAC;QAQtC;;;WAGG;QACI,aAAQ,GAAmB,IAAI,CAAC;QAgBvC,mDAAmD;QAC5C,UAAK,GAAW,EAAE,CAAC;IAI1B,CAAC;IAGD,sBAAI,sCAAY;QADhB,2GAA2G;aAC3G;YACI,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACrB,IAAI,IAAI,CAAC,WAAW,EAAE;oBAClB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC;iBACzC;qBAAM;oBACH,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;iBACrD;aACJ;YACD,OAAO,IAAI,CAAC,aAAa,CAAC;QAC9B,CAAC;;;OAAA;IAKD,sBAAW,gCAAM;QAHjB;;WAEG;aACH;YACI,OAAO,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC;;;OAAA;IAEM,uCAAgB,GAAvB,UAAwB,IAAU;QAC9B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAEM,4BAAK,GAAZ;;QACI,IAAI,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAChD,KAAwB,UAAgC,EAAhC,KAAA,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAhC,cAAgC,EAAhC,IAAgC,EAAE;YAArD,IAAI,WAAW,SAAA;YAChB,KAAK,CAAC,WAAqB,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC;SACpD;QACD,CAAA,KAAA,KAAK,CAAC,KAAK,CAAA,CAAC,MAAM,2BAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAK,KAAK,CAAC,cAAc,GAAE;QACnE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACrB,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,sCAAe,GAAtB,UAAuB,YAA2C;QAC9D,IAAI,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE;YACrE,IAAI,CAAC,YAAY,GAAG,YAAyB,CAAC;SACjD;aAAM;YACH,IAAI,CAAC,KAAK,GAAG,YAA6B,CAAC;SAC9C;IACL,CAAC;IAED,sBAAW,8BAAI;aAAf;YACI,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE;gBACjC,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;aAC9B;iBAAM,IAAI,IAAI,CAAC,KAAK,EAAE;gBACnB,OAAO,IAAI,CAAC,KAAK,CAAC;aACrB;iBAAM;gBACH,MAAS,IAAI,CAAC,YAAY,2FAAwF,CAAA;aACrH;QACL,CAAC;;;OAAA;IAEM,0CAAmB,GAA1B;QACI,IAAI;YACA,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B;QAAC,OAAO,KAAK,EAAE;YACZ,MAAM,wCAAsC,IAAI,CAAC,YAAY,UAAK,KAAO,CAAC;SAC7E;IACL,CAAC;IACL,mBAAC;AAAD,CAAC,AAjID,IAiIC"}
|