@singularsystems/neo-core 0.10.28 → 0.10.32
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/NeoModule.js +2 -0
- package/dist/AppServices/NeoModule.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/Extensions.d.ts +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/Validation/ValidationHelpers.d.ts +1 -1
- package/dist/Validation/ValidationHelpers.js +2 -1
- package/dist/Validation/ValidationHelpers.js.map +1 -1
- package/package.json +2 -2
|
@@ -11,12 +11,14 @@ import LocalisationService from '../Localisation/LocalisationService';
|
|
|
11
11
|
import { NotificationHelper } from '../Components/Notifications/NotificationHelper';
|
|
12
12
|
import { RouteSecurityService } from "../Routing/RouteSecurityService";
|
|
13
13
|
import { NeoLoginErrorHandler } from "../Security/LoginErrorHandler";
|
|
14
|
+
import { SecurityService } from "../Security/SecurityService";
|
|
14
15
|
var neoModule = new Module("neo", function (container) {
|
|
15
16
|
container.bind(NeoTypes.Config.ConfigService).to(ConfigService).inSingletonScope();
|
|
16
17
|
container.bind(NeoTypes.Core.ConnectionManager).to(ConnectionManager).inSingletonScope();
|
|
17
18
|
container.bind(NeoTypes.Routing.MenuItemProvider).to(MenuItemProvider).inSingletonScope();
|
|
18
19
|
container.bind(NeoTypes.Routing.RouteSecurityService).to(RouteSecurityService).inSingletonScope();
|
|
19
20
|
container.bind(NeoTypes.Security.LoginErrorHandler).to(NeoLoginErrorHandler).inSingletonScope();
|
|
21
|
+
container.bind(NeoTypes.Security.SecurityService).to(SecurityService).inSingletonScope();
|
|
20
22
|
container.bind(NeoTypes.Localisation.LocalisationService).to(LocalisationService).inSingletonScope();
|
|
21
23
|
container.bind(NeoTypes.UI.ModalStore).to(ModalStore).inSingletonScope();
|
|
22
24
|
container.bind(NeoTypes.UI.NotificationStore).to(NotificationStore).inTransientScope();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeoModule.js","sourceRoot":"","sources":["../../src/AppServices/NeoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAC9C,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,mBAAmB,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"NeoModule.js","sourceRoot":"","sources":["../../src/AppServices/NeoModule.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/Extensions.d.ts
CHANGED
|
@@ -70,7 +70,7 @@ declare global {
|
|
|
70
70
|
* Adds the value if it does not exists, and returns it.
|
|
71
71
|
* @param valueCallback Callback function which returns a value for the key.
|
|
72
72
|
*/
|
|
73
|
-
getOrAdd(key: K, valueCallback: (key: K) => V): V;
|
|
73
|
+
getOrAdd?(key: K, valueCallback: (key: K) => V): V;
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
export {};
|
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":"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"}
|
|
@@ -7,6 +7,6 @@ export interface IInvalidObjectGraph extends IInvalidObject {
|
|
|
7
7
|
valueObjects: IInvalidObjectGraph[];
|
|
8
8
|
}
|
|
9
9
|
/** Gets a validation summary graph for display of broken rules */
|
|
10
|
-
export declare function getValidationSummary(model: IModelBase, displayMode?: ValidationDisplayMode): IInvalidObjectGraph;
|
|
10
|
+
export declare function getValidationSummary(model: IModelBase, displayMode?: ValidationDisplayMode): IInvalidObjectGraph | null;
|
|
11
11
|
/** Gets a validation summary graph for display of broken rules */
|
|
12
12
|
export declare function getValidationSummary(models: IModelBase[], displayMode?: ValidationDisplayMode): IInvalidObjectGraph[];
|
|
@@ -34,6 +34,7 @@ var ObjectRecursionState = /** @class */ (function (_super) {
|
|
|
34
34
|
return ObjectRecursionState;
|
|
35
35
|
}(ModelTraverser.RecursionState));
|
|
36
36
|
export function getValidationSummary(model, displayMode) {
|
|
37
|
+
var _a;
|
|
37
38
|
var root = { model: undefined, objectDisplayInfo: [], isValid: true, childLists: [], propertyRules: [], childObjects: [], valueObjects: [] };
|
|
38
39
|
var state = new ObjectRecursionState(root);
|
|
39
40
|
var models;
|
|
@@ -52,6 +53,6 @@ export function getValidationSummary(model, displayMode) {
|
|
|
52
53
|
}
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
|
-
return isArray ? root.childLists : root.childLists[0];
|
|
56
|
+
return isArray ? root.childLists : (_a = root.childLists[0], (_a !== null && _a !== void 0 ? _a : null));
|
|
56
57
|
}
|
|
57
58
|
//# sourceMappingURL=ValidationHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationHelpers.js","sourceRoot":"","sources":["../../src/Validation/ValidationHelpers.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,cAAc,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAQ7C;IAAmC,wCAA6B;IAE5D,8BAAmB,MAA2B;QAA9C,YACI,iBAAO,SACV;QAFkB,YAAM,GAAN,MAAM,CAAqB;QAKtC,WAAK,GAAqE,EAAE,CAAC;;IAHrF,CAAC;IAKM,kCAAG,GAAV,UAAW,MAAsB,EAAE,YAA2B;QAE1D,IAAI,CAAC,OAAO,yBAAQ,MAAM,KAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,GAAE,CAAC;QACjF,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE;YAClD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7C;IACL,CAAC;IAED,wCAAS,GAAT;QACI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;IAC/B,CAAC;IACD,uCAAQ,GAAR;QACI,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACnC,CAAC;IACL,2BAAC;AAAD,CAAC,AA9BD,CAAmC,cAAc,CAAC,cAAc,GA8B/D;AAMD,MAAM,UAAU,oBAAoB,CAAC,KAAiC,EAAE,WAAmC
|
|
1
|
+
{"version":3,"file":"ValidationHelpers.js","sourceRoot":"","sources":["../../src/Validation/ValidationHelpers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@singularsystems/neo-core",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.32",
|
|
4
4
|
"description": "Core functionality for the Neo client library",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -27,4 +27,4 @@
|
|
|
27
27
|
"reflect-metadata": "0.1.13",
|
|
28
28
|
"tslib": "1.10.0"
|
|
29
29
|
}
|
|
30
|
-
}
|
|
30
|
+
}
|