@graffy/common 0.16.0-alpha.8 → 0.16.0-alpha.9

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) {
@@ -391,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));
@@ -1039,14 +1037,16 @@ function getKnown(graph, version = 0) {
   }
   return query;
 }
-function finalize(graph, query, version = Date.now()) {
+function finalize(graph, query, version = Date.now(), suppressSetVersion = false) {
   let result = [{ key: MIN_KEY, end: MAX_KEY, version: 0 }];
   merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  result = setVersion(result, version);
+  if (!suppressSetVersion)
+    result = setVersion(result, version);
   return result;
 }
+const PRE_CHI_PUT = Symbol("PREFIX_CHILDREN_$PUT");
 function decode$1(nodes = [], { isGraph } = {}) {
   function decodeChildren(nodes2) {
     let result = [];
@@ -1062,6 +1062,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
       result.push(...objects);
     }
     const putRanges = [];
+    const prefixChildPuts = [];
     let lastNode = null;
     function addPutRange({ key, end }) {
       if (lastNode) {
@@ -1087,9 +1088,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 +1128,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 +1168,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,7 +1498,7 @@ 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;
@@ -1492,8 +1509,13 @@ function encode(value, { version, isGraph } = {}) {
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
+      const foundPuts = parentPuts.filter(([_, putFilter]) => isEqual__default.default(filter, putFilter)).map(([range]) => range);
       if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props2))) {
-        const node2 = makeNode2({ ...object, $key: filter || {} }, key, ver);
+        const node2 = makeNode2(
+          { ...object, $key: filter || {}, $put: foundPuts },
+          key,
+          ver
+        );
         if (!filter)
           node2.key = MIN_KEY;
         node2.prefix = true;
@@ -1505,7 +1527,8 @@ function encode(value, { version, isGraph } = {}) {
             $key: filter || {},
             $chi: [
               { ...object, $key: isDef(page.$cursor) ? page.$cursor : page }
-            ]
+            ],
+            ...isGraph ? { $put: foundPuts } : {}
           },
           key,
           ver
@@ -1516,6 +1539,25 @@ function encode(value, { version, isGraph } = {}) {
         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 +1565,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 +1581,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 +1608,13 @@ 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,
+        node.version,
+        true
+      );
     }
     if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
@@ -1591,7 +1629,7 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return encode(obj, { version, isGraph: true });
+  return setVersion(encode(obj, { version, isGraph: true }), version);
 }
 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) {
@@ -386,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));
@@ -1034,14 +1032,16 @@ function getKnown(graph, version = 0) {
   }
   return query;
 }
-function finalize(graph, query, version = Date.now()) {
+function finalize(graph, query, version = Date.now(), suppressSetVersion = false) {
   let result = [{ key: MIN_KEY, end: MAX_KEY, version: 0 }];
   merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  result = setVersion(result, version);
+  if (!suppressSetVersion)
+    result = setVersion(result, version);
   return result;
 }
+const PRE_CHI_PUT = Symbol("PREFIX_CHILDREN_$PUT");
 function decode$1(nodes = [], { isGraph } = {}) {
   function decodeChildren(nodes2) {
     let result = [];
@@ -1057,6 +1057,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
       result.push(...objects);
     }
     const putRanges = [];
+    const prefixChildPuts = [];
     let lastNode = null;
     function addPutRange({ key, end }) {
       if (lastNode) {
@@ -1082,9 +1083,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 +1123,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 +1163,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,7 +1493,7 @@ 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;
@@ -1487,8 +1504,13 @@ function encode(value, { version, isGraph } = {}) {
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
+      const foundPuts = parentPuts.filter(([_, putFilter]) => isEqual(filter, putFilter)).map(([range]) => range);
       if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props2))) {
-        const node2 = makeNode2({ ...object, $key: filter || {} }, key, ver);
+        const node2 = makeNode2(
+          { ...object, $key: filter || {}, $put: foundPuts },
+          key,
+          ver
+        );
         if (!filter)
           node2.key = MIN_KEY;
         node2.prefix = true;
@@ -1500,7 +1522,8 @@ function encode(value, { version, isGraph } = {}) {
             $key: filter || {},
             $chi: [
               { ...object, $key: isDef(page.$cursor) ? page.$cursor : page }
-            ]
+            ],
+            ...isGraph ? { $put: foundPuts } : {}
           },
           key,
           ver
@@ -1511,6 +1534,25 @@ function encode(value, { version, isGraph } = {}) {
         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 +1560,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 +1576,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 +1603,13 @@ 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,
+        node.version,
+        true
+      );
     }
     if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
@@ -1586,7 +1624,7 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return encode(obj, { version, isGraph: true });
+  return setVersion(encode(obj, { version, isGraph: true }), version);
 }
 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-alpha.9",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -17,7 +17,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "lodash": "^4.17.19",
-    "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.16.0-alpha.8"
+    "@graffy/stream": "0.16.0-alpha.9",
+    "merge-async-iterators": "^0.2.1"
   }
 }

package/types/ops/finalize.d.ts

@@ -1,4 +1,4 @@
-export default function finalize(graph: any, query: any, version?: number): {
+export default function finalize(graph: any, query: any, version?: number, suppressSetVersion?: boolean): {
     key: Uint8Array;
     end: Uint8Array;
     version: number;