@decaf-ts/decorator-validation 1.7.12 → 1.7.13
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/decorator-validation.cjs +269 -106
- package/dist/decorator-validation.esm.cjs +269 -107
- package/lib/esm/index.d.ts +1 -1
- package/lib/esm/index.js +1 -1
- package/lib/esm/model/Model.js +28 -6
- package/lib/esm/model/decorators.d.ts +2 -12
- package/lib/esm/model/decorators.js +57 -37
- package/lib/esm/model/validation.d.ts +2 -2
- package/lib/esm/model/validation.js +51 -19
- package/lib/esm/utils/Decoration.d.ts +15 -3
- package/lib/esm/utils/Decoration.js +49 -12
- package/lib/esm/utils/decorators.d.ts +1 -1
- package/lib/esm/utils/decorators.js +13 -4
- package/lib/esm/utils/types.d.ts +3 -2
- package/lib/esm/utils/types.js +1 -1
- package/lib/esm/validation/Validators/ListValidator.js +8 -4
- package/lib/esm/validation/Validators/TypeValidator.js +12 -8
- package/lib/esm/validation/decorators.d.ts +4 -4
- package/lib/esm/validation/decorators.js +58 -22
- package/lib/esm/validation/types.d.ts +2 -1
- package/lib/esm/validation/types.js +1 -1
- package/lib/index.cjs +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/model/Model.cjs +28 -6
- package/lib/model/decorators.cjs +58 -37
- package/lib/model/decorators.d.ts +2 -12
- package/lib/model/validation.cjs +51 -19
- package/lib/model/validation.d.ts +2 -2
- package/lib/utils/Decoration.cjs +49 -12
- package/lib/utils/Decoration.d.ts +15 -3
- package/lib/utils/decorators.cjs +13 -4
- package/lib/utils/decorators.d.ts +1 -1
- package/lib/utils/types.cjs +1 -1
- package/lib/utils/types.d.ts +3 -2
- package/lib/validation/Validators/ListValidator.cjs +8 -4
- package/lib/validation/Validators/TypeValidator.cjs +12 -8
- package/lib/validation/decorators.cjs +58 -22
- package/lib/validation/decorators.d.ts +4 -4
- package/lib/validation/types.cjs +1 -1
- package/lib/validation/types.d.ts +2 -1
- package/package.json +1 -1
package/lib/utils/decorators.cjs
CHANGED
|
@@ -4,6 +4,7 @@ exports.prop = prop;
|
|
|
4
4
|
exports.propMetadata = propMetadata;
|
|
5
5
|
const reflection_1 = require("@decaf-ts/reflection");
|
|
6
6
|
const constants_1 = require("./constants.cjs");
|
|
7
|
+
const Decoration_1 = require("./Decoration.cjs");
|
|
7
8
|
/**
|
|
8
9
|
* @description Property decorator factory for model attributes
|
|
9
10
|
* @summary Creates a decorator that marks class properties as model attributes
|
|
@@ -30,17 +31,25 @@ const constants_1 = require("./constants.cjs");
|
|
|
30
31
|
* end
|
|
31
32
|
*/
|
|
32
33
|
function prop(key = constants_1.ModelKeys.ATTRIBUTE) {
|
|
33
|
-
return (
|
|
34
|
+
return Decoration_1.Decoration.for(key)
|
|
35
|
+
.define(function prop(model, propertyKey) {
|
|
34
36
|
let props;
|
|
35
37
|
if (Object.prototype.hasOwnProperty.call(model, key)) {
|
|
36
38
|
props = model[key];
|
|
37
39
|
}
|
|
38
40
|
else {
|
|
39
|
-
|
|
41
|
+
Object.defineProperty(model, key, {
|
|
42
|
+
enumerable: false,
|
|
43
|
+
configurable: false,
|
|
44
|
+
writable: false,
|
|
45
|
+
value: [],
|
|
46
|
+
});
|
|
47
|
+
props = model[key];
|
|
40
48
|
}
|
|
41
49
|
if (!props.includes(propertyKey))
|
|
42
50
|
props.push(propertyKey);
|
|
43
|
-
}
|
|
51
|
+
})
|
|
52
|
+
.apply();
|
|
44
53
|
}
|
|
45
54
|
/**
|
|
46
55
|
* @description Combined property decorator factory for metadata and attribute marking
|
|
@@ -56,4 +65,4 @@ function prop(key = constants_1.ModelKeys.ATTRIBUTE) {
|
|
|
56
65
|
function propMetadata(key, value) {
|
|
57
66
|
return (0, reflection_1.apply)(prop(), (0, reflection_1.metadata)(key, value));
|
|
58
67
|
}
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9ycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9kZWNvcmF0b3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBOEJBLG9CQW1CQztBQWFELG9DQUVDO0FBaEVELHFEQUF1RDtBQUN2RCwrQ0FBd0M7QUFDeEMsaURBQTBDO0FBRzFDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0F3Qkc7QUFDSCxTQUFnQixJQUFJLENBQUMsTUFBYyxxQkFBUyxDQUFDLFNBQVM7SUFDcEQsT0FBTyx1QkFBVSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUM7U0FDdkIsTUFBTSxDQUFDLFNBQVMsSUFBSSxDQUFDLEtBQWEsRUFBRSxXQUFpQjtRQUNwRCxJQUFJLEtBQWUsQ0FBQztRQUNwQixJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNyRCxLQUFLLEdBQUksS0FBYSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzlCLENBQUM7YUFBTSxDQUFDO1lBQ04sTUFBTSxDQUFDLGNBQWMsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFO2dCQUNoQyxVQUFVLEVBQUUsS0FBSztnQkFDakIsWUFBWSxFQUFFLEtBQUs7Z0JBQ25CLFFBQVEsRUFBRSxLQUFLO2dCQUNmLEtBQUssRUFBRSxFQUFFO2FBQ1YsQ0FBQyxDQUFDO1lBQ0gsS0FBSyxHQUFJLEtBQWEsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM5QixDQUFDO1FBQ0QsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsV0FBcUIsQ0FBQztZQUN4QyxLQUFLLENBQUMsSUFBSSxDQUFDLFdBQXFCLENBQUMsQ0FBQztJQUN0QyxDQUFDLENBQUM7U0FDRCxLQUFLLEVBQUUsQ0FBQztBQUNiLENBQUM7QUFFRDs7Ozs7Ozs7OztHQVVHO0FBQ0gsU0FBZ0IsWUFBWSxDQUFJLEdBQVcsRUFBRSxLQUFRO0lBQ25ELE9BQU8sSUFBQSxrQkFBSyxFQUFDLElBQUksRUFBRSxFQUFFLElBQUEscUJBQVEsRUFBSSxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUMsQ0FBQztBQUNoRCxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgYXBwbHksIG1ldGFkYXRhIH0gZnJvbSBcIkBkZWNhZi10cy9yZWZsZWN0aW9uXCI7XG5pbXBvcnQgeyBNb2RlbEtleXMgfSBmcm9tIFwiLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IERlY29yYXRpb24gfSBmcm9tIFwiLi9EZWNvcmF0aW9uXCI7XG5pbXBvcnQgeyBNb2RlbCB9IGZyb20gXCIuLi9tb2RlbFwiO1xuXG4vKipcbiAqIEBkZXNjcmlwdGlvbiBQcm9wZXJ0eSBkZWNvcmF0b3IgZmFjdG9yeSBmb3IgbW9kZWwgYXR0cmlidXRlc1xuICogQHN1bW1hcnkgQ3JlYXRlcyBhIGRlY29yYXRvciB0aGF0IG1hcmtzIGNsYXNzIHByb3BlcnRpZXMgYXMgbW9kZWwgYXR0cmlidXRlc1xuICpcbiAqIEBwYXJhbSB7c3RyaW5nfSBba2V5PU1vZGVsS2V5cy5BVFRSSUJVVEVdIC0gVGhlIG1ldGFkYXRhIGtleSB1bmRlciB3aGljaCB0byBzdG9yZSB0aGUgcHJvcGVydHkgbmFtZVxuICogQHJldHVybiB7ZnVuY3Rpb24ob2JqZWN0LCBhbnk/KTogdm9pZH0gLSBEZWNvcmF0b3IgZnVuY3Rpb24gdGhhdCByZWdpc3RlcnMgdGhlIHByb3BlcnR5XG4gKiBAZnVuY3Rpb24gcHJvcFxuICogQGNhdGVnb3J5IFByb3BlcnR5IERlY29yYXRvcnNcbiAqXG4gKiBAbWVybWFpZFxuICogc2VxdWVuY2VEaWFncmFtXG4gKiAgICBwYXJ0aWNpcGFudCBEIGFzIERlY29yYXRvclxuICogICAgcGFydGljaXBhbnQgTSBhcyBNb2RlbFxuICpcbiAqICAgIEQtPj5NOiBDaGVjayBpZiBrZXkgZXhpc3RzXG4gKiAgICBhbHQga2V5IGV4aXN0c1xuICogICAgICAgIE0tLT4+RDogUmV0dXJuIGV4aXN0aW5nIHByb3BzIGFycmF5XG4gKiAgICBlbHNlIGtleSBkb2Vzbid0IGV4aXN0XG4gKiAgICAgICAgRC0+Pk06IENyZWF0ZSBuZXcgcHJvcHMgYXJyYXlcbiAqICAgIGVuZFxuICogICAgRC0+Pk06IENoZWNrIGlmIHByb3BlcnR5IGV4aXN0c1xuICogICAgYWx0IHByb3BlcnR5IG5vdCBpbiBhcnJheVxuICogICAgICAgIEQtPj5NOiBBZGQgcHJvcGVydHkgdG8gYXJyYXlcbiAqICAgIGVuZFxuICovXG5leHBvcnQgZnVuY3Rpb24gcHJvcChrZXk6IHN0cmluZyA9IE1vZGVsS2V5cy5BVFRSSUJVVEUpIHtcbiAgcmV0dXJuIERlY29yYXRpb24uZm9yKGtleSlcbiAgICAuZGVmaW5lKGZ1bmN0aW9uIHByb3AobW9kZWw6IG9iamVjdCwgcHJvcGVydHlLZXk/OiBhbnkpIHtcbiAgICAgIGxldCBwcm9wczogc3RyaW5nW107XG4gICAgICBpZiAoT2JqZWN0LnByb3RvdHlwZS5oYXNPd25Qcm9wZXJ0eS5jYWxsKG1vZGVsLCBrZXkpKSB7XG4gICAgICAgIHByb3BzID0gKG1vZGVsIGFzIGFueSlba2V5XTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIE9iamVjdC5kZWZpbmVQcm9wZXJ0eShtb2RlbCwga2V5LCB7XG4gICAgICAgICAgZW51bWVyYWJsZTogZmFsc2UsXG4gICAgICAgICAgY29uZmlndXJhYmxlOiBmYWxzZSxcbiAgICAgICAgICB3cml0YWJsZTogZmFsc2UsXG4gICAgICAgICAgdmFsdWU6IFtdLFxuICAgICAgICB9KTtcbiAgICAgICAgcHJvcHMgPSAobW9kZWwgYXMgYW55KVtrZXldO1xuICAgICAgfVxuICAgICAgaWYgKCFwcm9wcy5pbmNsdWRlcyhwcm9wZXJ0eUtleSBhcyBzdHJpbmcpKVxuICAgICAgICBwcm9wcy5wdXNoKHByb3BlcnR5S2V5IGFzIHN0cmluZyk7XG4gICAgfSlcbiAgICAuYXBwbHkoKTtcbn1cblxuLyoqXG4gKiBAZGVzY3JpcHRpb24gQ29tYmluZWQgcHJvcGVydHkgZGVjb3JhdG9yIGZhY3RvcnkgZm9yIG1ldGFkYXRhIGFuZCBhdHRyaWJ1dGUgbWFya2luZ1xuICogQHN1bW1hcnkgQ3JlYXRlcyBhIGRlY29yYXRvciB0aGF0IGJvdGggbWFya3MgYSBwcm9wZXJ0eSBhcyBhIG1vZGVsIGF0dHJpYnV0ZSBhbmQgYXNzaWducyBtZXRhZGF0YSB0byBpdFxuICpcbiAqIEB0ZW1wbGF0ZSBWXG4gKiBAcGFyYW0ge3N0cmluZ30ga2V5IC0gVGhlIG1ldGFkYXRhIGtleVxuICogQHBhcmFtIHtWfSB2YWx1ZSAtIFRoZSBtZXRhZGF0YSB2YWx1ZSB0byBhc3NvY2lhdGUgd2l0aCB0aGUgcHJvcGVydHlcbiAqIEByZXR1cm4ge0Z1bmN0aW9ufSAtIENvbWJpbmVkIGRlY29yYXRvciBmdW5jdGlvblxuICogQGZ1bmN0aW9uIHByb3BNZXRhZGF0YVxuICogQGNhdGVnb3J5IFByb3BlcnR5IERlY29yYXRvcnNcbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHByb3BNZXRhZGF0YTxWPihrZXk6IHN0cmluZywgdmFsdWU6IFYpIHtcbiAgcmV0dXJuIGFwcGx5KHByb3AoKSwgbWV0YWRhdGE8Vj4oa2V5LCB2YWx1ZSkpO1xufVxuIl19
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
* D->>M: Add property to array
|
|
24
24
|
* end
|
|
25
25
|
*/
|
|
26
|
-
export declare function prop(key?: string): (
|
|
26
|
+
export declare function prop(key?: string): (target: any, propertyKey?: any, descriptor?: TypedPropertyDescriptor<any>) => any;
|
|
27
27
|
/**
|
|
28
28
|
* @description Combined property decorator factory for metadata and attribute marking
|
|
29
29
|
* @summary Creates a decorator that both marks a property as a model attribute and assigns metadata to it
|
package/lib/utils/types.cjs
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Model } from \"../model\";\nimport { DecoratorData } from \"./Decoration\";\n\n/**\n * @description Interface for the final stage of the decoration builder pattern\n * @summary Represents the build stage of the decoration builder, providing the ability to apply\n * the configured decorator to a target. This is the final stage in the builder chain.\n *\n * @interface DecorationBuilderBuild\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport interface DecorationBuilderBuild {\n  /**\n   * @description Creates and returns the decorator function\n   * @summary Finalizes the builder process and returns a decorator function that can be applied to a class,\n   * property, or method.\n   *\n   * @returns {function} A decorator function that can be applied to a target\n   */\n  apply(): (\n    target: any,\n    propertyKey?: any,\n    descriptor?: TypedPropertyDescriptor<any>\n  ) => any;\n}\n\n/**\n * @description Interface for the extension stage of the decoration builder pattern\n * @summary Represents the extension stage of the decoration builder, providing the ability to add\n * additional decorators to the existing configuration.\n *\n * @interface DecorationBuilderEnd\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport interface DecorationBuilderEnd {\n  /**\n   * @description Adds additional decorators to the existing configuration\n   * @summary Extends the current decorator configuration with additional decorators.\n   * This is useful for adding behavior to existing decorators.\n   *\n   * @param {...(ClassDecorator|PropertyDecorator|MethodDecorator)} decorators - Additional decorators to add\n   * @returns {DecorationBuilderBuild} The build stage of the builder pattern\n   */\n  extend(...decorators: DecoratorData[]): DecorationBuilderBuild;\n}\n\n/**\n * @description Interface for the middle stage of the decoration builder pattern\n * @summary Represents the middle stage of the decoration builder, extending the end stage\n * and providing the ability to define the primary decorators for the configuration.\n *\n * @interface DecorationBuilderMid\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport interface DecorationBuilderMid extends DecorationBuilderEnd {\n  /**\n   * @description Defines the primary decorators for the configuration\n   * @summary Sets the main decorators for the current context. This is typically\n   * called after specifying the key with the 'for' method.\n   */\n  define(\n    ...decorators: DecoratorData[]\n  ): DecorationBuilderEnd & DecorationBuilderBuild;\n}\n\n/**\n * @description Interface for the starting stage of the decoration builder pattern\n * @summary Represents the initial stage of the decoration builder, providing the entry point\n * for the builder pattern by specifying the key for the decorator.\n *\n * @interface DecorationBuilderStart\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport interface DecorationBuilderStart {\n  /**\n   * @description Specifies the key for the decorator\n   * @summary Sets the identifier for the decorator, which is used to register and retrieve\n   * the decorator in the decoration registry.\n   *\n   * @param {string} id - The identifier for the decorator\n   * @return {DecorationBuilderMid} The middle stage of the builder pattern\n   */\n  for(id: string): DecorationBuilderMid;\n}\n\n/**\n * @description Comprehensive interface for the complete decoration builder pattern\n * @summary A unified interface that combines all stages of the decoration builder pattern,\n * providing a complete API for creating, configuring, and applying decorators.\n * This interface is implemented by the Decoration class.\n *\n * @interface IDecorationBuilder\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport interface IDecorationBuilder\n  extends DecorationBuilderStart,\n    DecorationBuilderMid,\n    DecorationBuilderEnd,\n    DecorationBuilderBuild {}\n\n/**\n * @description Type definition for a function that resolves the flavour for a target\n * @summary Defines a function type that determines the appropriate flavour for a given target object.\n * This is used by the Decoration class to resolve which flavour of decorator to apply based on the target.\n *\n * @typedef {function(object): string} FlavourResolver\n *\n * @param {object} target - The target object to resolve the flavour for\n * @return {string} The resolved flavour identifier\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport type FlavourResolver = (target: object) => string;\n\n/**\n * @description Interface for serializing and deserializing model objects\n * @summary Defines the contract for classes that can convert model objects to and from string representations.\n * Serializers are used to persist models or transmit them over networks.\n *\n * @interface Serializer\n * @template T Type of model that can be serialized, must extend Model\n * @memberOf module:decorator-validation\n * @category Model\n */\nexport interface Serializer<M extends Model> {\n  /**\n   * @description Converts a model object to a string representation\n   * @summary Serializes a model instance into a string format that can be stored or transmitted.\n   * Additional arguments can be provided to customize the serialization process.\n   *\n   * @param {T} model - The model instance to serialize\n   * @param {...any} args - Additional arguments for the serialization process\n   * @return {string} The serialized representation of the model\n   * @throws {Error} If the model cannot be serialized\n   */\n  serialize(model: M, ...args: any[]): string;\n\n  /**\n   * @description Reconstructs a model object from its string representation\n   * @summary Deserializes a string back into a model instance.\n   * Additional arguments can be provided to customize the deserialization process.\n   *\n   * @param {string} str - The serialized string to convert back to a model\n   * @param {...any} args - Additional arguments for the deserialization process\n   * @return {T} The reconstructed model instance\n   * @throws {Error} If the string cannot be deserialized into a valid model\n   */\n  deserialize(str: string, ...args: any[]): M;\n}\n"]}
|
package/lib/utils/types.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Model } from "../model";
|
|
2
|
+
import { DecoratorData } from "./Decoration";
|
|
2
3
|
/**
|
|
3
4
|
* @description Interface for the final stage of the decoration builder pattern
|
|
4
5
|
* @summary Represents the build stage of the decoration builder, providing the ability to apply
|
|
@@ -36,7 +37,7 @@ export interface DecorationBuilderEnd {
|
|
|
36
37
|
* @param {...(ClassDecorator|PropertyDecorator|MethodDecorator)} decorators - Additional decorators to add
|
|
37
38
|
* @returns {DecorationBuilderBuild} The build stage of the builder pattern
|
|
38
39
|
*/
|
|
39
|
-
extend(...decorators:
|
|
40
|
+
extend(...decorators: DecoratorData[]): DecorationBuilderBuild;
|
|
40
41
|
}
|
|
41
42
|
/**
|
|
42
43
|
* @description Interface for the middle stage of the decoration builder pattern
|
|
@@ -53,7 +54,7 @@ export interface DecorationBuilderMid extends DecorationBuilderEnd {
|
|
|
53
54
|
* @summary Sets the main decorators for the current context. This is typically
|
|
54
55
|
* called after specifying the key with the 'for' method.
|
|
55
56
|
*/
|
|
56
|
-
define(...decorators:
|
|
57
|
+
define(...decorators: DecoratorData[]): DecorationBuilderEnd & DecorationBuilderBuild;
|
|
57
58
|
}
|
|
58
59
|
/**
|
|
59
60
|
* @description Interface for the starting stage of the decoration builder pattern
|
|
@@ -80,9 +80,13 @@ let ListValidator = class ListValidator extends Validator_1.Validator {
|
|
|
80
80
|
hasErrors(value, options) {
|
|
81
81
|
if (!value || (Array.isArray(value) ? !value.length : !value.size))
|
|
82
82
|
return;
|
|
83
|
-
const clazz = Array.isArray(options.clazz)
|
|
84
|
-
|
|
85
|
-
|
|
83
|
+
const clazz = (Array.isArray(options.clazz) ? options.clazz : [options.clazz]).map((c) => {
|
|
84
|
+
if (typeof c === "string")
|
|
85
|
+
return c;
|
|
86
|
+
if (!c.name)
|
|
87
|
+
return c().name;
|
|
88
|
+
return c.name;
|
|
89
|
+
});
|
|
86
90
|
let val, isValid = true;
|
|
87
91
|
for (let i = 0; i < (Array.isArray(value) ? value.length : value.size); i++) {
|
|
88
92
|
val = value[i];
|
|
@@ -106,4 +110,4 @@ exports.ListValidator = ListValidator = __decorate([
|
|
|
106
110
|
(0, decorators_1.validator)(constants_1.ValidationKeys.LIST),
|
|
107
111
|
__metadata("design:paramtypes", [String])
|
|
108
112
|
], ListValidator);
|
|
109
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTGlzdFZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy92YWxpZGF0aW9uL1ZhbGlkYXRvcnMvTGlzdFZhbGlkYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSwrQ0FBd0M7QUFDeEMsK0NBQXFFO0FBQ3JFLGlEQUF5QztBQUl6Qzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0E0Q0c7QUFFSSxJQUFNLGFBQWEsR0FBbkIsTUFBTSxhQUFjLFNBQVEscUJBQStCO0lBQ2hFLFlBQVksVUFBa0Isa0NBQXNCLENBQUMsSUFBSTtRQUN2RCxLQUFLLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRDs7Ozs7Ozs7Ozs7Ozs7T0FjRztJQUNILFNBQVMsQ0FDUCxLQUF1QixFQUN2QixPQUE2QjtRQUU3QixJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUM7WUFBRSxPQUFPO1FBRTNFLE1BQU0sS0FBSyxHQUFHLENBQ1osS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUMvRCxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ1YsSUFBSSxPQUFPLENBQUMsS0FBSyxRQUFRO2dCQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSTtnQkFBRSxPQUFRLENBQTRCLEVBQUUsQ0FBQyxJQUFJLENBQUM7WUFDekQsT0FBTyxDQUFDLENBQUMsSUFBSSxDQUFDO1FBQ2hCLENBQUMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxHQUFRLEVBQ1YsT0FBTyxHQUFHLElBQUksQ0FBQztRQUNqQixLQUNFLElBQUksQ0FBQyxHQUFHLENBQUMsRUFDVCxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQ3RELENBQUMsRUFBRSxFQUNILENBQUM7WUFDRCxHQUFHLEdBQUksS0FBYSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hCLFFBQVEsT0FBTyxHQUFHLEVBQUUsQ0FBQztnQkFDbkIsS0FBSyxRQUFRLENBQUM7Z0JBQ2QsS0FBSyxVQUFVO29CQUNiLE9BQU8sR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFFLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBWSxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFDLG9CQUFvQjtvQkFDekYsTUFBTTtnQkFDUjtvQkFDRSxPQUFPLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQVMsRUFBRSxFQUFFLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7b0JBQ3BFLE1BQU07WUFDVixDQUFDO1FBQ0gsQ0FBQztRQUVELE9BQU8sT0FBTztZQUNaLENBQUMsQ0FBQyxTQUFTO1lBQ1gsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzlELENBQUM7Q0FDRixDQUFBO0FBeERZLHNDQUFhO3dCQUFiLGFBQWE7SUFEekIsSUFBQSxzQkFBUyxFQUFDLDBCQUFjLENBQUMsSUFBSSxDQUFDOztHQUNsQixhQUFhLENBd0R6QiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFZhbGlkYXRvciB9IGZyb20gXCIuL1ZhbGlkYXRvclwiO1xuaW1wb3J0IHsgREVGQVVMVF9FUlJPUl9NRVNTQUdFUywgVmFsaWRhdGlvbktleXMgfSBmcm9tIFwiLi9jb25zdGFudHNcIjtcbmltcG9ydCB7IHZhbGlkYXRvciB9IGZyb20gXCIuL2RlY29yYXRvcnNcIjtcbmltcG9ydCB7IExpc3RWYWxpZGF0b3JPcHRpb25zIH0gZnJvbSBcIi4uL3R5cGVzXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3RvciB9IGZyb20gXCIuLi8uLi9tb2RlbFwiO1xuXG4vKipcbiAqIEBkZXNjcmlwdGlvbiBWYWxpZGF0b3IgZm9yIGNoZWNraW5nIGlmIGVsZW1lbnRzIGluIGEgbGlzdCBvciBzZXQgbWF0Y2ggZXhwZWN0ZWQgdHlwZXNcbiAqIEBzdW1tYXJ5IFRoZSBMaXN0VmFsaWRhdG9yIHZhbGlkYXRlcyB0aGF0IGFsbCBlbGVtZW50cyBpbiBhbiBhcnJheSBvciBTZXQgbWF0Y2ggdGhlIGV4cGVjdGVkIHR5cGVzLlxuICogSXQgY2hlY2tzIGVhY2ggZWxlbWVudCBhZ2FpbnN0IGEgbGlzdCBvZiBhbGxvd2VkIGNsYXNzIHR5cGVzIGFuZCBlbnN1cmVzIHR5cGUgY29uc2lzdGVuY3kuXG4gKiBUaGlzIHZhbGlkYXRvciBpcyB0eXBpY2FsbHkgdXNlZCB3aXRoIHRoZSBAbGlzdCBkZWNvcmF0b3IuXG4gKlxuICogQHBhcmFtIHtzdHJpbmd9IFttZXNzYWdlXSAtIEN1c3RvbSBlcnJvciBtZXNzYWdlIHRvIGRpc3BsYXkgd2hlbiB2YWxpZGF0aW9uIGZhaWxzLCBkZWZhdWx0cyB0byB7QGxpbmsgREVGQVVMVF9FUlJPUl9NRVNTQUdFUyNMSVNUfVxuICpcbiAqIEBjbGFzcyBMaXN0VmFsaWRhdG9yXG4gKiBAZXh0ZW5kcyBWYWxpZGF0b3JcbiAqXG4gKiBAZXhhbXBsZVxuICogYGBgdHlwZXNjcmlwdFxuICogLy8gQ3JlYXRlIGEgbGlzdCB2YWxpZGF0b3Igd2l0aCBkZWZhdWx0IGVycm9yIG1lc3NhZ2VcbiAqIGNvbnN0IGxpc3RWYWxpZGF0b3IgPSBuZXcgTGlzdFZhbGlkYXRvcigpO1xuICpcbiAqIC8vIENyZWF0ZSBhIGxpc3QgdmFsaWRhdG9yIHdpdGggY3VzdG9tIGVycm9yIG1lc3NhZ2VcbiAqIGNvbnN0IGN1c3RvbUxpc3RWYWxpZGF0b3IgPSBuZXcgTGlzdFZhbGlkYXRvcihcIkFsbCBpdGVtcyBtdXN0IGJlIG9mIHRoZSBzcGVjaWZpZWQgdHlwZVwiKTtcbiAqXG4gKiAvLyBWYWxpZGF0ZSBhIGxpc3RcbiAqIGNvbnN0IG9wdGlvbnMgPSB7IGNsYXp6OiBbXCJTdHJpbmdcIiwgXCJOdW1iZXJcIl0gfTtcbiAqIGNvbnN0IHJlc3VsdCA9IGxpc3RWYWxpZGF0b3IuaGFzRXJyb3JzKFtcInRlc3RcIiwgMTIzXSwgb3B0aW9ucyk7IC8vIHVuZGVmaW5lZCAodmFsaWQpXG4gKiBjb25zdCBpbnZhbGlkUmVzdWx0ID0gbGlzdFZhbGlkYXRvci5oYXNFcnJvcnMoW25ldyBEYXRlKCldLCBvcHRpb25zKTsgLy8gUmV0dXJucyBlcnJvciBtZXNzYWdlIChpbnZhbGlkKVxuICogYGBgXG4gKlxuICogQG1lcm1haWRcbiAqIHNlcXVlbmNlRGlhZ3JhbVxuICogICBwYXJ0aWNpcGFudCBDIGFzIENsaWVudFxuICogICBwYXJ0aWNpcGFudCBWIGFzIExpc3RWYWxpZGF0b3JcbiAqXG4gKiAgIEMtPj5WOiBuZXcgTGlzdFZhbGlkYXRvcihtZXNzYWdlKVxuICogICBDLT4+VjogaGFzRXJyb3JzKHZhbHVlLCBvcHRpb25zKVxuICogICBhbHQgdmFsdWUgaXMgZW1wdHlcbiAqICAgICBWLS0+PkM6IHVuZGVmaW5lZCAodmFsaWQpXG4gKiAgIGVsc2UgdmFsdWUgaGFzIGVsZW1lbnRzXG4gKiAgICAgVi0+PlY6IENoZWNrIGVhY2ggZWxlbWVudCdzIHR5cGVcbiAqICAgICBhbHQgQWxsIGVsZW1lbnRzIG1hdGNoIGFsbG93ZWQgdHlwZXNcbiAqICAgICAgIFYtLT4+QzogdW5kZWZpbmVkICh2YWxpZClcbiAqICAgICBlbHNlIFNvbWUgZWxlbWVudHMgZG9uJ3QgbWF0Y2hcbiAqICAgICAgIFYtLT4+QzogRXJyb3IgbWVzc2FnZVxuICogICAgIGVuZFxuICogICBlbmRcbiAqXG4gKiBAY2F0ZWdvcnkgVmFsaWRhdG9yc1xuICovXG5AdmFsaWRhdG9yKFZhbGlkYXRpb25LZXlzLkxJU1QpXG5leHBvcnQgY2xhc3MgTGlzdFZhbGlkYXRvciBleHRlbmRzIFZhbGlkYXRvcjxMaXN0VmFsaWRhdG9yT3B0aW9ucz4ge1xuICBjb25zdHJ1Y3RvcihtZXNzYWdlOiBzdHJpbmcgPSBERUZBVUxUX0VSUk9SX01FU1NBR0VTLkxJU1QpIHtcbiAgICBzdXBlcihtZXNzYWdlLCBBcnJheS5uYW1lLCBTZXQubmFtZSk7XG4gIH1cblxuICAvKipcbiAgICogQGRlc2NyaXB0aW9uIENoZWNrcyBpZiBhbGwgZWxlbWVudHMgaW4gYSBsaXN0IG9yIHNldCBtYXRjaCB0aGUgZXhwZWN0ZWQgdHlwZXNcbiAgICogQHN1bW1hcnkgVmFsaWRhdGVzIHRoYXQgZWFjaCBlbGVtZW50IGluIHRoZSBwcm92aWRlZCBhcnJheSBvciBTZXQgbWF0Y2hlcyBvbmUgb2YgdGhlXG4gICAqIGNsYXNzIHR5cGVzIHNwZWNpZmllZCBpbiB0aGUgb3B0aW9ucy4gRm9yIG9iamVjdCB0eXBlcywgaXQgY2hlY2tzIHRoZSBjb25zdHJ1Y3RvciBuYW1lLFxuICAgKiBhbmQgZm9yIHByaW1pdGl2ZSB0eXBlcywgaXQgY29tcGFyZXMgYWdhaW5zdCB0aGUgbG93ZXJjYXNlIHR5cGUgbmFtZS5cbiAgICpcbiAgICogQHBhcmFtIHthbnlbXSB8IFNldDxhbnk+fSB2YWx1ZSAtIFRoZSBhcnJheSBvciBTZXQgdG8gdmFsaWRhdGVcbiAgICogQHBhcmFtIHtMaXN0VmFsaWRhdG9yT3B0aW9uc30gb3B0aW9ucyAtIENvbmZpZ3VyYXRpb24gb3B0aW9ucyBjb250YWluaW5nIHRoZSBhbGxvd2VkIGNsYXNzIHR5cGVzXG4gICAqXG4gICAqIEByZXR1cm4ge3N0cmluZyB8IHVuZGVmaW5lZH0gRXJyb3IgbWVzc2FnZSBpZiB2YWxpZGF0aW9uIGZhaWxzLCB1bmRlZmluZWQgaWYgdmFsaWRhdGlvbiBwYXNzZXNcbiAgICpcbiAgICogQG92ZXJyaWRlXG4gICAqXG4gICAqIEBzZWUgVmFsaWRhdG9yI2hhc0Vycm9yc1xuICAgKi9cbiAgaGFzRXJyb3JzKFxuICAgIHZhbHVlOiBhbnlbXSB8IFNldDxhbnk+LFxuICAgIG9wdGlvbnM6IExpc3RWYWxpZGF0b3JPcHRpb25zXG4gICk6IHN0cmluZyB8IHVuZGVmaW5lZCB7XG4gICAgaWYgKCF2YWx1ZSB8fCAoQXJyYXkuaXNBcnJheSh2YWx1ZSkgPyAhdmFsdWUubGVuZ3RoIDogIXZhbHVlLnNpemUpKSByZXR1cm47XG5cbiAgICBjb25zdCBjbGF6eiA9IChcbiAgICAgIEFycmF5LmlzQXJyYXkob3B0aW9ucy5jbGF6eikgPyBvcHRpb25zLmNsYXp6IDogW29wdGlvbnMuY2xhenpdXG4gICAgKS5tYXAoKGMpID0+IHtcbiAgICAgIGlmICh0eXBlb2YgYyA9PT0gXCJzdHJpbmdcIikgcmV0dXJuIGM7XG4gICAgICBpZiAoIWMubmFtZSkgcmV0dXJuIChjIGFzICgpID0+IENvbnN0cnVjdG9yPGFueT4pKCkubmFtZTtcbiAgICAgIHJldHVybiBjLm5hbWU7XG4gICAgfSk7XG4gICAgbGV0IHZhbDogYW55LFxuICAgICAgaXNWYWxpZCA9IHRydWU7XG4gICAgZm9yIChcbiAgICAgIGxldCBpID0gMDtcbiAgICAgIGkgPCAoQXJyYXkuaXNBcnJheSh2YWx1ZSkgPyB2YWx1ZS5sZW5ndGggOiB2YWx1ZS5zaXplKTtcbiAgICAgIGkrK1xuICAgICkge1xuICAgICAgdmFsID0gKHZhbHVlIGFzIGFueSlbaV07XG4gICAgICBzd2l0Y2ggKHR5cGVvZiB2YWwpIHtcbiAgICAgICAgY2FzZSBcIm9iamVjdFwiOlxuICAgICAgICBjYXNlIFwiZnVuY3Rpb25cIjpcbiAgICAgICAgICBpc1ZhbGlkID0gY2xhenouaW5jbHVkZXMoKCh2YWwgPz8ge30pIGFzIG9iamVjdCkuY29uc3RydWN0b3I/Lm5hbWUpOyAvLyBudWxsIGlzIGFuIG9iamVjdFxuICAgICAgICAgIGJyZWFrO1xuICAgICAgICBkZWZhdWx0OlxuICAgICAgICAgIGlzVmFsaWQgPSBjbGF6ei5zb21lKChjOiBzdHJpbmcpID0+IHR5cGVvZiB2YWwgPT09IGMudG9Mb3dlckNhc2UoKSk7XG4gICAgICAgICAgYnJlYWs7XG4gICAgICB9XG4gICAgfVxuXG4gICAgcmV0dXJuIGlzVmFsaWRcbiAgICAgID8gdW5kZWZpbmVkXG4gICAgICA6IHRoaXMuZ2V0TWVzc2FnZShvcHRpb25zLm1lc3NhZ2UgfHwgdGhpcy5tZXNzYWdlLCBjbGF6eik7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -96,13 +96,17 @@ let TypeValidator = class TypeValidator extends Validator_1.Validator {
|
|
|
96
96
|
hasErrors(value, options) {
|
|
97
97
|
if (value === undefined)
|
|
98
98
|
return; // Don't try and enforce type if undefined
|
|
99
|
-
const { types, message } = options;
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
99
|
+
const { types, message, customTypes } = options;
|
|
100
|
+
let ts = customTypes || types;
|
|
101
|
+
ts = (Array.isArray(ts) ? ts : [ts]).map((t) => {
|
|
102
|
+
if (typeof t === "string")
|
|
103
|
+
return t;
|
|
104
|
+
if (typeof t === "function" && !t.name)
|
|
105
|
+
t = t();
|
|
106
|
+
return t.name || t;
|
|
107
|
+
});
|
|
108
|
+
if (!reflection_1.Reflection.evaluateDesignTypes(value, ts))
|
|
109
|
+
return this.getMessage(message || this.message, typeof ts === "string" ? ts : Array.isArray(ts) ? ts.join(", ") : ts, typeof value);
|
|
106
110
|
}
|
|
107
111
|
};
|
|
108
112
|
exports.TypeValidator = TypeValidator;
|
|
@@ -123,4 +127,4 @@ Validation_1.Validation.register({
|
|
|
123
127
|
validationKey: constants_2.ModelKeys.TYPE,
|
|
124
128
|
save: false,
|
|
125
129
|
});
|
|
126
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"TypeValidator.js","sourceRoot":"","sources":["../../../src/validation/Validators/TypeValidator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AACxC,+CAAqE;AACrE,iDAAyC;AACzC,oDAA2C;AAM3C,2DAAkD;AAClD,qDAAkD;AAElD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAEI,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,qBAA+B;IAChE,YAAY,UAAkB,kCAAsB,CAAC,IAAI;QACvD,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACI,SAAS,CACd,KAAU,EACV,OAA6B;QAE7B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,0CAA0C;QAE3E,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAEhD,IAAI,EAAE,GAAG,WAAW,IAAI,KAAK,CAAC;QAC9B,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7C,IAAI,OAAO,CAAC,KAAK,QAAQ;gBAAE,OAAO,CAAC,CAAC;YACpC,IAAI,OAAO,CAAC,KAAK,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI;gBAAE,CAAC,GAAI,CAAkB,EAAE,CAAC;YAClE,OAAQ,CAAS,CAAC,IAAI,IAAI,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAU,CAAC,mBAAmB,CAAC,KAAK,EAAE,EAAS,CAAC;YACnD,OAAO,IAAI,CAAC,UAAU,CACpB,OAAO,IAAI,IAAI,CAAC,OAAO,EACvB,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EACpE,OAAO,KAAK,CACb,CAAC;IACN,CAAC;CACF,CAAA;AA1CY,sCAAa;wBAAb,aAAa;IADzB,IAAA,sBAAS,EAAC,0BAAc,CAAC,IAAI,CAAC;;GAClB,aAAa,CA0CzB;AAED;;;;;;;GAOG;AACH,uBAAU,CAAC,QAAQ,CAAC;IAClB,SAAS,EAAE,aAAiC;IAC5C,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,IAAI,EAAE,KAAK;CACW,CAAC,CAAC","sourcesContent":["import { Validator } from \"./Validator\";\nimport { DEFAULT_ERROR_MESSAGES, ValidationKeys } from \"./constants\";\nimport { validator } from \"./decorators\";\nimport { Validation } from \"../Validation\";\nimport {\n  TypeValidatorOptions,\n  ValidatorDefinition,\n  ValidatorOptions,\n} from \"../types\";\nimport { ModelKeys } from \"../../utils/constants\";\nimport { Reflection } from \"@decaf-ts/reflection\";\n\n/**\n * @description Validator for checking if a value is of the expected type(s)\n * @summary The TypeValidator ensures that a value matches one of the specified types.\n * It can validate against a single type, multiple types, or a type with a specific name.\n * This validator is typically used with the @type decorator and is fundamental for\n * ensuring type safety in validated models.\n *\n * @param {string} [message] - Custom error message to display when validation fails, defaults to {@link DEFAULT_ERROR_MESSAGES#TYPE}\n *\n * @class TypeValidator\n * @extends Validator\n *\n * @example\n * ```typescript\n * // Create a type validator with default error message\n * const typeValidator = new TypeValidator();\n *\n * // Create a type validator with custom error message\n * const customTypeValidator = new TypeValidator(\"Value must be of type {0}, but got {1}\");\n *\n * // Validate against a single type\n * const stringOptions = { types: \"string\" };\n * typeValidator.hasErrors(\"hello\", stringOptions); // undefined (valid)\n * typeValidator.hasErrors(123, stringOptions); // Returns error message (invalid)\n *\n * // Validate against multiple types\n * const multiOptions = { types: [\"string\", \"number\"] };\n * typeValidator.hasErrors(\"hello\", multiOptions); // undefined (valid)\n * typeValidator.hasErrors(123, multiOptions); // undefined (valid)\n * typeValidator.hasErrors(true, multiOptions); // Returns error message (invalid)\n *\n * // Validate against a class type\n * const classOptions = { types: { name: \"Date\" } };\n * typeValidator.hasErrors(new Date(), classOptions); // undefined (valid)\n * ```\n *\n * @mermaid\n * sequenceDiagram\n *   participant C as Client\n *   participant V as TypeValidator\n *   participant R as Reflection\n *\n *   C->>V: new TypeValidator(message)\n *   C->>V: hasErrors(value, options)\n *   alt value is undefined\n *     V-->>C: undefined (valid)\n *   else value is defined\n *     V->>R: evaluateDesignTypes(value, types)\n *     alt type evaluation passes\n *       V-->>C: undefined (valid)\n *     else type evaluation fails\n *       V->>V: Format error message with type info\n *       V-->>C: Error message\n *     end\n *   end\n *\n * @category Validators\n */\n@validator(ValidationKeys.TYPE)\nexport class TypeValidator extends Validator<TypeValidatorOptions> {\n  constructor(message: string = DEFAULT_ERROR_MESSAGES.TYPE) {\n    super(message);\n  }\n\n  /**\n   * @description Checks if a value is of the expected type(s)\n   * @summary Validates that the provided value matches one of the specified types.\n   * It uses the Reflection utility to evaluate if the value's type matches the expected types.\n   * The method skips validation for undefined values to avoid conflicts with the RequiredValidator.\n   *\n   * @param {any} value - The value to validate\n   * @param {TypeValidatorOptions} options - Configuration options containing the expected types\n   *\n   * @return {string | undefined} Error message if validation fails, undefined if validation passes\n   *\n   * @override\n   *\n   * @see Validator#hasErrors\n   */\n  public hasErrors(\n    value: any,\n    options: TypeValidatorOptions\n  ): string | undefined {\n    if (value === undefined) return; // Don't try and enforce type if undefined\n\n    const { types, message, customTypes } = options;\n\n    let ts = customTypes || types;\n    ts = (Array.isArray(ts) ? ts : [ts]).map((t) => {\n      if (typeof t === \"string\") return t;\n      if (typeof t === \"function\" && !t.name) t = (t as () => string)();\n      return (t as any).name || t;\n    });\n\n    if (!Reflection.evaluateDesignTypes(value, ts as any))\n      return this.getMessage(\n        message || this.message,\n        typeof ts === \"string\" ? ts : Array.isArray(ts) ? ts.join(\", \") : ts,\n        typeof value\n      );\n  }\n}\n\n/**\n * @description Register the TypeValidator with the Validation registry\n * @summary This registration associates the TypeValidator with the ModelKeys.TYPE key,\n * allowing it to be used for validating design types. The save flag is set to false\n * to prevent the validator from being saved in the standard validator registry.\n *\n * @memberOf module:decorator-validation\n */\nValidation.register({\n  validator: TypeValidator as ValidatorOptions,\n  validationKey: ModelKeys.TYPE,\n  save: false,\n} as ValidatorDefinition);\n"]}
|