definition-generator-framework 1.12.0 → 1.12.1
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-validators/reference.custom-validator.d.ts +1 -0
- package/dist/helpers/validator/custom-validators/reference.custom-validator.js +9 -4
- package/dist/helpers/validator/custom-validators/reference.custom-validator.js.map +1 -1
- package/package.json +1 -1
- package/package.json.bak +1 -1
|
@@ -10,6 +10,7 @@ declare abstract class ReferenceCustomValidatorBase implements CustomStringValid
|
|
|
10
10
|
}
|
|
11
11
|
export declare class ReferenceCustomValidator extends ReferenceCustomValidatorBase {
|
|
12
12
|
readonly validate: (value: string, helpers: Joi.CustomHelpers) => any | ErrorReport;
|
|
13
|
+
private includeType;
|
|
13
14
|
private referencedComponents;
|
|
14
15
|
constructor(definitionComponentClasses: DefinitionComponentClassType<any> | DefinitionComponentClassType<any>[], options?: ReferenceCustomValidatorOptions);
|
|
15
16
|
}
|
|
@@ -48,7 +48,7 @@ class ReferenceCustomValidator extends ReferenceCustomValidatorBase {
|
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
50
50
|
this.validatePropertyExistence(referencedComponent, value, this.options);
|
|
51
|
-
if (this.
|
|
51
|
+
if (this.includeType) {
|
|
52
52
|
return {
|
|
53
53
|
value,
|
|
54
54
|
type: custom_validator_helper_1.CustomValidatorHelper.getDefinitionComponentName(referencedComponent)
|
|
@@ -64,9 +64,14 @@ class ReferenceCustomValidator extends ReferenceCustomValidatorBase {
|
|
|
64
64
|
}
|
|
65
65
|
};
|
|
66
66
|
this.referencedComponents = [];
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
if (helpers_lib_1.Comparator.isArray(definitionComponentClasses)) {
|
|
68
|
+
this.includeType = true;
|
|
69
|
+
this.referencedComponents = definitionComponentClasses;
|
|
70
|
+
}
|
|
71
|
+
else {
|
|
72
|
+
this.includeType = false;
|
|
73
|
+
this.referencedComponents = [definitionComponentClasses];
|
|
74
|
+
}
|
|
70
75
|
}
|
|
71
76
|
}
|
|
72
77
|
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":";;;AAAA,6CAAoE;AAIpE,wDAAqD;AACrD,0EAAsE;AACtE,6FAAwF;AACxF,gGAA2F;AAI3F,MAAe,4BAA4B;IAKzC,YAAgC,OAAyC;QAAzC,YAAO,GAAP,OAAO,CAAkC;QAJhE,UAAK,GAAG,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"reference.custom-validator.js","sourceRoot":"","sources":["../../../../src/helpers/validator/custom-validators/reference.custom-validator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED