@graffy/common 0.15.14 → 0.15.15

package/index.cjs

@@ -271,7 +271,7 @@ function keyBefore(key) {
   return key.charCodeAt(l) === 0 ? key.substr(0, l) : key.substr(0, l) + String.fromCharCode(key.charCodeAt(l) - 1) + "\uFFFF";
 }
 function keyAfter(key) {
-  if (key === "" || key === "\uFFFF" || key === "\0" || key === "\0\uFFFF") {
+  if (key === "\uFFFF" || key === "\0" || key === "\0\uFFFF") {
     return key;
   }
   const l = key.length - 1;
@@ -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;
     }
@@ -643,9 +646,10 @@ function wrap(children, path, version = 0, prefix = false) {
     children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { version, children })];
   return children;
 }
-function unwrap(children, path) {
+function unwrap(tree, path) {
   if (!Array.isArray(path))
     throw Error("unwrap.path_not_array " + path);
+  let children = tree;
   let node = { children };
   for (let i = 0; i < path.length; i++) {
     const { key } = encode$2(path[i]);
@@ -657,6 +661,8 @@ function unwrap(children, path) {
       return void 0;
     if (isRange(node))
       return null;
+    if (node.path)
+      return unwrap(tree, node.path.concat(path.slice(i + 1)));
   }
   return getNodeValue(node);
 }

package/index.mjs

@@ -263,7 +263,7 @@ function keyBefore(key) {
   return key.charCodeAt(l) === 0 ? key.substr(0, l) : key.substr(0, l) + String.fromCharCode(key.charCodeAt(l) - 1) + "\uFFFF";
 }
 function keyAfter(key) {
-  if (key === "" || key === "\uFFFF" || key === "\0" || key === "\0\uFFFF") {
+  if (key === "\uFFFF" || key === "\0" || key === "\0\uFFFF") {
     return key;
   }
   const l = key.length - 1;
@@ -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;
     }
@@ -635,9 +638,10 @@ function wrap(children, path, version = 0, prefix = false) {
     children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { version, children })];
   return children;
 }
-function unwrap(children, path) {
+function unwrap(tree, path) {
   if (!Array.isArray(path))
     throw Error("unwrap.path_not_array " + path);
+  let children = tree;
   let node = { children };
   for (let i = 0; i < path.length; i++) {
     const { key } = encode$2(path[i]);
@@ -649,6 +653,8 @@ function unwrap(children, path) {
       return void 0;
     if (isRange(node))
       return null;
+    if (node.path)
+      return unwrap(tree, node.path.concat(path.slice(i + 1)));
   }
   return getNodeValue(node);
 }

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.14",
+  "version": "0.15.15",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -17,8 +17,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "lodash": "^4.17.19",
-    "nanoid": "^3.1.25",
-    "@graffy/stream": "0.15.14",
+    "nanoid": "^3.1.31",
+    "@graffy/stream": "0.15.15",
     "merge-async-iterators": "^0.2.1"
   }
 }

package/types/ops/path.d.ts

@@ -1,6 +1,6 @@
 export function wrapValue(value: any, path: any, version?: number): any;
 export function wrap(children: any, path: any, version?: number, prefix?: boolean): any;
-export function unwrap(children: any, path: any): any;
+export function unwrap(tree: any, path: any): any;
 export function getNodeValue(node: any): any;
 export function remove(children: any, path: any): any;
 export const IS_VAL: unique symbol;