definition-generator-framework 1.3.9 → 1.3.10
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/helpers/validator/custom-validator-helper/custom-validator.helper.d.ts +1 -0
- package/dist/helpers/validator/custom-validator-helper/custom-validator.helper.js +5 -2
- package/dist/helpers/validator/custom-validator-helper/custom-validator.helper.js.map +1 -1
- package/dist/helpers/validator/custom-validators/reference.custom-validator.d.ts +1 -1
- package/dist/helpers/validator/custom-validators/reference.custom-validator.js +16 -6
- package/dist/helpers/validator/custom-validators/reference.custom-validator.js.map +1 -1
- package/package.json +2 -2
|
@@ -7,6 +7,7 @@ export declare class CustomValidatorHelper {
|
|
|
7
7
|
private static definitionNames;
|
|
8
8
|
private static duplicateHelpers;
|
|
9
9
|
static logDuplicates(context: Context): void;
|
|
10
|
+
static getDefinitionComponentName(definitionComponentClass: DefinitionComponentClassType<any>): string;
|
|
10
11
|
static getDefinitionComponentNamesFromArray(definitionComponentClasses: DefinitionComponentClassType<any> | DefinitionComponentClassType<any>[]): string[];
|
|
11
12
|
static getValidationState(helpers: Joi.CustomHelpers): 'notValid' | 'valid' | 'registerLoop';
|
|
12
13
|
static getPathAndRawDefinition(helpers: Joi.CustomHelpers): {
|
|
@@ -10,10 +10,13 @@ class CustomValidatorHelper {
|
|
|
10
10
|
static logDuplicates(context) {
|
|
11
11
|
this.duplicateHelpers.forEach(duplicateHelper => duplicateHelper.flush(context));
|
|
12
12
|
}
|
|
13
|
+
static getDefinitionComponentName(definitionComponentClass) {
|
|
14
|
+
return definitionComponentClass.$meta.componentName;
|
|
15
|
+
}
|
|
13
16
|
static getDefinitionComponentNamesFromArray(definitionComponentClasses) {
|
|
14
17
|
return helpers_lib_1.Comparator.isArray(definitionComponentClasses)
|
|
15
|
-
? definitionComponentClasses.map(definitionComponentClass => definitionComponentClass
|
|
16
|
-
: [definitionComponentClasses
|
|
18
|
+
? definitionComponentClasses.map(definitionComponentClass => this.getDefinitionComponentName(definitionComponentClass))
|
|
19
|
+
: [this.getDefinitionComponentName(definitionComponentClasses)];
|
|
17
20
|
}
|
|
18
21
|
static getValidationState(helpers) {
|
|
19
22
|
if (!helpers.state.path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-validator.helper.js","sourceRoot":"","sources":["../../../../src/helpers/validator/custom-validator-helper/custom-validator.helper.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAIzC,8EAA0E;AAG1E,MAAa,qBAAqB;aACzB,kBAAa,GAAG,EAAE,CAAC;aACX,oBAAe,GAAG,IAAI,GAAG,EAAuB,CAAC;aACjD,qBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAErE,MAAM,CAAC,aAAa,CAAC,OAAgB;QACnC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,oCAAoC,CACzC,0BAAmG;QAEnG,OAAO,wBAAU,CAAC,OAAO,CAAC,0BAA0B,CAAC;YACnD,CAAC,CAAuC,0BAA2B,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"custom-validator.helper.js","sourceRoot":"","sources":["../../../../src/helpers/validator/custom-validator-helper/custom-validator.helper.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAIzC,8EAA0E;AAG1E,MAAa,qBAAqB;aACzB,kBAAa,GAAG,EAAE,CAAC;aACX,oBAAe,GAAG,IAAI,GAAG,EAAuB,CAAC;aACjD,qBAAgB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAErE,MAAM,CAAC,aAAa,CAAC,OAAgB;QACnC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,0BAA0B,CAAC,wBAA2D;QAC3F,OAAa,wBAAyB,CAAC,KAAK,CAAC,aAAa,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,oCAAoC,CACzC,0BAAmG;QAEnG,OAAO,wBAAU,CAAC,OAAO,CAAC,0BAA0B,CAAC;YACnD,CAAC,CAAuC,0BAA2B,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAC/F,IAAI,CAAC,0BAA0B,CAAC,wBAAwB,CAAC,CAC1D;YACH,CAAC,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,OAA0B;QAClD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACxB,OAAO,UAAU,CAAC;QACpB,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,OAAO,CAAC;QACjB,CAAC;aAAM,IAAU,OAAO,CAAC,KAAK,CAAC,IAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YACjE,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,OAAO,UAAU,CAAC;QACpB,CAAC;IACH,CAAC;IAED,MAAM,CAAC,uBAAuB,CAAC,OAA0B;QACvD,IAAI,IAAI,GAAQ,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACnC,IAAI,aAAa,GAAkB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QACzD,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,aAAqB;QAC7C,IAAI,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,aAAqB;QAC7C,IAAI,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC/D,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,eAAe,GAAG,IAAI,kCAAe,CAAC,aAAa,CAAC,CAAC;YACrD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;;AAzDH,sDA0DC"}
|
|
@@ -5,6 +5,6 @@ export declare class ReferenceCustomValidator implements CustomValidator {
|
|
|
5
5
|
readonly regex: RegExp;
|
|
6
6
|
readonly validate: (value: string, helpers: Joi.CustomHelpers) => any | ErrorReport;
|
|
7
7
|
readonly handleError: (error: Joi.ErrorReport) => void;
|
|
8
|
-
private
|
|
8
|
+
private referencedComponents;
|
|
9
9
|
constructor(definitionComponentClasses: DefinitionComponentClassType<any> | DefinitionComponentClassType<any>[]);
|
|
10
10
|
}
|
|
@@ -3,18 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ReferenceCustomValidator = void 0;
|
|
4
4
|
const common_functions_1 = require("../../common-functions/common-functions");
|
|
5
5
|
const custom_validator_helper_1 = require("../custom-validator-helper/custom-validator.helper");
|
|
6
|
+
const helpers_lib_1 = require("helpers-lib");
|
|
6
7
|
class ReferenceCustomValidator {
|
|
7
8
|
constructor(definitionComponentClasses) {
|
|
8
9
|
this.regex = /^[a-z]+([a-zA-Z0-9]+)*$/;
|
|
9
10
|
this.validate = (value, helpers) => {
|
|
10
11
|
let validationState = custom_validator_helper_1.CustomValidatorHelper.getValidationState(helpers);
|
|
11
12
|
if (validationState === 'valid') {
|
|
12
|
-
let
|
|
13
|
-
if (!
|
|
13
|
+
let referencedComponent = this.referencedComponents.find(component => custom_validator_helper_1.CustomValidatorHelper.getDefinitionNames(component.name).has(value));
|
|
14
|
+
if (!referencedComponent) {
|
|
14
15
|
return helpers.error('any.custom');
|
|
15
16
|
}
|
|
16
17
|
else {
|
|
17
|
-
|
|
18
|
+
let definitionName = common_functions_1.CommonFunctions.decorateDefinitionName(value, referencedComponent.name);
|
|
19
|
+
return definitionName;
|
|
18
20
|
}
|
|
19
21
|
}
|
|
20
22
|
else {
|
|
@@ -26,11 +28,19 @@ class ReferenceCustomValidator {
|
|
|
26
28
|
error.message = `Internal Error; joi validation context for uniqueNameGroup: Path: "${error.state.path}", RawDefinition: "${JSON.stringify(error.prefs.context)}"`;
|
|
27
29
|
}
|
|
28
30
|
else if (error.code === 'any.custom') {
|
|
29
|
-
error.message = `There is no definition found for "${error.value}" in name field: "${this.
|
|
31
|
+
error.message = `There is no definition found for "${error.value}" in name field: "${this.referencedComponents
|
|
32
|
+
.map(component => component.name)
|
|
33
|
+
.join(', ')}"`;
|
|
30
34
|
}
|
|
31
35
|
};
|
|
32
|
-
this.
|
|
33
|
-
|
|
36
|
+
this.referencedComponents = [];
|
|
37
|
+
let componentClasses = helpers_lib_1.Comparator.isArray(definitionComponentClasses)
|
|
38
|
+
? definitionComponentClasses
|
|
39
|
+
: [definitionComponentClasses];
|
|
40
|
+
this.referencedComponents = componentClasses.map(component => ({
|
|
41
|
+
name: custom_validator_helper_1.CustomValidatorHelper.getDefinitionComponentName(component),
|
|
42
|
+
component
|
|
43
|
+
}));
|
|
34
44
|
}
|
|
35
45
|
}
|
|
36
46
|
exports.ReferenceCustomValidator = ReferenceCustomValidator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.custom-validator.js","sourceRoot":"","sources":["../../../../src/helpers/validator/custom-validators/reference.custom-validator.ts"],"names":[],"mappings":";;;AAEA,8EAA0E;AAE1E,gGAA2F;
|
|
1
|
+
{"version":3,"file":"reference.custom-validator.js","sourceRoot":"","sources":["../../../../src/helpers/validator/custom-validators/reference.custom-validator.ts"],"names":[],"mappings":";;;AAEA,8EAA0E;AAE1E,gGAA2F;AAE3F,6CAAyC;AAEzC,MAAa,wBAAwB;IAmCnC,YAAY,0BAAmG;QAlCtG,UAAK,GAAG,yBAAyB,CAAC;QAElC,aAAQ,GAAG,CAAC,KAAa,EAAE,OAA0B,EAAqB,EAAE;YACnF,IAAI,eAAe,GAAG,+CAAqB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACxE,IAAI,eAAe,KAAK,OAAO,EAAE,CAAC;gBAChC,IAAI,mBAAmB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CACnE,+CAAqB,CAAC,kBAAkB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CACpE,CAAC;gBACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBACzB,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACN,IAAI,cAAc,GAAG,kCAAe,CAAC,sBAAsB,CAAC,KAAK,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;oBAE7F,OAAO,cAAc,CAAC;gBACxB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YACxC,CAAC;QACH,CAAC,CAAC;QAEO,gBAAW,GAAG,CAAC,KAAsB,EAAQ,EAAE;YACtD,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;gBACnC,KAAK,CAAC,OAAO,GAAG,sEACd,KAAK,CAAC,KAAK,CAAC,IACd,sBAAsB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;YAC/D,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACvC,KAAK,CAAC,OAAO,GAAG,qCAAqC,KAAK,CAAC,KAAK,qBAAqB,IAAI,CAAC,oBAAoB;qBAC3G,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;qBAChC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACnB,CAAC;QACH,CAAC,CAAC;QAEM,yBAAoB,GAAqE,EAAE,CAAC;QAGlG,IAAI,gBAAgB,GAAG,wBAAU,CAAC,OAAO,CAAC,0BAA0B,CAAC;YACnE,CAAC,CAAC,0BAA0B;YAC5B,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC;QAEjC,IAAI,CAAC,oBAAoB,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC7D,IAAI,EAAE,+CAAqB,CAAC,0BAA0B,CAAC,SAAS,CAAC;YACjE,SAAS;SACV,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AA7CD,4DA6CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "definition-generator-framework",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.10",
|
|
4
4
|
"description": "Definition Generator Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"joi": "17.11.0",
|
|
54
|
-
"helpers-lib": "1.5.
|
|
54
|
+
"helpers-lib": "1.5.30",
|
|
55
55
|
"pixi-framework": "0.5.1",
|
|
56
56
|
"prettier": "3.1.1",
|
|
57
57
|
"image-size": "1.1.1"
|