@decaf-ts/for-fabric 0.1.2 → 0.1.4

package/lib/contracts/private-data.cjs

@@ -1,120 +1,204 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MISSING_PRIVATE_DATA_ERROR_MESSAGE = exports.MISSING_PRIVATE_DATA_REGEX = void 0;
-exports.processModel = processModel;
-exports.hasPrivateData = hasPrivateData;
-exports.getClassPrivateDataMetadata = getClassPrivateDataMetadata;
-exports.isModelPrivate = isModelPrivate;
-exports.modelToPrivate = modelToPrivate;
-const db_decorators_1 = require("@decaf-ts/db-decorators");
-const decorator_validation_1 = require("@decaf-ts/decorator-validation");
-const core_1 = require("@decaf-ts/core");
-const constants_1 = require("./../shared/constants.cjs");
-const decoration_1 = require("@decaf-ts/decoration");
-exports.MISSING_PRIVATE_DATA_REGEX = /private\s+data\s+matching\s+public\s+hash\s+version\s+is\s+not\s+available/i;
-exports.MISSING_PRIVATE_DATA_ERROR_MESSAGE = "private data matching public hash version is not available ...";
-function processModel(adapter, model) {
-    const transient = decorator_validation_1.Model.segregate(model);
-    const privateData = modelToPrivate(model);
-    const transformModel = (model) => {
-        return Object.entries(model).reduce((accum, [key, val]) => {
-            if (typeof val === "undefined")
-                return accum;
-            const mappedProp = core_1.Repository.column(model, key);
-            if (adapter.isReserved(mappedProp))
-                throw new db_decorators_1.InternalError(`Property name ${mappedProp} is reserved`);
-            accum[mappedProp] = val;
-            return accum;
-        }, {});
-    };
-    if (privateData.private) {
-        const collections = Object.keys(privateData.private);
-        for (const collection of collections) {
-            privateData.private[collection] = transformModel(privateData.private[collection]);
-        }
-    }
-    return {
-        model: transient.model,
-        transient: transient.transient,
-        privateData: privateData.private,
-        result: transformModel(transient.model),
-    };
-}
-function hasPrivateData(model) {
-    const metadata = getClassPrivateDataMetadata(model);
-    if (!metadata)
-        return false;
-    return true;
-}
-function getClassPrivateDataMetadata(model) {
-    return decoration_1.Metadata.get(model.constructor, constants_1.FabricModelKeys.PRIVATE);
-}
-function isModelPrivate(model) {
-    const metadata = getClassPrivateDataMetadata(model);
-    if (!metadata || metadata.isPrivate === undefined)
-        return false;
-    return metadata.isPrivate;
-}
-function modelToPrivate(model) {
-    if (!hasPrivateData(model))
-        return { model: model };
-    const isPrivate = isModelPrivate(model);
-    const modelCollections = getClassPrivateDataMetadata(model);
-    let result = {
-        model: model,
-        private: undefined,
-    };
-    // TODO: the is private is not workign correctly. If no properties it doesn't create the private part.
-    if (isPrivate) {
-        const privatePart = modelCollections.collections;
-        result = (decoration_1.Metadata.properties(model.constructor) || []).reduce((accum, k) => {
-            const collections = modelCollections.collections;
-            accum.private = accum.private || {};
-            for (const collection of collections) {
-                try {
-                    accum.private[collection] = accum.private[collection] || {};
-                    accum.private[collection][k] = model[k];
-                }
-                catch (e) {
-                    throw new db_decorators_1.SerializationError(`Failed to serialize private property ${k}: ${e}`);
-                }
-            }
-            return accum;
-        }, { model: {}, private: privatePart });
-    }
-    else {
-        result = Object.entries(modelCollections).reduce((accum, [k, val]) => {
-            const props = decoration_1.Metadata.properties(model.constructor);
-            if (!props?.includes(k))
-                return accum;
-            const collections = val.collections;
-            if (collections?.length) {
-                accum.private = accum.private || {};
-                for (const collection of collections) {
-                    try {
-                        accum.private[collection] = accum.private[collection] || {};
-                        accum.private[collection][k] = model[k];
-                    }
-                    catch (e) {
-                        throw new db_decorators_1.SerializationError(`Failed to serialize private property ${k}: ${e}`);
-                    }
-                }
-            }
-            else {
-                accum.model = accum.model || {};
-                accum.model[k] = model[k];
-            }
-            return accum;
-        }, {});
-    }
-    result.model = result.model || {};
-    result.model = decorator_validation_1.Model.build(result.model, model.constructor.name);
-    if (result.private) {
-        const collections = Object.keys(result.private);
-        for (const collection of collections) {
-            result.private[collection] = decorator_validation_1.Model.build(result.private[collection], model.constructor.name);
-        }
-    }
-    return result;
-}
+// import { InternalError, SerializationError } from "@decaf-ts/db-decorators";
+// import { Model } from "@decaf-ts/decorator-validation";
+// import { FabricModelKeys } from "../shared/constants";
+// import { Constructor, Metadata } from "@decaf-ts/decoration";
+//
+// export const MISSING_PRIVATE_DATA_REGEX =
+//   /private\s+data\s+matching\s+public\s+hash\s+version\s+is\s+not\s+available/i;
+//
+// export const MISSING_PRIVATE_DATA_ERROR_MESSAGE =
+//   "private data matching public hash version is not available ...";
+//
+// export function processModel<M extends Model>(adapter: any, model: M) {
+//   const transient = Model.segregate(model);
+//   const privateData = modelToPrivate(model);
+//
+//   const transformModel = (model: any) => {
+//     return Object.entries(model).reduce(
+//       (accum: Record<string, any>, [key, val]) => {
+//         if (typeof val === "undefined") return accum;
+//         const mappedProp = Model.columnName(
+//           model.constructor as Constructor,
+//           key as any
+//         );
+//         if (adapter.isReserved(mappedProp))
+//           throw new InternalError(`Property name ${mappedProp} is reserved`);
+//         accum[mappedProp] = val;
+//         return accum;
+//       },
+//       {}
+//     );
+//   };
+//
+//   if (privateData.private) {
+//     const collections = Object.keys(privateData.private);
+//
+//     for (const collection of collections) {
+//       privateData.private![collection] = transformModel(
+//         privateData.private![collection]
+//       );
+//     }
+//   }
+//
+//   return {
+//     model: transient.model,
+//     transient: transient.transient,
+//     privateData: privateData.private,
+//     result: transformModel(transient.model),
+//   };
+// }
+//
+// export function hasPrivateData<M extends Model>(model: M) {
+//   return !!getClassPrivateDataMetadata(model);
+// }
+//
+// export function getClassPrivateDataMetadata<M extends Model>(
+//   model: M
+// ): Record<string, any> | undefined {
+//   const constr = model.constructor as Constructor;
+//   const rootMetadata = Metadata.get(constr) || {};
+//   if (rootMetadata && rootMetadata[FabricModelKeys.PRIVATE])
+//     return rootMetadata[FabricModelKeys.PRIVATE];
+//   if (
+//     rootMetadata &&
+//     rootMetadata[FabricModelKeys.FABRIC + FabricModelKeys.PRIVATE]
+//   )
+//     return rootMetadata[FabricModelKeys.FABRIC + FabricModelKeys.PRIVATE];
+//   const flattened = Object.keys(rootMetadata || {}).reduce(
+//     (accum: Record<string, any>, key) => {
+//       if (key.includes(FabricModelKeys.PRIVATE)) {
+//         const property = key.split(Metadata.splitter).pop();
+//         if (property) accum[property] = Metadata.get(constr, key);
+//       }
+//       return accum;
+//     },
+//     {} as Record<string, any>
+//   );
+//   if (Object.keys(flattened).length) return flattened;
+//   const classKey = Metadata.key(
+//     FabricModelKeys.FABRIC + FabricModelKeys.PRIVATE
+//   );
+//   const classMetadata =
+//     Metadata.get(constr, classKey) ??
+//     Metadata.get(constr, FabricModelKeys.PRIVATE);
+//   if (classMetadata) return classMetadata;
+//   const props = Metadata.properties(constr) || [];
+//   const metadata: Record<string, any> = {};
+//   for (const prop of props) {
+//     const keys = [
+//       Metadata.key(FabricModelKeys.PRIVATE, prop),
+//       Metadata.key(classKey, prop),
+//     ];
+//     const propMetadata = keys
+//       .map((key) => Metadata.get(constr, key))
+//       .find(Boolean);
+//     if (propMetadata) metadata[prop] = propMetadata;
+//   }
+//   return Object.keys(metadata).length ? metadata : undefined;
+// }
+//
+// export function isModelPrivate<M extends Model>(model: M): boolean {
+//   const classMetadata = Metadata.get(
+//     model.constructor as Constructor,
+//     Metadata.key(FabricModelKeys.FABRIC + FabricModelKeys.PRIVATE)
+//   );
+//   return Boolean(classMetadata?.isPrivate);
+// }
+//
+// export function modelToPrivate<M extends Model>(
+//   model: M
+// ): { model: M; private?: Record<string, Record<string, any>> } {
+//   if (!hasPrivateData(model)) return { model: model };
+//
+//   const isPrivate = isModelPrivate(model);
+//   const modelCollections: Record<string, any> =
+//     getClassPrivateDataMetadata(model);
+//
+//   let result: { model: Record<string, any>; private?: Record<string, any> } = {
+//     model: model as Record<string, any>,
+//     private: undefined,
+//   };
+//
+//   // TODO: the is private is not workign correctly. If no properties it doesn't create the private part.
+//   if (isPrivate) {
+//     const privatePart = modelCollections.collections;
+//     result = (
+//       Metadata.properties(model.constructor as Constructor) || []
+//     ).reduce(
+//       (
+//         accum: { model: Record<string, any>; private?: Record<string, any> },
+//         k
+//       ) => {
+//         const collections = modelCollections.collections;
+//         accum.private = accum.private || {};
+//
+//         for (const collection of collections) {
+//           try {
+//             accum.private[collection] = accum.private[collection] || {};
+//             accum.private[collection][k] = model[k as keyof M];
+//           } catch (e: unknown) {
+//             throw new SerializationError(
+//               `Failed to serialize private property ${k}: ${e}`
+//             );
+//           }
+//         }
+//
+//         return accum;
+//       },
+//       { model: {}, private: privatePart } as {
+//         model: Record<string, any>;
+//         private?: Record<string, any>;
+//       }
+//     );
+//   } else {
+//     result = Object.entries(modelCollections).reduce(
+//       (
+//         accum: { model: Record<string, any>; private?: Record<string, any> },
+//         [k, val]
+//       ) => {
+//         const props = Metadata.properties(model.constructor as Constructor);
+//         if (!props?.includes(k)) return accum;
+//
+//         const collections = (val as Record<string, any>).collections;
+//
+//         if (collections?.length) {
+//           accum.private = accum.private || {};
+//
+//           for (const collection of collections) {
+//             try {
+//               accum.private[collection] = accum.private[collection] || {};
+//               accum.private[collection][k] = model[k as keyof M];
+//             } catch (e: unknown) {
+//               throw new SerializationError(
+//                 `Failed to serialize private property ${k}: ${e}`
+//               );
+//             }
+//           }
+//         } else {
+//           accum.model = accum.model || {};
+//           accum.model[k] = (model as Record<string, any>)[k];
+//         }
+//         return accum;
+//       },
+//       {} as { model: Record<string, any>; private?: Record<string, any> }
+//     );
+//   }
+//
+//   result.model = result.model || {};
+//
+//   result.model = Model.build(result.model, model.constructor.name);
+//
+//   if (result.private) {
+//     const collections = Object.keys(result.private);
+//
+//     for (const collection of collections) {
+//       result.private![collection] = Model.build(
+//         result.private![collection],
+//         model.constructor.name
+//       );
+//     }
+//   }
+//   return result as { model: M; private?: Record<string, Record<string, any>> };
+// }
 //# sourceMappingURL=private-data.js.map

