@decaf-ts/db-decorators 0.6.20 → 0.7.0

package/lib/repository/utils.cjs

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllPropertyDecoratorsRecursive = exports.getHandlerArgs = void 0;
+exports.getHandlerArgs = void 0;
 exports.enforceDBDecorators = enforceDBDecorators;
 exports.getDbDecorators = getDbDecorators;
 const constants_1 = require("./../operations/constants.cjs");
-const reflection_1 = require("@decaf-ts/reflection");
 const errors_1 = require("./errors.cjs");
-const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const decorators_1 = require("./../operations/decorators.cjs");
+const decoration_1 = require("@decaf-ts/decoration");
 /**
  * @summary retrieves the arguments for the handler
  * @param {any} dec the decorator
@@ -87,88 +86,107 @@ async function enforceDBDecorators(repo, context, model, operation, prefix, oldM
  * @memberOf db-decorators.utils
  */
 function getDbDecorators(model, operation, extraPrefix) {
-    const decorators = reflection_1.Reflection.getAllPropertyDecorators(model, 
-    // undefined,
-    constants_1.OperationKeys.REFLECT + (extraPrefix ? extraPrefix : ""));
+    const prefix = extraPrefix?.replace(/[.]$/, "");
+    const decorators = decoration_1.Metadata.get(model.constructor, constants_1.ModelOperations.OPERATIONS);
     if (!decorators)
         return;
     return Object.keys(decorators).reduce((accum, decorator) => {
-        const dec = decorators[decorator].filter((d) => d.key === operation);
-        if (dec && dec.length) {
+        const obj = prefix
+            ? decorators[decorator][prefix] || {}
+            : decorators[decorator];
+        const dec = Object.keys(obj).filter((d) => d === operation);
+        const decs = [];
+        for (const d of dec)
+            decs.push({ key: d, props: obj[d] });
+        if (decs && decs.length) {
             if (!accum)
                 accum = {};
-            accum[decorator] = dec;
+            accum[decorator] = decs;
         }
         return accum;
     }, undefined);
 }
-/**
- * @summary Retrieves the decorators for an object's properties prefixed by {@param prefixes} recursively
- * @param model
- * @param accum
- * @param prefixes
- *
- * @function getAllPropertyDecoratorsRecursive
- * @memberOf module:db-decorators.Repository
- */
-const getAllPropertyDecoratorsRecursive = function (model, accum, ...prefixes) {
-    const accumulator = accum || {};
-    const mergeDecorators = function (decs) {
-        const pushOrSquash = (key, ...values) => {
-            values.forEach((val) => {
-                let match;
-                if (!(match = accumulator[key].find((e) => e.key === val.key)) ||
-                    match.props.operation !== val.props.operation) {
-                    accumulator[key].push(val);
-                    return;
-                }
-                if (val.key === decorator_validation_1.ModelKeys.TYPE)
-                    return;
-                const { handlers, operation } = val.props;
-                if (!operation ||
-                    !operation.match(new RegExp(`^(:?${constants_1.OperationKeys.ON}|${constants_1.OperationKeys.AFTER})(:?${constants_1.OperationKeys.CREATE}|${constants_1.OperationKeys.READ}|${constants_1.OperationKeys.UPDATE}|${constants_1.OperationKeys.DELETE})$`))) {
-                    accumulator[key].push(val);
-                    return;
-                }
-                const accumHandlers = match.props.handlers;
-                Object.entries(handlers).forEach(([clazz, handlerDef]) => {
-                    if (!(clazz in accumHandlers)) {
-                        accumHandlers[clazz] = handlerDef;
-                        return;
-                    }
-                    Object.entries(handlerDef).forEach(([handlerProp, handler]) => {
-                        if (!(handlerProp in accumHandlers[clazz])) {
-                            accumHandlers[clazz][handlerProp] = handler;
-                            return;
-                        }
-                        Object.entries(handler).forEach(([handlerKey, argsObj]) => {
-                            if (!(handlerKey in accumHandlers[clazz][handlerProp])) {
-                                accumHandlers[clazz][handlerProp][handlerKey] = argsObj;
-                                return;
-                            }
-                            console.warn(`Skipping handler registration for ${clazz} under prop ${handlerProp} because handler is the same`);
-                        });
-                    });
-                });
-            });
-        };
-        Object.entries(decs).forEach(([key, value]) => {
-            accumulator[key] = accumulator[key] || [];
-            pushOrSquash(key, ...value);
-        });
-    };
-    const decs = reflection_1.Reflection.getAllPropertyDecorators(model, ...prefixes);
-    if (decs)
-        mergeDecorators(decs);
-    if (Object.getPrototypeOf(model) === Object.prototype)
-        return accumulator;
-    // const name = model.constructor.name;
-    const proto = Object.getPrototypeOf(model);
-    if (!proto)
-        return accumulator;
-    // if (proto.constructor && proto.constructor.name === name)
-    //     proto = Object.getPrototypeOf(proto)
-    return (0, exports.getAllPropertyDecoratorsRecursive)(proto, accumulator, ...prefixes);
-};
-exports.getAllPropertyDecoratorsRecursive = getAllPropertyDecoratorsRecursive;
+// /**
+//  * @summary Retrieves the decorators for an object's properties prefixed by {@param prefixes} recursively
+//  * @param model
+//  * @param accum
+//  * @param prefixes
+//  *
+//  * @function getAllPropertyDecoratorsRecursive
+//  * @memberOf module:db-decorators.Repository
+//  */
+// export const getAllPropertyDecoratorsRecursive = function <T extends Model>(
+//   model: T,
+//   accum: { [indexer: string]: any[] } | undefined,
+//   ...prefixes: string[]
+// ): { [indexer: string]: any[] } | undefined {
+//   const accumulator = accum || {};
+//   const mergeDecorators = function (decs: { [indexer: string]: any[] }) {
+//     const pushOrSquash = (key: string, ...values: any[]) => {
+//       values.forEach((val) => {
+//         let match: any;
+//         if (
+//           !(match = accumulator[key].find((e) => e.key === val.key)) ||
+//           match.props.operation !== val.props.operation
+//         ) {
+//           accumulator[key].push(val);
+//           return;
+//         }
+//         if (val.key === ModelKeys.TYPE) return;
+//         const { handlers, operation } = val.props;
+//         if (
+//           !operation ||
+//           !operation.match(
+//             new RegExp(
+//               `^(:?${OperationKeys.ON}|${OperationKeys.AFTER})(:?${OperationKeys.CREATE}|${OperationKeys.READ}|${OperationKeys.UPDATE}|${OperationKeys.DELETE})$`
+//             )
+//           )
+//         ) {
+//           accumulator[key].push(val);
+//           return;
+//         }
+//         const accumHandlers = match.props.handlers;
+//         Object.entries(handlers).forEach(([clazz, handlerDef]) => {
+//           if (!(clazz in accumHandlers)) {
+//             accumHandlers[clazz] = handlerDef;
+//             return;
+//           }
+//           Object.entries(handlerDef as object).forEach(
+//             ([handlerProp, handler]) => {
+//               if (!(handlerProp in accumHandlers[clazz])) {
+//                 accumHandlers[clazz][handlerProp] = handler;
+//                 return;
+//               }
+//               Object.entries(handler as object).forEach(
+//                 ([handlerKey, argsObj]) => {
+//                   if (!(handlerKey in accumHandlers[clazz][handlerProp])) {
+//                     accumHandlers[clazz][handlerProp][handlerKey] = argsObj;
+//                     return;
+//                   }
+//                   console.warn(
+//                     `Skipping handler registration for ${clazz} under prop ${handlerProp} because handler is the same`
+//                   );
+//                 }
+//               );
+//             }
+//           );
+//         });
+//       });
+//     };
+//     Object.entries(decs).forEach(([key, value]) => {
+//       accumulator[key] = accumulator[key] || [];
+//       pushOrSquash(key, ...value);
+//     });
+//   };
+//   const decs: { [indexer: string]: any[] } | undefined =
+//     Reflection.getAllPropertyDecorators(model, ...prefixes);
+//   if (decs) mergeDecorators(decs);
+//   if (Object.getPrototypeOf(model) === Object.prototype) return accumulator;
+//   // const name = model.constructor.name;
+//   const proto = Object.getPrototypeOf(model);
+//   if (!proto) return accumulator;
+//   // if (proto.constructor && proto.constructor.name === name)
+//   //     proto = Object.getPrototypeOf(proto)
+//   return getAllPropertyDecoratorsRecursive(proto, accumulator, ...prefixes);
+// };
 //# sourceMappingURL=utils.js.map

package/lib/repository/utils.d.ts

@@ -1,8 +1,8 @@
 import { IRepository } from "../interfaces/IRepository";
-import { DecoratorMetadata } from "@decaf-ts/reflection";
-import { Constructor, Model } from "@decaf-ts/decorator-validation";
+import { Model } from "@decaf-ts/decorator-validation";
 import { Context } from "./Context";
 import { RepositoryFlags } from "./types";
+import { Constructor } from "@decaf-ts/decoration";
 /**
  * @description Context arguments for repository operations.
  * @summary Represents the context and arguments for repository operations.
@@ -58,17 +58,3 @@ export declare function enforceDBDecorators<M extends Model<true | false>, R ext
  * @memberOf db-decorators.utils
  */
 export declare function getDbDecorators<T extends Model>(model: T, operation: string, extraPrefix?: string): Record<string, DecoratorMetadata[]> | undefined;
-/**
- * @summary Retrieves the decorators for an object's properties prefixed by {@param prefixes} recursively
- * @param model
- * @param accum
- * @param prefixes
- *
- * @function getAllPropertyDecoratorsRecursive
- * @memberOf module:db-decorators.Repository
- */
-export declare const getAllPropertyDecoratorsRecursive: <T extends Model>(model: T, accum: {
-    [indexer: string]: any[];
-} | undefined, ...prefixes: string[]) => {
-    [indexer: string]: any[];
-} | undefined;

package/lib/repository/utils.js.map

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

package/lib/validation/decorators.cjs

@@ -13,8 +13,7 @@ const constants_2 = require("./constants.cjs");
 const constants_3 = require("./../operations/constants.cjs");
 const decorators_1 = require("./../operations/decorators.cjs");
 const errors_1 = require("./../repository/errors.cjs");
-const reflection_1 = require("@decaf-ts/reflection");
-const repository_1 = require("./../repository/index.cjs");
+const decoration_1 = require("@decaf-ts/decoration");
 /**
  * @description Prevents a property from being modified after initial creation.
  * @summary Marks the property as readonly, causing validation errors if attempts are made to modify it during updates.
@@ -24,11 +23,17 @@ const repository_1 = require("./../repository/index.cjs");
  * @category Property Decorators
  */
 function readonly(message = constants_2.DEFAULT_ERROR_MESSAGES.READONLY.INVALID) {
-    const key = decorator_validation_1.Validation.updateKey(constants_1.DBKeys.READONLY);
-    return decorator_validation_1.Decoration.for(key)
-        .define((0, decorator_validation_1.propMetadata)(key, {
+    const key = constants_1.DBKeys.READONLY;
+    const meta = {
         message: message,
-    }))
+        description: `defines the attribute as readOnly`,
+        async: false,
+    };
+    return decoration_1.Decoration.for(key)
+        .define({
+        decorator: decorator_validation_1.innerValidationDecorator,
+        args: [readonly, key, meta],
+    })
         .apply();
 }
 /**
@@ -102,21 +107,21 @@ function timestamp(operation = constants_3.DBOperations.CREATE_UPDATE, format =
         const decorators = [
             (0, decorator_validation_1.date)(format, constants_2.DEFAULT_ERROR_MESSAGES.TIMESTAMP.DATE),
             (0, decorator_validation_1.required)(constants_2.DEFAULT_ERROR_MESSAGES.TIMESTAMP.REQUIRED),
-            (0, decorator_validation_1.propMetadata)(decorator_validation_1.Validation.key(constants_1.DBKeys.TIMESTAMP), {
+            (0, decoration_1.propMetadata)(decorator_validation_1.Validation.key(constants_1.DBKeys.TIMESTAMP), {
                 operation: operation,
                 format: format,
             }),
             (0, decorators_1.on)(operation, timestampHandler),
         ];
         if (operation.indexOf(constants_3.OperationKeys.UPDATE) !== -1)
-            decorators.push((0, decorator_validation_1.propMetadata)(key, {
+            decorators.push((0, decoration_1.propMetadata)(key, {
                 message: constants_2.DEFAULT_ERROR_MESSAGES.TIMESTAMP.INVALID,
             }));
         else
             decorators.push(readonly());
-        return (0, reflection_1.apply)(...decorators);
+        return (0, decoration_1.apply)(...decorators);
     }
-    return decorator_validation_1.Decoration.for(key)
+    return decoration_1.Decoration.for(key)
         .define({
         decorator: ts,
         args: [operation, format],
@@ -204,6 +209,6 @@ async function serializeAfterAll(context, data, key, model) {
  *   M->>C: Return model with deserialized property
  */
 function serialize() {
-    return (0, reflection_1.apply)((0, decorators_1.onCreateUpdate)(serializeOnCreateUpdate), (0, decorators_1.after)(constants_3.DBOperations.ALL, serializeAfterAll), (0, decorator_validation_1.type)([String.name, Object.name]), (0, reflection_1.metadata)(repository_1.Repository.key(constants_1.DBKeys.SERIALIZE), {}));
+    return (0, decoration_1.apply)((0, decorators_1.onCreateUpdate)(serializeOnCreateUpdate), (0, decorators_1.after)(constants_3.DBOperations.ALL, serializeAfterAll), (0, decorator_validation_1.type)([String, Object]), (0, decoration_1.metadata)(constants_1.DBKeys.SERIALIZE, {}));
 }
 //# sourceMappingURL=decorators.js.map

package/lib/validation/decorators.d.ts

@@ -136,4 +136,4 @@ export declare function serializeAfterAll<M extends Model, R extends IRepository
  *   S->>M: Parse JSON back to object
  *   M->>C: Return model with deserialized property
  */
-export declare function serialize(): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor) => void;
+export declare function serialize(): (target: object, propertyKey?: string | symbol | unknown, descriptor?: PropertyDescriptor | number) => void;

