@singularsystems/neo-core 0.10.18 → 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/Components/Modal/ModalHelper.d.ts +7 -1
- package/dist/Components/Modal/ModalHelper.js +25 -13
- package/dist/Components/Modal/ModalHelper.js.map +1 -1
- package/dist/Data/Deserialiser.d.ts +1 -0
- package/dist/Data/Deserialiser.js +24 -5
- package/dist/Data/Deserialiser.js.map +1 -1
- package/dist/Data/Paging/PageManager.d.ts +1 -1
- package/dist/Data/Paging/PageManager.js +13 -6
- package/dist/Data/Paging/PageManager.js.map +1 -1
- package/dist/Data/Serialiser.js +7 -6
- package/dist/Data/Serialiser.js.map +1 -1
- package/dist/Dates/DateUtils.d.ts +3 -0
- package/dist/Dates/DateUtils.js +10 -1
- package/dist/Dates/DateUtils.js.map +1 -1
- package/dist/Model/BaseModels/CriteriaBase.d.ts +16 -0
- package/dist/Model/BaseModels/CriteriaBase.js +35 -0
- package/dist/Model/BaseModels/CriteriaBase.js.map +1 -0
- package/dist/Model/Decorators.d.ts +3 -1
- package/dist/Model/Decorators.js +16 -4
- package/dist/Model/Decorators.js.map +1 -1
- package/dist/Model/IModelBase.d.ts +2 -1
- package/dist/Model/List.js +2 -2
- package/dist/Model/List.js.map +1 -1
- package/dist/Model/Misc.d.ts +2 -1
- package/dist/Model/Misc.js +1 -0
- package/dist/Model/Misc.js.map +1 -1
- package/dist/Model/ModelCreatorBase.js.map +1 -1
- package/dist/Model/ModelFieldInfo.d.ts +12 -0
- package/dist/Model/ModelFieldInfo.js +27 -0
- package/dist/Model/ModelFieldInfo.js.map +1 -0
- package/dist/Model/NeoTypeInfo.js +8 -5
- 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/dist/Model/index.d.ts +2 -0
- package/dist/Model/index.js +2 -0
- package/dist/Model/index.js.map +1 -1
- package/dist/Security/index.d.ts +1 -0
- package/dist/SignalR/HubBase.d.ts +1 -1
- package/package.json +1 -1
|
@@ -4,14 +4,20 @@ export interface IModalInstance {
|
|
|
4
4
|
isRemoving: boolean;
|
|
5
5
|
onDismiss?: (e: any) => void;
|
|
6
6
|
}
|
|
7
|
+
export interface IModalContainerOptions {
|
|
8
|
+
className?: string;
|
|
9
|
+
}
|
|
7
10
|
export default class ModalHelper {
|
|
8
11
|
private static _instance;
|
|
9
12
|
static get appInstance(): ModalHelper;
|
|
13
|
+
static initialise(props: IModalContainerOptions, container?: HTMLElement): void;
|
|
14
|
+
updateProps(props: IModalContainerOptions): void;
|
|
10
15
|
private rootContainer;
|
|
11
16
|
private modalsContainer;
|
|
12
17
|
private modalsBackdrop;
|
|
13
18
|
private modals;
|
|
14
|
-
|
|
19
|
+
private rootClassName;
|
|
20
|
+
constructor(props: IModalContainerOptions, container?: HTMLElement);
|
|
15
21
|
addModal(modal: HTMLDivElement, options: IModalOptionsBase, onDismiss?: (e: any) => void): IModalInstance;
|
|
16
22
|
private addFirstModal;
|
|
17
23
|
private insertAdditionalModal;
|
|
@@ -1,21 +1,23 @@
|
|
|
1
1
|
import { Misc } from '../../';
|
|
2
2
|
import AnimationHelper from '../AnimationHelper';
|
|
3
3
|
var inactiveClassName = "inactive";
|
|
4
|
-
var rootInitialClassName = "";
|
|
5
4
|
var ModalHelper = /** @class */ (function () {
|
|
6
|
-
function ModalHelper() {
|
|
5
|
+
function ModalHelper(props, container) {
|
|
7
6
|
var _this = this;
|
|
7
|
+
var _a;
|
|
8
8
|
this.modals = [];
|
|
9
|
+
this.rootClassName = "";
|
|
10
|
+
this.rootClassName = (_a = props.className, (_a !== null && _a !== void 0 ? _a : ""));
|
|
9
11
|
this.rootContainer = document.createElement("div");
|
|
10
|
-
this.rootContainer.className =
|
|
12
|
+
this.rootContainer.className = this.rootClassName;
|
|
11
13
|
this.rootContainer.tabIndex = -1;
|
|
12
|
-
Misc.Globals.rootElement.appendChild(this.rootContainer);
|
|
14
|
+
((container !== null && container !== void 0 ? container : Misc.Globals.rootElement)).appendChild(this.rootContainer);
|
|
13
15
|
// Create the container for all the modals
|
|
14
|
-
var
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
var modalsContainer = document.createElement("div");
|
|
17
|
+
modalsContainer.className = "modal fade";
|
|
18
|
+
modalsContainer.tabIndex = -1;
|
|
19
|
+
modalsContainer.addEventListener("mousedown", this.onContainerClick.bind(this));
|
|
20
|
+
modalsContainer.addEventListener("keydown", function (key) {
|
|
19
21
|
if (key.key === "Escape") {
|
|
20
22
|
if (_this.modals.length > 0) {
|
|
21
23
|
var lastModel = _this.modals[_this.modals.length - 1];
|
|
@@ -24,24 +26,34 @@ var ModalHelper = /** @class */ (function () {
|
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
28
|
});
|
|
27
|
-
this.modalsContainer =
|
|
28
|
-
this.rootContainer.appendChild(
|
|
29
|
+
this.modalsContainer = modalsContainer;
|
|
30
|
+
this.rootContainer.appendChild(modalsContainer);
|
|
29
31
|
// Create the full screen backdrop
|
|
30
32
|
var backdrop = document.createElement("div");
|
|
31
33
|
backdrop.className = "modal-backdrop fade";
|
|
34
|
+
backdrop.style.display = "none";
|
|
32
35
|
this.modalsBackdrop = backdrop;
|
|
33
36
|
this.rootContainer.appendChild(backdrop);
|
|
34
37
|
}
|
|
35
38
|
Object.defineProperty(ModalHelper, "appInstance", {
|
|
36
39
|
get: function () {
|
|
37
40
|
if (!ModalHelper._instance) {
|
|
38
|
-
ModalHelper.
|
|
41
|
+
throw Error("ModalHelper is not initialised. Make sure your app contains a ModalContainer component.");
|
|
39
42
|
}
|
|
40
43
|
return ModalHelper._instance;
|
|
41
44
|
},
|
|
42
45
|
enumerable: true,
|
|
43
46
|
configurable: true
|
|
44
47
|
});
|
|
48
|
+
ModalHelper.initialise = function (props, container) {
|
|
49
|
+
if (!ModalHelper._instance) {
|
|
50
|
+
ModalHelper._instance = new ModalHelper(props, container);
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
ModalHelper.prototype.updateProps = function (props) {
|
|
54
|
+
var _a;
|
|
55
|
+
this.rootClassName = (_a = props.className, (_a !== null && _a !== void 0 ? _a : ""));
|
|
56
|
+
};
|
|
45
57
|
ModalHelper.prototype.addModal = function (modal, options, onDismiss) {
|
|
46
58
|
modal.className = "modal-container";
|
|
47
59
|
// Create backdrop to prevent interaction with non top-level modals
|
|
@@ -95,7 +107,7 @@ var ModalHelper = /** @class */ (function () {
|
|
|
95
107
|
// If there is only 1 modal, remove the backdrop and top level container.
|
|
96
108
|
this.modalsContainer.classList.remove("show");
|
|
97
109
|
this.modalsBackdrop.classList.remove("show");
|
|
98
|
-
this.rootContainer.className =
|
|
110
|
+
this.rootContainer.className = this.rootClassName;
|
|
99
111
|
document.body.classList.remove("has-modal", "has-modal-scroll-fix");
|
|
100
112
|
if (document.body.scrollHeight > window.innerHeight) {
|
|
101
113
|
// Prevent modal jumping left when showing scrollbar.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModalHelper.js","sourceRoot":"","sources":["../../../src/Components/Modal/ModalHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,eAAe,MAAM,oBAAoB,CAAC;AAGjD,IAAM,iBAAiB,GAAI,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ModalHelper.js","sourceRoot":"","sources":["../../../src/Components/Modal/ModalHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ export declare class Deserialiser {
|
|
|
35
35
|
deserialise(from: object, to: IBindableBase | IBindableBase[], rootType?: new () => IModelBase, options?: IDeserialiseOptions, justCreated?: boolean): void;
|
|
36
36
|
private cleanUp;
|
|
37
37
|
private deserialiseArray;
|
|
38
|
+
private deserialiseDictionary;
|
|
38
39
|
private deserialiseObject;
|
|
39
40
|
}
|
|
40
41
|
export {};
|
|
@@ -10,11 +10,12 @@ var Deserialiser = /** @class */ (function () {
|
|
|
10
10
|
* Called before an object is deserialised. Object tracking should be suspended here. Must return the property info list.
|
|
11
11
|
*/
|
|
12
12
|
Deserialiser.prototype.beginObjectDeserialise = function (object) {
|
|
13
|
+
var _a;
|
|
13
14
|
var neoTypeInfo = object.constructor.neo;
|
|
14
15
|
if (!neoTypeInfo) {
|
|
15
16
|
throw "Tried to deserialise into an object without @NeoModel decorator.";
|
|
16
17
|
}
|
|
17
|
-
var propertyMap = neoTypeInfo.propertyMap;
|
|
18
|
+
var propertyMap = (_a = neoTypeInfo) === null || _a === void 0 ? void 0 : _a.propertyMap;
|
|
18
19
|
if (propertyMap && object.isSuspended !== undefined) {
|
|
19
20
|
object.isSuspended = true;
|
|
20
21
|
this.suspendedObjects.push(object);
|
|
@@ -120,6 +121,21 @@ var Deserialiser = /** @class */ (function () {
|
|
|
120
121
|
list.clearDeletedList();
|
|
121
122
|
}
|
|
122
123
|
};
|
|
124
|
+
Deserialiser.prototype.deserialiseDictionary = function (from, to, parentProperty) {
|
|
125
|
+
for (var key in from) {
|
|
126
|
+
var fromItem = from[key];
|
|
127
|
+
if (fromItem.$ref) {
|
|
128
|
+
to[key] = this.objectRefs[fromItem.$ref].to;
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
var mustCreate = !to[key];
|
|
132
|
+
if (mustCreate) {
|
|
133
|
+
to[key] = parentProperty.createValueInstance();
|
|
134
|
+
}
|
|
135
|
+
this.deserialiseObject(fromItem, to[key], mustCreate);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
};
|
|
123
139
|
Deserialiser.prototype.deserialiseObject = function (from, to, justCreated) {
|
|
124
140
|
if (!from || !to) {
|
|
125
141
|
throw "From and to objects are required.";
|
|
@@ -164,6 +180,12 @@ var Deserialiser = /** @class */ (function () {
|
|
|
164
180
|
to[key] = fromValue;
|
|
165
181
|
}
|
|
166
182
|
}
|
|
183
|
+
else if (propertyInfo.relationType === RelationType.Dictionary) {
|
|
184
|
+
if (!to[key]) {
|
|
185
|
+
to[key] = {};
|
|
186
|
+
}
|
|
187
|
+
this.deserialiseDictionary(fromValue, to[key], propertyInfo);
|
|
188
|
+
}
|
|
167
189
|
else if (fromValue instanceof Object) {
|
|
168
190
|
// Properties of type Parent are ignored. Parent will be set when the item is added to a list.
|
|
169
191
|
if (propertyInfo.relationType !== RelationType.Parent) {
|
|
@@ -173,10 +195,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
173
195
|
else {
|
|
174
196
|
var mustCreate = !to[key];
|
|
175
197
|
if (mustCreate) {
|
|
176
|
-
|
|
177
|
-
throw "Cannot create instance. Make sure the property is decorated with @Attributes.ChildObject.";
|
|
178
|
-
}
|
|
179
|
-
to[key] = new propertyInfo.type();
|
|
198
|
+
to[key] = propertyInfo.createValueInstance();
|
|
180
199
|
}
|
|
181
200
|
this.deserialiseObject(fromValue, to[key], mustCreate);
|
|
182
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":"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"}
|
|
@@ -90,7 +90,7 @@ export declare class PageManager<TCriteria extends ValueObject, TModel extends I
|
|
|
90
90
|
private modelType;
|
|
91
91
|
private dataSource;
|
|
92
92
|
private options;
|
|
93
|
-
constructor(criteria: TCriteria, modelType: new () => TModel, dataSource: (criteria: Model.PartialPlainNonTrackedObject<PageRequest<TCriteria>>) => AxiosPromise<PageResult<Model.PlainObject<TModel
|
|
93
|
+
constructor(criteria: TCriteria, modelType: new () => TModel, dataSource: (criteria: Model.PartialPlainNonTrackedObject<PageRequest<TCriteria>>) => (AxiosPromise<PageResult<Model.PlainObject<TModel>>> | Promise<PageResult<Model.PlainObject<TModel>>>), options?: IPageManagerOptions<TCriteria, TModel>);
|
|
94
94
|
taskRunner: ITaskRunner;
|
|
95
95
|
private hasInitialised;
|
|
96
96
|
private pageRequest;
|
|
@@ -175,16 +175,23 @@ var PageManager = /** @class */ (function (_super) {
|
|
|
175
175
|
return this.refreshData(false, taskRunner);
|
|
176
176
|
};
|
|
177
177
|
PageManager.prototype.fetchAndSetData = function (request) {
|
|
178
|
+
var _a;
|
|
178
179
|
return __awaiter(this, void 0, void 0, function () {
|
|
179
|
-
var response;
|
|
180
|
-
return __generator(this, function (
|
|
181
|
-
switch (
|
|
180
|
+
var response, data;
|
|
181
|
+
return __generator(this, function (_b) {
|
|
182
|
+
switch (_b.label) {
|
|
182
183
|
case 0: return [4 /*yield*/, this.dataSource(request)];
|
|
183
184
|
case 1:
|
|
184
|
-
response =
|
|
185
|
-
|
|
185
|
+
response = _b.sent();
|
|
186
|
+
if ((_a = response.data) === null || _a === void 0 ? void 0 : _a.entityList) {
|
|
187
|
+
data = response.data;
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
data = response;
|
|
191
|
+
}
|
|
192
|
+
return [4 /*yield*/, this.setData(data.entityList, data.total)];
|
|
186
193
|
case 2:
|
|
187
|
-
|
|
194
|
+
_b.sent();
|
|
188
195
|
return [2 /*return*/];
|
|
189
196
|
}
|
|
190
197
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PageManager.js","sourceRoot":"","sources":["../../../src/Data/Paging/PageManager.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAgB,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAuGpC;IAA8F,+BAAoB;IAI9G,qBACI,QAAmB,EACX,SAA2B,EAC3B,
|
|
1
|
+
{"version":3,"file":"PageManager.js","sourceRoot":"","sources":["../../../src/Data/Paging/PageManager.ts"],"names":[],"mappings":"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"}
|
package/dist/Data/Serialiser.js
CHANGED
|
@@ -59,7 +59,8 @@ var Serialiser = /** @class */ (function () {
|
|
|
59
59
|
delete this.objectRefs[id].from.__id;
|
|
60
60
|
}
|
|
61
61
|
};
|
|
62
|
-
Serialiser.prototype.serialiseObject = function (from, to) {
|
|
62
|
+
Serialiser.prototype.serialiseObject = function (from, to, isDictionary) {
|
|
63
|
+
if (isDictionary === void 0) { isDictionary = false; }
|
|
63
64
|
//check that this object hasnt already been serialised.
|
|
64
65
|
if (!from.__id) {
|
|
65
66
|
from.__id = this.currentID++;
|
|
@@ -76,7 +77,7 @@ var Serialiser = /** @class */ (function () {
|
|
|
76
77
|
this.objectRefs[from.__id] = { from: from, to: to };
|
|
77
78
|
}
|
|
78
79
|
//Set tracking state
|
|
79
|
-
if (!this.options.suppressTrackingState) {
|
|
80
|
+
if (!this.options.suppressTrackingState && !isDictionary) {
|
|
80
81
|
if (from.isNew) {
|
|
81
82
|
to.trackingState = TrackingState.Added;
|
|
82
83
|
}
|
|
@@ -89,10 +90,10 @@ var Serialiser = /** @class */ (function () {
|
|
|
89
90
|
to.entityIdentifier = from.entityIdentifier;
|
|
90
91
|
}
|
|
91
92
|
//Loop through serialisable properties
|
|
92
|
-
var propertyMap = from.constructor.neo.propertyMap;
|
|
93
|
+
var propertyMap = isDictionary ? {} : from.constructor.neo.propertyMap;
|
|
93
94
|
for (var key in from) {
|
|
94
95
|
if (from.hasOwnProperty(key) && key.indexOf("__") !== 0) {
|
|
95
|
-
var propertyInfo = propertyMap[key];
|
|
96
|
+
var propertyInfo = isDictionary ? {} : propertyMap[key];
|
|
96
97
|
if (propertyInfo &&
|
|
97
98
|
propertyInfo.serialise !== SerialiseType.Never &&
|
|
98
99
|
propertyInfo.serialise !== SerialiseType.MappingOnly &&
|
|
@@ -112,13 +113,13 @@ var Serialiser = /** @class */ (function () {
|
|
|
112
113
|
// Otherwise serialising a leaf node will serialise up the tree and the entire graph will be serialised.
|
|
113
114
|
}
|
|
114
115
|
else {
|
|
115
|
-
var shouldSerialise = !this.options.suppressChildren || fromValue instanceof ValueObject;
|
|
116
|
+
var shouldSerialise = !this.options.suppressChildren || fromValue instanceof ValueObject || propertyInfo.relationType === RelationType.Dictionary;
|
|
116
117
|
if (fromValue.canSerialise !== undefined) {
|
|
117
118
|
shouldSerialise = fromValue.canSerialise(shouldSerialise);
|
|
118
119
|
}
|
|
119
120
|
if (shouldSerialise) {
|
|
120
121
|
to[key] = {};
|
|
121
|
-
this.serialiseObject(fromValue, to[key]);
|
|
122
|
+
this.serialiseObject(fromValue, to[key], propertyInfo.relationType === RelationType.Dictionary);
|
|
122
123
|
}
|
|
123
124
|
}
|
|
124
125
|
}
|
|
@@ -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,MAAM,eAAe,CAAC;AAE3F,OAAO,EAAE,YAAY,EAAuB,MAAM,gBAAgB,CAAC;AACnE,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,SAAS,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { Model } from "../";
|
|
1
2
|
import { ITimeSpan, TimeSpan } from "./TimeSpan";
|
|
2
3
|
export default class DateUtils {
|
|
3
4
|
static defaultFormatString: string;
|
|
5
|
+
static defaultFormatStringWithTime: string;
|
|
4
6
|
private static token;
|
|
5
7
|
private static timezone;
|
|
6
8
|
private static timezoneClip;
|
|
@@ -9,6 +11,7 @@ export default class DateUtils {
|
|
|
9
11
|
monthNames: string[];
|
|
10
12
|
};
|
|
11
13
|
static format(date: Date, formatString?: string, utc?: boolean): string;
|
|
14
|
+
static format(dateProperty: Model.IPropertyInstance<Date>): string;
|
|
12
15
|
private static pad;
|
|
13
16
|
/**
|
|
14
17
|
* Tries to parse a date from a string using the supplied format string
|
package/dist/Dates/DateUtils.js
CHANGED
|
@@ -1,9 +1,17 @@
|
|
|
1
|
+
import { Misc } from "../";
|
|
1
2
|
import { TimeSpan } from "./TimeSpan";
|
|
2
3
|
var DateUtils = /** @class */ (function () {
|
|
3
4
|
function DateUtils() {
|
|
4
5
|
}
|
|
5
|
-
DateUtils.format = function (
|
|
6
|
+
DateUtils.format = function (dateOrDateProperty, formatString, utc) {
|
|
6
7
|
if (utc === void 0) { utc = false; }
|
|
8
|
+
var _a;
|
|
9
|
+
var date = dateOrDateProperty;
|
|
10
|
+
var dateProperty = dateOrDateProperty;
|
|
11
|
+
if ((_a = dateProperty) === null || _a === void 0 ? void 0 : _a.propertyInfo) {
|
|
12
|
+
date = dateProperty.value;
|
|
13
|
+
formatString = dateProperty.propertyInfo.timeZoneSerialisation === Misc.TimeZoneFormat.None ? DateUtils.defaultFormatString : DateUtils.defaultFormatStringWithTime;
|
|
14
|
+
}
|
|
7
15
|
if (!date)
|
|
8
16
|
return "";
|
|
9
17
|
// Passing date through Date applies Date.parse, if necessary
|
|
@@ -192,6 +200,7 @@ var DateUtils = /** @class */ (function () {
|
|
|
192
200
|
return new TimeSpan(compareDate.getFullYear(), compareDate.getMonth(), compareDate.getDate(), compareDate.getHours(), compareDate.getMinutes(), compareDate.getSeconds(), compareDate.getMilliseconds(), endDate.getTime() - startDate.getTime());
|
|
193
201
|
};
|
|
194
202
|
DateUtils.defaultFormatString = "dd MMM yyyy";
|
|
203
|
+
DateUtils.defaultFormatStringWithTime = "dd MMM yyyy HH:mm";
|
|
195
204
|
DateUtils.token = /d{1,4}|M{1,4}|yy(?:yy)?|([HhmsTt])\1?|[LloSZ]|"[^"]*"|'[^']*'/g;
|
|
196
205
|
DateUtils.timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
|
|
197
206
|
DateUtils.timezoneClip = /[^-+\dA-Z]/g;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateUtils.js","sourceRoot":"","sources":["../../src/Dates/DateUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DateUtils.js","sourceRoot":"","sources":["../../src/Dates/DateUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ModelFieldInfo } from "../ModelFieldInfo";
|
|
2
|
+
import ValueObject from "../ValueObject";
|
|
3
|
+
export declare abstract class CriteriaBase extends ValueObject {
|
|
4
|
+
/**
|
|
5
|
+
* Extra information about lookup fields in this object.
|
|
6
|
+
*/
|
|
7
|
+
fieldInfo: {
|
|
8
|
+
[K in keyof this]?: ModelFieldInfo;
|
|
9
|
+
};
|
|
10
|
+
/**
|
|
11
|
+
* Initialise the fieldInfo dictionary for the passed in properties.
|
|
12
|
+
* This is only necessary if you need to bind to the ModelFieldInfo values.
|
|
13
|
+
* You must also call this.makeObservable(); instead of using the @NeoModel decorator.
|
|
14
|
+
*/
|
|
15
|
+
protected initialiseFieldInfo(fields: (keyof this)[]): void;
|
|
16
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { __decorate, __extends, __metadata } from "tslib";
|
|
2
|
+
import { Dictionary } from "../Decorators";
|
|
3
|
+
import { ModelFieldInfo } from "../ModelFieldInfo";
|
|
4
|
+
import ValueObject from "../ValueObject";
|
|
5
|
+
var CriteriaBase = /** @class */ (function (_super) {
|
|
6
|
+
__extends(CriteriaBase, _super);
|
|
7
|
+
function CriteriaBase() {
|
|
8
|
+
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
9
|
+
/**
|
|
10
|
+
* Extra information about lookup fields in this object.
|
|
11
|
+
*/
|
|
12
|
+
_this.fieldInfo = {};
|
|
13
|
+
return _this;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Initialise the fieldInfo dictionary for the passed in properties.
|
|
17
|
+
* This is only necessary if you need to bind to the ModelFieldInfo values.
|
|
18
|
+
* You must also call this.makeObservable(); instead of using the @NeoModel decorator.
|
|
19
|
+
*/
|
|
20
|
+
CriteriaBase.prototype.initialiseFieldInfo = function (fields) {
|
|
21
|
+
for (var _i = 0, fields_1 = fields; _i < fields_1.length; _i++) {
|
|
22
|
+
var field = fields_1[_i];
|
|
23
|
+
if (!this.fieldInfo[field]) {
|
|
24
|
+
this.fieldInfo[field] = new ModelFieldInfo(this.meta[field].propertyInfo.readableName, "");
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
};
|
|
28
|
+
__decorate([
|
|
29
|
+
Dictionary(ModelFieldInfo),
|
|
30
|
+
__metadata("design:type", Object)
|
|
31
|
+
], CriteriaBase.prototype, "fieldInfo", void 0);
|
|
32
|
+
return CriteriaBase;
|
|
33
|
+
}(ValueObject));
|
|
34
|
+
export { CriteriaBase };
|
|
35
|
+
//# sourceMappingURL=CriteriaBase.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CriteriaBase.js","sourceRoot":"","sources":["../../../src/Model/BaseModels/CriteriaBase.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AAEzC;IAA2C,gCAAW;IAAtD;QAAA,qEAsBC;QApBG;;WAEG;QAEI,eAAS,GAA2C,EAAE,CAAC;;IAgBlE,CAAC;IAdG;;;;OAIG;IACO,0CAAmB,GAA7B,UAA8B,MAAsB;QAEhD,KAAkB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE;YAArB,IAAI,KAAK,eAAA;YACV,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAC1B;gBACI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,KAAmC,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;aAC5H;SACJ;IACL,CAAC;IAfD;QADC,UAAU,CAAC,cAAc,CAAC;;mDACmC;IAgBlE,mBAAC;CAAA,AAtBD,CAA2C,WAAW,GAsBrD;SAtBqB,YAAY"}
|
|
@@ -17,7 +17,9 @@ 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;
|
|
22
|
+
export declare function Dictionary(valueType: any): (type: any, propertyKey: string) => any;
|
|
21
23
|
export declare function Parent(parentType: () => any): (type: any, propertyKey: string) => void;
|
|
22
24
|
/** Registers an onChanged event handler for changes to this property
|
|
23
25
|
* @param requiresOldValue Set to true if this property is not tracked and you need the old value.
|
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;
|
|
@@ -97,10 +99,20 @@ export function ChildObject(childType, isValueObject) {
|
|
|
97
99
|
}
|
|
98
100
|
};
|
|
99
101
|
}
|
|
102
|
+
export function Dictionary(valueType) {
|
|
103
|
+
return function (type, propertyKey) {
|
|
104
|
+
var pi = getOrAddPropertyInfo(type, propertyKey);
|
|
105
|
+
pi.setPropertyType(valueType);
|
|
106
|
+
if (pi.relationType === RelationType.None) {
|
|
107
|
+
pi.relationType = RelationType.Dictionary;
|
|
108
|
+
pi.propertyType = DataType.Object;
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
}
|
|
100
112
|
export function Parent(parentType) {
|
|
101
113
|
return function (type, propertyKey) {
|
|
102
114
|
var pi = getOrAddPropertyInfo(type, propertyKey);
|
|
103
|
-
pi.
|
|
115
|
+
pi.setPropertyType(parentType);
|
|
104
116
|
pi.relationType = RelationType.Parent;
|
|
105
117
|
pi.propertyType = DataType.Object;
|
|
106
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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"}
|
|
@@ -6,8 +6,9 @@ import { ISerialiseOptions } from '../Data/Serialiser';
|
|
|
6
6
|
import { RemoveMethods, Omit } from '../Utils';
|
|
7
7
|
import List from './List';
|
|
8
8
|
import { Misc } from '../';
|
|
9
|
+
export declare type ObservableKeys<T> = RemoveMethods<Omit<T, keyof INonObservableModelBase>>;
|
|
9
10
|
export declare type TransformMetaType<T> = {
|
|
10
|
-
[P in keyof
|
|
11
|
+
[P in keyof ObservableKeys<T>]: IPropertyInstance<T[P]>;
|
|
11
12
|
};
|
|
12
13
|
export interface IMetaItem {
|
|
13
14
|
[index: string]: any;
|
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":"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
|
|
1
|
+
{"version":3,"file":"List.js","sourceRoot":"","sources":["../../src/Model/List.ts"],"names":[],"mappings":"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"}
|
package/dist/Model/Misc.d.ts
CHANGED
package/dist/Model/Misc.js
CHANGED
|
@@ -28,6 +28,7 @@ export var RelationType;
|
|
|
28
28
|
RelationType[RelationType["ChildList"] = 2] = "ChildList";
|
|
29
29
|
RelationType[RelationType["Parent"] = 3] = "Parent";
|
|
30
30
|
RelationType[RelationType["ValueObject"] = 4] = "ValueObject";
|
|
31
|
+
RelationType[RelationType["Dictionary"] = 5] = "Dictionary";
|
|
31
32
|
})(RelationType || (RelationType = {}));
|
|
32
33
|
export var DataType;
|
|
33
34
|
(function (DataType) {
|
package/dist/Model/Misc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Misc.js","sourceRoot":"","sources":["../../src/Model/Misc.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,aAmBX;AAnBD,WAAY,aAAa;IAErB,wDAAwD;IACxD,qDAAM,CAAA;IAEN;;;MAGE;IACF,yDAAQ,CAAA;IAER,8DAA8D;IAC9D,uDAAO,CAAA;IAEP,4DAA4D;IAC5D,+DAAW,CAAA;IAEX,uDAAuD;IACvD,mDAAK,CAAA;AACT,CAAC,EAnBW,aAAa,KAAb,aAAa,QAmBxB;AAED,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,4CAA4C;IAC5C,iDAAO,CAAA;IACP,sDAAsD;IACtD,mDAAQ,CAAA;AACZ,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAED,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"Misc.js","sourceRoot":"","sources":["../../src/Model/Misc.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,aAmBX;AAnBD,WAAY,aAAa;IAErB,wDAAwD;IACxD,qDAAM,CAAA;IAEN;;;MAGE;IACF,yDAAQ,CAAA;IAER,8DAA8D;IAC9D,uDAAO,CAAA;IAEP,4DAA4D;IAC5D,+DAAW,CAAA;IAEX,uDAAuD;IACvD,mDAAK,CAAA;AACT,CAAC,EAnBW,aAAa,KAAb,aAAa,QAmBxB;AAED,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,4CAA4C;IAC5C,iDAAO,CAAA;IACP,sDAAsD;IACtD,mDAAQ,CAAA;AACZ,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAED,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACpB,+CAAQ,CAAA;IACR,6DAAe,CAAA;IACf,yDAAa,CAAA;IACb,mDAAU,CAAA;IACV,6DAAe,CAAA;IACf,2DAAc,CAAA;AAClB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,CAAN,IAAY,QAQX;AARD,WAAY,QAAQ;IAChB,2CAAU,CAAA;IACV,qCAAO,CAAA;IACP,yCAAS,CAAA;IACT,uCAAQ,CAAA;IACR,2CAAU,CAAA;IACV,yCAAS,CAAA;IACT,6DAAmB,CAAA;AACvB,CAAC,EARW,QAAQ,KAAR,QAAQ,QAQnB;AAED;IACI,0BACW,WAAmD,EACnD,gBAAyB,EACzB,OAAe;QAFf,gBAAW,GAAX,WAAW,CAAwC;QACnD,qBAAgB,GAAhB,gBAAgB,CAAS;QACzB,YAAO,GAAP,OAAO,CAAQ;IACvB,CAAC;IACR,uBAAC;AAAD,CAAC,AAND,IAMC;;AAED,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACrB,2DAAa,CAAA;IACb,mDAAS,CAAA;IACT,yDAAY,CAAA;IACZ,uDAAW,CAAA;AACf,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB"}
|
|
@@ -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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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import ValueObject from "./ValueObject";
|
|
2
|
+
export declare class ModelFieldInfo extends ValueObject {
|
|
3
|
+
constructor(displayName: string, valueString: string);
|
|
4
|
+
/**
|
|
5
|
+
* Display name for the field.
|
|
6
|
+
*/
|
|
7
|
+
displayName: string;
|
|
8
|
+
/**
|
|
9
|
+
* Lookup of the field value
|
|
10
|
+
*/
|
|
11
|
+
valueString: string;
|
|
12
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { __decorate, __extends, __metadata } from "tslib";
|
|
2
|
+
import ValueObject from "./ValueObject";
|
|
3
|
+
import NeoModel from './NeoModel';
|
|
4
|
+
var ModelFieldInfo = /** @class */ (function (_super) {
|
|
5
|
+
__extends(ModelFieldInfo, _super);
|
|
6
|
+
function ModelFieldInfo(displayName, valueString) {
|
|
7
|
+
var _this = _super.call(this) || this;
|
|
8
|
+
/**
|
|
9
|
+
* Display name for the field.
|
|
10
|
+
*/
|
|
11
|
+
_this.displayName = "";
|
|
12
|
+
/**
|
|
13
|
+
* Lookup of the field value
|
|
14
|
+
*/
|
|
15
|
+
_this.valueString = "";
|
|
16
|
+
_this.displayName = displayName;
|
|
17
|
+
_this.valueString = valueString;
|
|
18
|
+
return _this;
|
|
19
|
+
}
|
|
20
|
+
ModelFieldInfo = __decorate([
|
|
21
|
+
NeoModel,
|
|
22
|
+
__metadata("design:paramtypes", [String, String])
|
|
23
|
+
], ModelFieldInfo);
|
|
24
|
+
return ModelFieldInfo;
|
|
25
|
+
}(ValueObject));
|
|
26
|
+
export { ModelFieldInfo };
|
|
27
|
+
//# sourceMappingURL=ModelFieldInfo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ModelFieldInfo.js","sourceRoot":"","sources":["../../src/Model/ModelFieldInfo.ts"],"names":[],"mappings":";AAAA,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,QAAQ,MAAM,YAAY,CAAC;AAGlC;IAAoC,kCAAW;IAE3C,wBAAa,WAAmB,EAAE,WAAmB;QAArD,YACI,iBAAO,SAIV;QAED;;WAEG;QACI,iBAAW,GAAW,EAAE,CAAC;QAEhC;;WAEG;QACI,iBAAW,GAAW,EAAE,CAAC;QAZ5B,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;;IACnC,CAAC;IAPQ,cAAc;QAD1B,QAAQ;;OACI,cAAc,CAkB1B;IAAD,qBAAC;CAAA,AAlBD,CAAoC,WAAW,GAkB9C;SAlBY,cAAc"}
|
|
@@ -17,7 +17,7 @@ var NeoTypeInfo = /** @class */ (function () {
|
|
|
17
17
|
this.properties = [];
|
|
18
18
|
// Property info dictionary for easy lookup.
|
|
19
19
|
this.propertyMap = {};
|
|
20
|
-
// Properties of type List<T>, or marked with the
|
|
20
|
+
// Properties of type List<T>, or marked with the ChildList or ChildObject decorator.
|
|
21
21
|
this.children = [];
|
|
22
22
|
// Properties marked with the parent decorator, multiple if a class can be child of more than one type.
|
|
23
23
|
this.parentProperties = [];
|
|
@@ -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":";AAAA,OAAO,EAAQ,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,gBAAyC,MAAM,oBAAoB,CAAC;AAC3E,OAAO,YAA0D,MAAM,gBAAgB,CAAC;AACxF,OAAO,OAAO,MAAM,YAAY,CAAC;AAGjC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,QAAQ,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,IAAM,oBAAoB,GAAG,CAAC,OAAO,CAAC,CAAC;AACvC,IAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEhD;IAAA;QAIY,0BAAqB,GAAG,KAAK,CAAC;QAC9B,uBAAkB,GAAG,KAAK,CAAC;QAGnC,gDAAgD;QACzC,eAAU,GAAoB,EAAE,CAAC;QAExC,4CAA4C;QACrC,gBAAW,GAAqB,EAAE,CAAC;QAE1C,
|
|
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":"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"}
|
package/dist/Model/index.d.ts
CHANGED
|
@@ -4,9 +4,11 @@ export { IPropertyInstance, PropertyAccessor } from './PropertyInstance';
|
|
|
4
4
|
export { IObservableValue, ObservableValue } from './ObservableValue';
|
|
5
5
|
export { ObservableProperty } from './ObservableProperty';
|
|
6
6
|
export { ISelectedItem } from './Misc';
|
|
7
|
+
export { ModelFieldInfo } from './ModelFieldInfo';
|
|
7
8
|
import * as GraphTraverser from './ModelGraphTraverser';
|
|
8
9
|
export { GraphTraverser };
|
|
9
10
|
export { AuditValues, AuditValuesBase } from './BaseModels/AuditValues';
|
|
10
11
|
export { FileDescriptorBase } from './BaseModels/FileDescriptorBase';
|
|
11
12
|
export { ReasonedUserEvent } from './BaseModels/ReasonedUserEvent';
|
|
12
13
|
export { UserEventBase, UserEvent } from './BaseModels/UserEvent';
|
|
14
|
+
export { CriteriaBase } from './BaseModels/CriteriaBase';
|
package/dist/Model/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { PropertyAccessor } from './PropertyInstance';
|
|
2
2
|
export { ObservableValue } from './ObservableValue';
|
|
3
3
|
export { ObservableProperty } from './ObservableProperty';
|
|
4
|
+
export { ModelFieldInfo } from './ModelFieldInfo';
|
|
4
5
|
import * as GraphTraverser from './ModelGraphTraverser';
|
|
5
6
|
export { GraphTraverser };
|
|
6
7
|
// Base Models
|
|
@@ -8,4 +9,5 @@ export { AuditValues, AuditValuesBase } from './BaseModels/AuditValues';
|
|
|
8
9
|
export { FileDescriptorBase } from './BaseModels/FileDescriptorBase';
|
|
9
10
|
export { ReasonedUserEvent } from './BaseModels/ReasonedUserEvent';
|
|
10
11
|
export { UserEventBase, UserEvent } from './BaseModels/UserEvent';
|
|
12
|
+
export { CriteriaBase } from './BaseModels/CriteriaBase';
|
|
11
13
|
//# sourceMappingURL=index.js.map
|
package/dist/Model/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Model/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,EAAoB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,cAAc,EAAE,CAAA;AAEzB,cAAc;AACd,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Model/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACxE,OAAO,EAAoB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,cAAc,MAAM,uBAAuB,CAAA;AAEvD,OAAO,EAAE,cAAc,EAAE,CAAA;AAEzB,cAAc;AACd,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC"}
|
package/dist/Security/index.d.ts
CHANGED
|
@@ -7,3 +7,4 @@ export { default as IAuthorisationService } from './IAuthorisationService';
|
|
|
7
7
|
export { IUserRole } from './IUserRole';
|
|
8
8
|
export { ILoginErrorHandler } from './ILoginErrorHandler';
|
|
9
9
|
export { NeoLoginErrorHandler } from './LoginErrorHandler';
|
|
10
|
+
export { default as IAuthenticationService } from './IAuthenticationService';
|
|
@@ -46,7 +46,7 @@ export declare class HubBase implements IHubBase {
|
|
|
46
46
|
* @param options Hub options.
|
|
47
47
|
* @param authenticationService Optional auth service if you don't want it to get from DI.
|
|
48
48
|
*/
|
|
49
|
-
constructor(url: string, options?: Partial<IHubOptions>, configModel?: AppServices.IConfigModel, authenticationService?: import("../Security
|
|
49
|
+
constructor(url: string, options?: Partial<IHubOptions>, configModel?: AppServices.IConfigModel, authenticationService?: import("../Security").IAuthenticationService);
|
|
50
50
|
readonly onDisconnected: IHubReceiver<Error | undefined>;
|
|
51
51
|
readonly onConnected: IHubReceiver<boolean>;
|
|
52
52
|
get connectionState(): ConnectionState;
|