@decaf-ts/decorator-validation 1.10.5 → 1.11.0

package/lib/esm/model/Model.d.ts

@@ -1,7 +1,8 @@
 import { BuilderRegistry } from "../utils/registry";
 import { ModelErrorDefinition } from "./ModelErrorDefinition";
-import { Comparable, Constructor, Hashable, ModelArg, ModelBuilderFunction, ModelConstructor, Serializable, Validatable } from "./types";
+import { Comparable, Hashable, ModelArg, ModelBuilderFunction, ModelConstructor, Serializable, Validatable } from "./types";
 import { ConditionalAsync } from "../types";
+import { Constructor } from "@decaf-ts/decoration";
 /**
  * @description Registry type for storing and retrieving model constructors
  * @summary The ModelRegistry type defines a registry for model constructors that extends
@@ -300,15 +301,6 @@ export declare abstract class Model<Async extends boolean = false> implements Va
      * @see ModelRegistry
      */
     static build<T extends Model>(obj?: Record<string, any>, clazz?: string): T;
-    /**
-     * @description Retrieves the model metadata from a model instance
-     * @summary Gets the metadata associated with a model instance, typically the model class name
-     *
-     * @template M
-     * @param {M} model - The model instance to get metadata from
-     * @return {string} - The model metadata (typically the class name)
-     */
-    static getMetadata<M extends Model>(model: M): any;
     /**
      * @description Retrieves all attribute names from a model class or instance
      * @summary Gets all attributes defined in a model, traversing the prototype chain to include inherited attributes
@@ -358,14 +350,6 @@ export declare abstract class Model<Async extends boolean = false> implements Va
      * @return {string} - The hash string representing the model
      */
     static hash<M extends Model<boolean>>(model: M): any;
-    /**
-     * @description Creates a metadata key for use with the Reflection API
-     * @summary Builds the key to store as Metadata under Reflections
-     *
-     * @param {string} str - The base key to concatenate with the model reflection prefix
-     * @return {string} - The complete metadata key
-     */
-    static key(str: string): string;
     /**
      * @description Determines if an object is a model instance or has model metadata
      * @summary Checks whether a given object is either an instance of the Model class or
@@ -400,5 +384,23 @@ export declare abstract class Model<Async extends boolean = false> implements Va
      * the model name if the property has a model type, or undefined if not a model
      */
     static isPropertyModel<M extends Model>(target: M, attribute: string): boolean | string | undefined;
-    static describe<M extends Model>(model: M | Constructor<M>, key?: keyof M): any;
+    static describe<M extends Model>(model: Constructor<M>, key?: keyof M): string | undefined;
+    /**
+     * @description Returns if a Model property should be validated
+     * @summary Returns if a Model property should be validated. Use for models that are relations.
+     *
+     * @template model - The model type extending from Model
+     * @param {M} model - The constructor of the target model class
+     * @param {string} property - The property name to retrieve validation for
+     * @return {boolean} An object of the designtypes
+     *
+     * @example
+     * Class Contacts extends Model{}
+     * class User extends Model {
+     *  contacts: Contacts
+     * }
+     *
+     *   const shouldValidate = shouldValidateNestedHandler(User,'contacts')
+     */
+    private static shouldValidateNestedHandler;
 }

package/lib/esm/model/Model.js

@@ -1,12 +1,12 @@
 import { Serialization } from "./../utils/serialization.js";
-import { isEqual, Reflection } from "@decaf-ts/reflection";
 import { validate } from "./validation.js";
 import { Hashing } from "./../utils/hashing.js";
 import { ModelKeys } from "./../utils/constants.js";
 import { ValidationKeys } from "./../validation/Validators/constants.js";
 import { jsTypes, ReservedModels } from "./constants.js";
-import { getMetadata, getModelKey } from "./utils.js";
 import { ASYNC_META_KEY } from "./../constants/index.js";