package/lib/validation/decorators.js.map

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

package/lib/validation/validators/ReadOnlyValidator.cjs

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReadOnlyValidator = void 0;
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const constants_1 = require("./../constants.cjs");
-const reflection_1 = require("@decaf-ts/reflection");
+const decorator_validation_2 = require("@decaf-ts/decorator-validation");
 /**
  * @description A validator that ensures properties marked as readonly cannot be modified during updates.
  * @summary Validator for the {@link readonly} decorator that checks if a value has been changed during an update operation. It compares the new value with the old value and returns an error message if they are not equal.
@@ -65,7 +65,7 @@ let ReadOnlyValidator = class ReadOnlyValidator extends decorator_validation_1.V
     updateHasErrors(value, oldValue, message) {
         if (value === undefined)
             return;
-        return (0, reflection_1.isEqual)(value, oldValue)
+        return (0, decorator_validation_2.isEqual)(value, oldValue)
             ? undefined
             : this.getMessage(message || this.message);
     }

package/lib/validation/validators/ReadOnlyValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReadOnlyValidator.js","sourceRoot":"","sources":["../../../src/validation/validators/ReadOnlyValidator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAAsE;AACtE,kDAA4E;AAC5E,qDAA+C;AAE/C;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,gCAAS;IAC9C;QACE,KAAK,CAAC,kCAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACH,6DAA6D;IAC7D,SAAS,CAAC,KAAU,EAAE,GAAG,IAAW;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACI,eAAe,CACpB,KAAU,EACV,QAAa,EACb,OAAgB;QAEhB,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO;QAEhC,OAAO,IAAA,oBAAO,EAAC,KAAK,EAAE,QAAQ,CAAC;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AApCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,gCAAS,EAAC,gCAAoB,CAAC,QAAQ,CAAC;;GAC5B,iBAAiB,CAoC7B"}
+{"version":3,"file":"ReadOnlyValidator.js","sourceRoot":"","sources":["../../../src/validation/validators/ReadOnlyValidator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAAsE;AACtE,kDAA4E;AAC5E,yEAAyD;AAEzD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,gCAAS;IAC9C;QACE,KAAK,CAAC,kCAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED;;;;;;OAMG;IACH,6DAA6D;IAC7D,SAAS,CAAC,KAAU,EAAE,GAAG,IAAW;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACI,eAAe,CACpB,KAAU,EACV,QAAa,EACb,OAAgB;QAEhB,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO;QAEhC,OAAO,IAAA,8BAAO,EAAC,KAAK,EAAE,QAAQ,CAAC;YAC7B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;CACF,CAAA;AApCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,gCAAS,EAAC,gCAAoB,CAAC,QAAQ,CAAC;;GAC5B,iBAAiB,CAoC7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/db-decorators",
-  "version": "0.6.20",
+  "version": "0.7.0",
   "description": "Agnostic database decorators and repository",
   "type": "module",
   "exports": {
@@ -80,7 +80,6 @@
   "dependencies": {
     "@decaf-ts/decoration": "latest",
     "@decaf-ts/decorator-validation": "latest",
-    "@decaf-ts/injectable-decorators": "latest",
-    "@decaf-ts/reflection": "latest"
+    "@decaf-ts/injectable-decorators": "latest"
   }
 }

package/lib/esm/identity/utils.d.ts

@@ -1,47 +0,0 @@
-import { Model } from "@decaf-ts/decorator-validation";
-/**
- * @description Finds the primary key attribute for a model
- * @summary Searches in all the properties in the object for an {@link id} decorated property and returns the property key and metadata
- * @param {Model} model - The model object to search for primary key
- * @return {Object} An object containing the id property name and its metadata
- * @function findPrimaryKey
- * @mermaid
- * sequenceDiagram
- *   participant Caller
- *   participant findPrimaryKey
- *   participant getAllPropertyDecoratorsRecursive
- *
- *   Caller->>findPrimaryKey: model
- *   findPrimaryKey->>getAllPropertyDecoratorsRecursive: get decorators
- *   getAllPropertyDecoratorsRecursive-->>findPrimaryKey: decorators
- *   findPrimaryKey->>findPrimaryKey: filter ID decorators
- *   findPrimaryKey->>findPrimaryKey: validate single ID property
- *   findPrimaryKey-->>Caller: {id, props}
- * @memberOf module:db-decorators
- */
-export declare function findPrimaryKey<M extends Model>(model: M): {
-    id: keyof M;
-    props: any;
-};
-/**
- * @description Retrieves the primary key value from a model
- * @summary Searches for the ID-decorated property in the model and returns its value
- * @param {Model} model - The model object to extract the ID from
- * @param {boolean} [returnEmpty=false] - Whether to return undefined if no ID value is found
- * @return {string | number | bigint} The primary key value
- * @function findModelId
- * @mermaid
- * sequenceDiagram
- *   participant Caller
- *   participant findModelId
- *   participant findPrimaryKey
- *
- *   Caller->>findModelId: model, returnEmpty
- *   findModelId->>findPrimaryKey: model
- *   findPrimaryKey-->>findModelId: {id, props}
- *   findModelId->>findModelId: extract model[id]
- *   findModelId->>findModelId: validate ID exists if required
- *   findModelId-->>Caller: ID value
- * @memberOf module:db-decorators
- */
-export declare function findModelId<M extends Model>(model: M, returnEmpty?: boolean): string | number | bigint;

