@graffy/common 0.16.0-alpha.8 → 0.16.0

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) {
@@ -14,13 +14,19 @@ function encode$6(string) {
 function decode$6(u8Arr) {
   return textDecoder.decode(u8Arr);
 }
+function TwosComplement(view) {
+  let lo = -view.getUint32(4) >>> 0;
+  const carry = lo ? 0 : -1;
+  let hi = ~view.getUint32(0) + carry >>> 0;
+  view.setUint32(0, hi);
+  view.setUint32(4, lo);
+}
 function encode$5(number) {
   const buffer = new ArrayBuffer(8);
   const view = new DataView(buffer);
   view.setFloat64(0, number);
   if (number < 0) {
-    view.setUint32(0, ~view.getUint32(0) >>> 0);
-    view.setUint32(4, ~view.getUint32(4) >>> 0);
+    TwosComplement(view);
   } else {
     view.setUint8(0, view.getUint8(0) | 128);
   }
@@ -35,8 +41,7 @@ function decode$5(u8Arr) {
   if (high & 128) {
     view.setUint8(0, high & 127);
   } else {
-    view.setUint32(0, ~view.getUint32(0) >>> 0);
-    view.setUint32(4, ~view.getUint32(4) >>> 0);
+    TwosComplement(view);
   }
   return view.getFloat64(0);
 }
@@ -118,6 +123,9 @@ const stringifyDescriptor = {
   }
 };
 function addStringify(buffer) {
+  if ("toJSON" in buffer || "toString" in buffer || Symbol.for("nodejs.util.inspect.custom") in buffer) {
+    return buffer;
+  }
   Object.defineProperties(buffer, {
     toJSON: stringifyDescriptor,
     toString: stringifyDescriptor,
@@ -282,10 +290,12 @@ function keyStep(key) {
   switch (key[l]) {
     case 0:
       newKey = key.slice(0, l);
+      addStringify(newKey);
       step = 1;
       break;
     case 255:
       newKey = key.slice(0, l);
+      addStringify(newKey);
       newKey[l - 1]++;
       step = -1;
       break;
@@ -293,7 +303,7 @@ function keyStep(key) {
       newKey = key;
       step = 0;
   }
-  return { key: addStringify(newKey), step };
+  return { key: newKey, step };
 }
 function keyBefore(key) {
   if (isMinKey(key) || isMaxKey(key))
@@ -391,8 +401,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));
@@ -1013,11 +1021,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;
 }
@@ -1044,9 +1053,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 = [];
@@ -1062,6 +1073,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
       result.push(...objects);
     }
     const putRanges = [];
+    const prefixChildPuts = [];
     let lastNode = null;
     function addPutRange({ key, end }) {
       if (lastNode) {
@@ -1087,9 +1099,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));
@@ -1123,15 +1139,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);
@@ -1161,6 +1179,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) {
@@ -1481,41 +1509,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;
+    const { $key, $ver, $ref, $val, $chi, $put, ...props2 } = object || {};
+    if (typeof object === "object" && object && !Array.isArray(object)) {
+      object = {
+        ...Object.fromEntries(
+          Object.entries({
+            $key,
+            $ver,
+            $ref,
+            $val,
+            $chi,
+            $put
+          }).filter(([_, val]) => isDef(val))
+        ),
+        ...props2
+      };
+    }
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    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(props2))) {
-        const node2 = makeNode2({ ...object, $key: filter || {} }, key, ver);
-        if (!filter)
-          node2.key = MIN_KEY;
-        node2.prefix = true;
-        return node2;
+      if (page) {
+        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);
@@ -1523,7 +1585,9 @@ 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, props2, $val, $chi);
@@ -1537,12 +1601,12 @@ function encode(value, { version, isGraph } = {}) {
     } 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;
       }, []);
