@decaf-ts/for-fabric 0.1.22 → 0.1.24

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

@@ -1,10 +1,9 @@
-import { Condition, ContextOf, MaybeContextualArg, Paginator, Statement } from "@decaf-ts/core";
+import { AdapterFlags, Condition, Statement } from "@decaf-ts/core";
 import { Model } from "@decaf-ts/decorator-validation";
-import { FabricQuery } from "./types";
 import { FabricClientAdapter } from "./FabricClientAdapter";
-export declare class FabricClientStatement<M extends Model, R> extends Statement<M, FabricClientAdapter, R, FabricQuery> {
-    constructor(adapter: FabricClientAdapter);
-    protected build(): FabricQuery;
-    paginate(size?: number, ...args: MaybeContextualArg<ContextOf<FabricClientAdapter>>): Promise<Paginator<M, R, FabricQuery>>;
-    protected parseCondition(condition: Condition<M>): FabricQuery;
+import { MangoQuery } from "@decaf-ts/for-couchdb";
+export declare class FabricClientStatement<M extends Model, R> extends Statement<M, FabricClientAdapter, R, MangoQuery> {
+    constructor(adapter: FabricClientAdapter, overrides?: Partial<AdapterFlags>);
+    protected build(): MangoQuery;
+    protected parseCondition(condition: Condition<M>, ...args: any[]): MangoQuery;
 }

package/lib/esm/client/FabricClientStatement.js

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

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

@@ -1 +1 @@
-{"version":3,"file":"FabricClientStatement.js","sourceRoot":"","sources":["../../../src/client/FabricClientStatement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FabricClientStatement.js","sourceRoot":"","sources":["../../../src/client/FabricClientStatement.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,EACT,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AAKxB,MAAM,OAAO,qBAA0C,SAAQ,SAK9D;IACC,YAAY,OAA4B,EAAE,SAAiC;QACzE,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5B,CAAC;IAEkB,KAAK;QACtB,MAAM,IAAI,gBAAgB,CACxB,2IAA2I,CAC5I,CAAC;IACJ,CAAC;IAEkB,cAAc;IAC/B,6DAA6D;IAC7D,SAAuB;IACvB,6DAA6D;IAC7D,GAAG,IAAW;QAEd,MAAM,IAAI,gBAAgB,CACxB,2IAA2I,CAC5I,CAAC;IACJ,CAAC;CACF"}

package/lib/esm/client/erc20/FabricERC20ClientRepository.d.ts

@@ -1,15 +1,15 @@
 import { FabricClientRepository } from "../FabricClientRepository";
 import { ERC20Token, ERC20Wallet } from "../../contracts/erc20/models";
 import { Model, Serializer } from "@decaf-ts/decorator-validation";
-import { FabricClientAdapter, FabricClientContext } from "../FabricClientAdapter";
-import { ContextualArgs, EventIds } from "@decaf-ts/core";
+import { FabricClientAdapter } from "../FabricClientAdapter";
+import { ContextOf, ContextualArgs, EventIds } from "@decaf-ts/core";
 import { BulkCrudOperationKeys, OperationKeys } from "@decaf-ts/db-decorators";
 import { Constructor } from "@decaf-ts/decoration";
 /**
  * Repository for interacting with ERC20 contracts on a Hyperledger Fabric network.
  * Extends the base FabricClientRepository class and utilizes the ClientSerializer for data serialization.
  */
-export declare class FabricERC20ClientRepository extends FabricClientRepository<ERC20Wallet> {
+export declare class FabricERC20ClientRepository<A extends FabricClientAdapter> extends FabricClientRepository<ERC20Wallet, A> {
     private static serializer;
     protected readonly serializer: Serializer<any>;
     private static decoder;
@@ -23,7 +23,7 @@ export declare class FabricERC20ClientRepository extends FabricClientRepository<
      * @return {Promise<void>} A promise that resolves when all observers have been notified.
      * @throws {InternalError} If the observer handler is not initialized.
      */
-    updateObservers<M extends Model>(table: Constructor<M> | string, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds, ...args: ContextualArgs<FabricClientContext>): Promise<void>;
+    updateObservers<M extends Model>(table: Constructor<M> | string, event: OperationKeys | BulkCrudOperationKeys | string, id: EventIds, ...args: ContextualArgs<ContextOf<A>>): Promise<void>;
     /**
      * Decodes a Uint8Array into a string using the TextDecoder.
      *
@@ -31,7 +31,7 @@ export declare class FabricERC20ClientRepository extends FabricClientRepository<
      * @returns The decoded string.
      */
     decode(data: Uint8Array): string;
-    constructor(adapter?: FabricClientAdapter);
+    constructor(adapter?: A);
     /**
      * Retrieves the name of the ERC20 token.
      *

package/lib/esm/client/erc20/FabricERC20ClientRepository.js.map

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

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

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

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

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

package/lib/esm/contract/Address.d.ts

@@ -0,0 +1,13 @@
+import { Model, type ModelArg } from "@decaf-ts/decorator-validation";
+export declare class Address extends Model {
+    id: number;
+    city: string;
+    street: string;
+    number: number;
+    createdAt: Date;
+    updatedAt: Date;
+    createdBy: string;
+    updatedBy: string;
+    msp: string;
+    constructor(arg?: ModelArg<Address>);
+}

package/lib/esm/contract/Address.js

@@ -0,0 +1,70 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+import { model, Model, required, } from "@decaf-ts/decorator-validation";
+import { column, createdAt, pk, table, createdBy, updatedAt, updatedBy, } from "@decaf-ts/core";
+import { uses } from "@decaf-ts/decoration";
+import { FabricFlavour, ownedBy } from "./../shared/index.js";
+let Address = class Address extends Model {
+    constructor(arg) {
+        super(arg);
+    }
+};
+__decorate([
+    pk(),
+    __metadata("design:type", Number)
+], Address.prototype, "id", void 0);
+__decorate([
+    column(),
+    required(),
+    __metadata("design:type", String)
+], Address.prototype, "city", void 0);
+__decorate([
+    column(),
+    required(),
+    __metadata("design:type", String)
+], Address.prototype, "street", void 0);
+__decorate([
+    column(),
+    required(),
+    __metadata("design:type", Number)
+], Address.prototype, "number", void 0);
+__decorate([
+    column(),
+    createdAt(),
+    __metadata("design:type", Date)
+], Address.prototype, "createdAt", void 0);
+__decorate([
+    column(),
+    updatedAt(),
+    __metadata("design:type", Date)
+], Address.prototype, "updatedAt", void 0);
+__decorate([
+    column(),
+    createdBy(),
+    __metadata("design:type", String)
+], Address.prototype, "createdBy", void 0);
+__decorate([
+    column(),
+    updatedBy(),
+    __metadata("design:type", String)
+], Address.prototype, "updatedBy", void 0);
+__decorate([
+    column(),
+    ownedBy(),
+    __metadata("design:type", String)
+], Address.prototype, "msp", void 0);
+Address = __decorate([
+    uses(FabricFlavour),
+    table(),
+    model(),
+    __metadata("design:paramtypes", [Object])
+], Address);
+export { Address };
+//# sourceMappingURL=Address.js.map

package/lib/esm/contract/Address.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Address.js","sourceRoot":"","sources":["../../../src/contract/Address.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EACL,KAAK,EACL,KAAK,EAEL,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,MAAM,EACN,SAAS,EACT,EAAE,EACF,KAAK,EACL,SAAS,EACT,SAAS,EACT,SAAS,GACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,6BAAwB;AAKlD,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,KAAK;IAoChC,YAAY,GAAuB;QACjC,KAAK,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF,CAAA;AArCC;IADC,EAAE,EAAE;;mCACO;AAIZ;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;qCACG;AAId;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;uCACK;AAIhB;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;uCACK;AAIhB;IAFC,MAAM,EAAE;IACR,SAAS,EAAE;8BACA,IAAI;0CAAC;AAIjB;IAFC,MAAM,EAAE;IACR,SAAS,EAAE;8BACA,IAAI;0CAAC;AAIjB;IAFC,MAAM,EAAE;IACR,SAAS,EAAE;;0CACO;AAInB;IAFC,MAAM,EAAE;IACR,SAAS,EAAE;;0CACO;AAInB;IAFC,MAAM,EAAE;IACR,OAAO,EAAE;;oCACG;AAlCF,OAAO;IAHnB,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,EAAE;IACP,KAAK,EAAE;;GACK,OAAO,CAuCnB"}

package/lib/esm/contract/AddressContract.d.ts

@@ -0,0 +1,5 @@
+import { SerializedCrudContract } from "../contracts/crud/serialized-crud-contract";
+import { Address } from "./Address";
+export declare class AddressContract extends SerializedCrudContract<Address> {
+    constructor();
+}

package/lib/esm/contract/AddressContract.js

@@ -0,0 +1,31 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var AddressContract_1;
+import { Model } from "@decaf-ts/decorator-validation";
+import { Info, Object as FabricObject } from "fabric-contract-api";
+import { BaseModel } from "@decaf-ts/core";
+import { SerializedCrudContract } from "./../contracts/crud/serialized-crud-contract.js";
+import { Address } from "./Address.js";
+FabricObject()(Model);
+FabricObject()(BaseModel);
+let AddressContract = AddressContract_1 = class AddressContract extends SerializedCrudContract {
+    constructor() {
+        super(AddressContract_1.name, Address);
+    }
+};
+AddressContract = AddressContract_1 = __decorate([
+    Info({
+        title: "AddressContract",
+        description: "Contract managing the Addresses",
+    }),
+    __metadata("design:paramtypes", [])
+], AddressContract);
+export { AddressContract };
+//# sourceMappingURL=AddressContract.js.map

package/lib/esm/contract/AddressContract.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AddressContract.js","sourceRoot":"","sources":["../../../src/contract/AddressContract.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,wDAAmD;AACpF,OAAO,EAAE,OAAO,EAAE,qBAAkB;AAEpC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC;AACtB,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC;AAMnB,IAAM,eAAe,uBAArB,MAAM,eAAgB,SAAQ,sBAA+B;IAClE;QACE,KAAK,CAAC,iBAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;CACF,CAAA;AAJY,eAAe;IAJ3B,IAAI,CAAC;QACJ,KAAK,EAAE,iBAAiB;QACxB,WAAW,EAAE,iCAAiC;KAC/C,CAAC;;GACW,eAAe,CAI3B"}

package/lib/esm/contract/index.js

@@ -2,5 +2,10 @@ import { FabricCrudContract } from "./../contracts/crud/crud-contract.js";
 console.log(FabricCrudContract.name);
 import { ProductContract } from "./ProductContract.js";
 import { UserContract } from "./UserContract.js";
-export const contracts = [ProductContract, UserContract];
+import { AddressContract } from "./AddressContract.js";
+export const contracts = [
+    ProductContract,
+    UserContract,
+    AddressContract,
+];
 //# sourceMappingURL=index.js.map

package/lib/esm/contract/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,6CAAwC;AACrE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,YAAY,EAAE,0BAAuB;AAE9C,MAAM,CAAC,MAAM,SAAS,GAAwB,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contract/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,6CAAwC;AACrE,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;AAErC,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,YAAY,EAAE,0BAAuB;AAC9C,OAAO,EAAE,eAAe,EAAE,6BAA0B;AAEpD,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C,eAAe;IACf,YAAY;IACZ,eAAe;CAChB,CAAC"}

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

@@ -2,10 +2,10 @@ import { CouchDBAdapter, MangoQuery } from "@decaf-ts/for-couchdb";
 import { Model } from "@decaf-ts/decorator-validation";
 import { FabricContractFlags } from "./types";
 import { FabricContractContext } from "./ContractContext";
-import { BaseError, Context, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
+import { BaseError, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
 import { Context as Ctx } from "fabric-contract-api";
 import { Logger } from "@decaf-ts/logging";
-import { RelationsMetadata, SequenceOptions, Adapter, PreparedModel, Repository, ContextualizedArgs } from "@decaf-ts/core";
+import { RelationsMetadata, SequenceOptions, Adapter, PreparedModel, Repository, ContextualizedArgs, Context, RawResult } from "@decaf-ts/core";
 import type { ContextualArgs, MaybeContextualArg } from "@decaf-ts/core";
 import { FabricContractRepository } from "./FabricContractRepository";
 import { ChaincodeStub, ClientIdentity, Iterators, StateQueryResponse } from "fabric-shim-api";
@@ -259,7 +259,7 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      *   FabricContractAdapter->>FabricContractAdapter: resultIterator(log, iterator)
      *   FabricContractAdapter-->>Caller: results
      */
-    raw<R>(rawInput: MangoQuery, ...args: ContextualArgs<FabricContractContext>): Promise<R>;
+    raw<R, D extends boolean>(rawInput: MangoQuery, docsOnly?: D, ...args: ContextualArgs<FabricContractContext>): Promise<RawResult<R, D>>;
     Statement<M extends Model>(): FabricStatement<M, any>;
     createAll<M extends Model>(tableName: Constructor<M>, id: PrimaryKeyType[], model: Record<string, any>[], ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>[]>;
     updateAll<M extends Model>(tableName: Constructor<M>, id: PrimaryKeyType[], model: Record<string, any>[], ...args: ContextualArgs<FabricContractContext>): Promise<Record<string, any>[]>;

package/lib/esm/contracts/ContractAdapter.js

@@ -1,9 +1,9 @@
 import { CouchDBAdapter, CouchDBKeys } from "@decaf-ts/for-couchdb";
 import { list, Model, required, type } from "@decaf-ts/decorator-validation";
 import { FabricContractContext } from "./ContractContext.js";
-import { afterAny, BadRequestError, ConflictError, Context, DBKeys, InternalError, NotFoundError, onCreate, onCreateUpdate, onDelete, onUpdate, readonly, SerializationError, } from "@decaf-ts/db-decorators";
+import { afterAny, BadRequestError, ConflictError, DBKeys, InternalError, NotFoundError, onCreate, onCreateUpdate, onDelete, onUpdate, readonly, SerializationError, } from "@decaf-ts/db-decorators";
 import { Object as FabricObject, Property as FabricProperty, } from "fabric-contract-api";
-import { PersistenceKeys, UnsupportedError, Adapter, oneToManyOnUpdate, relation, QueryError, PagingError, MigrationError, ObserverError, AuthorizationError, ForbiddenError, ConnectionError, } from "@decaf-ts/core";
+import { PersistenceKeys, UnsupportedError, Adapter, oneToManyOnUpdate, relation, QueryError, PagingError, MigrationError, ObserverError, AuthorizationError, ForbiddenError, ConnectionError, Context, } from "@decaf-ts/core";
 import { FabricContractRepository } from "./FabricContractRepository.js";
 import { FabricStatement } from "./FabricContractStatement.js";
 import { FabricFlavour } from "./../shared/constants.js";
@@ -364,17 +364,26 @@ export class FabricContractAdapter extends CouchDBAdapter {
         catch (e) {
             throw new SerializationError(`Failed to serialize record with id ${id}: ${e}`);
         }
-        await stub.putState(id.toString(), data);
-        log.silly(`state stored under id ${id}`);
+        const collection = ctx.get("segregated");
+        if (collection)
+            await stub.putPrivateData(collection, id.toString(), data);
+        else
+            await stub.putState(id.toString(), data);
+        log.silly(`state stored${collection ? ` in ${collection} collection` : ""} under id ${id}`);
         return model;
     }
     async readState(id, ctx) {
         let result;
         const { stub, log } = this.logCtx([ctx], this.readState);
-        const res = (await stub.getState(id)).toString();
+        let res;
+        const collection = ctx.get("segregated");
+        if (collection)
+            res = (await stub.getPrivateData(collection, id.toString())).toString();
+        else
+            res = (await stub.getState(id.toString())).toString();
         if (!res)
-            throw new NotFoundError(`Record with id ${id} not found`);
-        log.silly(`Read state for id ${id}`);
+            throw new NotFoundError(`Record with id ${id}${collection ? ` in ${collection} collection` : ""} not found`);
+        log.silly(`state retrieved from${collection ? ` ${collection} collection` : ""} under id ${id}`);
         try {
             result = FabricContractAdapter.serializer.deserialize(res.toString());
         }
@@ -383,15 +392,37 @@ export class FabricContractAdapter extends CouchDBAdapter {
         }
         return result;
     }
-    async queryResult(stub, rawInput, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    ...args) {
-        return (await stub.getQueryResult(JSON.stringify(rawInput)));
-    }
-    async queryResultPaginated(stub, rawInput, limit = 250, skip, 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    ...args) {
-        return (await stub.getQueryResultWithPagination(JSON.stringify(rawInput), limit, skip?.toString()));
+    async queryResult(stub, rawInput, ...args) {
+        const { ctx } = this.logCtx(args, this.readState);
+        let res;
+        const collection = ctx.get("segregated");
+        if (collection)
+            res = await stub.getPrivateDataQueryResult(collection, JSON.stringify(rawInput));
+        else
+            res = await stub.getQueryResult(JSON.stringify(rawInput));
+        return res;
+    }
+    async queryResultPaginated(stub, rawInput, limit = 250, skip, ...args) {
+        const { ctx } = this.logCtx(args, this.readState);
+        let res;
+        const collection = ctx.get("segregated");
+        if (collection) {
+            rawInput.selector = {
+                ...rawInput.selector,
+                _id: skip ? { $gt: skip.toString() } : { $gte: "" },
+            };
+            const it = await stub.getPrivateDataQueryResult(collection, JSON.stringify(rawInput));
+            res = {
+                iterator: it,
+                metadata: {
+                    fetchedRecordsCount: limit,
+                    bookmark: "",
+                },
+            };
+        }
+        else
+            res = await stub.getQueryResultWithPagination(JSON.stringify(rawInput), limit, skip?.toString());
+        return res;
     }
     mergeModels(results) {
         const extract = (model) => Object.entries(model).reduce((accum, [key, val]) => {
@@ -427,6 +458,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
     async flags(operation, model, flags, ctx, ...args) {
         const baseFlags = {
             stub: ctx.stub,
+            segregated: false,
         };
         if (ctx instanceof FabricContractContext) {
             Object.assign(baseFlags, {
@@ -544,9 +576,10 @@ export class FabricContractAdapter extends CouchDBAdapter {
      *   FabricContractAdapter->>FabricContractAdapter: resultIterator(log, iterator)
      *   FabricContractAdapter-->>Caller: results
      */
-    async raw(rawInput, ...args) {
-        const { log, ctxArgs, stub } = this.logCtx(args, this.raw);
-        const docsOnly = typeof ctxArgs[0] === "boolean" ? ctxArgs.shift() : false;
+    async raw(rawInput, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    docsOnly = true, ...args) {
+        const { log, stub } = this.logCtx(args, this.raw);
         const { skip, limit } = rawInput;
         let iterator;
         if (limit || skip) {
@@ -562,7 +595,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
         }
         log.debug("Iterator acquired");
         const results = (await this.resultIterator(log, iterator));
-        log.debug(`returning {0} results`, `${Array.isArray(results) ? results.length : 1}`);
+        log.debug(`returning ${Array.isArray(results) ? results.length : 1} results`);
         return results;
     }
     Statement() {