@brightchain/brightchain-api-lib 0.23.0 → 0.23.2

package/src/lib/utils/serialization.js

@@ -3,18 +3,32 @@
  * @fileoverview Serialization utility for converting typed RBAC documents
  * to their stored (all-string) representation for BrightChainDb.
  *
- * Converts GuidV4Buffer values to hex strings and Date values to ISO strings.
+ * Converts GUID values (GuidV4Buffer / GuidUint8Array) to short hex strings,
+ * BSON ObjectId values to hex strings, Date values to ISO strings, and plain
+ * Buffers to hex strings.
  * This is the inverse of the rehydration functions in ./rehydration.ts.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serializeForStorage = serializeForStorage;
+/**
+ * Type guard: does this value have an `asShortHexGuid` string property?
+ * Matches both GuidV4Buffer (Buffer subclass, node-ecies-lib) and
+ * GuidUint8Array (Uint8Array subclass, ecies-lib browser build).
+ */
+function hasShortHexGuid(value) {
+    return (value !== null &&
+        typeof value === 'object' &&
+        'asShortHexGuid' in value &&
+        typeof value['asShortHexGuid'] === 'string');
+}
 /**
  * Serialize a typed document for storage.
  *
  * Converts:
  *  - Date → ISO-8601 string
- *  - GuidV4Buffer → full hex GUID string
- *  - Buffer → hex string
+ *  - GuidV4Buffer / GuidUint8Array (has asShortHexGuid) → 32-char short hex GUID string
+ *  - Plain Buffer → hex string
+ *  - Object with toHexString() (e.g. BSON ObjectId) → hex string via toHexString()
  *  - Everything else passes through unchanged
  *
  * @template T - The input typed document
@@ -26,12 +40,21 @@ function serializeForStorage(doc) {
         if (value instanceof Date) {
             result[key] = value.toISOString();
         }
-        else if (Buffer.isBuffer(value) && 'asFullHexGuid' in value) {
-            result[key] = value.asFullHexGuid;
+        else if (hasShortHexGuid(value)) {
+            // GuidV4Buffer (Buffer subclass) or GuidUint8Array (Uint8Array subclass)
+            // — use the 32-char no-dashes hex form the schema expects
+            result[key] = value.asShortHexGuid;
         }
         else if (Buffer.isBuffer(value)) {
+            // Plain Buffer (no GUID properties)
             result[key] = value.toString('hex');
         }
+        else if (value !== null &&
+            typeof value === 'object' &&
+            typeof value['toHexString'] === 'function') {
+            // BSON ObjectId (and any other ID type with toHexString())
+            result[key] = value.toHexString();
+        }
         else {
             result[key] = value;
         }

package/src/lib/utils/serialization.js.map

@@ -1 +1 @@
-{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../../../../brightchain-api-lib/src/lib/utils/serialization.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAgBH,kDAiBC;AA7BD;;;;;;;;;;;GAWG;AACH,SAAgB,mBAAmB,CAGjC,GAAM;IACN,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACpC,CAAC;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,eAAe,IAAI,KAAK,EAAE,CAAC;YAC9D,MAAM,CAAC,GAAG,CAAC,GAAI,KAAsB,CAAC,aAAa,CAAC;QACtD,CAAC;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,MAAiB,CAAC;AAC3B,CAAC"}
+{"version":3,"file":"serialization.js","sourceRoot":"","sources":["../../../../../brightchain-api-lib/src/lib/utils/serialization.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;AA6BH,kDA2BC;AAtDD;;;;GAIG;AACH,SAAS,eAAe,CAAC,KAAc;IACrC,OAAO,CACL,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,KAAK,QAAQ;QACzB,gBAAgB,IAAI,KAAK;QACzB,OAAQ,KAAiC,CAAC,gBAAgB,CAAC,KAAK,QAAQ,CACzE,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,mBAAmB,CAGjC,GAAM;IACN,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QACpC,CAAC;aAAM,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,yEAAyE;YACzE,0DAA0D;YAC1D,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC;QACrC,CAAC;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,oCAAoC;YACpC,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;aAAM,IACL,KAAK,KAAK,IAAI;YACd,OAAO,KAAK,KAAK,QAAQ;YACzB,OAAQ,KAAiC,CAAC,aAAa,CAAC,KAAK,UAAU,EACvE,CAAC;YACD,2DAA2D;YAC3D,MAAM,CAAC,GAAG,CAAC,GAAI,KAAuC,CAAC,WAAW,EAAE,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,MAAiB,CAAC;AAC3B,CAAC"}