@decaf-ts/for-fabric 0.1.16 → 0.1.18

package/lib/esm/client/FabricClientStatement.js

@@ -0,0 +1,107 @@
+import { Condition, GroupOperator, Operator, QueryClause, QueryError, Statement, } from "@decaf-ts/core";
+import { toCamelCase } from "@decaf-ts/logging";
+import { FabricClientPaginator } from "./FabricClientPaginator.js";
+import { InternalError } from "@decaf-ts/db-decorators";
+export class FabricClientStatement extends Statement {
+    constructor(adapter) {
+        super(adapter);
+    }
+    build() {
+        const method = [QueryClause.FIND_BY];
+        const args = [];
+        const params = {};
+        if (this.whereCondition) {
+            const parsed = this.parseCondition(this.whereCondition);
+            method.push(parsed.method);
+            if (parsed.args && parsed.args.length)
+                args.push(...parsed.args);
+        }
+        if (this.selectSelector)
+            method.push(QueryClause.SELECT, this.selectSelector.join(` ${QueryClause.AND.toLowerCase()} `));
+        if (this.orderBySelector)
+            method.push(QueryClause.ORDER_BY, ...this.orderBySelector);
+        if (this.groupBySelector)
+            method.push(QueryClause.GROUP_BY, this.groupBySelector);
+        if (this.limitSelector)
+            params.limit = this.limitSelector;
+        if (this.offsetSelector) {
+            params.skip = this.offsetSelector;
+        }
+        return {
+            class: this.fromSelector,
+            method: toCamelCase(method.join(" ")),
+            args: args,
+            params: Object.keys(params).length ? params : undefined,
+        };
+    }
+    async paginate(size = 10, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    ...args) {
+        try {
+            const query = this.build();
+            return new FabricClientPaginator(this.adapter, query, size, this.fromSelector);
+        }
+        catch (e) {
+            throw new InternalError(e);
+        }
+    }
+    parseCondition(condition) {
+        // @ts-expect-error accessing protected properties
+        // eslint-disable-next-line prefer-const
+        let { attr1, operator, comparison } = condition;
+        const result = {};
+        switch (operator) {
+            case GroupOperator.AND:
+            case GroupOperator.OR: {
+                let side1 = attr1, side2 = comparison;
+                if (typeof attr1 !== "string") {
+                    const condition1 = this.parseCondition(attr1);
+                    side1 = condition1.method;
+                    result.args = [...(result.args || []), ...(condition1.args || [])];
+                }
+                if (comparison instanceof Condition) {
+                    const condition2 = this.parseCondition(comparison);
+                    side2 = condition2.method;
+                    result.args = [...(result.args || []), ...(condition2.args || [])];
+                }
+                result.method = `${side1} ${operator.toLowerCase()} ${side2}`;
+                break;
+            }
+            case Operator.EQUAL:
+                result.method = attr1;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case Operator.DIFFERENT:
+                result.method = `${attr1} diff`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case Operator.REGEXP:
+                result.method = `${attr1} matches`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case Operator.BIGGER:
+                result.method = `${attr1} bigger`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case Operator.BIGGER_EQ:
+                result.method = `${attr1} bigger than equal`;
+                break;
+            case Operator.SMALLER:
+                result.method = `${attr1} less`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case Operator.SMALLER_EQ:
+                result.method = `${attr1} less than equal`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case Operator.IN:
+                result.method = `${attr1} in`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            default:
+                throw new QueryError(`Unsupported operator ${operator}`);
+        }
+        return result;
+    }
+}
+//# sourceMappingURL=FabricClientStatement.js.map

