@futdevpro/fsm-dynamo 1.10.15 → 1.10.16
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/.github/workflows/main.yml +1 -2
- package/build/_collections/utils/stack.util.d.ts +7 -0
- package/build/_collections/utils/stack.util.d.ts.map +1 -0
- package/build/_collections/utils/stack.util.js +31 -0
- package/build/_collections/utils/stack.util.js.map +1 -0
- package/build/_models/control-models/data-model-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/data-model-params.control-model.js +29 -15
- package/build/_models/control-models/data-model-params.control-model.js.map +1 -1
- package/build/_models/control-models/data-model-params.control-model.spec.js +3 -3
- package/build/_models/control-models/data-model-params.control-model.spec.js.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.d.ts +1 -2
- package/build/_models/control-models/data-property-params.control-model.d.ts.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.js +14 -8
- package/build/_models/control-models/data-property-params.control-model.js.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.spec.js +3 -16
- package/build/_models/control-models/data-property-params.control-model.spec.js.map +1 -1
- package/build/_models/control-models/poll.control-model.d.ts +25 -16
- package/build/_models/control-models/poll.control-model.d.ts.map +1 -1
- package/build/_models/control-models/poll.control-model.js +40 -14
- package/build/_models/control-models/poll.control-model.js.map +1 -1
- package/build/_modules/socket/_models/sck-client-params.control-model.d.ts.map +1 -1
- package/build/_modules/socket/_models/sck-client-params.control-model.js +6 -2
- package/build/_modules/socket/_models/sck-client-params.control-model.js.map +1 -1
- package/build/_modules/socket/_models/sck-client-params.control-model.spec.js +1 -1
- package/build/_modules/socket/_models/sck-socket-event.control-model.d.ts +1 -0
- package/build/_modules/socket/_models/sck-socket-event.control-model.d.ts.map +1 -1
- package/build/_modules/socket/_models/sck-socket-event.control-model.js +3 -0
- package/build/_modules/socket/_models/sck-socket-event.control-model.js.map +1 -1
- package/build/_modules/socket/_services/sck-client.service-base.d.ts +1 -0
- package/build/_modules/socket/_services/sck-client.service-base.d.ts.map +1 -1
- package/build/_modules/socket/_services/sck-client.service-base.js +26 -5
- package/build/_modules/socket/_services/sck-client.service-base.js.map +1 -1
- package/build/_modules/test/_collections/tst-module-settings.const.d.ts +14 -8
- package/build/_modules/test/_collections/tst-module-settings.const.d.ts.map +1 -1
- package/build/_modules/test/_collections/tst-module-settings.const.js +11 -8
- package/build/_modules/test/_collections/tst-module-settings.const.js.map +1 -1
- package/build/index.d.ts +2 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +2 -0
- package/build/index.js.map +1 -1
- package/futdevpro-fsm-dynamo-01.10.16.tgz +0 -0
- package/package.json +1 -1
- package/src/_collections/utils/stack.util.ts +33 -0
- package/src/_models/control-models/data-model-params.control-model.spec.ts +3 -4
- package/src/_models/control-models/data-model-params.control-model.ts +21 -5
- package/src/_models/control-models/data-property-params.control-model.spec.ts +3 -23
- package/src/_models/control-models/data-property-params.control-model.ts +22 -13
- package/src/_models/control-models/poll.control-model.ts +47 -29
- package/src/_modules/socket/_models/sck-client-params.control-model.spec.ts +1 -1
- package/src/_modules/socket/_models/sck-client-params.control-model.ts +13 -2
- package/src/_modules/socket/_models/sck-socket-event.control-model.ts +5 -0
- package/src/_modules/socket/_services/sck-client.service-base.ts +29 -5
- package/src/_modules/test/_collections/tst-module-settings.const.ts +15 -9
- package/src/index.ts +2 -0
- package/futdevpro-fsm-dynamo-01.10.15.tgz +0 -0
|
@@ -4,6 +4,7 @@ exports.DyFM_SocketEvent = void 0;
|
|
|
4
4
|
const global_settings_const_1 = require("../../../_collections/constants/global-settings.const");
|
|
5
5
|
const array_util_1 = require("../../../_collections/utils/array.util");
|
|
6
6
|
const log_util_1 = require("../../../_collections/utils/log.util");
|
|
7
|
+
const stack_util_1 = require("../../../_collections/utils/stack.util");
|
|
7
8
|
const sck_event_key_enum_1 = require("../_enums/sck-event-key.enum");
|
|
8
9
|
/**
|
|
9
10
|
* socket handling and clarification is under development
|
|
@@ -16,6 +17,7 @@ class DyFM_SocketEvent {
|
|
|
16
17
|
tasks;
|
|
17
18
|
logEvent;
|
|
18
19
|
logEventContent;
|
|
20
|
+
stackLocation;
|
|
19
21
|
constructor(set) {
|
|
20
22
|
try {
|
|
21
23
|
this.name = set.name ?? set.eventKey;
|
|
@@ -23,6 +25,7 @@ class DyFM_SocketEvent {
|
|
|
23
25
|
this.serviceName = set.serviceName ?? 'UnknownSocketService';
|
|
24
26
|
this.preProcesses = set.preProcesses ?? [];
|
|
25
27
|
this.tasks = set.tasks ?? [];
|
|
28
|
+
this.stackLocation = (0, stack_util_1.DyFM_getStackLocation)();
|
|
26
29
|
if (set.logEvent !== undefined) {
|
|
27
30
|
this.logEvent = set.logEvent;
|
|
28
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-socket-event.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.ts"],"names":[],"mappings":";;;AACA,iGAA6F;AAC7F,uEAAoE;AACpE,mEAAgE;
|
|
1
|
+
{"version":3,"file":"sck-socket-event.control-model.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_models/sck-socket-event.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ export declare abstract class DyFM_SocketClient_ServiceBase<T_SubscriptionConten
|
|
|
31
31
|
private setupDefaultEvents;
|
|
32
32
|
private setupSocketEvents;
|
|
33
33
|
private connectSocket;
|
|
34
|
+
private tryingToReconnect;
|
|
34
35
|
private tryReconnectIfNeeded;
|
|
35
36
|
/**
|
|
36
37
|
* You must setup params for the service in this function
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-client.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"sck-client.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAWvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,8BAAsB,6BAA6B,CAAC,qBAAqB,GAAG,GAAG;IAE7E,OAAO,CAAC,OAAO,CAA2B;IAC1C,SAAS,KAAK,MAAM,IAAI,wBAAwB,CAE/C;IACD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC;IAExC,SAAS,CAAC,cAAc,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;IAElD,SAAS,CAAC,aAAa,EAAE,eAAe,CAAC,OAAO,CAAC,CAAuC;IACxF,IAAI,SAAS,IAAI,OAAO,CAEvB;IACD,QAAQ,CAAC,UAAU,qCAAqC;IAExD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiE;IAChG,IAAI,UAAU,IAAI,OAAO,CAExB;IACD,QAAQ,CAAC,WAAW,qCAAsC;IAE1D,SAAS,CAAC,QAAQ,EAAE,OAAO,CAA2C;IACtE,SAAS,CAAC,KAAK,EAAE,OAAO,CAA+C;IAEvE,OAAO,CAAC,QAAQ,CAAC,aAAa,CA8D5B;IAEF,SAAS;IAoBT,sBAAsB,EAAE,OAAO,CAAS;IAClC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC;;;;OAIG;cACa,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;YAc3D,gBAAgB;YA8BhB,kBAAkB;YA0BlB,iBAAiB;YA4BjB,aAAa;IAsB3B,OAAO,CAAC,iBAAiB,CAAkB;YAC7B,oBAAoB;IAiClC;;OAEG;IACH,QAAQ,CAAC,SAAS,IAAI,wBAAwB;IAE9C;;OAEG;IACH,QAAQ,CAAC,iBAAiB,IAAI,gBAAgB,CAAC,GAAG,CAAC,EAAE;IAErD;;OAEG;IACH,QAAQ,CAAC,sBAAsB,IAAI,OAAO,CAAC,qBAAqB,CAAC;CAClE"}
|
|
@@ -3,25 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DyFM_SocketClient_ServiceBase = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const SocketIOClient = tslib_1.__importStar(require("socket.io-client"));
|
|
6
|
+
const rxjs_1 = require("rxjs");
|
|
6
7
|
const global_settings_const_1 = require("../../../_collections/constants/global-settings.const");
|
|
7
8
|
const array_util_1 = require("../../../_collections/utils/array.util");
|
|
8
9
|
const log_util_1 = require("../../../_collections/utils/log.util");
|
|
9
10
|
const utilities_util_1 = require("../../../_collections/utils/utilities.util");
|
|
10
11
|
const error_control_model_1 = require("../../../_models/control-models/error.control-model");
|
|
11
|
-
const rxjs_1 = require("rxjs");
|
|
12
12
|
const sck_event_key_enum_1 = require("../_enums/sck-event-key.enum");
|
|
13
13
|
const sck_socket_event_control_model_1 = require("../_models/sck-socket-event.control-model");
|
|
14
14
|
class DyFM_SocketClient_ServiceBase {
|
|
15
15
|
_params;
|
|
16
|
-
get params() {
|
|
17
|
-
|
|
16
|
+
get params() {
|
|
17
|
+
return this._params;
|
|
18
|
+
}
|
|
19
|
+
get name() {
|
|
20
|
+
return this.params.name;
|
|
21
|
+
}
|
|
18
22
|
socket;
|
|
19
23
|
incomingEvents;
|
|
20
24
|
_connected_BS = new rxjs_1.BehaviorSubject(false);
|
|
21
|
-
get connected() {
|
|
25
|
+
get connected() {
|
|
26
|
+
return this._connected_BS.value;
|
|
27
|
+
}
|
|
22
28
|
connected$ = this._connected_BS.asObservable();
|
|
23
29
|
_subscribed_BS = new rxjs_1.BehaviorSubject(false);
|
|
24
|
-
get subscribed() {
|
|
30
|
+
get subscribed() {
|
|
31
|
+
return this._subscribed_BS.value;
|
|
32
|
+
}
|
|
25
33
|
subscribed$ = this._subscribed_BS.asObservable();
|
|
26
34
|
debugLog = global_settings_const_1.DyFM_global_settings.log_settings.setup;
|
|
27
35
|
logFn = global_settings_const_1.DyFM_global_settings.log_settings.functions;
|
|
@@ -222,18 +230,31 @@ class DyFM_SocketClient_ServiceBase {
|
|
|
222
230
|
throw error;
|
|
223
231
|
}
|
|
224
232
|
}
|
|
233
|
+
tryingToReconnect = false;
|
|
225
234
|
async tryReconnectIfNeeded() {
|
|
226
235
|
try {
|
|
236
|
+
console.log('tryReconnectIfNeeded', this._params.reconnectDelay);
|
|
237
|
+
if (this.tryingToReconnect) {
|
|
238
|
+
log_util_1.DyFM_Log.warn(`socket-client(${this.params.name}) already trying to reconnect!`);
|
|
239
|
+
return;
|
|
240
|
+
}
|
|
241
|
+
if (!this.params.reconnect) {
|
|
242
|
+
log_util_1.DyFM_Log.warn(`socket-client(${this.params.name}) Dynamo reconnection is disabled!`);
|
|
243
|
+
return;
|
|
244
|
+
}
|
|
245
|
+
this.tryingToReconnect = true;
|
|
227
246
|
if (this.logFn)
|
|
228
247
|
console.log(`\nFn:. tryReconnectIfNeeded`);
|
|
229
248
|
await (0, utilities_util_1.DyFM_delay)(this._params.reconnectDelay);
|
|
230
249
|
if (!this.connected) {
|
|
250
|
+
this.tryingToReconnect = false;
|
|
231
251
|
await this.connectSocket();
|
|
232
252
|
}
|
|
233
253
|
}
|
|
234
254
|
catch (error) {
|
|
235
255
|
log_util_1.DyFM_Log.error(`socket-client(${this.params.name}) Service Try Reconnect failed, ` +
|
|
236
256
|
`ERROR:`, error);
|
|
257
|
+
this.tryingToReconnect = false;
|
|
237
258
|
throw error;
|
|
238
259
|
}
|
|
239
260
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sck-client.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.ts"],"names":[],"mappings":";;;;AACA,yEAAmD;
|
|
1
|
+
{"version":3,"file":"sck-client.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/socket/_services/sck-client.service-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,21 +1,27 @@
|
|
|
1
1
|
import { DyFM_EndpointTypesContainer, DyFM_ServiceEndpointTypesSettings } from '../../../_models/control-models/service-endpoint-settings-base.control-model';
|
|
2
2
|
import { DyFM_Route_Settings } from '../../../_models/interfaces/route-settings.interface';
|
|
3
3
|
export declare enum DyFM_TestRoute {
|
|
4
|
-
testGet = "
|
|
5
|
-
testPost = "
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
testGet = "test-get",
|
|
5
|
+
testPost = "test-post",
|
|
6
|
+
testPut = "test-put",
|
|
7
|
+
testPatch = "test-patch",
|
|
8
|
+
testDelete = "test-delete",
|
|
9
|
+
getServerStatus = "get-server-status"
|
|
8
10
|
}
|
|
9
11
|
export declare const DyFM_testModule_settings: DyFM_Route_Settings<DyFM_TestRoute>;
|
|
10
12
|
export declare const DyFM_fullTestRoute: {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
"test-get": string;
|
|
14
|
+
"test-post": string;
|
|
15
|
+
"test-put": string;
|
|
16
|
+
"test-patch": string;
|
|
17
|
+
"test-delete": string;
|
|
18
|
+
"get-server-status": string;
|
|
15
19
|
};
|
|
16
20
|
export interface DyFM_Test_EndpointTypeSettings extends DyFM_ServiceEndpointTypesSettings {
|
|
17
21
|
[DyFM_TestRoute.testGet]: DyFM_EndpointTypesContainer<DyFM_Test_Result>;
|
|
18
22
|
[DyFM_TestRoute.testPost]: DyFM_EndpointTypesContainer<DyFM_Test_Result, any, any>;
|
|
23
|
+
[DyFM_TestRoute.testPut]: DyFM_EndpointTypesContainer<DyFM_Test_Result, any, any>;
|
|
24
|
+
[DyFM_TestRoute.testPatch]: DyFM_EndpointTypesContainer<DyFM_Test_Result, any, any>;
|
|
19
25
|
[DyFM_TestRoute.testDelete]: DyFM_EndpointTypesContainer<DyFM_Test_Result>;
|
|
20
26
|
[DyFM_TestRoute.getServerStatus]: DyFM_EndpointTypesContainer<{
|
|
21
27
|
status: 'ready';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tst-module-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tst-module-settings.const.d.ts","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,iCAAiC,EAClC,MAAM,8EAA8E,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,sDAAsD,CAAC;AAE3F,oBAAY,cAAc;IACxB,OAAO,aAAa;IACpB,QAAQ,cAAc;IACtB,OAAO,aAAa;IACpB,SAAS,eAAe;IACxB,UAAU,gBAAgB;IAC1B,eAAe,sBAAsB;CACtC;AAED,eAAO,MAAM,wBAAwB,EAAE,mBAAmB,CAAC,cAAc,CAOxE,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;CAa9B,CAAC;AAEF,MAAM,WAAW,8BAA+B,SAAQ,iCAAiC;IACvF,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IACxE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACnF,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAClF,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACpF,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;IAC3E,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,2BAA2B,CAAC;QAC5D,MAAM,EAAE,OAAO,CAAC;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;CACJ;AAED,UAAU,gBAAgB;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,GAAG,CAAC;CACd"}
|
|
@@ -3,18 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.DyFM_fullTestRoute = exports.DyFM_testModule_settings = exports.DyFM_TestRoute = void 0;
|
|
4
4
|
var DyFM_TestRoute;
|
|
5
5
|
(function (DyFM_TestRoute) {
|
|
6
|
-
DyFM_TestRoute["testGet"] = "
|
|
7
|
-
DyFM_TestRoute["testPost"] = "
|
|
8
|
-
DyFM_TestRoute["
|
|
9
|
-
DyFM_TestRoute["
|
|
6
|
+
DyFM_TestRoute["testGet"] = "test-get";
|
|
7
|
+
DyFM_TestRoute["testPost"] = "test-post";
|
|
8
|
+
DyFM_TestRoute["testPut"] = "test-put";
|
|
9
|
+
DyFM_TestRoute["testPatch"] = "test-patch";
|
|
10
|
+
DyFM_TestRoute["testDelete"] = "test-delete";
|
|
11
|
+
DyFM_TestRoute["getServerStatus"] = "get-server-status";
|
|
10
12
|
})(DyFM_TestRoute || (exports.DyFM_TestRoute = DyFM_TestRoute = {}));
|
|
11
13
|
exports.DyFM_testModule_settings = {
|
|
12
14
|
mainRoute: '/test',
|
|
13
15
|
endPoints: {
|
|
14
|
-
|
|
15
|
-
[DyFM_TestRoute.testPost]: '/test-post',
|
|
16
|
-
[DyFM_TestRoute.testDelete]: '/test-delete',
|
|
17
|
-
[DyFM_TestRoute.getServerStatus]: '/server-status',
|
|
16
|
+
...Object.fromEntries(Object.values(DyFM_TestRoute).map((route) => [route, `/${route}`])),
|
|
18
17
|
},
|
|
19
18
|
};
|
|
20
19
|
exports.DyFM_fullTestRoute = {
|
|
@@ -22,6 +21,10 @@ exports.DyFM_fullTestRoute = {
|
|
|
22
21
|
exports.DyFM_testModule_settings.endPoints[DyFM_TestRoute.testGet],
|
|
23
22
|
[DyFM_TestRoute.testPost]: exports.DyFM_testModule_settings.mainRoute +
|
|
24
23
|
exports.DyFM_testModule_settings.endPoints[DyFM_TestRoute.testPost],
|
|
24
|
+
[DyFM_TestRoute.testPut]: exports.DyFM_testModule_settings.mainRoute +
|
|
25
|
+
exports.DyFM_testModule_settings.endPoints[DyFM_TestRoute.testPut],
|
|
26
|
+
[DyFM_TestRoute.testPatch]: exports.DyFM_testModule_settings.mainRoute +
|
|
27
|
+
exports.DyFM_testModule_settings.endPoints[DyFM_TestRoute.testPatch],
|
|
25
28
|
[DyFM_TestRoute.testDelete]: exports.DyFM_testModule_settings.mainRoute +
|
|
26
29
|
exports.DyFM_testModule_settings.endPoints[DyFM_TestRoute.testDelete],
|
|
27
30
|
[DyFM_TestRoute.getServerStatus]: exports.DyFM_testModule_settings.mainRoute +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tst-module-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"tst-module-settings.const.js","sourceRoot":"","sources":["../../../../src/_modules/test/_collections/tst-module-settings.const.ts"],"names":[],"mappings":";;;AAMA,IAAY,cAOX;AAPD,WAAY,cAAc;IACxB,sCAAoB,CAAA;IACpB,wCAAsB,CAAA;IACtB,sCAAoB,CAAA;IACpB,0CAAwB,CAAA;IACxB,4CAA0B,CAAA;IAC1B,uDAAqC,CAAA;AACvC,CAAC,EAPW,cAAc,8BAAd,cAAc,QAOzB;AAEY,QAAA,wBAAwB,GAAwC;IAC3E,SAAS,EAAE,OAAO;IAClB,SAAS,EAAE;QACT,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC,CACnE;KACF;CACF,CAAC;AAEW,QAAA,kBAAkB,GAAG;IAChC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC1D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC;IAC5D,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC3D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC;IAC7D,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC1D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC;IAC5D,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC5D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC;IAC9D,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAC7D,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;IAC/D,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,gCAAwB,CAAC,SAAS;QAClE,gCAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,eAAe,CAAC;CACrE,CAAC"}
|
package/build/index.d.ts
CHANGED
|
@@ -6,6 +6,8 @@ export * from './_collections/utils/array.util';
|
|
|
6
6
|
export * from './_collections/utils/log.util';
|
|
7
7
|
export * from './_collections/utils/round-list.util';
|
|
8
8
|
export * from './_collections/utils/shared.util';
|
|
9
|
+
export * from './_collections/utils/stack.util';
|
|
10
|
+
export * from './_collections/utils/string.util';
|
|
9
11
|
export * from './_collections/utils/time.util';
|
|
10
12
|
export * from './_collections/utils/type-cloning-facility.util';
|
|
11
13
|
export * from './_collections/utils/utilities.util';
|
package/build/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AAGrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iDAAiD,CAAC;AAChE,cAAc,qCAAqC,CAAC;AACpD,cAAc,gCAAgC,CAAC;AAG/C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,wCAAwC,CAAC;AAGvD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,gDAAgD,CAAC;AAI/D,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,yBAAyB,CAAC;AAGxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AAKjD,cAAc,0DAA0D,CAAC;AACzE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,8CAA8C,CAAC;AAC7D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,oDAAoD,CAAC;AACnE,cAAc,uEAAuE,CAAC;AAGtF,cAAc,2CAA2C,CAAC;AAG1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,sCAAsC,CAAC;AACrD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,wCAAwC,CAAC;AAGvD,cAAc,gEAAgE,CAAC;AAC/E,cAAc,4DAA4D,CAAC;AAG3E,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,+CAA+C,CAAC;AAC9D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AAGrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAChD,cAAc,kCAAkC,CAAC;AACjD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,iDAAiD,CAAC;AAChE,cAAc,qCAAqC,CAAC;AACpD,cAAc,gCAAgC,CAAC;AAG/C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,6CAA6C,CAAC;AAC5D,cAAc,wCAAwC,CAAC;AAGvD,cAAc,gDAAgD,CAAC;AAC/D,cAAc,uCAAuC,CAAC;AACtD,cAAc,gDAAgD,CAAC;AAI/D,cAAc,mCAAmC,CAAC;AAClD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kCAAkC,CAAC;AACjD,cAAc,yBAAyB,CAAC;AAGxC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,kCAAkC,CAAC;AAKjD,cAAc,0DAA0D,CAAC;AACzE,cAAc,6DAA6D,CAAC;AAC5E,cAAc,8CAA8C,CAAC;AAC7D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,oDAAoD,CAAC;AACnE,cAAc,uEAAuE,CAAC;AAGtF,cAAc,2CAA2C,CAAC;AAG1D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,sCAAsC,CAAC;AACrD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,wCAAwC,CAAC;AAGvD,cAAc,gEAAgE,CAAC;AAC/E,cAAc,4DAA4D,CAAC;AAG3E,cAAc,gCAAgC,CAAC;AAC/C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,+BAA+B,CAAC"}
|
package/build/index.js
CHANGED
|
@@ -12,6 +12,8 @@ tslib_1.__exportStar(require("./_collections/utils/array.util"), exports);
|
|
|
12
12
|
tslib_1.__exportStar(require("./_collections/utils/log.util"), exports);
|
|
13
13
|
tslib_1.__exportStar(require("./_collections/utils/round-list.util"), exports);
|
|
14
14
|
tslib_1.__exportStar(require("./_collections/utils/shared.util"), exports);
|
|
15
|
+
tslib_1.__exportStar(require("./_collections/utils/stack.util"), exports);
|
|
16
|
+
tslib_1.__exportStar(require("./_collections/utils/string.util"), exports);
|
|
15
17
|
tslib_1.__exportStar(require("./_collections/utils/time.util"), exports);
|
|
16
18
|
tslib_1.__exportStar(require("./_collections/utils/type-cloning-facility.util"), exports);
|
|
17
19
|
tslib_1.__exportStar(require("./_collections/utils/utilities.util"), exports);
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,cAAc;AACd,wBAAwB;AACxB,wFAA8D;AAC9D,yFAA+D;AAC/D,iFAAuD;AACvD,+EAAqD;AAErD,oBAAoB;AACpB,0EAAgD;AAChD,wEAA8C;AAC9C,+EAAqD;AACrD,2EAAiD;AACjD,yEAA+C;AAC/C,0FAAgE;AAChE,8EAAoD;AACpD,yEAA+C;AAE/C,yBAAyB;AACzB,oFAA0D;AAC1D,8EAAoD;AACpD,gFAAsD;AACtD,sFAA4D;AAC5D,iFAAuD;AAEvD,2BAA2B;AAC3B,yFAA+D;AAC/D,gFAAsD;AACtD,yFAA+D;AAG/D,QAAQ;AACR,4EAAkD;AAClD,wEAA8C;AAC9C,yEAA+C;AAC/C,oEAA0C;AAC1C,uEAA6C;AAC7C,2EAAiD;AACjD,kEAAwC;AAExC,aAAa;AACb,yEAA+C;AAC/C,mEAAyC;AACzC,2EAAiD;AAGjD,SAAS;AACT,wBAAwB;AACxB,mGAAyE;AACzE,sGAA4E;AAC5E,uFAA6D;AAC7D,sFAA4D;AAC5D,6FAAmE;AACnE,gHAAsF;AAEtF,qBAAqB;AACrB,oFAA0D;AAE1D,oBAAoB;AACpB,wFAA8D;AAC9D,+EAAqD;AACrD,uFAA6D;AAC7D,wFAA8D;AAC9D,sFAA4D;AAC5D,uFAA6D;AAC7D,iFAAuD;AAEvD,gCAAgC;AAChC,yGAA+E;AAC/E,qGAA2E;AAE3E,eAAe;AACf,yEAA+C;AAC/C,uEAA6C;AAC7C,+EAAgD;AAChD,6EAA8C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,cAAc;AACd,wBAAwB;AACxB,wFAA8D;AAC9D,yFAA+D;AAC/D,iFAAuD;AACvD,+EAAqD;AAErD,oBAAoB;AACpB,0EAAgD;AAChD,wEAA8C;AAC9C,+EAAqD;AACrD,2EAAiD;AACjD,0EAAgD;AAChD,2EAAiD;AACjD,yEAA+C;AAC/C,0FAAgE;AAChE,8EAAoD;AACpD,yEAA+C;AAE/C,yBAAyB;AACzB,oFAA0D;AAC1D,8EAAoD;AACpD,gFAAsD;AACtD,sFAA4D;AAC5D,iFAAuD;AAEvD,2BAA2B;AAC3B,yFAA+D;AAC/D,gFAAsD;AACtD,yFAA+D;AAG/D,QAAQ;AACR,4EAAkD;AAClD,wEAA8C;AAC9C,yEAA+C;AAC/C,oEAA0C;AAC1C,uEAA6C;AAC7C,2EAAiD;AACjD,kEAAwC;AAExC,aAAa;AACb,yEAA+C;AAC/C,mEAAyC;AACzC,2EAAiD;AAGjD,SAAS;AACT,wBAAwB;AACxB,mGAAyE;AACzE,sGAA4E;AAC5E,uFAA6D;AAC7D,sFAA4D;AAC5D,6FAAmE;AACnE,gHAAsF;AAEtF,qBAAqB;AACrB,oFAA0D;AAE1D,oBAAoB;AACpB,wFAA8D;AAC9D,+EAAqD;AACrD,uFAA6D;AAC7D,wFAA8D;AAC9D,sFAA4D;AAC5D,uFAA6D;AAC7D,iFAAuD;AAEvD,gCAAgC;AAChC,yGAA+E;AAC/E,qGAA2E;AAE3E,eAAe;AACf,yEAA+C;AAC/C,uEAA6C;AAC7C,+EAAgD;AAChD,6EAA8C"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.10.
|
|
3
|
+
"version": "01.10.16",
|
|
4
4
|
"description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"prep": "npm i pnpm -g && npm i rimraf nodemon -g",
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { DyFM_Log } from './log.util';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Get the stack location of the constructor call
|
|
5
|
+
* use it in the constructor of a class to get the stack location of the constructor call
|
|
6
|
+
* @returns The stack location of the constructor call
|
|
7
|
+
*/
|
|
8
|
+
export function DyFM_getStackLocation(): string {
|
|
9
|
+
let stack: string = new Error().stack;
|
|
10
|
+
|
|
11
|
+
// Split the stack into lines and remove the first line (Error:)
|
|
12
|
+
const stackLines = stack?.split('\n')?.slice(1);
|
|
13
|
+
|
|
14
|
+
// Find the line that contains the constructor call
|
|
15
|
+
// It will be the FIRST line that doesn't contain 'getStackLocation'
|
|
16
|
+
let constructorLine = stackLines?.find(line =>
|
|
17
|
+
!line.includes('getStackLocation') &&
|
|
18
|
+
!line.includes('at new')
|
|
19
|
+
);
|
|
20
|
+
if (!constructorLine) {
|
|
21
|
+
DyFM_Log.warn('No constructor line found');
|
|
22
|
+
return '';
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
// Remove the 'constructorLine at ... (' and the ')'
|
|
26
|
+
constructorLine = constructorLine.split('(')[1]?.split(')')[0];
|
|
27
|
+
if (!constructorLine) {
|
|
28
|
+
DyFM_Log.warn('No constructor line found');
|
|
29
|
+
return '';
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return constructorLine;
|
|
33
|
+
}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
|
|
2
1
|
import { DyFM_Log } from '../../_collections/utils/log.util';
|
|
3
2
|
import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
|
|
4
3
|
import { DyFM_Metadata } from '../data-models/metadata.data-model';
|
|
@@ -30,7 +29,7 @@ describe('DyFM_DataModel_Params', () => {
|
|
|
30
29
|
mockSettings.properties = null as any;
|
|
31
30
|
const params = new DyFM_DataModel_Params(mockSettings);
|
|
32
31
|
expect(DyFM_Log.error).toHaveBeenCalledWith(
|
|
33
|
-
'DyFM_DataModel_Params.constructor: Properties are missing in testModel model.'
|
|
32
|
+
'DyFM_DataModel_Params.constructor: Properties are missing in "testModel" model.'
|
|
34
33
|
);
|
|
35
34
|
expect(params.properties).toEqual({});
|
|
36
35
|
});
|
|
@@ -40,7 +39,7 @@ describe('DyFM_DataModel_Params', () => {
|
|
|
40
39
|
mockSettings.properties = { '': { key: '' } } as any;
|
|
41
40
|
new DyFM_DataModel_Params(mockSettings);
|
|
42
41
|
expect(DyFM_Log.error).toHaveBeenCalledWith(
|
|
43
|
-
'DyFM_DataModel_Params.constructor: A property key is missing in testModel model.'
|
|
42
|
+
'DyFM_DataModel_Params.constructor: A property key is missing in "testModel" model.'
|
|
44
43
|
);
|
|
45
44
|
});
|
|
46
45
|
|
|
@@ -51,7 +50,7 @@ describe('DyFM_DataModel_Params', () => {
|
|
|
51
50
|
|
|
52
51
|
it('should set dbName based on dataName if not provided', () => {
|
|
53
52
|
const params = new DyFM_DataModel_Params(mockSettings);
|
|
54
|
-
expect(params.dbName).
|
|
53
|
+
expect(params.dbName).toBeUndefined();
|
|
55
54
|
});
|
|
56
55
|
|
|
57
56
|
xit('should convert dbName to camelCase if it contains underscores', () => {
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
|
|
2
1
|
import { DyFM_Log } from '../../_collections/utils/log.util';
|
|
3
2
|
import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
|
|
4
3
|
import { DyFM_Metadata } from '../data-models/metadata.data-model';
|
|
@@ -32,7 +31,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
32
31
|
if (!this.properties || typeof this.properties !== 'object') {
|
|
33
32
|
DyFM_Log.error(
|
|
34
33
|
'DyFM_DataModel_Params.constructor: ' +
|
|
35
|
-
|
|
34
|
+
`Properties are missing in "${this.dataName}" model.`
|
|
36
35
|
);
|
|
37
36
|
|
|
38
37
|
this.properties = {} as DyFM_DataProperties<T>;
|
|
@@ -42,7 +41,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
42
41
|
if (!key) {
|
|
43
42
|
DyFM_Log.error(
|
|
44
43
|
'DyFM_DataModel_Params.constructor: ' +
|
|
45
|
-
|
|
44
|
+
`A property key is missing in "${this.dataName}" model.`
|
|
46
45
|
);
|
|
47
46
|
}
|
|
48
47
|
|
|
@@ -57,7 +56,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
57
56
|
this.modelType = DyFM_DataModel_Type.data;
|
|
58
57
|
}
|
|
59
58
|
|
|
60
|
-
if (!this.dbName && this?.modelType == DyFM_DataModel_Type.data) {
|
|
59
|
+
/* if (!this.dbName && this?.modelType == DyFM_DataModel_Type.data) {
|
|
61
60
|
// upper case first letter
|
|
62
61
|
this.dbName = this.dataName.charAt(0).toUpperCase() + this.dataName.slice(1);
|
|
63
62
|
|
|
@@ -72,6 +71,23 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
72
71
|
this.dbName.slice(index + 1);
|
|
73
72
|
}
|
|
74
73
|
});
|
|
74
|
+
} */
|
|
75
|
+
|
|
76
|
+
// check for any Uppercase letters in dbName
|
|
77
|
+
if (RegExp(/[A-Z]/).exec(this.dataName)) {
|
|
78
|
+
DyFM_Log.warn(
|
|
79
|
+
'DyFM_DataModel_Params.constructor: ' +
|
|
80
|
+
`dbName should be in snake_case in "${this.dataName}" model.` +
|
|
81
|
+
'For future compatibility.'
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
if (this.dataName.includes('-')) {
|
|
86
|
+
DyFM_Log.warn(
|
|
87
|
+
'DyFM_DataModel_Params.constructor: ' +
|
|
88
|
+
`dataName should be in snake_case in "${this.dataName}" model.` +
|
|
89
|
+
'For future compatibility.'
|
|
90
|
+
);
|
|
75
91
|
}
|
|
76
92
|
}
|
|
77
93
|
|
|
@@ -85,7 +101,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
85
101
|
if (!key) {
|
|
86
102
|
DyFM_Log.error(
|
|
87
103
|
'DyFM_DataModel_Params.setKeysForSubObjectParams: ' +
|
|
88
|
-
|
|
104
|
+
`A subObjectParams key is missing in "${this.dataName}" model.`
|
|
89
105
|
);
|
|
90
106
|
}
|
|
91
107
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
import { DyFM_Log } from '../../_collections/utils/log.util';
|
|
2
2
|
import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
|
|
3
3
|
import { DyFM_DataProperty_Params, DyFM_DataProperty_Settings } from './data-property-params.control-model';
|
|
4
4
|
|
|
@@ -12,7 +12,6 @@ describe('DyFM_DataProperty_Params', () => {
|
|
|
12
12
|
readonly: false,
|
|
13
13
|
required: true,
|
|
14
14
|
index: false,
|
|
15
|
-
isDependencyHook: false,
|
|
16
15
|
dependencyDataName: 'dependencyName',
|
|
17
16
|
minlength: 5,
|
|
18
17
|
maxlength: 10,
|
|
@@ -29,7 +28,6 @@ describe('DyFM_DataProperty_Params', () => {
|
|
|
29
28
|
expect(instance.readonly).toBe(false);
|
|
30
29
|
expect(instance.required).toBe(true);
|
|
31
30
|
expect(instance.index).toBe(false);
|
|
32
|
-
expect(instance.isDependencyHook).toBe(false);
|
|
33
31
|
expect(instance.dependencyDataName).toBe('dependencyName');
|
|
34
32
|
expect(instance.minlength).toBe(5);
|
|
35
33
|
expect(instance.maxlength).toBe(10);
|
|
@@ -38,7 +36,7 @@ describe('DyFM_DataProperty_Params', () => {
|
|
|
38
36
|
});
|
|
39
37
|
|
|
40
38
|
it('should log error if type is missing', () => {
|
|
41
|
-
const consoleErrorSpy = spyOn(
|
|
39
|
+
const consoleErrorSpy = spyOn(DyFM_Log, 'error');
|
|
42
40
|
const settings: DyFM_DataProperty_Settings<string> = {
|
|
43
41
|
key: 'testKey',
|
|
44
42
|
type: undefined as any, // Simulating missing type
|
|
@@ -52,26 +50,8 @@ describe('DyFM_DataProperty_Params', () => {
|
|
|
52
50
|
);
|
|
53
51
|
});
|
|
54
52
|
|
|
55
|
-
it('should log error if isDependencyHook is true but dependencyDataName is missing', () => {
|
|
56
|
-
const consoleErrorSpy = spyOn(console, 'error');
|
|
57
|
-
const settings: DyFM_DataProperty_Settings<string> = {
|
|
58
|
-
key: 'testKey',
|
|
59
|
-
type: DyFM_BasicProperty_Type.string,
|
|
60
|
-
isDependencyHook: true,
|
|
61
|
-
dependencyDataName: undefined
|
|
62
|
-
};
|
|
63
|
-
|
|
64
|
-
new DyFM_DataProperty_Params(settings);
|
|
65
|
-
|
|
66
|
-
expect(consoleErrorSpy).toHaveBeenCalledWith(
|
|
67
|
-
'DYNAMO ERROR: ',
|
|
68
|
-
'\n dependencyName missing for dependencyHook from ' +
|
|
69
|
-
'DynamoBEDataPropertyParams'
|
|
70
|
-
);
|
|
71
|
-
});
|
|
72
|
-
|
|
73
53
|
it('should log error if settings are not provided', () => {
|
|
74
|
-
const consoleErrorSpy = spyOn(
|
|
54
|
+
const consoleErrorSpy = spyOn(DyFM_Log, 'error');
|
|
75
55
|
|
|
76
56
|
new DyFM_DataProperty_Params(undefined as any);
|
|
77
57
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { DyFM_Log } from '../../_collections/utils/log.util';
|
|
1
2
|
import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
|
|
2
3
|
|
|
3
4
|
export type DyFM_DataProperties<T> = {
|
|
@@ -16,14 +17,14 @@ export class DyFM_DataProperty_Settings<T>{
|
|
|
16
17
|
required?: boolean;
|
|
17
18
|
index?: boolean;
|
|
18
19
|
|
|
19
|
-
isDependencyHook?: boolean;
|
|
20
|
+
/* isDependencyHook?: boolean; */
|
|
20
21
|
/**
|
|
21
22
|
* This will be used to prehook dependency db service to data service by
|
|
22
23
|
* dataName from dependency data's DyNTS_DataPropertyParams
|
|
23
24
|
* Use the dependency data's DyNTS_DataPropertyParams.
|
|
24
25
|
*
|
|
25
26
|
* @example
|
|
26
|
-
* dependencyName: accountModelParams.dataName
|
|
27
|
+
* accountId: { dependencyName: accountModelParams.dataName }
|
|
27
28
|
*/
|
|
28
29
|
dependencyDataName?: string;
|
|
29
30
|
archiveable?: boolean;
|
|
@@ -58,25 +59,33 @@ export class DyFM_DataProperty_Params<T> extends DyFM_DataProperty_Settings<T> {
|
|
|
58
59
|
|
|
59
60
|
if (set) {
|
|
60
61
|
if (!set.type) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
DyFM_Log.error(
|
|
63
|
+
'DYNAMO ERROR: ',
|
|
64
|
+
'\n type is missing from DynamoBEDataPropertyParams'
|
|
64
65
|
);
|
|
65
66
|
}
|
|
66
67
|
|
|
67
|
-
if (set.
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
68
|
+
if (set.dependencyDataName) {
|
|
69
|
+
if (set.required === false) {
|
|
70
|
+
DyFM_Log.warn(
|
|
71
|
+
'DYNAMO WARNING: ',
|
|
72
|
+
'\n required is not recommended to be false if dependency is set'
|
|
73
|
+
);
|
|
74
|
+
} else if (set.required === undefined) {
|
|
75
|
+
DyFM_Log.warn(
|
|
76
|
+
'DYNAMO WARNING: ',
|
|
77
|
+
'\n required is recommended to be set if dependency is set. ' +
|
|
78
|
+
`It will be set to true by while you are not setting it.`
|
|
79
|
+
);
|
|
80
|
+
set.required = true;
|
|
81
|
+
}
|
|
73
82
|
}
|
|
74
83
|
|
|
75
84
|
Object.assign(this, set);
|
|
76
85
|
} else {
|
|
77
|
-
|
|
86
|
+
DyFM_Log.error(
|
|
78
87
|
'DYNAMO ERROR: ',
|
|
79
|
-
'\nMISSING DynamoBEDataPropertyParams constructor input'
|
|
88
|
+
'\nMISSING DynamoBEDataPropertyParams constructor input'
|
|
80
89
|
);
|
|
81
90
|
}
|
|
82
91
|
}
|