package/lib/esm/identity/utils.js

@@ -1,75 +0,0 @@
-import { DBKeys } from "./../model/constants.js";
-import { getAllPropertyDecoratorsRecursive } from "./../repository/utils.js";
-import { ModelKeys, sf } from "@decaf-ts/decorator-validation";
-import { InternalError } from "./../repository/errors.js";
-/**
- * @description Finds the primary key attribute for a model
- * @summary Searches in all the properties in the object for an {@link id} decorated property and returns the property key and metadata
- * @param {Model} model - The model object to search for primary key
- * @return {Object} An object containing the id property name and its metadata
- * @function findPrimaryKey
- * @mermaid
- * sequenceDiagram
- *   participant Caller
- *   participant findPrimaryKey
- *   participant getAllPropertyDecoratorsRecursive
- *
- *   Caller->>findPrimaryKey: model
- *   findPrimaryKey->>getAllPropertyDecoratorsRecursive: get decorators
- *   getAllPropertyDecoratorsRecursive-->>findPrimaryKey: decorators
- *   findPrimaryKey->>findPrimaryKey: filter ID decorators
- *   findPrimaryKey->>findPrimaryKey: validate single ID property
- *   findPrimaryKey-->>Caller: {id, props}
- * @memberOf module:db-decorators
- */
-export function findPrimaryKey(model) {
-    const decorators = getAllPropertyDecoratorsRecursive(model, undefined, DBKeys.REFLECT + DBKeys.ID);
-    const idDecorators = Object.entries(decorators).reduce((accum, [prop, decs]) => {
-        const filtered = decs.filter((d) => d.key !== ModelKeys.TYPE);
-        if (filtered && filtered.length) {
-            accum[prop] = accum[prop] || [];
-            accum[prop].push(...filtered);
-        }
-        return accum;
-    }, {});
-    if (!idDecorators || !Object.keys(idDecorators).length)
-        throw new InternalError("Could not find ID decorated Property");
-    if (Object.keys(idDecorators).length > 1)
-        throw new InternalError(sf(Object.keys(idDecorators).join(", ")));
-    const idProp = Object.keys(idDecorators)[0];
-    if (!idProp)
-        throw new InternalError("Could not find ID decorated Property");
-    return {
-        id: idProp,
-        props: idDecorators[idProp][0].props,
-    };
-}
-/**
- * @description Retrieves the primary key value from a model
- * @summary Searches for the ID-decorated property in the model and returns its value
- * @param {Model} model - The model object to extract the ID from
- * @param {boolean} [returnEmpty=false] - Whether to return undefined if no ID value is found
- * @return {string | number | bigint} The primary key value
- * @function findModelId
- * @mermaid
- * sequenceDiagram
- *   participant Caller
- *   participant findModelId
- *   participant findPrimaryKey
- *
- *   Caller->>findModelId: model, returnEmpty
- *   findModelId->>findPrimaryKey: model
- *   findPrimaryKey-->>findModelId: {id, props}
- *   findModelId->>findModelId: extract model[id]
- *   findModelId->>findModelId: validate ID exists if required
- *   findModelId-->>Caller: ID value
- * @memberOf module:db-decorators
- */
-export function findModelId(model, returnEmpty = false) {
-    const idProp = findPrimaryKey(model).id;
-    const modelId = model[idProp];
-    if (typeof modelId === "undefined" && !returnEmpty)
-        throw new InternalError(`No value for the Id is defined under the property ${idProp}`);
-    return modelId;
-}
-//# sourceMappingURL=utils.js.map

