@graffy/common 0.15.25-alpha.1 → 0.15.25-alpha.2

package/index.cjs

@@ -1,46 +1,12 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports[Symbol.toStringTag] = "Module";
-var nonSecure = require("nanoid/non-secure");
-var mergeIterators = require("merge-async-iterators");
-var stream = require("@graffy/stream");
-var isEqual = require("lodash/isEqual.js");
-function _interopDefaultLegacy(e) {
-  return e && typeof e === "object" && "default" in e ? e : { "default": e };
-}
-var mergeIterators__default = /* @__PURE__ */ _interopDefaultLegacy(mergeIterators);
-var isEqual__default = /* @__PURE__ */ _interopDefaultLegacy(isEqual);
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const nonSecure = require("nanoid/non-secure");
+const mergeIterators = require("merge-async-iterators");
+const stream = require("@graffy/stream");
+const isEqual = require("lodash/isEqual.js");
+const _interopDefaultLegacy = (e) => e && typeof e === "object" && "default" in e ? e : { default: e };
+const mergeIterators__default = /* @__PURE__ */ _interopDefaultLegacy(mergeIterators);
+const isEqual__default = /* @__PURE__ */ _interopDefaultLegacy(isEqual);
 function encode$7(query) {
   return encodeURIComponent(JSON.stringify(query));
 }
@@ -79,7 +45,7 @@ function decode$5(u8Arr) {
   }
   return view.getFloat64(0);
 }
-var alpha = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
+const alpha = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
 function getByte(view, offset) {
   return offset < view.byteLength ? view.getUint8(offset) : 0;
 }
