@decaf-ts/for-fabric 0.1.2 → 0.1.5

package/lib/client/FabricClientAdapter.cjs

@@ -42,7 +42,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FabricClientAdapter = void 0;
+exports.FabricClientAdapter = exports.FabricClientContext = void 0;
 const for_couchdb_1 = require("@decaf-ts/for-couchdb");
 const grpc_js_1 = require("@grpc/grpc-js");
 const grpc = __importStar(require("@grpc/grpc-js"));
@@ -51,11 +51,15 @@ const logging_1 = require("@decaf-ts/logging");
 const fabric_gateway_1 = require("@hyperledger/fabric-gateway");
 const fabric_fs_1 = require("./fabric-fs.cjs");
 const db_decorators_1 = require("@decaf-ts/db-decorators");
+const db_decorators_2 = require("@decaf-ts/db-decorators");
 const core_1 = require("@decaf-ts/core");
 const FabricClientRepository_1 = require("./FabricClientRepository.cjs");
 const constants_1 = require("./../shared/constants.cjs");
 const ClientSerializer_1 = require("./../shared/ClientSerializer.cjs");
 const fabric_hsm_1 = require("./fabric-hsm.cjs");
+class FabricClientContext extends db_decorators_2.Context {
+}
+exports.FabricClientContext = FabricClientContext;
 /**
  * @description Adapter for interacting with Hyperledger Fabric networks
  * @summary The FabricAdapter extends CouchDBAdapter to provide a seamless interface for interacting with Hyperledger Fabric networks.
@@ -113,18 +117,7 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      */
     static { this.decoder = new TextDecoder("utf8"); }
     static { this.serializer = new ClientSerializer_1.ClientSerializer(); }
-    /**
-     * @description Static logger instance for the FabricAdapter class
-     */
-    static { this.log = new logging_1.MiniLogger(FabricClientAdapter.name); }
-    /**
-     * @description Gets the logger instance for this adapter
-     * @summary Returns the static logger instance for the FabricAdapter class
-     * @return {Logger} The logger instance
-     */
-    get log() {
-        return FabricClientAdapter.log;
-    }
+    static { this.log = logging_1.Logging.for(FabricClientAdapter); }
     /**
      * @description Creates a new FabricAdapter instance
      * @summary Initializes a new adapter for interacting with a Hyperledger Fabric network
@@ -135,6 +128,12 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
         super(config, constants_1.FabricFlavour, alias);
         this.serializer = FabricClientAdapter.serializer;
     }
+    async context(operation, overrides, model, ...args) {
+        const log = this.log.for(this.context);
+        log.debug(`Creating new context for ${operation} operation on ${Array.isArray(model) ? model.map((m) => m.name) : model.name} model with flag overrides: ${JSON.stringify(overrides)}`);
+        const flags = await this.flags(operation, model, overrides, ...args);
+        return new FabricClientContext().accumulate(flags);
+    }
     /**
      * @description Decodes a Uint8Array to a string
      * @summary Converts binary data received from Fabric to a string using UTF-8 encoding
@@ -156,15 +155,16 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the created records
      */
-    async createAll(tableName, ids, models, transient) {
-        const log = this.log.for(this.createAll);
+    async createAll(clazz, ids, models, ...args) {
         if (ids.length !== models.length)
-            throw new db_decorators_1.InternalError(`Ids and models must have the same length: ${ids.length} != ${models.length}`);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+            throw new db_decorators_1.InternalError("Ids and models must have the same length");
+        const ctxArgs = [...args];
+        const transient = ctxArgs.shift();
+        const { log } = this.logCtx(ctxArgs, this.createAll);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.info(`adding ${ids.length} entries to ${tableName} table`);
         log.verbose(`pks: ${ids}`);
-        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.CREATE_ALL, [ids, models.map((m) => this.serializer.serialize(m, tableName))], transient, undefined, tableName);
+        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.CREATE_ALL, [ids, models.map((m) => this.serializer.serialize(m, clazz.name))], transient, undefined, tableName);
         try {
             return JSON.parse(this.decode(result)).map((r) => JSON.parse(r));
         }
@@ -179,13 +179,12 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {string[] | number[]} ids - Array of record identifiers to read
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the retrieved records
      */