package/lib/esm/identity/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/identity/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gCAA2B;AAC5C,OAAO,EAAE,iCAAiC,EAAE,iCAA4B;AACxE,OAAO,EAAS,SAAS,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,kCAA6B;AAErD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,cAAc,CAAkB,KAAQ;IACtD,MAAM,UAAU,GAAG,iCAAiC,CAClD,KAAK,EACL,SAAS,EACT,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,EAAE,CAC3B,CAAC;IACF,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,UAAoB,CAAC,CAAC,MAAM,CAC9D,CAAC,KAAmC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE;QACpD,MAAM,QAAQ,GAAI,IAA0B,CAAC,MAAM,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,SAAS,CAAC,IAAI,CAChC,CAAC;QACF,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EACD,EAAE,CACH,CAAC;IAEF,IAAI,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM;QACpD,MAAM,IAAI,aAAa,CAAC,sCAAsC,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,GAAG,CAAC;QACtC,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,CAAC,MAAM;QAAE,MAAM,IAAI,aAAa,CAAC,sCAAsC,CAAC,CAAC;IAC7E,OAAO;QACL,EAAE,EAAE,MAAiB;QACrB,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK;KACrC,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,WAAW,CACzB,KAAQ,EACR,WAAW,GAAG,KAAK;IAEnB,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,IAAI,OAAO,OAAO,KAAK,WAAW,IAAI,CAAC,WAAW;QAChD,MAAM,IAAI,aAAa,CACrB,qDAAqD,MAAgB,EAAE,CACxE,CAAC;IACJ,OAAO,OAAmC,CAAC;AAC7C,CAAC"}

