@decaf-ts/for-fabric 0.1.74 → 0.1.76

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

@@ -30,7 +30,7 @@ export declare class CoreUtils {
      * @param {string|Buffer} contentOrPath - Path to a file on disk or an already-loaded Buffer
      * @return {Promise<string|Uint8Array|Buffer>} The file content as a Buffer/string depending on reader
      */
-    static readFile(contentOrPath: string | Buffer): Promise<Buffer<ArrayBufferLike>>;
+    static readFile(contentOrPath: string | Buffer): Promise<NonSharedBuffer>;
     /**
      * @description Create a Fabric CA User object with enrollment
      * @summary Constructs a fabric-common User, sets a crypto suite, imports the provided private key, and sets enrollment with certificate and MSP ID.

package/lib/esm/contract/Product.js

@@ -19,7 +19,7 @@ let Product = class Product extends FabricIdentifiedBaseModel {
     }
 };
 __decorate([
-    pk({ type: "Number", generated: true }),
+    pk({ type: Number, generated: true }),
     __metadata("design:type", Number)
 ], Product.prototype, "productCode", void 0);
 __decorate([

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

@@ -1 +1 @@
-{"version":3,"file":"Product.js","sourceRoot":"","sources":["../../../src/contract/Product.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAiB,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,iCAA4B;AACpD,OAAO,EAAE,yBAAyB,EAAE,uDAAkD;AACtF,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAKrC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,yBAAyB;IAQpD,YAAY,IAAwB;QAClC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACF,CAAA;AATC;IADC,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;4CACnB;AAIrB;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;6CACW;AANX,OAAO;IAHnB,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,EAAE;IACP,KAAK,EAAE;;GACK,OAAO,CAWnB"}
+{"version":3,"file":"Product.js","sourceRoot":"","sources":["../../../src/contract/Product.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAiB,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,iCAA4B;AACpD,OAAO,EAAE,yBAAyB,EAAE,uDAAkD;AACtF,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAKrC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,yBAAyB;IAQpD,YAAY,IAAwB;QAClC,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACF,CAAA;AATC;IADC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;4CACjB;AAIrB;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;6CACW;AANX,OAAO;IAHnB,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,EAAE;IACP,KAAK,EAAE;;GACK,OAAO,CAWnB"}

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

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

package/lib/esm/contract/SegregatedPrivateDocumentContract.js

@@ -0,0 +1,27 @@
+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 SegregatedPrivateDocumentContract_1;
+import { Info } from "fabric-contract-api";
+import { SerializedCrudContract } from "./../contracts/crud/serialized-crud-contract.js";
+import { SegregatedPrivateDocument } from "./models/SegregatedDocument.js";
+let SegregatedPrivateDocumentContract = SegregatedPrivateDocumentContract_1 = class SegregatedPrivateDocumentContract extends SerializedCrudContract {
+    constructor() {
+        super(SegregatedPrivateDocumentContract_1.name, SegregatedPrivateDocument);
+    }
+};
+SegregatedPrivateDocumentContract = SegregatedPrivateDocumentContract_1 = __decorate([
+    Info({
+        title: "SegregatedPrivateDocumentContract",
+        description: "Handles CRUD for documents split across segregated private collections.",
+    }),
+    __metadata("design:paramtypes", [])
+], SegregatedPrivateDocumentContract);
+export { SegregatedPrivateDocumentContract };
+//# sourceMappingURL=SegregatedPrivateDocumentContract.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SegregatedPrivateDocumentContract.js","sourceRoot":"","sources":["../../../src/contract/SegregatedPrivateDocumentContract.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,wDAAmD;AACpF,OAAO,EAAE,yBAAyB,EAAE,uCAAoC;AAMjE,IAAM,iCAAiC,yCAAvC,MAAM,iCAAkC,SAAQ,sBAEtD;IACC;QACE,KAAK,CACH,mCAAiC,CAAC,IAAI,EACtC,yBAAyB,CAC1B,CAAC;IACJ,CAAC;CACF,CAAA;AATY,iCAAiC;IAJ7C,IAAI,CAAC;QACJ,KAAK,EAAE,mCAAmC;QAC1C,WAAW,EAAE,yEAAyE;KACvF,CAAC;;GACW,iCAAiC,CAS7C"}

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

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

package/lib/esm/contract/SegregatedSharedDocumentContract.js

@@ -0,0 +1,27 @@
+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 SegregatedSharedDocumentContract_1;
+import { Info } from "fabric-contract-api";
+import { SerializedCrudContract } from "./../contracts/crud/serialized-crud-contract.js";
+import { SegregatedSharedDocument } from "./models/SegregatedDocument.js";
+let SegregatedSharedDocumentContract = SegregatedSharedDocumentContract_1 = class SegregatedSharedDocumentContract extends SerializedCrudContract {
+    constructor() {
+        super(SegregatedSharedDocumentContract_1.name, SegregatedSharedDocument);
+    }
+};
+SegregatedSharedDocumentContract = SegregatedSharedDocumentContract_1 = __decorate([
+    Info({
+        title: "SegregatedSharedDocumentContract",
+        description: "Handles CRUD for documents split across segregated shared collections.",
+    }),
+    __metadata("design:paramtypes", [])
+], SegregatedSharedDocumentContract);
+export { SegregatedSharedDocumentContract };
+//# sourceMappingURL=SegregatedSharedDocumentContract.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SegregatedSharedDocumentContract.js","sourceRoot":"","sources":["../../../src/contract/SegregatedSharedDocumentContract.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,sBAAsB,EAAE,wDAAmD;AACpF,OAAO,EAAE,wBAAwB,EAAE,uCAAoC;AAMhE,IAAM,gCAAgC,wCAAtC,MAAM,gCAAiC,SAAQ,sBAErD;IACC;QACE,KAAK,CACH,kCAAgC,CAAC,IAAI,EACrC,wBAAwB,CACzB,CAAC;IACJ,CAAC;CACF,CAAA;AATY,gCAAgC;IAJ5C,IAAI,CAAC;QACJ,KAAK,EAAE,kCAAkC;QACzC,WAAW,EAAE,wEAAwE;KACtF,CAAC;;GACW,gCAAgC,CAS5C"}

package/lib/esm/contract/User.js

@@ -17,7 +17,7 @@ let User = class User extends Model {
     }
 };
 __decorate([
-    pk({ type: "Number", generated: true }),
+    pk({ type: Number, generated: true }),
     __metadata("design:type", Number)
 ], User.prototype, "id", void 0);
 __decorate([

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

@@ -1 +1 @@
-{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/contract/User.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,iCAA4B;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAKrC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,KAAK;IAO7B,YAAY,IAAqB;QAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACF,CAAA;AARC;IADC,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;gCAC5B;AAGZ;IADC,MAAM,EAAE;;kCACK;AALH,IAAI;IAHhB,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,EAAE;IACP,KAAK,EAAE;;GACK,IAAI,CAUhB"}
+{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../src/contract/User.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,iCAA4B;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAKrC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,KAAK;IAO7B,YAAY,IAAqB;QAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACF,CAAA;AARC;IADC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;;gCAC1B;AAGZ;IADC,MAAM,EAAE;;kCACK;AALH,IAAI;IAHhB,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,EAAE;IACP,KAAK,EAAE;;GACK,IAAI,CAUhB"}

package/lib/esm/contract/index.js

@@ -5,11 +5,15 @@ import { BatchContract } from "./BatchContract.js";
 import { UserContract } from "./UserContract.js";
 import { AddressContract } from "./AddressContract.js";
 import { OtherProductSharedContract } from "./OtherProductSharedContract.js";
+import { SegregatedPrivateDocumentContract } from "./SegregatedPrivateDocumentContract.js";
+import { SegregatedSharedDocumentContract } from "./SegregatedSharedDocumentContract.js";
 export const contracts = [
     ProductContract,
     BatchContract,
     UserContract,
     AddressContract,
     OtherProductSharedContract,
+    SegregatedPrivateDocumentContract,
+    SegregatedSharedDocumentContract,
 ];
 //# 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,aAAa,EAAE,2BAAwB;AAChD,OAAO,EAAE,YAAY,EAAE,0BAAuB;AAC9C,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,0BAA0B,EAAE,wCAAqC;AAE1E,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C,eAAe;IACf,aAAa;IACb,YAAY;IACZ,eAAe;IACf,0BAA0B;CAC3B,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,aAAa,EAAE,2BAAwB;AAChD,OAAO,EAAE,YAAY,EAAE,0BAAuB;AAC9C,OAAO,EAAE,eAAe,EAAE,6BAA0B;AACpD,OAAO,EAAE,0BAA0B,EAAE,wCAAqC;AAC1E,OAAO,EAAE,iCAAiC,EAAE,+CAA4C;AACxF,OAAO,EAAE,gCAAgC,EAAE,8CAA2C;AAEtF,MAAM,CAAC,MAAM,SAAS,GAAwB;IAC5C,eAAe;IACf,aAAa;IACb,YAAY;IACZ,eAAe;IACf,0BAA0B;IAC1B,iCAAiC;IACjC,gCAAgC;CACjC,CAAC"}

package/lib/esm/contract/models/Market.js

@@ -21,7 +21,7 @@ let Market = class Market extends BaseIdentifiedModel {
     }
 };
 __decorate([
-    pk({ type: "String", generated: false }),
+    pk({ type: String, generated: false }),
     composed(["productCode", "marketId"], ":", true),
     description("Unique identifier composed of product code and market ID."),
     __metadata("design:type", String)

package/lib/esm/contract/models/Market.js.map

@@ -1 +1 @@
-{"version":3,"file":"Market.js","sourceRoot":"","sources":["../../../../src/contract/models/Market.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EACL,SAAS,EACT,SAAS,EACT,KAAK,EACL,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,uBAAoB;AACzC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,IAAI,EAAE,kBAAe;AAC9B,OAAO,EAAE,aAAa,EAAE,gCAA2B;AAM5C,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,mBAAmB;IA2C7C,YAAY,KAAwB;QAClC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF,CAAA;AA1CC;IAHC,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACxC,QAAQ,CAAC,CAAC,aAAa,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC;IAChD,WAAW,CAAC,2DAA2D,CAAC;;kCAC7D;AAQZ;IANC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CACV,mEAAmE,CACpE;;wCACiB;AAKlB;IAHC,MAAM,EAAE;IACR,IAAI,EAAE;IACN,QAAQ,EAAE;;2CACU;AAQrB;IANC,MAAM,EAAE;IACR,SAAS,CAAC,CAAC,CAAC;IACZ,SAAS,CAAC,CAAC,CAAC;IACZ,WAAW,CACV,0EAA0E,CAC3E;;4CACqB;AAItB;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,mDAAmD,CAAC;;uCAChD;AAMjB;IAJC,MAAM,EAAE;IACR,WAAW,CACV,sEAAsE,CACvE;;+CACwB;AAMzB;IAJC,MAAM,EAAE;IACR,WAAW,CACV,4EAA4E,CAC7E;;0CACmB;AAzCT,MAAM;IAJlB,WAAW,CAAC,uCAAuC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;IACxB,KAAK,EAAE;;GACK,MAAM,CA8ClB"}
+{"version":3,"file":"Market.js","sourceRoot":"","sources":["../../../../src/contract/models/Market.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EACL,SAAS,EACT,SAAS,EACT,KAAK,EACL,QAAQ,GACT,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,uBAAoB;AACzC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,IAAI,EAAE,kBAAe;AAC9B,OAAO,EAAE,aAAa,EAAE,gCAA2B;AAM5C,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,mBAAmB;IA2C7C,YAAY,KAAwB;QAClC,KAAK,CAAC,KAAK,CAAC,CAAC;IACf,CAAC;CACF,CAAA;AA1CC;IAHC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACtC,QAAQ,CAAC,CAAC,aAAa,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC;IAChD,WAAW,CAAC,2DAA2D,CAAC;;kCAC7D;AAQZ;IANC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IAC/C,WAAW,CACV,mEAAmE,CACpE;;wCACiB;AAKlB;IAHC,MAAM,EAAE;IACR,IAAI,EAAE;IACN,QAAQ,EAAE;;2CACU;AAQrB;IANC,MAAM,EAAE;IACR,SAAS,CAAC,CAAC,CAAC;IACZ,SAAS,CAAC,CAAC,CAAC;IACZ,WAAW,CACV,0EAA0E,CAC3E;;4CACqB;AAItB;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,mDAAmD,CAAC;;uCAChD;AAMjB;IAJC,MAAM,EAAE;IACR,WAAW,CACV,sEAAsE,CACvE;;+CACwB;AAMzB;IAJC,MAAM,EAAE;IACR,WAAW,CACV,4EAA4E,CAC7E;;0CACmB;AAzCT,MAAM;IAJlB,WAAW,CAAC,uCAAuC,CAAC;IACpD,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;IACxB,KAAK,EAAE;;GACK,MAAM,CA8ClB"}

package/lib/esm/contract/models/OtherProductShared.js

@@ -8,13 +8,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { model, required } from "@decaf-ts/decorator-validation";
-import { column, index, OrderDirection, pk, table, } from "@decaf-ts/core";
+import { column, index, OrderDirection, pk, table } from "@decaf-ts/core";
 // import {BlockOperations, OperationKeys, readonly} from "@decaf-ts/db-decorators";
 import { uses } from "@decaf-ts/decoration";
 import { BaseIdentifiedModel } from "./BaseIdentifiedModel.js";
 import { gtin } from "./gtin.js";
 import { audit } from "./decorators.js";
-import { FabricFlavour, mirror, ModelCollection, ownedBy, sharedData, } from "./../../shared/index.js";
+import { FabricFlavour, mirror, NamespaceCollection, ownedBy, sharedData, } from "./../../shared/index.js";
 import { version } from "@decaf-ts/db-decorators";
 let OtherProductShared = class OtherProductShared extends BaseIdentifiedModel {
     constructor(args) {
@@ -25,7 +25,7 @@ let OtherProductShared = class OtherProductShared extends BaseIdentifiedModel {
 __decorate([
     pk(),
     gtin(),
-    mirror("ptp-product", (mspId) => mspId === "org-c"),
+    mirror("mirror-collection", (mspId) => mspId === "main-org"),
     audit(OtherProductShared),
     __metadata("design:type", String)
 ], OtherProductShared.prototype, "productCode", void 0);
@@ -60,7 +60,7 @@ __decorate([
     __metadata("design:type", String)
 ], OtherProductShared.prototype, "ownedBy", void 0);
 OtherProductShared = __decorate([
-    sharedData(ModelCollection),
+    sharedData(NamespaceCollection("decaf-namespace")),
     uses(FabricFlavour)
     // @BlockOperations([OperationKeys.DELETE])
     ,

package/lib/esm/contract/models/OtherProductShared.js.map

@@ -1 +1 @@
-{"version":3,"file":"OtherProductShared.js","sourceRoot":"","sources":["../../../../src/contract/models/OtherProductShared.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EACL,MAAM,EAEN,KAAK,EACL,cAAc,EACd,EAAE,EACF,KAAK,GACN,MAAM,gBAAgB,CAAC;AACxB,oFAAoF;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,IAAI,EAAE,kBAAe;AAE9B,OAAO,EAAE,KAAK,EAAE,wBAAqB;AACrC,OAAO,EACL,aAAa,EACb,MAAM,EACN,eAAe,EACf,OAAO,EACP,UAAU,GACX,gCAA2B;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAO3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,mBAAmB;IAgEzD,YAAY,IAAmC;QAC7C,KAAK,CAAC,IAAI,CAAC,CAAC;QA3Cd,kBAAa,GAAY,KAAK,CAAC;IA4C/B,CAAC;CACF,CAAA;AA9DC;IAJC,EAAE,EAAE;IACJ,IAAI,EAAE;IACN,MAAM,CAAC,aAAa,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,OAAO,CAAC;IAC3D,KAAK,CAAC,kBAAkB,CAAC;;uDACL;AAKrB;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;wDAC1B;AAKtB;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;gEAClB;AAG9B;IADC,MAAM,EAAE;;gEACqB;AAI9B;IAFC,MAAM,EAAE;IACR,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;yDACjB;AAsB/B;IADC,OAAO,EAAE;;mDACO;AAkBjB;IAFC,MAAM,EAAE;IACR,OAAO,EAAE;;mDACO;AA9DN,kBAAkB;IAL9B,UAAU,CAAC,eAAe,CAAC;IAC3B,IAAI,CAAC,aAAa,CAAC;IACpB,2CAA2C;;IAC1C,KAAK,CAAC,sBAAsB,CAAC;IAC7B,KAAK,EAAE;;GACK,kBAAkB,CAmE9B"}
+{"version":3,"file":"OtherProductShared.js","sourceRoot":"","sources":["../../../../src/contract/models/OtherProductShared.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC1E,oFAAoF;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAC5D,OAAO,EAAE,IAAI,EAAE,kBAAe;AAC9B,OAAO,EAAE,KAAK,EAAE,wBAAqB;AACrC,OAAO,EACL,aAAa,EACb,MAAM,EACN,mBAAmB,EACnB,OAAO,EACP,UAAU,GACX,gCAA2B;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAO3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,mBAAmB;IAgEzD,YAAY,IAAmC;QAC7C,KAAK,CAAC,IAAI,CAAC,CAAC;QA3Cd,kBAAa,GAAY,KAAK,CAAC;IA4C/B,CAAC;CACF,CAAA;AA9DC;IAJC,EAAE,EAAE;IACJ,IAAI,EAAE;IACN,MAAM,CAAC,mBAAmB,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,KAAK,UAAU,CAAC;IACpE,KAAK,CAAC,kBAAkB,CAAC;;uDACL;AAKrB;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;wDAC1B;AAKtB;IAHC,MAAM,EAAE;IACR,QAAQ,EAAE;IACV,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;gEAClB;AAG9B;IADC,MAAM,EAAE;;gEACqB;AAI9B;IAFC,MAAM,EAAE;IACR,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;yDACjB;AAsB/B;IADC,OAAO,EAAE;;mDACO;AAkBjB;IAFC,MAAM,EAAE;IACR,OAAO,EAAE;;mDACO;AA9DN,kBAAkB;IAL9B,UAAU,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAClD,IAAI,CAAC,aAAa,CAAC;IACpB,2CAA2C;;IAC1C,KAAK,CAAC,sBAAsB,CAAC;IAC7B,KAAK,EAAE;;GACK,kBAAkB,CAmE9B"}

package/lib/esm/contract/models/SegregatedDocument.d.ts

@@ -0,0 +1,18 @@
+import type { ModelArg } from "@decaf-ts/decorator-validation";
+import { BaseIdentifiedModel } from "./BaseIdentifiedModel";
+export declare class SegregatedPrivateDocument extends BaseIdentifiedModel {
+    id: string;
+    title: string;
+    privateNoteA?: string;
+    privateNoteB?: string;
+    owner?: string;
+    constructor(args?: ModelArg<SegregatedPrivateDocument>);
+}
+export declare class SegregatedSharedDocument extends BaseIdentifiedModel {
+    id: string;
+    name: string;
+    sharedNoteA?: string;
+    sharedNoteB?: string;
+    owner?: string;
+    constructor(args?: ModelArg<SegregatedSharedDocument>);
+}

package/lib/esm/contract/models/SegregatedDocument.js

@@ -0,0 +1,91 @@
+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, required } from "@decaf-ts/decorator-validation";
+import { column, pk, table } from "@decaf-ts/core";
+import { uses } from "@decaf-ts/decoration";
+import { FabricFlavour, ownedBy, privateData, sharedData, } from "./../../shared/index.js";
+import { BaseIdentifiedModel } from "./BaseIdentifiedModel.js";
+const PRIVATE_COLLECTION_A = "segregatedPrivateCollectionA";
+const PRIVATE_COLLECTION_B = "segregatedPrivateCollectionB";
+const SHARED_COLLECTION_A = "segregatedSharedCollectionA";
+const SHARED_COLLECTION_B = "segregatedSharedCollectionB";
+let SegregatedPrivateDocument = class SegregatedPrivateDocument extends BaseIdentifiedModel {
+    constructor(args) {
+        super(args);
+    }
+};
+__decorate([
+    pk(),
+    __metadata("design:type", String)
+], SegregatedPrivateDocument.prototype, "id", void 0);
+__decorate([
+    column(),
+    required(),
+    __metadata("design:type", String)
+], SegregatedPrivateDocument.prototype, "title", void 0);
+__decorate([
+    column(),
+    privateData(PRIVATE_COLLECTION_A),
+    __metadata("design:type", String)
+], SegregatedPrivateDocument.prototype, "privateNoteA", void 0);
+__decorate([
+    column(),
+    privateData(PRIVATE_COLLECTION_B),
+    __metadata("design:type", String)
+], SegregatedPrivateDocument.prototype, "privateNoteB", void 0);
+__decorate([
+    column(),
+    ownedBy(),
+    __metadata("design:type", String)
+], SegregatedPrivateDocument.prototype, "owner", void 0);
+SegregatedPrivateDocument = __decorate([
+    uses(FabricFlavour),
+    table("segregated_private_document"),
+    model(),
+    __metadata("design:paramtypes", [Object])
+], SegregatedPrivateDocument);
+export { SegregatedPrivateDocument };
+let SegregatedSharedDocument = class SegregatedSharedDocument extends BaseIdentifiedModel {
+    constructor(args) {
+        super(args);
+    }
+};
+__decorate([
+    pk(),
+    __metadata("design:type", String)
+], SegregatedSharedDocument.prototype, "id", void 0);
+__decorate([
+    column(),
+    required(),
+    __metadata("design:type", String)
+], SegregatedSharedDocument.prototype, "name", void 0);
+__decorate([
+    column(),
+    sharedData(SHARED_COLLECTION_A),
+    __metadata("design:type", String)
+], SegregatedSharedDocument.prototype, "sharedNoteA", void 0);
+__decorate([
+    column(),
+    sharedData(SHARED_COLLECTION_B),
+    __metadata("design:type", String)
+], SegregatedSharedDocument.prototype, "sharedNoteB", void 0);
+__decorate([
+    column(),
+    ownedBy(),
+    __metadata("design:type", String)
+], SegregatedSharedDocument.prototype, "owner", void 0);
+SegregatedSharedDocument = __decorate([
+    uses(FabricFlavour),
+    table("segregated_shared_document"),
+    model(),
+    __metadata("design:paramtypes", [Object])
+], SegregatedSharedDocument);
+export { SegregatedSharedDocument };
+//# sourceMappingURL=SegregatedDocument.js.map

package/lib/esm/contract/models/SegregatedDocument.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SegregatedDocument.js","sourceRoot":"","sources":["../../../../src/contract/models/SegregatedDocument.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,OAAO,EACP,WAAW,EACX,UAAU,GACX,gCAA2B;AAC5B,OAAO,EAAE,mBAAmB,EAAE,iCAA8B;AAE5D,MAAM,oBAAoB,GAAG,8BAA8B,CAAC;AAC5D,MAAM,oBAAoB,GAAG,8BAA8B,CAAC;AAC5D,MAAM,mBAAmB,GAAG,6BAA6B,CAAC;AAC1D,MAAM,mBAAmB,GAAG,6BAA6B,CAAC;AAKnD,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,mBAAmB;IAoBhE,YAAY,IAA0C;QACpD,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACF,CAAA;AArBC;IADC,EAAE,EAAE;;qDACO;AAIZ;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;wDACI;AAIf;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,oBAAoB,CAAC;;+DACZ;AAItB;IAFC,MAAM,EAAE;IACR,WAAW,CAAC,oBAAoB,CAAC;;+DACZ;AAItB;IAFC,MAAM,EAAE;IACR,OAAO,EAAE;;wDACK;AAlBJ,yBAAyB;IAHrC,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,6BAA6B,CAAC;IACpC,KAAK,EAAE;;GACK,yBAAyB,CAuBrC;;AAKM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,mBAAmB;IAoB/D,YAAY,IAAyC;QACnD,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;CACF,CAAA;AArBC;IADC,EAAE,EAAE;;oDACO;AAIZ;IAFC,MAAM,EAAE;IACR,QAAQ,EAAE;;sDACG;AAId;IAFC,MAAM,EAAE;IACR,UAAU,CAAC,mBAAmB,CAAC;;6DACX;AAIrB;IAFC,MAAM,EAAE;IACR,UAAU,CAAC,mBAAmB,CAAC;;6DACX;AAIrB;IAFC,MAAM,EAAE;IACR,OAAO,EAAE;;uDACK;AAlBJ,wBAAwB;IAHpC,IAAI,CAAC,aAAa,CAAC;IACnB,KAAK,CAAC,4BAA4B,CAAC;IACnC,KAAK,EAAE;;GACK,wBAAwB,CAuBpC"}

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

@@ -1,4 +1,4 @@
-import { CouchDBAdapter, MangoQuery } from "@decaf-ts/for-couchdb";
+import { CouchDBAdapter, MangoQuery, ViewResponse } from "@decaf-ts/for-couchdb";
 import { Model } from "@decaf-ts/decorator-validation";
 import { FabricContractFlags } from "./types";
 import { FabricContractContext } from "./ContractContext";
@@ -151,8 +151,14 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
     protected deleteState(id: string, context: FabricContractContext): Promise<void>;
     forPrivate(collection: string): FabricContractAdapter;
     protected putState(id: string, model: Record<string, any>, ctx: FabricContractContext): Promise<Record<string, any>>;
+    private flushSegregatedWrites;
+    private buildSegregatedPayload;
+    private mergeSegregatedReads;
+    private readPrivateRecord;
+    private deleteSegregatedCollections;
     protected readState(id: string, ctx: FabricContractContext): Promise<any>;
     protected queryResult(stub: ChaincodeStub, rawInput: any, ...args: ContextualArgs<FabricContractContext>): Promise<Iterators.StateQueryIterator>;
+    private createRowsIterator;
     protected queryResultPaginated(stub: ChaincodeStub, rawInput: any, limit?: number, page?: number, bookmark?: string | number, ...args: any[]): Promise<StateQueryResponse<Iterators.StateQueryIterator>>;
     protected mergeModels(results: Record<string, any>[]): Record<string, any>;
     /**
@@ -236,6 +242,7 @@ export declare class FabricContractAdapter extends CouchDBAdapter<any, void, Fab
      *   FabricContractAdapter-->>Caller: results
      */
     raw<R, D extends boolean>(rawInput: MangoQuery, docsOnly?: D, ...args: ContextualArgs<FabricContractContext>): Promise<RawResult<R, D>>;
+    view<R>(ddoc: string, viewName: string, options: Record<string, any>, ..._args: ContextualArgs<FabricContractContext>): Promise<ViewResponse<R>>;
     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,4 +1,4 @@
-import { CouchDBAdapter, CouchDBKeys } from "@decaf-ts/for-couchdb";
+import { CouchDBAdapter, CouchDBKeys, } from "@decaf-ts/for-couchdb";
 import { Model, ValidationKeys } from "@decaf-ts/decorator-validation";
 import { FabricContractContext } from "./ContractContext.js";
 import { BadRequestError, ConflictError, InternalError, NotFoundError, onCreate, onCreateUpdate, SerializationError, } from "@decaf-ts/db-decorators";
@@ -169,6 +169,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
         try {
             const composedKey = ctx.stub.createCompositeKey(tableName, [String(id)]);
             model = await this.readState(composedKey, ctx);
+            model = await this.mergeSegregatedReads(ctx, composedKey, model);
         }
         catch (e) {
             throw this.parseError(e);
@@ -215,6 +216,7 @@ export class FabricContractAdapter extends CouchDBAdapter {
             model = await this.read(clazz, id, ...ctxArgs);
             log.verbose(`deleting entry with pk ${id} from ${tableName} table`);
             await this.deleteState(composedKey, ctx);
+            await this.deleteSegregatedCollections(ctx, composedKey);
         }
         catch (e) {
             throw this.parseError(e);
@@ -223,7 +225,11 @@ export class FabricContractAdapter extends CouchDBAdapter {
     }
     async deleteState(id, context) {
         const { ctx } = this.logCtx([context], this.deleteState);
-        await ctx.stub.deleteState(id);
+        const collection = ctx.getOrUndefined("segregated");
+        if (collection)
+            await ctx.stub.deletePrivateData(collection, id);
+        else
+            await ctx.stub.deleteState(id);
     }
     forPrivate(collection) {
         const toOverride = [
@@ -241,17 +247,30 @@ export class FabricContractAdapter extends CouchDBAdapter {
                     async apply(fn, thisArg, argsList) {
                         switch (prop) {
                             case "putState": {
-                                const [stub, id, model] = argsList;
-                                await stub.putPrivateData(collection, id.toString(), model);
+                                // putState signature: (id: string, model: Record<string, any>, ctx: FabricContractContext)
+                                const [id, model, ctx] = argsList;
+                                const data = Buffer.from(FabricContractAdapter.serializer.serialize(model, false));
+                                await ctx.stub.putPrivateData(collection, id.toString(), data);
                                 return model;
                             }
                             case "deleteState": {
-                                const [stub, id] = argsList;
-                                return stub.deletePrivateData(collection, id);
+                                // deleteState signature: (id: string, context: FabricContractContext)
+                                const [id, ctx] = argsList;
+                                await ctx.stub.deletePrivateData(collection, id.toString());
+                                return;
                             }
                             case "readState": {
-                                const [stub, id] = argsList;
-                                return stub.getPrivateData(collection, id);
+                                // readState signature: (id: string, ctx: FabricContractContext)
+                                const [id, ctx] = argsList;
+                                const data = await ctx.stub.getPrivateData(collection, id);
+                                if (!data)
+                                    return "";
+                                try {
+                                    return FabricContractAdapter.serializer.deserialize(data.toString("utf8"));
+                                }
+                                catch {
+                                    return data.toString("utf8");
+                                }
                             }
                             case "queryResult": {
                                 const [stub, rawInput] = argsList;
@@ -322,14 +341,98 @@ export class FabricContractAdapter extends CouchDBAdapter {
         catch (e) {
             throw new SerializationError(`Failed to serialize record with id ${id}: ${e}`);
         }
-        const collection = ctx.get("segregated");
-        if (collection)
+        const collection = ctx.getOrUndefined("segregated");
+        if (collection) {
             await ctx.stub.putPrivateData(collection, id.toString(), data);
-        else
+        }
+        else {
             await ctx.stub.putState(id.toString(), data);
+            await this.flushSegregatedWrites(ctx, id);
+        }
         log.silly(`state stored${collection ? ` in ${collection} collection` : ""} under id ${id}`);
         return model;
     }
+    async flushSegregatedWrites(ctx, id) {
+        const writes = ctx.getOrUndefined("segregateWrite");
+        if (!writes)
+            return;
+        for (const [collection, entries] of Object.entries(writes)) {
+            for (const entry of entries) {
+                const payload = this.buildSegregatedPayload(entry);
+                if (!payload)
+                    continue;
+                const privateCtx = ctx.override({
+                    segregated: collection,
+                });
+                await this.putState(id, payload, privateCtx);
+            }
+        }
+        ctx.cache.remove("segregateWrite");
+    }
+    buildSegregatedPayload(entry) {
+        const payload = {};
+        if (entry.model) {
+            payload["$$table"] = Model.tableName(entry.model.constructor);
+        }
+        const merge = (source) => {
+            if (!source)
+                return;
+            Object.entries(source).forEach(([key, value]) => {
+                if (typeof value === "undefined")
+                    return;
+                payload[key] = value;
+            });
+        };
+        merge(entry.privates);
+        merge(entry.shared);
+        merge(entry.transient);
+        if (!Object.keys(payload).length)
+            return null;
+        return payload;
+    }
+    async mergeSegregatedReads(ctx, id, model) {
+        const reads = ctx.getOrUndefined("segregateRead");
+        if (!reads?.length)
+            return model;
+        for (const collection of reads) {
+            const privateRecord = await this.readPrivateRecord(ctx, collection, id);
+            if (!privateRecord)
+                continue;
+            Object.entries(privateRecord).forEach(([key, value]) => {
+                if (typeof value === "undefined")
+                    return;
+                model[key] = value;
+            });
+        }
+        return model;
+    }
+    async readPrivateRecord(ctx, collection, id) {
+        const data = await ctx.stub.getPrivateData(collection, id);
+        if (!data)
+            return undefined;
+        const text = data.toString();
+        if (!text)
+            return undefined;
+        try {
+            return FabricContractAdapter.serializer.deserialize(text);
+        }
+        catch {
+            return undefined;
+        }
+    }
+    async deleteSegregatedCollections(ctx, id) {
+        const reads = ctx.getOrUndefined("segregateRead");
+        if (!reads?.length)
+            return;
+        for (const collection of reads) {
+            try {
+                await ctx.stub.deletePrivateData(collection, id);
+            }
+            catch {
+                // ignore missing private data
+            }
+        }
+    }
     async readState(id, ctx) {
         let result;
         const { log } = this.logCtx([ctx], this.readState);
@@ -360,19 +463,56 @@ export class FabricContractAdapter extends CouchDBAdapter {
             res = await stub.getQueryResult(JSON.stringify(rawInput));
         return res;
     }
+    createRowsIterator(rows) {
+        let index = 0;
+        return {
+            // @ts-expect-error typeing of iterator?
+            async next() {
+                if (index < rows.length) {
+                    const row = rows[index++];
+                    return {
+                        value: { key: row.key, value: row.value },
+                        done: false,
+                    };
+                }
+                return { done: true };
+            },
+            async close() {
+                // noop
+            },
+        };
+    }
     async queryResultPaginated(stub, rawInput, limit = 250, page, bookmark, ...args) {
         const { ctx } = this.logCtx(args, this.readState);
         let res;
         const collection = ctx.get("segregated");
         if (collection) {
+            const clonedInput = JSON.parse(JSON.stringify(rawInput));
+            clonedInput.selector = clonedInput.selector || {};
             if (bookmark)
-                rawInput.selector._id = { $gt: bookmark.toString() };
-            const it = await stub.getPrivateDataQueryResult(collection, JSON.stringify(rawInput));
+                clonedInput.selector._id = { $gt: bookmark.toString() };
+            const limitValue = typeof limit === "number" && limit > 0 ? limit : Number.MAX_VALUE;
+            const iterator = await stub.getPrivateDataQueryResult(collection, JSON.stringify(clonedInput));
+            const rows = [];
+            let lastKey = "";
+            while (rows.length < limitValue) {
+                const resRow = await iterator.next();
+                if (resRow.done)
+                    break;
+                if (resRow.value && resRow.value.value) {
+                    rows.push({
+                        key: resRow.value.key,
+                        value: resRow.value.value,
+                    });
+                    lastKey = resRow.value.key;
+                }
+            }
+            await iterator.close();
             res = {
-                iterator: it,
+                iterator: this.createRowsIterator(rows),
                 metadata: {
-                    fetchedRecordsCount: limit,
-                    bookmark: "",
+                    fetchedRecordsCount: rows.length,
+                    bookmark: rows.length ? lastKey : "",
                 },
             };
         }
@@ -415,21 +555,22 @@ export class FabricContractAdapter extends CouchDBAdapter {
         let baseFlags = Object.assign({
             segregated: false,
         }, flags);
-        if (flags instanceof FabricContractContext) {
-            // do nothing
-        }
-        else if (flags.stub) {
+        const stubFromFlags = flags.stub || flags.stub;
+        const identityFromFlags = flags.identity ||
+            flags.clientIdentity;
+        if (stubFromFlags && identityFromFlags) {
+            const txId = stubFromFlags.getTxID();
             Object.assign(baseFlags, {
-                stub: flags.stub,
-                identity: flags.clientIdentity,
-                cert: flags.clientIdentity.getIDBytes().toString(),
-                roles: flags.clientIdentity.getAttributeValue("roles"),
+                stub: stubFromFlags,
+                identity: identityFromFlags,
+                cert: identityFromFlags.getIDBytes().toString(),
+                roles: identityFromFlags.getAttributeValue("roles"),
                 logger: Logging.for(operation, {
                     logLevel: false,
                     timestamp: false,
-                    correlationId: flags.stub.getTxID(),
+                    correlationId: txId,
                 }, flags),
-                correlationId: flags.stub.getTxID(),
+                correlationId: txId,
             });
         }
         else {
@@ -560,6 +701,17 @@ export class FabricContractAdapter extends CouchDBAdapter {
             return resp.docs;
         return resp;
     }
+    async view(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    ddoc, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    viewName, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    options, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    ..._args) {
+        throw new UnsupportedError("Fabric contracts do not support CouchDB views.");
+    }
     Statement() {
         return new FabricStatement(this);
     }