@decaf-ts/for-fabric 0.1.119 → 0.2.0

package/lib/shared/decorators.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SEGREGATED_COLLECTION_EXTRACTION_PRIORITY = exports.ImplicitPrivateCollection = exports.ModelCollection = void 0;
+exports.extractMspId = extractMspId;
 exports.Owner = Owner;
 exports.ownedByOnCreate = ownedByOnCreate;
 exports.ownedBy = ownedBy;
@@ -14,6 +15,7 @@ exports.mirrorWriteGuard = mirrorWriteGuard;
 exports.readMirrorHandler = readMirrorHandler;
 exports.mirror = mirror;
 exports.NamespaceCollection = NamespaceCollection;
+exports.applySegregationFlags = applySegregationFlags;
 exports.extractSegregatedCollections = extractSegregatedCollections;
 exports.segregatedDataOnCreate = segregatedDataOnCreate;
 exports.segregatedDataOnRead = segregatedDataOnRead;
@@ -28,7 +30,6 @@ const constants_1 = require("./constants.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
 const logging_1 = require("@decaf-ts/logging");
 require("./overrides/index.cjs");
-const MIRROR_SKIP_FLAG_PREFIX = "mirror:skip:";
 /**
  * @description Extracts the MSP ID from either a string or ClientIdentity object
  * @param identity - The identity value which can be a string MSP ID or ClientIdentity object
@@ -141,45 +142,74 @@ async function evalMirrorMetadata(model, resolver, ctx) {
 }
 async function createMirrorHandler(context, data, key, model) {
     const collection = await evalMirrorMetadata(model, data.resolver, context);
-    const repo = this.override(Object.assign({}, this._overrides, {
-        segregated: collection,
-        mirror: true,
-        ignoreValidation: true,
-        ignoreHandlers: true,
-    }));
-    const mirror = await repo.create(model, context);
-    context.logger.info(`Mirror for ${decorator_validation_1.Model.tableName(this.class)} created with ${decorator_validation_1.Model.pk(model)}: ${mirror[decorator_validation_1.Model.pk(model)]}`);
+    const fabricCtx = context;
+    // Put mirror flags directly on context so adapter.prepare() and adapter.create() can see them
+    fabricCtx.put("mirror", true);
+    fabricCtx.put("segregated", collection);
+    try {
+        const repo = this.override(Object.assign({}, this._overrides, {
+            segregated: collection,
+            mirror: true,
+            ignoreValidation: true,
+            ignoreHandlers: true,
+        }));
+        const mirror = await repo.create(model, context);
+        context.logger.info(`Mirror for ${decorator_validation_1.Model.tableName(this.class)} created with ${decorator_validation_1.Model.pk(model)}: ${mirror[decorator_validation_1.Model.pk(model)]}`);
+    }
+    finally {
+        // Clean up mirror flags from context
+        fabricCtx.put("mirror", undefined);
+        fabricCtx.put("segregated", undefined);
+    }
 }
 async function updateMirrorHandler(context, data, key, model) {
     const collection = await evalMirrorMetadata(model, data.resolver, context);
-    const repo = this.override(Object.assign({}, this._overrides, {
-        segregated: collection,
-        mirror: true,
-        ignoreValidation: true,
-        ignoreHandlers: true,
-        applyUpdateValidation: false,
-        mergeForUpdate: false,
-    }));
-    await repo.update(model, context);
-    context.logger.info(`Mirror for ${decorator_validation_1.Model.tableName(this.class)} updated: ${model[decorator_validation_1.Model.pk(model)]}`);
+    const fabricCtx = context;
+    fabricCtx.put("mirror", true);
+    fabricCtx.put("segregated", collection);
+    try {
+        const repo = this.override(Object.assign({}, this._overrides, {
+            segregated: collection,
+            mirror: true,
+            ignoreValidation: true,
+            ignoreHandlers: true,
+            applyUpdateValidation: false,
+            mergeForUpdate: false,
+        }));
+        await repo.update(model, context);
+        context.logger.info(`Mirror for ${decorator_validation_1.Model.tableName(this.class)} updated: ${model[decorator_validation_1.Model.pk(model)]}`);
+    }
+    finally {
+        fabricCtx.put("mirror", undefined);
+        fabricCtx.put("segregated", undefined);
+    }
 }
 async function deleteMirrorHandler(context, data, key, model) {
     const collection = await evalMirrorMetadata(model, data.resolver, context);
-    const pkProp = decorator_validation_1.Model.pk(model);
-    const id = model[pkProp];
-    const repo = this.override(Object.assign({}, this._overrides, {
-        segregated: collection,
-        mirror: true,
-        ignoreValidation: true,
-        ignoreHandlers: true,
-    }));
+    const fabricCtx = context;
+    fabricCtx.put("mirror", true);
+    fabricCtx.put("segregated", collection);
     try {
-        await repo.delete(id, context);
+        const pkProp = decorator_validation_1.Model.pk(model);
+        const id = model[pkProp];
+        const repo = this.override(Object.assign({}, this._overrides, {
+            segregated: collection,
+            mirror: true,
+            ignoreValidation: true,
+            ignoreHandlers: true,
+        }));
+        try {
+            await repo.delete(id, context);
+        }
+        catch {
+            // May already be deleted by adapter.deleteSegregatedCollections
+        }
+        context.logger.info(`Mirror for ${decorator_validation_1.Model.tableName(this.class)} deleted: ${String(id)}`);
     }
-    catch {
-        // May already be deleted by adapter.deleteSegregatedCollections
+    finally {
+        fabricCtx.put("mirror", undefined);
+        fabricCtx.put("segregated", undefined);
     }
-    context.logger.info(`Mirror for ${decorator_validation_1.Model.tableName(this.class)} deleted: ${String(id)}`);
 }
 async function mirrorWriteGuard(context, data, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -194,28 +224,19 @@ model) {
     }
 }
 async function readMirrorHandler(context, data, key, model) {
-    // Get the current MSP ID from the context
     const msp = extractMspId(context.get("identity"));
-    if (!msp) {
-        context.logger.debug(`Mirror read: No MSP ID available, using default read behavior`);
+    if (!msp)
         return;
-    }
-    // Evaluate the mirror condition
     const collection = await evalMirrorMetadata(model, data.resolver, context);
-    const skipFlagKey = `${MIRROR_SKIP_FLAG_PREFIX}${collection}`;
     const fabricCtx = context;
     const matches = msp === data.mspId || (data.condition && data.condition(msp));
     if (matches) {
-        context.logger.info(`Mirror read: MSP ${msp} matches condition, routing ALL reads exclusively to collection ${collection}`);
-        // Set the segregated flag in context to route ALL reads to the mirror collection
-        // This ensures no reads go to world state or other collections
-        fabricCtx.put("segregated", collection);
+        context.logger.info(`Mirror read: MSP ${msp} matches, routing reads to mirror collection ${collection}`);
+        // Route reads exclusively through the mirror collection
+        fabricCtx.put("fullySegregated", true);
         fabricCtx.readFrom(collection);
-        fabricCtx.put(skipFlagKey, false);
-    }
-    else {
-        fabricCtx.put(skipFlagKey, true);
     }
+    // When MSP does NOT match, normal read flow — all data is in public state
 }
 function mirror(collection, mspIdOrCondition, condition) {
     const isConditionOnly = typeof mspIdOrCondition !== "string" && Boolean(mspIdOrCondition);
@@ -231,7 +252,7 @@ function mirror(collection, mspIdOrCondition, condition) {
             mspId: mspId,
             resolver: resolver,
         };
-        return (0, decoration_1.apply)((0, decoration_1.metadata)(decoration_1.Metadata.key(constants_1.FabricModelKeys.FABRIC, constants_1.FabricModelKeys.MIRROR), meta), privateData(collection), 
+        return (0, decoration_1.apply)((0, decoration_1.metadata)(decoration_1.Metadata.key(constants_1.FabricModelKeys.FABRIC, constants_1.FabricModelKeys.MIRROR), meta), 
         // Read handler runs early (priority 30) to set up context before any reads
         (0, db_decorators_1.onRead)(readMirrorHandler, meta, { priority: 30 }), 
         // Write guards — reject matching MSPs before any processing
@@ -276,6 +297,23 @@ exports.ImplicitPrivateCollection = ImplicitPrivateCollection;
  * operations occur, allowing sequences to be replicated to private/shared collections.
  */
 exports.SEGREGATED_COLLECTION_EXTRACTION_PRIORITY = 35;
+function applySegregationFlags(clazz, collections, ctx) {
+    // Register collections early using readFrom - this allows sequence code
+    // to know which collections to replicate to during pk generation
+    if (collections.length > 0) {
+        ctx.readFrom(collections);
+    }
+    // Check if model is fully segregated (all non-pk properties are private/shared/transient).
+    // Use Model.segregate() which is the canonical way to determine what's transient,
+    // rather than reading DBKeys.TRANSIENT metadata which may not accumulate correctly
+    // when class-level @privateData applies decorators iteratively.
+    if (!ctx.isFullySegregated && collections.length) {
+        const segregated = decorator_validation_1.Model.segregate(clazz);
+        const publicData = segregated.public || {};
+        if (!Object.keys(publicData).length)
+            ctx.markFullySegregated();
+    }
+}
 /**
  * @description Early handler to extract and register collections in context
  * @summary Runs with priority < 40 to extract collection names before pk generation (priority 60).
@@ -305,30 +343,11 @@ async function extractSegregatedCollections(context, data, keys, model) {
             collections.push(collection);
         }
     }
-    // Register collections early using readFrom - this allows sequence code
-    // to know which collections to replicate to during pk generation
-    if (collections.length > 0) {
-        context.readFrom(collections);
-    }
-    // Check if model is fully segregated (all non-pk properties are private/shared/transient).
-    // Use Model.segregate() which is the canonical way to determine what's transient,
-    // rather than reading DBKeys.TRANSIENT metadata which may not accumulate correctly
-    // when class-level @privateData applies decorators iteratively.
-    const fabricCtx = context;
-    if (!fabricCtx.isFullySegregated) {
-        const pkProp = decorator_validation_1.Model.pk(model);
-        const segregated = decorator_validation_1.Model.segregate(model);
-        const publicKeys = Object.keys(segregated.model).filter((k) => k !== pkProp && segregated.model[k] !== undefined);
-        if (publicKeys.length === 0) {
-            fabricCtx.markFullySegregated();
-        }
-    }
+    applySegregationFlags(model, collections, context);
     // Store segregation metadata on the adapter (persists across context chains).
     // The Sequence creates its own context via logCtx, losing context-stored flags.
-    const adapter = this.adapter;
-    const tableName = decorator_validation_1.Model.tableName(model.constructor);
-    const seqName = `${tableName}_pk`;
-    adapter.setSequenceSegregation(seqName, fabricCtx.isFullySegregated, collections);
+    const seqName = decorator_validation_1.Model.sequenceName(model, "pk");
+    context.setSequenceSegregation(seqName, context.isFullySegregated, collections);
 }
 async function segregatedDataOnCreate(context, data, keys, model) {
     const dataArray = (Array.isArray(data) ? data : [data]);
@@ -352,11 +371,8 @@ async function segregatedDataOnCreate(context, data, keys, model) {
             throw new core_1.UnsupportedError(`Segregated data collection mismatch: ${c} vs ${collection}`);
     });
     const keyStrings = keyArray.map((key) => String(key));
-    // Store the original model — prepare() will filter to collection-specific fields
-    context.writeTo(collection, {
-        model,
-        keys: keyStrings,
-    });
+    // Store the segregated model — prepare() will filter to collection-specific fields
+    context.writeTo(collection, keyStrings);
 }
 async function segregatedDataOnRead(context, data, keys, model) {
     const dataArray = (Array.isArray(data) ? data : [data]);
@@ -370,10 +386,6 @@ async function segregatedDataOnRead(context, data, keys, model) {
     const collection = typeof collectionResolver === "string"
         ? collectionResolver
         : await collectionResolver(model, msp, context);
-    const skipFlagKey = `${MIRROR_SKIP_FLAG_PREFIX}${collection}`;
-    const fabricCtx = context;
-    if (fabricCtx.getOrUndefined(skipFlagKey))
-        return;
     context.readFrom(collection);
 }
 async function segregatedDataOnUpdate(context, data, key, model, 
@@ -400,10 +412,7 @@ oldModel) {
     });
     const keyStrings = keyArray.map((key) => String(key));
     // Store the original model — prepare() will filter to collection-specific fields
-    context.writeTo(collection, {
-        model,
-        keys: keyStrings,
-    });
+    context.writeTo(collection, keyStrings);
 }
 async function segregatedDataOnDelete(context, data, key, model) {
     const dataArray = (Array.isArray(data) ? data : [data]);
@@ -445,7 +454,7 @@ function segregated(collection, type, filter) {
         const decs = [];
         if (!propertyKey) {
             // decorated at the class level
-            const properties = decoration_1.Metadata.validatableProperties(target);
+            const properties = decoration_1.Metadata.getAttributes(target);
             properties?.forEach((p) => {
                 if (!filter || filter(p)) {
                     segregated(collection, type)(target.prototype, p);

package/lib/shared/decorators.d.ts

@@ -1,9 +1,16 @@
 import { Repo, Context, Repository, ContextOf } from "@decaf-ts/core";
 import { Model } from "@decaf-ts/decorator-validation";
+import { ClientIdentity } from "fabric-shim-api";
 import { Constructor } from "@decaf-ts/decoration";
 import { FabricFlags } from "./types";
 import { FabricContractFlags } from "../contracts/types";
 import "../shared/overrides";
+/**
+ * @description Extracts the MSP ID from either a string or ClientIdentity object
+ * @param identity - The identity value which can be a string MSP ID or ClientIdentity object
+ * @returns The MSP ID as a string, or undefined if not available
+ */
+export declare function extractMspId(identity: string | ClientIdentity | undefined): string | undefined;
 /**
  * Decorator for marking methods that require ownership authorization.
  * Checks the owner of the token before allowing the method to be executed.
@@ -51,6 +58,7 @@ export type SegregatedDataMetadata = {
  * operations occur, allowing sequences to be replicated to private/shared collections.
  */
 export declare const SEGREGATED_COLLECTION_EXTRACTION_PRIORITY = 35;
+export declare function applySegregationFlags<M extends Model>(clazz: M, collections: string[], ctx: any): void;
 /**
  * @description Early handler to extract and register collections in context
  * @summary Runs with priority < 40 to extract collection names before pk generation (priority 60).

package/lib/shared/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/shared/decorators.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/shared/decorators.ts"],"names":[],"mappings":";;;AAmDA,oCAMC;AAkBD,sBAwCC;AAED,0CA8BC;AAED,0BAsBC;AAED,sDAaC;AAED,sCA0BC;AAUD,gDAsBC;AAED,kDAiCC;AAED,kDAiCC;AAED,kDAqCC;AAED,4CAqBC;AAED,8CA6BC;AAED,wBAgDC;AAsBD,kDAWC;AA0BD,sDAoBC;AAaD,oEA0CC;AAED,wDA+CC;AAED,oDA6BC;AAED,wDAgDC;AAED,wDAmCC;AA8GD,kCAaC;AAED,gCAWC;AAh4BD,yCAOwB;AACxB,2DAiBiC;AACjC,yEAAiE;AACjE,+CAA8C;AAI9C,qDAQ8B;AAE9B,+CAAiD;AAEjD,iCAA6B;AAG7B;;;;GAIG;AACH,SAAgB,YAAY,CAC1B,QAA6C;IAE7C,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IAChC,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAClD,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,KAAK;IACnB,OAAO,UACL,MAAW,EACX,WAAmB,EACnB,UAA8B;QAE9B,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC;QAExC,UAAU,CAAC,KAAK,GAAG,KAAK,WAEtB,GAAG,IAAW;YAEd,MAAM,GAAG,GAAc,IAAI,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAE5C,MAAM,MAAM,GAAG,MAAO,IAA4B,CAChD,iBAAiB,CAClB,CAAC,MAAM,EAAE,CAAC;YAEX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAEzC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACvB,MAAM,IAAI,6BAAa,CAAC,qBAAqB,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,IAAI,6BAAa,CAAC,6BAA6B,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YACxE,CAAC;YAED,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,QAAQ,EAAE,CAAC;gBAChC,MAAM,IAAI,yBAAkB,CAC1B,8BAA8B,WAAW,eAAe,CACzD,CAAC;YACJ,CAAC;YAED,OAAO,MAAM,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,eAAe,CAMnC,OAAqB,EACrB,IAAO,EACP,GAAY,EACZ,KAAQ;IAER,MAAM,EAAE,IAAI,EAAE,GAAG,OAAc,CAAC;IAEhC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IACxC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,MAAM,kBAAkB,GAAG,UACzB,MAAS,EACT,WAAmB,EACnB,KAA+B;QAE/B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE;YACzC,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,KAAK;YACf,YAAY,EAAE,IAAI;YAClB,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,kBAAkB,CAAC,KAAK,EAAE,GAAa,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,OAAO;IACrB,SAAS,OAAO;QACd,OAAO,UAAU,GAAQ,EAAE,SAAe;YACxC,OAAO,IAAA,kBAAK,EACV,IAAA,+BAAQ,GAAE,EACV,IAAA,yBAAS,GAAE,EACX,IAAA,wBAAQ,GAAE,EACV,IAAA,wBAAQ,EAAC,eAAe,CAAC,EACzB,IAAA,yBAAY,EACV,qBAAQ,CAAC,GAAG,CAAC,2BAAe,CAAC,MAAM,EAAE,2BAAe,CAAC,QAAQ,CAAC,EAC9D,SAAS,CACV,CACF,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,uBAAU,CAAC,GAAG,CAAC,2BAAe,CAAC,QAAQ,CAAC;SAC5C,MAAM,CAAC;QACN,SAAS,EAAE,OAAO;QAClB,IAAI,EAAE,EAAE;KACT,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC;AAEM,KAAK,UAAU,qBAAqB,CAMzC,OAAqB,EACrB,IAAO,EACP,GAAY,EACZ,KAAQ;IAER,MAAM,EAAE,IAAI,EAAE,GAAG,OAAc,CAAC;IAChC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;AAC9B,CAAC;AAED,SAAgB,aAAa;IAC3B,SAAS,aAAa;QACpB,OAAO,UAAU,GAAQ,EAAE,SAAe;YACxC,OAAO,IAAA,kBAAK,EACV,IAAA,+BAAQ,GAAE,EACV,IAAA,wBAAQ,GAAE,EACV,IAAA,wBAAQ,EAAC,qBAAqB,CAAC,EAC/B,IAAA,wBAAQ,EAAC,qBAAqB,CAAC,EAC/B,IAAA,yBAAY,EACV,qBAAQ,CAAC,GAAG,CACV,2BAAe,CAAC,MAAM,EACtB,SAAS,EACT,2BAAe,CAAC,cAAc,CAC/B,EACD,SAAS,CACV,CACF,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;IAED,OAAO,uBAAU,CAAC,GAAG,CAAC,2BAAe,CAAC,cAAc,CAAC;SAClD,MAAM,CAAC;QACN,SAAS,EAAE,aAAa;QACxB,IAAI,EAAE,EAAE;KACT,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC;AAUM,KAAK,UAAU,kBAAkB,CACtC,KAAQ,EACR,QAAiD,EACjD,GAAiC;IAEjC,IAAI,UAAU,GAA4C,QAAQ,CAAC;IACnE,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,KAAK,GACT,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC;YAClE,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,UAAU;gBAC5C,UAAU,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,MAAM,IAAI,6BAAa,CAAC,6CAA6C,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ;QAC/C,MAAM,IAAI,6BAAa,CACrB,6BAA6B,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CACtD,CAAC;IACJ,OAAO,UAAU,CAAC;AACpB,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAKvC,OAAqC,EACrC,IAAoB,EACpB,GAAY,EACZ,KAAQ;IAER,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,OAAgC,CAAC;IACnD,8FAA8F;IAC9F,SAAS,CAAC,GAAG,CAAC,QAAe,EAAE,IAAI,CAAC,CAAC;IACrC,SAAS,CAAC,GAAG,CAAC,YAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAG,IAAY,CAAC,UAAU,EAAE;YAC1C,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,IAAI;SACd,CAAC,CACV,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACjD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,cAAc,4BAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,4BAAK,CAAC,EAAE,CAAC,KAAK,CAAW,KAAK,MAAM,CAAC,4BAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAClH,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,qCAAqC;QACrC,SAAS,CAAC,GAAG,CAAC,QAAe,EAAE,SAAS,CAAC,CAAC;QAC1C,SAAS,CAAC,GAAG,CAAC,YAAmB,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAKvC,OAAqC,EACrC,IAAoB,EACpB,GAAY,EACZ,KAAQ;IAER,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,OAAgC,CAAC;IACnD,SAAS,CAAC,GAAG,CAAC,QAAe,EAAE,IAAI,CAAC,CAAC;IACrC,SAAS,CAAC,GAAG,CAAC,YAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAG,IAAY,CAAC,UAAU,EAAE;YAC1C,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,IAAI;YACpB,qBAAqB,EAAE,KAAK;YAC5B,cAAc,EAAE,KAAK;SACf,CAAC,CACV,CAAC;QACF,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,cAAc,4BAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,aAAc,KAAa,CAAC,4BAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CACxF,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,SAAS,CAAC,GAAG,CAAC,QAAe,EAAE,SAAS,CAAC,CAAC;QAC1C,SAAS,CAAC,GAAG,CAAC,YAAmB,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAKvC,OAAqC,EACrC,IAAoB,EACpB,GAAY,EACZ,KAAQ;IAER,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,OAAgC,CAAC;IACnD,SAAS,CAAC,GAAG,CAAC,QAAe,EAAE,IAAI,CAAC,CAAC;IACrC,SAAS,CAAC,GAAG,CAAC,YAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,4BAAK,CAAC,EAAE,CAAC,KAAK,CAAY,CAAC;QAC1C,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CACxB,MAAM,CAAC,MAAM,CAAC,EAAE,EAAG,IAAY,CAAC,UAAU,EAAE;YAC1C,UAAU,EAAE,UAAU;YACtB,MAAM,EAAE,IAAI;YACZ,gBAAgB,EAAE,IAAI;YACtB,cAAc,EAAE,IAAI;SACd,CAAC,CACV,CAAC;QACF,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,EAAS,EAAE,OAAO,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,gEAAgE;QAClE,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,cAAc,4BAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,EAAE,CAAC,EAAE,CACnE,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,SAAS,CAAC,GAAG,CAAC,QAAe,EAAE,SAAS,CAAC,CAAC;QAC1C,SAAS,CAAC,GAAG,CAAC,YAAmB,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAKpC,OAAqC,EACrC,IAAoB;AACpB,6DAA6D;AAC7D,GAAY;AACZ,6DAA6D;AAC7D,KAAQ;IAER,MAAM,GAAG,GAAG,YAAY,CACtB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAwC,CAC/D,CAAC;IACF,IAAI,CAAC,GAAG;QAAE,OAAO;IACjB,IAAI,GAAG,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,yBAAkB,CAC1B,gBAAgB,GAAG,4CAA4C,CAChE,CAAC;IACJ,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAKrC,OAAqC,EACrC,IAAoB,EACpB,GAAY,EACZ,KAAQ;IAER,MAAM,GAAG,GAAG,YAAY,CACtB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAwC,CAC/D,CAAC;IAEF,IAAI,CAAC,GAAG;QAAE,OAAO;IAEjB,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,OAAgC,CAAC;IACnD,MAAM,OAAO,GAAG,GAAG,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAE9E,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,oBAAoB,GAAG,gDAAgD,UAAU,EAAE,CACpF,CAAC;QACF,wDAAwD;QACxD,SAAS,CAAC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;QACvC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IACD,0EAA0E;AAC5E,CAAC;AAED,SAAgB,MAAM,CACpB,UAAuC,EACvC,gBAA2C,EAC3C,SAA2B;IAE3B,MAAM,eAAe,GACnB,OAAO,gBAAgB,KAAK,QAAQ,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,eAAe;QAC3B,CAAC,CAAC,SAAS;QACX,CAAC,CAAE,gBAAuC,CAAC;IAC7C,MAAM,IAAI,GAAG,eAAe;QAC1B,CAAC,CAAE,gBAAoC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,SAAS,MAAM,CACb,QAAqC,EACrC,KAAa,EACb,SAA2B;QAE3B,MAAM,IAAI,GAAmB;YAC3B,SAAS,EAAE,SAAS;YACpB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,OAAO,IAAA,kBAAK,EACV,IAAA,qBAAQ,EACN,qBAAQ,CAAC,GAAG,CAAC,2BAAe,CAAC,MAAM,EAAE,2BAAe,CAAC,MAAM,CAAC,EAC5D,IAAI,CACL;QACD,2EAA2E;QAC3E,IAAA,sBAAM,EAAC,iBAAwB,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACxD,4DAA4D;QAC5D,IAAA,wBAAQ,EAAC,gBAAuB,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EACzD,IAAA,wBAAQ,EAAC,gBAAuB,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EACzD,IAAA,wBAAQ,EAAC,gBAAuB,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACzD,oEAAoE;QACpE,IAAA,2BAAW,EAAC,mBAA0B,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAC/D,IAAA,2BAAW,EAAC,mBAA0B,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAC/D,IAAA,2BAAW,EAAC,mBAA0B,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAChE,CAAC;IACJ,CAAC;IAED,OAAO,uBAAU,CAAC,GAAG,CAAC,2BAAe,CAAC,MAAM,CAAC;SAC1C,MAAM,CAAC;QACN,SAAS,EAAE,MAAM;QACjB,IAAI,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC;KAChC,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC;AAQM,MAAM,eAAe,GAAuB,CACjD,KAAyB,EACzB,KAAc,EACd,EAAE;IACF,MAAM,OAAO,GACX,KAAK,IAAI,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;IACvE,IAAI,CAAC,OAAO;QACV,MAAM,IAAI,6BAAa,CACrB,SAAS,MAAM,CAAC,IAAI,kFAAkF,CACvG,CAAC;IACJ,OAAO,GAAG,IAAA,sBAAY,EAAC,MAAM,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,sBAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;AAC/E,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AAEF,SAAgB,mBAAmB,CAAC,SAAiB;IACnD,OAAO,CAAkB,KAAyB,EAAE,KAAc,EAAE,EAAE;QACpE,MAAM,OAAO,GACX,KAAK,IAAI,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC5E,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC;QACvE,IAAI,CAAC,OAAO;YACV,MAAM,IAAI,6BAAa,CACrB,SAAS,MAAM,CAAC,IAAI,kFAAkF,CACvG,CAAC;QACJ,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,IAAA,sBAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAC/D,CAAC,CAAC;AACJ,CAAC;AAEM,MAAM,yBAAyB,GAAuB,CAC3D,KAAyB,EACzB,KAAc,EACd,EAAE;IACF,MAAM,OAAO,GACX,KAAK,IAAI,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5E,IAAI,CAAC,OAAO;QACV,MAAM,IAAI,6BAAa,CACrB,SAAS,KAAK,CAAC,WAAW,CAAC,IAAI,kFAAkF,CAClH,CAAC;IACJ,OAAO,KAAK,IAAA,sBAAY,EAAC,OAAO,CAAC,mBAAmB,CAAC;AACvD,CAAC,CAAC;AAXW,QAAA,yBAAyB,6BAWpC;AAMF;;;;GAIG;AACU,QAAA,yCAAyC,GAAG,EAAE,CAAC;AAE5D,SAAgB,qBAAqB,CACnC,KAAQ,EACR,WAAqB,EACrB,GAAQ;IAER,wEAAwE;IACxE,iEAAiE;IACjE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,GAA6B,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED,2FAA2F;IAC3F,kFAAkF;IAClF,mFAAmF;IACnF,gEAAgE;IAChE,IAAI,CAAC,GAAG,CAAC,iBAAiB,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,4BAAK,CAAC,SAAS,CAAC,KAAY,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM;YAAE,GAAG,CAAC,mBAAmB,EAAE,CAAC;IACjE,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACI,KAAK,UAAU,4BAA4B,CAEhD,OAA+B,EAC/B,IAAuD,EACvD,IAA2B,EAC3B,KAAQ;IAER,MAAM,SAAS,GAAG,CAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACR,CAAC;IAE9B,MAAM,GAAG,GACP,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,YAAY,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,CAAwC,CAC/D,CAAC;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,0EAA0E;QAC1E,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,WAAW,CAAC;QAChD,MAAM,UAAU,GACd,OAAO,kBAAkB,KAAK,QAAQ;YACpC,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAC9C,IAAI,UAAU,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,qBAAqB,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IAEnD,8EAA8E;IAC9E,gFAAgF;IAChF,MAAM,OAAO,GAAG,4BAAK,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC/C,OAAe,CAAC,sBAAsB,CACrC,OAAO,EACN,OAAe,CAAC,iBAAiB,EAClC,WAAW,CACZ,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAE1C,OAA+B,EAC/B,IAAuD,EACvD,IAA2B,EAC3B,KAAQ;IAER,MAAM,SAAS,GAAG,CAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACR,CAAC;IAC9B,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAgB,CAAC;IACtE,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QACtC,MAAM,IAAI,6BAAa,CACrB,mDAAmD,CACpD,CAAC;IAEJ,MAAM,GAAG,GACP,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,YAAY,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,CAAwC,CAC/D,CAAC;IACJ,IAAI,CAAC,GAAG;QACN,MAAM,IAAI,+BAAe,CACvB,8CAA8C,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CACvE,CAAC;IAEJ,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACpD,MAAM,UAAU,GACd,OAAO,kBAAkB,KAAK,QAAQ;QACpC,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAE9C,mDAAmD;IACnD,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACzB,MAAM,CAAC,GACL,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,QAAQ;YAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW;YAC1B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,UAAU;YAClB,MAAM,IAAI,uBAAgB,CACxB,wCAAwC,CAAC,OAAO,UAAU,EAAE,CAC7D,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACtD,mFAAmF;IAClF,OAAiC,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACrE,CAAC;AAEM,KAAK,UAAU,oBAAoB,CAExC,OAA6B,EAC7B,IAAuD,EACvD,IAA2B,EAC3B,KAAQ;IAER,MAAM,SAAS,GAAG,CAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACR,CAAC;IAC9B,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAgB,CAAC;IACtE,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QACtC,MAAM,IAAI,6BAAa,CACrB,mDAAmD,CACpD,CAAC;IAEJ,MAAM,GAAG,GAAG,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1E,IAAI,CAAC,GAAG;QACN,MAAM,IAAI,+BAAe,CACvB,8CAA8C,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CACvE,CAAC;IAEJ,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACpD,MAAM,UAAU,GACd,OAAO,kBAAkB,KAAK,QAAQ;QACpC,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,MAAM,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAEnD,OAAiC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC1D,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAE1C,OAA+B,EAC/B,IAAuD,EACvD,GAA0B,EAC1B,KAAQ;AACR,6DAA6D;AAC7D,QAAW;IAEX,MAAM,SAAS,GAAG,CAChB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CACR,CAAC;IAC9B,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAgB,CAAC;IACnE,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QACtC,MAAM,IAAI,6BAAa,CACrB,mDAAmD,CACpD,CAAC;IAEJ,MAAM,GAAG,GACP,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,YAAY,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,CAAwC,CAC/D,CAAC;IACJ,IAAI,CAAC,GAAG;QACN,MAAM,IAAI,+BAAe,CACvB,8CAA8C,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CACvE,CAAC;IAEJ,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACpD,MAAM,UAAU,GACd,OAAO,kBAAkB,KAAK,QAAQ;QACpC,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAE9C,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACxB,MAAM,CAAC,GACL,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,KAAK,QAAQ;YAC1C,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW;YAC1B,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,UAAU;YAClB,MAAM,IAAI,uBAAgB,CACxB,wCAAwC,CAAC,OAAO,UAAU,EAAE,CAC7D,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAI,QAAwB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACvE,iFAAiF;IAChF,OAAiC,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACrE,CAAC;AAEM,KAAK,UAAU,sBAAsB,CAM1C,OAAqB,EACrB,IAAa,EACb,GAAgB,EAChB,KAAQ;IAER,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAQ,CAAC;IAC/D,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAgB,CAAC;IACnE,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QACtC,MAAM,IAAI,6BAAa,CACrB,mDAAmD,CACpD,CAAC;IAEJ,MAAM,GAAG,GACP,4BAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACpB,YAAY,CACV,OAAO,CAAC,GAAG,CAAC,UAAU,CAAwC,CAC/D,CAAC;IACJ,IAAI,CAAC,GAAG;QACN,MAAM,IAAI,+BAAe,CACvB,8CAA8C,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,CACvE,CAAC;IAEJ,MAAM,kBAAkB,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;IACpD,MAAM,UAAU,GACd,OAAO,kBAAkB,KAAK,QAAQ;QACpC,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAE7C,OAAiC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,UAAU,CACjB,UAAuC,EACvC,IAAsD,EACtD,MAAsC;IAEtC,OAAO,SAAS,eAAe,CAAC,MAAc,EAAE,WAAiB;QAC/D,SAAS,aAAa,CAAC,MAAc,EAAE,WAAiB;YACtD,MAAM,GAAG,GAAG,qBAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAC5C,MAAM,MAAM,GAAgB,MAAM,CAAC,WAA0B,CAAC;YAE9D,MAAM,IAAI,GAAG,qBAAQ,CAAC,GAAG,CAAC,MAAqB,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;YAC5D,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;YACpD,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC5B,IAAI,CAAC,WAAW,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;YACpC,qBAAQ,CAAC,GAAG,CAAC,MAAqB,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAE/C,MAAM,UAAU,GAAG,qBAAQ,CAAC,GAAG,CAAC,MAAqB,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YACnE,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;YAChE,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAClC,UAAU,CAAC,WAAW,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAC;YAChD,qBAAQ,CAAC,GAAG,CAAC,MAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;YAEtD,MAAM,aAAa,GACjB,qBAAQ,CAAC,GAAG,CAAC,MAAqB,EAAE,sBAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAC9D,MAAM,oBAAoB,GAAG;gBAC3B,GAAG,aAAa;gBAChB,CAAC,WAAkB,CAAC,EAAE,EAAE;aACzB,CAAC;YACF,qBAAQ,CAAC,GAAG,CACV,MAAqB,EACrB,sBAAM,CAAC,SAAS,EAChB,oBAAoB,CACrB,CAAC;QACJ,CAAC;QAED,MAAM,IAAI,GAAU,EAAE,CAAC;QACvB,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,+BAA+B;YAC/B,MAAM,UAAU,GAAG,qBAAQ,CAAC,aAAa,CAAC,MAAqB,CAAC,CAAC;YACjE,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;oBACzB,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAE,MAAc,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;aAAM,CAAC;YACN,MAAM,SAAS,GACb,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YACtE,+EAA+E;YAC/E,MAAM,gBAAgB,GAAG,GAAG,SAAS,UAAU,CAAC;YAChD,MAAM,aAAa,GAAG,GAAG,SAAS,OAAO,CAAC;YAC1C,MAAM,mBAAmB,GAAG,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;YACxD,MAAM,wBAAwB,GAAG;gBAC/B,QAAQ,EAAE,iDAAyC;gBACnD,KAAK,EAAE,gBAAgB;aACxB,CAAC;YACF,IAAI,CAAC,IAAI,CACP,IAAA,iBAAI,GAAE,EACN,IAAA,yBAAS,GAAE,EACX,aAAa;YACb,qEAAqE;YACrE,8EAA8E;YAC9E,4EAA4E;YAC5E,IAAA,kBAAE,EACA,4BAAY,CAAC,GAAG,EAChB,4BAAmC,EACnC,mBAAmB,EACnB,wBAAwB,CACzB;YACD,6DAA6D;YAC7D,IAAA,wBAAQ,EACN,sBAAsB,EACtB,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B;gBACE,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,aAAa;aACrB,CACF,EACD,IAAA,sBAAM,EACJ,oBAA2B,EAC3B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B;gBACE,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,aAAa;aACrB,CACF,EACD,IAAA,wBAAQ,EACN,sBAA6B,EAC7B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B;gBACE,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,aAAa;aACrB,CACF,EACD,IAAA,wBAAQ,EACN,sBAA6B,EAC7B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B;gBACE,QAAQ,EAAE,EAAE;gBACZ,KAAK,EAAE,aAAa;aACrB,CACF,CACF,CAAC;QACJ,CAAC;QACD,OAAO,IAAA,kBAAK,EAAC,GAAG,IAAI,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,WAAW,CACzB,aAA0C,iCAAyB;IAEnE,SAAS,WAAW,CAAC,UAAuC;QAC1D,OAAO,UAAU,CAAC,UAAU,EAAE,2BAAe,CAAC,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,uBAAU,CAAC,GAAG,CAAC,2BAAe,CAAC,OAAO,CAAC;SAC3C,MAAM,CAAC;QACN,SAAS,EAAE,WAAW;QACtB,IAAI,EAAE,CAAC,UAAU,CAAC;KACnB,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC;AAED,SAAgB,UAAU,CAAC,UAAuC;IAChE,SAAS,UAAU,CAAC,UAAuC;QACzD,OAAO,UAAU,CAAC,UAAU,EAAE,2BAAe,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,uBAAU,CAAC,GAAG,CAAC,2BAAe,CAAC,MAAM,CAAC;SAC1C,MAAM,CAAC;QACN,SAAS,EAAE,UAAU;QACrB,IAAI,EAAE,CAAC,UAAU,CAAC;KACnB,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC"}

package/lib/shared/overrides/overrides.cjs

@@ -16,12 +16,13 @@ decorator_validation_1.Model.prototype.segregate = function segregate() {
 decorator_validation_1.Model.segregate = function segregate(model) {
     if (!decorator_validation_1.Model.isTransient(model))
         return { model: model };
-    const decoratedProperties = decoration_1.Metadata.validatableProperties(model.constructor);
+    const decoratedProperties = decoration_1.Metadata.getAttributes(model.constructor) || [];
     const transientProps = decoration_1.Metadata.get(model.constructor, db_decorators_1.DBKeys.TRANSIENT);
     const privateProperties = decoration_1.Metadata.get(model.constructor, constants_1.FabricModelKeys.PRIVATE);
     const sharedProperties = decoration_1.Metadata.get(model.constructor, constants_1.FabricModelKeys.SHARED);
     const result = {
         model: {},
+        public: {},
         transient: {},
         privates: {},
         shared: {},
@@ -33,6 +34,7 @@ decorator_validation_1.Model.segregate = function segregate(model) {
     for (const key of decoratedProperties) {
         const value = model[key];
         const isTransient = transientKeys.includes(key);
+        const isPublic = !isTransient;
         const isPrivate = privateKeys.includes(key);
         const isShared = sharedKeys.includes(key);
         // const isPrimaryKey = key === pkKey;
@@ -48,13 +50,12 @@ decorator_validation_1.Model.segregate = function segregate(model) {
             result.shared = result.shared || {};
             result.shared[key] = value;
         }
-        const shouldIncludeInModel = !isTransient && !isPrivate && !isShared;
-        if (shouldIncludeInModel) {
-            result.model = result.model || {};
-            result.model[key] = value;
+        if (isPublic) {
+            result.public = (result.public || {});
+            result.public[key] = value;
         }
     }
-    result.model = decorator_validation_1.Model.build(result.model, model.constructor.name);
+    result.model = decorator_validation_1.Model.build(result.public, model.constructor.name);
     return result;
 }.bind(decorator_validation_1.Model);
 decorator_validation_1.Model.isPrivate = function isPrivate(model) {

package/lib/shared/overrides/overrides.js.map

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

package/lib/shared/types.d.ts

@@ -89,9 +89,10 @@ export interface Credentials {
 }
 export type SegregatedModel<M extends Model> = {
     model: M;
+    public?: Record<keyof M, any>;
     transient?: Record<keyof M, any>;
-    privates?: Record<keyof M, any>;
-    shared?: Record<keyof M, any>;
+    privates?: Record<string, Record<keyof M, any>>;
+    shared?: Record<string, Record<keyof M, any>>;
 };
 export type FabricFlags<LOG extends Logger = Logger> = AdapterFlags<LOG> & {
     segregated?: string;

package/lib/version.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_NAME = exports.VERSION = void 0;
 const decoration_1 = require("@decaf-ts/decoration");
-exports.VERSION = "0.1.119";
+exports.VERSION = "0.1.118";
 exports.PACKAGE_NAME = "@decaf-ts/for-fabric";
 decoration_1.Metadata.registerLibrary(exports.PACKAGE_NAME, exports.VERSION);
 //# sourceMappingURL=version.js.map

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.119";
+export declare const VERSION = "0.1.118";
 export declare const PACKAGE_NAME = "@decaf-ts/for-fabric";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/for-fabric",
-  "version": "0.1.119",
+  "version": "0.2.0",
   "description": "Abstracts fabric logic",
   "type": "module",
   "exports": {
@@ -62,8 +62,8 @@
     "infrastructure-hsm:down": "docker compose -f ./docker/infrastructure/docker-compose-hsm.yaml down --rmi local -v",
     "build:contract2": "npx decaf fabric compile-contract --debug --bundle --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}",
     "update:contract": "npm run build:contract && npm run deploy:contract",
-    "build:contract": "node ./lib/bin/cli.cjs compile-contract --dev --debug --bundle --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract} && npm run extract:collections",
-    "deploy:contract": "node ./lib/bin/cli.cjs deploy-contract --name ${CONTRACT_NAME:-GlobalContract} --input ${CONTRACT_NAME:-GlobalContract} --collections-config=./docker/infrastructure/chaincode/GlobalContract/collections_config.json",
+    "build:contract": "node ./lib/bin/cli.cjs compile-contract --dev --debug --bundle --name ${CONTRACT_NAME:-GlobalContract} --input ./src/contract --output ./docker/infrastructure/chaincode && LEVEL=verbose node ./lib/bin/cli.cjs extract-indexes --folder ./lib/contract --outDir ./docker/infrastructure/chaincode/${CONTRACT_NAME:-GlobalContract}",
+    "deploy:contract": "node ./lib/bin/cli.cjs deploy-contract --name ${CONTRACT_NAME:-GlobalContract} --input ${CONTRACT_NAME:-GlobalContract}",
     "publish-docs": "docker run -it --rm --user $(id -u):$(id -g) -v \"$(pwd)/workdocs/confluence:/content\" -e ATLASSIAN_API_TOKEN=$(cat .confluence-token) ghcr.io/markdown-confluence/publish:latest",
     "copy-storage": "sudo cp -R docker/infrastructure/storage docker/docker-data/ && sudo chmod -R 755 docker/docker-data",
     "copy:crypto": "node ./lib/bin/cli.cjs get-crypto-material --folder ./docker/docker-data",