@graffy/common 0.15.15-alpha.2 → 0.15.17

package/index.cjs

@@ -502,8 +502,11 @@ function add(base, diff) {
     }
     if (nodeIsBranch && itemIsBranch) {
       changed = add(item.children, node.children) || changed;
-    } else if (nodeIsBranch || itemIsBranch) {
-      throw new Error("add.branch_leaf_mismatch");
+    } else if (nodeIsBranch) {
+      continue;
+    } else if (itemIsBranch) {
+      item.value = node.value;
+      changed = true;
     } else {
       item.value += node.value;
     }
@@ -1057,18 +1060,22 @@ function decode(nodes = [], { isGraph } = {}) {
           delete item.$key;
           return collection;
         }
-        const _a = item, { $key, $val } = _a, rest = __objRest(_a, ["$key", "$val"]);
+        const { $key, $val } = item;
+        delete item.$key;
+        delete item.$val;
         if (typeof $val === "object")
           $val.$val = true;
-        collection[$key] = isDef($val) ? $val : !isEmpty(rest) ? rest : isGraph ? null : true;
+        collection[$key] = isDef($val) ? $val : !isEmpty(item) ? item : isGraph ? null : true;
         return collection;
       }, allStrs ? {} : []);
     }
     if (isGraph && putRanges.length) {
       if (putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
-        result.$put = true;
+        Object.defineProperty(result, "$put", { value: true });
       } else {
-        result.$put = putRanges.map((rNode) => decode$2(rNode));
+        Object.defineProperty(result, "$put", {
+          value: putRanges.map((rNode) => decode$2(rNode))
+        });
       }
     }
     return result;
@@ -1193,7 +1200,7 @@ function decorate(rootGraph, rootQuery) {
       } else if (Array.isArray(plumGraph)) {
         graph = decodeGraph(plumGraph);
       } else {
-        throw Error("decorate.unexpected_graph", plumGraph);
+        throw Error("decorate.unexpected_graph");
       }
     }
     if (plumGraph[REF])

package/index.mjs

@@ -494,8 +494,11 @@ function add(base, diff) {
     }
     if (nodeIsBranch && itemIsBranch) {
       changed = add(item.children, node.children) || changed;
-    } else if (nodeIsBranch || itemIsBranch) {
-      throw new Error("add.branch_leaf_mismatch");
+    } else if (nodeIsBranch) {
+      continue;
+    } else if (itemIsBranch) {
+      item.value = node.value;
+      changed = true;
     } else {
       item.value += node.value;
     }
@@ -1049,18 +1052,22 @@ function decode(nodes = [], { isGraph } = {}) {
           delete item.$key;
           return collection;
         }
-        const _a = item, { $key, $val } = _a, rest = __objRest(_a, ["$key", "$val"]);
+        const { $key, $val } = item;
+        delete item.$key;
+        delete item.$val;
         if (typeof $val === "object")
           $val.$val = true;
-        collection[$key] = isDef($val) ? $val : !isEmpty(rest) ? rest : isGraph ? null : true;
+        collection[$key] = isDef($val) ? $val : !isEmpty(item) ? item : isGraph ? null : true;
         return collection;
       }, allStrs ? {} : []);
     }
     if (isGraph && putRanges.length) {
       if (putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
-        result.$put = true;
+        Object.defineProperty(result, "$put", { value: true });
       } else {
-        result.$put = putRanges.map((rNode) => decode$2(rNode));
+        Object.defineProperty(result, "$put", {
+          value: putRanges.map((rNode) => decode$2(rNode))
+        });
       }
     }
     return result;
@@ -1185,7 +1192,7 @@ function decorate(rootGraph, rootQuery) {
       } else if (Array.isArray(plumGraph)) {
         graph = decodeGraph(plumGraph);
       } else {
-        throw Error("decorate.unexpected_graph", plumGraph);
+        throw Error("decorate.unexpected_graph");
       }
     }
     if (plumGraph[REF])

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/common",
   "description": "Common libraries that used by various Graffy modules.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.15-alpha.2",
+  "version": "0.15.17",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -17,8 +17,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "lodash": "^4.17.19",
-    "nanoid": "^3.1.25",
     "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.15.15-alpha.2"
+    "@graffy/stream": "0.15.17",
+    "nanoid": "^3.2.0"
   }
 }