@@ -1564,19 +1628,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;
@@ -1591,7 +1644,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 });

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) {
@@ -9,13 +9,19 @@ function encode$6(string) {
 function decode$6(u8Arr) {
   return textDecoder.decode(u8Arr);
 }
+function TwosComplement(view) {
+  let lo = -view.getUint32(4) >>> 0;
+  const carry = lo ? 0 : -1;
+  let hi = ~view.getUint32(0) + carry >>> 0;
+  view.setUint32(0, hi);
+  view.setUint32(4, lo);
+}
 function encode$5(number) {
   const buffer = new ArrayBuffer(8);
   const view = new DataView(buffer);
   view.setFloat64(0, number);
   if (number < 0) {
-    view.setUint32(0, ~view.getUint32(0) >>> 0);
-    view.setUint32(4, ~view.getUint32(4) >>> 0);
+    TwosComplement(view);
   } else {
     view.setUint8(0, view.getUint8(0) | 128);
   }
@@ -30,8 +36,7 @@ function decode$5(u8Arr) {
   if (high & 128) {
     view.setUint8(0, high & 127);
   } else {
-    view.setUint32(0, ~view.getUint32(0) >>> 0);
-    view.setUint32(4, ~view.getUint32(4) >>> 0);
+    TwosComplement(view);
   }
   return view.getFloat64(0);
 }
@@ -113,6 +118,9 @@ const stringifyDescriptor = {
   }
 };
 function addStringify(buffer) {
+  if ("toJSON" in buffer || "toString" in buffer || Symbol.for("nodejs.util.inspect.custom") in buffer) {
+    return buffer;
+  }
   Object.defineProperties(buffer, {
     toJSON: stringifyDescriptor,
     toString: stringifyDescriptor,
@@ -277,10 +285,12 @@ function keyStep(key) {
   switch (key[l]) {
     case 0:
       newKey = key.slice(0, l);
+      addStringify(newKey);
       step = 1;
       break;
     case 255:
       newKey = key.slice(0, l);
+      addStringify(newKey);
       newKey[l - 1]++;
       step = -1;
       break;
@@ -288,7 +298,7 @@ function keyStep(key) {
       newKey = key;
       step = 0;
   }
-  return { key: addStringify(newKey), step };
+  return { key: newKey, step };
 }
 function keyBefore(key) {
   if (isMinKey(key) || isMaxKey(key))
@@ -386,8 +396,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));
@@ -1008,11 +1016,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;
 }
@@ -1039,9 +1048,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 = [];
@@ -1057,6 +1068,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
       result.push(...objects);
     }
     const putRanges = [];
+    const prefixChildPuts = [];
     let lastNode = null;
     function addPutRange({ key, end }) {
       if (lastNode) {
@@ -1082,9 +1094,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));
@@ -1118,15 +1134,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);
@@ -1156,6 +1174,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) {
@@ -1476,41 +1504,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;
+    const { $key, $ver, $ref, $val, $chi, $put, ...props2 } = object || {};
+    if (typeof object === "object" && object && !Array.isArray(object)) {
+      object = {
+        ...Object.fromEntries(
+          Object.entries({
+            $key,
+            $ver,
+            $ref,
+            $val,
+            $chi,
+            $put
+          }).filter(([_, val]) => isDef(val))
+        ),
+        ...props2
+      };
+    }
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    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(props2))) {
-        const node2 = makeNode2({ ...object, $key: filter || {} }, key, ver);
-        if (!filter)
-          node2.key = MIN_KEY;
-        node2.prefix = true;
-        return node2;
+      if (page) {
+        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);
@@ -1518,7 +1580,9 @@ 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, props2, $val, $chi);
@@ -1532,12 +1596,12 @@ function encode(value, { version, isGraph } = {}) {
     } 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;
       }, []);
@@ -1559,19 +1623,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;
@@ -1586,7 +1639,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 });

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.8",
+  "version": "0.16.0",
   "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.8"
+    "@graffy/stream": "0.16.0"
   }
 }

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;