@graffy/common 0.16.0-alpha.10 → 0.16.0-alpha.12

package/index.cjs

@@ -118,6 +118,9 @@ const stringifyDescriptor = {
   }
 };
 function addStringify(buffer) {
+  if (Object.hasOwn(buffer, "toJSON") || Object.hasOwn(buffer, "toString") || Object.hasOwn(buffer, Symbol.for("nodejs.util.inspect.custom"))) {
+    return buffer;
+  }
   Object.defineProperties(buffer, {
     toJSON: stringifyDescriptor,
     toString: stringifyDescriptor,
@@ -282,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;
@@ -293,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))
@@ -1016,7 +1021,7 @@ function setVersion(graph, version, onlyIfZero = false) {
     if (!onlyIfZero || !node.version)
       node.version = version;
     if (node.children)
-      setVersion(node.children, version);
+      setVersion(node.children, version, onlyIfZero);
   }
   return graph;
 }
@@ -1038,13 +1043,13 @@ function getKnown(graph, version = 0) {
   }
   return query;
 }
-function finalize(graph, query, version = Date.now(), suppressSetVersion = false) {
+function finalize(graph, query, version = Date.now()) {
   let result = [{ key: MIN_KEY, end: MAX_KEY, version: 0 }];
   merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  if (!suppressSetVersion)
-    result = setVersion(result, version);
+  if (!version !== false)
+    result = setVersion(result, version, true);
   return result;
 }
 const PRE_CHI_PUT = Symbol("PREFIX_CHILDREN_$PUT");
@@ -1506,45 +1511,47 @@ function encode(value, { version, isGraph } = {}) {
     if (typeof object === "object" && object && isEmpty(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, ...props2 }).filter(
-          ([_, val]) => isDef(val)
-        )
-      );
-    }
     if (isDef($ver))
       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 || {}, $put: foundPuts },
-          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 }
-            ],
-            ...isGraph ? { $put: foundPuts } : {}
-          },
-          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;
+        }
       }
     }
     let putQuery = [], prefixPuts = [];
@@ -1617,12 +1624,7 @@ function encode(value, { version, isGraph } = {}) {
       }
     }
     if (isGraph && (putQuery === null || putQuery.length)) {
-      node.children = finalize(
-        node.children || [],
-        putQuery,
-        node.version,
-        true
-      );
+      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;
@@ -1637,7 +1639,9 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return setVersion(encode(obj, { version, isGraph: true }), version, 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

@@ -113,6 +113,9 @@ const stringifyDescriptor = {
   }
 };
 function addStringify(buffer) {
+  if (Object.hasOwn(buffer, "toJSON") || Object.hasOwn(buffer, "toString") || Object.hasOwn(buffer, Symbol.for("nodejs.util.inspect.custom"))) {
+    return buffer;
+  }
   Object.defineProperties(buffer, {
     toJSON: stringifyDescriptor,
     toString: stringifyDescriptor,
@@ -277,10 +280,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 +293,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))
@@ -1011,7 +1016,7 @@ function setVersion(graph, version, onlyIfZero = false) {
     if (!onlyIfZero || !node.version)
       node.version = version;
     if (node.children)
-      setVersion(node.children, version);
+      setVersion(node.children, version, onlyIfZero);
   }
   return graph;
 }
@@ -1033,13 +1038,13 @@ function getKnown(graph, version = 0) {
   }
   return query;
 }
-function finalize(graph, query, version = Date.now(), suppressSetVersion = false) {
+function finalize(graph, query, version = Date.now()) {
   let result = [{ key: MIN_KEY, end: MAX_KEY, version: 0 }];
   merge(result, graph);
   if (query)
     result = slice(result, query).known || [];
-  if (!suppressSetVersion)
-    result = setVersion(result, version);
+  if (!version !== false)
+    result = setVersion(result, version, true);
   return result;
 }
 const PRE_CHI_PUT = Symbol("PREFIX_CHILDREN_$PUT");
@@ -1501,45 +1506,47 @@ function encode(value, { version, isGraph } = {}) {
     if (typeof object === "object" && object && isEmpty(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, ...props2 }).filter(
-          ([_, val]) => isDef(val)
-        )
-      );
-    }
     if (isDef($ver))
       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 || {}, $put: foundPuts },
-          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 }
-            ],
-            ...isGraph ? { $put: foundPuts } : {}
-          },
-          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;
+        }
       }
     }
     let putQuery = [], prefixPuts = [];
@@ -1612,12 +1619,7 @@ function encode(value, { version, isGraph } = {}) {
       }
     }
     if (isGraph && (putQuery === null || putQuery.length)) {
-      node.children = finalize(
-        node.children || [],
-        putQuery,
-        node.version,
-        true
-      );
+      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;
@@ -1632,7 +1634,9 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return setVersion(encode(obj, { version, isGraph: true }), version, 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.10",
+  "version": "0.16.0-alpha.12",
   "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.10"
+    "@graffy/stream": "0.16.0-alpha.12",
+    "merge-async-iterators": "^0.2.1"
   }
 }

package/types/ops/finalize.d.ts

@@ -1,4 +1,11 @@
-export default function finalize(graph: any, query: any, version?: number, suppressSetVersion?: boolean): {
+/**
+ *
+ * @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;