@decaf-ts/core 0.7.1 → 0.7.3

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

@@ -29,7 +29,7 @@ import { Constructor } from "@decaf-ts/decoration";
  *       U-->>C: throw InternalError
  *     end
  *   end
- *   U->>S: sf(INJECTABLE, flavour, Repository.table(model))
+ *   U->>S: sf(INJECTABLE, flavour, Model.tableName(model))
  *   S-->>C: token string
  * @memberOf module:core
  */

package/lib/esm/repository/utils.js

@@ -2,7 +2,6 @@ import { InternalError } from "@decaf-ts/db-decorators";
 import { sf } from "@decaf-ts/decorator-validation";
 import { PersistenceKeys } from "./../persistence/constants.js";
 import { Model } from "@decaf-ts/decorator-validation";
-import { getTableName } from "./../identity/utils.js";
 import { DefaultFlavour, Decoration } from "@decaf-ts/decoration";
 /**
  * @description Generates a unique injectable name for a repository.
@@ -33,7 +32,7 @@ import { DefaultFlavour, Decoration } from "@decaf-ts/decoration";
  *       U-->>C: throw InternalError
  *     end
  *   end
- *   U->>S: sf(INJECTABLE, flavour, Repository.table(model))
+ *   U->>S: sf(INJECTABLE, flavour, Model.tableName(model))
  *   S-->>C: token string
  * @memberOf module:core
  */
@@ -43,6 +42,6 @@ export function generateInjectableNameForRepository(model, flavour) {
         if (!flavour || flavour === DefaultFlavour)
             throw new InternalError(`Could not retrieve flavour from model ${model instanceof Model ? model.constructor.name : model.name}`);
     }
-    return sf(PersistenceKeys.INJECTABLE, flavour, getTableName(model));
+    return sf(PersistenceKeys.INJECTABLE, flavour, Model.tableName(model));
 }
 //# sourceMappingURL=utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/repository/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,sCAAiC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,+BAA0B;AACjD,OAAO,EAAe,cAAc,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,UAAU,mCAAmC,CACjD,KAAyB,EACzB,OAAgB;IAEhB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,CACrC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAE,KAAa,CAC5D,CAAC;QACF,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,cAAc;YACxC,MAAM,IAAI,aAAa,CACrB,yCAAyC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CACxG,CAAC;IACN,CAAC;IACD,OAAO,EAAE,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;AACtE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/repository/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,sCAAiC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAe,cAAc,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,UAAU,mCAAmC,CACjD,KAAyB,EACzB,OAAgB;IAEhB,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,CACrC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAE,KAAa,CAC5D,CAAC;QACF,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,cAAc;YACxC,MAAM,IAAI,aAAa,CACrB,yCAAyC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CACxG,CAAC;IACN,CAAC;IACD,OAAO,EAAE,CAAC,eAAe,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AACzE,CAAC"}

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

@@ -0,0 +1,16 @@
+import { LoggedClass } from "@decaf-ts/logging";
+import { Context } from "@decaf-ts/db-decorators";
+import { LoggerOf } from "../persistence/index";
+export type ContextualArgs<C extends Context<any>, ARGS extends any[] = any[]> = [...ARGS, C];
+export type MaybeContextualArg<C extends Context<any>, ARGS extends any[] = any[]> = any[] | ContextualArgs<C, ARGS>;
+export type ContextualizedArgs<C extends Context<any>, ARGS extends any[] = any[]> = {
+    ctx: C;
+    log: LoggerOf<C>;
+    ctxArgs: ContextualArgs<C, ARGS>;
+};
+export declare abstract class ContextualLoggedClass<C extends Context<any>> extends LoggedClass {
+    protected logFor(ctx: C, ...args: any[]): LoggerOf<C>;
+    protected logCtx<ARGS extends any[]>(args: ARGS, method: ((...args: any[]) => any) | string): ContextualizedArgs<any, ARGS>;
+    protected static logCtx<CONTEXT extends Context<any>, ARGS extends any[]>(this: any, args: ARGS, method: string): ContextualizedArgs<CONTEXT, ARGS>;
+    protected static logCtx<CONTEXT extends Context<any>, ARGS extends any[]>(this: any, args: ARGS, method: (...args: any[]) => any): ContextualizedArgs<CONTEXT, ARGS>;
+}