package/lib/esm/model/overrides.js

@@ -1,33 +0,0 @@
-import { Model, validate, } from "@decaf-ts/decorator-validation";
-import { validateCompare } from "./validation.js";
-/**
- * @description Validates the model and checks for errors
- * @summary Validates the current model state and optionally compares with a previous version
- * @template M - Type extending Model
- * @param {M|any} [previousVersion] - Optional previous version of the model for comparison
- * @param {...any[]} exclusions - Properties to exclude from validation
- * @return {ModelErrorDefinition|undefined} Error definition if validation fails, undefined otherwise
- * @function hasErrors
- * @memberOf module:db-decorators
- */
-Model.prototype.hasErrors = function (previousVersion, ...exclusions) {
-    if (previousVersion && !(previousVersion instanceof Model)) {
-        exclusions.unshift(previousVersion);
-        previousVersion = undefined;
-    }
-    const async = this.isAsync();
-    const errs = validate(this, async, ...exclusions);
-    if (async) {
-        return Promise.resolve(errs).then((resolvedErrs) => {
-            if (resolvedErrs || !previousVersion) {
-                return resolvedErrs;
-            }
-            return validateCompare(previousVersion, this, async, ...exclusions);
-        });
-    }
-    if (errs || !previousVersion)
-        return errs;
-    // @ts-expect-error Overriding Model prototype method with dynamic conditional return type.
-    return validateCompare(previousVersion, this, async, ...exclusions);
-};
-//# sourceMappingURL=overrides.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../../src/model/overrides.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,wBAAqB;AAE/C;;;;;;;;;GASG;AACH,KAAK,CAAC,SAAS,CAAC,SAAS,GAAG,UAE1B,eAAyB,EACzB,GAAG,UAAiB;IAEpB,IAAI,eAAe,IAAI,CAAC,CAAC,eAAe,YAAY,KAAK,CAAC,EAAE,CAAC;QAC3D,UAAU,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QACpC,eAAe,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,CAAC;IAElD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;YACjD,IAAI,YAAY,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrC,OAAO,YAAY,CAAC;YACtB,CAAC;YACD,OAAO,eAAe,CAAC,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,CAAC;QACtE,CAAC,CAAQ,CAAC;IACZ,CAAC;IAED,IAAI,IAAI,IAAI,CAAC,eAAe;QAAE,OAAO,IAAW,CAAC;IAEjD,2FAA2F;IAC3F,OAAO,eAAe,CAAC,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,CAAC;AACtE,CAAC,CAAC"}

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