package/lib/contracts/private-data.d.ts

@@ -1,16 +0,0 @@
-import { Model } from "@decaf-ts/decorator-validation";
-export declare const MISSING_PRIVATE_DATA_REGEX: RegExp;
-export declare const MISSING_PRIVATE_DATA_ERROR_MESSAGE = "private data matching public hash version is not available ...";
-export declare function processModel<M extends Model>(adapter: any, model: M): {
-    model: M;
-    transient: Record<keyof M, any> | undefined;
-    privateData: Record<string, Record<string, any>> | undefined;
-    result: Record<string, any>;
-};
-export declare function hasPrivateData<M extends Model>(model: M): boolean;
-export declare function getClassPrivateDataMetadata<M extends Model>(model: M): Record<string, any>;
-export declare function isModelPrivate<M extends Model>(model: M): boolean;
-export declare function modelToPrivate<M extends Model>(model: M): {
-    model: M;
-    private?: Record<string, Record<string, any>>;
-};

package/lib/contracts/private-data.js.map

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

package/lib/contracts/types.d.ts

@@ -18,7 +18,7 @@ export interface FabricContractFlags extends RepositoryFlags {
     /**
      * @description Client identity for the transaction submitter
      */
-    clientIdentity: ClientIdentity;
+    identity: ClientIdentity;
     /**
      * @description Logger instance for the contract
      */

package/lib/esm/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;
 }