@decaf-ts/core 0.6.0 → 0.7.1

package/lib/model/decorators.cjs

@@ -18,14 +18,12 @@ exports.noValidateOn = noValidateOn;
 exports.noValidateOnCreate = noValidateOnCreate;
 exports.noValidateOnUpdate = noValidateOnUpdate;
 exports.noValidateOnCreateUpdate = noValidateOnCreateUpdate;
+exports.relation = relation;
 const db_decorators_1 = require("@decaf-ts/db-decorators");
-const reflection_1 = require("@decaf-ts/reflection");
 const decoration_1 = require("@decaf-ts/decoration");
 const constants_1 = require("./../persistence/constants.cjs");
 const constants_2 = require("./../repository/constants.cjs");
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
-const persistence_1 = require("./../persistence/index.cjs");
-const Repository_1 = require("./../repository/Repository.cjs");
 const Condition_1 = require("./../query/Condition.cjs");
 const construction_1 = require("./construction.cjs");
 const utils_1 = require("./../utils/index.cjs");
@@ -38,15 +36,16 @@ const utils_1 = require("./../utils/index.cjs");
  * @category Class Decorators
  */
 function table(opts) {
-    return function table(target) {
-        const key = persistence_1.Adapter.key(constants_1.PersistenceKeys.TABLE);
-        return decorator_validation_1.Decoration.for(key)
-            .define({
-            decorator: reflection_1.metadata,
-            args: [key, opts || target.name.toLowerCase()],
-        })
-            .apply()(target);
-    };
+    return decoration_1.Decoration.for(constants_1.PersistenceKeys.TABLE)
+        .define({
+        decorator: function table(opts) {
+            return function table(target) {
+                return (0, decoration_1.metadata)(constants_1.PersistenceKeys.TABLE, opts || target.name.toLowerCase())(target);
+            };
+        },
+        args: [opts],
+    })
+        .apply();
 }
 /**
  * @description Specifies the database column name for a model property
@@ -57,42 +56,43 @@ function table(opts) {
  * @category Property Decorators
  */
 function column(columnName) {
-    const key = persistence_1.Adapter.key(constants_1.PersistenceKeys.COLUMN);
-    return decorator_validation_1.Decoration.for(key)
+    return decoration_1.Decoration.for(constants_1.PersistenceKeys.COLUMN)
         .define({
-        decorator: function column(k, c) {
+        decorator: function column(c) {
             return function column(obj, attr) {
-                return (0, decorator_validation_1.propMetadata)(k, c || attr)(obj, attr);
+                return (0, decoration_1.propMetadata)(decoration_1.Metadata.key(constants_1.PersistenceKeys.COLUMN, attr), c || attr)(obj, attr);
             };
         },
-        args: [key, columnName],
+        args: [columnName],
     })
         .apply();
 }
 function index(directions, compositions, name) {
     function index(directions, compositions, name) {
-        if (typeof directions === "string") {
-            name = directions;
-            directions = undefined;
-            compositions = undefined;
-        }
-        if (typeof compositions === "string") {
-            name = compositions;
-            compositions = undefined;
-        }
-        if (!compositions && directions) {
-            if (directions.find((d) => ![constants_2.OrderDirection.ASC, constants_2.OrderDirection.DSC].includes(d))) {
-                compositions = directions;
+        return function index(obj, attr) {
+            if (typeof directions === "string") {
+                name = directions;
                 directions = undefined;
+                compositions = undefined;
+            }
+            if (typeof compositions === "string") {
+                name = compositions;
+                compositions = undefined;
             }
-        }
-        return (0, decorator_validation_1.propMetadata)(Repository_1.Repository.key(`${constants_1.PersistenceKeys.INDEX}${compositions && compositions.length ? `.${compositions.join(".")}` : ""}`), {
-            directions: directions,
-            compositions: compositions,
-            name: name,
-        });
+            if (!compositions && directions) {
+                if (directions.find((d) => ![constants_2.OrderDirection.ASC, constants_2.OrderDirection.DSC].includes(d))) {
+                    compositions = directions;
+                    directions = undefined;
+                }
+            }
+            return (0, decoration_1.propMetadata)(decoration_1.Metadata.key(`${constants_1.PersistenceKeys.INDEX}${compositions && compositions?.length ? `.${compositions.join(".")}` : ""}`, attr), {
+                directions: directions,
+                compositions: compositions,
+                name: name,
+            })(obj, attr);
+        };
     }
-    return decorator_validation_1.Decoration.for(constants_1.PersistenceKeys.INDEX)
+    return decoration_1.Decoration.for(constants_1.PersistenceKeys.INDEX)
         .define({
         decorator: index,
         args: [directions, compositions, name],
@@ -141,9 +141,9 @@ async function uniqueOnCreateUpdate(context, data, key, model) {
  * ```
  */
 function unique() {
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.UNIQUE);
-    return decorator_validation_1.Decoration.for(key)
-        .define((0, db_decorators_1.onCreateUpdate)(uniqueOnCreateUpdate), (0, decorator_validation_1.propMetadata)(key, {}))
+    const key = constants_1.PersistenceKeys.UNIQUE;
+    return decoration_1.Decoration.for(key)
+        .define((0, db_decorators_1.onCreateUpdate)(uniqueOnCreateUpdate), (0, decoration_1.propMetadata)(key, {}))
         .apply();
 }
 /**
@@ -189,9 +189,15 @@ model) {
  * ```
  */
 function createdBy() {
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.CREATED_BY);
-    return decorator_validation_1.Decoration.for(key)
-        .define((0, db_decorators_1.onCreate)(createdByOnCreateUpdate), (0, decorator_validation_1.propMetadata)(key, {}))
+    const key = constants_1.PersistenceKeys.CREATED_BY;
+    function createdBy() {
+        return (0, decoration_1.apply)((0, db_decorators_1.onCreate)(createdByOnCreateUpdate), (0, decoration_1.propMetadata)(key, {}));
+    }
+    return decoration_1.Decoration.for(key)
+        .define({
+        decorator: createdBy,
+        args: [],
+    })
         .apply();
 }
 /**
@@ -209,9 +215,15 @@ function createdBy() {
  * ```
  */
 function updatedBy() {
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.UPDATED_BY);
-    return decorator_validation_1.Decoration.for(key)
-        .define((0, db_decorators_1.onCreateUpdate)(createdByOnCreateUpdate), (0, decorator_validation_1.propMetadata)(key, {}))
+    const key = constants_1.PersistenceKeys.UPDATED_BY;
+    function updatedBy() {
+        return (0, decoration_1.apply)((0, db_decorators_1.onUpdate)(createdByOnCreateUpdate), (0, decoration_1.propMetadata)(key, {}));
+    }
+    return decoration_1.Decoration.for(key)
+        .define({
+        decorator: updatedBy,
+        args: [],
+    })
         .apply();
 }
 function createdAt() {
@@ -246,11 +258,10 @@ function updatedAt() {
  * @see manyToOne
  */
 function oneToOne(clazz, cascadeOptions = constants_2.DefaultCascade, populate = true, joinColumnOpts, fk) {
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.ONE_TO_ONE);
-    // Model.register(clazz as Constructor<M>);
+    const key = constants_1.PersistenceKeys.ONE_TO_ONE;
     function oneToOneDec(clazz, cascade, populate, joinColumnOpts, fk) {
         const meta = {
-            class: clazz.name ? clazz.name : clazz,
+            class: clazz,
             cascade: cascade,
             populate: populate,
         };
@@ -258,14 +269,9 @@ function oneToOne(clazz, cascadeOptions = constants_2.DefaultCascade, populate =
             meta.joinTable = joinColumnOpts;
         if (fk)
             meta.name = fk;
-        return (0, reflection_1.apply)((0, decorator_validation_1.prop)(constants_1.PersistenceKeys.RELATIONS), (0, decorator_validation_1.type)([
-            clazz.name ? clazz.name : clazz,
-            String.name,
-            Number.name,
-            BigInt.name,
-        ]), (0, db_decorators_1.onCreate)(construction_1.oneToOneOnCreate, meta), (0, db_decorators_1.onUpdate)(construction_1.oneToOneOnUpdate, meta), (0, db_decorators_1.onDelete)(construction_1.oneToOneOnDelete, meta), (0, db_decorators_1.afterAny)(construction_1.populate, meta), (0, decorator_validation_1.propMetadata)(key, meta));
+        return (0, decoration_1.apply)((0, decoration_1.prop)(), relation(key, meta), (0, decorator_validation_1.type)([clazz, String, Number, BigInt]), (0, db_decorators_1.onCreate)(construction_1.oneToOneOnCreate, meta), (0, db_decorators_1.onUpdate)(construction_1.oneToOneOnUpdate, meta), (0, db_decorators_1.onDelete)(construction_1.oneToOneOnDelete, meta), (0, db_decorators_1.afterAny)(construction_1.populate, meta));
     }
-    return decorator_validation_1.Decoration.for(key)
+    return decoration_1.Decoration.for(key)
         .define({
         decorator: oneToOneDec,
         args: [clazz, cascadeOptions, populate, joinColumnOpts, fk],
@@ -301,10 +307,10 @@ function oneToOne(clazz, cascadeOptions = constants_2.DefaultCascade, populate =
  * @see manyToOne
  */
 function oneToMany(clazz, cascadeOptions = constants_2.DefaultCascade, populate = true, joinTableOpts, fk) {
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.ONE_TO_MANY);
+    const key = constants_1.PersistenceKeys.ONE_TO_MANY;
     function oneToManyDec(clazz, cascade, populate, joinTableOpts, fk) {
         const metadata = {
-            class: clazz.name ? clazz.name : clazz,
+            class: clazz,
             cascade: cascade,
             populate: populate,
         };
@@ -312,15 +318,15 @@ function oneToMany(clazz, cascadeOptions = constants_2.DefaultCascade, populate
             metadata.joinTable = joinTableOpts;
         if (fk)
             metadata.name = fk;
-        return (0, reflection_1.apply)((0, decorator_validation_1.prop)(constants_1.PersistenceKeys.RELATIONS), (0, decorator_validation_1.list)([
+        return (0, decoration_1.apply)((0, decoration_1.prop)(), relation(key, metadata), (0, decorator_validation_1.list)([
             clazz,
             String,
             Number,
             // @ts-expect-error Bigint is not a constructor
             BigInt,
-        ]), (0, db_decorators_1.onCreate)(construction_1.oneToManyOnCreate, metadata), (0, db_decorators_1.onUpdate)(construction_1.oneToManyOnUpdate, metadata), (0, db_decorators_1.onDelete)(construction_1.oneToManyOnDelete, metadata), (0, db_decorators_1.afterAny)(construction_1.populate, metadata), (0, decorator_validation_1.propMetadata)(key, metadata));
+        ]), (0, db_decorators_1.onCreate)(construction_1.oneToManyOnCreate, metadata), (0, db_decorators_1.onUpdate)(construction_1.oneToManyOnUpdate, metadata), (0, db_decorators_1.onDelete)(construction_1.oneToManyOnDelete, metadata), (0, db_decorators_1.afterAny)(construction_1.populate, metadata));
     }
-    return decorator_validation_1.Decoration.for(key)
+    return decoration_1.Decoration.for(key)
         .define({
         decorator: oneToManyDec,
         args: [clazz, cascadeOptions, populate, joinTableOpts, fk],
@@ -357,11 +363,10 @@ function oneToMany(clazz, cascadeOptions = constants_2.DefaultCascade, populate
  */
 function manyToOne(clazz, cascadeOptions = constants_2.DefaultCascade, populate = true, joinTableOpts, fk) {
     // Model.register(clazz as Constructor<M>);
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.MANY_TO_ONE);
+    const key = constants_1.PersistenceKeys.MANY_TO_ONE;
     function manyToOneDec(clazz, cascade, populate, joinTableOpts, fk) {
-        const clazzName = () => (clazz?.name ? clazz : clazz()).name;
         const metadata = {
-            class: clazz?.name ? clazz.name : clazz,
+            class: clazz,
             cascade: cascade,
             populate: populate,
         };
@@ -369,14 +374,14 @@ function manyToOne(clazz, cascadeOptions = constants_2.DefaultCascade, populate
             metadata.joinTable = joinTableOpts;
         if (fk)
             metadata.name = fk;
-        return (0, reflection_1.apply)((0, decorator_validation_1.prop)(constants_1.PersistenceKeys.RELATIONS), (0, decorator_validation_1.type)([clazzName, String.name, Number.name, BigInt.name]), 
+        return (0, decoration_1.apply)((0, decoration_1.prop)(), relation(key, metadata), (0, decorator_validation_1.type)([clazz, String, Number, BigInt])
         // onCreate(oneToManyOnCreate, metadata),
         // onUpdate(oneToManyOnUpdate, metadata),
         // onDelete(oneToManyOnDelete, metadata),
         // afterAny(pop, metadata),
-        (0, decorator_validation_1.propMetadata)(key, metadata));
+        );
     }
-    return decorator_validation_1.Decoration.for(key)
+    return decoration_1.Decoration.for(key)
         .define({
         decorator: manyToOneDec,
         args: [clazz, cascadeOptions, populate, joinTableOpts, fk],
@@ -413,10 +418,10 @@ function manyToOne(clazz, cascadeOptions = constants_2.DefaultCascade, populate
  */
 function manyToMany(clazz, cascadeOptions = constants_2.DefaultCascade, populate = true, joinTableOpts, fk) {
     // Model.register(clazz as Constructor<M>);
-    const key = Repository_1.Repository.key(constants_1.PersistenceKeys.MANY_TO_MANY);
+    const key = constants_1.PersistenceKeys.MANY_TO_MANY;
     function manyToManyDec(clazz, cascade, populate, joinTableOpts, fk) {
         const metadata = {
-            class: clazz.name ? clazz.name : clazz,
+            class: clazz,
             cascade: cascade,
             populate: populate,
         };
@@ -424,19 +429,14 @@ function manyToMany(clazz, cascadeOptions = constants_2.DefaultCascade, populate
             metadata.joinTable = joinTableOpts;
         if (fk)
             metadata.name = fk;
-        return (0, reflection_1.apply)((0, decorator_validation_1.prop)(constants_1.PersistenceKeys.RELATIONS), (0, decorator_validation_1.list)([
-            clazz.name ? clazz.name : clazz,
-            String.name,
-            Number.name,
-            BigInt.name,
-        ]), 
+        return (0, decoration_1.apply)((0, decoration_1.prop)(), relation(key, metadata), (0, decorator_validation_1.list)([clazz, String, Number, BigInt])
         // onCreate(oneToManyOnCreate, metadata),
         // onUpdate(oneToManyOnUpdate, metadata),
         // onDelete(oneToManyOnDelete, metadata),
         // afterAll(populate, metadata),
-        (0, decorator_validation_1.propMetadata)(key, metadata));
+        );
     }
-    return decorator_validation_1.Decoration.for(key)
+    return decoration_1.Decoration.for(key)
         .define({
         decorator: manyToManyDec,
         args: [clazz, cascadeOptions, populate, joinTableOpts, fk],
@@ -459,4 +459,27 @@ function noValidateOnUpdate() {
 function noValidateOnCreateUpdate() {
     return noValidateOn(db_decorators_1.OperationKeys.UPDATE, db_decorators_1.OperationKeys.CREATE);
 }
+/**
+ * @description Specifies the model property as a relation
+ * @summary Decorator that specifies the model property as a relation in the database
+ * @return {Function} A decorator function that can be applied to a class property
+ * @function relation
+ * @category Property Decorators
+ */
+function relation(relationKey, meta) {
+    function relation(relationKey, meta) {
+        return function relation(obj, attr) {
+            (0, decoration_1.propMetadata)(relationKey, meta)(obj, attr);
+            return (0, decoration_1.propMetadata)(decoration_1.Metadata.key(constants_1.PersistenceKeys.RELATIONS, attr), Object.assign({}, meta, {
+                key: relationKey,
+            }))(obj, attr);
+        };
+    }
+    return decoration_1.Decoration.for(constants_1.PersistenceKeys.RELATIONS)
+        .define({
+        decorator: relation,
+        args: [relationKey, meta],
+    })
+        .apply();
+}
 //# sourceMappingURL=decorators.js.map

package/lib/model/decorators.d.ts

@@ -1,7 +1,8 @@
 import { Context, OperationKeys, RepositoryFlags } from "@decaf-ts/db-decorators";
+import { propMetadata, Constructor } from "@decaf-ts/decoration";
 import { CascadeMetadata } from "../repository/types";
 import { OrderDirection } from "../repository/constants";
-import { Constructor, Model, propMetadata } from "@decaf-ts/decorator-validation";
+import { Model } from "@decaf-ts/decorator-validation";
 import { Repo } from "../repository/Repository";
 import { JoinColumnOptions, JoinTableMultipleColumnsOptions, JoinTableOptions, RelationsMetadata } from "./types";
 /**
@@ -12,7 +13,7 @@ import { JoinColumnOptions, JoinTableMultipleColumnsOptions, JoinTableOptions, R
  * @function table
  * @category Class Decorators
  */
-export declare function table<OPTS = string>(opts?: OPTS): (target: any) => any;
+export declare function table<OPTS = string>(opts?: OPTS): (target: any, propertyKey?: any, descriptor?: TypedPropertyDescriptor<any>) => any;
 /**
  * @description Specifies the database column name for a model property
  * @summary Decorator that maps a model property to a specific column name in the database
@@ -238,3 +239,11 @@ export declare function noValidateOn(...ops: OperationKeys[]): (target: any, pro
 export declare function noValidateOnCreate(): (target: any, propertyKey?: any) => void;
 export declare function noValidateOnUpdate(): (target: any, propertyKey?: any) => void;
 export declare function noValidateOnCreateUpdate(): (target: any, propertyKey?: any) => void;
+/**
+ * @description Specifies the model property as a relation
+ * @summary Decorator that specifies the model property as a relation in the database
+ * @return {Function} A decorator function that can be applied to a class property
+ * @function relation
+ * @category Property Decorators
+ */
+export declare function relation(relationKey: string, meta: RelationsMetadata): (target: any, propertyKey?: any, descriptor?: TypedPropertyDescriptor<any>) => any;

package/lib/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":"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"}

package/lib/model/types.d.ts

@@ -1,5 +1,6 @@
+import { Constructor } from "@decaf-ts/decoration";
 import { CascadeMetadata } from "../repository";
-import { Constructor } from "@decaf-ts/decorator-validation";
+import { PersistenceKeys } from "../persistence/index";
 /**
  * Describes join column options.
  */
@@ -48,9 +49,12 @@ export type JoinTableMultipleColumnsOptions = {
     inverseJoinColumns?: JoinColumnOptions[];
 };
 export type RelationsMetadata = {
-    class: string | (() => Constructor<any>);
+    class: Constructor<any> | (() => Constructor<any>);
     cascade: CascadeMetadata;
     populate: boolean;
     name?: string;
     joinTable?: JoinTableOptions;
 };
+export type ExtendedRelationsMetadata = RelationsMetadata & {
+    key: PersistenceKeys.ONE_TO_ONE | PersistenceKeys.ONE_TO_MANY | PersistenceKeys.MANY_TO_ONE | PersistenceKeys.MANY_TO_MANY;
+};

package/lib/overrides/Metadata.d.ts

@@ -1,10 +1,22 @@
 import "@decaf-ts/decoration";
-import type { Constructor, Model } from "@decaf-ts/decorator-validation";
+import type { Model } from "@decaf-ts/decorator-validation";
 import { Context, OperationKeys, RepositoryFlags } from "@decaf-ts/db-decorators";
-import type { Adapter, Migration } from "../persistence/index";
+import type { Adapter, Migration } from "../persistence";
+import type { Constructor } from "@decaf-ts/decoration";
+import type { ExtendedRelationsMetadata } from "../model";
 declare module "@decaf-ts/decoration" {
     namespace Metadata {
         function validationExceptions<M extends Model>(model: Constructor<M>, op: OperationKeys): string[];
         function migrationsFor<A extends Adapter<CONF, CONN, QUERY, FLAGS, CONTEXT>, CONF, CONN, QUERY, FLAGS extends RepositoryFlags = RepositoryFlags, CONTEXT extends Context<FLAGS> = Context<FLAGS>>(adapter?: A): Constructor<Migration<any, A, CONF, CONN, QUERY, FLAGS, CONTEXT>>[];
+        function relations<M extends Model>(m: Constructor<M>): string[] | undefined;
+        function relations<M extends Model>(m: Constructor<M>, prop: keyof M): ExtendedRelationsMetadata;
+        function relations<M extends Model>(m: Constructor<M>, prop?: keyof M): string[] | ExtendedRelationsMetadata | undefined;
+    }
+}
+declare module "@decaf-ts/decorator-validation" {
+    namespace Model {
+        function relations<M extends Model>(m: Constructor<M>): string[];
+        function relations<M extends Model>(m: Constructor<M>, prop: keyof M): ExtendedRelationsMetadata;
+        function relations<M extends Model>(m: Constructor<M>, prop?: keyof M): string[] | ExtendedRelationsMetadata;
     }
 }

package/lib/overrides/overrides.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const decoration_1 = require("@decaf-ts/decoration");
+const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
 const index_1 = require("./../persistence/index.cjs");
 decoration_1.Metadata.validationExceptions = function (model, op) {
@@ -11,6 +12,23 @@ decoration_1.Metadata.validationExceptions = function (model, op) {
         .filter(([, val]) => val.includes(op))
         .map(([key]) => key);
 }.bind(decoration_1.Metadata);
+decorator_validation_1.Model.shouldValidateNestedHandler = function (model, property) {
+    const metadata = decoration_1.Metadata.get(model.constructor);
+    if (!metadata)
+        return false;
+    const relations = metadata[index_1.PersistenceKeys.RELATIONS];
+    const relation = metadata[index_1.PersistenceKeys.RELATION];
+    if (Array.isArray(relations) && relations?.includes(property)) {
+        const relationName = Object.keys(relation)[0];
+        const relationClassName = decorator_validation_1.Model.isPropertyModel(model, property);
+        return (relation[relationName]?.class !== relationClassName
+        // TODO: Revisit this
+        // ||
+        // relation[relationName]?.populate !== false
+        );
+    }
+    return true;
+}.bind(decorator_validation_1.Model);
 decoration_1.Metadata.migrationsFor = function (adapter) {
     adapter = adapter ?? index_1.Adapter.current;
     if (!adapter)
@@ -18,4 +36,17 @@ decoration_1.Metadata.migrationsFor = function (adapter) {
     const migrations = decoration_1.Metadata["innerGet"](Symbol.for(index_1.PersistenceKeys.MIGRATION), adapter.alias);
     return migrations.map((m) => m.class);
 }.bind(decoration_1.Metadata);
+decoration_1.Metadata.relations = function (m, prop) {
+    const meta = decoration_1.Metadata.get(m, index_1.PersistenceKeys.RELATIONS);
+    if (!meta)
+        return undefined;
+    if (!prop)
+        return Object.keys(meta);
+    if (!meta[prop])
+        throw new db_decorators_1.InternalError(`No relations metadata found for property ${prop}`);
+    return meta[prop];
+}.bind(decoration_1.Metadata);
+decorator_validation_1.Model.relations = function (m, prop) {
+    return decoration_1.Metadata.relations(m, prop) || [];
+};
 //# sourceMappingURL=overrides.js.map

package/lib/overrides/overrides.js.map

@@ -1 +1 @@
-{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../src/overrides/overrides.ts"],"names":[],"mappings":";;AAAA,qDAAgD;AAEhD,2DAKiC;AACjC,sDAAgF;AAE/E,qBAAgB,CAAC,oBAAoB,GAAG,UAEvC,KAAqB,EACrB,EAAiB;IAEjB,MAAM,YAAY,GAChB,qBAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,uBAAe,CAAC,WAAW,CAAC,CAAC;IACnD,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;SAChC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACrC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC,IAAI,CAAC,qBAAQ,CAAC,CAAC;AAEhB,qBAAgB,CAAC,aAAa,GAAG,UAQhC,OAAW;IAEX,OAAO,GAAG,OAAO,IAAK,eAAO,CAAC,OAAa,CAAC;IAC5C,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,6BAAa,CAAC,sCAAsC,CAAC,CAAC;IAC9E,MAAM,UAAU,GAAG,qBAAQ,CAAC,UAAU,CAAC,CACrC,MAAM,CAAC,GAAG,CAAC,uBAAe,CAAC,SAAS,CAAC,EACrC,OAAO,CAAC,KAAK,CACd,CAAC;IACF,OAAO,UAAU,CAAC,GAAG,CACnB,CAAC,CAEA,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CACd,CAAC;AACJ,CAAC,CAAC,IAAI,CAAC,qBAAQ,CAAC,CAAC"}
+{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../src/overrides/overrides.ts"],"names":[],"mappings":"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"}

package/lib/persistence/Adapter.cjs

@@ -17,27 +17,35 @@ const utils_1 = require("./../utils/index.cjs");
 const ObserverHandler_1 = require("./ObserverHandler.cjs");
 const logging_1 = require("@decaf-ts/logging");
 const utils_2 = require("./../identity/utils.cjs");
-const db_decorators_2 = require("@decaf-ts/db-decorators");
 const decoration_1 = require("@decaf-ts/decoration");
 const errors_1 = require("./errors.cjs");
-decorator_validation_1.Decoration.setFlavourResolver((obj) => {
+const flavourResolver = decoration_1.Decoration["flavourResolver"].bind(decoration_1.Decoration);
+decoration_1.Decoration["flavourResolver"] = (obj) => {
     try {
-        return (Adapter.flavourOf(decorator_validation_1.Model.isModel(obj) ? obj.constructor : obj) ||
-            Adapter.currentFlavour ||
-            decorator_validation_1.DefaultFlavour);
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    }
-    catch (e) {
-        // return DefaultFlavour;
-    }
-    try {
-        return Adapter.currentFlavour || decorator_validation_1.DefaultFlavour;
+        const result = flavourResolver(obj);
+        if (result && result !== decoration_1.DefaultFlavour)
+            return result;
+        const targetCtor = typeof obj === "function"
+            ? obj
+            : obj?.constructor;
+        const registeredFlavour = targetCtor && typeof decoration_1.Metadata["registeredFlavour"] === "function"
+            ? decoration_1.Metadata.registeredFlavour(targetCtor)
+            : undefined;
+        if (registeredFlavour && registeredFlavour !== decoration_1.DefaultFlavour)
+            return registeredFlavour;
+        const currentFlavour = Adapter["_currentFlavour"];
+        if (currentFlavour) {
+            const cachedAdapter = Adapter["_cache"]?.[currentFlavour];
+            if (cachedAdapter?.flavour)
+                return cachedAdapter.flavour;
+            return currentFlavour;
+        }
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
     }
     catch (e) {
-        return decorator_validation_1.DefaultFlavour;
+        return decoration_1.DefaultFlavour;
     }
-});
+};
 /**
  * @description Abstract Facade class for persistence adapters
  * @summary Provides the foundation for all database adapters in the persistence layer. This class
@@ -304,7 +312,7 @@ class Adapter extends logging_1.LoggedClass {
      */
     prepare(model, pk) {
         const log = this.log.for(this.prepare);
-        const split = (0, db_decorators_1.modelToTransient)(model);
+        const split = model.segregate();
         const result = Object.entries(split.model).reduce((accum, [key, val]) => {
             if (typeof val === "undefined")
                 return accum;
@@ -518,8 +526,7 @@ class Adapter extends logging_1.LoggedClass {
      * @return {string} The adapter flavor name
      */
     static flavourOf(model) {
-        return (Reflect.getMetadata(this.key(constants_1.PersistenceKeys.ADAPTER), model) ||
-            this.current?.flavour);
+        return decoration_1.Metadata.flavourOf(model);
     }
     static get currentFlavour() {
         if (!Adapter._currentFlavour)
@@ -561,15 +568,6 @@ class Adapter extends logging_1.LoggedClass {
     static setCurrent(flavour) {
         this._currentFlavour = flavour;
     }
-    /**
-     * @description Creates a metadata key
-     * @summary Generates a standardized metadata key for persistence-related metadata
-     * @param {string} key - The base key name
-     * @return {string} The formatted metadata key
-     */
-    static key(key) {
-        return db_decorators_2.Repository.key(key);
-    }
     /**
      * @description Gets all models associated with an adapter flavor
      * @summary Retrieves all model constructors that are configured to use a specific adapter flavor
@@ -579,24 +577,7 @@ class Adapter extends logging_1.LoggedClass {
      */
     static models(flavour) {
         try {
-            const registry = decorator_validation_1.Model.getRegistry();
-            const cache = registry.cache;
-            const managedModels = Object.values(cache)
-                .map((m) => {
-                let f = Reflect.getMetadata(Adapter.key(constants_1.PersistenceKeys.ADAPTER), m);
-                if (f && f === flavour)
-                    return m;
-                if (!f) {
-                    const repo = Reflect.getMetadata(db_decorators_2.Repository.key(db_decorators_1.DBKeys.REPOSITORY), m);
-                    if (!repo)
-                        return;
-                    const repository = this._baseRepository.forModel(m);
-                    f = Reflect.getMetadata(Adapter.key(constants_1.PersistenceKeys.ADAPTER), repository);
-                    return f;
-                }
-            })
-                .filter((m) => !!m);
-            return managedModels;
+            return decoration_1.Metadata.flavouredAs(flavour);
         }
         catch (e) {
             throw new db_decorators_1.InternalError(e);