package/lib/esm/client/FabricClientStatement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FabricClientStatement.js","sourceRoot":"","sources":["../../../src/client/FabricClientStatement.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,aAAa,EAEb,QAAQ,EAER,WAAW,EACX,UAAU,EACV,SAAS,GACV,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,qBAAqB,EAAE,mCAAgC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAGxD,MAAM,OAAO,qBAA0C,SAAQ,SAK9D;IACC,YAAY,OAA4B;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;IACjB,CAAC;IAES,KAAK;QACb,MAAM,MAAM,GAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAwB,EAAE,CAAC;QACrC,MAAM,MAAM,GAAkC,EAAS,CAAC;QAExD,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3B,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM;gBACnC,IAAI,CAAC,IAAI,CAAC,GAAI,MAAM,CAAC,IAA4B,CAAC,CAAC;QACvD,CAAC;QACD,IAAI,IAAI,CAAC,cAAc;YACrB,MAAM,CAAC,IAAI,CACT,WAAW,CAAC,MAAM,EAClB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,CAC/D,CAAC;QACJ,IAAI,IAAI,CAAC,eAAe;YACtB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAI,IAAI,CAAC,eAA4B,CAAC,CAAC;QAC3E,IAAI,IAAI,CAAC,eAAe;YACtB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,eAAyB,CAAC,CAAC;QACpE,IAAI,IAAI,CAAC,aAAa;YAAE,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC;QAC1D,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC;QACpC,CAAC;QACD,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,YAAY;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACrC,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;SACzC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,OAAe,EAAE;IACjB,6DAA6D;IAC7D,GAAG,IAAwD;QAE3D,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3B,OAAO,IAAI,qBAAqB,CAC9B,IAAI,CAAC,OAAc,EACnB,KAAK,EACL,IAAI,EACJ,IAAI,CAAC,YAAY,CACX,CAAC;QACX,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAES,cAAc,CAAC,SAAuB;QAC9C,kDAAkD;QAClD,wCAAwC;QACxC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,SAAS,CAAC;QAEhD,MAAM,MAAM,GAAgB,EAAS,CAAC;QACtC,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,aAAa,CAAC,GAAG,CAAC;YACvB,KAAK,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;gBACtB,IAAI,KAAK,GAAW,KAAe,EACjC,KAAK,GAAW,UAAiB,CAAC;gBACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC9B,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,KAAuB,CAAC,CAAC;oBAChE,KAAK,GAAG,UAAU,CAAC,MAAgB,CAAC;oBACpC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;gBACrE,CAAC;gBAED,IAAI,UAAU,YAAY,SAAS,EAAE,CAAC;oBACpC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;oBACnD,KAAK,GAAG,UAAU,CAAC,MAAgB,CAAC;oBACpC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;gBACrE,CAAC;gBAED,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,IAAI,QAAQ,CAAC,WAAW,EAAE,IAAI,KAAK,EAAE,CAAC;gBAC9D,MAAM;YACR,CAAC;YACD,KAAK,QAAQ,CAAC,KAAK;gBACjB,MAAM,CAAC,MAAM,GAAG,KAAe,CAAC;gBAChC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ,CAAC,SAAS;gBACrB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,OAAO,CAAC;gBAChC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ,CAAC,MAAM;gBAClB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,UAAU,CAAC;gBACnC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ,CAAC,MAAM;gBAClB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,SAAS,CAAC;gBAClC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ,CAAC,SAAS;gBACrB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,oBAAoB,CAAC;gBAC7C,MAAM;YACR,KAAK,QAAQ,CAAC,OAAO;gBACnB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,OAAO,CAAC;gBAChC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ,CAAC,UAAU;gBACtB,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,kBAAkB,CAAC;gBAC3C,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR,KAAK,QAAQ,CAAC,EAAE;gBACd,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,KAAK,CAAC;gBAC9B,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;gBACnD,MAAM;YACR;gBACE,MAAM,IAAI,UAAU,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,MAAqB,CAAC;IAC/B,CAAC;CACF"}

package/lib/esm/client/fabric-fs.d.ts

