@decaf-ts/for-fabric 0.1.22 → 0.1.24

package/lib/contracts/crud/serialized-crud-contract.cjs

@@ -12,6 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SerializedCrudContract = void 0;
 const crud_contract_1 = require("./crud-contract.cjs");
 const fabric_contract_api_1 = require("fabric-contract-api");
+const core_1 = require("@decaf-ts/core");
+const db_decorators_1 = require("@decaf-ts/db-decorators");
 /**
  * @description CRUD contract variant that serializes/deserializes payloads
  * @summary Exposes the same CRUD operations as FabricCrudContract but takes and returns JSON strings to facilitate simple client interactions.
@@ -71,14 +73,50 @@ class SerializedCrudContract extends crud_contract_1.FabricCrudContract {
         log.info(`Updating ${modelList.length} entries to the table`);
         return JSON.stringify((await super.updateAll(ctx, modelList)).map((m) => this.serialize(m)));
     }
-    async statement(context, method) {
-        const { ctx } = await this.logCtx([context], this.statement);
-        return super.statement(ctx, method);
+    async statement(context, method, ...args) {
+        const { ctx, log } = await this.logCtx([...args, context], this.statement);
+        args = args.map((a) => {
+            try {
+                return JSON.parse(a);
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            }
+            catch (e) {
+                return a;
+            }
+        });
+        log.info(`calling prepared statement ${method}`);
+        log.debug(`with args ${args}`);
+        return super.statement(ctx, method, ...args);
     }
-    async raw(context, rawInput, docsOnly) {
+    async listBy(context, key, order, ...args) {
+        const { ctx } = await this.logCtx([...args, context], this.listBy);
+        return super.listBy(ctx, key, order);
+    }
+    async paginateBy(context, key, order, size, ...args) {
+        const { ctx } = await this.logCtx([...args, context], this.paginateBy);
+        return super.paginateBy(ctx, key, order, size);
+    }
+    async findOneBy(context, key, value, ...args) {
+        const { ctx } = await this.logCtx([...args, context], this.paginateBy);
+        return super.findOneBy(ctx, key, value, ...args);
+    }
+    // @Transaction(false)
+    async query(context, condition, orderBy, order, limit, skip, ...args) {
+        const { ctx } = await this.logCtx([context], this.query);
+        let cond;
+        try {
+            cond = core_1.Condition.from(JSON.parse(condition));
+        }
+        catch (e) {
+            throw new db_decorators_1.SerializationError(`Invalid condition: ${e}`);
+        }
+        return super.query(ctx, cond, orderBy, order, limit, skip, ...args);
+    }
+    // @Transaction(false)
+    async raw(context, rawInput, docsOnly, ...args) {
         const { ctx } = await this.logCtx([context], this.raw);
         const parsedInput = JSON.parse(rawInput);
-        return super.raw(ctx, parsedInput, docsOnly);
+        return super.raw(ctx, parsedInput, docsOnly, ...args);
     }
     async init(ctx) {
         await super.init(ctx);
@@ -145,15 +183,27 @@ __decorate([
 __decorate([
     (0, fabric_contract_api_1.Transaction)(false),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [fabric_contract_api_1.Context, String]),
+    __metadata("design:paramtypes", [fabric_contract_api_1.Context, String, String]),
     __metadata("design:returntype", Promise)
 ], SerializedCrudContract.prototype, "statement", null);
 __decorate([
     (0, fabric_contract_api_1.Transaction)(false),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [fabric_contract_api_1.Context, String, Boolean]),
+    __metadata("design:paramtypes", [fabric_contract_api_1.Context, String, String, String]),
+    __metadata("design:returntype", Promise)
+], SerializedCrudContract.prototype, "listBy", null);
+__decorate([
+    (0, fabric_contract_api_1.Transaction)(false),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [fabric_contract_api_1.Context, String, String, Number, String]),
+    __metadata("design:returntype", Promise)
+], SerializedCrudContract.prototype, "paginateBy", null);
+__decorate([
+    (0, fabric_contract_api_1.Transaction)(false),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [fabric_contract_api_1.Context, String, String, String]),
     __metadata("design:returntype", Promise)
-], SerializedCrudContract.prototype, "raw", null);
+], SerializedCrudContract.prototype, "findOneBy", null);
 __decorate([
     (0, fabric_contract_api_1.Transaction)(),
     __metadata("design:type", Function),

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

@@ -23,8 +23,12 @@ export declare class SerializedCrudContract<M extends Model> extends FabricCrudC
     deleteAll(context: Ctx, keys: string): Promise<string>;
     readAll(context: Ctx, keys: string): Promise<string>;
     updateAll(context: Ctx, models: string): Promise<string>;
-    statement(context: Ctx, method: string): Promise<any>;
-    raw(context: Ctx, rawInput: string, docsOnly: boolean): Promise<any>;
+    statement(context: Ctx, method: string, ...args: string[]): Promise<any>;
+    listBy(context: Ctx, key: string, order: string, ...args: string[]): Promise<M[]>;
+    paginateBy(context: Ctx, key: string, order: string, size: number, ...args: string[]): Promise<import("@decaf-ts/core").Paginator<M, M[], any>>;
+    findOneBy(context: Ctx, key: string, value: string, ...args: string[]): Promise<M>;
+    query(context: Ctx, condition: string, orderBy: string, order: string, limit?: number, skip?: number, ...args: string[]): Promise<M[]>;
+    raw(context: Ctx, rawInput: string, docsOnly: boolean, ...args: string[]): Promise<any>;
     init(ctx: Ctx): Promise<void>;
     healthcheck(context: Ctx): Promise<string>;
     createAll(context: Ctx, models: string): Promise<string>;

package/lib/contracts/crud/serialized-crud-contract.js.map

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

package/lib/contracts/types.d.ts

@@ -1,6 +1,6 @@
-import { RepositoryFlags } from "@decaf-ts/db-decorators";
 import { ChaincodeStub, ClientIdentity } from "fabric-shim-api";
 import { Logger } from "@decaf-ts/logging";
+import { FabricFlags } from "../shared/index";
 /**
  * @description Flags for Fabric chaincode contract operations
  * @summary Extends repository flags with Fabric-specific context elements available during Fabric chaincode execution, such as the ChaincodeStub, ClientIdentity and a request-scoped Logger.
@@ -10,7 +10,7 @@ import { Logger } from "@decaf-ts/logging";
  * @interface FabricContractFlags
  * @memberOf module:fabric.contracts
  */