@@ -163,7 +129,10 @@ function encode$3(value) {
   const parts = encodeParts(value);
   while (parts[parts.length - 1] === END)
     parts.pop();
-  const length = parts.reduce((sum, part) => sum + (typeof part === "number" ? 1 : part.length), 0);
+  const length = parts.reduce(
+    (sum, part) => sum + (typeof part === "number" ? 1 : part.length),
+    0
+  );
   const buffer = new Uint8Array(length);
   let i = 0;
   for (const part of parts) {
@@ -177,7 +146,7 @@ function encode$3(value) {
   }
   return encode$4(buffer);
 }
-const nextKey = new WeakMap();
+const nextKey = /* @__PURE__ */ new WeakMap();
 function decode$3(key) {
   let i = 0;
   const buffer = decode$4(key, 0);
@@ -277,8 +246,7 @@ function keyAfter(key) {
   const l = key.length - 1;
   return key.charCodeAt(l) === 65535 ? key.substr(0, l - 1) + String.fromCharCode(key.charCodeAt(l - 1) + 1) : key + "\0";
 }
-function err(message, _a = {}) {
-  var _b = _a, { cause } = _b, args = __objRest(_b, ["cause"]);
+function err(message, { cause, ...args } = {}) {
   const e = new Error(message + (args ? " " + JSON.stringify(args) : ""));
   e.cause = cause;
   throw e;
@@ -356,7 +324,7 @@ function encode$2(arg) {
   errIf("page_and_filter", page && filter, arg);
   if (!page)
     return { key: maybeEncode(filter || {}) };
-  const _a = page, { $cursor } = _a, range = __objRest(_a, ["$cursor"]);
+  const { $cursor, ...range } = page;
   const { $first, $all, $last, $after, $before, $since, $until } = range;
   const hasRange = !isEmpty(range);
   errIf("first_and_last", isDef($first) && isDef($last), arg);
@@ -451,15 +419,20 @@ function splitRef($ref) {
     return [];
   return splitArgs(tail);
 }
-var id = nonSecure.customAlphabet(alpha, 20);
+const id = nonSecure.customAlphabet(alpha, 20);
 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);
+  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, first, last);
@@ -530,7 +503,7 @@ function compareValue(a, b) {
   return a < b ? -1 : 1;
 }
 function clone(node) {
-  const copy = __spreadValues({}, node);
+  const copy = { ...node };
   if (node.children)
     copy.children = node.children.map((child) => clone(child));
   return copy;
@@ -564,9 +537,9 @@ function mergeRanges$1(base, node) {
   if (node.version < base.version)
     [node, base] = [base, node];
   return [
-    base.key < node.key && __spreadProps(__spreadValues({}, base), { end: keyBefore(node.key) }),
+    base.key < node.key && { ...base, end: keyBefore(node.key) },
     node,
-    base.end > node.end && __spreadProps(__spreadValues({}, base), { key: keyAfter(node.end) })
+    base.end > node.end && { ...base, key: keyAfter(node.end) }
   ].filter(Boolean);
 }
 function insertNode$1(current, change, start = 0) {
@@ -589,9 +562,9 @@ function insertNodeIntoRange$1(current, index, change) {
   if (!newChange)
     return;
   const insertions = [
-    range.key < key && __spreadProps(__spreadValues({}, range), { end: keyBefore(key) }),
+    range.key < key && { ...range, end: keyBefore(key) },
     newChange,
-    range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
+    range.end > key && { ...range, key: keyAfter(key) }
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
   return index + insertions.length - 1;
@@ -617,14 +590,14 @@ function getNewer(node, base) {
   if (isBranch(node)) {
     const children = [{ key: "", end: "\uFFFF", version }];
     merge(children, node.children);
-    return children.length === 1 ? null : __spreadProps(__spreadValues({}, node), { children });
+    return children.length === 1 ? null : { ...node, children };
   } else {
     return node.version >= version ? node : null;
   }
 }
 const IS_VAL = Symbol("IS_VAL");
 function wrapValue(value, path, version = 0) {
-  const node = __spreadProps(__spreadValues({}, encode$2(path[path.length - 1])), { value, version });
+  const node = { ...encode$2(path[path.length - 1]), value, version };
   return wrap([node], path.slice(0, -1), version);
 }
 function wrap(children, path, version = 0, prefix = false) {
@@ -634,16 +607,16 @@ function wrap(children, path, version = 0, prefix = false) {
     return children;
   let i = path.length - 1;
   if (!Array.isArray(children)) {
-    children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { value: children, version })];
+    children = [{ ...encode$2(path[i--]), value: children, version }];
   } else {
     if (!children.length)
       return;
-    children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { version, children })];
+    children = [{ ...encode$2(path[i--]), version, children }];
   }
   if (prefix)
     children[0].prefix = true;
   while (i >= 0)
-    children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { version, children })];
+    children = [{ ...encode$2(path[i--]), version, children }];
   return children;
 }
 function unwrap(tree, path) {
@@ -694,7 +667,7 @@ function remove(children, path) {
   const filteredChildren = remove(node.children, path.slice(1));
   if (filteredChildren === children)
     return children;
-  const filteredNode = filteredChildren.length ? __spreadProps(__spreadValues({}, node), { children: filteredChildren }) : [];
+  const filteredNode = filteredChildren.length ? { ...node, children: filteredChildren } : [];
   return children.slice(0, ix).concat(filteredNode, children.slice(ix + 1));
 }
 class Result {
@@ -743,7 +716,10 @@ function sliceNode(graph, query, result) {
     result.addUnknown(query);
   } else if (isRange(graph)) {
     if (isBranch(query)) {
-      const { known } = slice([{ key: "", end: "\uFFFF", version: graph.version }], query.children);
+      const { known } = slice(
+        [{ key: "", end: "\uFFFF", version: graph.version }],
+        query.children
+      );
       result.addKnown({ key, version: graph.version, children: known });
     } else {
       result.addKnown({ key, end: key, version: graph.version });
@@ -751,20 +727,30 @@ function sliceNode(graph, query, result) {
   } else if (isBranch(graph) && isBranch(query)) {
     const { known, unknown } = slice(graph.children, query.children, root);
     if (known)
-      result.addKnown(__spreadProps(__spreadValues({}, graph), { children: known }));
+      result.addKnown({ ...graph, children: known });
     if (unknown)
-      result.addUnknown(__spreadProps(__spreadValues({}, query), { children: unknown }));
+      result.addUnknown({ ...query, children: unknown });
   } else if (isLink(graph)) {
     result.addKnown(graph);
     if (graph.prefix && isRange(query)) {
       result.addLinked(wrap([query], graph.path, version, true));
     } else {
-      result.addLinked(wrap(query.children || query.value, graph.path, version, graph.prefix || query.prefix));
+      result.addLinked(
+        wrap(
+          query.children || query.value,
+          graph.path,
+          version,
+          graph.prefix || query.prefix
+        )
+      );
     }
   } else if (isBranch(graph)) {
     result.addKnown(graph);
   } else if (isBranch(query)) {
-    const { known } = slice([{ key: "", end: "\uFFFF", version: graph.version }], query.children);
+    const { known } = slice(
+      [{ key: "", end: "\uFFFF", version: graph.version }],
+      query.children
+    );
     result.addKnown({ key, version: graph.version, children: known });
   } else {
     result.addKnown(graph);
@@ -776,9 +762,9 @@ function sliceRange(graph, query, result) {
   if (graph[0].key === "" && graph[0].prefix && graph[0].children) {
     const { known, unknown } = slice(graph[0].children, [query], result.root);
     if (known)
-      result.addKnown(__spreadProps(__spreadValues({}, graph[0]), { children: known }));
+      result.addKnown({ ...graph[0], children: known });
     if (unknown)
-      result.addUnknown(__spreadProps(__spreadValues({}, query[0]), { children: unknown }));
+      result.addUnknown({ ...query[0], children: unknown });
     return;
   }
   if (key < end) {
@@ -789,7 +775,7 @@ function sliceRange(graph, query, result) {
       if (isRange(node)) {
         result.addKnown(getOverlap(node, key, end));
       } else {
-        sliceNode(node, __spreadProps(__spreadValues({}, query), { key }), result);
+        sliceNode(node, { ...query, key }, result);
         limit--;
       }
       key = keyAfter(node.end || node.key);
@@ -802,24 +788,25 @@ function sliceRange(graph, query, result) {
       if (isRange(node)) {
         result.addKnown(getOverlap(node, end, key));
       } else {
-        sliceNode(node, __spreadProps(__spreadValues({}, query), { key }), result);
+        sliceNode(node, { ...query, key }, result);
         limit--;
       }
       key = keyBefore(node.key);
     }
   }
   if (limit && (step < 0 ? key > end : key < end)) {
-    const unknown = __spreadProps(__spreadValues({}, query), { key, end, limit });
+    const unknown = { ...query, key, end, limit };
     result.addUnknown(unknown);
   }
 }
 function getOverlap(node, key, end) {
   if (node.key >= key && node.end <= end)
     return node;
-  return __spreadProps(__spreadValues({}, node), {
+  return {
+    ...node,
     key: node.key > key ? node.key : key,
     end: node.end < end ? node.end : end
-  });
+  };
 }
 function sieve(current, changes, result = []) {
   let index = 0;
@@ -887,9 +874,9 @@ function mergeRanges(base, node) {
   if (node.version < base.version)
     [node, base] = [base, node];
   return [
-    base.key < node.key && __spreadProps(__spreadValues({}, base), { end: keyBefore(node.key) }),
+    base.key < node.key && { ...base, end: keyBefore(node.key) },
     node,
-    base.end > node.end && __spreadProps(__spreadValues({}, base), { key: keyAfter(node.end) })
+    base.end > node.end && { ...base, key: keyAfter(node.end) }
   ].filter(Boolean);
 }
 function insertNode(current, change, result, start = 0) {
@@ -911,9 +898,9 @@ function insertNodeIntoRange(current, index, change, result) {
     return;
   result.push(newChange);
   const insertions = [
-    range.key < key && __spreadProps(__spreadValues({}, range), { end: keyBefore(key) }),
+    range.key < key && { ...range, end: keyBefore(key) },
     newNode,
-    range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
+    range.end > key && { ...range, key: keyAfter(key) }
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
   return index + insertions.length - 1;
@@ -925,7 +912,7 @@ function updateNode(current, index, change, result) {
     node.version = change.version;
     sieve(node.children, change.children, nextResult);
     if (nextResult.length)
-      result.push(__spreadProps(__spreadValues({}, change), { children: nextResult }));
+      result.push({ ...change, children: nextResult });
   } else if (isBranch(node)) {
     const newNode = getNewerNode(node, change);
     current[index] = newNode || change;
@@ -960,15 +947,17 @@ function getNewerNode(node, base) {
     const emptyNode = { key: "", end: "\uFFFF", version: base.version };
     const children = [emptyNode];
     sieve(children, node.children);
-    return children.length === 1 && children[0] === emptyNode ? null : __spreadProps(__spreadValues({}, node), { children });
+    return children.length === 1 && children[0] === emptyNode ? null : { ...node, children };
   } else {
     return node.version >= base.version ? node : null;
   }
 }
 function getNewerChange(node, base) {
   if (isBranch(node)) {
-    const children = node.children.filter((child) => getNewerChange(child, base));
-    return children.length && __spreadProps(__spreadValues({}, node), { children });
+    const children = node.children.filter(
+      (child) => getNewerChange(child, base)
+    );
+    return children.length && { ...node, children };
   } else {
     return node.version >= base.version ? node : null;
   }
@@ -1058,21 +1047,24 @@ function decode(nodes = [], { isGraph } = {}) {
         pushResult(decodeLeafNode(node));
     }
     if (allNums || allStrs) {
-      result = result.reduce((collection, item) => {
-        if (Array.isArray(item)) {
-          collection[item.$key] = item;
+      result = result.reduce(
+        (collection, item) => {
+          if (Array.isArray(item)) {
+            collection[item.$key] = item;
+            delete item.$key;
+            return collection;
+          }
+          const { $key, $val } = item;
           delete item.$key;
+          delete item.$val;
+          if (typeof $val === "object") {
+            Object.defineProperty($val, "$val", { value: true });
+          }
+          collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
           return collection;
-        }
-        const { $key, $val } = item;
-        delete item.$key;
-        delete item.$val;
-        if (typeof $val === "object") {
-          Object.defineProperty($val, "$val", { value: true });
-        }
-        collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
-        return collection;
-      }, allStrs ? {} : []);
+        },
+        allStrs ? {} : []
+      );
     }
     if (isGraph && putRanges.length) {
       if (putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
@@ -1115,7 +1107,7 @@ function decode(nodes = [], { isGraph } = {}) {
       if (!splitArgs(child.$key)[0]) {
         child.$key = { $cursor: child.$key };
       }
-      child.$key = __spreadValues(__spreadValues({}, args), child.$key);
+      child.$key = { ...args, ...child.$key };
     }
     return children;
   }
@@ -1158,13 +1150,16 @@ function decorate(rootGraph, rootQuery) {
       query = [query];
     let graph;
     if (query.$ref) {
-      const _a = query, { $ref } = _a, props = __objRest(_a, ["$ref"]);
+      const { $ref, ...props } = query;
       const [range, filter] = splitRef($ref);
       const path = encode$1($ref);
       const targetPlumGraph = unwrap(rootGraph, path);
       if (range)
         targetPlumGraph[PRE] = filter;
-      graph = construct(targetPlumGraph, range ? __spreadValues({ $key: range }, props) : props);
+      graph = construct(
+        targetPlumGraph,
+        range ? { $key: range, ...props } : props
+      );
       Object.defineProperty(graph, "$ref", { value: $ref });
     } else if (Array.isArray(query)) {
       let pageKey;
@@ -1172,13 +1167,15 @@ function decorate(rootGraph, rootQuery) {
         if (!(item == null ? void 0 : item.$key)) {
           return construct(descend(plumGraph, i), item);
         }
-        const _a2 = item, { $key, $chi } = _a2, props = __objRest(_a2, ["$key", "$chi"]);
+        const { $key, $chi, ...props } = item;
         const subQuery = $chi || (isEmpty(props) ? 1 : props);
         if (!isPlainObject($key) || !splitArgs($key)[0]) {
           return construct(descend(plumGraph, $key), subQuery);
         }
         if (pageKey) {
-          throw Error("decorate.multi_range_query:" + JSON.stringify({ $key, pageKey }));
+          throw Error(
+            "decorate.multi_range_query:" + JSON.stringify({ $key, pageKey })
+          );
         }
         pageKey = $key;
         const children = slice2(plumGraph, $key);
@@ -1186,7 +1183,7 @@ function decorate(rootGraph, rootQuery) {
           const $key2 = decode$2(node);
           const subResult = construct(getValue(node), subQuery);
           if (typeof subResult === "object") {
-            subResult.$key = children[PRE] ? __spreadProps(__spreadValues({}, children[PRE]), { $cursor: $key2 }) : $key2;
+            subResult.$key = children[PRE] ? { ...children[PRE], $cursor: $key2 } : $key2;
           }
           return subResult;
         });
@@ -1204,7 +1201,7 @@ function decorate(rootGraph, rootQuery) {
       } else if (typeof plumGraph !== "object" || !plumGraph) {
         graph = plumGraph;
       } else if (plumGraph[IS_VAL]) {
-        graph = Array.isArray(plumGraph) ? plumGraph.slice(0) : __spreadValues({}, plumGraph);
+        graph = Array.isArray(plumGraph) ? plumGraph.slice(0) : { ...plumGraph };
         graph.$val = true;
       } else if (Array.isArray(plumGraph)) {
         graph = decodeGraph(plumGraph);
@@ -1285,9 +1282,9 @@ function addPageMeta(graph, args) {
     Object.assign(graph, { $page: args, $prev: null, $next: null });
     return;
   }
-  const [_a, ..._b] = splitArgs(args), _c = _a, { $first, $last } = _c, bounds = __objRest(_c, ["$first", "$last"]), [filter] = _b;
+  const [{ $first, $last, ...bounds }, filter] = splitArgs(args);
   const count = $first || $last;
-  const $page = __spreadProps(__spreadValues(__spreadValues({}, filter), bounds), { $all: true });
+  const $page = { ...filter, ...bounds, $all: true };
   if (graph.length === count) {
     if ($first) {
       const boundKey = graph[graph.length - 1].$key;
@@ -1299,8 +1296,8 @@ function addPageMeta(graph, args) {
       delete $page.$after;
     }
   }
-  const $prev = isDef($page.$after) ? __spreadProps(__spreadValues({}, filter), { $last: count, $until: $page.$after }) : isDef($page.$since) ? __spreadProps(__spreadValues({}, filter), { $last: count, $before: $page.$since }) : null;
-  let $next = isDef($page.$before) ? __spreadProps(__spreadValues({}, filter), { $first: count, $since: $page.$before }) : isDef($page.$until) ? __spreadProps(__spreadValues({}, filter), { $first: count, $after: $page.$until }) : null;
+  const $prev = isDef($page.$after) ? { ...filter, $last: count, $until: $page.$after } : isDef($page.$since) ? { ...filter, $last: count, $before: $page.$since } : null;
+  let $next = isDef($page.$before) ? { ...filter, $first: count, $since: $page.$before } : isDef($page.$until) ? { ...filter, $first: count, $after: $page.$until } : null;
   Object.assign(graph, { $page, $next, $prev });
 }
 function serialize(obj) {
@@ -1315,35 +1312,47 @@ function encode(value, { version, isGraph } = {}) {
   const links = [];
   function pushLink($ref, $ver, props, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props) ? makeNode(range ? [__spreadValues({ $key: range }, props)] : props, void 0, $ver).children : isDef($chi) ? makeNode(range ? [{ $key: range, $chi }] : $chi, void 0, $ver).children : isDef($val) ? $val : isGraph ? void 0 : 1;
+    let children = !isEmpty(props) ? makeNode(
+      range ? [{ $key: range, ...props }] : props,
+      void 0,
+      $ver
+    ).children : isDef($chi) ? makeNode(
+      range ? [{ $key: range, $chi }] : $chi,
+      void 0,
+      $ver
+    ).children : isDef($val) ? $val : isGraph ? void 0 : 1;
     if (children) {
       links.push(wrap(children, encode$1($ref), $ver, !!range)[0]);
     }
   }
   const combine = isGraph ? merge : add;
   function makeNode(object, key, ver) {
-    var _b;
+    var _a2;
     if (!isDef(object))
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const _a2 = object || {}, { $key, $ver, $ref, $val, $chi, $put } = _a2, props = __objRest(_a2, ["$key", "$ver", "$ref", "$val", "$chi", "$put"]);
+    const { $key, $ver, $ref, $val, $chi, $put, ...props } = object || {};
     if (isDef($ver))
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
       if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props))) {
-        const node2 = makeNode(__spreadProps(__spreadValues({}, object), { $key: filter || "" }), key, ver);
+        const node2 = makeNode({ ...object, $key: filter || "" }, key, ver);
         node2.prefix = true;
         return node2;
       }
       if ((!isDef(key) || Number.isInteger(key)) && page && (filter || isDef(page.$cursor))) {
-        const node2 = makeNode({
-          $key: filter || "",
-          $chi: [
-            __spreadProps(__spreadValues({}, object), { $key: isDef(page.$cursor) ? page.$cursor : page })
-          ]
-        }, key, ver);
+        const node2 = makeNode(
+          {
+            $key: filter || "",
+            $chi: [
+              { ...object, $key: isDef(page.$cursor) ? page.$cursor : page }
+            ]
+          },
+          key,
+          ver
+        );
         node2.prefix = true;
         return node2;
       }
@@ -1410,7 +1419,7 @@ function encode(value, { version, isGraph } = {}) {
     if (isGraph && isDef(putQuery)) {
       node.children = finalize(node.children || [], putQuery, node.version);
     }
-    if (((_b = node.children) == null ? void 0 : _b.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
+    if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
     }
   }
@@ -1442,10 +1451,10 @@ async function* mergeStreams(...streams) {
       merge(merged, value);
     yield merged;
   }
-  yield* mergeIterators__default["default"](streams);
+  yield* mergeIterators__default.default(streams);
 }
 function makeWatcher() {
-  const listeners = new Set();
+  const listeners = /* @__PURE__ */ new Set();
   function write(change) {
     for (const push of listeners)
       push(change);
@@ -1501,7 +1510,7 @@ function wrapObject(object, path) {
     } else if (Array.isArray(object)) {
       object = [{ $key, $chi: object }];
     } else {
-      object = [__spreadValues({ $key }, object)];
+      object = [{ $key, ...object }];
     }
   }
   return object;
@@ -1526,8 +1535,8 @@ function unwrapObject(object, path) {
       if (page && !page.$cursor) {
         return object;
       } else {
-        const target = (page == null ? void 0 : page.$cursor) ? __spreadProps(__spreadValues({}, filter), { $cursor: page.$cursor }) : filter;
-        object = object.find(({ $key: $key2 }) => isEqual__default["default"]($key2, target));
+        const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
+        object = object.find(({ $key: $key2 }) => isEqual__default.default($key2, target));
       }
     }
   }

package/index.mjs

@@ -1,34 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 import { customAlphabet } from "nanoid/non-secure";
 import mergeIterators from "merge-async-iterators";
 import { makeStream } from "@graffy/stream";
@@ -71,7 +40,7 @@ function decode$5(u8Arr) {
   }
   return view.getFloat64(0);
 }
-var alpha = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
+const alpha = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
 function getByte(view, offset) {
   return offset < view.byteLength ? view.getUint8(offset) : 0;
 }
@@ -155,7 +124,10 @@ function encode$3(value) {
   const parts = encodeParts(value);
   while (parts[parts.length - 1] === END)
     parts.pop();
-  const length = parts.reduce((sum, part) => sum + (typeof part === "number" ? 1 : part.length), 0);
+  const length = parts.reduce(
+    (sum, part) => sum + (typeof part === "number" ? 1 : part.length),
+    0
+  );
   const buffer = new Uint8Array(length);
   let i = 0;
   for (const part of parts) {
@@ -169,7 +141,7 @@ function encode$3(value) {
   }
   return encode$4(buffer);
 }
-const nextKey = new WeakMap();
+const nextKey = /* @__PURE__ */ new WeakMap();
 function decode$3(key) {
   let i = 0;
   const buffer = decode$4(key, 0);
@@ -269,8 +241,7 @@ function keyAfter(key) {
   const l = key.length - 1;
   return key.charCodeAt(l) === 65535 ? key.substr(0, l - 1) + String.fromCharCode(key.charCodeAt(l - 1) + 1) : key + "\0";
 }
-function err(message, _a = {}) {
-  var _b = _a, { cause } = _b, args = __objRest(_b, ["cause"]);
+function err(message, { cause, ...args } = {}) {
   const e = new Error(message + (args ? " " + JSON.stringify(args) : ""));
   e.cause = cause;
   throw e;
@@ -348,7 +319,7 @@ function encode$2(arg) {
   errIf("page_and_filter", page && filter, arg);
   if (!page)
     return { key: maybeEncode(filter || {}) };
-  const _a = page, { $cursor } = _a, range = __objRest(_a, ["$cursor"]);
+  const { $cursor, ...range } = page;
   const { $first, $all, $last, $after, $before, $since, $until } = range;
   const hasRange = !isEmpty(range);
   errIf("first_and_last", isDef($first) && isDef($last), arg);
@@ -443,15 +414,20 @@ function splitRef($ref) {
     return [];
   return splitArgs(tail);
 }
-var id = customAlphabet(alpha, 20);
+const id = customAlphabet(alpha, 20);
 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);
+  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, first, last);
@@ -522,7 +498,7 @@ function compareValue(a, b) {
   return a < b ? -1 : 1;
 }
 function clone(node) {
-  const copy = __spreadValues({}, node);
+  const copy = { ...node };
   if (node.children)
     copy.children = node.children.map((child) => clone(child));
   return copy;
@@ -556,9 +532,9 @@ function mergeRanges$1(base, node) {
   if (node.version < base.version)
     [node, base] = [base, node];
   return [
-    base.key < node.key && __spreadProps(__spreadValues({}, base), { end: keyBefore(node.key) }),
+    base.key < node.key && { ...base, end: keyBefore(node.key) },
     node,
-    base.end > node.end && __spreadProps(__spreadValues({}, base), { key: keyAfter(node.end) })
+    base.end > node.end && { ...base, key: keyAfter(node.end) }
   ].filter(Boolean);
 }
 function insertNode$1(current, change, start = 0) {
@@ -581,9 +557,9 @@ function insertNodeIntoRange$1(current, index, change) {
   if (!newChange)
     return;
   const insertions = [
-    range.key < key && __spreadProps(__spreadValues({}, range), { end: keyBefore(key) }),
+    range.key < key && { ...range, end: keyBefore(key) },
     newChange,
-    range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
+    range.end > key && { ...range, key: keyAfter(key) }
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
   return index + insertions.length - 1;
@@ -609,14 +585,14 @@ function getNewer(node, base) {
   if (isBranch(node)) {
     const children = [{ key: "", end: "\uFFFF", version }];
     merge(children, node.children);
-    return children.length === 1 ? null : __spreadProps(__spreadValues({}, node), { children });
+    return children.length === 1 ? null : { ...node, children };
   } else {
     return node.version >= version ? node : null;
   }
 }
 const IS_VAL = Symbol("IS_VAL");
 function wrapValue(value, path, version = 0) {
-  const node = __spreadProps(__spreadValues({}, encode$2(path[path.length - 1])), { value, version });
+  const node = { ...encode$2(path[path.length - 1]), value, version };
   return wrap([node], path.slice(0, -1), version);
 }
 function wrap(children, path, version = 0, prefix = false) {
@@ -626,16 +602,16 @@ function wrap(children, path, version = 0, prefix = false) {
     return children;
   let i = path.length - 1;
   if (!Array.isArray(children)) {
-    children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { value: children, version })];
+    children = [{ ...encode$2(path[i--]), value: children, version }];
   } else {
     if (!children.length)
       return;
-    children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { version, children })];
+    children = [{ ...encode$2(path[i--]), version, children }];
   }
   if (prefix)
     children[0].prefix = true;
   while (i >= 0)
-    children = [__spreadProps(__spreadValues({}, encode$2(path[i--])), { version, children })];
+    children = [{ ...encode$2(path[i--]), version, children }];
   return children;
 }
 function unwrap(tree, path) {
@@ -686,7 +662,7 @@ function remove(children, path) {
   const filteredChildren = remove(node.children, path.slice(1));
   if (filteredChildren === children)
     return children;
-  const filteredNode = filteredChildren.length ? __spreadProps(__spreadValues({}, node), { children: filteredChildren }) : [];
+  const filteredNode = filteredChildren.length ? { ...node, children: filteredChildren } : [];
   return children.slice(0, ix).concat(filteredNode, children.slice(ix + 1));
 }
 class Result {
@@ -735,7 +711,10 @@ function sliceNode(graph, query, result) {
     result.addUnknown(query);
   } else if (isRange(graph)) {
     if (isBranch(query)) {
-      const { known } = slice([{ key: "", end: "\uFFFF", version: graph.version }], query.children);
+      const { known } = slice(
+        [{ key: "", end: "\uFFFF", version: graph.version }],
+        query.children
+      );
       result.addKnown({ key, version: graph.version, children: known });
     } else {
       result.addKnown({ key, end: key, version: graph.version });
@@ -743,20 +722,30 @@ function sliceNode(graph, query, result) {
   } else if (isBranch(graph) && isBranch(query)) {
     const { known, unknown } = slice(graph.children, query.children, root);
     if (known)
-      result.addKnown(__spreadProps(__spreadValues({}, graph), { children: known }));
+      result.addKnown({ ...graph, children: known });
     if (unknown)
-      result.addUnknown(__spreadProps(__spreadValues({}, query), { children: unknown }));
+      result.addUnknown({ ...query, children: unknown });
   } else if (isLink(graph)) {
     result.addKnown(graph);
     if (graph.prefix && isRange(query)) {
       result.addLinked(wrap([query], graph.path, version, true));
     } else {
-      result.addLinked(wrap(query.children || query.value, graph.path, version, graph.prefix || query.prefix));
+      result.addLinked(
+        wrap(
+          query.children || query.value,
+          graph.path,
+          version,
+          graph.prefix || query.prefix
+        )
+      );
     }
   } else if (isBranch(graph)) {
     result.addKnown(graph);
   } else if (isBranch(query)) {
-    const { known } = slice([{ key: "", end: "\uFFFF", version: graph.version }], query.children);
+    const { known } = slice(
+      [{ key: "", end: "\uFFFF", version: graph.version }],
+      query.children
+    );
     result.addKnown({ key, version: graph.version, children: known });
   } else {
     result.addKnown(graph);
@@ -768,9 +757,9 @@ function sliceRange(graph, query, result) {
   if (graph[0].key === "" && graph[0].prefix && graph[0].children) {
     const { known, unknown } = slice(graph[0].children, [query], result.root);
     if (known)
-      result.addKnown(__spreadProps(__spreadValues({}, graph[0]), { children: known }));
+      result.addKnown({ ...graph[0], children: known });
     if (unknown)
-      result.addUnknown(__spreadProps(__spreadValues({}, query[0]), { children: unknown }));
+      result.addUnknown({ ...query[0], children: unknown });
     return;
   }
   if (key < end) {
@@ -781,7 +770,7 @@ function sliceRange(graph, query, result) {
       if (isRange(node)) {
         result.addKnown(getOverlap(node, key, end));
       } else {
-        sliceNode(node, __spreadProps(__spreadValues({}, query), { key }), result);
+        sliceNode(node, { ...query, key }, result);
         limit--;
       }
       key = keyAfter(node.end || node.key);
@@ -794,24 +783,25 @@ function sliceRange(graph, query, result) {
       if (isRange(node)) {
         result.addKnown(getOverlap(node, end, key));
       } else {
-        sliceNode(node, __spreadProps(__spreadValues({}, query), { key }), result);
+        sliceNode(node, { ...query, key }, result);
         limit--;
       }
       key = keyBefore(node.key);
     }
   }
   if (limit && (step < 0 ? key > end : key < end)) {
-    const unknown = __spreadProps(__spreadValues({}, query), { key, end, limit });
+    const unknown = { ...query, key, end, limit };
     result.addUnknown(unknown);
   }
 }
 function getOverlap(node, key, end) {
   if (node.key >= key && node.end <= end)
     return node;
-  return __spreadProps(__spreadValues({}, node), {
+  return {
+    ...node,
     key: node.key > key ? node.key : key,
     end: node.end < end ? node.end : end
-  });
+  };
 }
 function sieve(current, changes, result = []) {
   let index = 0;
@@ -879,9 +869,9 @@ function mergeRanges(base, node) {
   if (node.version < base.version)
     [node, base] = [base, node];
   return [
-    base.key < node.key && __spreadProps(__spreadValues({}, base), { end: keyBefore(node.key) }),
+    base.key < node.key && { ...base, end: keyBefore(node.key) },
     node,
-    base.end > node.end && __spreadProps(__spreadValues({}, base), { key: keyAfter(node.end) })
+    base.end > node.end && { ...base, key: keyAfter(node.end) }
   ].filter(Boolean);
 }
 function insertNode(current, change, result, start = 0) {
@@ -903,9 +893,9 @@ function insertNodeIntoRange(current, index, change, result) {
     return;
   result.push(newChange);
   const insertions = [
-    range.key < key && __spreadProps(__spreadValues({}, range), { end: keyBefore(key) }),
+    range.key < key && { ...range, end: keyBefore(key) },
     newNode,
-    range.end > key && __spreadProps(__spreadValues({}, range), { key: keyAfter(key) })
+    range.end > key && { ...range, key: keyAfter(key) }
   ].filter(Boolean);
   current.splice(index, 1, ...insertions);
   return index + insertions.length - 1;
@@ -917,7 +907,7 @@ function updateNode(current, index, change, result) {
     node.version = change.version;
     sieve(node.children, change.children, nextResult);
     if (nextResult.length)
-      result.push(__spreadProps(__spreadValues({}, change), { children: nextResult }));
+      result.push({ ...change, children: nextResult });
   } else if (isBranch(node)) {
     const newNode = getNewerNode(node, change);
     current[index] = newNode || change;
@@ -952,15 +942,17 @@ function getNewerNode(node, base) {
     const emptyNode = { key: "", end: "\uFFFF", version: base.version };
     const children = [emptyNode];
     sieve(children, node.children);
-    return children.length === 1 && children[0] === emptyNode ? null : __spreadProps(__spreadValues({}, node), { children });
+    return children.length === 1 && children[0] === emptyNode ? null : { ...node, children };
   } else {
     return node.version >= base.version ? node : null;
   }
 }
 function getNewerChange(node, base) {
   if (isBranch(node)) {
-    const children = node.children.filter((child) => getNewerChange(child, base));
-    return children.length && __spreadProps(__spreadValues({}, node), { children });
+    const children = node.children.filter(
+      (child) => getNewerChange(child, base)
+    );
+    return children.length && { ...node, children };
   } else {
     return node.version >= base.version ? node : null;
   }
@@ -1050,21 +1042,24 @@ function decode(nodes = [], { isGraph } = {}) {
         pushResult(decodeLeafNode(node));
     }
     if (allNums || allStrs) {
-      result = result.reduce((collection, item) => {
-        if (Array.isArray(item)) {
-          collection[item.$key] = item;
+      result = result.reduce(
+        (collection, item) => {
+          if (Array.isArray(item)) {
+            collection[item.$key] = item;
+            delete item.$key;
+            return collection;
+          }
+          const { $key, $val } = item;
           delete item.$key;
+          delete item.$val;
+          if (typeof $val === "object") {
+            Object.defineProperty($val, "$val", { value: true });
+          }
+          collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
           return collection;
-        }
-        const { $key, $val } = item;
-        delete item.$key;
-        delete item.$val;
-        if (typeof $val === "object") {
-          Object.defineProperty($val, "$val", { value: true });
-        }
-        collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
-        return collection;
-      }, allStrs ? {} : []);
+        },
+        allStrs ? {} : []
+      );
     }
     if (isGraph && putRanges.length) {
       if (putRanges[0].key === "" && putRanges[0].end === "\uFFFF") {
@@ -1107,7 +1102,7 @@ function decode(nodes = [], { isGraph } = {}) {
       if (!splitArgs(child.$key)[0]) {
         child.$key = { $cursor: child.$key };
       }
-      child.$key = __spreadValues(__spreadValues({}, args), child.$key);
+      child.$key = { ...args, ...child.$key };
     }
     return children;
   }
@@ -1150,13 +1145,16 @@ function decorate(rootGraph, rootQuery) {
       query = [query];
     let graph;
     if (query.$ref) {
-      const _a = query, { $ref } = _a, props = __objRest(_a, ["$ref"]);
+      const { $ref, ...props } = query;
       const [range, filter] = splitRef($ref);
       const path = encode$1($ref);
       const targetPlumGraph = unwrap(rootGraph, path);
       if (range)
         targetPlumGraph[PRE] = filter;
-      graph = construct(targetPlumGraph, range ? __spreadValues({ $key: range }, props) : props);
+      graph = construct(
+        targetPlumGraph,
+        range ? { $key: range, ...props } : props
+      );
       Object.defineProperty(graph, "$ref", { value: $ref });
     } else if (Array.isArray(query)) {
       let pageKey;
@@ -1164,13 +1162,15 @@ function decorate(rootGraph, rootQuery) {
         if (!(item == null ? void 0 : item.$key)) {
           return construct(descend(plumGraph, i), item);
         }
-        const _a2 = item, { $key, $chi } = _a2, props = __objRest(_a2, ["$key", "$chi"]);
+        const { $key, $chi, ...props } = item;
         const subQuery = $chi || (isEmpty(props) ? 1 : props);
         if (!isPlainObject($key) || !splitArgs($key)[0]) {
           return construct(descend(plumGraph, $key), subQuery);
         }
         if (pageKey) {
-          throw Error("decorate.multi_range_query:" + JSON.stringify({ $key, pageKey }));
+          throw Error(
+            "decorate.multi_range_query:" + JSON.stringify({ $key, pageKey })
+          );
         }
         pageKey = $key;
         const children = slice2(plumGraph, $key);
@@ -1178,7 +1178,7 @@ function decorate(rootGraph, rootQuery) {
           const $key2 = decode$2(node);
           const subResult = construct(getValue(node), subQuery);
           if (typeof subResult === "object") {
-            subResult.$key = children[PRE] ? __spreadProps(__spreadValues({}, children[PRE]), { $cursor: $key2 }) : $key2;
+            subResult.$key = children[PRE] ? { ...children[PRE], $cursor: $key2 } : $key2;
           }
           return subResult;
         });
@@ -1196,7 +1196,7 @@ function decorate(rootGraph, rootQuery) {
       } else if (typeof plumGraph !== "object" || !plumGraph) {
         graph = plumGraph;
       } else if (plumGraph[IS_VAL]) {
-        graph = Array.isArray(plumGraph) ? plumGraph.slice(0) : __spreadValues({}, plumGraph);
+        graph = Array.isArray(plumGraph) ? plumGraph.slice(0) : { ...plumGraph };
         graph.$val = true;
       } else if (Array.isArray(plumGraph)) {
         graph = decodeGraph(plumGraph);
@@ -1277,9 +1277,9 @@ function addPageMeta(graph, args) {
     Object.assign(graph, { $page: args, $prev: null, $next: null });
     return;
   }
-  const [_a, ..._b] = splitArgs(args), _c = _a, { $first, $last } = _c, bounds = __objRest(_c, ["$first", "$last"]), [filter] = _b;
+  const [{ $first, $last, ...bounds }, filter] = splitArgs(args);
   const count = $first || $last;
-  const $page = __spreadProps(__spreadValues(__spreadValues({}, filter), bounds), { $all: true });
+  const $page = { ...filter, ...bounds, $all: true };
   if (graph.length === count) {
     if ($first) {
       const boundKey = graph[graph.length - 1].$key;
@@ -1291,8 +1291,8 @@ function addPageMeta(graph, args) {
       delete $page.$after;
     }
   }
-  const $prev = isDef($page.$after) ? __spreadProps(__spreadValues({}, filter), { $last: count, $until: $page.$after }) : isDef($page.$since) ? __spreadProps(__spreadValues({}, filter), { $last: count, $before: $page.$since }) : null;
-  let $next = isDef($page.$before) ? __spreadProps(__spreadValues({}, filter), { $first: count, $since: $page.$before }) : isDef($page.$until) ? __spreadProps(__spreadValues({}, filter), { $first: count, $after: $page.$until }) : null;
+  const $prev = isDef($page.$after) ? { ...filter, $last: count, $until: $page.$after } : isDef($page.$since) ? { ...filter, $last: count, $before: $page.$since } : null;
+  let $next = isDef($page.$before) ? { ...filter, $first: count, $since: $page.$before } : isDef($page.$until) ? { ...filter, $first: count, $after: $page.$until } : null;
   Object.assign(graph, { $page, $next, $prev });
 }
 function serialize(obj) {
@@ -1307,35 +1307,47 @@ function encode(value, { version, isGraph } = {}) {
   const links = [];
   function pushLink($ref, $ver, props, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props) ? makeNode(range ? [__spreadValues({ $key: range }, props)] : props, void 0, $ver).children : isDef($chi) ? makeNode(range ? [{ $key: range, $chi }] : $chi, void 0, $ver).children : isDef($val) ? $val : isGraph ? void 0 : 1;
+    let children = !isEmpty(props) ? makeNode(
+      range ? [{ $key: range, ...props }] : props,
+      void 0,
+      $ver
+    ).children : isDef($chi) ? makeNode(
+      range ? [{ $key: range, $chi }] : $chi,
+      void 0,
+      $ver
+    ).children : isDef($val) ? $val : isGraph ? void 0 : 1;
     if (children) {
       links.push(wrap(children, encode$1($ref), $ver, !!range)[0]);
     }
   }
   const combine = isGraph ? merge : add;
   function makeNode(object, key, ver) {
-    var _b;
+    var _a2;
     if (!isDef(object))
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const _a2 = object || {}, { $key, $ver, $ref, $val, $chi, $put } = _a2, props = __objRest(_a2, ["$key", "$ver", "$ref", "$val", "$chi", "$put"]);
+    const { $key, $ver, $ref, $val, $chi, $put, ...props } = object || {};
     if (isDef($ver))
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
       if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props))) {
-        const node2 = makeNode(__spreadProps(__spreadValues({}, object), { $key: filter || "" }), key, ver);
+        const node2 = makeNode({ ...object, $key: filter || "" }, key, ver);
         node2.prefix = true;
         return node2;
       }
       if ((!isDef(key) || Number.isInteger(key)) && page && (filter || isDef(page.$cursor))) {
-        const node2 = makeNode({
-          $key: filter || "",
-          $chi: [
-            __spreadProps(__spreadValues({}, object), { $key: isDef(page.$cursor) ? page.$cursor : page })
-          ]
-        }, key, ver);
+        const node2 = makeNode(
+          {
+            $key: filter || "",
+            $chi: [
+              { ...object, $key: isDef(page.$cursor) ? page.$cursor : page }
+            ]
+          },
+          key,
+          ver
+        );
         node2.prefix = true;
         return node2;
       }
@@ -1402,7 +1414,7 @@ function encode(value, { version, isGraph } = {}) {
     if (isGraph && isDef(putQuery)) {
       node.children = finalize(node.children || [], putQuery, node.version);
     }
-    if (((_b = node.children) == null ? void 0 : _b.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
+    if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
     }
   }
@@ -1437,7 +1449,7 @@ async function* mergeStreams(...streams) {
   yield* mergeIterators(streams);
 }
 function makeWatcher() {
-  const listeners = new Set();
+  const listeners = /* @__PURE__ */ new Set();
   function write(change) {
     for (const push of listeners)
       push(change);
@@ -1493,7 +1505,7 @@ function wrapObject(object, path) {
     } else if (Array.isArray(object)) {
       object = [{ $key, $chi: object }];
     } else {
-      object = [__spreadValues({ $key }, object)];
+      object = [{ $key, ...object }];
     }
   }
   return object;
@@ -1518,11 +1530,68 @@ function unwrapObject(object, path) {
       if (page && !page.$cursor) {
         return object;
       } else {
-        const target = (page == null ? void 0 : page.$cursor) ? __spreadProps(__spreadValues({}, filter), { $cursor: page.$cursor }) : filter;
+        const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
         object = object.find(({ $key: $key2 }) => isEqual($key2, target));
       }
     }
   }
   return object;
 }
-export { IS_VAL, add, cloneObject, decode$2 as decodeArgs, decodeGraph, decode$1 as decodePath, decodeQuery, decode$7 as decodeUrl, decode$3 as decodeValue, decorate, deserialize, encode$2 as encodeArgs, encodeGraph, encode$1 as encodePath, encodeQuery, encode$7 as encodeUrl, encode$3 as encodeValue, err, errIf, finalize, find, findFirst, findLast, getKnown, getNodeValue, isBranch, isDef, isEmpty, isEncoded, isEncodedKey, isLink, isNewer, isOlder, isPlainObject, isPrefix, isRange, keyAfter, keyBefore, keyStep, id as makeId, makeWatcher, merge, mergeObject, mergeStreams, remove, serialize, setVersion, sieve, slice, splitArgs, splitRef, unwrap, unwrapObject, wrap, wrapObject, wrapValue };
+export {
+  IS_VAL,
+  add,
+  cloneObject,
+  decode$2 as decodeArgs,
+  decodeGraph,
+  decode$1 as decodePath,
+  decodeQuery,
+  decode$7 as decodeUrl,
+  decode$3 as decodeValue,
+  decorate,
+  deserialize,
+  encode$2 as encodeArgs,
+  encodeGraph,
+  encode$1 as encodePath,
+  encodeQuery,
+  encode$7 as encodeUrl,
+  encode$3 as encodeValue,
+  err,
+  errIf,
+  finalize,
+  find,
+  findFirst,
+  findLast,
+  getKnown,
+  getNodeValue,
+  isBranch,
+  isDef,
+  isEmpty,
+  isEncoded,
+  isEncodedKey,
+  isLink,
+  isNewer,
+  isOlder,
+  isPlainObject,
+  isPrefix,
+  isRange,
+  keyAfter,
+  keyBefore,
+  keyStep,
+  id as makeId,
+  makeWatcher,
+  merge,
+  mergeObject,
+  mergeStreams,
+  remove,
+  serialize,
+  setVersion,
+  sieve,
+  slice,
+  splitArgs,
+  splitRef,
+  unwrap,
+  unwrapObject,
+  wrap,
+  wrapObject,
+  wrapValue
+};

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.25-alpha.1",
+  "version": "0.15.25-alpha.2",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -17,8 +17,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "lodash": "^4.17.19",
-    "nanoid": "^3.2.0",
-    "@graffy/stream": "0.15.25-alpha.1",
+    "nanoid": "^4.0.0",
+    "@graffy/stream": "0.15.25-alpha.2",
     "merge-async-iterators": "^0.2.1"
   }
 }

package/types/coding/alphabet.d.ts

@@ -1,2 +1,2 @@
-declare var _default: "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
+declare const _default: "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
 export default _default;

package/types/coding/id.d.ts

@@ -1,2 +1,2 @@
-declare var _default: () => string;
+declare const _default: (size?: number) => string;
 export default _default;