@@ -18,7 +18,7 @@ export declare function contentOfLoadFile(contentOrPath: string | Uint8Array, fi
  * @function readFile
  * @memberOf module:for-fabric.client
  */
-export declare function readFile(contentOrPath: string | Buffer): Promise<Buffer<ArrayBufferLike>>;
+export declare function readFile(contentOrPath: string | Buffer): Promise<NonSharedBuffer>;
 /**
  * @description Creates a Certificate Authority user
  * @summary Initializes a user with the given credentials for interacting with a Fabric CA

package/lib/esm/client/indexes/generation.d.ts

@@ -0,0 +1,16 @@
+import { OrderDirection } from "@decaf-ts/core";
+import { Constructor } from "@decaf-ts/decoration";
+import { Model, ModelConstructor } from "@decaf-ts/decorator-validation";
+export type Index = {
+    index: {
+        fields: string[] | {
+            [k: string]: OrderDirection;
+        };
+    };
+    ddoc?: string;
+    name: string;
+    type: "json";
+};
+export declare function generateModelIndexes<M extends Model>(m: Constructor<M>, accum?: Record<string, any>): Index[];
+export declare function readModelFolders(...folders: string[]): Promise<ModelConstructor<any>[]>;
+export declare function writeIndexes(indexes: Index[], p?: string): void;

package/lib/esm/client/indexes/generation.js

@@ -0,0 +1,118 @@
+import { Metadata } from "@decaf-ts/decoration";
+import { CouchDBKeys } from "@decaf-ts/for-couchdb";
+import { Model } from "@decaf-ts/decorator-validation";
+import { normalizeImport } from "./../../shared/index.js";
+function getIndexReference(name, direction, compositions) {
+    return [
+        ...name.map((n) => (n === CouchDBKeys.TABLE ? "table" : n)),
+        ...(compositions || []),
+        ...(direction ? [direction] : []),
+        "index",
+    ].join(Metadata.splitter);
+}
+function addIndex(accum, fields, direction, compositions) {
+    const name = getIndexReference(fields, direction, compositions);
+    let f = [
+        ...fields,
+        ...(compositions || []),
+    ];
+    if (direction)
+        f = f.reduce((accum, el) => {
+            const entry = {};
+            entry[el] = direction;
+            accum.push(entry);
+            return accum;
+        }, []);
+    const index = {
+        index: {
+            fields: f,
+        },
+        name: name,
+        ddoc: name,
+        type: "json",
+    };
+    accum[name] = index;
+}
+export function generateModelIndexes(m, accum) {
+    const tableName = getIndexReference([CouchDBKeys.TABLE]);
+    const indexes = accum || {};
+    indexes[tableName] = {
+        index: {
+            fields: [CouchDBKeys.TABLE],
+        },
+        name: tableName,
+        ddoc: tableName,
+        type: "json",
+    };
+    const result = {};
+    const modelIndexes = Model.indexes(m);
+    for (const prop of Object.keys(modelIndexes)) {
+        for (const [key, dec] of Object.entries(modelIndexes[prop])) {
+            const directions = dec
+                .directions;
+            const compositions = dec.compositions;
+            const fields = [key, CouchDBKeys.TABLE];
+            addIndex(result, fields);
+            if (compositions && compositions.length)
+                addIndex(result, fields, undefined, compositions);
+            if (directions && directions.length) {
+                directions.forEach((d) => {
+                    addIndex(result, fields, d);
+                    if (compositions && compositions.length)
+                        addIndex(result, fields, d, compositions);
+                });
+            }
+        }
+    }
+    return Object.values(result);
+}
+export async function readModelFolders(...folders) {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const fs = require("fs");
+    // // eslint-disable-next-line @typescript-eslint/no-require-imports
+    // const path = require("path");
+    const result = [];
+    for (const folder of folders) {
+        const files = fs
+            .readdirSync(folder, {
+            withFileTypes: true,
+            recursive: true,
+        })
+            .filter((f) => f.isFile());
+        for (const file of files) {
+            const exports = await normalizeImport(import(file));
+            const values = Object.values(exports).filter((e) => {
+                try {
+                    const m = new e();
+                    return m instanceof Model;
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                }
+                catch (e) {
+                    return false;
+                }
+            });
+            result.push(...values);
+        }
+    }
+    return result;
+}
+export function writeIndexes(indexes, p = process.cwd()) {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const fs = require("fs");
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const path = require("path");
+    function ensureDirectoryExistence(filePath) {
+        const dirname = path.dirname(filePath);
+        if (fs.existsSync(dirname)) {
+            return true;
+        }
+        ensureDirectoryExistence(dirname);
+        fs.mkdirSync(dirname);
+    }
+    indexes.forEach((index) => {
+        const file = path.resolve(path.join(p, `./META-INF/statedb/couchdb/indexes/${index.name}.json`));
+        ensureDirectoryExistence(file);
+        fs.writeFileSync(file, JSON.stringify(index, undefined, 2));
+    });
+}
+//# sourceMappingURL=generation.js.map

package/lib/esm/client/indexes/generation.js.map

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

package/lib/esm/client/indexes/index.d.ts

@@ -0,0 +1 @@
+export * from "./generation";

package/lib/esm/client/indexes/index.js

@@ -0,0 +1,2 @@
+export * from "./generation.js";
+//# sourceMappingURL=index.js.map

package/lib/esm/client/indexes/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/client/indexes/index.ts"],"names":[],"mappings":"AAAA,gCAA6B"}

package/lib/esm/client/services/FabricEnrollmentService.d.ts

@@ -115,7 +115,7 @@ export declare class FabricEnrollmentService extends LoggedClass {
      * @return {Promise<FabricIdentity[]>} The list of identities registered in the CA.
      */
     getIdentities(): Promise<FabricIdentity[]>;
-    protected parseError(e: Error): AuthorizationError | ConflictError;
+    protected parseError(e: Error): ConflictError | AuthorizationError;
     /**
      * @description Retrieve affiliations from the CA.
      * @summary Queries the CA for the list of affiliations available under the configured CA.

package/lib/esm/client/types.d.ts

@@ -0,0 +1,7 @@
+import { ModelConstructor } from "@decaf-ts/decorator-validation";
+export type FabricQuery = {
+    class: ModelConstructor<any> | string;
+    method: string;
+    args: any[];
+    params?: Record<"limit" | "skip", number>;
+};

package/lib/esm/client/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/lib/esm/client/types.js.map

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

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

@@ -5,10 +5,10 @@ import { FabricContractContext } from "./ContractContext";
 import { BaseError, Context, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
 import { Context as Ctx } from "fabric-contract-api";
 import { Logger } from "@decaf-ts/logging";
-import { RelationsMetadata, Sequence, SequenceOptions, Adapter, PreparedModel, Repository } from "@decaf-ts/core";
+import { RelationsMetadata, SequenceOptions, Adapter, PreparedModel, Repository, ContextualizedArgs } from "@decaf-ts/core";
 import type { ContextualArgs, MaybeContextualArg } from "@decaf-ts/core";
 import { FabricContractRepository } from "./FabricContractRepository";
-import { ChaincodeStub, Iterators, StateQueryResponse } from "fabric-shim-api";
+import { ChaincodeStub, ClientIdentity, Iterators, StateQueryResponse } from "fabric-shim-api";
 import { FabricStatement } from "./FabricContractStatement";
 import { SimpleDeterministicSerializer } from "../shared/SimpleDeterministicSerializer";
 import { Constructor } from "@decaf-ts/decoration";
@@ -116,14 +116,14 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      * @description Context constructor for this adapter
      * @summary Overrides the base Context constructor with FabricContractContext
      */
-    Context: typeof FabricContractContext;
+    protected readonly Context: Constructor<FabricContractContext>;
     /**
      * @description Gets the repository constructor for this adapter
      * @summary Returns the FabricContractRepository constructor for creating repositories
      * @template M - Type extending Model
      * @return {Constructor<Repository<M, MangoQuery, FabricContractAdapter, FabricContractFlags, FabricContractContext>>} The repository constructor
      */
-    repository<R extends Repository<any, Adapter<any, void, MangoQuery, FabricContractContext>>>(): Constructor<R>;
+    repository<R extends Repository<any, Adapter<any, void, MangoQuery, Context<FabricContractFlags>>>>(): Constructor<R>;
     /**
      * @description Creates a new FabricContractAdapter instance
      * @summary Initializes an adapter for interacting with the Fabric state database
@@ -142,7 +142,7 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      * @param {...any[]} args - Additional arguments, including the chaincode stub and logger
      * @return {Promise<Record<string, any>>} Promise resolving to the created record
      */
-    create<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>>;
+    create<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<Context<FabricContractFlags>>): Promise<Record<string, any>>;
     /**
      * @description Reads a record from the state database
      * @summary Retrieves and deserializes a record from the Fabric state database
@@ -151,7 +151,7 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      * @param {...any[]} args - Additional arguments, including the chaincode stub and logger
      * @return {Promise<Record<string, any>>} Promise resolving to the retrieved record
      */
