@decaf-ts/core 0.7.2 → 0.7.4

package/lib/persistence/ObserverHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"ObserverHandler.js","sourceRoot":"","sources":["../../src/persistence/ObserverHandler.ts"],"names":[],"mappings":";;;AAEA,2DAIiC;AAGjC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAa,eAAe;IAA5B;QACE;;;WAGG;QACgB,cAAS,GAGtB,EAAE,CAAC;IAgHX,CAAC;IA9GC;;;;OAIG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,QAAkB,EAAE,MAAuB;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,6BAAa,CAAC,6BAA6B,CAAC,CAAC;QACzE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAAkB;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,6BAAa,CAAC,yBAAyB,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;IACH,KAAK,CAAC,eAAe,CACnB,GAAW,EACX,KAAa,EACb,KAAqD,EACrD,EAAY,EACZ,GAAG,IAAW;QAEd,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,IAAI,CAAC,SAAS;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,IAAI,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAClC,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,GAAG,CAAC,KAAK,CACP,6BAA6B,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAC3D,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC,CACL,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;gBAC9B,GAAG,CAAC,KAAK,CACP,+BAA+B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,CAChF,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAxHD,0CAwHC"}
+{"version":3,"file":"ObserverHandler.js","sourceRoot":"","sources":["../../src/persistence/ObserverHandler.ts"],"names":[],"mappings":";;;AAEA,2DAKiC;AAGjC,2CAAoC;AAGpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,MAAa,eAAe;IAA5B;QACE;;;WAGG;QACgB,cAAS,GAGtB,EAAE,CAAC;IAkHX,CAAC;IAhHC;;;;OAIG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,QAAkB,EAAE,MAAuB;QACjD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,6BAAa,CAAC,6BAA6B,CAAC,CAAC;QACzE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,QAAkB;QAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtE,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,MAAM,IAAI,6BAAa,CAAC,yBAAyB,CAAC,CAAC;QACrE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAClC,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0CG;IACH,KAAK,CAAC,eAAe,CACnB,KAA8B,EAC9B,KAAqD,EACrD,EAAY,EACZ,GAAG,IAAyB;QAE5B,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,iBAAO,CAAC,MAAM,CACrC,IAAI,EACJ,IAAI,CAAC,eAAe,CACrB,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CACtC,IAAI,CAAC,SAAS;aACX,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YACrB,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC;YACzB,IAAI,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;YAC9C,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,GAAG,CAAC,KAAK,CACP,6BAA6B,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAC3D,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC;QACnD,CAAC,CAAC,CACL,CAAC;QACF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;gBAC9B,GAAG,CAAC,KAAK,CACP,+BAA+B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,CAChF,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1HD,0CA0HC"}

package/lib/persistence/Sequence.cjs

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sequence = void 0;
-const utils_1 = require("./../identity/utils.cjs");
-const logging_1 = require("@decaf-ts/logging");
+const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const errors_1 = require("./errors.cjs");
+const db_decorators_1 = require("@decaf-ts/db-decorators");
+const ContextualLoggedClass_1 = require("./../utils/ContextualLoggedClass.cjs");
+const Adapter_1 = require("./Adapter.cjs");
+const Repository_1 = require("./../repository/Repository.cjs");
+const SequenceModel_1 = require("./../model/SequenceModel.cjs");
+const generators_1 = require("./generators.cjs");
 /**
  * @description Abstract base class for sequence generation
  * @summary Provides a framework for generating sequential values (like primary keys) in the persistence layer.
@@ -50,23 +55,136 @@ const errors_1 = require("./errors.cjs");
  * const nextId = await sequence.next();
  * ```
  */
