@decaf-ts/core 0.7.1 → 0.7.3

package/lib/persistence/Sequence.cjs

@@ -1,9 +1,9 @@
 "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 ContextualLoggedClass_1 = require("./../utils/ContextualLoggedClass.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 +50,18 @@ 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;
+    }
+    parse(value) {
+        return Sequence.parseValue(this.options.type, value);
     }
     /**
      * @description Gets the primary key sequence name for a model
@@ -76,7 +71,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

package/lib/persistence/Sequence.d.ts

@@ -1,7 +1,9 @@
 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 { PrimaryKeyType } from "@decaf-ts/db-decorators";
+import { ContextualLoggedClass, MaybeContextualArg } from "../utils/ContextualLoggedClass";
+import { Adapter } from "./Adapter";
 /**
  * @description Abstract base class for sequence generation
  * @summary Provides a framework for generating sequential values (like primary keys) in the persistence layer.
@@ -48,43 +50,34 @@ import { Constructor } from "@decaf-ts/decoration";
  * const nextId = await sequence.next();
  * ```
  */
-export declare abstract class Sequence {
+export declare abstract class Sequence extends ContextualLoggedClass<any> {
     protected readonly options: SequenceOptions;
-    /**
-     * @description Logger instance for this sequence
-     * @summary Lazily initialized logger for the sequence instance
-     */
-    private logger;
-    /**
-     * @description Accessor for the logger instance
-     * @summary Gets or initializes the logger for this sequence
-     * @return {Logger} The logger instance
-     */
-    protected get log(): Logger;
+    protected readonly adapter: Adapter<any, any, any>;
     /**
      * @description Creates a new sequence instance
      * @summary Protected constructor that initializes the sequence with the provided options
      */
-    protected constructor(options: SequenceOptions);
+    protected constructor(options: SequenceOptions, adapter: Adapter<any, any, any>);
     /**
      * @description Gets the next value in the sequence
      * @summary Retrieves the next value from the sequence, incrementing it in the process
      * @return A promise that resolves to the next value in the sequence
      */
-    abstract next(): Promise<string | number | bigint>;
+    abstract next(...args: MaybeContextualArg<any>): Promise<PrimaryKeyType>;
     /**
      * @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>;
+    abstract current(...args: MaybeContextualArg<any>): Promise<PrimaryKeyType>;
+    protected parse(value: string | number | bigint): string | number | 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
      * @return A promise that resolves to an array of sequential values
      */
-    abstract range(count: number): Promise<(number | string | bigint)[]>;
+    abstract range(count: number, ...argz: MaybeContextualArg<any>): Promise<(number | string | 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

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":";;;AAAA,yEAAuD;AAEvD,yCAA4C;AAG5C,gFAGwC;AAGxC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,MAAsB,QAAS,SAAQ,6CAA0B;IAC/D;;;OAGG;IACH,YACqB,OAAwB,EACxB,OAA+B;QAElD,KAAK,EAAE,CAAC;QAHW,YAAO,GAAP,OAAO,CAAiB;QACxB,YAAO,GAAP,OAAO,CAAwB;IAGpD,CAAC;IAgBS,KAAK,CAAC,KAA+B;QAC7C,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvD,CAAC;IAaD;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,CAAkB,KAAyB;QAClD,OAAO,4BAAK,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,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;AAjFD,4BAiFC"}

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/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))

package/lib/query/Paginator.d.ts

@@ -2,6 +2,7 @@ import { Adapter } from "../persistence";
 import { Model } from "@decaf-ts/decorator-validation";
 import { Constructor } from "@decaf-ts/decoration";
 import { LoggedClass } from "@decaf-ts/logging";
+import { MaybeContextualArg } from "../utils/index";
 /**
  * @description Handles pagination for database queries
  * @summary Provides functionality for navigating through paginated query results
@@ -59,7 +60,7 @@ import { LoggedClass } from "@decaf-ts/logging";
  *   Paginator-->>Client: return page results
  */
 export declare abstract class Paginator<M extends Model, R = M[], Q = any> extends LoggedClass {
-    protected readonly adapter: Adapter<any, any, Q, any, any>;
+    protected readonly adapter: Adapter<any, any, Q, any>;
     protected readonly query: Q;
     readonly size: number;
     protected readonly clazz: Constructor<M>;
@@ -72,10 +73,10 @@ export declare abstract class Paginator<M extends Model, R = M[], Q = any> exten
     get total(): number;
     get count(): number;
     protected get statement(): Q;
-    protected constructor(adapter: Adapter<any, any, Q, any, any>, query: Q, size: number, clazz: Constructor<M>);
+    protected constructor(adapter: Adapter<any, any, Q, any>, query: Q, size: number, clazz: Constructor<M>);
     protected abstract prepare(rawStatement: Q): Q;
-    next(): Promise<R[]>;
-    previous(): Promise<R[]>;
+    next(...args: MaybeContextualArg<any>): Promise<R[]>;
+    previous(...args: MaybeContextualArg<any>): Promise<R[]>;
     protected validatePage(page: number): number;
-    abstract page(page?: number): Promise<R[]>;
+    abstract page(page?: number, ...args: MaybeContextualArg<any>): Promise<R[]>;
 }

package/lib/query/Paginator.js.map

@@ -1 +1 @@
-{"version":3,"file":"Paginator.js","sourceRoot":"","sources":["../../src/query/Paginator.ts"],"names":[],"mappings":";;;AAAA,yCAAuC;AAIvC,+CAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAsB,SAIpB,SAAQ,qBAAW;IAQnB,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAc,SAAS;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,YACqB,OAAuC,EACvC,KAAQ,EAClB,IAAY,EACF,KAAqB;QAExC,KAAK,EAAE,CAAC;QALW,YAAO,GAAP,OAAO,CAAgC;QACvC,UAAK,GAAL,KAAK,CAAG;QAClB,SAAI,GAAJ,IAAI,CAAQ;QACF,UAAK,GAAL,KAAK,CAAgB;IAG1C,CAAC;IAID,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;IACrC,CAAC;IAES,YAAY,CAAC,IAAY;QACjC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACrC,MAAM,IAAI,oBAAW,CACnB,sDAAsD,CACvD,CAAC;QACJ,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,WAAW,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW;YACpE,MAAM,IAAI,oBAAW,CACnB,QAAQ,IAAI,CAAC,WAAW,qCAAqC,IAAI,EAAE,CACpE,CAAC;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;CAGF;AA7DD,8BA6DC"}
+{"version":3,"file":"Paginator.js","sourceRoot":"","sources":["../../src/query/Paginator.ts"],"names":[],"mappings":";;;AAAA,yCAAuC;AAIvC,+CAAgD;AAGhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAsB,SAIpB,SAAQ,qBAAW;IAQnB,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAc,SAAS;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,YACqB,OAAkC,EAClC,KAAQ,EAClB,IAAY,EACF,KAAqB;QAExC,KAAK,EAAE,CAAC;QALW,YAAO,GAAP,OAAO,CAA2B;QAClC,UAAK,GAAL,KAAK,CAAG;QAClB,SAAI,GAAJ,IAAI,CAAQ;QACF,UAAK,GAAL,KAAK,CAAgB;IAG1C,CAAC;IAID,KAAK,CAAC,IAAI,CAAC,GAAG,IAA6B;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAG,IAA6B;QAC7C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;IAES,YAAY,CAAC,IAAY;QACjC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC;YACrC,MAAM,IAAI,oBAAW,CACnB,sDAAsD,CACvD,CAAC;QACJ,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,WAAW,IAAI,IAAI,GAAG,IAAI,CAAC,WAAW;YACpE,MAAM,IAAI,oBAAW,CACnB,QAAQ,IAAI,CAAC,WAAW,qCAAqC,IAAI,EAAE,CACpE,CAAC;QACJ,OAAO,IAAI,CAAC;IACd,CAAC;CAGF;AA7DD,8BA6DC"}

package/lib/query/Statement.cjs

@@ -14,9 +14,10 @@ exports.Statement = void 0;
 const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const Condition_1 = require("./Condition.cjs");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
-const decorators_1 = require("./../utils/decorators.cjs");
-const errors_1 = require("./errors.cjs");
 const logging_1 = require("@decaf-ts/logging");
+const persistence_1 = require("./../persistence/index.cjs");
+const errors_1 = require("./errors.cjs");
+const index_1 = require("./../utils/index.cjs");
 /**
  * @description Base class for database query statements
  * @summary Provides a foundation for building and executing database queries
@@ -68,7 +69,7 @@ const logging_1 = require("@decaf-ts/logging");
  *   Adapter-->>Statement: return processed results
  *   Statement-->>Client: return final results
  */
-class Statement extends logging_1.LoggedClass {
+class Statement extends index_1.ContextualLoggedClass {
     constructor(adapter) {
         super();
         this.adapter = adapter;
@@ -125,100 +126,112 @@ class Statement extends logging_1.LoggedClass {
         this.offsetSelector = value;
         return this;
     }
-    async execute() {
+    async execute(...args) {
+        let execArgs = args;
+        if ((!execArgs.length ||
+            !(execArgs[execArgs.length - 1] instanceof db_decorators_1.Context)) &&
+            this.fromSelector) {
+            const ctx = await this.adapter.context(db_decorators_1.OperationKeys.READ, {}, this.fromSelector);
+            execArgs = [...execArgs, ctx];
+        }
+        const { ctx } = persistence_1.Adapter.logCtx(execArgs, this.toString());
         try {
             const query = this.build();
-            return (await this.raw(query));
+            return (await this.raw(query, ctx));
         }
         catch (e) {
             throw new db_decorators_1.InternalError(e);
         }
     }
-    async raw(rawInput) {
-        const results = await this.adapter.raw(rawInput);
+    async raw(rawInput, ...args) {
+        const { ctx, ctxArgs } = this.logCtx(args, this.raw);
+        const results = await this.adapter.raw(rawInput, ...ctxArgs);
         if (!this.selectSelector)
             return results;
         const pkAttr = decorator_validation_1.Model.pk(this.fromSelector);
         const processor = function recordProcessor(r) {
             const id = r[pkAttr];
-            return this.adapter.revert(r, this.fromSelector, pkAttr, id);
+            return this.adapter.revert(r, this.fromSelector, id, undefined, ctx);
         }.bind(this);
         if (Array.isArray(results))
             return results.map(processor);
         return processor(results);
     }
+    toString() {
+        return `${this.adapter.flavour} statement`;
+    }
 }
 exports.Statement = Statement;
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "select", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [typeof (_a = typeof S !== "undefined" && S) === "function" ? _a : Object]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "distinct", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [typeof (_b = typeof S !== "undefined" && S) === "function" ? _b : Object]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "max", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [typeof (_c = typeof S !== "undefined" && S) === "function" ? _c : Object]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "min", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [typeof (_d = typeof S !== "undefined" && S) === "function" ? _d : Object]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "count", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "from", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Condition_1.Condition]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "where", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Array]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "orderBy", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "groupBy", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Number]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "limit", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Number]),
     __metadata("design:returntype", Object)
 ], Statement.prototype, "offset", null);
 __decorate([
-    (0, decorators_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
+    __metadata("design:paramtypes", [void 0]),
     __metadata("design:returntype", Promise)
 ], Statement.prototype, "execute", null);
 //# sourceMappingURL=Statement.js.map

package/lib/query/Statement.d.ts

@@ -5,10 +5,10 @@ import { Condition } from "./Condition";
 import type { CountOption, DistinctOption, LimitOption, MaxOption, MinOption, OffsetOption, OrderAndGroupOption, SelectOption, WhereOption } from "./options";
 import { Paginatable } from "../interfaces/Paginatable";
 import { Paginator } from "./Paginator";
-import { Adapter } from "../persistence";
+import { Adapter, type ContextOf } from "../persistence";
 import { Logger } from "@decaf-ts/logging";
-import { LoggedClass } from "@decaf-ts/logging";
 import { Constructor } from "@decaf-ts/decoration";
+import { type ContextualArgs, ContextualLoggedClass, type MaybeContextualArg } from "../utils/index";
 /**
  * @description Base class for database query statements
  * @summary Provides a foundation for building and executing database queries
@@ -60,8 +60,8 @@ import { Constructor } from "@decaf-ts/decoration";
  *   Adapter-->>Statement: return processed results
  *   Statement-->>Client: return final results
  */
-export declare abstract class Statement<Q, M extends Model, R> extends LoggedClass implements Executor<R>, RawExecutor<Q>, Paginatable<M, R, Q> {
-    protected adapter: Adapter<any, any, Q, any, any>;
+export declare abstract class Statement<M extends Model, A extends Adapter<any, any, any, any>, R, Q = A extends Adapter<any, any, infer Q, any> ? Q : never> extends ContextualLoggedClass<ContextOf<A>> implements Executor<R>, RawExecutor<Q>, Paginatable<M, R, Q> {
+    protected adapter: Adapter<any, any, Q, any>;
     protected readonly selectSelector?: SelectSelector<M>[];
     protected distinctSelector?: SelectSelector<M>;
     protected maxSelector?: SelectSelector<M>;
@@ -73,7 +73,7 @@ export declare abstract class Statement<Q, M extends Model, R> extends LoggedCla
     protected groupBySelector?: GroupBySelector<M>;
     protected limitSelector?: number;
     protected offsetSelector?: number;
-    protected constructor(adapter: Adapter<any, any, Q, any, any>);
+    protected constructor(adapter: Adapter<any, any, Q, any>);
     protected get log(): Logger;
     select<S extends readonly SelectSelector<M>[]>(): SelectOption<M, M[]>;
     select<S extends readonly SelectSelector<M>[]>(selector: readonly [...S]): SelectOption<M, Pick<M, S[number]>[]>;
@@ -87,9 +87,10 @@ export declare abstract class Statement<Q, M extends Model, R> extends LoggedCla
     groupBy(selector: GroupBySelector<M>): LimitOption<M, R>;
     limit(value: number): OffsetOption<R>;
     offset(value: number): Executor<R>;
-    execute(): Promise<R>;
-    raw<R>(rawInput: Q): Promise<R>;
+    execute(...args: MaybeContextualArg<ContextOf<A>>): Promise<R>;
+    raw<R>(rawInput: Q, ...args: ContextualArgs<ContextOf<A>>): Promise<R>;
     protected abstract build(): Q;
     protected abstract parseCondition(condition: Condition<M>, ...args: any[]): Q;
-    abstract paginate(size: number): Promise<Paginator<M, R, Q>>;
+    abstract paginate(size: number, ...args: MaybeContextualArg<ContextOf<A>>): Promise<Paginator<M, R, Q>>;
+    toString(): string;
 }

package/lib/query/Statement.js.map

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