package/lib/esm/utils/ContextualLoggedClass.js

@@ -0,0 +1,29 @@
+import { LoggedClass } from "@decaf-ts/logging";
+import { Context, InternalError } from "@decaf-ts/db-decorators";
+export class ContextualLoggedClass extends LoggedClass {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    logFor(ctx, ...args) {
+        return ctx.logger.for(this);
+    }
+    logCtx(args, method) {
+        return ContextualLoggedClass.logCtx.call(this, args, method);
+    }
+    static logCtx(args, method) {
+        if (args.length < 1)
+            throw new InternalError("No context provided");
+        const ctx = args.pop();
+        if (!(ctx instanceof Context))
+            throw new InternalError("No context provided");
+        if (args.filter((a) => a instanceof Context).length > 1)
+            throw new Error("here");
+        const log = (this
+            ? ctx.logger.for(this).for(method)
+            : ctx.logger.clear().for(this).for(method));
+        return {
+            ctx: ctx,
+            log: method ? log.for(method) : log,
+            ctxArgs: [...args, ctx],
+        };
+    }
+}
+//# sourceMappingURL=ContextualLoggedClass.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ContextualLoggedClass.js","sourceRoot":"","sources":["../../../src/utils/ContextualLoggedClass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAsBjE,MAAM,OAAgB,qBAEpB,SAAQ,WAAW;IACnB,6DAA6D;IACnD,MAAM,CAAC,GAAM,EAAE,GAAG,IAAW;QACrC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAgB,CAAC;IAC7C,CAAC;IAES,MAAM,CACd,IAAU,EACV,MAA0C;QAE1C,OAAO,qBAAqB,CAAC,MAAM,CAAC,IAAI,CACtC,IAAI,EACJ,IAAI,EACJ,MAAa,CACiB,CAAC;IACnC,CAAC;IAYS,MAAM,CAAC,MAAM,CAErB,IAAU,EACV,MAA0C;QAE1C,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,IAAI,aAAa,CAAC,qBAAqB,CAAC,CAAC;QACpE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAa,CAAC;QAClC,IAAI,CAAC,CAAC,GAAG,YAAY,OAAO,CAAC;YAC3B,MAAM,IAAI,aAAa,CAAC,qBAAqB,CAAC,CAAC;QACjD,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1B,MAAM,GAAG,GAAG,CACV,IAAI;YACF,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;YAClC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CACxB,CAAC;QACvB,OAAO;YACL,GAAG,EAAE,GAAG;YACR,GAAG,EAAE,MAAM,CAAC,CAAC,CAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAuB,CAAC,CAAC,CAAC,GAAG;YAC1D,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,CAAC;SACxB,CAAC;IACJ,CAAC;CACF"}

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

@@ -0,0 +1,28 @@
+import { Constructor } from "@decaf-ts/decoration";
+import { ContextualLoggedClass } from "./ContextualLoggedClass";
+export declare abstract class Service extends ContextualLoggedClass<any> {
+    readonly name?: string | undefined;
+    protected constructor(name?: string | undefined);
+    /**
+     * @description Retrieves a Service instance by name/class
+     * @summary Looks up and returns a cached API instance by its name or constructor
+     * @template A Type extending Api
+     * @param {string | Constructor<A>} name - Name of the API or its constructor
+     * @return {A} The requested API instance
+     */
+    static get<A extends Service>(name: string | symbol | Constructor<A>): A;
+    static boot(): Promise<void>;
+}
+export declare abstract class ClientBasedService<CLIENT, CONF> extends Service {
+    protected _client?: CLIENT;
+    protected _config?: CONF;
+    protected constructor();
+    boot(): Promise<void>;
+    abstract initialize(): Promise<{
+        config: CONF;
+        client: CLIENT;
+    }>;
+    protected get config(): CONF;
+    get client(): CLIENT;
+    shutdown(): Promise<void>;
+}