@@ -1,45 +0,0 @@
-import { Model } from "@decaf-ts/decorator-validation";
-/**
- * @description Checks if a model is marked as transient
- * @summary Determines whether a model class has been decorated with the transient decorator
- * @template M - Type extending Model
- * @param {M} model - The model instance to check
- * @return {boolean} True if the model is transient, false otherwise
- * @function isTransient
- * @memberOf module:db-decorators
- */
-export declare function isTransient<M extends Model>(model: M): boolean;
-/**
- * @description Separates transient properties from a model
- * @summary Extracts properties marked as transient into a separate object
- * @template M - Type extending Model
- * @param {M} model - The model instance to process
- * @return {Object} Object containing the model without transient properties and a separate transient object
- * @property {M} model - The model with transient properties removed
- * @property {Record<string, any>} [transient] - Object containing the transient properties
- * @function modelToTransient
- * @memberOf module:db-decorators
- * @mermaid
- * sequenceDiagram
- *   participant Caller
- *   participant modelToTransient
- *   participant isTransient
- *   participant getAllPropertyDecoratorsRecursive
- *
- *   Caller->>modelToTransient: model
- *   modelToTransient->>isTransient: check if model is transient
- *   isTransient-->>modelToTransient: transient status
- *   alt model is not transient
- *     modelToTransient-->>Caller: {model}
- *   else model is transient
- *     modelToTransient->>getAllPropertyDecoratorsRecursive: get transient properties
- *     getAllPropertyDecoratorsRecursive-->>modelToTransient: property decorators
- *     modelToTransient->>modelToTransient: separate properties
- *     modelToTransient->>Model.build: rebuild model without transient props
- *     modelToTransient-->>Caller: {model, transient}
- *   end
- */
-export declare function modelToTransient<M extends Model>(model: M): {
-    model: M;
-    transient?: Record<string, any>;
-};