@graffy/common 0.16.0-alpha.9 → 0.16.1

package/index.cjs

@@ -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))
@@ -1011,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;
 }
@@ -1037,13 +1048,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");
@@ -1484,15 +1495,8 @@ function encode(value, { version, isGraph } = {}) {
   const links = [];
   function pushLink($ref, $ver, props2, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props2) ? makeNode2(
-      range ? [{ $key: range, ...props2 }] : props2,
-      void 0,
-      $ver
-    ).children : isDef($chi) ? makeNode2(
-      range ? [{ $key: range, $chi }] : $chi,
-      void 0,
-      $ver
-    ).children : isDef($val) ? $val : isGraph ? void 0 : 1;
+    const node = !isEmpty(props2) ? makeNode2(range ? [{ $key: range, ...props2 }] : props2, void 0, $ver) : isDef($chi) ? makeNode2(range ? [{ $key: range, $chi }] : $chi, void 0, $ver) : null;
+    const children = node ? node.children : isDef($val) ? $val : isGraph ? void 0 : 1;
     if (children) {
       links.push(wrap(children, encode$2($ref), $ver, !!range)[0]);
     }
@@ -1502,41 +1506,50 @@ function encode(value, { version, isGraph } = {}) {
     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);
-      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) {
+        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 = [];
@@ -1609,12 +1622,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;
@@ -1629,7 +1637,9 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return setVersion(encode(obj, { version, isGraph: true }), version);
+  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

@@ -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))
@@ -1006,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;
 }
@@ -1032,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");
@@ -1479,15 +1490,8 @@ function encode(value, { version, isGraph } = {}) {
   const links = [];
   function pushLink($ref, $ver, props2, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props2) ? makeNode2(
-      range ? [{ $key: range, ...props2 }] : props2,
-      void 0,
-      $ver
-    ).children : isDef($chi) ? makeNode2(
-      range ? [{ $key: range, $chi }] : $chi,
-      void 0,
-      $ver
-    ).children : isDef($val) ? $val : isGraph ? void 0 : 1;
+    const node = !isEmpty(props2) ? makeNode2(range ? [{ $key: range, ...props2 }] : props2, void 0, $ver) : isDef($chi) ? makeNode2(range ? [{ $key: range, $chi }] : $chi, void 0, $ver) : null;
+    const children = node ? node.children : isDef($val) ? $val : isGraph ? void 0 : 1;
     if (children) {
       links.push(wrap(children, encode$2($ref), $ver, !!range)[0]);
     }
@@ -1497,41 +1501,50 @@ function encode(value, { version, isGraph } = {}) {
     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);
-      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) {
+        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 = [];
@@ -1604,12 +1617,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;
@@ -1624,7 +1632,9 @@ function encode(value, { version, isGraph } = {}) {
   return result;
 }
 function encodeGraph(obj, version = Date.now()) {
-  return setVersion(encode(obj, { version, isGraph: true }), version);
+  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.9",
+  "version": "0.16.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -17,7 +17,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "lodash": "^4.17.19",
-    "@graffy/stream": "0.16.0-alpha.9",
-    "merge-async-iterators": "^0.2.1"
+    "merge-async-iterators": "^0.2.1",
+    "@graffy/stream": "0.16.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;

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;