-export interface FabricContractFlags extends RepositoryFlags {
+export interface FabricContractFlags extends FabricFlags {
     /**
      * @description Chaincode stub for interacting with the ledger
      */

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

@@ -1,16 +1,13 @@
+import "../shared/overrides";
+import { type MangoQuery } from "@decaf-ts/for-couchdb";
 import { Client } from "@grpc/grpc-js";
-import { Model, type Serializer } from "@decaf-ts/decorator-validation";
-import { type FabricFlags, type PeerConfig } from "../shared/types";
+import { Model, type ModelConstructor, type Serializer } from "@decaf-ts/decorator-validation";
+import { type FabricFlags, type PeerConfig, type SegregatedModel } from "../shared/types";
 import { Gateway, Network, Contract as Contrakt } from "@hyperledger/fabric-gateway";
-import { BaseError, OperationKeys } from "@decaf-ts/db-decorators";
-import { Context, type PrimaryKeyType } from "@decaf-ts/db-decorators";
-import { Adapter, ContextOf, PreparedModel, Repository, Statement } from "@decaf-ts/core";
-import type { ContextualArgs, MaybeContextualArg } from "@decaf-ts/core";
-import type { FabricClientDispatch } from "./FabricClientDispatch";
+import { BaseError, OperationKeys, type PrimaryKeyType } from "@decaf-ts/db-decorators";
+import { Context, Adapter, type AdapterFlags, Repository, Statement, type PreparedStatement, Paginator, MaybeContextualArg, ContextualArgs, type PreparedModel } from "@decaf-ts/core";
+import { FabricClientDispatch } from "./FabricClientDispatch";
 import { type Constructor } from "@decaf-ts/decoration";
-import { type FabricQuery } from "./types";
-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.
@@ -62,7 +59,7 @@ export declare class FabricClientContext extends Context<FabricFlags> {
  *   FabricAdapter->>FabricAdapter: serializer.deserialize(decodedResult)
  *   FabricAdapter-->>Client: deserializedResult
  */
-export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, FabricQuery, FabricClientContext> {
+export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, MangoQuery, Context<FabricFlags>> {
     /**
      * @description Static text decoder for converting Uint8Array to string
      */
@@ -77,8 +74,9 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {string} [alias] - Optional alias for the adapter instance
      */
     constructor(config: PeerConfig, alias?: string);
-    Statement<M extends Model>(): Statement<M, Adapter<PeerConfig, Client, any, any>, any>;
-    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>;
+    Statement<M extends Model>(overrides?: Partial<AdapterFlags>): Statement<M, FabricClientAdapter, any, MangoQuery>;
+    Paginator<M extends Model>(query: PreparedStatement<any> | MangoQuery, size: number, clazz: Constructor<M>): Paginator<M, any, MangoQuery>;
+    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<Context<FabricFlags>>;
     /**
      * @description Decodes a Uint8Array to a string
      * @summary Converts binary data received from Fabric to a string using UTF-8 encoding
@@ -86,8 +84,8 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @return {string} The decoded string
      */
     decode(data: Uint8Array): string;
-    repository<R extends Repository<any, Adapter<PeerConfig, Client, FabricQuery, FabricClientContext>>>(): Constructor<R>;
-    protected createPrefix<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: MaybeContextualArg<ContextOf<FabricClientAdapter>>): [Constructor<M>, PrimaryKeyType, Record<string, any>, ...any[], Context];
+    repository<R extends Repository<any, Adapter<PeerConfig, Client, MangoQuery, Context<FabricFlags>>>>(): Constructor<R>;
+    protected createPrefix<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: MaybeContextualArg<Context<FabricFlags>>): [Constructor<M>, PrimaryKeyType, Record<string, any>, ...any[], Context];
     /**
      * @description Prepares multiple records for creation
      * @summary Adds necessary CouchDB fields to multiple records before creation
@@ -97,8 +95,8 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @return A tuple containing the tableName, ids, and prepared records
      * @throws {InternalError} If ids and models arrays have different lengths
      */
-    protected createAllPrefix<M extends Model>(clazz: Constructor<M>, ids: string[] | number[], models: Record<string, any>[], ...args: MaybeContextualArg<ContextOf<FabricClientAdapter>>): any[];
-    protected updateAllPrefix<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: MaybeContextualArg<ContextOf<FabricClientAdapter>>): any[];
+    protected createAllPrefix<M extends Model>(clazz: Constructor<M>, ids: string[] | number[], models: Record<string, any>[], ...args: MaybeContextualArg<Context<FabricFlags>>): any[];
+    protected updateAllPrefix<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: MaybeContextualArg<Context<FabricFlags>>): any[];
     /**
      * @description Creates multiple records in a single transaction
      * @summary Submits a transaction to create multiple records in the Fabric ledger
@@ -108,7 +106,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the created records
      */
-    createAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
+    createAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>[]>;
     /**
      * @description Reads multiple records in a single transaction
      * @summary Submits a transaction to read multiple records from the Fabric ledger
@@ -116,7 +114,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {string[] | number[]} ids - Array of record identifiers to read
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the retrieved records
      */
-    readAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
+    readAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>[]>;
     /**
      * @description Updates multiple records in a single transaction
      * @summary Submits a transaction to update multiple records in the Fabric ledger
@@ -126,7 +124,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the updated records
      */
-    updateAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
+    updateAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], models: Record<string, any>[], ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>[]>;
     /**
      * @description Deletes multiple records in a single transaction
      * @summary Submits a transaction to delete multiple records from the Fabric ledger
@@ -135,7 +133,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {Serializer<any>} serializer - Serializer for the model data
      * @return {Promise<Array<Record<string, any>>>} Promise resolving to the deleted records
      */
