@decaf-ts/for-fabric 0.1.1 → 0.1.3

package/lib/esm/contracts/FabricContractSequence.d.ts

@@ -1,47 +1,27 @@
-import { Context, RepositoryFlags } from "@decaf-ts/db-decorators";
-import { Adapter, SequenceOptions } from "@decaf-ts/core";
+import { SequenceOptions } from "@decaf-ts/core";
+import type { Adapter, MaybeContextualArg } from "@decaf-ts/core";
+import type { MangoQuery } from "@decaf-ts/for-couchdb";
 import { Sequence } from "@decaf-ts/core";
-import { MangoQuery } from "@decaf-ts/for-couchdb";
-import { FabricContractContext } from "./ContractContext";
+import { SequenceModel } from "../shared/model/Sequence";
 import { FabricContractRepository } from "./FabricContractRepository";
-import { CustomizableSequence } from "./PrivateSequence";
+import { FabricContractContext } from "./ContractContext";
 /**
- * @description Abstract implementation of a Sequence for Fabric contracts
- * @summary Provides the basic functionality for sequences backed by the FabricContractRepository storing values in CouchDB-like state, including current, next and range operations.
- * @param {SequenceOptions} options - Sequence configuration such as name, type, startWith and incrementBy
- * @return {void}
- * @class FabricContractSequence
- * @example
- * const seq = new FabricContractDBSequence({ name: 'orderSeq', type: 'Number', incrementBy: 1, startWith: 1 }, adapter);
- * const next = await seq.next(ctx); // 1
- * const [a,b,c] = await seq.range(3, ctx); // [2,3,4]
- * @mermaid
- * sequenceDiagram
- *   participant App
- *   participant Sequence
- *   participant Repo
- *   App->>Sequence: next(ctx)
- *   Sequence->>Repo: read(name, ctx)
- *   Repo-->>Sequence: current
- *   Sequence->>Repo: update(current+inc)
- *   Repo-->>Sequence: saved
- *   Sequence-->>App: next value
+ * @summary Abstract implementation of a Sequence
+ * @description provides the basic functionality for {@link Sequence}s
+ *
+ * @param {SequenceOptions} options
+ *
+ * @class CouchDBSequence
+ * @implements Sequence
  */
 export declare class FabricContractSequence extends Sequence {
-    protected repo: FabricContractRepository<CustomizableSequence>;
-    constructor(options: SequenceOptions, adapter: Adapter<any, any, MangoQuery, any, any>, collections?: string[]);
+    protected repo: FabricContractRepository<SequenceModel>;
+    constructor(options: SequenceOptions, adapter: Adapter<any, any, MangoQuery, FabricContractContext>);
     /**
      * @summary Retrieves the current value for the sequence
      * @protected
      */
-    current(ctx?: Context<RepositoryFlags>): Promise<string | number | bigint>;
-    /**
-     * @summary Parses the {@link Sequence} value
-     *
-     * @protected
-     * @param value
-     */
-    private parse;
+    current(...args: MaybeContextualArg<any>): Promise<string | number | bigint>;
     /**
      * @summary increments the sequence
      * @description Sequence specific implementation
@@ -52,11 +32,19 @@ export declare class FabricContractSequence extends Sequence {
      */
     private increment;
     /**
-     * @summary Generates the next value in th sequence
-     * @description calls {@link Sequence#parse} on the current value
-     * followed by {@link Sequence#increment}
-     *
+     * @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
+     */
+    next(...argz: MaybeContextualArg<any>): Promise<number | string | bigint>;
+    /**
+     * @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
      */
-    next(ctx?: FabricContractContext): Promise<number | string | bigint>;
-    range(count: number, ctx?: FabricContractContext): Promise<(number | string | bigint)[]>;
+    range(count: number, ...argz: MaybeContextualArg<any>): Promise<(number | string | bigint)[]>;
 }

package/lib/esm/contracts/FabricContractSequence.js

@@ -1,46 +1,28 @@
-import { InternalError, NotFoundError, } from "@decaf-ts/db-decorators";
+import { Context, InternalError, NotFoundError, OperationKeys, } from "@decaf-ts/db-decorators";
 import { Repository } from "@decaf-ts/core";
 import { Sequence } from "@decaf-ts/core";