+import { Metadata } from "@decaf-ts/decoration";
+import { isEqual } from "./../utils/equality.js";
 let modelBuilderFunction;
 let actingModelRegistry;
 /**
@@ -100,7 +100,7 @@ export class ModelRegistryManager {
     build(obj = {}, clazz) {
         if (!clazz && !this.testFunction(obj))
             throw new Error("Provided obj is not a Model object");
-        const name = clazz || Model.getMetadata(obj);
+        const name = clazz || Metadata.modelName(obj.constructor);
         if (!(name in this.cache))
             throw new Error(`Provided class ${name} is not a registered Model object`);
         return new this.cache[name](obj);
@@ -211,7 +211,14 @@ export class Model {
      * @throws {Error} If it fails to parse the string, or if it fails to build the model
      */
     static deserialize(str) {
-        const metadata = Reflect.getMetadata(Model.key(ModelKeys.SERIALIZATION), this.constructor);
+        let metadata;
+        try {
+            metadata = Metadata.get(this.constructor, ModelKeys.SERIALIZATION);
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        }
+        catch (e) {
+            metadata = undefined;
+        }
         if (metadata && metadata.serializer)
             return Serialization.deserialize(str, metadata.serializer, ...(metadata.args || []));
         return Serialization.deserialize(str);
@@ -279,7 +286,7 @@ export class Model {
     static fromModel(self, obj) {
         if (!obj)
             obj = {};
-        let decorators, dec;
+        let decorators;
         const props = Model.getAttributes(self);
         const proto = Object.getPrototypeOf(self);
         let descriptor;
@@ -307,72 +314,52 @@ export class Model {
                 }
                 continue;
             }
-            const allDecorators = Reflection.getPropertyDecorators(ValidationKeys.REFLECT, self, prop).decorators;
-            decorators = allDecorators.filter((d) => [ModelKeys.TYPE, ValidationKeys.TYPE].indexOf(d.key) !== -1);
+            decorators = Metadata.allowedTypes(self.constructor, prop);
             if (!decorators || !decorators.length)
                 throw new Error(`failed to find decorators for property ${prop}`);
-            dec = decorators.pop();
-            const clazz = dec.props.name
-                ? [dec.props.name]
-                : (Array.isArray(dec.props.customTypes)
-                    ? dec.props.customTypes
-                    : [dec.props.customTypes]).map((t) => (typeof t === "function" ? t() : t));
-            const reserved = Object.values(ReservedModels).map((v) => v.toLowerCase());
+            const clazz = decorators.map((t) => typeof t === "function" && !t.name ? t() : t);
+            const reserved = Object.values(ReservedModels);
             clazz.forEach((c) => {
-                if (typeof c === "function") {
-                    if (c.name)
-                        c = c.name;
-                    else
-                        c = c();
-                }
-                if (reserved.indexOf(c.toLowerCase()) === -1)
+                if (!reserved.includes(c))
                     try {
-                        switch (c) {
+                        switch (c.name) {
                             case "Array":
-                            case "Set":
-                                if (allDecorators.length) {
-                                    const listDec = allDecorators.find((d) => d.key === ValidationKeys.LIST);
-                                    if (listDec) {
-                                        let clazzName = listDec.props.clazz.find((t) => {
-                                            t = typeof t === "function" ? t() : t;
-                                            t = t.name ? t.name : t;
-                                            return !jsTypes.includes(t);
-                                        });
-                                        clazzName =
-                                            typeof clazzName === "string"
-                                                ? clazzName
-                                                : clazzName();
-                                        clazzName =
-                                            typeof clazzName === "string"
-                                                ? clazzName
-                                                : clazzName.name;
-                                        if (c === "Array")
-                                            self[prop] = self[prop].map((el) => {
-                                                return ["object", "function"].includes(typeof el) &&
-                                                    clazzName
-                                                    ? Model.build(el, clazzName)
-                                                    : el;
-                                            });
-                                        if (c === "Set") {
-                                            const s = new Set();
-                                            for (const v of self[prop]) {
-                                                if (["object", "function"].includes(typeof v) &&
-                                                    clazzName) {
-                                                    s.add(Model.build(v, clazzName));
-                                                }
-                                                else {
-                                                    s.add(v);
-                                                }
-                                            }
-                                            self[prop] = s;
+                            case "Set": {
+                                const validation = Metadata.validationFor(self.constructor, prop);
+                                if (!validation || !validation[ValidationKeys.LIST])
+                                    break;
+                                const listDec = validation[ValidationKeys.LIST];
+                                const clazzName = listDec.clazz
+                                    .map((t) => typeof t === "function" && !t.name
+                                    ? t()
+                                    : t)
+                                    .find((t) => !jsTypes.includes(t.name));
+                                if (c.name === "Array")
+                                    self[prop] = self[prop].map((el) => {
+                                        return ["object", "function"].includes(typeof el) &&
+                                            clazzName
+                                            ? Model.build(el, clazzName.name)
+                                            : el;
+                                    });
+                                if (c.name === "Set") {
+                                    const s = new Set();
+                                    for (const v of self[prop]) {
+                                        if (["object", "function"].includes(typeof v) &&
+                                            clazzName) {
+                                            s.add(Model.build(v, clazzName.name));
+                                        }
+                                        else {
+                                            s.add(v);
                                         }
                                     }
+                                    self[prop] = s;
                                 }
                                 break;
+                            }
                             default:
                                 if (typeof self[prop] !== "undefined" &&
-                                    Model.get(c))
-                                    self[prop] = Model.build(self[prop], c);
+                                    Model.get(c.name))
+                                    self[prop] = Model.build(self[prop], c.name);
                         }
                     }
                     catch (e) {
@@ -466,17 +453,6 @@ export class Model {
     static build(obj = {}, clazz) {
         return Model.getRegistry().build(obj, clazz);
     }
-    /**
-     * @description Retrieves the model metadata from a model instance
-     * @summary Gets the metadata associated with a model instance, typically the model class name
-     *
-     * @template M
-     * @param {M} model - The model instance to get metadata from
-     * @return {string} - The model metadata (typically the class name)
-     */
-    static getMetadata(model) {
-        return getMetadata(model);
-    }
     /**
      * @description Retrieves all attribute names from a model class or instance
      * @summary Gets all attributes defined in a model, traversing the prototype chain to include inherited attributes
@@ -486,18 +462,23 @@ export class Model {
      * @return {string[]} - Array of attribute names defined in the model
      */
     static getAttributes(model) {
-        const result = [];
-        let prototype = model instanceof Model
-            ? Object.getPrototypeOf(model)
-            : model.prototype;
-        while (prototype != null) {
-            const props = prototype[ModelKeys.ATTRIBUTE];
-            if (props) {
-                result.push(...props);
+        const constructor = model instanceof Model ? model.constructor : model;
+        const seen = new Set();
+        const collect = (current) => {
+            if (!current)
+                return [];
+            const parent = Object.getPrototypeOf(current);
+            const attributes = collect(parent);
+            const props = Metadata.properties(current) ?? [];
+            for (const prop of props) {
+                if (!seen.has(prop)) {
+                    seen.add(prop);
+                    attributes.push(prop);
+                }
             }
-            prototype = Object.getPrototypeOf(prototype);
-        }
-        return result;
+            return attributes;
+        };
+        return collect(constructor);
     }
     /**
      * @description Compares two model instances for equality
@@ -534,7 +515,14 @@ export class Model {
      * @return {string} - The serialized string representation of the model
      */
     static serialize(model) {
-        const metadata = Reflect.getMetadata(Model.key(ModelKeys.SERIALIZATION), model.constructor);
+        let metadata;
+        try {
+            metadata = Metadata.get(model.constructor, ModelKeys.SERIALIZATION);
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        }
+        catch (e) {
+            metadata = undefined;
+        }
         if (metadata && metadata.serializer)
             return Serialization.serialize(this, metadata.serializer, ...(metadata.args || []));
         return Serialization.serialize(model);
@@ -548,21 +536,11 @@ export class Model {
      * @return {string} - The hash string representing the model
      */
     static hash(model) {
-        const metadata = Reflect.getMetadata(Model.key(ModelKeys.HASHING), model.constructor);
+        const metadata = Metadata.get(model.constructor, ModelKeys.HASHING);
         if (metadata && metadata.algorithm)
             return Hashing.hash(model, metadata.algorithm, ...(metadata.args || []));
         return Hashing.hash(model);
     }
-    /**
-     * @description Creates a metadata key for use with the Reflection API
-     * @summary Builds the key to store as Metadata under Reflections
-     *
-     * @param {string} str - The base key to concatenate with the model reflection prefix
-     * @return {string} - The complete metadata key
-     */
-    static key(str) {
-        return getModelKey(str);
-    }
     /**
      * @description Determines if an object is a model instance or has model metadata
      * @summary Checks whether a given object is either an instance of the Model class or
@@ -586,7 +564,16 @@ export class Model {
      */
     static isModel(target) {
         try {
-            return target instanceof Model || !!Model.getMetadata(target);
+            if (target instanceof Model)
+                return true;
+            const constr = Metadata.constr(target);
+            if (!constr || constr === target)
+                return false;
+            return !!Metadata.modelName(constr);
+            //
+            // // return target instanceof Model || !!Metadata.modelName(target as any);
+            // const modelName = Metadata.modelName(target as any);
+            // return target instanceof Model || !!Model.get(modelName);
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
         }
         catch (e) {
@@ -605,22 +592,42 @@ export class Model {
      * the model name if the property has a model type, or undefined if not a model
      */
     static isPropertyModel(target, attribute) {
-        if (Model.isModel(target[attribute]))
+        const isModel = Model.isModel(target[attribute]);
+        if (isModel)
             return true;
-        const metadata = Reflect.getMetadata(ModelKeys.TYPE, target, attribute);
+        const metadata = Metadata.type(target.constructor, attribute);
         if (!metadata)
             return undefined;
         return Model.get(metadata.name) ? metadata.name : undefined;
     }
     static describe(model, key) {
-        const descKey = Model.key(ModelKeys.DESCRIPTION);
-        if (key) {
-            model = model instanceof Model ? model : new model();
-            return (Reflect.getMetadataKeys(model.constructor, key.toString())
-                .find((k) => k === descKey)
-                ?.toString() || model.toString());
-        }
-        return (Reflect.getMetadata(Model.key(ModelKeys.DESCRIPTION), model instanceof Model ? model.constructor : model) || model.toString());
+        return Metadata.description(model, key);
     }
+    /**
+     * @description Returns if a Model property should be validated
+     * @summary Returns if a Model property should be validated. Use for models that are relations.
+     *
+     * @template model - The model type extending from Model
+     * @param {M} model - The constructor of the target model class
+     * @param {string} property - The property name to retrieve validation for
+     * @return {boolean} An object of the designtypes
+     *
+     * @example
+     * Class Contacts extends Model{}
+     * class User extends Model {
+     *  contacts: Contacts
+     * }
+     *
+     *   const shouldValidate = shouldValidateNestedHandler(User,'contacts')
+     */
+    static { this.shouldValidateNestedHandler = function (model, property) {
+        const instance = model[property];
+        if (!instance)
+            return false;
+        const isValidModel = typeof instance === "object" && typeof instance.hasErrors === "function";
+        if (!isValidModel)
+            console.log(`The instance should be validatable but it is not`);
+        return isValidModel;
+    }; }
 }
 //# sourceMappingURL=Model.js.map

package/lib/esm/model/Model.js.map

@@ -1 +1 @@
-{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/model/Model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/model/Model.ts"],"names":[],"mappings":"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"}

package/lib/esm/model/constants.d.ts

@@ -32,20 +32,20 @@ export declare enum Primitives {
  * @readonly
  * @memberOf module:decorator-validation
  */
-export declare enum ReservedModels {
+export declare const ReservedModels: {
     /** reserved name for string */
-    STRING = "string",
+    STRING: StringConstructor;
     /** reserved name for object */
-    OBJECT = "object",
+    OBJECT: ObjectConstructor;
     /** reserved name for number */
-    NUMBER = "number",
+    NUMBER: NumberConstructor;
     /** reserved name for boolean */
-    BOOLEAN = "boolean",
+    BOOLEAN: BooleanConstructor;
     /** reserved name for bigint */
-    BIGINT = "bigint",
+    BIGINT: BigIntConstructor;
     /** reserved name for Date */
-    DATE = "date"
-}
+    DATE: DateConstructor;
+};
 /**
  * @description Basic supported JavaScript types used by the validation system.
  * @summary References the basic supported JS types as strings that can be used for type checking and metadata.

package/lib/esm/model/constants.js

@@ -33,21 +33,20 @@ export var Primitives;
  * @readonly
  * @memberOf module:decorator-validation
  */
-export var ReservedModels;
-(function (ReservedModels) {
+export const ReservedModels = {
     /** reserved name for string */
-    ReservedModels["STRING"] = "string";
+    STRING: String,
     /** reserved name for object */
-    ReservedModels["OBJECT"] = "object";
+    OBJECT: Object,
     /** reserved name for number */
-    ReservedModels["NUMBER"] = "number";
+    NUMBER: Number,
     /** reserved name for boolean */
-    ReservedModels["BOOLEAN"] = "boolean";
+    BOOLEAN: Boolean,
     /** reserved name for bigint */
-    ReservedModels["BIGINT"] = "bigint";
+    BIGINT: BigInt,
     /** reserved name for Date */
-    ReservedModels["DATE"] = "date";
-})(ReservedModels || (ReservedModels = {}));
+    DATE: Date,
+};
 /**
  * @description Basic supported JavaScript types used by the validation system.
  * @summary References the basic supported JS types as strings that can be used for type checking and metadata.

package/lib/esm/model/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/model/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,CAAN,IAAY,UASX;AATD,WAAY,UAAU;IACpB,sCAAsC;IACtC,+BAAiB,CAAA;IACjB,sCAAsC;IACtC,+BAAiB,CAAA;IACjB,uCAAuC;IACvC,iCAAmB,CAAA;IACnB,sCAAsC;IACtC,+BAAiB,CAAA;AACnB,CAAC,EATW,UAAU,KAAV,UAAU,QASrB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAN,IAAY,cAaX;AAbD,WAAY,cAAc;IACxB,+BAA+B;IAC/B,mCAAiB,CAAA;IACjB,+BAA+B;IAC/B,mCAAiB,CAAA;IACjB,+BAA+B;IAC/B,mCAAiB,CAAA;IACjB,gCAAgC;IAChC,qCAAmB,CAAA;IACnB,+BAA+B;IAC/B,mCAAiB,CAAA;IACjB,6BAA6B;IAC7B,+BAAa,CAAA;AACf,CAAC,EAbW,cAAc,KAAd,cAAc,QAazB;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,UAAU;IACV,QAAQ;IACR,WAAW;IACX,MAAM;IACN,QAAQ;CACT,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/model/constants.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,MAAM,CAAN,IAAY,UASX;AATD,WAAY,UAAU;IACpB,sCAAsC;IACtC,+BAAiB,CAAA;IACjB,sCAAsC;IACtC,+BAAiB,CAAA;IACjB,uCAAuC;IACvC,iCAAmB,CAAA;IACnB,sCAAsC;IACtC,+BAAiB,CAAA;AACnB,CAAC,EATW,UAAU,KAAV,UAAU,QASrB;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,+BAA+B;IAC/B,MAAM,EAAE,MAAM;IACd,+BAA+B;IAC/B,MAAM,EAAE,MAAM;IACd,+BAA+B;IAC/B,MAAM,EAAE,MAAM;IACd,gCAAgC;IAChC,OAAO,EAAE,OAAO;IAChB,+BAA+B;IAC/B,MAAM,EAAE,MAAM;IACd,6BAA6B;IAC7B,IAAI,EAAE,IAAI;CACX,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,UAAU;IACV,QAAQ;IACR,WAAW;IACX,MAAM;IACN,QAAQ;CACT,CAAC"}

package/lib/esm/model/decorators.d.ts

@@ -26,7 +26,7 @@ export declare function model(): (target: any, propertyKey?: any, descriptor?: T
  *
  * @category Class Decorators
  */
-export declare function hashedBy(algorithm: string, ...args: any[]): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function hashedBy(algorithm: string, ...args: any[]): (model: any, prop?: any, descriptor?: PropertyDescriptor | number) => void;
 /**
  * @summary Defines the serialization algorithm to use on the model
  *
@@ -36,14 +36,4 @@ export declare function hashedBy(algorithm: string, ...args: any[]): (target: ob
  *
  * @category Class Decorators
  */
-export declare function serializedBy(serializer: string, ...args: any[]): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
-/**
- * @summary Applies descriptive metadata to a class, property or method
- *
- * @param {string} description the description to apply
- *
- * @function description
- *
- * @category Decorators
- */
-export declare function description(description: string): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function serializedBy(serializer: string, ...args: any[]): (model: any, prop?: any, descriptor?: PropertyDescriptor | number) => void;

package/lib/esm/model/decorators.js

@@ -1,8 +1,7 @@
 import { bindModelPrototype, construct } from "./construction.js";
 import { ModelKeys } from "./../utils/constants.js";
 import { Model } from "./Model.js";
-import { metadata } from "@decaf-ts/reflection";
-import { Decoration, DecorationKeys, Metadata } from "@decaf-ts/decoration";
+import { Decoration, metadata } from "@decaf-ts/decoration";
 export function modelBaseDecorator(original) {
     // the new constructor behaviour
     const newConstructor = function (...args) {
@@ -12,15 +11,10 @@ export function modelBaseDecorator(original) {
         const builder = Model.getBuilder();
         if (builder)
             builder(instance, args.length ? args[0] : undefined);
-        metadata(Model.key(ModelKeys.MODEL), original.name)(instance.constructor);
         return instance;
     };
     // copy prototype so instanceof operator still works
     newConstructor.prototype = original.prototype;
-    metadata(Model.key(ModelKeys.MODEL), original.name)(original);
-    Reflect.getMetadataKeys(original).forEach((key) => {
-        Reflect.defineMetadata(key, Reflect.getMetadata(key, original), newConstructor);
-    });
     // Sets the proper constructor name for type verification
     Object.defineProperty(newConstructor, "name", {
         writable: false,
@@ -28,23 +22,7 @@ export function modelBaseDecorator(original) {
         configurable: false,
         value: original.prototype.constructor.name,
     });
-    //
-    // anchors the original constructor for future reference
-    Object.defineProperty(newConstructor, ModelKeys.ANCHOR, {
-        writable: false,
-        enumerable: false,
-        configurable: false,
-        value: original,
-    });
-    Metadata.set(newConstructor, DecorationKeys.CONSTRUCTOR, original);
-    //
-    // // anchors the new constructor for future reference
-    // Object.defineProperty(original, ModelKeys.ANCHOR, {
-    //   writable: false,
-    //   enumerable: true,
-    //   configurable: false,
-    //   value: newConstructor,
-    // });
+    metadata(ModelKeys.CONSTRUCTOR, original)(newConstructor);
     Model.register(newConstructor, original.name);
     // return new constructor (will override original)
     return newConstructor;
@@ -62,7 +40,7 @@ export function modelBaseDecorator(original) {
  * @category Class Decorators
  */
 export function model() {
-    const key = Model.key(ModelKeys.MODEL);
+    const key = ModelKeys.MODEL;
     return Decoration.for(key).define(modelBaseDecorator).apply();
 }
 /**
@@ -80,7 +58,7 @@ export function model() {
  * @category Class Decorators
  */
 export function hashedBy(algorithm, ...args) {
-    return metadata(Model.key(ModelKeys.HASHING), {
+    return metadata(ModelKeys.HASHING, {
         algorithm: algorithm,
         args: args,
     });
@@ -95,21 +73,9 @@ export function hashedBy(algorithm, ...args) {
  * @category Class Decorators
  */
 export function serializedBy(serializer, ...args) {
-    return metadata(Model.key(ModelKeys.SERIALIZATION), {
+    return metadata(ModelKeys.SERIALIZATION, {
         serializer: serializer,
         args: args,
     });
 }
-/**
- * @summary Applies descriptive metadata to a class, property or method
- *
- * @param {string} description the description to apply
- *
- * @function description
- *
- * @category Decorators
- */
-export function description(description) {
-    return metadata(Model.key(ModelKeys.DESCRIPTION), description);
-}
 //# sourceMappingURL=decorators.js.map

package/lib/esm/model/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/model/decorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/model/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,0BAAuB;AAC/D,OAAO,EAAE,SAAS,EAAE,gCAA2B;AAC/C,OAAO,EAAE,KAAK,EAAE,mBAAgB;AAChC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAE5D,MAAM,UAAU,kBAAkB,CAAC,QAAa;IAC9C,gCAAgC;IAChC,MAAM,cAAc,GAAQ,UAAU,GAAG,IAAW;QAClD,MAAM,QAAQ,GAAgC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;QAC3E,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE7B,2EAA2E;QAC3E,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;QACnC,IAAI,OAAO;YAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAElE,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEF,oDAAoD;IACpD,cAAc,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IAE9C,yDAAyD;IACzD,MAAM,CAAC,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE;QAC5C,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI;KAC3C,CAAC,CAAC;IAEH,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,cAAc,CAAC,CAAC;IAE1D,KAAK,CAAC,QAAQ,CAAC,cAAc,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,kDAAkD;IAClD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,KAAK;IACnB,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,CAAC;IAC5B,OAAO,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,KAAK,EAAE,CAAC;AAChE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,QAAQ,CAAC,SAAiB,EAAE,GAAG,IAAW;IACxD,OAAO,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE;QACjC,SAAS,EAAE,SAAS;QACpB,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,UAAkB,EAAE,GAAG,IAAW;IAC7D,OAAO,QAAQ,CAAC,SAAS,CAAC,aAAa,EAAE;QACvC,UAAU,EAAE,UAAU;QACtB,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;AACL,CAAC"}

package/lib/esm/model/index.d.ts

@@ -3,6 +3,7 @@ export * from "./construction";
 export * from "./decorators";
 export * from "./Model";
 export * from "./ModelErrorDefinition";
+export * from "./Builder";
 export * from "./types";
 export * from "./validation";
 export * from "./utils";