-    deleteAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>[]>;
+    deleteAll<M extends Model>(clazz: Constructor<M>, ids: PrimaryKeyType[], ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>[]>;
     /**
      * @description Prepares a model for persistence
      * @summary Converts a model instance into a format suitable for database storage,
@@ -145,20 +143,8 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param pk - The primary key property name
      * @return The prepared data
      */
-    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
-     * and reattaching transient properties
-     * @template M - The model type
-     * @param obj - The database record
-     * @param {string|Constructor<M>} clazz - The model class or name
-     * @param pk - The primary key property name
-     * @param {string|number|bigint} id - The primary key value
-     * @param [transient] - Transient properties to reattach
-     * @return {M} The reconstructed model instance
-     */
-    revert<M extends Model>(obj: Record<string, any>, clazz: Constructor<M>, id: PrimaryKeyType, transient?: Record<string, any>, ...args: ContextualArgs<FabricClientContext>): M;
+    prepare<M extends Model>(model: M, ...args: ContextualArgs<Context<FabricFlags>>): SegregatedModel<M> & PreparedModel;
+    revert<M extends Model>(obj: Record<string, any>, clazz: Constructor<M>, id: PrimaryKeyType, transient?: Record<string, any>, ...args: ContextualArgs<Context<FabricFlags>>): M;
     /**
      * @description Creates indexes for the given models
      * @summary Abstract method that must be implemented to create database indexes for the specified models
@@ -166,7 +152,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {...Constructor<M>} models - The model constructors to create indexes for
      * @return {Promise<void>} A promise that resolves when all indexes are created
      */
-    protected index<M extends Model>(...args: MaybeContextualArg<FabricClientContext, [
+    protected index<M extends Model>(...args: MaybeContextualArg<Context<FabricFlags>, [
         string,
         ...(Constructor<M> | string)[]
     ]>): Promise<void>;
@@ -179,7 +165,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @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<FabricClientContext>): Promise<Record<string, any>>;
+    create<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, transient?: Record<string, any>, ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>>;
     /**
      * @description Reads a single record
      * @summary Evaluates a transaction to read a record from the Fabric ledger
@@ -187,8 +173,8 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {string | number} id - The record identifier
      * @return {Promise<Record<string, any>>} Promise resolving to the retrieved record
      */
-    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[];
+    read<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>>;
+    updatePrefix<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, ...args: MaybeContextualArg<Context<FabricFlags>>): any[];
     /**
      * @description Updates a single record
      * @summary Submits a transaction to update a record in the Fabric ledger
@@ -198,7 +184,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @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<FabricClientContext>): Promise<Record<string, any>>;
+    update<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, model: Record<string, any>, transient?: Record<string, any>, ...args: ContextualArgs<Context<FabricFlags>>): Promise<Record<string, any>>;
     /**
      * @description Deletes a single record
      * @summary Submits a transaction to delete a record from the Fabric ledger
@@ -206,7 +192,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      * @param {string | number} id - The record identifier to delete
      * @return {Promise<Record<string, any>>} Promise resolving to the deleted record
      */
-    delete<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<FabricClientContext>): Promise<Record<string, any>>;
+    delete<M extends Model>(clazz: Constructor<M>, id: PrimaryKeyType, ...args: ContextualArgs<Context<FabricFlags>>): 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
@@ -232,7 +218,7 @@ export declare class FabricClientAdapter extends Adapter<PeerConfig, Client, Fab
      *   FabricAdapter->>FabricAdapter: Process result based on type
      *   FabricAdapter-->>Client: processed result
      */
