@graffy/common 0.16.0-alpha.1 → 0.16.0-alpha.11

package/index.cjs

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const isEqual = require("lodash/isEqual.js");
 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);
+const mergeIterators__default = /* @__PURE__ */ _interopDefaultLegacy(mergeIterators);
 const textEncoder = new TextEncoder();
 const textDecoder = new TextDecoder("utf-8");
 function encode$6(string) {
@@ -119,6 +119,7 @@ const stringifyDescriptor = {
 };
 function addStringify(buffer) {
   Object.defineProperties(buffer, {
+    toJSON: stringifyDescriptor,
     toString: stringifyDescriptor,
     [Symbol.for("nodejs.util.inspect.custom")]: stringifyDescriptor
   });
@@ -390,8 +391,6 @@ function encode$3(arg) {
   return node;
 }
 function decode$3(node) {
-  if (typeof node === "string")
-    throw Error("why?");
   const { key, end, limit } = node;
   errIf("no_key", !isDef(key));
   errIf("limit_without_end", isDef(limit) && !isDef(end));
@@ -639,10 +638,10 @@ function getNewer(node, base) {
   }
 }
 const IS_VAL = Symbol("IS_VAL");
-function makeNode(seg, props) {
+function makeNode(seg, props2) {
   if (ArrayBuffer.isView(seg))
-    return { key: seg, ...props };
-  return { ...seg, ...props };
+    return { key: seg, ...props2 };
+  return { ...seg, ...props2 };
 }
 function wrapValue(value, path, version = 0) {
   const node = makeNode(path[path.length - 1], { value, version });
@@ -869,7 +868,7 @@ function insertRange(current, change, result, start = 0) {
   const { key, end } = change;
   const keyIx = findFirst(current, key, start);
   const endIx = findLast(current, end, keyIx);
-  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, key) <= 0 && cmp(current[keyIx].end, end) >= 0)) {
+  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, end) <= 0 && cmp(current[keyIx].end || current[keyIx].key, key) >= 0)) {
     return keyIx;
   }
   const appliedChange = [];
@@ -1012,11 +1011,12 @@ function getNewerChange(node, base) {
     return node.version >= base.version ? node : null;
   }
 }