-import { MissingContextError } from "./../shared/errors.js";
-import { CustomizableSequence } from "./PrivateSequence.js";
-import { privateData } from "./../shared/decorators.js";
+import { SequenceModel } from "./../shared/model/Sequence.js";
 /**
- * @description Abstract implementation of a Sequence for Fabric contracts
- * @summary Provides the basic functionality for sequences backed by the FabricContractRepository storing values in CouchDB-like state, including current, next and range operations.
- * @param {SequenceOptions} options - Sequence configuration such as name, type, startWith and incrementBy
- * @return {void}
- * @class FabricContractSequence
- * @example
- * const seq = new FabricContractDBSequence({ name: 'orderSeq', type: 'Number', incrementBy: 1, startWith: 1 }, adapter);
- * const next = await seq.next(ctx); // 1
- * const [a,b,c] = await seq.range(3, ctx); // [2,3,4]
- * @mermaid
- * sequenceDiagram
- *   participant App
- *   participant Sequence
- *   participant Repo
- *   App->>Sequence: next(ctx)
- *   Sequence->>Repo: read(name, ctx)
- *   Repo-->>Sequence: current
- *   Sequence->>Repo: update(current+inc)
- *   Repo-->>Sequence: saved
- *   Sequence-->>App: next value
+ * @summary Abstract implementation of a Sequence
+ * @description provides the basic functionality for {@link Sequence}s
+ *
+ * @param {SequenceOptions} options
+ *
+ * @class CouchDBSequence
+ * @implements Sequence
  */
 export class FabricContractSequence extends Sequence {
-    constructor(options, adapter, collections) {
-        super(options);
-        for (const collection of collections || []) {
-            privateData(collection)(CustomizableSequence);
-        }
-        this.repo = Repository.forModel(CustomizableSequence, adapter.alias);
+    constructor(options, adapter) {
+        super(options, adapter);
+        this.repo = Repository.forModel(SequenceModel, adapter.alias);
     }
     /**
      * @summary Retrieves the current value for the sequence
      * @protected
      */
-    async current(ctx) {
-        if (!ctx)
-            throw new MissingContextError("Context is required");
+    async current(...args) {
+        const contextArgs = await Context.args(OperationKeys.READ, SequenceModel, args, this.adapter);
+        const ctx = contextArgs.context;
         const { name, startWith } = this.options;
         try {
             const sequence = await this.repo.read(name, ctx);
@@ -60,15 +42,6 @@ export class FabricContractSequence extends Sequence {
             throw new InternalError(`Failed to retrieve current value for sequence ${name}: ${e}`);
         }
     }
-    /**
-     * @summary Parses the {@link Sequence} value
-     *
-     * @protected
-     * @param value
-     */
-    parse(value) {
-        return Sequence.parseValue(this.options.type, value);
-    }
     /**
      * @summary increments the sequence
      * @description Sequence specific implementation
@@ -78,8 +51,6 @@ export class FabricContractSequence extends Sequence {
      * @protected
      */
     async increment(current, count, ctx) {
-        if (!ctx)
-            throw new MissingContextError("Context is required");
         const { type, incrementBy, name } = this.options;
         let next;
         const toIncrementBy = count || incrementBy;
@@ -97,38 +68,46 @@ export class FabricContractSequence extends Sequence {
         }
         let seq;
         try {
-            seq = await this.repo.update(new CustomizableSequence({ id: name, current: next }), ctx);
+            seq = await this.repo.update(new SequenceModel({ id: name, current: next }), ctx);
         }
         catch (e) {
             if (!(e instanceof NotFoundError))
                 throw e;
-            seq = await this.repo.create(new CustomizableSequence({ id: name, current: next }), ctx);
+            seq = await this.repo.create(new SequenceModel({ id: name, current: next }), ctx);
         }
         return seq.current;
     }
     /**
-     * @summary Generates the next value in th sequence
-     * @description calls {@link Sequence#parse} on the current value
-     * followed by {@link Sequence#increment}
-     *
+     * @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(ctx) {
-        if (!ctx)
-            throw new MissingContextError("Context is required");
-        const current = await this.current(ctx);
-        return this.increment(current, undefined, ctx);
+    async next(...argz) {
+        const contextArgs = await Context.args(OperationKeys.UPDATE, SequenceModel, argz, this.adapter);
+        const { context, args } = contextArgs;
+        const current = await this.current(...args);
+        return this.increment(current, undefined, context);
     }
-    async range(count, ctx) {
-        if (!ctx)
-            throw new MissingContextError("Context is required");
-        const current = (await this.current(ctx));
+    /**
+     * @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 Context.args(OperationKeys.UPDATE, 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, ctx);
+        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)
+        if (range[range.length - 1] !== next && this.options.type !== "String")
             throw new InternalError("Miscalculation of range");
         return range;
     }

package/lib/esm/contracts/FabricContractSequence.js.map

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

package/lib/esm/contracts/FabricContractStatement.d.ts

@@ -1,6 +1,5 @@
 import { Model } from "@decaf-ts/decorator-validation";
-import { MangoQuery } from "@decaf-ts/for-couchdb";
-import { FabricContractAdapter } from "./ContractAdapter";
+import { CouchDBAdapter, MangoQuery } from "@decaf-ts/for-couchdb";
 import { FabricContractContext } from "./ContractContext";
 import { CouchDBStatement } from "@decaf-ts/for-couchdb";
 /**
@@ -27,9 +26,8 @@ import { CouchDBStatement } from "@decaf-ts/for-couchdb";
  *   Adapter-->>Statement: rows
  *   Statement-->>App: models
  */
-export declare class FabricStatement<M extends Model, R> extends CouchDBStatement<M, R> {
-    private readonly ctx;
-    constructor(adapter: FabricContractAdapter, ctx: FabricContractContext);
-    raw<R>(rawInput: MangoQuery): Promise<R>;
+export declare class FabricStatement<M extends Model, R> extends CouchDBStatement<M, CouchDBAdapter<any, void, FabricContractContext>, R> {
+    constructor(adapter: CouchDBAdapter<any, void, FabricContractContext>);
+    raw<R>(rawInput: MangoQuery, ...args: any[]): Promise<R>;
     build(): MangoQuery;
 }

package/lib/esm/contracts/FabricContractStatement.js

@@ -1,7 +1,7 @@
 import { Model } from "@decaf-ts/decorator-validation";
 import { CouchDBGroupOperator, CouchDBKeys, CouchDBOperator, } from "@decaf-ts/for-couchdb";
 import { CouchDBStatement } from "@decaf-ts/for-couchdb";
-import { Condition, Repository } from "@decaf-ts/core";
+import { Condition } from "@decaf-ts/core";
 import { Metadata } from "@decaf-ts/decoration";
 import { DBKeys } from "@decaf-ts/db-decorators";
 /**
@@ -29,22 +29,22 @@ import { DBKeys } from "@decaf-ts/db-decorators";
  *   Statement-->>App: models
  */
 export class FabricStatement extends CouchDBStatement {
-    constructor(adapter, ctx) {
+    constructor(adapter) {
         super(adapter);
-        this.ctx = ctx;
     }
-    async raw(rawInput) {
-        const results = await this.adapter.raw(rawInput, true, this.ctx);
+    async raw(rawInput, ...args) {
+        const { ctx } = this.logCtx(args, this.raw);
+        const results = await this.adapter.raw(rawInput, true, ctx);
         const pkAttr = Model.pk(this.fromSelector);
         const type = Metadata.get(this.fromSelector, Metadata.key(DBKeys.ID, pkAttr))?.type;
         if (!this.selectSelector)
-            return results.map((r) => this.processRecord(r, pkAttr, type));
+            return results.map((r) => this.processRecord(r, pkAttr, type, ctx));
         return results;
     }
     build() {
         const selectors = {};
         selectors[CouchDBKeys.TABLE] = {};
-        selectors[CouchDBKeys.TABLE] = Repository.table(this.fromSelector);
+        selectors[CouchDBKeys.TABLE] = Model.tableName(this.fromSelector);
         const query = { selector: selectors };
         if (this.selectSelector)
             query.fields = this.selectSelector;

package/lib/esm/contracts/FabricContractStatement.js.map

@@ -1 +1 @@
-{"version":3,"file":"FabricContractStatement.js","sourceRoot":"","sources":["../../../src/contracts/FabricContractStatement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAEL,oBAAoB,EACpB,WAAW,EACX,eAAe,GAIhB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAkB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,OAAO,eAAoC,SAAQ,gBAGxD;IACC,YACE,OAA8B,EACb,GAA0B;QAE3C,KAAK,CAAC,OAAwD,CAAC,CAAC;QAF/C,QAAG,GAAH,GAAG,CAAuB;IAG7C,CAAC;IAEQ,KAAK,CAAC,GAAG,CAAI,QAAoB;QACxC,MAAM,OAAO,GAAU,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAExE,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CACvB,IAAI,CAAC,YAAY,EACjB,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAgB,CAAC,CAC1C,EAAE,IAAI,CAAC;QAER,IAAI,CAAC,IAAI,CAAC,cAAc;YACtB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAM,CAAC;QACtE,OAAO,OAAY,CAAC;IACtB,CAAC;IAEQ,KAAK;QACZ,MAAM,SAAS,GAAkB,EAAE,CAAC;QACpC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;QAClC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACnE,MAAM,KAAK,GAAe,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;QAClD,IAAI,IAAI,CAAC,cAAc;YAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,cAA0B,CAAC;QAExE,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,SAAS,GAAkB,IAAI,CAAC,cAAc,CAClD,SAAS,CAAC,GAAG,CACX,IAAI,CAAC,cAAc,EACnB,SAAS,CAAC,SAAS,CAAI,WAAW,CAAC,KAAgB,CAAC,CAAC,EAAE,CACrD,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,CAClC,CACF,CACF,CAAC,QAAQ,CAAC;YACX,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAoB,CAAC;YAC/D,IACE,YAAY,CAAC,MAAM,KAAK,CAAC;gBACzB,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAEnE,QAAQ,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;oBACxB,KAAK,oBAAoB,CAAC,GAAG;wBAC3B,SAAS,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG;4BACpC,GAAG,MAAM,CAAC,MAAM,CACd,SAAS,CAAC,oBAAoB,CAAC,GAAG,CAAkB,CACrD,CAAC,MAAM,CAAC,CAAC,KAAsB,EAAE,GAAQ,EAAE,EAAE;gCAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gCAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;oCACnB,MAAM,IAAI,KAAK,CACb,gDAAgD,CACjD,CAAC;gCACJ,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gCAClB,IAAI,CAAC,KAAK,oBAAoB,CAAC,GAAG;oCAChC,KAAK,CAAC,IAAI,CAAC,GAAI,GAAG,CAAC,CAAC,CAAW,CAAC,CAAC;;oCAC9B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gCACrB,OAAO,KAAK,CAAC;4BACf,CAAC,EAAE,EAAE,CAAC;yBACP,CAAC;wBACF,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;wBAC3B,MAAM;oBACR,KAAK,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC7B,MAAM,CAAC,GAAqB,EAAE,CAAC;wBAC/B,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG;4BAC5B,SAAS;4BACT,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;gCACnD,MAAM,MAAM,GAAqB,EAAE,CAAC;gCACpC,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gCAClB,OAAO,MAAM,CAAC;4BAChB,CAAC,CAAC;yBACH,CAAC;wBACF,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;wBACnB,MAAM;oBACR,CAAC;oBACD;wBACE,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;gBACjD,CAAC;iBACE,CAAC;gBACJ,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;oBAC/C,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;wBACrB,OAAO,CAAC,IAAI,CACV,KAAK,GAAG,2CAA2C,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CACnF,CAAC;oBACJ,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;gBAC5B,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;YAC9B,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAK,EAAoB,CAAC;YACzD,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,eAG9B,CAAC;YACF,MAAM,GAAG,GAAQ,EAAE,CAAC;YACpB,GAAG,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;YACrB,KAAK,CAAC,IAAc,CAAC,IAAI,CAAC,GAAU,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC9B,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAmB,CAAC;gBAC9C,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAmB,CAAC,eAAe,CAAC,MAAM,CAAC;oBACjE,IAAI,CAAC;YACT,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,aAAa;YAAE,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC;QAEzD,IAAI,IAAI,CAAC,cAAc;YAAE,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC;QAE1D,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+{"version":3,"file":"FabricContractStatement.js","sourceRoot":"","sources":["../../../src/contracts/FabricContractStatement.ts"],"names":[],"mappings":"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"}

package/lib/esm/contracts/crud/crud-contract.d.ts

@@ -1,12 +1,13 @@
 import { FabricContractAdapter } from "../ContractAdapter";
-import { Context, Contract, Context as Ctx } from "fabric-contract-api";
+import { Contract, Context as Ctx } from "fabric-contract-api";
 import { Model } from "@decaf-ts/decorator-validation";
+import { ContextualizedArgs } from "@decaf-ts/core";
 import { FabricContractRepository } from "../FabricContractRepository";
 import { DeterministicSerializer } from "../../shared/DeterministicSerializer";
 import { MangoQuery } from "@decaf-ts/for-couchdb";
 import { Checkable, healthcheck } from "../../shared/interfaces/Checkable";
-import { ContractLogger } from "../logging";
 import { Constructor } from "@decaf-ts/decoration";
+import { FabricContractContext } from "../ContractContext";
 /**
  * @description Base contract class for CRUD operations in Fabric chaincode
  * @summary Provides standard create, read, update, and delete operations for models in Fabric chaincode
@@ -71,14 +72,6 @@ export declare abstract class FabricCrudContract<M extends Model> extends Contra
      * @param {Constructor<M>} clazz - The model constructor
      */
     protected constructor(name: string, clazz: Constructor<M>);
-    protected getAdapter(clazz: Constructor<M>): FabricContractAdapter;
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx: Context): ContractLogger;
     /**
      * @description Creates a single model in the state database
      * @summary Delegates to the repository's create method
@@ -152,7 +145,7 @@ export declare abstract class FabricCrudContract<M extends Model> extends Contra
      * @param {...any[]} args - Additional arguments
      * @return {Promise<any>} Promise resolving to the query results
      */
-    raw(ctx: Ctx, rawInput: MangoQuery | string, docsOnly: boolean, ...args: any[]): Promise<any | string>;
+    raw(ctx: Ctx | FabricContractContext, rawInput: MangoQuery | string, docsOnly: boolean, ...args: any[]): Promise<any | string>;
     protected serialize(model: M): string;
     protected deserialize<M extends Model>(str: string): M;
     protected init(ctx: Ctx): Promise<void>;
@@ -166,4 +159,7 @@ export declare abstract class FabricCrudContract<M extends Model> extends Contra
      * @return {Promise<M[]>} Promise resolving to the created models
      */
     createAll(ctx: Ctx, models: string | M[], ...args: any[]): Promise<string | M[]>;
+    logCtx<ARGS extends any[]>(args: ARGS, method: ((...args: any[]) => any) | string): Promise<ContextualizedArgs<FabricContractContext, ARGS>>;
+    protected static logCtx<ARGS extends any[]>(this: any, args: ARGS, method: string): Promise<ContextualizedArgs<FabricContractContext, ARGS>>;
+    protected static logCtx<ARGS extends any[]>(this: any, args: ARGS, method: (...args: any[]) => any): Promise<ContextualizedArgs<FabricContractContext, ARGS>>;
 }

package/lib/esm/contracts/crud/crud-contract.js

@@ -1,11 +1,10 @@
 import { FabricContractAdapter } from "./../ContractAdapter.js";
-import { Contract } from "fabric-contract-api";
+import { Context, Contract } from "fabric-contract-api";
+import { Model } from "@decaf-ts/decorator-validation";
 import { Repository } from "@decaf-ts/core";
 import { DeterministicSerializer } from "./../../shared/DeterministicSerializer.js";
-import { Logging } from "@decaf-ts/logging";
-import { isModelPrivate, modelToPrivate } from "./../private-data.js";
-import { FabricContractPrivateDataAdapter } from "./../ContractPrivateDataAdapter.js";
-import { FabricFlavour } from "./../../shared/constants.js";
+import { FabricContractContext } from "./../ContractContext.js";
+import { BulkCrudOperationKeys, InternalError, OperationKeys, } from "@decaf-ts/db-decorators";
 /**
  * @description Base contract class for CRUD operations in Fabric chaincode
  * @summary Provides standard create, read, update, and delete operations for models in Fabric chaincode
@@ -55,6 +54,10 @@ import { FabricFlavour } from "./../../shared/constants.js";
  *   Contract-->>Client: model
  */
 export class FabricCrudContract extends Contract {
+    /**
+     * @description Shared adapter instance for all contract instances
+     */
+    static { this.adapter = new FabricContractAdapter(); }
     static { this.serializer = new DeterministicSerializer(); }
     /**
      * @description Creates a new FabricCrudContract instance
@@ -66,28 +69,7 @@ export class FabricCrudContract extends Contract {
         super(name);
         this.clazz = clazz;
         this.initialized = false;
-        FabricCrudContract.adapter = this.getAdapter(clazz);
-        this.repo = Repository.forModel(clazz, FabricCrudContract.adapter.alias);
-    }
-    getAdapter(clazz) {
-        const instance = new clazz();
-        if (isModelPrivate(instance)) {
-            const pvt = modelToPrivate(instance);
-            const collections = Object.keys(pvt.private);
-            return new FabricContractPrivateDataAdapter(undefined, "fabric-private-data-adapter", collections);
-        }
-        else {
-            return new FabricContractAdapter(undefined, [FabricFlavour, clazz.name].join("_"));
-        }
-    }
-    /**
-     * @description Creates a logger for a specific chaincode context
-     * @summary Returns a ContractLogger instance configured for the current context
-     * @param {Ctx} ctx - The Fabric chaincode context
-     * @return {ContractLogger} The logger instance
-     */
-    logFor(ctx) {
-        return Logging.for(FabricCrudContract.name, {}, ctx);
+        this.repo = Repository.forModel(clazz);
     }
     /**
      * @description Creates a single model in the state database
@@ -98,14 +80,14 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M>} Promise resolving to the created model
      */
     async create(ctx, model, ...args) {
-        const log = this.logFor(ctx).for(this.create);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.create);
         if (typeof model === "string")
             model = this.deserialize(model);
         log.info(`Creating model: ${JSON.stringify(model)}`);
         const transient = this.getTransientData(ctx);
         log.info(`Merging transient data...`);
-        model = this.repo.merge(model, transient);
-        return this.repo.create(model, ctx, ...args);
+        model = Model.merge(model, transient, this.clazz);
+        return this.repo.create(model, ...ctxArgs);
     }
     /**
      * @description Reads a single model from the state database
@@ -116,9 +98,9 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M>} Promise resolving to the retrieved model
      */
     async read(ctx, key, ...args) {
-        const log = this.logFor(ctx).for(this.read);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.read);
         log.info(`reading entry with pk ${key} `);
-        return this.repo.read(key, ctx, ...args);
+        return this.repo.read(key, ...ctxArgs);
     }
     getTransientData(ctx) {
         const transientMap = ctx.stub.getTransient();
@@ -137,14 +119,14 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M>} Promise resolving to the updated model
      */
     async update(ctx, model, ...args) {
-        const log = this.logFor(ctx).for(this.update);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.update);
         if (typeof model === "string")
             model = this.deserialize(model);
         log.info(`Updating model: ${JSON.stringify(model)}`);
         const transient = this.getTransientData(ctx);
         log.info(`Merging transient data...`);
-        model = this.repo.merge(model, transient);
-        return this.repo.update(model, ctx, ...args);
+        model = Model.merge(model, transient, this.clazz);
+        return this.repo.update(model, ...ctxArgs);
     }
     /**
      * @description Deletes a single model from the state database
@@ -155,9 +137,9 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M>} Promise resolving to the deleted model
      */
     async delete(ctx, key, ...args) {
-        const log = this.logFor(ctx).for(this.delete);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.delete);
         log.info(`deleting entry with pk ${key} `);
-        return this.repo.delete(String(key), ctx, ...args);
+        return this.repo.delete(String(key), ...ctxArgs);
     }
     /**
      * @description Deletes multiple models from the state database
@@ -168,9 +150,10 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M[]>} Promise resolving to the deleted models
      */
     async deleteAll(ctx, keys, ...args) {
+        const { ctxArgs } = await this.logCtx([...args, ctx], this.readAll);
         if (typeof keys === "string")
             keys = JSON.parse(keys);
-        return this.repo.deleteAll(keys, ctx, ...args);
+        return this.repo.deleteAll(keys, ...ctxArgs);
     }
     /**
      * @description Reads multiple models from the state database
@@ -181,9 +164,10 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M[]>} Promise resolving to the retrieved models
      */
     async readAll(ctx, keys, ...args) {
+        const { ctxArgs } = await this.logCtx([...args, ctx], this.readAll);
         if (typeof keys === "string")
             keys = JSON.parse(keys);
-        return this.repo.readAll(keys, ctx, ...args);
+        return this.repo.readAll(keys, ...ctxArgs);
     }
     /**
      * @description Updates multiple models in the state database
@@ -194,13 +178,13 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M[]>} Promise resolving to the updated models
      */
     async updateAll(ctx, models, ...args) {
-        const log = this.logFor(ctx).for(this.updateAll);
+        const { log, ctxArgs } = await this.logCtx([...args, ctx], this.updateAll);
         if (typeof models === "string")
             models = JSON.parse(models)
                 .map((m) => this.deserialize(m))
                 .map((m) => new this.clazz(m));
         log.info(`updating ${models.length} entries to the table`);
-        return this.repo.updateAll(models, ctx, ...args);
+        return this.repo.updateAll(models, ...ctxArgs);
     }
     /**
      * @description Executes a raw query against the state database
@@ -212,9 +196,10 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<any>} Promise resolving to the query results
      */
     async raw(ctx, rawInput, docsOnly, ...args) {
+        const { ctxArgs } = await this.logCtx([...args, ctx], this.raw);
         if (typeof rawInput === "string")
             rawInput = JSON.parse(rawInput);
-        return this.repo.raw(rawInput, docsOnly, ctx, ...args);
+        return FabricCrudContract.adapter.raw(rawInput, docsOnly, ...ctxArgs);
     }
     serialize(model) {
         return FabricCrudContract.serializer.serialize(model);
@@ -223,13 +208,13 @@ export class FabricCrudContract extends Contract {
         return FabricCrudContract.serializer.deserialize(str);
     }
     async init(ctx) {
-        const log = this.logFor(ctx).for(this.init);
+        const { log } = await this.logCtx([ctx], this.init);
         log.info(`Running contract initialization...`);
         this.initialized = true;
         log.info(`Contract initialization completed.`);
     }
     async healthcheck(ctx) {
-        const log = this.logFor(ctx).for(this.healthcheck);
+        const { log } = await this.logCtx([ctx], this.healthcheck);
         log.info(`Running Healthcheck: ${this.initialized}...`);
         return { healthcheck: this.initialized };
     }
@@ -242,7 +227,7 @@ export class FabricCrudContract extends Contract {
      * @return {Promise<M[]>} Promise resolving to the created models
      */
     async createAll(ctx, models, ...args) {
-        const log = this.logFor(ctx).for(this.createAll);
+        const { log } = await this.logCtx([...args, ctx], this.createAll);
         if (typeof models === "string")
             models = JSON.parse(models)
                 .map((m) => this.deserialize(m))
@@ -250,5 +235,50 @@ export class FabricCrudContract extends Contract {
         log.info(`adding ${models.length} entries to the table`);
         return this.repo.createAll(models, ctx, ...args);
     }
+    async logCtx(args, method) {
+        return FabricCrudContract.logCtx.bind(this)(args, method);
+    }
+    static async logCtx(args, method) {
+        if (args.length < 1)
+            throw new InternalError("No context provided");
+        const ctx = args.pop();
+        if (ctx instanceof FabricContractContext)
+            return {
+                ctx,
+                log: ctx.logger.clear().for(this).for(method),
+                ctxArgs: [...args, ctx],
+            };
+        if (!(ctx instanceof Context))
+            throw new InternalError("No valid context provided");
+        function getOp() {
+            if (typeof method === "string")
+                return method;
+            switch (method.name) {
+                case OperationKeys.CREATE:
+                case OperationKeys.READ:
+                case OperationKeys.UPDATE:
+                case OperationKeys.DELETE:
+                case BulkCrudOperationKeys.CREATE_ALL:
+                case BulkCrudOperationKeys.READ_ALL:
+                case BulkCrudOperationKeys.UPDATE_ALL:
+                case BulkCrudOperationKeys.DELETE_ALL:
+                    return method.name;
+                default:
+                    return method.name;
+            }
+        }
+        const overrides = {
+            correlationId: ctx.stub.getTxID(),
+        };
+        const context = await FabricCrudContract.adapter.context(getOp(), overrides, this.clazz, ctx);
+        const log = (this
+            ? context.logger.for(this).for(method)
+            : context.logger.clear().for(this).for(method));
+        return {
+            ctx: context,
+            log: log,
+            ctxArgs: [...args, context],
+        };
+    }
 }
 //# sourceMappingURL=crud-contract.js.map