-    raw<V>(rawInput: FabricQuery, ...args: ContextualArgs<FabricClientContext>): Promise<V>;
+    raw<V, D extends boolean>(rawInput: MangoQuery, docsOnly: D | undefined, clazz: ModelConstructor<any>, ...args: ContextualArgs<Context<FabricFlags>>): 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

package/lib/esm/client/FabricClientAdapter.js

@@ -7,6 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a;
+import "./../shared/overrides/index.js";
 import { CouchDBKeys } from "@decaf-ts/for-couchdb";
 import { Client } from "@grpc/grpc-js";
 import * as grpc from "@grpc/grpc-js";
@@ -15,16 +17,15 @@ import { debug, final, Logging } from "@decaf-ts/logging";
 import { connect, } from "@hyperledger/fabric-gateway";
 import { getIdentity, getSigner } from "./fabric-fs.js";
 import { InternalError, OperationKeys, SerializationError, BulkCrudOperationKeys, NotFoundError, ConflictError, BadRequestError, } from "@decaf-ts/db-decorators";
-import { Context } from "@decaf-ts/db-decorators";
-import { Adapter, AuthorizationError, ConnectionError, ForbiddenError, MigrationError, ObserverError, PagingError, PersistenceKeys, QueryError, UnsupportedError, } from "@decaf-ts/core";
-import { FabricClientRepository } from "./FabricClientRepository.js";
+import { Context, Adapter, AuthorizationError, ConnectionError, ForbiddenError, MigrationError, ObserverError, PagingError, PersistenceKeys, QueryError, UnsupportedError, } from "@decaf-ts/core";
 import { FabricFlavour } from "./../shared/constants.js";
 import { ClientSerializer } from "./../shared/ClientSerializer.js";
 import { HSMSignerFactoryCustom } from "./fabric-hsm.js";
 import { generateModelIndexes, readModelFolders, writeIndexes, } from "./indexes/index.js";
 import { FabricClientStatement } from "./FabricClientStatement.js";