-function setVersion(graph, version) {
+function setVersion(graph, version, onlyIfZero = false) {
   for (const node of graph) {
-    node.version = version;
+    if (!onlyIfZero || !node.version)
+      node.version = version;
     if (node.children)
-      setVersion(node.children, version);
+      setVersion(node.children, version, onlyIfZero);
   }
   return graph;
 }
@@ -1043,9 +1043,11 @@ function finalize(graph, query, version = Date.now()) {
   merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  result = setVersion(result, version);
+  if (!version !== false)
+    result = setVersion(result, version, true);
   return result;
 }
+const PRE_CHI_PUT = Symbol("PREFIX_CHILDREN_$PUT");
 function decode$1(nodes = [], { isGraph } = {}) {
   function decodeChildren(nodes2) {
     let result = [];
@@ -1061,6 +1063,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
       result.push(...objects);
     }
     const putRanges = [];
+    const prefixChildPuts = [];
     let lastNode = null;
     function addPutRange({ key, end }) {
       if (lastNode) {
@@ -1086,9 +1089,13 @@ function decode$1(nodes = [], { isGraph } = {}) {
     for (const node of nodes2) {
       if (isGraph && addPutRange(node))
         continue;
-      if (isPrefix(node))
-        pushResult(...decodePrefixNode(node));
-      else if (isGraph && isRange(node))
+      if (isPrefix(node)) {
+        const decodedChildren = decodePrefixNode(node);
+        if (PRE_CHI_PUT in decodedChildren) {
+          prefixChildPuts.push(...decodedChildren[PRE_CHI_PUT]);
+        }
+        pushResult(...decodedChildren);
+      } else if (isGraph && isRange(node))
         pushResult(decodeRangeNode(node));
       else if (isBranch(node))
         pushResult(decodeBranchNode(node));
@@ -1122,15 +1129,17 @@ function decode$1(nodes = [], { isGraph } = {}) {
         Object.defineProperty(result, "$put", { value: true });
       } else {
         Object.defineProperty(result, "$put", {
-          value: putRanges.map((rNode) => decode$3(rNode))
+          value: putRanges.map((rNode) => decode$3(rNode)).concat(prefixChildPuts)
         });
       }
+    } else if (prefixChildPuts.length) {
+      Object.defineProperty(result, "$put", { value: prefixChildPuts });
     }
     return result;
   }
   function decodePrefixNode(node) {
     let args = decode$3(node);
-    if (args === "")
+    if (!args)
       args = {};
     if (typeof args === "string") {
       throw Error("decode.unencoded_prefix: " + args);
@@ -1160,6 +1169,16 @@ function decode$1(nodes = [], { isGraph } = {}) {
       }
       child.$key = { ...args, ...child.$key };
     }
+    if (children.$put === true) {
+      children[PRE_CHI_PUT] = [{ ...args, $all: true }];
+    } else if (Array.isArray(children.$put)) {
+      children[PRE_CHI_PUT] = children.$put.map((rarg) => ({
+        ...args,
+        ...rarg
+      }));
+    } else if (isDef(children.$put)) {
+      children[PRE_CHI_PUT] = [{ ...args, ...children.$put }];
+    }
     return children;
   }
   function decodeBranchNode(node) {
@@ -1202,7 +1221,7 @@ function decorate(rootGraph, rootQuery) {
       query = [query];
     let graph;
     if (query.$ref) {
-      const { $ref, ...props } = query;
+      const { $ref, ...props2 } = query;
       const [range, filter] = splitRef($ref);
       const path = encode$2($ref);
       const targetPlumGraph = unwrap(rootGraph, path);
@@ -1211,7 +1230,7 @@ function decorate(rootGraph, rootQuery) {
           targetPlumGraph[PRE] = filter;
         graph = construct(
           targetPlumGraph,
-          range ? { $key: range, ...props } : props
+          range ? { $key: range, ...props2 } : props2
         );
         Object.defineProperty(graph, "$ref", { value: $ref });
       }
@@ -1221,8 +1240,8 @@ function decorate(rootGraph, rootQuery) {
         if (!(item == null ? void 0 : item.$key)) {
           return construct(descend(plumGraph, i), item);
         }
-        const { $key, $chi, ...props } = item;
-        const subQuery = $chi || (isEmpty(props) ? 1 : props);
+        const { $key, $chi, ...props2 } = item;
+        const subQuery = $chi || (isEmpty(props2) ? 1 : props2);
         if (!isPlainObject($key) || !splitArgs($key)[0]) {
           return construct(descend(plumGraph, $key), subQuery);
         }
@@ -1388,25 +1407,86 @@ function decode(string, start = 0) {
   }
   return addStringify(new Uint8Array(buffer));
 }
-function serialize(obj) {
-  return JSON.stringify(obj, (_key, value) => {
-    return ArrayBuffer.isView(value) ? "\0" + encode$1(value) : value;
-  });
+const props = [
+  "end",
+  "version",
+  "limit",
+  "value",
+  "path",
+  "prefix",
+  "children"
+];
+function serializeKey(key) {
+  if (key[0] === STR) {
+    const last = key[key.length - 1];
+    if (last !== 0 && last !== 255) {
+      return decode$4(key);
+    }
+  }
+  return "\0" + encode$1(key);
 }
-function deserialize(str) {
-  return JSON.parse(
-    str,
-    (_key, value) => typeof value === "string" && value[0] === "\0" ? decode(value.slice(1)) : value
+function deserializeKey(key) {
+  if (key[0] === "\0")
+    return decode(key.slice(1));
+  return encode$4(key);
+}
+function pack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
+  const array = children.map(
+    (node) => props.reduce(
+      (array2, prop, i) => {
+        if (!(prop in node))
+          return array2;
+        let value = node[prop];
+        if (prop === "version" && value === parentVersion)
+          return array2;
+        if (prop === "children")
+          value = pack(value, node.version);
+        if (prop === "end")
+          value = serializeKey(value);
+        if (prop === "path")
+          value = value.map(serializeKey);
+        array2[1] |= 1 << i;
+        array2.push(value);
+        return array2;
+      },
+      [serializeKey(node.key), 0]
+    )
   );
+  return array;
+}
+function unpack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
+  const node = children.map(
+    ([key, type, ...values]) => props.reduce(
+      (node2, prop, i) => {
+        if (!(type & 1 << i))
+          return node2;
+        let value = values.shift();
+        if (prop === "children")
+          value = unpack(value, node2.version);
+        if (prop === "end")
+          value = deserializeKey(value);
+        if (prop === "path")
+          value = value.map(deserializeKey);
+        node2[prop] = value;
+        return node2;
+      },
+      { key: deserializeKey(key), version: parentVersion }
+    )
+  );
+  return node;
 }
 const ROOT_KEY = Symbol();
 function encode(value, { version, isGraph } = {}) {
   var _a;
   const links = [];
-  function pushLink($ref, $ver, props, $val, $chi) {
+  function pushLink($ref, $ver, props2, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props) ? makeNode2(
-      range ? [{ $key: range, ...props }] : props,
+    let children = !isEmpty(props2) ? makeNode2(
+      range ? [{ $key: range, ...props2 }] : props2,
       void 0,
       $ver
     ).children : isDef($chi) ? makeNode2(
@@ -1419,41 +1499,75 @@ function encode(value, { version, isGraph } = {}) {
     }
   }
   const combine = isGraph ? merge : add;
-  function makeNode2(object, key, ver) {
+  function makeNode2(object, key, ver, parentPuts = []) {
     var _a2;
     if (!isDef(object))
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const { $key, $ver, $ref, $val, $chi, $put, ...props } = object || {};
+    const { $key, $ver, $ref, $val, $chi, $put, ...props2 } = 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 = makeNode2({ ...object, $key: filter || {} }, key, ver);
-        if (!filter)
-          node2.key = MIN_KEY;
-        node2.prefix = true;
-        return node2;
+      if (page) {
+        if (typeof object === "object" && object && !Array.isArray(object)) {
+          object = {
+            ...Object.fromEntries(
+              Object.entries({
+                $key,
+                $ver,
+                $ref,
+                $val,
+                $chi,
+                $put
+              }).filter(([_, val]) => isDef(val))
+            ),
+            ...props2
+          };
+        }
+        const foundPuts = parentPuts.filter(([_, putFilter]) => isEqual__default.default(filter, putFilter)).map(([range]) => range);
+        if (isGraph && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props2))) {
+          object.$key = filter || {};
+          object.$put = foundPuts;
+          const node2 = makeNode2(object, key, ver);
+          if (!filter)
+            node2.key = MIN_KEY;
+          node2.prefix = true;
+          return node2;
+        }
+        if ((!isDef(key) || Number.isInteger(key)) && (filter || isDef(page.$cursor))) {
+          object.$key = isDef(page.$cursor) ? page.$cursor : page;
+          const wrapper = { $key: filter || {}, $chi: [object] };
+          if (isGraph)
+            wrapper.$put = foundPuts;
+          const node2 = makeNode2(wrapper, key, ver);
+          if (!filter)
+            node2.key = MIN_KEY;
+          node2.prefix = true;
+          return node2;
+        }
       }
-      if ((!isDef(key) || Number.isInteger(key)) && page && (filter || isDef(page.$cursor))) {
-        const node2 = makeNode2(
-          {
-            $key: filter || {},
-            $chi: [
-              { ...object, $key: isDef(page.$cursor) ? page.$cursor : page }
-            ]
-          },
-          key,
-          ver
-        );
-        if (!filter)
-          node2.key = MIN_KEY;
-        node2.prefix = true;
-        return node2;
+    }
+    let putQuery = [], prefixPuts = [];
+    if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
+      putQuery = [encode$3({ $since: 0, $until: Infinity })];
+    }
+    function classifyPut(put) {
+      const [range, filter] = splitArgs(put);
+      if (filter) {
+        prefixPuts.push([range, filter]);
+      } else {
+        putQuery.push(encode$3(put));
       }
     }
+    if ($put === true) {
+      putQuery = null;
+    } else if (Array.isArray($put)) {
+      $put.forEach(classifyPut);
+    } else if (isDef($put)) {
+      classifyPut($put);
+    }
     if (isDef($key) && (Number.isInteger(key) || !isDef(key)))
       key = $key;
     const node = key === ROOT_KEY || !isDef(key) ? {} : encode$3(key);
@@ -1461,26 +1575,28 @@ function encode(value, { version, isGraph } = {}) {
     if (object === null) {
       node.end = node.key;
     } else if (isDef($key) && isDef(key) && key !== $key) {
-      node.children = [makeNode2(object, void 0, ver)].filter(Boolean);
+      node.children = [makeNode2(object, void 0, ver, prefixPuts)].filter(
+        Boolean
+      );
       return node;
     } else if ($ref) {
-      pushLink($ref, node.version, props, $val, $chi);
+      pushLink($ref, node.version, props2, $val, $chi);
       if (!isGraph)
         return;
       node.path = encode$2($ref);
     } else if ($val === true) {
-      node.value = props;
+      node.value = props2;
     } else if (isDef($val)) {
       node.value = $val;
     } else if (typeof object !== "object") {
       node.value = isGraph || typeof object === "number" ? object : 1;
     } else if (isDef($chi)) {
-      const children = $chi.map((obj) => makeNode2(obj, void 0, ver)).filter(Boolean).sort((a, b) => cmp(a.key, b.key));
+      const children = $chi.map((obj) => makeNode2(obj, void 0, ver, prefixPuts)).filter(Boolean).sort((a, b) => cmp(a.key, b.key));
       if (children.length) {
         node.children = children;
       }
     } else if (Array.isArray(object)) {
-      const children = object.map((obj, i) => makeNode2(obj, i, ver)).filter(Boolean).reduce((acc, it) => {
+      const children = object.map((obj, i) => makeNode2(obj, i, ver, prefixPuts)).filter(Boolean).reduce((acc, it) => {
         combine(acc, [it]);
         return acc;
       }, []);
@@ -1488,7 +1604,7 @@ function encode(value, { version, isGraph } = {}) {
         node.children = children;
       }
     } else {
-      const children = Object.keys(props).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
+      const children = Object.keys(props2).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
       if (children.length) {
         node.children = children;
       } else if (isGraph) {
@@ -1502,19 +1618,8 @@ function encode(value, { version, isGraph } = {}) {
         node.value = 1;
       }
     }
-    let putQuery;
-    if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
-      putQuery = [encode$3({ $since: 0, $until: Infinity })];
-    }
-    if ($put === true) {
-      putQuery = null;
-    } else if (Array.isArray($put)) {
-      putQuery = $put.map((arg) => encode$3(arg));
-    } else if (isDef($put)) {
-      putQuery = [encode$3($put)];
-    }
-    if (isGraph && isDef(putQuery)) {
-      node.children = finalize(node.children || [], putQuery, node.version);
+    if (isGraph && (putQuery === null || putQuery.length)) {
+      node.children = finalize(node.children || [], putQuery, false);
     }
     if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
@@ -1529,7 +1634,9 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return encode(obj, { version, isGraph: true });
+  const encoded = encode(obj, { version, isGraph: true });
+  const versioned = setVersion(encoded, version, true);
+  return versioned;
 }
 function encodeQuery(obj, version = 0) {
   return encode(obj, { version, isGraph: false });
@@ -1652,7 +1759,6 @@ exports.decodePath = decode$2;
 exports.decodeQuery = decodeQuery;
 exports.decodeValue = decode$4;
 exports.decorate = decorate;
-exports.deserialize = deserialize;
 exports.encodeArgs = encode$3;
 exports.encodeGraph = encodeGraph;
 exports.encodePath = encode$2;
@@ -1685,13 +1791,14 @@ exports.makeWatcher = makeWatcher;
 exports.merge = merge;
 exports.mergeObject = mergeObject;
 exports.mergeStreams = mergeStreams;
+exports.pack = pack;
 exports.remove = remove;
-exports.serialize = serialize;
 exports.setVersion = setVersion;
 exports.sieve = sieve;
 exports.slice = slice;
 exports.splitArgs = splitArgs;
 exports.splitRef = splitRef;
+exports.unpack = unpack;
 exports.unwrap = unwrap;
 exports.unwrapObject = unwrapObject;
 exports.wrap = wrap;

package/index.mjs

@@ -1,6 +1,6 @@
+import isEqual from "lodash/isEqual.js";
 import mergeIterators from "merge-async-iterators";
 import { makeStream } from "@graffy/stream";
-import isEqual from "lodash/isEqual.js";
 const textEncoder = new TextEncoder();
 const textDecoder = new TextDecoder("utf-8");
 function encode$6(string) {
@@ -114,6 +114,7 @@ const stringifyDescriptor = {
 };
 function addStringify(buffer) {
   Object.defineProperties(buffer, {
+    toJSON: stringifyDescriptor,
     toString: stringifyDescriptor,
     [Symbol.for("nodejs.util.inspect.custom")]: stringifyDescriptor
   });
@@ -385,8 +386,6 @@ function encode$3(arg) {
   return node;
 }
 function decode$3(node) {
-  if (typeof node === "string")
-    throw Error("why?");
   const { key, end, limit } = node;
   errIf("no_key", !isDef(key));
   errIf("limit_without_end", isDef(limit) && !isDef(end));
@@ -634,10 +633,10 @@ function getNewer(node, base) {
   }
 }
 const IS_VAL = Symbol("IS_VAL");
-function makeNode(seg, props) {
+function makeNode(seg, props2) {
   if (ArrayBuffer.isView(seg))
-    return { key: seg, ...props };
-  return { ...seg, ...props };
+    return { key: seg, ...props2 };
+  return { ...seg, ...props2 };
 }
 function wrapValue(value, path, version = 0) {
   const node = makeNode(path[path.length - 1], { value, version });
@@ -864,7 +863,7 @@ function insertRange(current, change, result, start = 0) {
   const { key, end } = change;
   const keyIx = findFirst(current, key, start);
   const endIx = findLast(current, end, keyIx);
-  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, key) <= 0 && cmp(current[keyIx].end, end) >= 0)) {
+  if (keyIx === endIx && !(current[keyIx] && cmp(current[keyIx].key, end) <= 0 && cmp(current[keyIx].end || current[keyIx].key, key) >= 0)) {
     return keyIx;
   }
   const appliedChange = [];
@@ -1007,11 +1006,12 @@ function getNewerChange(node, base) {
     return node.version >= base.version ? node : null;
   }
 }
-function setVersion(graph, version) {
+function setVersion(graph, version, onlyIfZero = false) {
   for (const node of graph) {
-    node.version = version;
+    if (!onlyIfZero || !node.version)
+      node.version = version;
     if (node.children)
-      setVersion(node.children, version);
+      setVersion(node.children, version, onlyIfZero);
   }
   return graph;
 }
@@ -1038,9 +1038,11 @@ function finalize(graph, query, version = Date.now()) {
   merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  result = setVersion(result, version);
+  if (!version !== false)
+    result = setVersion(result, version, true);
   return result;
 }
+const PRE_CHI_PUT = Symbol("PREFIX_CHILDREN_$PUT");
 function decode$1(nodes = [], { isGraph } = {}) {
   function decodeChildren(nodes2) {
     let result = [];
@@ -1056,6 +1058,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
       result.push(...objects);
     }
     const putRanges = [];
+    const prefixChildPuts = [];
     let lastNode = null;
     function addPutRange({ key, end }) {
       if (lastNode) {
@@ -1081,9 +1084,13 @@ function decode$1(nodes = [], { isGraph } = {}) {
     for (const node of nodes2) {
       if (isGraph && addPutRange(node))
         continue;
-      if (isPrefix(node))
-        pushResult(...decodePrefixNode(node));
-      else if (isGraph && isRange(node))
+      if (isPrefix(node)) {
+        const decodedChildren = decodePrefixNode(node);
+        if (PRE_CHI_PUT in decodedChildren) {
+          prefixChildPuts.push(...decodedChildren[PRE_CHI_PUT]);
+        }
+        pushResult(...decodedChildren);
+      } else if (isGraph && isRange(node))
         pushResult(decodeRangeNode(node));
       else if (isBranch(node))
         pushResult(decodeBranchNode(node));
@@ -1117,15 +1124,17 @@ function decode$1(nodes = [], { isGraph } = {}) {
         Object.defineProperty(result, "$put", { value: true });
       } else {
         Object.defineProperty(result, "$put", {
-          value: putRanges.map((rNode) => decode$3(rNode))
+          value: putRanges.map((rNode) => decode$3(rNode)).concat(prefixChildPuts)
         });
       }
+    } else if (prefixChildPuts.length) {
+      Object.defineProperty(result, "$put", { value: prefixChildPuts });
     }
     return result;
   }
   function decodePrefixNode(node) {
     let args = decode$3(node);
-    if (args === "")
+    if (!args)
       args = {};
     if (typeof args === "string") {
       throw Error("decode.unencoded_prefix: " + args);
@@ -1155,6 +1164,16 @@ function decode$1(nodes = [], { isGraph } = {}) {
       }
       child.$key = { ...args, ...child.$key };
     }
+    if (children.$put === true) {
+      children[PRE_CHI_PUT] = [{ ...args, $all: true }];
+    } else if (Array.isArray(children.$put)) {
+      children[PRE_CHI_PUT] = children.$put.map((rarg) => ({
+        ...args,
+        ...rarg
+      }));
+    } else if (isDef(children.$put)) {
+      children[PRE_CHI_PUT] = [{ ...args, ...children.$put }];
+    }
     return children;
   }
   function decodeBranchNode(node) {
@@ -1197,7 +1216,7 @@ function decorate(rootGraph, rootQuery) {
       query = [query];
     let graph;
     if (query.$ref) {
-      const { $ref, ...props } = query;
+      const { $ref, ...props2 } = query;
       const [range, filter] = splitRef($ref);
       const path = encode$2($ref);
       const targetPlumGraph = unwrap(rootGraph, path);
@@ -1206,7 +1225,7 @@ function decorate(rootGraph, rootQuery) {
           targetPlumGraph[PRE] = filter;
         graph = construct(
           targetPlumGraph,
-          range ? { $key: range, ...props } : props
+          range ? { $key: range, ...props2 } : props2
         );
         Object.defineProperty(graph, "$ref", { value: $ref });
       }
@@ -1216,8 +1235,8 @@ function decorate(rootGraph, rootQuery) {
         if (!(item == null ? void 0 : item.$key)) {
           return construct(descend(plumGraph, i), item);
         }
-        const { $key, $chi, ...props } = item;
-        const subQuery = $chi || (isEmpty(props) ? 1 : props);
+        const { $key, $chi, ...props2 } = item;
+        const subQuery = $chi || (isEmpty(props2) ? 1 : props2);
         if (!isPlainObject($key) || !splitArgs($key)[0]) {
           return construct(descend(plumGraph, $key), subQuery);
         }
@@ -1383,25 +1402,86 @@ function decode(string, start = 0) {
   }
   return addStringify(new Uint8Array(buffer));
 }
-function serialize(obj) {
-  return JSON.stringify(obj, (_key, value) => {
-    return ArrayBuffer.isView(value) ? "\0" + encode$1(value) : value;
-  });
+const props = [
+  "end",
+  "version",
+  "limit",
+  "value",
+  "path",
+  "prefix",
+  "children"
+];
+function serializeKey(key) {
+  if (key[0] === STR) {
+    const last = key[key.length - 1];
+    if (last !== 0 && last !== 255) {
+      return decode$4(key);
+    }
+  }
+  return "\0" + encode$1(key);
+}
+function deserializeKey(key) {
+  if (key[0] === "\0")
+    return decode(key.slice(1));
+  return encode$4(key);
+}
+function pack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
+  const array = children.map(
+    (node) => props.reduce(
+      (array2, prop, i) => {
+        if (!(prop in node))
+          return array2;
+        let value = node[prop];
+        if (prop === "version" && value === parentVersion)
+          return array2;
+        if (prop === "children")
+          value = pack(value, node.version);
+        if (prop === "end")
+          value = serializeKey(value);
+        if (prop === "path")
+          value = value.map(serializeKey);
+        array2[1] |= 1 << i;
+        array2.push(value);
+        return array2;
+      },
+      [serializeKey(node.key), 0]
+    )
+  );
+  return array;
 }
-function deserialize(str) {
-  return JSON.parse(
-    str,
-    (_key, value) => typeof value === "string" && value[0] === "\0" ? decode(value.slice(1)) : value
+function unpack(children, parentVersion) {
+  if (!Array.isArray(children))
+    return children;
+  const node = children.map(
+    ([key, type, ...values]) => props.reduce(
+      (node2, prop, i) => {
+        if (!(type & 1 << i))
+          return node2;
+        let value = values.shift();
+        if (prop === "children")
+          value = unpack(value, node2.version);
+        if (prop === "end")
+          value = deserializeKey(value);
+        if (prop === "path")
+          value = value.map(deserializeKey);
+        node2[prop] = value;
+        return node2;
+      },
+      { key: deserializeKey(key), version: parentVersion }
+    )
   );
+  return node;
 }
 const ROOT_KEY = Symbol();
 function encode(value, { version, isGraph } = {}) {
   var _a;
   const links = [];
-  function pushLink($ref, $ver, props, $val, $chi) {
+  function pushLink($ref, $ver, props2, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props) ? makeNode2(
-      range ? [{ $key: range, ...props }] : props,
+    let children = !isEmpty(props2) ? makeNode2(
+      range ? [{ $key: range, ...props2 }] : props2,
       void 0,
       $ver
     ).children : isDef($chi) ? makeNode2(
@@ -1414,41 +1494,75 @@ function encode(value, { version, isGraph } = {}) {
     }
   }
   const combine = isGraph ? merge : add;
-  function makeNode2(object, key, ver) {
+  function makeNode2(object, key, ver, parentPuts = []) {
     var _a2;
     if (!isDef(object))
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const { $key, $ver, $ref, $val, $chi, $put, ...props } = object || {};
+    const { $key, $ver, $ref, $val, $chi, $put, ...props2 } = 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 = makeNode2({ ...object, $key: filter || {} }, key, ver);
-        if (!filter)
-          node2.key = MIN_KEY;
-        node2.prefix = true;
-        return node2;
+      if (page) {
+        if (typeof object === "object" && object && !Array.isArray(object)) {
+          object = {
+            ...Object.fromEntries(
+              Object.entries({
+                $key,
+                $ver,
+                $ref,
+                $val,
+                $chi,
+                $put
+              }).filter(([_, val]) => isDef(val))
+            ),
+            ...props2
+          };
+        }
+        const foundPuts = parentPuts.filter(([_, putFilter]) => isEqual(filter, putFilter)).map(([range]) => range);
+        if (isGraph && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props2))) {
+          object.$key = filter || {};
+          object.$put = foundPuts;
+          const node2 = makeNode2(object, key, ver);
+          if (!filter)
+            node2.key = MIN_KEY;
+          node2.prefix = true;
+          return node2;
+        }
+        if ((!isDef(key) || Number.isInteger(key)) && (filter || isDef(page.$cursor))) {
+          object.$key = isDef(page.$cursor) ? page.$cursor : page;
+          const wrapper = { $key: filter || {}, $chi: [object] };
+          if (isGraph)
+            wrapper.$put = foundPuts;
+          const node2 = makeNode2(wrapper, key, ver);
+          if (!filter)
+            node2.key = MIN_KEY;
+          node2.prefix = true;
+          return node2;
+        }
       }
-      if ((!isDef(key) || Number.isInteger(key)) && page && (filter || isDef(page.$cursor))) {
-        const node2 = makeNode2(
-          {
-            $key: filter || {},
-            $chi: [
-              { ...object, $key: isDef(page.$cursor) ? page.$cursor : page }
-            ]
-          },
-          key,
-          ver
-        );
-        if (!filter)
-          node2.key = MIN_KEY;
-        node2.prefix = true;
-        return node2;
+    }
+    let putQuery = [], prefixPuts = [];
+    if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
+      putQuery = [encode$3({ $since: 0, $until: Infinity })];
+    }
+    function classifyPut(put) {
+      const [range, filter] = splitArgs(put);
+      if (filter) {
+        prefixPuts.push([range, filter]);
+      } else {
+        putQuery.push(encode$3(put));
       }
     }
+    if ($put === true) {
+      putQuery = null;
+    } else if (Array.isArray($put)) {
+      $put.forEach(classifyPut);
+    } else if (isDef($put)) {
+      classifyPut($put);
+    }
     if (isDef($key) && (Number.isInteger(key) || !isDef(key)))
       key = $key;
     const node = key === ROOT_KEY || !isDef(key) ? {} : encode$3(key);
@@ -1456,26 +1570,28 @@ function encode(value, { version, isGraph } = {}) {
     if (object === null) {
       node.end = node.key;
     } else if (isDef($key) && isDef(key) && key !== $key) {
-      node.children = [makeNode2(object, void 0, ver)].filter(Boolean);
+      node.children = [makeNode2(object, void 0, ver, prefixPuts)].filter(
+        Boolean
+      );
       return node;
     } else if ($ref) {
-      pushLink($ref, node.version, props, $val, $chi);
+      pushLink($ref, node.version, props2, $val, $chi);
       if (!isGraph)
         return;
       node.path = encode$2($ref);
     } else if ($val === true) {
-      node.value = props;
+      node.value = props2;
     } else if (isDef($val)) {
       node.value = $val;
     } else if (typeof object !== "object") {
       node.value = isGraph || typeof object === "number" ? object : 1;
     } else if (isDef($chi)) {
-      const children = $chi.map((obj) => makeNode2(obj, void 0, ver)).filter(Boolean).sort((a, b) => cmp(a.key, b.key));
+      const children = $chi.map((obj) => makeNode2(obj, void 0, ver, prefixPuts)).filter(Boolean).sort((a, b) => cmp(a.key, b.key));
       if (children.length) {
         node.children = children;
       }
     } else if (Array.isArray(object)) {
-      const children = object.map((obj, i) => makeNode2(obj, i, ver)).filter(Boolean).reduce((acc, it) => {
+      const children = object.map((obj, i) => makeNode2(obj, i, ver, prefixPuts)).filter(Boolean).reduce((acc, it) => {
         combine(acc, [it]);
         return acc;
       }, []);
@@ -1483,7 +1599,7 @@ function encode(value, { version, isGraph } = {}) {
         node.children = children;
       }
     } else {
-      const children = Object.keys(props).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
+      const children = Object.keys(props2).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
       if (children.length) {
         node.children = children;
       } else if (isGraph) {
@@ -1497,19 +1613,8 @@ function encode(value, { version, isGraph } = {}) {
         node.value = 1;
       }
     }
-    let putQuery;
-    if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
-      putQuery = [encode$3({ $since: 0, $until: Infinity })];
-    }
-    if ($put === true) {
-      putQuery = null;
-    } else if (Array.isArray($put)) {
-      putQuery = $put.map((arg) => encode$3(arg));
-    } else if (isDef($put)) {
-      putQuery = [encode$3($put)];
-    }
-    if (isGraph && isDef(putQuery)) {
-      node.children = finalize(node.children || [], putQuery, node.version);
+    if (isGraph && (putQuery === null || putQuery.length)) {
+      node.children = finalize(node.children || [], putQuery, false);
     }
     if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
@@ -1524,7 +1629,9 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return encode(obj, { version, isGraph: true });
+  const encoded = encode(obj, { version, isGraph: true });
+  const versioned = setVersion(encoded, version, true);
+  return versioned;
 }
 function encodeQuery(obj, version = 0) {
   return encode(obj, { version, isGraph: false });
@@ -1648,7 +1755,6 @@ export {
   decodeQuery,
   decode$4 as decodeValue,
   decorate,
-  deserialize,
   encode$3 as encodeArgs,
   encodeGraph,
   encode$2 as encodePath,
@@ -1681,13 +1787,14 @@ export {
   merge,
   mergeObject,
   mergeStreams,
+  pack,
   remove,
-  serialize,
   setVersion,
   sieve,
   slice,
   splitArgs,
   splitRef,
+  unpack,
   unwrap,
   unwrapObject,
   wrap,

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.16.0-alpha.1",
+  "version": "0.16.0-alpha.11",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -18,6 +18,6 @@
   "dependencies": {
     "lodash": "^4.17.19",
     "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.16.0-alpha.1"
+    "@graffy/stream": "0.16.0-alpha.11"
   }
 }

package/types/coding/index.d.ts

@@ -1,6 +1,6 @@
 export { default as makeId } from "./id.js";
 export { default as decorate } from "./decorate.js";
-export * from "./serialize.js";
+export * from "./pack.js";
 export * from "./encodeTree.js";
 export * from "./decodeTree.js";
 export { encode as encodeValue, decode as decodeValue } from "./struct.js";

package/types/coding/pack.d.ts

@@ -0,0 +1,2 @@
+export function pack(children: any, parentVersion: any): any;
+export function unpack(children: any, parentVersion: any): any;

package/types/ops/finalize.d.ts

@@ -1,4 +1,11 @@
-export default function finalize(graph: any, query: any, version?: number): {
+/**
+ *
+ * @param {any} graph
+ * @param {any} query
+ * @param {number | false} version
+ * @returns any
+ */
+export default function finalize(graph: any, query: any, version?: number | false): {
     key: Uint8Array;
     end: Uint8Array;
     version: number;

package/types/ops/setVersion.d.ts

@@ -1 +1 @@
-export default function setVersion(graph: any, version: any): any;
+export default function setVersion(graph: any, version: any, onlyIfZero?: boolean): any;

package/types/coding/serialize.d.ts

@@ -1,2 +0,0 @@
-export function serialize(obj: any): string;
-export function deserialize(str: any): any;