-    read<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>>;
+    read<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<Context<FabricContractFlags>>): Promise<Record<string, any>>;
     /**
      * @description Updates a record in the state database
      * @summary Serializes a model and updates it in the Fabric state database
@@ -162,7 +162,7 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      * @param {...any[]} args - Additional arguments, including the chaincode stub and logger
      * @return {Promise<Record<string, any>>} Promise resolving to the updated record
      */
-    update<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>>;
+    update<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<Context<FabricContractFlags>>): Promise<Record<string, any>>;
     /**
      * @description Deletes a record from the state database
      * @summary Retrieves a record and then removes it from the Fabric state database
@@ -171,7 +171,7 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      * @param {...any[]} args - Additional arguments, including the chaincode stub and logger
      * @return {Promise<Record<string, any>>} Promise resolving to the deleted record
      */
-    delete<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>>;
+    delete<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<Context<FabricContractFlags>>): Promise<Record<string, any>>;
     protected deleteState(id: string, ctx: FabricContractContext): Promise<void>;
     forPrivate(collection: string): FabricContractAdapter;
     protected putState(id: string, model: Record<string, any>, ctx: FabricContractContext): Promise<Record<string, any>>;
@@ -261,7 +261,6 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      */
     raw<R>(rawInput: MangoQuery, ...args: ContextualArgs<FabricContractContext>): Promise<R>;
     Statement<M extends Model>(): FabricStatement<M, any>;
