fix: did:peer:2 abbreviations not working quite right

Signed-off-by: Daniel Bluhm <dbluhm@pm.me>
decentralized-identity · Nov 7, 2023 · 1d9ba83 · 1d9ba83
1 parent 3d21f4b
commit 1d9ba83
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/lib/peer2.ts b/src/lib/peer2.ts
@@ -114,10 +114,14 @@ export default class DIDPeer {
     const expanded = Object.fromEntries(
       Object.entries(input).map(([key, value]) => {
         const expandedKey = reverseCommonStringAbbreviations[key] || key
-        const expandedValue =
-          typeof value === "string"
-            ? reverseCommonStringAbbreviations[value] || value
-            : value
+        let expandedValue = value;
+        if (typeof value == "string") {
+          expandedValue = reverseCommonStringAbbreviations[value] || value
+        } else if (Array.isArray(value)) {
+          expandedValue = value.map((item: any) => reverseCommonStringAbbreviations[item] || item)
+        } else if (typeof value == "object") {
+          expandedValue = DIDPeer.expandCommonStringAbbreviations(expandedValue)
+        }
         return [expandedKey, expandedValue]
       })
     )
@@ -128,10 +132,14 @@ export default class DIDPeer {
     const abbreviated = Object.fromEntries(
       Object.entries(input).map(([key, value]) => {
         const abbreviatedKey = commonStringAbbreviations[key] || key
-        const abbreviatedValue =
-          typeof value === "string"
-            ? commonStringAbbreviations[value] || value
-            : value
+        let abbreviatedValue = value
+        if (typeof value == "string") {
+          abbreviatedValue = commonStringAbbreviations[value] || value
+        } else if (Array.isArray(value)) {
+          abbreviatedValue = value.map((item: any) => commonStringAbbreviations[item] || item)
+        } else if (typeof value == "object") {
+          abbreviatedValue = DIDPeer.abbreviateCommonStrings(abbreviatedValue)
+        }
         return [abbreviatedKey, abbreviatedValue]
       })
     )