@decaf-ts/for-fabric 0.1.22 → 0.1.23

package/lib/shared/overrides/overrides.cjs

@@ -6,6 +6,7 @@ const decoration_1 = require("@decaf-ts/decoration");
 // import { DBKeys } from "../model/constants";
 // import { SerializationError } from "../repository/errors";
 const constants_1 = require("./../constants.cjs");
+const db_decorators_1 = require("@decaf-ts/db-decorators");
 decorator_validation_1.Model.prototype.isShared = function isShared() {
     return decorator_validation_1.Model.isShared(this.constructor);
 };
@@ -15,45 +16,45 @@ decorator_validation_1.Model.prototype.isPrivate = function isPrivate() {
 decorator_validation_1.Model.prototype.segregate = function segregate() {
     return decorator_validation_1.Model.segregate(this);
 };
-//
-// (Model as any).toTransient = function toTransient<M extends Model>(model: M) {
-//   if (!Metadata.isTransient(model)) return { model: model };
-//   const decoratedProperties = Metadata.validatableProperties(
-//     model.constructor as any
-//   );
-//
-//   const transientProps = Metadata.get(
-//     model.constructor as any,
-//     DBKeys.TRANSIENT
-//   );
-//
-//   const result = {
-//     model: {} as Record<string, any>,
-//     transient: {} as Record<string, any>,
-//   };
-//   for (const key of decoratedProperties) {
-//     const isTransient = Object.keys(transientProps).includes(key);
-//     if (isTransient) {
-//       result.transient = result.transient || {};
-//       try {
-//         result.transient[key] = model[key as keyof M];
-//       } catch (e: unknown) {
-//         throw new SerializationError(
-//           `Failed to serialize transient property ${key}: ${e}`
-//         );
-//       }
-//     } else {
-//       result.model = result.model || {};
-//       result.model[key] = (model as Record<string, any>)[key];
-//     }
-//   }
-//
-//   result.model = Model.build(result.model, model.constructor.name);
-//   return result as { model: M; transient?: Record<string, any> };
-// };
-const seg = decorator_validation_1.Model.segregate;
 decorator_validation_1.Model.segregate = function segregate(model) {
-    return seg.call(decorator_validation_1.Model, model);
+    if (!decorator_validation_1.Model.isTransient(model))
+        return { model: model };
+    const decoratedProperties = decoration_1.Metadata.validatableProperties(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.PRIVATE);
+    const result = {
+        model: {},
+        transient: {},
+        private: {},
+        shared: {},
+    };
+    const transientKeys = Object.keys(transientProps);
+    const privateKeys = Object.keys(privateProperties);
+    const sharedKeys = Object.keys(sharedProperties);
+    for (const key of decoratedProperties) {
+        const isTransient = transientKeys.includes(key);
+        const isPrivate = privateKeys.includes(key);
+        const isShared = sharedKeys.includes(key);
+        if (isTransient) {
+            result.transient = result.transient || {};
+            result.transient[key] = model[key];
+            if (isPrivate) {
+                result.private = result.private || {};
+                result.private[key] = model[key];
+            }
+            if (isShared) {
+                result.shared = result.shared || {};
+                result.shared[key] = model[key];
+            }
+        }
+        else {
+            result.model = result.model || {};
+            result.model[key] = model[key];
+        }
+    }
+    result.model = decorator_validation_1.Model.build(result.model, model.constructor.name);
+    return result;
 }.bind(decorator_validation_1.Model);
 decorator_validation_1.Model.isPrivate = function isPrivate(model) {
     return !!decoration_1.Metadata.get(typeof model !== "function" ? model.constructor : model, constants_1.FabricModelKeys.PRIVATE);

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

@@ -1 +1 @@
-{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../../src/shared/overrides/overrides.ts"],"names":[],"mappings":";;AAAA,yEAAuD;AACvD,yDAAyD;AACzD,qDAA6D;AAC7D,+CAA+C;AAC/C,6DAA6D;AAC7D,kDAA+C;AAG/C,4BAAK,CAAC,SAAS,CAAC,QAAQ,GAAG,SAAS,QAAQ;IAG1C,OAAO,4BAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,WAA6B,CAAC,CAAC;AAC5D,CAAC,CAAC;AAEF,4BAAK,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,SAAS;IAG5C,OAAO,4BAAK,CAAC,SAAS,CAAC,IAAI,CAAC,WAA6B,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,4BAAK,CAAC,SAAS,CAAC,SAAS,GAAG,SAAS,SAAS;IAG5C,OAAO,4BAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,EAAE;AACF,iFAAiF;AACjF,+DAA+D;AAC/D,gEAAgE;AAChE,+BAA+B;AAC/B,OAAO;AACP,EAAE;AACF,yCAAyC;AACzC,gCAAgC;AAChC,uBAAuB;AACvB,OAAO;AACP,EAAE;AACF,qBAAqB;AACrB,wCAAwC;AACxC,4CAA4C;AAC5C,OAAO;AACP,6CAA6C;AAC7C,qEAAqE;AACrE,yBAAyB;AACzB,mDAAmD;AACnD,cAAc;AACd,yDAAyD;AACzD,+BAA+B;AAC/B,wCAAwC;AACxC,kEAAkE;AAClE,aAAa;AACb,UAAU;AACV,eAAe;AACf,2CAA2C;AAC3C,iEAAiE;AACjE,QAAQ;AACR,MAAM;AACN,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,KAAK;AAEL,MAAM,GAAG,GAAG,4BAAK,CAAC,SAAS,CAAC;AAE3B,4BAAa,CAAC,SAAS,GAAG,SAAS,SAAS,CAC3C,KAAQ;IAER,OAAO,GAAG,CAAC,IAAI,CAAC,4BAAK,EAAE,KAAK,CAAuB,CAAC;AACtD,CAAC,CAAC,IAAI,CAAC,4BAAK,CAAC,CAAC;AAEb,4BAAa,CAAC,SAAS,GAAG,SAAS,SAAS,CAC3C,KAAyB;IAEzB,OAAO,CAAC,CAAC,qBAAQ,CAAC,GAAG,CACnB,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAK,CAAC,WAAmB,CAAC,CAAC,CAAC,KAAK,EAChE,2BAAe,CAAC,OAAO,CACxB,CAAC;AACJ,CAAC,CAAC,IAAI,CAAC,4BAAK,CAAC,CAAC;AAEb,qBAAgB,CAAC,QAAQ,GAAG,SAAS,QAAQ,CAC5C,KAAyB;IAEzB,OAAO,CAAC,CAAC,qBAAQ,CAAC,GAAG,CACnB,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAK,CAAC,WAAmB,CAAC,CAAC,CAAC,KAAK,EAChE,2BAAe,CAAC,MAAM,CACvB,CAAC;AACJ,CAAC,CAAC,IAAI,CAAC,qBAAQ,CAAC,CAAC"}
+{"version":3,"file":"overrides.js","sourceRoot":"","sources":["../../../src/shared/overrides/overrides.ts"],"names":[],"mappings":"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"}

package/lib/shared/types.d.ts

@@ -1,6 +1,7 @@
-import { RepositoryFlags } from "@decaf-ts/db-decorators";
 import { TLSOptions } from "fabric-ca-client";
 import { Model } from "@decaf-ts/decorator-validation";
+import { AdapterFlags } from "@decaf-ts/core";
+import { Logger } from "@decaf-ts/logging";
 export type HSMOptions = {
     library: string;
     slot?: number;
@@ -48,14 +49,6 @@ export type PeerConfig = {
     channel: string;
     hsm?: HSMOptions;
 };
-/**
- * @description Flags for Fabric operations
- * @summary Combines repository flags with peer configuration overrides
- * @interface FabricFlags
- * @extends {RepositoryFlags}
- * @memberOf module:for-fabric.shared
- */
-export type FabricFlags = RepositoryFlags;
 /**
  * @description Configuration for connecting to a Hyperledger Fabric peer
  * @summary Contains all the necessary parameters to establish a connection to a Fabric peer and interact with chaincode
@@ -94,3 +87,6 @@ export type SegregatedModel<M extends Model> = {
     private?: Record<keyof M, any>;
     shared?: 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.21";
+exports.VERSION = "0.1.22";
 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.21";
+export declare const VERSION = "0.1.22";
 export declare const PACKAGE_NAME = "@decaf-ts/for-fabric";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decaf-ts/for-fabric",
-  "version": "0.1.22",
+  "version": "0.1.23",
   "description": "Abstracts fabric logic",
   "type": "module",
   "exports": {

package/lib/client/types.cjs

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=types.js.map

package/lib/client/types.d.ts

@@ -1,7 +0,0 @@
-import { ModelConstructor } from "@decaf-ts/decorator-validation";
-export type FabricQuery = {
-    class: ModelConstructor<any> | string;
-    method: string;
-    args: any[];
-    params?: Record<"limit" | "skip", number>;
-};

package/lib/client/types.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":""}

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

@@ -1,7 +0,0 @@
-import { ModelConstructor } from "@decaf-ts/decorator-validation";
-export type FabricQuery = {
-    class: ModelConstructor<any> | string;
-    method: string;
-    args: any[];
-    params?: Record<"limit" | "skip", number>;
-};

package/lib/esm/client/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":""}