-class Sequence {
-    /**
-     * @description Accessor for the logger instance
-     * @summary Gets or initializes the logger for this sequence
-     * @return {Logger} The logger instance
-     */
-    get log() {
-        if (!this.logger)
-            this.logger = logging_1.Logging.for(this);
-        return this.logger;
-    }
+class Sequence extends ContextualLoggedClass_1.ContextualLoggedClass {
     /**
      * @description Creates a new sequence instance
      * @summary Protected constructor that initializes the sequence with the provided options
      */
-    constructor(options) {
+    constructor(options, adapter) {
+        super();
         this.options = options;
+        this.adapter = adapter;
+        this.repo = Repository_1.Repository.forModel(SequenceModel_1.SequenceModel, adapter.alias);
+    }
+    /**
+     * @description Retrieves the current value of the sequence
+     * @summary Gets the current value of the sequence from storage. If the sequence
+     * doesn't exist yet, it returns the configured starting value.
+     * @return A promise that resolves to the current sequence value
+     */
+    async current(...args) {
+        const contextArgs = await db_decorators_1.Context.args(db_decorators_1.OperationKeys.READ, SequenceModel_1.SequenceModel, args, this.adapter);
+        const ctx = contextArgs.context;
+        const { name, startWith } = this.options;
+        try {
+            const sequence = await this.repo.read(name, ctx);
+            return this.parse(sequence.current);
+        }
+        catch (e) {
+            if (e instanceof db_decorators_1.NotFoundError) {
+                if (typeof startWith === "undefined")
+                    throw new db_decorators_1.InternalError("Starting value is not defined for a non existing sequence");
+                try {
+                    return this.parse(startWith);
+                }
+                catch (e) {
+                    throw new db_decorators_1.InternalError(`Failed to parse initial value for sequence ${startWith}: ${e}`);
+                }
+            }
+            throw new db_decorators_1.InternalError(`Failed to retrieve current value for sequence ${name}: ${e}`);
+        }
+    }
+    /**
+     * @description Increments the sequence value
+     * @summary Increases the current sequence value by the specified amount and persists
+     * the new value to storage. This method handles both numeric and BigInt sequence types.
+     * @param {string | number | bigint} current - The current value of the sequence
+     * @param {number} [count] - Optional amount to increment by, defaults to the sequence's incrementBy value
+     * @return A promise that resolves to the new sequence value after incrementing
+     */
+    async increment(current, count, ctx) {
+        const { type, incrementBy, name } = this.options;
+        let next;
+        const toIncrementBy = count || incrementBy;
+        if (toIncrementBy % incrementBy !== 0)
+            throw new db_decorators_1.InternalError(`Value to increment does not consider the incrementBy setting: ${incrementBy}`);
+        switch (type) {
+            case "Number":
+                next = this.parse(current) + toIncrementBy;
+                break;
+            case "BigInt":
+                next = this.parse(current) + BigInt(toIncrementBy);
+                break;
+            case "String":
+                next = this.parse(current);
+                break;
+            case "serial":
+                next = generators_1.Serial.instance.generate(current);
+                break;
+            case "uuid":
+                next = generators_1.UUID.instance.generate(current);
+                break;
+            default:
+                throw new db_decorators_1.InternalError("Should never happen");
+        }
+        let seq;
+        // const repo = this.repo.override({
+        //   ignoredValidationProperties: ["updatedAt"],
+        // });
+        try {
+            seq = await this.repo.update(new SequenceModel_1.SequenceModel({ id: name, current: next }), ctx);
+        }
+        catch (e) {
+            if (!(e instanceof db_decorators_1.NotFoundError)) {
+                throw e;
+            }
+            try {
+                seq = await this.repo.create(new SequenceModel_1.SequenceModel({ id: name, current: next }), ctx);
+            }
+            catch (e) {
+                if (!(e instanceof db_decorators_1.ConflictError) || type !== "uuid")
+                    throw e;
+                return this.increment(current, count, ctx); // retries uuids in case of conflict
+            }
+        }
+        return seq.current;
+    }
+    /**
+     * @description Gets the next value in the sequence
+     * @summary Retrieves the current value of the sequence and increments it by the
+     * configured increment amount. This is the main method used to get a new sequential value.
+     * @return A promise that resolves to the next value in the sequence
+     */
+    async next(...argz) {
+        const contextArgs = await db_decorators_1.Context.args(db_decorators_1.OperationKeys.UPDATE, SequenceModel_1.SequenceModel, argz, this.adapter);
+        const { context, args } = contextArgs;
+        const current = await this.current(...args);
+        return this.increment(current, undefined, context);
+    }
+    /**
+     * @description Generates a range of sequential values
+     * @summary Retrieves a specified number of sequential values from the sequence.
+     * This is useful when you need to allocate multiple IDs at once.
+     * The method increments the sequence by the total amount needed and returns all values in the range.
+     * @param {number} count - The number of sequential values to generate
+     * @return A promise that resolves to an array of sequential values
+     */
+    async range(count, ...argz) {
+        const contextArgs = await db_decorators_1.Context.args(db_decorators_1.OperationKeys.UPDATE, SequenceModel_1.SequenceModel, argz, this.adapter);
+        const { context, args } = contextArgs;
+        const current = (await this.current(...args));
+        const incrementBy = this.parse(this.options.incrementBy);
+        const next = await this.increment(current, this.parse(count) * incrementBy, context);
+        const range = [];
+        for (let i = 1; i <= count; i++) {
+            range.push(current + incrementBy * this.parse(i));
+        }
+        if (range[range.length - 1] !== next && this.options.type !== "String")
+            throw new db_decorators_1.InternalError("Miscalculation of range");
+        return range;
+    }
+    parse(value) {
+        return Sequence.parseValue(this.options.type, value);
     }
     /**
      * @description Gets the primary key sequence name for a model
@@ -76,7 +194,7 @@ class Sequence {
      * @return {string} The sequence name for the model's primary key
      */
     static pk(model) {
-        return (0, utils_1.sequenceNameForModel)(model, "pk");
+        return decorator_validation_1.Model.sequenceName(model, "pk");
     }
     /**
      * @description Parses a sequence value to the appropriate type
@@ -97,6 +215,8 @@ class Sequence {
                 return BigInt(value);
             case undefined:
             case "String":
+            case "uuid":
+            case "serial":
                 return value;
             default:
                 throw new errors_1.UnsupportedError(`Unsupported sequence type: ${type} for adapter ${this}`);
@@ -104,4 +224,5 @@ class Sequence {
     }
 }
 exports.Sequence = Sequence;
+Adapter_1.Adapter["_baseSequence"] = Sequence;
 //# sourceMappingURL=Sequence.js.map

package/lib/persistence/Sequence.d.ts

@@ -1,7 +1,11 @@
 import { Model } from "@decaf-ts/decorator-validation";
 import { SequenceOptions } from "../interfaces/SequenceOptions";
-import { Logger } from "@decaf-ts/logging";
 import { Constructor } from "@decaf-ts/decoration";
+import { Context } from "@decaf-ts/db-decorators";
+import { ContextualLoggedClass, MaybeContextualArg } from "../utils/ContextualLoggedClass";
+import { Adapter } from "./Adapter";
+import { Repo } from "../repository/Repository";
+import { SequenceModel } from "../model/SequenceModel";
 /**
  * @description Abstract base class for sequence generation
  * @summary Provides a framework for generating sequential values (like primary keys) in the persistence layer.
@@ -48,43 +52,48 @@ import { Constructor } from "@decaf-ts/decoration";
  * const nextId = await sequence.next();
  * ```
  */
-export declare abstract class Sequence {
+export declare class Sequence extends ContextualLoggedClass<any> {
     protected readonly options: SequenceOptions;
+    protected readonly adapter: Adapter<any, any, any>;
+    protected repo: Repo<SequenceModel>;
     /**
-     * @description Logger instance for this sequence
-     * @summary Lazily initialized logger for the sequence instance
+     * @description Creates a new sequence instance
+     * @summary Protected constructor that initializes the sequence with the provided options
      */
-    private logger;
+    constructor(options: SequenceOptions, adapter: Adapter<any, any, any>);
     /**
-     * @description Accessor for the logger instance
-     * @summary Gets or initializes the logger for this sequence
-     * @return {Logger} The logger instance
+     * @description Retrieves the current value of the sequence
+     * @summary Gets the current value of the sequence from storage. If the sequence
+     * doesn't exist yet, it returns the configured starting value.
+     * @return A promise that resolves to the current sequence value
      */
-    protected get log(): Logger;
+    current(...args: MaybeContextualArg<any>): Promise<string | number | bigint>;
     /**
-     * @description Creates a new sequence instance
-     * @summary Protected constructor that initializes the sequence with the provided options
+     * @description Increments the sequence value
+     * @summary Increases the current sequence value by the specified amount and persists
+     * the new value to storage. This method handles both numeric and BigInt sequence types.
+     * @param {string | number | bigint} current - The current value of the sequence
+     * @param {number} [count] - Optional amount to increment by, defaults to the sequence's incrementBy value
+     * @return A promise that resolves to the new sequence value after incrementing
      */
-    protected constructor(options: SequenceOptions);
+    protected increment(current: string | number | bigint, count: number | undefined, ctx: Context<any>): Promise<string | number | bigint>;
     /**
      * @description Gets the next value in the sequence
-     * @summary Retrieves the next value from the sequence, incrementing it in the process
+     * @summary Retrieves the current value of the sequence and increments it by the
+     * configured increment amount. This is the main method used to get a new sequential value.
      * @return A promise that resolves to the next value in the sequence
      */
-    abstract next(): Promise<string | number | bigint>;
-    /**
-     * @description Gets the current value of the sequence
-     * @summary Retrieves the current value of the sequence without incrementing it
-     * @return A promise that resolves to the current value in the sequence
-     */
-    abstract current(): Promise<string | number | bigint>;
+    next(...argz: MaybeContextualArg<any>): Promise<number | string | bigint>;
     /**
-     * @description Gets a range of sequential values
-     * @summary Retrieves multiple sequential values at once, which can be more efficient than calling next() multiple times
-     * @param {number} count - The number of sequential values to retrieve
+     * @description Generates a range of sequential values
+     * @summary Retrieves a specified number of sequential values from the sequence.
+     * This is useful when you need to allocate multiple IDs at once.
+     * The method increments the sequence by the total amount needed and returns all values in the range.
+     * @param {number} count - The number of sequential values to generate
      * @return A promise that resolves to an array of sequential values
      */
-    abstract range(count: number): Promise<(number | string | bigint)[]>;
+    range(count: number, ...argz: MaybeContextualArg<any>): Promise<(number | string | bigint)[]>;
+    protected parse(value: string | number | bigint): string | number | bigint;
     /**
      * @description Gets the primary key sequence name for a model
      * @summary Utility method that returns the standardized sequence name for a model's primary key
@@ -100,5 +109,5 @@ export declare abstract class Sequence {
      * @param {string|number|bigint} value - The value to convert
      * @return {string|number|bigint} The converted value
      */
-    static parseValue(type: "Number" | "BigInt" | string | undefined, value: string | number | bigint): string | number | bigint;
+    static parseValue(type: "Number" | "BigInt" | "uuid" | "serial" | string | undefined, value: string | number | bigint): string | number | bigint;
 }

package/lib/persistence/Sequence.js.map

@@ -1 +1 @@
-{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../src/persistence/Sequence.ts"],"names":[],"mappings":";;;AACA,mDAAyD;AAEzD,+CAAoD;AACpD,yCAA4C;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,MAAsB,QAAQ;IAO5B;;;;OAIG;IACH,IAAc,GAAG;QACf,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,iBAAO,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,YAAyC,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;IAAG,CAAC;IAwBrE;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,CAAkB,KAAyB;QAClD,OAAO,IAAA,4BAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,UAAU,CACf,IAA8C,EAC9C,KAA+B;QAE/B,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,QAAQ;gBACX,OAAO,OAAO,KAAK,KAAK,QAAQ;oBAC9B,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;oBACjB,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ;wBACzB,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;YACvB,KAAK,SAAS,CAAC;YACf,KAAK,QAAQ;gBACX,OAAO,KAAK,CAAC;YACf;gBACE,MAAM,IAAI,yBAAgB,CACxB,8BAA8B,IAAI,gBAAgB,IAAI,EAAE,CACzD,CAAC;QACN,CAAC;IACH,CAAC;CACF;AArFD,4BAqFC"}
+{"version":3,"file":"Sequence.js","sourceRoot":"","sources":["../../src/persistence/Sequence.ts"],"names":[],"mappings":"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"}

package/lib/persistence/constants.cjs

@@ -18,6 +18,7 @@ var PersistenceKeys;
     PersistenceKeys["ADAPTER"] = "adapter";
     /** @description Template for injectable adapter names */
     PersistenceKeys["INJECTABLE"] = "decaf_{0}_adapter_for_{1}";
+    PersistenceKeys["SERVICE"] = "service";
     /** @description Key for table name metadata */
     PersistenceKeys["TABLE"] = "table";
     /** @description Key for column name metadata */

package/lib/persistence/constants.d.ts

@@ -14,6 +14,7 @@ export declare enum PersistenceKeys {
     ADAPTER = "adapter",
     /** @description Template for injectable adapter names */
     INJECTABLE = "decaf_{0}_adapter_for_{1}",
+    SERVICE = "service",
     /** @description Key for table name metadata */
     TABLE = "table",
     /** @description Key for column name metadata */

package/lib/persistence/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/persistence/constants.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,IAAY,eAyDX;AAzDD,WAAY,eAAe;IACzB,0CAA0C;IAC1C,kCAAe,CAAA;IAEf,sDAAsD;IACtD,oCAAiB,CAAA;IAEjB,4CAA4C;IAC5C,sCAAmB,CAAA;IAEnB,yDAAyD;IACzD,2DAAwC,CAAA;IAExC,+CAA+C;IAC/C,kCAAe,CAAA;IAEf,gDAAgD;IAChD,oCAAiB,CAAA;IAEjB,oDAAoD;IACpD,0CAAuB,CAAA;IAEvB,YAAY;IACZ,yDAAyD;IACzD,0CAAuB,CAAA;IAEvB,yDAAyD;IACzD,sDAAsC,CAAA;IAEtC,yDAAyD;IACzD,sDAAsC,CAAA;IAEtC,YAAY;IAEZ,sDAAsD;IACtD,4CAAyB,CAAA;IAEzB,sDAAsD;IACtD,wCAAqB,CAAA;IAErB,wDAAwD;IACxD,qDAAqC,CAAA;IAErC,yDAAyD;IACzD,uDAAuC,CAAA;IAEvC,yDAAyD;IACzD,uDAAuC,CAAA;IACvC,yDAAyD;IACzD,yDAAyC,CAAA;IAEzC,6CAA6C;IAC7C,wCAAqB,CAAA;IACrB,6CAA6C;IAC7C,8CAA2B,CAAA;IAC3B,6CAA6C;IAC7C,0CAAuB,CAAA;AACzB,CAAC,EAzDW,eAAe,+BAAf,eAAe,QAyD1B"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/persistence/constants.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,IAAY,eA0DX;AA1DD,WAAY,eAAe;IACzB,0CAA0C;IAC1C,kCAAe,CAAA;IAEf,sDAAsD;IACtD,oCAAiB,CAAA;IAEjB,4CAA4C;IAC5C,sCAAmB,CAAA;IAEnB,yDAAyD;IACzD,2DAAwC,CAAA;IAExC,sCAAmB,CAAA;IACnB,+CAA+C;IAC/C,kCAAe,CAAA;IAEf,gDAAgD;IAChD,oCAAiB,CAAA;IAEjB,oDAAoD;IACpD,0CAAuB,CAAA;IAEvB,YAAY;IACZ,yDAAyD;IACzD,0CAAuB,CAAA;IAEvB,yDAAyD;IACzD,sDAAsC,CAAA;IAEtC,yDAAyD;IACzD,sDAAsC,CAAA;IAEtC,YAAY;IAEZ,sDAAsD;IACtD,4CAAyB,CAAA;IAEzB,sDAAsD;IACtD,wCAAqB,CAAA;IAErB,wDAAwD;IACxD,qDAAqC,CAAA;IAErC,yDAAyD;IACzD,uDAAuC,CAAA;IAEvC,yDAAyD;IACzD,uDAAuC,CAAA;IACvC,yDAAyD;IACzD,yDAAyC,CAAA;IAEzC,6CAA6C;IAC7C,wCAAqB,CAAA;IACrB,6CAA6C;IAC7C,8CAA2B,CAAA;IAC3B,6CAA6C;IAC7C,0CAAuB,CAAA;AACzB,CAAC,EA1DW,eAAe,+BAAf,eAAe,QA0D1B"}

package/lib/persistence/generators.cjs

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Serial = exports.UUID = void 0;
+class UUID {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    generate(prev) {
+        return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+            const r = (Math.random() * 16) | 0, v = c == "x" ? r : (r & 0x3) | 0x8;
+            return v.toString(16);
+        });
+    }
+    static get instance() {
+        if (!UUID._instance)
+            UUID._instance = new UUID();
+        return UUID._instance;
+    }
+}
+exports.UUID = UUID;
+class Serial {
+    constructor() {
+        this.count = 14;
+    }
+    generate(prev) {
+        prev = ((prev ? parseInt(prev) : 0) || 0);
+        return (prev + 1)
+            .toString()
+            .padStart(this.count, "0");
+    }
+    static get instance() {
+        if (!Serial._instance)
+            Serial._instance = new Serial();
+        return Serial._instance;
+    }
+}
+exports.Serial = Serial;
+//# sourceMappingURL=generators.js.map

package/lib/persistence/generators.d.ts

@@ -0,0 +1,14 @@
+export interface Generator<OUT extends string | number = string> {
+    generate(prev?: OUT): OUT;
+}
+export declare class UUID implements Generator {
+    private static _instance;
+    generate(prev?: string): string;
+    static get instance(): UUID;
+}
+export declare class Serial implements Generator {
+    private static _instance;
+    private count;
+    generate(prev?: string): string;
+    static get instance(): Serial;
+}

package/lib/persistence/generators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators.js","sourceRoot":"","sources":["../../src/persistence/generators.ts"],"names":[],"mappings":";;;AAIA,MAAa,IAAI;IAGf,6DAA6D;IAC7D,QAAQ,CAAC,IAAa;QACpB,OAAO,sCAAsC,CAAC,OAAO,CACnD,OAAO,EACP,UAAU,CAAC;YACT,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAChC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;YACrC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;CACF;AAnBD,oBAmBC;AAED,MAAa,MAAM;IAAnB;QAGU,UAAK,GAAG,EAAE,CAAC;IAarB,CAAC;IAXC,QAAQ,CAAC,IAAa;QACpB,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAsB,CAAC;QACzE,OAAO,CAAE,IAA0B,GAAG,CAAC,CAAC;aACrC,QAAQ,EAAE;aACV,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,IAAI,CAAC,MAAM,CAAC,SAAS;YAAE,MAAM,CAAC,SAAS,GAAG,IAAI,MAAM,EAAE,CAAC;QACvD,OAAO,MAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;CACF;AAhBD,wBAgBC"}

package/lib/persistence/index.cjs

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Dispatch.cjs"), exports);
 __exportStar(require("./constants.cjs"), exports);
 __exportStar(require("./errors.cjs"), exports);
+__exportStar(require("./generators.cjs"), exports);
 __exportStar(require("./migrations.cjs"), exports);
 __exportStar(require("./ObserverHandler.cjs"), exports);
 __exportStar(require("./Sequence.cjs"), exports);

package/lib/persistence/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./Dispatch";
 export * from "./constants";
 export * from "./errors";
+export * from "./generators";
 export * from "./migrations";
 export * from "./ObserverHandler";
 export * from "./Sequence";

package/lib/persistence/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/persistence/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2BAA2B;AAC3B,iDAA2B;AAC3B,kDAA4B;AAC5B,+CAAyB;AACzB,mDAA6B;AAC7B,wDAAkC;AAClC,iDAA2B;AAC3B,8CAAwB;AACxB,gDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/persistence/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2BAA2B;AAC3B,iDAA2B;AAC3B,kDAA4B;AAC5B,+CAAyB;AACzB,mDAA6B;AAC7B,mDAA6B;AAC7B,wDAAkC;AAClC,iDAA2B;AAC3B,8CAAwB;AACxB,gDAA0B"}

package/lib/persistence/migrations.cjs

@@ -9,6 +9,7 @@ const logging_1 = require("@decaf-ts/logging");
 const constants_1 = require("./constants.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
 const errors_1 = require("./errors.cjs");
+const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 function prefixMethod(obj, after, prefix, afterName) {
     async function wrapper(...args) {
         let results;
@@ -48,14 +49,12 @@ class AbsMigration extends logging_1.LoggedClass {
         const flavour = meta.flavour;
         return Adapter_1.Adapter.get(flavour);
     }
-    async enforceRules(qr, adapter, l) {
+    async enforceRules(qr, adapter, ctx) {
         const rules = decoration_1.Metadata.get(this.constructor, constants_1.PersistenceKeys.MIGRATION)?.rules;
         if (!rules || !rules.length)
             return true;
-        let log;
         for (const rule of rules) {
-            log = l.for(rule);
-            const result = await rule(qr, adapter, log);
+            const result = await rule(qr, adapter, ctx);
             if (!result)
                 return false;
         }
@@ -71,13 +70,13 @@ class AbsMigration extends logging_1.LoggedClass {
                 qr = qrOrAdapter;
                 qrOrAdapter = this.adapter;
             }
-            const log = this.log.for(name);
-            const allowed = await this.enforceRules(qr, qrOrAdapter, log);
+            const ctx = await db_decorators_1.Context.args("migration", decorator_validation_1.Model, [name], qrOrAdapter);
+            const allowed = await this.enforceRules(qr, qrOrAdapter, ctx.context);
             if (!allowed) {
-                log.verbose(`Skipping migration ${this.constructor.name} due to rules`);
+                ctx.context.logger.verbose(`Skipping migration ${this.constructor.name} due to rules`);
                 throw new errors_1.MigrationRuleError("Migration skipped for rule enforcement");
             }
-            return [qr, qrOrAdapter, log];
+            return [qr, qrOrAdapter, ctx.context];
         }.bind(this);
     }
 }

package/lib/persistence/migrations.d.ts

@@ -1,19 +1,19 @@
-import { Migration } from "./types";
+import { ContextOf, Migration } from "./types";
 import { Adapter } from "./Adapter";
-import { Context, RepositoryFlags } from "@decaf-ts/db-decorators";
-import { LoggedClass, Logger } from "@decaf-ts/logging";
+import { LoggedClass } from "@decaf-ts/logging";
 export declare function prefixMethod(obj: any, after: (...args: any[]) => any, prefix: (...args: any[]) => any, afterName?: string): void;
-export declare abstract class AbsMigration<A extends Adapter<CONF, CONN, QUERY, FLAGS, CONTEXT>, CONF, CONN, QUERY, QUERYRUNNER = CONN, FLAGS extends RepositoryFlags = RepositoryFlags, CONTEXT extends Context<FLAGS> = Context<FLAGS>> extends LoggedClass implements Migration<QUERYRUNNER, A, CONF, CONN, QUERY, FLAGS, CONTEXT> {
+export type ConnectionForAdapter<A extends Adapter<any, any, any, any>> = A extends Adapter<any, any, infer CONN, any> ? CONN : never;
+export declare abstract class AbsMigration<A extends Adapter<any, any, any, any>, QUERYRUNNER = ConnectionForAdapter<A>> extends LoggedClass implements Migration<QUERYRUNNER, A> {
     transaction: boolean;
     protected constructor();
     protected get adapter(): A;
-    protected abstract getQueryRunner(conn: CONN): QUERYRUNNER;
+    protected abstract getQueryRunner(conn: ConnectionForAdapter<A>): QUERYRUNNER;
     private enforceRules;
     private prefix;
-    abstract down(qr: QUERYRUNNER, adapter: A, log: Logger): Promise<void>;
-    abstract up(qr: QUERYRUNNER, adapter: A, log: Logger): Promise<void>;
+    abstract down(qr: QUERYRUNNER, adapter: A, ctx: ContextOf<A>): Promise<void>;
+    abstract up(qr: QUERYRUNNER, adapter: A, ctx: ContextOf<A>): Promise<void>;
 }
-export type MigrationRule<A extends Adapter<CONF, CONN, QUERY, FLAGS, CONTEXT> = any, CONF = any, CONN = any, QUERY = any, QUERYRUNNER = CONN, FLAGS extends RepositoryFlags = RepositoryFlags, CONTEXT extends Context<FLAGS> = Context<FLAGS>> = (qr: QUERYRUNNER, adapter: A, log: Logger) => Promise<boolean>;
+export type MigrationRule<A extends Adapter<any, any, any, any> = any, QUERYRUNNER = ConnectionForAdapter<A>> = (qr: QUERYRUNNER, adapter: A, ctx: ContextOf<A>) => Promise<boolean>;
 export type MigrationMetadata = {
     flavour: string;
     rules?: MigrationRule[];

package/lib/persistence/migrations.js.map

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

package/lib/persistence/types.d.ts

@@ -1,7 +1,30 @@
-import { BulkCrudOperationKeys, Context, OperationKeys, RepositoryFlags } from "@decaf-ts/db-decorators";
+import { BulkCrudOperationKeys, Context, ContextOfRepository, FlagsOfContext, FlagsOfRepository, IRepository, LoggerOfContext, LoggerOfFlags, LoggerOfRepository, OperationKeys, RepositoryFlags } from "@decaf-ts/db-decorators";
 import { Adapter } from "./Adapter";
-import { Observable } from "../interfaces/index";
+import { Observable, type Observer } from "../interfaces/index";
 import { Logger } from "@decaf-ts/logging";
+import { Constructor } from "@decaf-ts/decoration";
+import { Model } from "@decaf-ts/decorator-validation";
+import { ContextualArgs } from "../utils/index";
+export type ContextOf<OBJ extends IRepository<any, any> | Adapter<any, any, any, any>> = OBJ extends Adapter<any, any, any, infer C> ? C : OBJ extends IRepository<any, any> ? ContextOfRepository<OBJ> : never;
+export type LoggerOfAdapter<A extends Adapter<any, any, any, any>> = A extends Adapter<any, any, any, infer C> ? LoggerOfContext<C> : never;
+export type FlagsOfAdapter<A extends Adapter<any, any, any, any>> = A extends Adapter<any, any, any, infer C> ? FlagsOfContext<C> : never;
+export type LoggerOf<OBJ extends RepositoryFlags<any> | Context<any> | Adapter<any, any, any> | IRepository<any, any>> = OBJ extends RepositoryFlags<any> ? LoggerOfFlags<OBJ> : OBJ extends Context<any> ? LoggerOfContext<OBJ> : OBJ extends IRepository<any, any> ? LoggerOfRepository<OBJ> : OBJ extends Adapter<any, any, any> ? LoggerOfAdapter<OBJ> : Logger;
+export type FlagsOf<OBJ extends IRepository<any, any> | Adapter<any, any, any, any> | Context<any>> = OBJ extends Context<any> ? FlagsOfContext<OBJ> : OBJ extends IRepository<any, any> ? FlagsOfRepository<OBJ> : OBJ extends Adapter<any, any, any, any> ? FlagsOfAdapter<OBJ> : never;
+export type PersistenceObservable<CONTEXT extends Context<any>> = Observable<[
+    Observer,
+    ObserverFilter?
+], [
+    Constructor | string,
+    OperationKeys | BulkCrudOperationKeys | string,
+    EventIds,
+    ...ContextualArgs<CONTEXT>
+]>;
+export type PersistenceObserver<CONTEXT extends Context<any>> = Observer<[
+    Constructor | string,
+    OperationKeys | BulkCrudOperationKeys | string,
+    EventIds,
+    ...ContextualArgs<CONTEXT>
+]>;
 /**
  * @description Type representing possible ID formats for database events
  * @summary A union type that defines the possible formats for event identifiers in the persistence layer.
@@ -10,25 +33,20 @@ import { Logger } from "@decaf-ts/logging";
  * @memberOf module:core
  */
 export type EventIds = string | number | bigint | string[] | number[] | bigint[];
-/**
- * @description Function type for filtering observer notifications
- * @summary A function type that defines a predicate used to determine whether an observer should be notified
- * about a specific database event. The filter examines the table name, event type, and affected IDs.
- * @param {string} table - The name of the database table where the event occurred
- * @param {(OperationKeys|BulkCrudOperationKeys|string)} event - The type of operation that triggered the event
- * @param {EventIds} id - The identifier(s) of the affected record(s)
- * @return {boolean} True if the observer should be notified, false otherwise
- * @typedef {Function} ObserverFilter
- * @memberOf module:core
- */
-export type ObserverFilter = (table: string, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds) => boolean;
-export type InferredAdapterConfig<A> = A extends Adapter<infer CONF, any, any, any> ? CONF : never;
-export interface AdapterDispatch extends Observable {
+export type ObserverFilter = (table: string | Constructor, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds, ...args: [...any[], Context<any>]) => boolean;
+export type InferredAdapterConfig<A> = A extends Adapter<infer CONF, any, any> ? CONF : never;
+export interface AdapterDispatch<A extends Adapter<any, any, any, any>> extends PersistenceObservable<ContextOf<A>> {
     close(): Promise<void>;
-    updateObservers(table: string, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds): Promise<void>;
+    updateObservers<M extends Model>(table: Constructor<M> | string, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds, ...args: ContextualArgs<ContextOf<A>>): Promise<void>;
 }
-export interface Migration<QUERYRUNNER, A extends Adapter<CONF, CONN, QUERY, FLAGS, CONTEXT>, CONF, CONN, QUERY, FLAGS extends RepositoryFlags = RepositoryFlags, CONTEXT extends Context<FLAGS> = Context<FLAGS>> {
+export interface Migration<QUERYRUNNER, A extends Adapter<any, any, any, any>> {
     transaction: boolean;
-    up(qr: QUERYRUNNER, adapter?: A, log?: Logger): Promise<void>;
-    down(qr: QUERYRUNNER, adapter?: A, log?: Logger): Promise<void>;
+    up(qr: QUERYRUNNER, adapter?: A, ctx?: ContextOf<A>): Promise<void>;
+    down(qr: QUERYRUNNER, adapter?: A, ctx?: ContextOf<A>): Promise<void>;
 }
+export type RepositoryFor<A extends Adapter<any, any, any, any>> = A extends Adapter<any, any, any, any> ? ReturnType<A["repository"]> : never;
+export type PreparedModel = {
+    record: Record<string, any>;
+    id: string;
+    transient?: Record<string, any>;
+};

package/lib/query/Paginator.cjs

@@ -81,11 +81,11 @@ class Paginator extends logging_1.LoggedClass {
         this.size = size;
         this.clazz = clazz;
     }
-    async next() {
-        return this.page(this.current + 1);
+    async next(...args) {
+        return this.page(this.current + 1, ...args);
     }
-    async previous() {
-        return this.page(this.current - 1);
+    async previous(...args) {
+        return this.page(this.current - 1, ...args);
     }
     validatePage(page) {
         if (page < 1 || !Number.isInteger(page))