-    Sequence(options: SequenceOptions): Promise<Sequence>;
     createAll<M extends Model>(tableName: Constructor<M>, id: PrimaryKeyType[], model: Record<string, any>[], ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>[]>;
     updateAll<M extends Model>(tableName: Constructor<M>, id: PrimaryKeyType[], model: Record<string, any>[], ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>[]>;
     /**
@@ -277,6 +276,18 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
     protected createAllPrefix<M extends Model>(tableName: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: [...any, FabricContractContext]): (string | string[] | number[] | Record<string, any>[])[];
     protected updateAllPrefix<M extends Model>(tableName: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: [...any, FabricContractContext]): any[];
     parseError<E extends BaseError>(err: Error | string, reason?: string): E;
+    logCtx<ARGS extends any[]>(args: ARGS, method: ((...args: any[]) => any) | string): ContextualizedArgs<FabricContractContext, ARGS> & {
+        stub: ChaincodeStub;
+        identity: ClientIdentity;
+    };
+    static logCtx<ARGS extends any[]>(this: any, args: ARGS, method: string): ContextualizedArgs<FabricContractContext, ARGS> & {
+        stub: ChaincodeStub;
+        identity: ClientIdentity;
+    };
+    static logCtx<ARGS extends any[]>(this: any, args: ARGS, method: (...args: any[]) => any): ContextualizedArgs<FabricContractContext, ARGS> & {
+        stub: ChaincodeStub;
+        identity: ClientIdentity;
+    };
     static parseError<E extends BaseError>(err: Error | string): E;
     /**
      * @description Static method for decoration overrides

package/lib/esm/contracts/ContractAdapter.js

@@ -1,16 +1,16 @@
 import { CouchDBAdapter, CouchDBKeys } from "@decaf-ts/for-couchdb";
 import { list, Model, required, type } from "@decaf-ts/decorator-validation";
 import { FabricContractContext } from "./ContractContext.js";
-import { afterAny, BadRequestError, ConflictError, DBKeys, InternalError, NotFoundError, onCreate, onCreateUpdate, onDelete, onUpdate, readonly, SerializationError, } from "@decaf-ts/db-decorators";
+import { afterAny, BadRequestError, ConflictError, Context, DBKeys, InternalError, NotFoundError, onCreate, onCreateUpdate, onDelete, onUpdate, readonly, SerializationError, } from "@decaf-ts/db-decorators";
 import { Object as FabricObject, Property as FabricProperty, } from "fabric-contract-api";
 import { PersistenceKeys, UnsupportedError, Adapter, oneToManyOnUpdate, relation, QueryError, PagingError, MigrationError, ObserverError, AuthorizationError, ForbiddenError, ConnectionError, } from "@decaf-ts/core";
 import { FabricContractRepository } from "./FabricContractRepository.js";
 import { FabricStatement } from "./FabricContractStatement.js";
-import { FabricContractSequence } from "./FabricContractSequence.js";
 import { FabricFlavour } from "./../shared/constants.js";
 import { SimpleDeterministicSerializer } from "./../shared/SimpleDeterministicSerializer.js";
 import { oneToManyOnCreate, oneToManyOnDelete, oneToOneOnCreate, oneToOneOnDelete, oneToOneOnUpdate, populate as pop, } from "./FabricConstruction.js";
 import { apply, Decoration, prop, propMetadata, Metadata, } from "@decaf-ts/decoration";
+import { ContractLogger } from "./logging.js";
 /**
  * @description Sets the creator or updater field in a model based on the user in the context
  * @summary Callback function used in decorators to automatically set the created_by or updated_by fields
@@ -182,9 +182,8 @@ export class FabricContractAdapter extends CouchDBAdapter {
      * @return {Promise<Record<string, any>>} Promise resolving to the created record
      */
     async create(clazz, id, model, ...args) {
-        const { ctx, log } = this.logCtx(args, this.create);
+        const { ctx, log, stub } = this.logCtx(args, this.create);
         log.info(`in ADAPTER create with args ${args}`);
-        const { stub } = ctx;
         const tableName = Model.tableName(clazz);
         try {
             log.info(`adding entry to ${tableName} table with pk ${id}`);
@@ -205,9 +204,8 @@ export class FabricContractAdapter extends CouchDBAdapter {
      * @return {Promise<Record<string, any>>} Promise resolving to the retrieved record
      */
     async read(clazz, id, ...args) {
-        const { ctx, log } = this.logCtx(args, this.read);
+        const { ctx, log, stub } = this.logCtx(args, this.read);
         log.info(`in ADAPTER read with args ${args}`);
-        const { stub } = ctx;
         const tableName = Model.tableName(clazz);
         let model;
         try {
@@ -230,8 +228,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
      * @return {Promise<Record<string, any>>} Promise resolving to the updated record
      */
     async update(clazz, id, model, ...args) {
-        const { ctx, log } = this.logCtx(args, this.update);
-        const { stub } = ctx;
+        const { ctx, log, stub } = this.logCtx(args, this.update);
         const tableName = Model.tableName(clazz);
         try {
             log.verbose(`updating entry to ${tableName} table with pk ${id}`);
@@ -252,8 +249,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
      * @return {Promise<Record<string, any>>} Promise resolving to the deleted record
      */
     async delete(clazz, id, ...args) {
-        const { ctx, log, ctxArgs } = this.logCtx(args, this.delete);
-        const { stub } = ctx;
+        const { ctx, log, ctxArgs, stub } = this.logCtx(args, this.delete);
         const tableName = Model.tableName(clazz);
         let model;
         try {
@@ -268,8 +264,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
         return model;
     }
     async deleteState(id, ctx) {
-        const { stub, logger } = ctx;
-        const log = logger.for(this.deleteState);
+        const { stub } = this.logCtx([ctx], this.deleteState);
         await stub.deleteState(id);
     }
     forPrivate(collection) {
@@ -362,8 +357,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
     }
     async putState(id, model, ctx) {
         let data;
-        const { stub, logger } = ctx;
-        const log = logger.for(this.putState);
+        const { stub, log } = this.logCtx([ctx], this.putState);
         try {
             data = Buffer.from(FabricContractAdapter.serializer.serialize(model));
         }
@@ -376,8 +370,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
     }
     async readState(id, ctx) {
         let result;
-        const { stub, logger } = ctx;
-        const log = logger.for(this.readState);
+        const { stub, log } = this.logCtx([ctx], this.readState);
         const res = (await stub.getState(id)).toString();
         if (!res)
             throw new NotFoundError(`Record with id ${id} not found`);
@@ -432,33 +425,32 @@ export class FabricContractAdapter extends CouchDBAdapter {
      * @return {FabricContractFlags} The merged flags
      */
     async flags(operation, model, flags, ctx, ...args) {
-        const ensureLogger = (logger) => {
-            const base = logger ?? this.log.for(this.flags);
-            if (typeof base.clear !== "function")
-                base.clear = () => base;
-            if (typeof base.for !== "function")
-                base.for = () => base;
-            return base;
+        const baseFlags = {
+            stub: ctx.stub,
         };
-        const fabricCtx = ctx instanceof FabricContractContext
-            ? ctx.accumulate({
-                logger: ensureLogger(ctx.logger),
-            })
-            : new FabricContractContext().accumulate({
-                stub: ctx.stub,
+        if (ctx instanceof FabricContractContext) {
+            Object.assign(baseFlags, {
+                logger: ctx.logger,
+                identity: ctx.identity,
+                correlationId: ctx.stub.getTxID(),
+            });
+        }
+        else {
+            const LOG = !(ctx instanceof FabricContractContext)
+                ? ctx.logging.getLogger()
+                : ctx.logger;
+            LOG.info(`In flags`);
+            LOG.info(`${operation} - ${model.name} - ${JSON.stringify(flags)} - ${JSON.stringify(ctx)}`);
+            LOG.info(`flags: ${Object.keys(flags)}`);
+            LOG.info(`ctx: ${ctx.constructor.name}`);
+            Object.assign(baseFlags, {
                 identity: ctx.clientIdentity,
-                logger: ensureLogger(),
+                logger: new ContractLogger(this, undefined, ctx),
+                correlationId: ctx.stub.getTxID(),
             });
-        const baseFlags = Object.assign({}, flags, {
-            logger: fabricCtx.logger,
-        });
-        return Object.assign(await super.flags(operation, model, baseFlags, ...args), {
-            stub: ctx.stub,
-            identity: (ctx.clientIdentity ??
-                fabricCtx.identity),
-            logger: fabricCtx.logger,
-            correlationId: ctx.stub.getTxID(),
-        });
+        }
+        flags = (await super.flags(operation, model, baseFlags, ...args));
+        return flags;
     }
     /**
      * @description Creates an index for a model
@@ -560,9 +552,8 @@ export class FabricContractAdapter extends CouchDBAdapter {
      *   FabricContractAdapter-->>Caller: results
      */
     async raw(rawInput, ...args) {
-        const { ctx, log, ctxArgs } = this.logCtx(args, this.raw);
+        const { log, ctxArgs, stub } = this.logCtx(args, this.raw);
         const docsOnly = typeof ctxArgs[0] === "boolean" ? ctxArgs.shift() : false;
-        const { stub } = ctx;
         const { skip, limit } = rawInput;
         let iterator;
         if (limit || skip) {
@@ -584,9 +575,6 @@ export class FabricContractAdapter extends CouchDBAdapter {
     Statement() {
         return new FabricStatement(this);
     }
-    async Sequence(options) {
-        return new FabricContractSequence(options, this);
-    }
     async createAll(tableName, id, model, ...args) {
         if (id.length !== model.length)
             throw new InternalError("Ids and models must have the same length");
@@ -693,6 +681,28 @@ export class FabricContractAdapter extends CouchDBAdapter {
     parseError(err, reason) {
         return FabricContractAdapter.parseError(reason || err);
     }
+    logCtx(args, method) {
+        return FabricContractAdapter.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,
+            stub: ctx.stub,
+            identity: ctx.identity,
+            ctxArgs: [...args, ctx],
+        };
+    }
     static parseError(err) {
         // if (
         //   MISSING_PRIVATE_DATA_REGEX.test(