@graffy/common 0.15.9 → 0.15.11-alpha.1

package/index.cjs

@@ -452,17 +452,17 @@ function splitRef($ref) {
   return splitArgs(tail);
 }
 var id = nonSecure.customAlphabet(alpha, 20);
-function findFirst(children, target) {
+function findFirst(children, target, first, last) {
   return find(children, ({ key, end }) => {
     if (key === target || end && key < target && end >= target)
       return 0;
     if (key < target)
       return -1;
     return 1;
-  });
+  }, first, last);
 }
 function findLast(children, end, first, last) {
-  const ix = findFirst(children, end);
+  const ix = findFirst(children, end, first, last);
   return children[ix] && children[ix].key <= end ? ix + 1 : ix;
 }
 function isRange(node) {
@@ -534,6 +534,8 @@ function clone(node) {
 }
 function merge(current, changes) {
   let index = 0;
+  if (typeof changes === "undefined")
+    return current;
   for (const change of changes) {
     index = isRange(change) ? insertRange$1(current, change, index) : insertNode$1(current, change, index);
   }
@@ -541,8 +543,8 @@ function merge(current, changes) {
 }
 function insertRange$1(current, change, start = 0) {
   const { key, end } = change;
-  const keyIx = findFirst(current, key);
-  const endIx = findLast(current, end);
+  const keyIx = findFirst(current, key, start);
+  const endIx = findLast(current, end, keyIx);
   const insertions = [change];
   for (let i = keyIx; i < endIx; i++) {
     const node = current[i];
@@ -553,7 +555,7 @@ function insertRange$1(current, change, start = 0) {
     }
   }
   current.splice(keyIx, endIx - keyIx, ...insertions);
-  return keyIx + insertions.length;
+  return keyIx + insertions.length - 1;
 }
 function mergeRanges$1(base, node) {
   if (node.version < base.version)
@@ -568,7 +570,7 @@ function insertNode$1(current, change, start = 0) {
   if (!current)
     throw new Error("merge.insertNode: " + current);
   const key = change.key;
-  const index = findFirst(current, key);
+  const index = findFirst(current, key, start);
   const node = current[index];
   if (node && node.key <= key) {
     return isRange(node) ? insertNodeIntoRange$1(current, index, change) : updateNode$1(current, index, change);
@@ -589,7 +591,7 @@ function insertNodeIntoRange$1(current, index, change) {
     range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
-  return index + insertions.length;
+  return index + insertions.length - 1;
 }
 function updateNode$1(current, index, change) {
   const node = current[index];
@@ -684,7 +686,7 @@ function remove(children, path) {
   if (!isBranch(node))
     return children;
   const filteredChildren = remove(node.children, path.slice(1));
-  if (filteredChildren === path.children)
+  if (filteredChildren === children)
     return children;
   const filteredNode = filteredChildren.length ? __spreadProps(__spreadValues({}, node), { children: filteredChildren }) : [];
   return children.slice(0, ix).concat(filteredNode, children.slice(ix + 1));
@@ -818,8 +820,8 @@ function sieve(current, changes, result = []) {
 }
 function insertRange(current, change, result, start = 0) {
   const { key, end } = change;
-  const keyIx = findFirst(current, key);
-  const endIx = findLast(current, end);
+  const keyIx = findFirst(current, key, start);
+  const endIx = findLast(current, end, keyIx);
   if (keyIx === endIx && !(current[keyIx] && current[keyIx].key <= key && current[keyIx].end >= end)) {
     return keyIx;
   }
@@ -869,7 +871,7 @@ function insertRange(current, change, result, start = 0) {
     }
   }
   current.splice(keyIx, endIx - keyIx, ...insertions);
-  return keyIx + insertions.length;
+  return keyIx + insertions.length - 1;
 }
 function mergeRanges(base, node) {
   if (node.version < base.version)
@@ -882,7 +884,7 @@ function mergeRanges(base, node) {
 }
 function insertNode(current, change, result, start = 0) {
   const key = change.key;
-  const index = findFirst(current, key);
+  const index = findFirst(current, key, start);
   const node = current[index];
   if (node && node.key <= key) {
     return isRange(node) ? insertNodeIntoRange(current, index, change, result) : updateNode(current, index, change, result);
@@ -904,7 +906,7 @@ function insertNodeIntoRange(current, index, change, result) {
     range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
-  return index + insertions.length;
+  return index + insertions.length - 1;
 }
 function updateNode(current, index, change, result) {
   const node = current[index];
@@ -989,9 +991,10 @@ function getKnown(graph, version = 0) {
 }
 function finalize(graph, query, version = Date.now()) {
   let result = [{ key: "", end: "\uFFFF", version: 0 }];
+  merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  result = setVersion(merge(result, graph), version);
+  result = setVersion(result, version);
   return result;
 }
 function decode(nodes = [], { isGraph } = {}) {
@@ -1059,7 +1062,7 @@ function decode(nodes = [], { isGraph } = {}) {
       }, allStrs ? {} : []);
     }
     if (isGraph && putRanges.length) {
-      if (putRanges.length === 1 && putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
+      if (putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
         result.$put = true;
       } else {
         result.$put = putRanges.map((rNode) => decode$2(rNode));
@@ -1169,7 +1172,8 @@ function decorate(rootGraph, rootQuery) {
           return subResult;
         });
       });
-      addPageMeta(graph, pageKey);
+      if (pageKey)
+        addPageMeta(graph, pageKey);
     } else if (typeof query === "object") {
       graph = {};
       for (const prop in query) {

package/index.mjs

@@ -444,17 +444,17 @@ function splitRef($ref) {
   return splitArgs(tail);
 }
 var id = customAlphabet(alpha, 20);
-function findFirst(children, target) {
+function findFirst(children, target, first, last) {
   return find(children, ({ key, end }) => {
     if (key === target || end && key < target && end >= target)
       return 0;
     if (key < target)
       return -1;
     return 1;
-  });
+  }, first, last);
 }
 function findLast(children, end, first, last) {
-  const ix = findFirst(children, end);
+  const ix = findFirst(children, end, first, last);
   return children[ix] && children[ix].key <= end ? ix + 1 : ix;
 }
 function isRange(node) {
@@ -526,6 +526,8 @@ function clone(node) {
 }
 function merge(current, changes) {
   let index = 0;
+  if (typeof changes === "undefined")
+    return current;
   for (const change of changes) {
     index = isRange(change) ? insertRange$1(current, change, index) : insertNode$1(current, change, index);
   }
@@ -533,8 +535,8 @@ function merge(current, changes) {
 }
 function insertRange$1(current, change, start = 0) {
   const { key, end } = change;
-  const keyIx = findFirst(current, key);
-  const endIx = findLast(current, end);
+  const keyIx = findFirst(current, key, start);
+  const endIx = findLast(current, end, keyIx);
   const insertions = [change];
   for (let i = keyIx; i < endIx; i++) {
     const node = current[i];
@@ -545,7 +547,7 @@ function insertRange$1(current, change, start = 0) {
     }
   }
   current.splice(keyIx, endIx - keyIx, ...insertions);
-  return keyIx + insertions.length;
+  return keyIx + insertions.length - 1;
 }
 function mergeRanges$1(base, node) {
   if (node.version < base.version)
@@ -560,7 +562,7 @@ function insertNode$1(current, change, start = 0) {
   if (!current)
     throw new Error("merge.insertNode: " + current);
   const key = change.key;
-  const index = findFirst(current, key);
+  const index = findFirst(current, key, start);
   const node = current[index];
   if (node && node.key <= key) {
     return isRange(node) ? insertNodeIntoRange$1(current, index, change) : updateNode$1(current, index, change);
@@ -581,7 +583,7 @@ function insertNodeIntoRange$1(current, index, change) {
     range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
-  return index + insertions.length;
+  return index + insertions.length - 1;
 }
 function updateNode$1(current, index, change) {
   const node = current[index];
@@ -676,7 +678,7 @@ function remove(children, path) {
   if (!isBranch(node))
     return children;
   const filteredChildren = remove(node.children, path.slice(1));
-  if (filteredChildren === path.children)
+  if (filteredChildren === children)
     return children;
   const filteredNode = filteredChildren.length ? __spreadProps(__spreadValues({}, node), { children: filteredChildren }) : [];
   return children.slice(0, ix).concat(filteredNode, children.slice(ix + 1));
@@ -810,8 +812,8 @@ function sieve(current, changes, result = []) {
 }
 function insertRange(current, change, result, start = 0) {
   const { key, end } = change;
-  const keyIx = findFirst(current, key);
-  const endIx = findLast(current, end);
+  const keyIx = findFirst(current, key, start);
+  const endIx = findLast(current, end, keyIx);
   if (keyIx === endIx && !(current[keyIx] && current[keyIx].key <= key && current[keyIx].end >= end)) {
     return keyIx;
   }
@@ -861,7 +863,7 @@ function insertRange(current, change, result, start = 0) {
     }
   }
   current.splice(keyIx, endIx - keyIx, ...insertions);
-  return keyIx + insertions.length;
+  return keyIx + insertions.length - 1;
 }
 function mergeRanges(base, node) {
   if (node.version < base.version)
@@ -874,7 +876,7 @@ function mergeRanges(base, node) {
 }
 function insertNode(current, change, result, start = 0) {
   const key = change.key;
-  const index = findFirst(current, key);
+  const index = findFirst(current, key, start);
   const node = current[index];
   if (node && node.key <= key) {
     return isRange(node) ? insertNodeIntoRange(current, index, change, result) : updateNode(current, index, change, result);
@@ -896,7 +898,7 @@ function insertNodeIntoRange(current, index, change, result) {
     range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
-  return index + insertions.length;
+  return index + insertions.length - 1;
 }
 function updateNode(current, index, change, result) {
   const node = current[index];
@@ -981,9 +983,10 @@ function getKnown(graph, version = 0) {
 }
 function finalize(graph, query, version = Date.now()) {
   let result = [{ key: "", end: "\uFFFF", version: 0 }];
+  merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  result = setVersion(merge(result, graph), version);
+  result = setVersion(result, version);
   return result;
 }
 function decode(nodes = [], { isGraph } = {}) {
@@ -1051,7 +1054,7 @@ function decode(nodes = [], { isGraph } = {}) {
       }, allStrs ? {} : []);
     }
     if (isGraph && putRanges.length) {
-      if (putRanges.length === 1 && putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
+      if (putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
         result.$put = true;
       } else {
         result.$put = putRanges.map((rNode) => decode$2(rNode));
@@ -1161,7 +1164,8 @@ function decorate(rootGraph, rootQuery) {
           return subResult;
         });
       });
-      addPageMeta(graph, pageKey);
+      if (pageKey)
+        addPageMeta(graph, pageKey);
     } else if (typeof query === "object") {
       graph = {};
       for (const prop in query) {

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.9",
+  "version": "0.15.11-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -19,6 +19,6 @@
     "lodash": "^4.17.19",
     "nanoid": "^3.1.25",
     "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.15.9"
+    "@graffy/stream": "0.15.11-alpha.1"
   }
 }

package/types/node/find.d.ts

@@ -1,2 +1,2 @@
-export function findFirst(children: any, target: any): number;
+export function findFirst(children: any, target: any, first: any, last: any): number;
 export function findLast(children: any, end: any, first: any, last: any): number;