-    async readAll(tableName, ids) {
-        const log = this.log.for(this.readAll);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+    async readAll(clazz, ids, ...args) {
+        const { log } = this.logCtx(args, this.readAll);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.info(`reading ${ids.length} entries to ${tableName} table`);
         log.verbose(`pks: ${ids}`);
-        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.READ_ALL, [ids], undefined, undefined, tableName);
+        const result = await this.evaluateTransaction(db_decorators_1.BulkCrudOperationKeys.READ_ALL, [ids], undefined, undefined, tableName);
         try {
             return JSON.parse(this.decode(result)).map((r) => JSON.parse(r));
         }
@@ -202,15 +201,16 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the updated records
      */
-    async updateAll(tableName, ids, models, transient) {
-        const log = this.log.for(this.updateAll);
+    async updateAll(clazz, ids, models, ...args) {
         if (ids.length !== models.length)
-            throw new db_decorators_1.InternalError(`Ids and models must have the same length: ${ids.length} != ${models.length}`);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+            throw new db_decorators_1.InternalError("Ids and models must have the same length");
+        const ctxArgs = [...args];
+        const transient = ctxArgs.shift();
+        const { log } = this.logCtx(ctxArgs, this.updateAll);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.info(`updating ${ids.length} entries to ${tableName} table`);
         log.verbose(`pks: ${ids}`);
-        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.UPDATE_ALL, [ids, models.map((m) => this.serializer.serialize(m, tableName))], transient, undefined, tableName);
+        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.UPDATE_ALL, [ids, models.map((m) => this.serializer.serialize(m, clazz.name))], transient, undefined, clazz.name);
         try {
             return JSON.parse(this.decode(result)).map((r) => JSON.parse(r));
         }
@@ -226,13 +226,12 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {Serializer<any>} serializer - Serializer for the model data
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the deleted records
      */
-    async deleteAll(tableName, ids) {
-        const log = this.log.for(this.deleteAll);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+    async deleteAll(clazz, ids, ...args) {
+        const { log } = core_1.Adapter.logCtx(args, this.deleteAll);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.info(`deleting ${ids.length} entries to ${tableName} table`);
         log.verbose(`pks: ${ids}`);
-        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.DELETE_ALL, [ids], undefined, undefined, tableName);
+        const result = await this.submitTransaction(db_decorators_1.BulkCrudOperationKeys.DELETE_ALL, [ids], undefined, undefined, clazz.name);
         try {
             return JSON.parse(this.decode(result)).map((r) => JSON.parse(r));
         }
@@ -249,8 +248,8 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param pk - The primary key property name
      * @return The prepared data
      */
-    prepare(model, pk) {
-        const log = this.log.for(this.prepare);
+    prepare(model, ...args) {
+        const { log } = this.logCtx(args, this.prepare);
         const split = decorator_validation_1.Model.segregate(model);
         if (model[core_1.PersistenceKeys.METADATA]) {
             log.silly(`Passing along persistence metadata for ${model[core_1.PersistenceKeys.METADATA]}`);
@@ -263,7 +262,7 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
         }
         return {
             record: split.model,
-            id: model[pk],
+            id: model[decorator_validation_1.Model.pk(model.constructor)],
             transient: split.transient,
         };
     }
@@ -279,31 +278,33 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param [transient] - Transient properties to reattach
      * @return {M} The reconstructed model instance
      */
-    revert(obj, clazz, pk, id, transient) {
-        const log = this.log.for(this.revert);
+    revert(obj, clazz, id, transient, ...args) {
+        const { log, ctx } = this.logCtx(args, this.revert);
         const ob = {};
+        const pk = decorator_validation_1.Model.pk(clazz);
         ob[pk] = id;
-        const m = (typeof clazz === "string" ? decorator_validation_1.Model.build(ob, clazz) : new clazz(ob));
+        const m = new clazz(ob);
         log.silly(`Rebuilding model ${m.constructor.name} id ${id}`);
         const metadata = obj[core_1.PersistenceKeys.METADATA];
         const result = Object.keys(m).reduce((accum, key) => {
             accum[key] = obj[key];
             return accum;
         }, m);
-        if (transient) {
+        if (ctx.get("rebuildWithTransient") && transient) {
             log.verbose(`re-adding transient properties: ${Object.keys(transient).join(", ")}`);
             Object.entries(transient).forEach(([key, val]) => {
-                if (key in result && result[key] !== undefined)
+                if (key in result)
                     throw new db_decorators_1.InternalError(`Transient property ${key} already exists on model ${m.constructor.name}. should be impossible`);
                 result[key] = val;
             });
         }
         if (metadata) {
+            // TODO move to couchdb
             log.silly(`Passing along ${this.flavour} persistence metadata for ${m.constructor.name} id ${id}: ${metadata}`);
             Object.defineProperty(result, core_1.PersistenceKeys.METADATA, {
                 enumerable: false,
-                configurable: false,
-                writable: false,
+                configurable: true,
+                writable: true,
                 value: metadata,
             });
         }
@@ -328,13 +329,14 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Record<string, any>>} Promise resolving to the created record
      */
-    async create(tableName, id, model, transient) {
-        const log = this.log.for(this.create);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+    async create(clazz, id, model, ...args) {
+        const ctxArgs = [...args];
+        const transient = ctxArgs.shift() || {};
+        const { log } = this.logCtx(ctxArgs, this.create);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.verbose(`adding entry to ${tableName} table`);
         log.debug(`pk: ${id}`);
-        const result = await this.submitTransaction(db_decorators_1.OperationKeys.CREATE, [this.serializer.serialize(model, tableName)], transient, undefined, tableName);
+        const result = await this.submitTransaction(db_decorators_1.OperationKeys.CREATE, [this.serializer.serialize(model, clazz.name)], transient, undefined, clazz.name);
         return this.serializer.deserialize(this.decode(result));
     }
     /**
@@ -344,21 +346,22 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {string | number} id - The record identifier
      * @return {Promise<Record<string, any>>} Promise resolving to the retrieved record
      */
-    async read(tableName, id) {
-        const log = this.log.for(this.read);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+    async read(clazz, id, ...args) {
+        const { log } = this.logCtx(args, this.readAll);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.verbose(`reading entry from ${tableName} table`);
         log.debug(`pk: ${id}`);
-        const result = await this.evaluateTransaction(db_decorators_1.OperationKeys.READ, [id.toString()], undefined, undefined, tableName);
+        const result = await this.evaluateTransaction(db_decorators_1.OperationKeys.READ, [id.toString()], undefined, undefined, clazz.name);
         return this.serializer.deserialize(this.decode(result));
     }
-    updatePrefix(tableName, id, model) {
+    updatePrefix(clazz, id, model, ...args) {
+        const tableName = decorator_validation_1.Model.tableName(clazz);
+        const { ctxArgs } = this.logCtx(args, this.updatePrefix);
         const record = {};
         record[for_couchdb_1.CouchDBKeys.TABLE] = tableName;
         record[for_couchdb_1.CouchDBKeys.ID] = this.generateId(tableName, id);
         Object.assign(record, model);
-        return [tableName, id, record];
+        return [tableName, id, record, ...ctxArgs];
     }
     /**
      * @description Updates a single record
@@ -369,13 +372,14 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Record<string, any>>} Promise resolving to the updated record
      */
-    async update(tableName, id, model, transient) {
-        const log = this.log.for(this.update);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+    async update(clazz, id, model, ...args) {
+        const ctxArgs = [...args];
+        const transient = ctxArgs.shift() || {};
+        const { log } = this.logCtx(ctxArgs, this.updateAll);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.verbose(`updating entry to ${tableName} table`);
         log.debug(`pk: ${id}`);
-        const result = await this.submitTransaction(db_decorators_1.OperationKeys.UPDATE, [this.serializer.serialize(model, tableName)], transient, undefined, tableName);
+        const result = await this.submitTransaction(db_decorators_1.OperationKeys.UPDATE, [this.serializer.serialize(model, clazz.name)], transient, undefined, clazz.name);
         return this.serializer.deserialize(this.decode(result));
     }
     /**
@@ -385,13 +389,12 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @param {string | number} id - The record identifier to delete
      * @return {Promise<Record<string, any>>} Promise resolving to the deleted record
      */
-    async delete(tableName, id) {
-        const log = this.log.for(this.delete);
-        if (typeof tableName !== "string")
-            tableName = tableName.name;
+    async delete(clazz, id, ...args) {
+        const { log } = this.logCtx(args, this.delete);
+        const tableName = decorator_validation_1.Model.tableName(clazz);
         log.verbose(`deleting entry from ${tableName} table`);
         log.debug(`pk: ${id}`);
-        const result = await this.submitTransaction(db_decorators_1.OperationKeys.DELETE, [id.toString()], undefined, undefined, tableName);
+        const result = await this.submitTransaction(db_decorators_1.OperationKeys.DELETE, [id.toString()], undefined, undefined, clazz.name);
         return this.serializer.deserialize(this.decode(result));
     }
     /**
@@ -419,8 +422,17 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      *   FabricAdapter->>FabricAdapter: Process result based on type
      *   FabricAdapter-->>Client: processed result
      */
-    async raw(rawInput, process, tableName) {
-        const log = this.log.for(this.raw);
+    async raw(rawInput, ...args) {
+        const ctxArgs = [...args];
+        if (typeof ctxArgs[0] === "boolean") {
+            ctxArgs.shift();
+        }
+        let tableName;
+        if (ctxArgs.length &&
+            (typeof ctxArgs[0] === "string" || typeof ctxArgs[0] === "function")) {
+            tableName = ctxArgs.shift();
+        }
+        const { log } = this.logCtx(ctxArgs, this.raw);
         log.info(`Performing raw  query on table`);
         log.debug(`processing raw input for query: ${JSON.stringify(rawInput)}`);
         let input;
@@ -433,7 +445,7 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
         let transactionResult;
         try {
             if (typeof tableName !== "string")
-                tableName = tableName.name;
+                tableName = tableName?.name;
             transactionResult = await this.evaluateTransaction("query", [input], undefined, undefined, tableName);
         }
         catch (e) {
@@ -624,7 +636,7 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @return {Network} The Network instance
      */
     static getNetwork(gateway, channelName) {
-        const log = this.log.for(this.getNetwork);
+        const log = logging_1.Logging.for(this.getNetwork);
         let network;
         try {
             log.debug(`Connecting to channel ${channelName}`);
@@ -685,7 +697,7 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      *   FabricAdapter-->>Caller: gateway
      */
     static async getConnection(client, config) {
-        const log = this.log.for(this.getConnection);
+        const log = logging_1.Logging.for(this.getConnection);
         log.debug(`Retrieving Peer Identity for ${config.mspId} under ${config.certCertOrDirectoryPath}`);
         const identity = await (0, fabric_fs_1.getIdentity)(config.mspId, config.certCertOrDirectoryPath);
         log.debug(`Retrieving signer key from ${config.keyCertOrDirectoryPath}`);
@@ -756,6 +768,7 @@ class FabricClientAdapter extends for_couchdb_1.CouchDBAdapter {
      * @return {BaseError} The parsed error
      */
     static parseError(err, reason) {
+        // TODO
         return super.parseError(err, reason);
     }
 }
@@ -770,36 +783,36 @@ __decorate([
 ], FabricClientAdapter.prototype, "index", null);
 __decorate([
     (0, logging_1.debug)(),
-    (0, core_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object, Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object, FabricClientContext]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "create", null);
 __decorate([
     (0, logging_1.debug)(),
-    (0, core_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:paramtypes", [Object, Object, FabricClientContext]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "read", null);
 __decorate([
     (0, logging_1.debug)(),
-    (0, core_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object, Object, Object]),
+    __metadata("design:paramtypes", [Object, Object, Object, FabricClientContext]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "update", null);
 __decorate([
     (0, logging_1.debug)(),
-    (0, core_1.final)(),
+    (0, logging_1.final)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:paramtypes", [Object, Object, FabricClientContext]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "delete", null);
 __decorate([
     (0, logging_1.debug)(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Boolean, String]),
+    __metadata("design:paramtypes", [Object, FabricClientContext]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "raw", null);
 FabricClientAdapter.decoration();

package/lib/client/FabricClientAdapter.d.ts

@@ -1,13 +1,16 @@
 import { CouchDBAdapter, type MangoQuery } from "@decaf-ts/for-couchdb";
 import { Client } from "@grpc/grpc-js";
 import { Model, type Serializer } from "@decaf-ts/decorator-validation";
-import { type Logger } from "@decaf-ts/logging";
 import { type FabricFlags, type PeerConfig } from "../shared/types";
 import { Gateway, Network, Contract as Contrakt } from "@hyperledger/fabric-gateway";
-import { BaseError, Context } from "@decaf-ts/db-decorators";
-import { Adapter, Repository } from "@decaf-ts/core";
+import { BaseError, OperationKeys } from "@decaf-ts/db-decorators";
+import { Context, type PrimaryKeyType } from "@decaf-ts/db-decorators";
+import { Adapter, PreparedModel, Repository } from "@decaf-ts/core";
+import type { ContextualArgs, MaybeContextualArg } from "@decaf-ts/core";
 import type { FabricClientDispatch } from "./FabricClientDispatch";
 import { type Constructor } from "@decaf-ts/decoration";
+export declare class FabricClientContext extends Context<FabricFlags> {
+}
 /**
  * @description Adapter for interacting with Hyperledger Fabric networks
  * @summary The FabricAdapter extends CouchDBAdapter to provide a seamless interface for interacting with Hyperledger Fabric networks.
@@ -59,22 +62,13 @@ import { type Constructor } from "@decaf-ts/decoration";
  *   FabricAdapter->>FabricAdapter: serializer.deserialize(decodedResult)
  *   FabricAdapter-->>Client: deserializedResult
  */
-export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Client, FabricFlags, Context<FabricFlags>> {
+export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Client, FabricClientContext> {
     /**
      * @description Static text decoder for converting Uint8Array to string
      */
     private static decoder;
     private static serializer;
-    /**
-     * @description Static logger instance for the FabricAdapter class
-     */
-    private static log;
-    /**
-     * @description Gets the logger instance for this adapter
-     * @summary Returns the static logger instance for the FabricAdapter class
-     * @return {Logger} The logger instance
-     */
-    protected get log(): Logger;
+    protected static log: import("@decaf-ts/logging").Logger;
     protected readonly serializer: Serializer<any>;
     /**
      * @description Creates a new FabricAdapter instance
@@ -83,6 +77,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {string} [alias] - Optional alias for the adapter instance
      */
     constructor(config: PeerConfig, alias?: string);
+    context<M extends Model>(operation: OperationKeys.CREATE | OperationKeys.READ | OperationKeys.UPDATE | OperationKeys.DELETE | string, overrides: Partial<FabricFlags>, model: Constructor<M> | Constructor<M>[], ...args: any[]): Promise<FabricClientContext>;
     /**
      * @description Decodes a Uint8Array to a string
      * @summary Converts binary data received from Fabric to a string using UTF-8 encoding
@@ -90,7 +85,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @return {string} The decoded string
      */
     decode(data: Uint8Array): string;
-    repository<M extends Model<true | false>>(): Constructor<Repository<M, MangoQuery, Adapter<PeerConfig, Client, MangoQuery, FabricFlags, Context<FabricFlags>>, FabricFlags, Context<FabricFlags>>>;
+    repository<R extends Repository<any, Adapter<PeerConfig, Client, MangoQuery, FabricClientContext>>>(): Constructor<R>;
     /**
      * @description Creates multiple records in a single transaction
      * @summary Submits a transaction to create multiple records in the Fabric ledger
@@ -100,7 +95,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the created records
      */
-    createAll(tableName: string, ids: string[] | number[], models: Record<string, any>[], transient: Record<string, any>): Promise<Record<string, any>[]>;
+    createAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
     /**
      * @description Reads multiple records in a single transaction
      * @summary Submits a transaction to read multiple records from the Fabric ledger
@@ -108,7 +103,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {string[] | number[]} ids - Array of record identifiers to read
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the retrieved records
      */
-    readAll(tableName: string, ids: string[] | number[]): Promise<Record<string, any>[]>;
+    readAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
     /**
      * @description Updates multiple records in a single transaction
      * @summary Submits a transaction to update multiple records in the Fabric ledger
@@ -118,7 +113,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the updated records
      */
-    updateAll(tableName: string, ids: string[] | number[], models: Record<string, any>[], transient: Record<string, any>): Promise<Record<string, any>[]>;
+    updateAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
     /**
      * @description Deletes multiple records in a single transaction
      * @summary Submits a transaction to delete multiple records from the Fabric ledger
@@ -127,7 +122,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {Serializer<any>} serializer - Serializer for the model data
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the deleted records
      */
-    deleteAll(tableName: string, ids: (string | number | bigint)[]): Promise<Record<string, any>[]>;
+    deleteAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
     /**
      * @description Prepares a model for persistence
      * @summary Converts a model instance into a format suitable for database storage,
@@ -137,11 +132,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param pk - The primary key property name
      * @return The prepared data
      */
-    prepare<M extends Model>(model: M, pk: keyof M): {
-        record: Record<string, any>;
-        id: string;
-        transient?: Record<string, any>;
-    };
+    prepare<M extends Model>(model: M, ...args: ContextualArgs<FabricClientContext>): PreparedModel;
     /**
      * @description Converts database data back into a model instance
      * @summary Reconstructs a model instance from database data, handling column mapping
@@ -154,7 +145,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param [transient] - Transient properties to reattach
      * @return {M} The reconstructed model instance
      */
-    revert<M extends Model>(obj: Record<string, any>, clazz: string | Constructor<M>, pk: keyof M, id: string | number | bigint, transient?: Record<string, any>): M;
+    revert<M extends Model>(obj: Record<string, any>, clazz: Constructor<M>, id: PrimaryKeyType, transient?: Record<string, any>, ...args: ContextualArgs<FabricClientContext>): M;
     /**
      * @description Creates an index for a model
      * @summary This method is not implemented for Fabric and will throw an error
@@ -172,7 +163,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Record<string, any>>} Promise resolving to the created record
      */
-    create(tableName: string, id: string | number, model: Record<string, any>, transient: Record<string, any>): Promise<Record<string, any>>;
+    create<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>>;
     /**
      * @description Reads a single record
      * @summary Evaluates a transaction to read a record from the Fabric ledger
@@ -180,8 +171,8 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {string | number} id - The record identifier
      * @return {Promise<Record<string, any>>} Promise resolving to the retrieved record
      */
-    read(tableName: string, id: string | number): Promise<Record<string, any>>;
-    updatePrefix(tableName: string, id: string | number, model: Record<string, any>): (string | number | Record<string, any>)[];
+    read<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>>;
+    updatePrefix<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: MaybeContextualArg<FabricClientContext>): any[];
     /**
      * @description Updates a single record
      * @summary Submits a transaction to update a record in the Fabric ledger
@@ -191,7 +182,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Record<string, any>>} Promise resolving to the updated record
      */
-    update(tableName: string, id: string | number, model: Record<string, any>, transient: Record<string, any>): Promise<Record<string, any>>;
+    update<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>>;
     /**
      * @description Deletes a single record
      * @summary Submits a transaction to delete a record from the Fabric ledger
@@ -199,7 +190,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {string | number} id - The record identifier to delete
      * @return {Promise<Record<string, any>>} Promise resolving to the deleted record
      */
-    delete(tableName: string, id: string | number): Promise<Record<string, any>>;
+    delete<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>>;
     /**
      * @description Executes a raw query against the Fabric ledger
      * @summary Evaluates a transaction to perform a query using Mango Query syntax
@@ -225,7 +216,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      *   FabricAdapter->>FabricAdapter: Process result based on type
      *   FabricAdapter-->>Client: processed result
      */
-    raw<V>(rawInput: MangoQuery, process: boolean, tableName?: string): Promise<V>;
+    raw<V>(rawInput: MangoQuery, ...args: ContextualArgs<FabricClientContext>): Promise<V>;
     /**
      * @description Gets or creates a gRPC client for the Fabric peer
      * @summary Returns a cached client or creates a new one if none exists
@@ -281,7 +272,7 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {string} [reason] - Optional reason for the error
      * @return {BaseError} The parsed error
      */
-    parseError(err: Error | string, reason?: string): BaseError;
+    parseError<E extends BaseError>(err: Error | string, reason?: string): E;
     /**
      * @description Submits a transaction to the Fabric network
      * @summary Executes a transaction that modifies the ledger state
@@ -381,5 +372,5 @@ export declare class FabricClientAdapter extends CouchDBAdapter<PeerConfig, Clie
      * @param {string} [reason] - Optional reason for the error
      * @return {BaseError} The parsed error
      */
-    protected static parseError(err: Error | string, reason?: string): BaseError;
+    protected static parseError<E extends BaseError>(err: Error | string, reason?: string): E;
 }