package/lib/esm/utils/Services.js

@@ -0,0 +1,88 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { InternalError } from "@decaf-ts/db-decorators";
+import { final, Logging } from "@decaf-ts/logging";
+import { Injectables } from "@decaf-ts/injectable-decorators";
+import { ContextualLoggedClass } from "./ContextualLoggedClass.js";
+export class Service extends ContextualLoggedClass {
+    constructor(name) {
+        super();
+        this.name = name;
+    }
+    /**
+     * @description Retrieves a Service instance by name/class
+     * @summary Looks up and returns a cached API instance by its name or constructor
+     * @template A Type extending Api
+     * @param {string | Constructor<A>} name - Name of the API or its constructor
+     * @return {A} The requested API instance
+     */
+    static get(name) {
+        if (!name)
+            throw new InternalError(`No name provided`);
+        const injectable = Injectables.get(name);
+        if (injectable)
+            return injectable;
+        throw new InternalError(`No Service found for ${typeof name === "string" ? name : typeof name === "symbol" ? name.toString() : name.name}`);
+    }
+    static async boot() {
+        const log = Logging.for(this.boot);
+        const services = Injectables.services();
+        for (const [key, service] of Object.entries(services)) {
+            try {
+                const s = new service.data();
+                if (s instanceof ClientBasedService)
+                    await s.boot();
+            }
+            catch (e) {
+                log.error(`Failed to boot ${key} service`, e);
+            }
+        }
+    }
+}
+export class ClientBasedService extends Service {
+    constructor() {
+        super();
+    }
+    async boot() {
+        const { config, client } = await this.initialize();
+        this._config = config;
+        this._client = client;
+    }
+    get config() {
+        if (!this._config)
+            throw new InternalError(`Config not initialized`);
+        return this._config;
+    }
+    get client() {
+        if (!this._client)
+            throw new InternalError(`Client not initialized`);
+        return this._client;
+    }
+    async shutdown() {
+        // do nothing. sub classes must implement this if controlled shutdown is necessary
+    }
+}
+__decorate([
+    final(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ClientBasedService.prototype, "boot", null);
+__decorate([
+    final(),
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
+], ClientBasedService.prototype, "config", null);
+__decorate([
+    final(),
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
+], ClientBasedService.prototype, "client", null);
+//# sourceMappingURL=Services.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Services.js","sourceRoot":"","sources":["../../../src/utils/Services.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,mCAAgC;AAEhE,MAAM,OAAgB,OAAQ,SAAQ,qBAA0B;IAC9D,YAA+B,IAAa;QAC1C,KAAK,EAAE,CAAC;QADqB,SAAI,GAAJ,IAAI,CAAS;IAE5C,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,GAAG,CAAoB,IAAsC;QAClE,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,aAAa,CAAC,kBAAkB,CAAC,CAAC;QAEvD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,UAAU;YAAE,OAAO,UAAe,CAAC;QAEvC,MAAM,IAAI,aAAa,CACrB,wBAAwB,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CACnH,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI;QACf,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;QACxC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC;gBACH,MAAM,CAAC,GAAG,IACR,OACD,CAAC,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,YAAY,kBAAkB;oBAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACtD,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,GAAG,CAAC,KAAK,CAAC,kBAAkB,GAAG,UAAU,EAAE,CAAU,CAAC,CAAC;YACzD,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAgB,kBAAiC,SAAQ,OAAO;IAKpE;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACR,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAOD,IACc,MAAM;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,aAAa,CAAC,wBAAwB,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IACI,MAAM;QACR,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,aAAa,CAAC,wBAAwB,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,kFAAkF;IACpF,CAAC;CACF;AA1BO;IADL,KAAK,EAAE;;;;8CAKP;AAOD;IAAC,KAAK,EAAE;;;gDAIP;AAED;IAAC,KAAK,EAAE;;;gDAIP"}

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

@@ -1,9 +1 @@
-/**
- * @description Creates a decorator that makes a method non-configurable
- * @summary This decorator prevents a method from being overridden by making it non-configurable.
- * It throws an error if used on anything other than a method.
- * @return {Function} A decorator function that can be applied to methods
- * @function final
- * @category Method Decorators
- */
-export declare function final(): (target: object, propertyKey?: any, descriptor?: PropertyDescriptor) => PropertyDescriptor;
+export declare function service(key: string): (target: any, prop?: any, descriptor?: any) => void;

package/lib/esm/utils/decorators.js

@@ -1,19 +1,30 @@
-/**
- * @description Creates a decorator that makes a method non-configurable
- * @summary This decorator prevents a method from being overridden by making it non-configurable.
- * It throws an error if used on anything other than a method.
- * @return {Function} A decorator function that can be applied to methods
- * @function final
- * @category Method Decorators
- */
-export function final() {
-    return (target, propertyKey, descriptor) => {
-        if (!descriptor)
-            throw new Error("final decorator can only be used on methods");
-        if (descriptor?.configurable) {
-            descriptor.configurable = false;
+import { apply, metadata, Metadata } from "@decaf-ts/decoration";
+import { inject, injectable } from "@decaf-ts/injectable-decorators";
+import { PersistenceKeys } from "./../persistence/index.js";
+export function service(key) {
+    return function service(target, prop, descriptor) {
+        Metadata.set(PersistenceKeys.SERVICE, key, target);
+        const decs = [];
+        if (descriptor && typeof descriptor.value === "number") {
+            decs.push(inject());
         }
-        return descriptor;
+        else if (!descriptor && !prop) {
+            decs.push(injectable({
+                callback: (inst) => Object.defineProperty(inst, "name", {
+                    enumerable: true,
+                    configurable: false,
+                    writable: false,
+                    value: key,
+                }),
+            }));
+        }
+        else if (!descriptor) {
+            decs.push(inject());
+        }
+        else
+            throw new Error("Invalid decorator usage. Should be impossible");
+        decs.push(metadata(PersistenceKeys.SERVICE, key));
+        return apply(...decs)(target, prop, descriptor);
     };
 }
 //# sourceMappingURL=decorators.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/utils/decorators.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,UAAU,KAAK;IACnB,OAAO,CACL,MAAc,EACd,WAAiB,EACjB,UAA+B,EAC/B,EAAE;QACF,IAAI,CAAC,UAAU;YACb,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,IAAI,UAAU,EAAE,YAAY,EAAE,CAAC;YAC7B,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC;QAClC,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../src/utils/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,kCAA6B;AAEvD,MAAM,UAAU,OAAO,CAAC,GAAW;IACjC,OAAO,SAAS,OAAO,CAAC,MAAW,EAAE,IAAU,EAAE,UAAgB;QAC/D,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtB,CAAC;aAAM,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC;YAChC,IAAI,CAAC,IAAI,CACP,UAAU,CAAC;gBACT,QAAQ,EAAE,CAAC,IAAS,EAAE,EAAE,CACtB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE;oBAClC,UAAU,EAAE,IAAI;oBAChB,YAAY,EAAE,KAAK;oBACnB,QAAQ,EAAE,KAAK;oBACf,KAAK,EAAE,GAAG;iBACX,CAAC;aACL,CAAC,CACH,CAAC;QACJ,CAAC;aAAM,IAAI,CAAC,UAAU,EAAE,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtB,CAAC;;YAAM,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QAExE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC"}

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

@@ -1,2 +1,3 @@
-export * from "./decorators";
+export * from "./ContextualLoggedClass";
 export * from "./errors";
+export * from "./Services";

package/lib/esm/utils/index.js

@@ -1,3 +1,4 @@
-export * from "./decorators.js";
+export * from "./ContextualLoggedClass.js";
 export * from "./errors.js";
+export * from "./Services.js";
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,gCAA6B;AAC7B,4BAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,2CAAwC;AACxC,4BAAyB;AACzB,8BAA2B"}

package/lib/identity/decorators.cjs

@@ -6,7 +6,6 @@ const decorator_validation_1 = require("@decaf-ts/decorator-validation");
 const SequenceOptions_1 = require("./../interfaces/SequenceOptions.cjs");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
 const decorators_1 = require("./../model/decorators.cjs");
-const utils_1 = require("./utils.cjs");
 const repository_1 = require("./../repository/index.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
 const defaultPkPriority = 60; // Default priority for primary key to run latter than other properties
@@ -51,15 +50,10 @@ async function pkOnCreate(context, data, key, model) {
         return;
     }
     const setPrimaryKeyValue = function (target, propertyKey, value) {
-        Object.defineProperty(target, propertyKey, {
-            enumerable: true,
-            writable: false,
-            configurable: true,
-            value: value,
-        });
+        Reflect.set(target, propertyKey, value);
     };
     if (!data.name)
-        data.name = (0, utils_1.sequenceNameForModel)(model, "pk");
+        data.name = decorator_validation_1.Model.sequenceName(model, "pk");
     let sequence;
     try {
         sequence = await this.adapter.Sequence(data);
@@ -67,7 +61,7 @@ async function pkOnCreate(context, data, key, model) {
     catch (e) {
         throw new db_decorators_1.InternalError(`Failed to instantiate Sequence ${data.name}: ${e}`);
     }
-    const next = await sequence.next();
+    const next = await sequence.next(context);
     setPrimaryKeyValue(model, key, next);
 }
 /**

package/lib/identity/decorators.d.ts

@@ -1,8 +1,7 @@
 import { Model } from "@decaf-ts/decorator-validation";
 import { SequenceOptions } from "../interfaces/SequenceOptions";
-import { RepositoryFlags } from "@decaf-ts/db-decorators";
-import { Repo } from "../repository/Repository";
-import { Context } from "@decaf-ts/db-decorators";
+import { ContextOf } from "../persistence/types";
+import { Repository } from "../repository/Repository";
 /**
  * @description Callback function for primary key creation
  * @summary Handles the creation of primary key values for models using sequences
@@ -39,7 +38,7 @@ import { Context } from "@decaf-ts/db-decorators";
  *     pkOnCreate->>Model: Set primary key value
  *   end
  */
-export declare function pkOnCreate<M extends Model, R extends Repo<M, F, C>, V extends SequenceOptions, F extends RepositoryFlags, C extends Context<F>>(this: R, context: Context<F>, data: V, key: keyof M, model: M): Promise<void>;
+export declare function pkOnCreate<M extends Model, R extends Repository<M, any>, V extends SequenceOptions>(this: R, context: ContextOf<R>, data: V, key: keyof M, model: M): Promise<void>;
 /**
  * @description Primary Key Decorator
  * @summary Marks a property as the model's primary key with automatic sequence generation

package/lib/identity/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/identity/decorators.ts"],"names":[],"mappings":";;AAgEA,gCA0CC;AAsBD,gBAgCC;AAhKD,yEAAiE;AACjE,yEAGuC;AACvC,2DAOiC;AAEjC,0DAA4C;AAC5C,uCAA+C;AAG/C,0DAA+C;AAC/C,qDAK8B;AAE9B,MAAM,iBAAiB,GAAG,EAAE,CAAC,CAAC,uEAAuE;AAErG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACI,KAAK,UAAU,UAAU,CAQ9B,OAAmB,EACnB,IAAO,EACP,GAAY,EACZ,KAAQ;IAER,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,UACzB,MAAS,EACT,WAAmB,EACnB,KAA+B;QAE/B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YACzC,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,GAAG,IAAA,4BAAoB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC9D,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAa,CACrB,kCAAkC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,CACpD,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IACnC,kBAAkB,CAAC,KAAK,EAAE,GAAa,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,EAAE,CAChB,OAGI,wCAAsB;IAE1B,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wCAAsB,EAAE,IAAI,EAAE;QACrD,SAAS,EACP,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW;YAChD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,wCAAsB,CAAC,SAAS;KACzD,CAAoB,CAAC;IAEtB,MAAM,GAAG,GAAG,sBAAM,CAAC,EAAE,CAAC;IACtB,SAAS,KAAK,CAAC,OAAwB,EAAE,SAAqB;QAC5D,OAAO,SAAS,KAAK,CAAC,GAAQ,EAAE,IAAS;YACvC,OAAO,IAAA,kBAAK,EACV,IAAA,kBAAK,EAAC,CAAC,2BAAc,CAAC,GAAG,EAAE,2BAAc,CAAC,GAAG,CAAC,CAAC,EAC/C,IAAA,+BAAQ,GAAE,EACV,IAAA,wBAAQ,GAAE;YACV,qIAAqI;YACrI,IAAA,yBAAY,EAAC,qBAAQ,CAAC,GAAG,CAAC,sBAAM,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,EACpD,IAAA,wBAAQ,EAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,CACzC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACf,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,uBAAU,CAAC,GAAG,CAAC,GAAG,CAAC;SACvB,MAAM,CAAC;QACN,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;KAC9C,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/identity/decorators.ts"],"names":[],"mappings":";;AA6DA,gCAmCC;AAsBD,gBAgCC;AAtJD,yEAAiE;AACjE,yEAGuC;AACvC,2DAMiC;AACjC,0DAA4C;AAE5C,0DAA+C;AAC/C,qDAK8B;AAG9B,MAAM,iBAAiB,GAAG,EAAE,CAAC,CAAC,uEAAuE;AAErG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACI,KAAK,UAAU,UAAU,CAM9B,OAAqB,EACrB,IAAO,EACP,GAAY,EACZ,KAAQ;IAER,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAChD,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,UACzB,MAAS,EACT,WAAmB,EACnB,KAA+B;QAE/B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,IAAI,CAAC,IAAI,GAAG,4BAAK,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5D,IAAI,QAAkB,CAAC;IACvB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,MAAM,IAAI,6BAAa,CACrB,kCAAkC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,CACpD,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,kBAAkB,CAAC,KAAK,EAAE,GAAa,EAAE,IAAI,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,SAAgB,EAAE,CAChB,OAGI,wCAAsB;IAE1B,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,wCAAsB,EAAE,IAAI,EAAE;QACrD,SAAS,EACP,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW;YAChD,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,wCAAsB,CAAC,SAAS;KACzD,CAAoB,CAAC;IAEtB,MAAM,GAAG,GAAG,sBAAM,CAAC,EAAE,CAAC;IACtB,SAAS,KAAK,CAAC,OAAwB,EAAE,SAAqB;QAC5D,OAAO,SAAS,KAAK,CAAC,GAAQ,EAAE,IAAS;YACvC,OAAO,IAAA,kBAAK,EACV,IAAA,kBAAK,EAAC,CAAC,2BAAc,CAAC,GAAG,EAAE,2BAAc,CAAC,GAAG,CAAC,CAAC,EAC/C,IAAA,+BAAQ,GAAE,EACV,IAAA,wBAAQ,GAAE;YACV,qIAAqI;YACrI,IAAA,yBAAY,EAAC,qBAAQ,CAAC,GAAG,CAAC,sBAAM,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,EACpD,IAAA,wBAAQ,EAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,CACzC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACf,CAAC,CAAC;IACJ,CAAC;IACD,OAAO,uBAAU,CAAC,GAAG,CAAC,GAAG,CAAC;SACvB,MAAM,CAAC;QACN,SAAS,EAAE,KAAK;QAChB,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;KAC9C,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC"}

package/lib/identity/index.cjs

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./decorators.cjs"), exports);
-__exportStar(require("./utils.cjs"), exports);
 //# sourceMappingURL=index.js.map

package/lib/identity/index.d.ts

@@ -1,2 +1 @@
 export * from "./decorators";
-export * from "./utils";

package/lib/identity/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/identity/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAA6B;AAC7B,8CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/identity/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAA6B"}

package/lib/index.cjs

@@ -44,7 +44,7 @@ __exportStar(require("./ram/index.cjs"), exports);
  * @const VERSION
  * @memberOf module:core
  */
-exports.VERSION = "0.7.0";
+exports.VERSION = "0.7.2";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/index.d.ts

@@ -20,7 +20,7 @@ export * from "./ram";
  * @const VERSION
  * @memberOf module:core
  */
-export declare const VERSION = "0.7.0";
+export declare const VERSION = "0.7.2";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/interfaces/ContextuallyLogged.cjs

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ContextuallyLogged.js.map

package/lib/interfaces/ContextuallyLogged.d.ts

@@ -0,0 +1,8 @@
+import { Context } from "@decaf-ts/db-decorators";
+import { LoggerOf } from "../persistence/index";
+export interface ContextuallyLogged<C extends Context<any>> {
+    logAndCtx(args: any[], method?: (...args: any[]) => any): {
+        ctx: C;
+        log: LoggerOf<C>;
+    };
+}

package/lib/interfaces/ContextuallyLogged.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextuallyLogged.js","sourceRoot":"","sources":["../../src/interfaces/ContextuallyLogged.ts"],"names":[],"mappings":""}

package/lib/interfaces/ErrorParser.d.ts

@@ -10,7 +10,7 @@ export interface ErrorParser {
      * @description Parses a generic Error into a BaseError
      * @summary Converts a standard Error object into a more specific BaseError type
      * @param {Error} error - The error to be parsed
-     * @return {BaseError} The parsed error as a BaseError instance
+     * @return {E} The parsed error as a BaseError instance
      */
-    parseError(error: Error): BaseError;
+    parseError<E extends BaseError>(error: Error): E;
 }

package/lib/interfaces/Executor.d.ts

@@ -12,5 +12,5 @@ export interface Executor<R> {
      * @template R - The type of result returned by the execute method
      * @return {Promise<R>} A promise that resolves to the result of type R
      */
-    execute(): Promise<R>;
+    execute(...args: any[]): Promise<R>;
 }

package/lib/interfaces/Observable.d.ts

@@ -6,28 +6,28 @@ import { Observer } from "./Observer";
  * @interface Observable
  * @memberOf module:core
  */
-export interface Observable {
+export interface Observable<REGISTRATION extends [Observer, ...any[]] = [Observer], ARGS extends any[] = any[]> {
     /**
      * @description Registers an observer to receive notifications
      * @summary Adds an observer to the list of observers that will be notified of state changes
-     * @param {Observer} observer - The observer to register
-     * @param {...any[]} args - Additional arguments to pass to the observer
+     * @template REGISTRATION - The type of the registration arguments for the observer
+     * @param {...REGISTRATION} args - @{link Observer} and additional arguments
      * @return {void}
      */
-    observe(observer: Observer, ...args: any[]): void;
+    observe(...args: REGISTRATION): void;
     /**
      * @description Unregisters an observer from receiving notifications
      * @summary Removes an observer from the list of observers that will be notified of state changes
-     * @param {Observer} observer - The observer to unregister
-     * @param {...any[]} args - Additional arguments to help identify the observer
+     * @template REGISTRATION - The type of the registration arguments for the observer
+     * @param {...REGISTRATION} args - @{link Observer} and additional arguments
      * @return {void}
      */
-    unObserve(observer: Observer, ...args: any[]): void;
+    unObserve(...args: REGISTRATION): void;
     /**
      * @description Notifies all registered observers of a state change
      * @summary Calls the update method on all registered observers, passing any provided arguments
      * @param {...any[]} args - Arguments to pass to the observers' update methods
      * @return {Promise<void>} A promise that resolves when all observers have been updated
      */
-    updateObservers(...args: any[]): Promise<void>;
+    updateObservers(...args: ARGS): Promise<void>;
 }

package/lib/interfaces/Observer.d.ts

@@ -4,12 +4,12 @@
  * @interface Observer
  * @memberOf module:core
  */
-export interface Observer {
+export interface Observer<ARGS extends any[] = any[]> {
     /**
      * @description Updates the observer with new state information
      * @summary Called by an Observable when its state changes, allowing the Observer to react to those changes
      * @param {...any[]} args - Arguments containing state information from the Observable
      * @return {Promise<void>} A promise that resolves when the observer has processed the update
      */
-    refresh(...args: any[]): Promise<void>;
+    refresh(...args: ARGS): Promise<void>;
 }

package/lib/interfaces/RawExecutor.d.ts

@@ -13,5 +13,5 @@ export interface RawExecutor<Q> {
      * @param {Q} rawInput - The raw query to execute
      * @return {Promise<R>} A promise that resolves to the result of type R
      */
-    raw<R>(rawInput: Q): Promise<R>;
+    raw<R>(rawInput: Q, ...args: any[]): Promise<R>;
 }

package/lib/model/BaseModel.cjs

@@ -44,9 +44,9 @@ exports.BaseModel = BaseModel;
 __decorate([
     (0, decorators_1.createdAt)(),
     __metadata("design:type", Date)
-], BaseModel.prototype, "createdOn", void 0);
+], BaseModel.prototype, "createdAt", void 0);
 __decorate([
     (0, decorators_1.updatedAt)(),
     __metadata("design:type", Date)
-], BaseModel.prototype, "updatedOn", void 0);
+], BaseModel.prototype, "updatedAt", void 0);
 //# sourceMappingURL=BaseModel.js.map

package/lib/model/BaseModel.d.ts

@@ -27,11 +27,11 @@ export declare abstract class BaseModel extends Model {
      * @description Creation timestamp for the model
      * @summary Automatically set to the current date and time when the model is created
      */
-    createdOn: Date;
+    createdAt: Date;
     /**
      * @description Last update timestamp for the model
      * @summary Automatically updated to the current date and time whenever the model is modified
      */
-    updatedOn: Date;
+    updatedAt: Date;
     protected constructor(arg?: ModelArg<BaseModel>);
 }

package/lib/model/construction.cjs

@@ -66,7 +66,7 @@ async function createOrUpdate(model, context, alias, repository) {
             throw new db_decorators_1.InternalError(`Could not find model ${model.constructor.name}`);
         repository = Repository_1.Repository.forModel(constructor, alias);
     }
-    if (typeof model[repository.pk] === "undefined")
+    if (typeof model[decorator_validation_1.Model.pk(repository.class)] === "undefined")
         return repository.create(model, context);
     else {
         try {
@@ -456,7 +456,7 @@ async function oneToManyOnDelete(context, data, key, model) {
         : repositoryFromTypeMetadata(model, key, this.adapter.alias);
     const uniqueValues = new Set([
         ...(isInstantiated
-            ? values.map((v) => v[repo.pk])
+            ? values.map((v) => v[repo["pk"]])
             : values),
     ]);
     for (const id of uniqueValues.values()) {