-export class FabricClientContext extends Context {
-}
+import { FabricClientPaginator } from "./FabricClientPaginator.js";
+import { FabricClientRepository } from "./FabricClientRepository.js";
+import { EndorsementError } from "./../shared/errors.js";
 /**
  * @description Adapter for interacting with Hyperledger Fabric networks
  * @summary The FabricAdapter extends CouchDBAdapter to provide a seamless interface for interacting with Hyperledger Fabric networks.
@@ -93,14 +94,17 @@ export class FabricClientAdapter extends Adapter {
         super(config, FabricFlavour, alias);
         this.serializer = FabricClientAdapter.serializer;
     }
-    Statement() {
-        return new FabricClientStatement(this);
+    Statement(overrides) {
+        return new FabricClientStatement(this, overrides);
+    }
+    Paginator(query, size, clazz) {
+        return new FabricClientPaginator(this, query, size, clazz);
     }
     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);
+        return new Context().accumulate(flags);
     }
     /**
      * @description Decodes a Uint8Array to a string
@@ -272,53 +276,24 @@ export class FabricClientAdapter extends Adapter {
         }
         return {
             record: split.model,
+            model: split.model,
             id: model[Model.pk(model.constructor)],
             transient: split.transient,
+            private: split.private,
+            shared: split.shared,
         };
     }
-    /**
-     * @description Converts database data back into a model instance
-     * @summary Reconstructs a model instance from database data, handling column mapping
-     * and reattaching transient properties
-     * @template M - The model type
-     * @param obj - The database record
-     * @param {string|Constructor<M>} clazz - The model class or name
-     * @param pk - The primary key property name
-     * @param {string|number|bigint} id - The primary key value
-     * @param [transient] - Transient properties to reattach
-     * @return {M} The reconstructed model instance
-     */
     revert(obj, clazz, id, transient, ...args) {
-        const { log, ctx } = this.logCtx(args, this.revert);
-        const ob = {};
-        const pk = Model.pk(clazz);
-        ob[pk] = id;
-        const m = new clazz(ob);
-        log.silly(`Rebuilding model ${m.constructor.name} id ${id}`);
-        const metadata = obj[PersistenceKeys.METADATA];
-        const result = Object.keys(m).reduce((accum, key) => {
-            accum[key] = obj[key];
-            return accum;
-        }, m);
-        if (ctx.get("rebuildWithTransient") && transient) {
+        const { log } = this.logCtx(args, this.revert);
+        if (transient) {
             log.verbose(`re-adding transient properties: ${Object.keys(transient).join(", ")}`);
             Object.entries(transient).forEach(([key, val]) => {
-                if (key in result)
-                    throw new InternalError(`Transient property ${key} already exists on model ${m.constructor.name}. should be impossible`);
-                result[key] = val;
+                if (key in obj)
+                    throw new InternalError(`Transient property ${key} already exists on model ${typeof clazz === "string" ? clazz : clazz.name}. should be impossible`);
+                obj[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, PersistenceKeys.METADATA, {
-                enumerable: false,
-                configurable: true,
-                writable: true,
-                value: metadata,
-            });
-        }
-        return result;
+        return new clazz(obj);
     }
     /**
      * @description Creates indexes for the given models
@@ -356,9 +331,8 @@ export class FabricClientAdapter extends Adapter {
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Record<string, any>>} Promise resolving to the created record
      */
-    async create(clazz, id, model, ...args) {
+    async create(clazz, id, model, transient = {}, ...args) {
         const ctxArgs = [...args];
-        const transient = {}; //(ctxArgs.shift() as Record<string, any>) || {}; TODO: Verify
         const { log } = this.logCtx(ctxArgs, this.create);
         const tableName = Model.tableName(clazz);
         log.verbose(`adding entry to ${tableName} table`);
@@ -399,9 +373,8 @@ export class FabricClientAdapter extends Adapter {
      * @param {Record<string, any>} transient - Transient data for the transaction
      * @return {Promise<Record<string, any>>} Promise resolving to the updated record
      */
-    async update(clazz, id, model, ...args) {
+    async update(clazz, id, model, transient = {}, ...args) {
         const ctxArgs = [...args];
-        const transient = {}; //(ctxArgs.shift() as Record<string, any>) || {}; TODO: Verify
         const { log } = this.logCtx(ctxArgs, this.updateAll);
         log.info(`CLIENT UPDATE class : ${typeof clazz}`);
         const tableName = Model.tableName(clazz);
@@ -451,13 +424,13 @@ export class FabricClientAdapter extends Adapter {
      *   FabricAdapter->>FabricAdapter: Process result based on type
      *   FabricAdapter-->>Client: processed result
      */
-    async raw(rawInput, ...args) {
-        const { log, ctxArgs } = this.logCtx(args, this.raw);
-        const tableName = rawInput.class.name;
-        log.info(`Performing prepared statement ${rawInput.method} on table ${Model.tableName(rawInput.class)}`);
+    async raw(rawInput, docsOnly = true, clazz, ...args) {
+        const { log } = this.logCtx(args, this.raw);
+        const tableName = clazz.name;
+        log.info(`Performing raw statement on table ${Model.tableName(clazz)}`);
         let transactionResult;
         try {
-            transactionResult = await this.evaluateTransaction(PersistenceKeys.STATEMENT, [rawInput.method, ...rawInput.args, rawInput.params], undefined, undefined, tableName);
+            transactionResult = await this.evaluateTransaction("raw", [JSON.stringify(rawInput), docsOnly], undefined, undefined, tableName);
         }
         catch (e) {
             throw this.parseError(e);
@@ -785,6 +758,12 @@ export class FabricClientAdapter extends Adapter {
         //   )
         // )
         //   return new UnauthorizedPrivateDataAccess(err) as E;
+        if (err instanceof Error && err.code) {
+            switch (err.code) {
+                case 9:
+                    return new EndorsementError(err);
+            }
+        }
         const msg = typeof err === "string" ? err : err.message;
         if (msg.includes(NotFoundError.name))
             return new NotFoundError(err);
@@ -823,34 +802,34 @@ __decorate([
     debug(),
     final(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object, FabricClientContext]),
+    __metadata("design:paramtypes", [Object, Object, Object, Object, Context]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "create", null);
 __decorate([
     debug(),
     final(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, FabricClientContext]),
+    __metadata("design:paramtypes", [Object, Object, Context]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "read", null);
 __decorate([
     debug(),
     final(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, Object, FabricClientContext]),
+    __metadata("design:paramtypes", [Object, Object, Object, Object, Context]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "update", null);
 __decorate([
     debug(),
     final(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object, FabricClientContext]),
+    __metadata("design:paramtypes", [Object, Object, Context]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "delete", null);
 __decorate([
     debug(),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, FabricClientContext]),
+    __metadata("design:paramtypes", [Object, typeof (_a = typeof D !== "undefined" && D) === "function" ? _a : Object, Object, Context]),
     __metadata("design:returntype", Promise)
 ], FabricClientAdapter.prototype, "raw", null);
 FabricClientAdapter.decoration();