@singularsystems/neo-core 0.10.30 → 0.10.34
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/AppServices/ServiceIdentifier.d.ts +1 -1
- package/dist/AppServices/ServiceIdentifier.js +8 -2
- package/dist/AppServices/ServiceIdentifier.js.map +1 -1
- package/dist/Components/TaskRunner/TaskRunner.d.ts +7 -1
- package/dist/Components/TaskRunner/TaskRunner.js +30 -1
- package/dist/Components/TaskRunner/TaskRunner.js.map +1 -1
- package/dist/Data/Deserialiser.d.ts +1 -0
- package/dist/Data/Deserialiser.js +10 -3
- package/dist/Data/Deserialiser.js.map +1 -1
- package/dist/Data/Serialiser.js +2 -2
- package/dist/Data/Serialiser.js.map +1 -1
- package/dist/FileUtils.js +4 -0
- package/dist/FileUtils.js.map +1 -1
- package/dist/Model/Decorators.js +0 -1
- package/dist/Model/Decorators.js.map +1 -1
- package/dist/Model/ModelGraphTraverser.d.ts +6 -0
- package/dist/Model/ModelGraphTraverser.js +27 -17
- package/dist/Model/ModelGraphTraverser.js.map +1 -1
- package/dist/Model/NeoTypeInfo.js +4 -1
- package/dist/Model/NeoTypeInfo.js.map +1 -1
- package/dist/Model/PropertyInfo.d.ts +1 -1
- package/dist/Model/PropertyInfo.js +1 -1
- package/dist/Model/PropertyInfo.js.map +1 -1
- package/dist/Validation/Rules.d.ts +1 -0
- package/dist/Validation/Rules.js +11 -1
- package/dist/Validation/Rules.js.map +1 -1
- package/package.json +1 -1
|
@@ -9,14 +9,19 @@ var ServiceIdentifier = /** @class */ (function () {
|
|
|
9
9
|
*/
|
|
10
10
|
function ServiceIdentifier(name, symbol) {
|
|
11
11
|
if (symbol === void 0) { symbol = Symbol(name); }
|
|
12
|
-
this.name = name;
|
|
13
12
|
this.symbol = symbol;
|
|
13
|
+
if (ServiceIdentifier.typeNames.has(name)) {
|
|
14
|
+
console.error("Warning: Service type " + name + " has already been registered!");
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
ServiceIdentifier.typeNames.add(name);
|
|
18
|
+
}
|
|
14
19
|
}
|
|
15
20
|
/**
|
|
16
21
|
* Changes the type of the service identifier.
|
|
17
22
|
*/
|
|
18
23
|
ServiceIdentifier.prototype.asType = function () {
|
|
19
|
-
return
|
|
24
|
+
return this;
|
|
20
25
|
};
|
|
21
26
|
/**
|
|
22
27
|
* Creates a service identifier from the given type and key.
|
|
@@ -28,6 +33,7 @@ var ServiceIdentifier = /** @class */ (function () {
|
|
|
28
33
|
ServiceIdentifier.prototype.toString = function () {
|
|
29
34
|
return this.symbol.toString();
|
|
30
35
|
};
|
|
36
|
+
ServiceIdentifier.typeNames = new Set();
|
|
31
37
|
return ServiceIdentifier;
|
|
32
38
|
}());
|
|
33
39
|
export { ServiceIdentifier };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceIdentifier.js","sourceRoot":"","sources":["../../src/AppServices/ServiceIdentifier.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;
|
|
1
|
+
{"version":3,"file":"ServiceIdentifier.js","sourceRoot":"","sources":["../../src/AppServices/ServiceIdentifier.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH;IAII;;;;OAIG;IACH,2BAAY,IAAY,EAAE,MAA6B;QAA7B,uBAAA,EAAA,SAAiB,MAAM,CAAC,IAAI,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,IAAI,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvC,OAAO,CAAC,KAAK,CAAC,2BAAyB,IAAI,kCAA+B,CAAC,CAAC;SAC/E;aAAM;YACH,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACzC;IACL,CAAC;IAID;;OAEG;IACI,kCAAM,GAAb;QACI,OAAO,IAA+B,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACW,qBAAG,GAAjB,UAAqB,GAAW;QAC5B,OAAO,IAAI,iBAAiB,CAAI,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,oCAAQ,GAAf;QACI,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClC,CAAC;IApCc,2BAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAqCjD,wBAAC;CAAA,AAvCD,IAuCC;SAvCY,iBAAiB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { variant } from '..';
|
|
2
|
+
import { AxiosPromise } from 'axios';
|
|
2
3
|
import { IErrorHandler, ErrorDisplayType } from '../ErrorHandler';
|
|
3
4
|
import { ProgressState } from './ProgressState';
|
|
4
5
|
declare type PromiseDictionary = {
|
|
@@ -52,11 +53,15 @@ export interface ITaskRunner {
|
|
|
52
53
|
run<T>(loadingText: string, task: (options: TaskRunnerOptions<T>) => Promise<T>): Promise<void>;
|
|
53
54
|
/**
|
|
54
55
|
* Sets the isBusy property to true while the supplied promise is executing.
|
|
55
|
-
* Note, if an error occurs, the return value wrapped by the promise will be undefined.
|
|
56
56
|
* @param task A promise which is busy executing.
|
|
57
57
|
* @param options Static options.
|
|
58
58
|
*/
|
|
59
59
|
waitFor<T>(task: Promise<T>, options?: Partial<WaitForTaskRunnerOptions<T>>): Promise<T>;
|
|
60
|
+
/**
|
|
61
|
+
* Sets the isBusy property to true while the supplied axios promise is executing. The data in the axios response is returned.
|
|
62
|
+
* @param task Axios promise which is busy executing.
|
|
63
|
+
*/
|
|
64
|
+
waitForData<T>(task: AxiosPromise<T>, options?: Partial<WaitForTaskRunnerOptions<T>>): Promise<T>;
|
|
60
65
|
/**
|
|
61
66
|
* Accepts a dictionary of promises, and waits for all of them to resolve.
|
|
62
67
|
* A dictionary with the same keys is returned with the results of each promise.
|
|
@@ -92,6 +97,7 @@ export default class TaskRunner implements ITaskRunner {
|
|
|
92
97
|
* A dictionary with the same keys is returned with the results of each promise.
|
|
93
98
|
*/
|
|
94
99
|
waitForAll<T extends PromiseDictionary>(promises: T, options?: Partial<WaitForTaskRunnerOptions<T>>): Promise<TransformPromises<T>>;
|
|
100
|
+
waitForData<T>(task: AxiosPromise<T>, options?: Partial<WaitForTaskRunnerOptions<T>>): Promise<T>;
|
|
95
101
|
private runTask;
|
|
96
102
|
/** Waits the specified number of milliseconds. */
|
|
97
103
|
static delay(ms: number): Promise<unknown>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { __awaiter, __decorate, __extends, __generator, __metadata, __param } from "tslib";
|
|
1
|
+
import { __assign, __awaiter, __decorate, __extends, __generator, __metadata, __param } from "tslib";
|
|
2
2
|
import { Observable } from '../../Model/Decorators';
|
|
3
3
|
import NeoModel from '../../Model/NeoModel';
|
|
4
4
|
import { ModalUtils } from '../..';
|
|
@@ -128,6 +128,35 @@ var TaskRunner = /** @class */ (function () {
|
|
|
128
128
|
});
|
|
129
129
|
});
|
|
130
130
|
};
|
|
131
|
+
TaskRunner.prototype.waitForData = function (task, options) {
|
|
132
|
+
var _a, _b;
|
|
133
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
134
|
+
var optionsNoDefault, result, e_2;
|
|
135
|
+
return __generator(this, function (_c) {
|
|
136
|
+
switch (_c.label) {
|
|
137
|
+
case 0:
|
|
138
|
+
optionsNoDefault = __assign(__assign({}, options), { defaultReturnValue: undefined });
|
|
139
|
+
_c.label = 1;
|
|
140
|
+
case 1:
|
|
141
|
+
_c.trys.push([1, 3, , 4]);
|
|
142
|
+
return [4 /*yield*/, this.waitFor(task, optionsNoDefault)];
|
|
143
|
+
case 2:
|
|
144
|
+
result = _c.sent();
|
|
145
|
+
return [2 /*return*/, result.data];
|
|
146
|
+
case 3:
|
|
147
|
+
e_2 = _c.sent();
|
|
148
|
+
if (((_a = options) === null || _a === void 0 ? void 0 : _a.defaultReturnValue) === undefined) {
|
|
149
|
+
throw e_2;
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
return [2 /*return*/, (_b = options) === null || _b === void 0 ? void 0 : _b.defaultReturnValue];
|
|
153
|
+
}
|
|
154
|
+
return [3 /*break*/, 4];
|
|
155
|
+
case 4: return [2 /*return*/];
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
});
|
|
159
|
+
};
|
|
131
160
|
TaskRunner.prototype.runTask = function (name, runningTask, options) {
|
|
132
161
|
var _this = this;
|
|
133
162
|
if (this.runningTasks.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../../src/Components/TaskRunner/TaskRunner.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAGnC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAiB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAMhD;IAEI,2BAAoB,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAI1C,qFAAqF;QACrF,kBAAa,GAAG,gBAAgB,CAAC,SAAS,CAAC;QAE3C,8CAA8C;QAE9C,gBAAW,GAAG,EAAE,CAAC;QAGjB,YAAO,GAAY,SAAS,CAAC;QAE7B,8BAA8B;QAC9B,oBAAe,GAAW,CAAC,CAAC;QAE5B,0DAA0D;QAC1D,aAAQ,GAAW,CAAC,CAAC;QAErB,yDAAyD;QACzD,iBAAY,GAAY,IAAI,CAAC;IAnB7B,CAAC;IA2BD,sBAAW,4CAAa;aAAxB;YACI,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QACzC,CAAC;;;OAAA;IAtBD;QADC,UAAU,EAAE;;0DACI;IAGjB;QADC,UAAU,EAAE;;sDACgB;IAdpB,iBAAiB;QAD7B,QAAQ;yCAG2B,UAAU;OAFjC,iBAAiB,CAkC7B;IAAD,wBAAC;CAAA,AAlCD,IAkCC;SAlCY,iBAAiB;AAoC9B;IAAuD,4CAAoB;IAA3E;;IAOA,CAAC;IAAD,+BAAC;AAAD,CAAC,AAPD,CAAuD,iBAAiB,GAOvE;;AAED,IAAM,eAAe,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskRunner.js","sourceRoot":"","sources":["../../../src/Components/TaskRunner/TaskRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,7 +95,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
97
|
if (fromItem.$ref) {
|
|
98
|
-
toItem = this.
|
|
98
|
+
toItem = this.getReferencedObject(fromItem.$ref);
|
|
99
99
|
deserialise = false;
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
@@ -125,7 +125,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
125
125
|
for (var key in from) {
|
|
126
126
|
var fromItem = from[key];
|
|
127
127
|
if (fromItem.$ref) {
|
|
128
|
-
to[key] = this.
|
|
128
|
+
to[key] = this.getReferencedObject(fromItem.$ref);
|
|
129
129
|
}
|
|
130
130
|
else {
|
|
131
131
|
var mustCreate = !to[key];
|
|
@@ -190,7 +190,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
190
190
|
// Properties of type Parent are ignored. Parent will be set when the item is added to a list.
|
|
191
191
|
if (propertyInfo.relationType !== RelationType.Parent) {
|
|
192
192
|
if (fromValue.$ref) {
|
|
193
|
-
to[key] = this.
|
|
193
|
+
to[key] = this.getReferencedObject(fromValue.$ref);
|
|
194
194
|
}
|
|
195
195
|
else {
|
|
196
196
|
var mustCreate = !to[key];
|
|
@@ -241,6 +241,13 @@ var Deserialiser = /** @class */ (function () {
|
|
|
241
241
|
}
|
|
242
242
|
this.endObjectDeserialise(to, justCreated);
|
|
243
243
|
};
|
|
244
|
+
Deserialiser.prototype.getReferencedObject = function (id) {
|
|
245
|
+
var found = this.objectRefs[id];
|
|
246
|
+
if (!found) {
|
|
247
|
+
throw "Cannot find $id: " + id + ".";
|
|
248
|
+
}
|
|
249
|
+
return found.to;
|
|
250
|
+
};
|
|
244
251
|
return Deserialiser;
|
|
245
252
|
}());
|
|
246
253
|
export { Deserialiser };
|
|
@@ -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":"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"}
|
package/dist/Data/Serialiser.js
CHANGED
|
@@ -92,7 +92,7 @@ var Serialiser = /** @class */ (function () {
|
|
|
92
92
|
//Loop through serialisable properties
|
|
93
93
|
var typeInfo = from.constructor.neo;
|
|
94
94
|
if (!typeInfo && !isDictionary) {
|
|
95
|
-
throw "Object is not decorated with @NeoModel. Either add @NeoModel,
|
|
95
|
+
throw "Object is not decorated with @NeoModel. Either add @NeoModel, suppress serialisation on the property, or add @Attributes.Raw() to the property.";
|
|
96
96
|
}
|
|
97
97
|
var propertyMap = isDictionary ? {} : typeInfo.propertyMap;
|
|
98
98
|
for (var key in from) {
|
|
@@ -112,7 +112,7 @@ var Serialiser = /** @class */ (function () {
|
|
|
112
112
|
this.serialiseArray(fromValue, to[key]);
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
|
-
else if (isChildObject) {
|
|
115
|
+
else if (isChildObject && !propertyInfo.assignOnDeserialise) {
|
|
116
116
|
if (!fromValue || (propertyInfo.relationType === RelationType.Parent && !fromValue.__id)) {
|
|
117
117
|
// Parents must only be included if they reference an already serialised object.
|
|
118
118
|
// Otherwise serialising a leaf node will serialise up the tree and the entire graph will be serialised.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"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"}
|
package/dist/FileUtils.js
CHANGED
|
@@ -25,6 +25,10 @@ var FileUtils = /** @class */ (function () {
|
|
|
25
25
|
return matches[1].replace(/['"]/g, '');
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
var fileNameValue = response.headers["X_FILENAME"];
|
|
29
|
+
if (fileNameValue) {
|
|
30
|
+
return fileNameValue;
|
|
31
|
+
}
|
|
28
32
|
throw Error("Filename not found. Make sure the response contains a content-disposition header, and that your CORS policy exposes this header.");
|
|
29
33
|
};
|
|
30
34
|
return FileUtils;
|
package/dist/FileUtils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../src/FileUtils.ts"],"names":[],"mappings":"AAEA;IAAA;
|
|
1
|
+
{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../src/FileUtils.ts"],"names":[],"mappings":"AAEA;IAAA;IAyCA,CAAC;IArCiB,sBAAY,GAA1B,UAA2B,cAA0C,EAAE,QAAiB;QAEpF,IAAI,QAAQ,GAAG,cAAsB,CAAC;QAEtC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAM,QAAQ,GAAG,cAAqC,CAAC;YACvD,QAAQ,GAAG,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;YAC5D,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;SAC5B;QAED,IAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACvE,IAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAEa,2CAAiC,GAA/C,UAAgD,QAAuB;QAEnE,IAAM,WAAW,GAAW,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACpE,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACrD,IAAM,aAAa,GAAG,wCAAwC,CAAC;YAC/D,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChD,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC/B,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;aAC1C;SACJ;QAED,IAAM,aAAa,GAAW,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC;SACxB;QAED,MAAM,KAAK,CAAC,kIAAkI,CAAC,CAAC;IACpJ,CAAC;IACL,gBAAC;AAAD,CAAC,AAzCD,IAyCC"}
|
package/dist/Model/Decorators.js
CHANGED
|
@@ -77,7 +77,6 @@ export function ChildList(childType) {
|
|
|
77
77
|
if (pi.relationType === RelationType.None) {
|
|
78
78
|
pi.relationType = RelationType.ChildList;
|
|
79
79
|
pi.propertyType = DataType.Array;
|
|
80
|
-
pi.noTrack = true;
|
|
81
80
|
// Also add child properties to a dedicated list. (Used in graph iterator)
|
|
82
81
|
type.constructor.neo.children.push(pi);
|
|
83
82
|
}
|
|
@@ -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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"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { RelationType } from './Misc';
|
|
2
2
|
import { IModelBase } from './IModelBase';
|
|
3
|
+
import PropertyInfo from './PropertyInfo';
|
|
3
4
|
export declare class RecursionState {
|
|
4
5
|
stop: boolean;
|
|
6
|
+
canRecurse: (model: IModelBase, property: PropertyInfo) => boolean;
|
|
5
7
|
pushState(): void;
|
|
6
8
|
popState(): void;
|
|
9
|
+
/**
|
|
10
|
+
* Overwrites the canRecurse callback to always return true.
|
|
11
|
+
*/
|
|
12
|
+
includeNonTrackedProperties(): this;
|
|
7
13
|
}
|
|
8
14
|
export declare class BooleanRecursionState extends RecursionState {
|
|
9
15
|
flag: boolean;
|
|
@@ -3,11 +3,19 @@ import { RelationType } from './Misc';
|
|
|
3
3
|
var RecursionState = /** @class */ (function () {
|
|
4
4
|
function RecursionState() {
|
|
5
5
|
this.stop = false;
|
|
6
|
+
this.canRecurse = function (model, property) { return !property.noTrack; };
|
|
6
7
|
}
|
|
7
8
|
RecursionState.prototype.pushState = function () {
|
|
8
9
|
};
|
|
9
10
|
RecursionState.prototype.popState = function () {
|
|
10
11
|
};
|
|
12
|
+
/**
|
|
13
|
+
* Overwrites the canRecurse callback to always return true.
|
|
14
|
+
*/
|
|
15
|
+
RecursionState.prototype.includeNonTrackedProperties = function () {
|
|
16
|
+
this.canRecurse = function (model, property) { return true; };
|
|
17
|
+
return this;
|
|
18
|
+
};
|
|
11
19
|
return RecursionState;
|
|
12
20
|
}());
|
|
13
21
|
export { RecursionState };
|
|
@@ -26,7 +34,7 @@ export function traverseItems(model, stateOrCallback, callbackOrListCallback, li
|
|
|
26
34
|
var state;
|
|
27
35
|
var callback;
|
|
28
36
|
if (typeof stateOrCallback === "function") {
|
|
29
|
-
state =
|
|
37
|
+
state = new RecursionState();
|
|
30
38
|
callback = stateOrCallback;
|
|
31
39
|
listCallback = callbackOrListCallback;
|
|
32
40
|
}
|
|
@@ -58,24 +66,26 @@ function invokeOnSelfAndChildren(model, state, callback, listCallback, relationT
|
|
|
58
66
|
if (ctor.neo.children) {
|
|
59
67
|
for (var i = 0; i < ctor.neo.children.length; i++) {
|
|
60
68
|
var cpi = ctor.neo.children[i];
|
|
61
|
-
if (
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
listCallback
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
invokeOnItemsAndChildren(childList, state, callback, listCallback, RelationType.ChildList);
|
|
69
|
-
state.popState();
|
|
70
|
-
if (state.stop)
|
|
71
|
-
return state;
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
74
|
-
var child = model[cpi.propertyName];
|
|
75
|
-
if (child) {
|
|
69
|
+
if (state.canRecurse(model, cpi)) {
|
|
70
|
+
if (cpi.relationType == RelationType.ChildList) {
|
|
71
|
+
var childList = model[cpi.propertyName];
|
|
72
|
+
if (listCallback)
|
|
73
|
+
listCallback(childList, state);
|
|
74
|
+
if (state.stop)
|
|
75
|
+
return state;
|
|
76
76
|
state.pushState();
|
|
77
|
-
|
|
77
|
+
invokeOnItemsAndChildren(childList, state, callback, listCallback, RelationType.ChildList);
|
|
78
78
|
state.popState();
|
|
79
|
+
if (state.stop)
|
|
80
|
+
return state;
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
var child = model[cpi.propertyName];
|
|
84
|
+
if (child) {
|
|
85
|
+
state.pushState();
|
|
86
|
+
invokeOnSelfAndChildren(child, state, callback, listCallback, cpi.relationType);
|
|
87
|
+
state.popState();
|
|
88
|
+
}
|
|
79
89
|
}
|
|
80
90
|
}
|
|
81
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelGraphTraverser.js","sourceRoot":"","sources":["../../src/Model/ModelGraphTraverser.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
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,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAE/B,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;gBAC9B,IAAI,GAAG,CAAC,YAAY,IAAI,YAAY,CAAC,SAAS,EAAE;oBAC5C,IAAI,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBAExC,IAAI,YAAY;wBAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;oBACjD,IAAI,KAAK,CAAC,IAAI;wBAAE,OAAO,KAAK,CAAC;oBAE7B,KAAK,CAAC,SAAS,EAAE,CAAC;oBAClB,wBAAwB,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC3F,KAAK,CAAC,QAAQ,EAAE,CAAC;oBACjB,IAAI,KAAK,CAAC,IAAI;wBAAE,OAAO,KAAK,CAAC;iBAChC;qBAAM;oBACH,IAAI,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;oBACpC,IAAI,KAAK,EAAE;wBACP,KAAK,CAAC,SAAS,EAAE,CAAC;wBAClB,uBAAuB,CAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;wBACjF,KAAK,CAAC,QAAQ,EAAE,CAAC;qBACpB;iBACJ;aACJ;SACJ;KACJ;IACD,OAAO,KAAK,CAAC;AACjB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __spreadArrays } from "tslib";
|
|
2
|
-
import { ExpressionRule } from '../Validation/Rules';
|
|
2
|
+
import { ExpressionRule, CallbackRule } from '../Validation/Rules';
|
|
3
3
|
import PropertyInstance from './PropertyInstance';
|
|
4
4
|
import PropertyInfo from './PropertyInfo';
|
|
5
5
|
import Globals from '../Globals';
|
|
@@ -108,6 +108,9 @@ var NeoTypeInfo = /** @class */ (function () {
|
|
|
108
108
|
if (instance.addBusinessRules !== undefined) {
|
|
109
109
|
var validationRules = new ValidationRules();
|
|
110
110
|
instance.addBusinessRules(validationRules);
|
|
111
|
+
if (validationRules.rules.some(function (c) { return c instanceof CallbackRule && c.hasBoundFunction; })) {
|
|
112
|
+
console.error("Warning: " + this.objectConstructor.name + " has rules which have been added using a bound function, or arrow function.");
|
|
113
|
+
}
|
|
111
114
|
var modelProxy = new ModelProxy(instance);
|
|
112
115
|
for (var _i = 0, _a = validationRules.rules; _i < _a.length; _i++) {
|
|
113
116
|
var rule = _a[_i];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeoTypeInfo.js","sourceRoot":"","sources":["../../src/Model/NeoTypeInfo.ts"],"names":[],"mappings":";AAAA,OAAO,EAAQ,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"NeoTypeInfo.js","sourceRoot":"","sources":["../../src/Model/NeoTypeInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,7 @@ export default class PropertyInfo {
|
|
|
54
54
|
hasSortValue: boolean;
|
|
55
55
|
/** List of rules that display on this property. */
|
|
56
56
|
rules: Rule[];
|
|
57
|
-
/** Indicates that this property must be assigned to on
|
|
57
|
+
/** Indicates that this property must be assigned to on de/serialisation. The de/serialiser will not try create a model instance of the object / array. */
|
|
58
58
|
assignOnDeserialise: boolean;
|
|
59
59
|
constructor(propertyName: string);
|
|
60
60
|
/** Gets the readable name of the property. Uses string.readable if Display decorator was not specified. */
|
|
@@ -27,7 +27,7 @@ var PropertyInfo = /** @class */ (function () {
|
|
|
27
27
|
this.debounce = null;
|
|
28
28
|
/** List of rules that display on this property. */
|
|
29
29
|
this.rules = [];
|
|
30
|
-
/** Indicates that this property must be assigned to on
|
|
30
|
+
/** Indicates that this property must be assigned to on de/serialisation. The de/serialiser will not try create a model instance of the object / array. */
|
|
31
31
|
this.assignOnDeserialise = false;
|
|
32
32
|
}
|
|
33
33
|
Object.defineProperty(PropertyInfo.prototype, "readableName", {
|
|
@@ -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;IAqEI,sBAAmB,YAAqB;QAArB,iBAAY,GAAZ,YAAY,CAAS;QAjEhC,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;QAE1B,
|
|
1
|
+
{"version":3,"file":"PropertyInfo.js","sourceRoot":"","sources":["../../src/Model/PropertyInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ export declare abstract class CustomRule<T extends IModelBase> extends Rule impl
|
|
|
57
57
|
}
|
|
58
58
|
export declare class CallbackRule<T extends IModelBase> extends CustomRule<T> {
|
|
59
59
|
private validateFn;
|
|
60
|
+
hasBoundFunction: boolean;
|
|
60
61
|
constructor(validateFn: (context: RuleContext) => void);
|
|
61
62
|
checkRule(propertyInstance: IPropertyInstance, context: RuleContext): void;
|
|
62
63
|
}
|
package/dist/Validation/Rules.js
CHANGED
|
@@ -124,10 +124,20 @@ var CallbackRule = /** @class */ (function (_super) {
|
|
|
124
124
|
function CallbackRule(validateFn) {
|
|
125
125
|
var _this = _super.call(this) || this;
|
|
126
126
|
_this.validateFn = validateFn;
|
|
127
|
+
_this.hasBoundFunction = false;
|
|
128
|
+
if (!validateFn.hasOwnProperty("prototype")) {
|
|
129
|
+
_this.hasBoundFunction = true;
|
|
130
|
+
}
|
|
127
131
|
return _this;
|
|
128
132
|
}
|
|
129
133
|
CallbackRule.prototype.checkRule = function (propertyInstance, context) {
|
|
130
|
-
this.
|
|
134
|
+
if (this.hasBoundFunction) {
|
|
135
|
+
var reboundFn = this.validateFn.bind(propertyInstance.attachedTo);
|
|
136
|
+
reboundFn(context);
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
this.validateFn.call(propertyInstance.attachedTo, context);
|
|
140
|
+
}
|
|
131
141
|
};
|
|
132
142
|
return CallbackRule;
|
|
133
143
|
}(CustomRule));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Rules.js","sourceRoot":"","sources":["../../src/Validation/Rules.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Rules.js","sourceRoot":"","sources":["../../src/Validation/Rules.ts"],"names":[],"mappings":"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"}
|