@singularsystems/neo-core 0.10.32 → 0.10.33
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/FileUtils.js +4 -0
- package/dist/FileUtils.js.map +1 -1
- package/dist/Model/NeoTypeInfo.js +4 -1
- package/dist/Model/NeoTypeInfo.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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"}
|
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"}
|
|
@@ -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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"}
|
|
@@ -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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"}
|