@futdevpro/fsm-dynamo 1.11.36 → 1.11.37
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/build/_models/control-models/data-model-params.control-model.d.ts +1 -5
- 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 +4 -0
- package/build/_models/control-models/data-model-params.control-model.js.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.d.ts +8 -8
- 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.map +1 -1
- package/build/_models/control-models/data-property-params.control-model.spec.js.map +1 -1
- package/futdevpro-fsm-dynamo-01.11.37.tgz +0 -0
- package/package.json +1 -1
- package/src/_models/control-models/data-model-params.control-model.ts +7 -7
- package/src/_models/control-models/data-property-params.control-model.spec.ts +3 -3
- package/src/_models/control-models/data-property-params.control-model.ts +8 -8
- package/futdevpro-fsm-dynamo-01.11.36.tgz +0 -0
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
|
|
2
2
|
import { DyFM_Metadata } from '../data-models/metadata.data-model';
|
|
3
3
|
import { DyFM_DataProperties, DyFM_DataProperty_Params } from './data-property-params.control-model';
|
|
4
|
-
export type DyFM_Data_S<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
|
|
5
|
-
export type DyFM_Data_Settings<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
|
|
6
4
|
export declare class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends DyFM_Metadata {
|
|
7
5
|
/** this will be used as db table name, therefore it should be in snake_case,
|
|
8
6
|
* this also will be used in logs and errors
|
|
@@ -24,12 +22,10 @@ export declare class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends Dy
|
|
|
24
22
|
forbidDelete?: boolean;
|
|
25
23
|
properties: DyFM_DataProperties<T>;
|
|
26
24
|
}
|
|
27
|
-
export type DyFM_Data_P<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>;
|
|
28
|
-
export type DyFM_Data_Params<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>;
|
|
29
25
|
export declare class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataModel_Settings<T> {
|
|
30
26
|
readonly stackLocation?: string;
|
|
31
27
|
constructor(set: DyFM_DataModel_Settings<T>);
|
|
32
28
|
constructed?(): boolean;
|
|
33
|
-
setKeysForSubObjectParams?(property: DyFM_DataProperty_Params<any>): void;
|
|
29
|
+
setKeysForSubObjectParams?(property: DyFM_DataProperty_Params<any, T>): void;
|
|
34
30
|
}
|
|
35
31
|
//# sourceMappingURL=data-model-params.control-model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-model-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"data-model-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAIrG,qBAAa,uBAAuB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,aAAa;IACjF;;OAEG;IACH,QAAQ,EAAG,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAEhC,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,UAAU,EAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;CACrC;AAID,qBAAa,qBAAqB,CAAC,CAAC,SAAS,aAAa,CAAE,SAAQ,uBAAuB,CAAC,CAAC,CAAC;IAG5F,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;gBAG9B,GAAG,EAAE,uBAAuB,CAAC,CAAC,CAAC;IA2KjC,WAAW,CAAC,IAAI,OAAO;IAIvB,yBAAyB,CAAC,CAAC,QAAQ,EAAE,wBAAwB,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI;CAmB7E"}
|
|
@@ -6,6 +6,8 @@ const stack_util_1 = require("../../_collections/utils/stack.util");
|
|
|
6
6
|
const data_model_type_enum_1 = require("../../_enums/data-model-type.enum");
|
|
7
7
|
const metadata_data_model_1 = require("../data-models/metadata.data-model");
|
|
8
8
|
const data_property_params_control_model_1 = require("./data-property-params.control-model");
|
|
9
|
+
/* export type DyFM_Data_S<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
|
|
10
|
+
export type DyFM_Data_Settings<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>; */
|
|
9
11
|
class DyFM_DataModel_Settings extends metadata_data_model_1.DyFM_Metadata {
|
|
10
12
|
/** this will be used as db table name, therefore it should be in snake_case,
|
|
11
13
|
* this also will be used in logs and errors
|
|
@@ -28,6 +30,8 @@ class DyFM_DataModel_Settings extends metadata_data_model_1.DyFM_Metadata {
|
|
|
28
30
|
properties;
|
|
29
31
|
}
|
|
30
32
|
exports.DyFM_DataModel_Settings = DyFM_DataModel_Settings;
|
|
33
|
+
/* export type DyFM_Data_P<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>;
|
|
34
|
+
export type DyFM_Data_Params<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>; */
|
|
31
35
|
class DyFM_DataModel_Params extends DyFM_DataModel_Settings {
|
|
32
36
|
/* override properties?: DyFM_DataProperties<T>; */
|
|
33
37
|
stackLocation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-model-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAC7D,oEAAwF;AAExF,4EAAwE;AACxE,4EAAmE;AACnE,6FAAqG;
|
|
1
|
+
{"version":3,"file":"data-model-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-model-params.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
|
|
2
2
|
import { DyFM_OpenAIEmbeddingModel } from '../../_modules/open-ai/_enums/open-ai-model.enum';
|
|
3
3
|
import { DyFM_DataModel_Params } from './data-model-params.control-model';
|
|
4
|
-
export type DyFM_DataProperties<
|
|
5
|
-
[K in keyof
|
|
4
|
+
export type DyFM_DataProperties<T_Data> = {
|
|
5
|
+
[K in keyof T_Data]: DyFM_DataProperty_Params<T_Data[K], T_Data>;
|
|
6
6
|
};
|
|
7
|
-
export declare class DyFM_DataProperty_Settings<
|
|
7
|
+
export declare class DyFM_DataProperty_Settings<T_Property, T_Data> {
|
|
8
8
|
key?: string;
|
|
9
9
|
type: DyFM_BasicProperty_Type | string;
|
|
10
|
-
default?:
|
|
10
|
+
default?: T_Property;
|
|
11
11
|
unique?: boolean;
|
|
12
12
|
readonly?: boolean;
|
|
13
13
|
required?: boolean;
|
|
@@ -56,15 +56,15 @@ export declare class DyFM_DataProperty_Settings<T> {
|
|
|
56
56
|
minlength?: number;
|
|
57
57
|
maxlength?: number;
|
|
58
58
|
subObjectParams?: DyFM_DataProperties<any>;
|
|
59
|
-
additionalValidators?: ((property:
|
|
59
|
+
additionalValidators?: ((property: T_Property, data: T_Data) => void)[];
|
|
60
60
|
}
|
|
61
61
|
/**
|
|
62
62
|
* This will be used for setting up db.
|
|
63
63
|
* DataServices also uses this to prehook tools, as db service and dependency db service.
|
|
64
64
|
*/
|
|
65
|
-
export declare class DyFM_DataProperty_Params<
|
|
66
|
-
additionalValidators?: ((property:
|
|
67
|
-
constructor(set: DyFM_DataProperty_Settings<
|
|
65
|
+
export declare class DyFM_DataProperty_Params<T_Property, T_Data> extends DyFM_DataProperty_Settings<T_Property, T_Data> {
|
|
66
|
+
additionalValidators?: ((property: T_Property, data: T_Data) => void)[];
|
|
67
|
+
constructor(set: DyFM_DataProperty_Settings<T_Property, T_Data>, parentDataParams?: DyFM_DataModel_Params<any>);
|
|
68
68
|
constructed?(): boolean;
|
|
69
69
|
getBEType?(): string | number | boolean | object | Function | Array<any> | Date;
|
|
70
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,MAAM,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"data-property-params.control-model.d.ts","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,MAAM,MAAM,mBAAmB,CAAC,MAAM,IAAI;KACvC,CAAC,IAAI,MAAM,MAAM,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC;CACjE,CAAA;AAID,qBAAa,0BAA0B,CAAC,UAAU,EAAE,MAAM;IACxD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAG,uBAAuB,GAAG,MAAM,CAAC;IACxC,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAGhB;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAE1B,cAAc,CAAC,EAAE,yBAAyB,CAAC;IAC3C;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;;;;;;;;;;OAgBG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,eAAe,CAAC,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAE3C,oBAAoB,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAC;CACzE;AAKD;;;GAGG;AACH,qBAAa,wBAAwB,CAAC,UAAU,EAAE,MAAM,CAAE,SAAQ,0BAA0B,CAAC,UAAU,EAAE,MAAM,CAAC;IAKrG,oBAAoB,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,EAAE,CAAM;gBAGpF,GAAG,EAAE,0BAA0B,CAAC,UAAU,EAAE,MAAM,CAAC,EACnD,gBAAgB,CAAC,EAAE,qBAAqB,CAAC,GAAG,CAAC;IAkE/C,WAAW,CAAC,IAAI,OAAO;IAKvB,SAAS,CAAC,IAAI,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI;CAyBhF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":";;;AAAA,gEAA6D;AAC7D,oEAAwF;AACxF,oFAAgF;AAQhF,qFAAqF;AAErF,MAAa,0BAA0B;IACrC,GAAG,CAAU;IACb,IAAI,CAAoC;IACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"data-property-params.control-model.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-property-params.control-model.spec.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.spec.ts"],"names":[],"mappings":";;AAAA,gEAA6D;AAC7D,oFAAgF;AAChF,6FAA4G;AAE5G,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"data-property-params.control-model.spec.js","sourceRoot":"","sources":["../../../src/_models/control-models/data-property-params.control-model.spec.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.11.
|
|
3
|
+
"version": "01.11.37",
|
|
4
4
|
"description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "full-stack-package",
|
|
@@ -5,8 +5,8 @@ import { DyFM_DataModel_Type } from '../../_enums/data-model-type.enum';
|
|
|
5
5
|
import { DyFM_Metadata } from '../data-models/metadata.data-model';
|
|
6
6
|
import { DyFM_DataProperties, DyFM_DataProperty_Params } from './data-property-params.control-model';
|
|
7
7
|
|
|
8
|
-
export type DyFM_Data_S<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
|
|
9
|
-
export type DyFM_Data_Settings<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
|
|
8
|
+
/* export type DyFM_Data_S<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>;
|
|
9
|
+
export type DyFM_Data_Settings<T extends DyFM_Metadata> = DyFM_DataModel_Settings<T>; */
|
|
10
10
|
export class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends DyFM_Metadata {
|
|
11
11
|
/** this will be used as db table name, therefore it should be in snake_case,
|
|
12
12
|
* this also will be used in logs and errors
|
|
@@ -33,8 +33,8 @@ export class DyFM_DataModel_Settings<T extends DyFM_Metadata> extends DyFM_Metad
|
|
|
33
33
|
properties!: DyFM_DataProperties<T>;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
|
-
export type DyFM_Data_P<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>;
|
|
37
|
-
export type DyFM_Data_Params<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>;
|
|
36
|
+
/* export type DyFM_Data_P<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>;
|
|
37
|
+
export type DyFM_Data_Params<T extends DyFM_Metadata> = DyFM_DataModel_Params<T>; */
|
|
38
38
|
export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataModel_Settings<T> {
|
|
39
39
|
|
|
40
40
|
/* override properties?: DyFM_DataProperties<T>; */
|
|
@@ -71,7 +71,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
71
71
|
);
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
const property: DyFM_DataProperty_Params<any> = new DyFM_DataProperty_Params({
|
|
74
|
+
const property: DyFM_DataProperty_Params<any, T> = new DyFM_DataProperty_Params({
|
|
75
75
|
...this.properties[key],
|
|
76
76
|
key: key,
|
|
77
77
|
}, this);
|
|
@@ -83,7 +83,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
83
83
|
});
|
|
84
84
|
|
|
85
85
|
keys.forEach((key: string): void => {
|
|
86
|
-
const property: DyFM_DataProperty_Params<any> = this.properties[key];
|
|
86
|
+
const property: DyFM_DataProperty_Params<any, T> = this.properties[key];
|
|
87
87
|
/* if (property.vectorizeTo) {
|
|
88
88
|
if (!this.properties[property.vectorizeTo]) {
|
|
89
89
|
throw new Error(
|
|
@@ -216,7 +216,7 @@ export class DyFM_DataModel_Params<T extends DyFM_Metadata> extends DyFM_DataMod
|
|
|
216
216
|
return true;
|
|
217
217
|
}
|
|
218
218
|
|
|
219
|
-
setKeysForSubObjectParams?(property: DyFM_DataProperty_Params<any>): void {
|
|
219
|
+
setKeysForSubObjectParams?(property: DyFM_DataProperty_Params<any, T>): void {
|
|
220
220
|
if (property.subObjectParams) {
|
|
221
221
|
Object.keys(property.subObjectParams).forEach((key: string): void => {
|
|
222
222
|
if (!key) {
|
|
@@ -4,7 +4,7 @@ import { DyFM_DataProperty_Params, DyFM_DataProperty_Settings } from './data-pro
|
|
|
4
4
|
|
|
5
5
|
describe('| DyFM_DataProperty_Params', () => {
|
|
6
6
|
it('| should create an instance with given settings', () => {
|
|
7
|
-
const settings: DyFM_DataProperty_Settings<string> = {
|
|
7
|
+
const settings: DyFM_DataProperty_Settings<string, any> = {
|
|
8
8
|
key: 'testKey',
|
|
9
9
|
type: DyFM_BasicProperty_Type.string,
|
|
10
10
|
default: 'defaultValue',
|
|
@@ -37,7 +37,7 @@ describe('| DyFM_DataProperty_Params', () => {
|
|
|
37
37
|
|
|
38
38
|
xit('should log error if type is missing', () => {
|
|
39
39
|
const consoleErrorSpy = spyOn(DyFM_Log, 'error');
|
|
40
|
-
const settings: DyFM_DataProperty_Settings<string> = {
|
|
40
|
+
const settings: DyFM_DataProperty_Settings<string, any> = {
|
|
41
41
|
key: 'testKey',
|
|
42
42
|
type: undefined as any, // Simulating missing type
|
|
43
43
|
};
|
|
@@ -66,7 +66,7 @@ describe('| DyFM_DataProperty_Params', () => {
|
|
|
66
66
|
});
|
|
67
67
|
|
|
68
68
|
xit('should return correct BEType based on type', () => {
|
|
69
|
-
const settings: DyFM_DataProperty_Settings<any> = {
|
|
69
|
+
const settings: DyFM_DataProperty_Settings<any, any> = {
|
|
70
70
|
type: DyFM_BasicProperty_Type.string
|
|
71
71
|
};
|
|
72
72
|
const instance = new DyFM_DataProperty_Params(settings, { dataName: 'testDataName' } as any);
|
|
@@ -4,16 +4,16 @@ import { DyFM_BasicProperty_Type } from '../../_enums/basic-property-type.enum';
|
|
|
4
4
|
import { DyFM_OpenAIEmbeddingModel } from '../../_modules/open-ai/_enums/open-ai-model.enum';
|
|
5
5
|
import { DyFM_DataModel_Params } from './data-model-params.control-model';
|
|
6
6
|
|
|
7
|
-
export type DyFM_DataProperties<
|
|
8
|
-
[K in keyof
|
|
7
|
+
export type DyFM_DataProperties<T_Data> = {
|
|
8
|
+
[K in keyof T_Data]: DyFM_DataProperty_Params<T_Data[K], T_Data>;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
/* export type DyFM_DataPropertySettings<T = any> = DyFM_DataProperty_Settings<T>; */
|
|
12
12
|
|
|
13
|
-
export class DyFM_DataProperty_Settings<
|
|
13
|
+
export class DyFM_DataProperty_Settings<T_Property, T_Data>{
|
|
14
14
|
key?: string;
|
|
15
15
|
type!: DyFM_BasicProperty_Type | string;
|
|
16
|
-
default?:
|
|
16
|
+
default?: T_Property;
|
|
17
17
|
|
|
18
18
|
unique?: boolean;
|
|
19
19
|
readonly?: boolean;
|
|
@@ -70,7 +70,7 @@ export class DyFM_DataProperty_Settings<T>{
|
|
|
70
70
|
|
|
71
71
|
subObjectParams?: DyFM_DataProperties<any>;
|
|
72
72
|
|
|
73
|
-
additionalValidators?: ((property:
|
|
73
|
+
additionalValidators?: ((property: T_Property, data: T_Data) => void)[];
|
|
74
74
|
}
|
|
75
75
|
|
|
76
76
|
|
|
@@ -80,15 +80,15 @@ export type DyFM_DPropPs<T> = DyFM_DataProperty_Params<T>; */
|
|
|
80
80
|
* This will be used for setting up db.
|
|
81
81
|
* DataServices also uses this to prehook tools, as db service and dependency db service.
|
|
82
82
|
*/
|
|
83
|
-
export class DyFM_DataProperty_Params<
|
|
83
|
+
export class DyFM_DataProperty_Params<T_Property, T_Data> extends DyFM_DataProperty_Settings<T_Property, T_Data> {
|
|
84
84
|
|
|
85
85
|
/* override subObjectParams?: DyFM_DataProperty_Params<>[] = []; */
|
|
86
86
|
/* override subObjectParams?: DyFM_Data_Params<T> = {}; */
|
|
87
87
|
|
|
88
|
-
override additionalValidators?: ((property:
|
|
88
|
+
override additionalValidators?: ((property: T_Property, data: T_Data) => void)[] = [];
|
|
89
89
|
|
|
90
90
|
constructor(
|
|
91
|
-
set: DyFM_DataProperty_Settings<
|
|
91
|
+
set: DyFM_DataProperty_Settings<T_Property, T_Data>,
|
|
92
92
|
parentDataParams?: DyFM_DataModel_Params<any>,
|
|
93
93
|
) {
|
|
94
94
|
super();
|
|
Binary file
|