@graffy/common 0.16.1 → 0.16.2

package/index.cjs

@@ -1,11 +1,8 @@
 "use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const isEqual = require("lodash/isEqual.js");
 const mergeIterators = require("merge-async-iterators");
 const stream = require("@graffy/stream");
-const _interopDefaultLegacy = (e) => e && typeof e === "object" && "default" in e ? e : { default: e };
-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) {
@@ -54,7 +51,7 @@ function isMaxKey(key) {
   return key.length === 1 && key[0] === 255;
 }
 function err(message, { cause = null, ...args } = {}) {
-  const e = new Error(message + (args ? " " + JSON.stringify(args) : ""));
+  const e = new Error(message + (args ? ` ${JSON.stringify(args)}` : ""));
   e.cause = cause;
   throw e;
 }
@@ -107,7 +104,7 @@ const stringifyDescriptor = {
   value: function() {
     var _a;
     if ((this == null ? void 0 : this.length) === 0)
-      return "\xB7";
+      return "·";
     let str = "";
     let bull = false;
     (_a = this == null ? void 0 : this.forEach) == null ? void 0 : _a.call(this, (value, i) => {
@@ -115,7 +112,7 @@ const stringifyDescriptor = {
         str += String.fromCharCode(value);
         bull = true;
       } else {
-        str += (bull ? "\xB7" : "") + ("0" + value.toString(16)).slice(-2) + (i < this.length - 1 ? "\xB7" : "");
+        str += (bull ? "·" : "") + `0${value.toString(16)}`.slice(-2) + (i < this.length - 1 ? "·" : "");
         bull = false;
       }
     });
@@ -274,7 +271,7 @@ function decode$4(buffer) {
         pushToken(type, {});
         break;
       default:
-        throw new Error("Invalid byte " + type + " at " + start);
+        throw new Error(`Invalid byte ${type} at ${start}`);
     }
   }
   return stack[0][0];
@@ -432,7 +429,7 @@ function encode$2(path) {
     path = path.split(PATH_SEPARATOR);
   }
   if (!Array.isArray(path)) {
-    throw Error("encodePath.invalid:" + JSON.stringify(path));
+    throw Error(`encodePath.invalid:${JSON.stringify(path)}`);
   }
   function encodeSegment(seg) {
     if (ArrayBuffer.isView(seg))
@@ -451,7 +448,7 @@ function encode$2(path) {
 }
 function decode$2(path) {
   if (!Array.isArray(path)) {
-    throw Error("decodePath.invalid:" + JSON.stringify(path));
+    throw Error(`decodePath.invalid:${JSON.stringify(path)}`);
   }
   return path.map((key) => decode$3({ key }));
 }
@@ -500,7 +497,7 @@ function isBranch(node) {
   return node && typeof node.children !== "undefined";
 }
 function isPrefix(node) {
-  return node && node.prefix;
+  return node == null ? void 0 : node.prefix;
 }
 function isLink(node) {
   return node && typeof node.path !== "undefined";
@@ -596,7 +593,7 @@ function mergeRanges$1(base, node) {
 }
 function insertNode$1(current, change, start = 0) {
   if (!current)
-    throw new Error("merge.insertNode: " + current);
+    throw new Error(`merge.insertNode: ${current}`);
   const key = change.key;
   const index = findFirst(current, key, start);
   const node = current[index];
@@ -659,7 +656,7 @@ function wrapValue(value, path, version = 0) {
 }
 function wrap(children, path, version = 0, prefix = false) {
   if (!Array.isArray(path))
-    throw Error("wrap.path_not_array " + path);
+    throw Error(`wrap.path_not_array ${path}`);
   if (!path.length)
     return children;
   let i = path.length - 1;
@@ -678,7 +675,7 @@ function wrap(children, path, version = 0, prefix = false) {
 }
 function unwrap(tree, path) {
   if (!Array.isArray(path))
-    throw Error("unwrap.path_not_array " + path);
+    throw Error(`unwrap.path_not_array ${path}`);
   let children = tree;
   let node = { children };
   for (let i = 0; i < path.length; i++) {
@@ -708,7 +705,7 @@ function getNodeValue(node) {
 }
 function remove(children, path) {
   if (!Array.isArray(path))
-    throw Error("del.path_not_array " + path);
+    throw Error(`del.path_not_array ${path}`);
   if (!children)
     return null;
   if (!path.length)
@@ -989,9 +986,9 @@ function updateNode(current, index, change, result) {
   return index + 1;
 }
 function isPathEqual(first, second) {
-  if (!first && !second)
+  if (!(first || second))
     return true;
-  if (!first || !second)
+  if (!(first && second))
     return false;
   if (first.length !== second.length)
     return false;
@@ -1023,7 +1020,7 @@ function getNewerChange(node, base) {
 }
 function setVersion(graph, version, onlyIfZero = false) {
   for (const node of graph) {
-    if (!onlyIfZero || !node.version)
+    if (!(onlyIfZero && node.version))
       node.version = version;
     if (node.children)
       setVersion(node.children, version, onlyIfZero);
@@ -1152,14 +1149,14 @@ function decode$1(nodes = [], { isGraph } = {}) {
     if (!args)
       args = {};
     if (typeof args === "string") {
-      throw Error("decode.unencoded_prefix: " + args);
+      throw Error(`decode.unencoded_prefix: ${args}`);
     }
     if (isLink(node)) {
       args.$all = true;
       const $ref = decode$2(node.path);
       const lastKey = $ref[$ref.length - 1];
       if (typeof lastKey === "string") {
-        throw Error("decode.unencoded_prefix_ref: " + node.path);
+        throw Error(`decode.unencoded_prefix_ref: ${node.path}`);
       }
       lastKey.$all = true;
       const linkObject = { $key: args };
@@ -1168,11 +1165,11 @@ function decode$1(nodes = [], { isGraph } = {}) {
     }
     const children = decodeChildren(node.children);
     if (!Array.isArray(children)) {
-      throw Error("decode.prefix_without_encoded_child_keys:" + node.key);
+      throw Error(`decode.prefix_without_encoded_child_keys:${node.key}`);
     }
     for (const child of children) {
       if (typeof child.$key === "string") {
-        throw Error("decode.prefix_with_unencoded_child_key:" + child.$key);
+        throw Error(`decode.prefix_with_unencoded_child_key:${child.$key}`);
       }
       if (!splitArgs(child.$key)[0]) {
         child.$key = { $cursor: child.$key };
@@ -1252,12 +1249,12 @@ function decorate(rootGraph, rootQuery) {
         }
         const { $key, $chi, ...props2 } = item;
         const subQuery = $chi || (isEmpty(props2) ? 1 : props2);
-        if (!isPlainObject($key) || !splitArgs($key)[0]) {
+        if (!(isPlainObject($key) && splitArgs($key)[0])) {
           return construct(descend(plumGraph, $key), subQuery);
         }
         if (pageKey) {
           throw Error(
-            "decorate.multi_range_query:" + JSON.stringify({ $key, pageKey })
+            `decorate.multi_range_query:${JSON.stringify({ $key, pageKey })}`
           );
         }
         pageKey = $key;
@@ -1433,7 +1430,7 @@ function serializeKey(key) {
       return decode$4(key);
     }
   }
-  return "\0" + encode$1(key);
+  return `\0${encode$1(key)}`;
 }
 function deserializeKey(key) {
   if (key[0] === "\0")
@@ -1529,7 +1526,7 @@ function encode(value, { version, isGraph } = {}) {
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
       if (page) {
-        const foundPuts = parentPuts.filter(([_, putFilter]) => isEqual__default.default(filter, putFilter)).map(([range]) => range);
+        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;
@@ -1552,7 +1549,8 @@ function encode(value, { version, isGraph } = {}) {
         }
       }
     }
-    let putQuery = [], prefixPuts = [];
+    let putQuery = [];
+    let prefixPuts = [];
     if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
       putQuery = [encode$3({ $since: 0, $until: Infinity })];
     }
@@ -1611,7 +1609,7 @@ function encode(value, { version, isGraph } = {}) {
       if (children.length) {
         node.children = children;
       } else if (isGraph) {
-        if (!isDef($key) && !isDef($put))
+        if (!(isDef($key) || isDef($put)))
           return;
         if (node.key && !node.end)
           node.end = node.key;
@@ -1658,7 +1656,7 @@ async function* mergeStreams(...streams) {
       merge(merged, value);
     yield merged;
   }
-  yield* mergeIterators__default.default(streams);
+  yield* mergeIterators(streams);
 }
 function makeWatcher() {
   const listeners = /* @__PURE__ */ new Set();
@@ -1709,7 +1707,7 @@ function cloneObject(object) {
 }
 function wrapObject(object, path) {
   if (!Array.isArray(path))
-    throw Error("wrapObject.path_not_array " + path);
+    throw Error(`wrapObject.path_not_array ${path}`);
   for (let i = path.length - 1; i >= 0; i--) {
     const $key = path[i];
     if (typeof $key === "string") {
@@ -1724,26 +1722,26 @@ function wrapObject(object, path) {
 }
 function unwrapObject(object, path) {
   if (!Array.isArray(path))
-    throw Error("unwrapObject.path_not_array " + path);
+    throw Error(`unwrapObject.path_not_array ${path}`);
   for (let i = 0; i < path.length; i++) {
     if (!object || typeof object !== "object")
       return;
     const $key = path[i];
     if (typeof $key === "string") {
       if (Array.isArray(object)) {
-        throw Error("unwrapObject.string_key_array:" + $key);
+        throw Error(`unwrapObject.string_key_array:${$key}`);
       }
       object = object[$key];
     } else {
       if (!Array.isArray(object)) {
-        throw Error("unwrapObject.arg_key_object:" + JSON.stringify($key));
+        throw Error(`unwrapObject.arg_key_object:${JSON.stringify($key)}`);
       }
       const [page, filter] = splitArgs($key);
       if (page && !page.$cursor) {
         return object;
       } else {
         const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
-        object = object.find(({ $key: $key2 }) => isEqual__default.default($key2, target));
+        object = object.find(({ $key: $key2 }) => isEqual($key2, target));
       }
     }
   }

package/index.mjs

@@ -49,7 +49,7 @@ function isMaxKey(key) {
   return key.length === 1 && key[0] === 255;
 }
 function err(message, { cause = null, ...args } = {}) {
-  const e = new Error(message + (args ? " " + JSON.stringify(args) : ""));
+  const e = new Error(message + (args ? ` ${JSON.stringify(args)}` : ""));
   e.cause = cause;
   throw e;
 }
@@ -102,7 +102,7 @@ const stringifyDescriptor = {
   value: function() {
     var _a;
     if ((this == null ? void 0 : this.length) === 0)
-      return "\xB7";
+      return "·";
     let str = "";
     let bull = false;
     (_a = this == null ? void 0 : this.forEach) == null ? void 0 : _a.call(this, (value, i) => {
@@ -110,7 +110,7 @@ const stringifyDescriptor = {
         str += String.fromCharCode(value);
         bull = true;
       } else {
-        str += (bull ? "\xB7" : "") + ("0" + value.toString(16)).slice(-2) + (i < this.length - 1 ? "\xB7" : "");
+        str += (bull ? "·" : "") + `0${value.toString(16)}`.slice(-2) + (i < this.length - 1 ? "·" : "");
         bull = false;
       }
     });
@@ -269,7 +269,7 @@ function decode$4(buffer) {
         pushToken(type, {});
         break;
       default:
-        throw new Error("Invalid byte " + type + " at " + start);
+        throw new Error(`Invalid byte ${type} at ${start}`);
     }
   }
   return stack[0][0];
@@ -427,7 +427,7 @@ function encode$2(path) {
     path = path.split(PATH_SEPARATOR);
   }
   if (!Array.isArray(path)) {
-    throw Error("encodePath.invalid:" + JSON.stringify(path));
+    throw Error(`encodePath.invalid:${JSON.stringify(path)}`);
   }
   function encodeSegment(seg) {
     if (ArrayBuffer.isView(seg))
@@ -446,7 +446,7 @@ function encode$2(path) {
 }
 function decode$2(path) {
   if (!Array.isArray(path)) {
-    throw Error("decodePath.invalid:" + JSON.stringify(path));
+    throw Error(`decodePath.invalid:${JSON.stringify(path)}`);
   }
   return path.map((key) => decode$3({ key }));
 }
@@ -495,7 +495,7 @@ function isBranch(node) {
   return node && typeof node.children !== "undefined";
 }
 function isPrefix(node) {
-  return node && node.prefix;
+  return node == null ? void 0 : node.prefix;
 }
 function isLink(node) {
   return node && typeof node.path !== "undefined";
@@ -591,7 +591,7 @@ function mergeRanges$1(base, node) {
 }
 function insertNode$1(current, change, start = 0) {
   if (!current)
-    throw new Error("merge.insertNode: " + current);
+    throw new Error(`merge.insertNode: ${current}`);
   const key = change.key;
   const index = findFirst(current, key, start);
   const node = current[index];
@@ -654,7 +654,7 @@ function wrapValue(value, path, version = 0) {
 }
 function wrap(children, path, version = 0, prefix = false) {
   if (!Array.isArray(path))
-    throw Error("wrap.path_not_array " + path);
+    throw Error(`wrap.path_not_array ${path}`);
   if (!path.length)
     return children;
   let i = path.length - 1;
@@ -673,7 +673,7 @@ function wrap(children, path, version = 0, prefix = false) {
 }
 function unwrap(tree, path) {
   if (!Array.isArray(path))
-    throw Error("unwrap.path_not_array " + path);
+    throw Error(`unwrap.path_not_array ${path}`);
   let children = tree;
   let node = { children };
   for (let i = 0; i < path.length; i++) {
@@ -703,7 +703,7 @@ function getNodeValue(node) {
 }
 function remove(children, path) {
   if (!Array.isArray(path))
-    throw Error("del.path_not_array " + path);
+    throw Error(`del.path_not_array ${path}`);
   if (!children)
     return null;
   if (!path.length)
@@ -984,9 +984,9 @@ function updateNode(current, index, change, result) {
   return index + 1;
 }
 function isPathEqual(first, second) {
-  if (!first && !second)
+  if (!(first || second))
     return true;
-  if (!first || !second)
+  if (!(first && second))
     return false;
   if (first.length !== second.length)
     return false;
@@ -1018,7 +1018,7 @@ function getNewerChange(node, base) {
 }
 function setVersion(graph, version, onlyIfZero = false) {
   for (const node of graph) {
-    if (!onlyIfZero || !node.version)
+    if (!(onlyIfZero && node.version))
       node.version = version;
     if (node.children)
       setVersion(node.children, version, onlyIfZero);
@@ -1147,14 +1147,14 @@ function decode$1(nodes = [], { isGraph } = {}) {
     if (!args)
       args = {};
     if (typeof args === "string") {
-      throw Error("decode.unencoded_prefix: " + args);
+      throw Error(`decode.unencoded_prefix: ${args}`);
     }
     if (isLink(node)) {
       args.$all = true;
       const $ref = decode$2(node.path);
       const lastKey = $ref[$ref.length - 1];
       if (typeof lastKey === "string") {
-        throw Error("decode.unencoded_prefix_ref: " + node.path);
+        throw Error(`decode.unencoded_prefix_ref: ${node.path}`);
       }
       lastKey.$all = true;
       const linkObject = { $key: args };
@@ -1163,11 +1163,11 @@ function decode$1(nodes = [], { isGraph } = {}) {
     }
     const children = decodeChildren(node.children);
     if (!Array.isArray(children)) {
-      throw Error("decode.prefix_without_encoded_child_keys:" + node.key);
+      throw Error(`decode.prefix_without_encoded_child_keys:${node.key}`);
     }
     for (const child of children) {
       if (typeof child.$key === "string") {
-        throw Error("decode.prefix_with_unencoded_child_key:" + child.$key);
+        throw Error(`decode.prefix_with_unencoded_child_key:${child.$key}`);
       }
       if (!splitArgs(child.$key)[0]) {
         child.$key = { $cursor: child.$key };
@@ -1247,12 +1247,12 @@ function decorate(rootGraph, rootQuery) {
         }
         const { $key, $chi, ...props2 } = item;
         const subQuery = $chi || (isEmpty(props2) ? 1 : props2);
-        if (!isPlainObject($key) || !splitArgs($key)[0]) {
+        if (!(isPlainObject($key) && splitArgs($key)[0])) {
           return construct(descend(plumGraph, $key), subQuery);
         }
         if (pageKey) {
           throw Error(
-            "decorate.multi_range_query:" + JSON.stringify({ $key, pageKey })
+            `decorate.multi_range_query:${JSON.stringify({ $key, pageKey })}`
           );
         }
         pageKey = $key;
@@ -1428,7 +1428,7 @@ function serializeKey(key) {
       return decode$4(key);
     }
   }
-  return "\0" + encode$1(key);
+  return `\0${encode$1(key)}`;
 }
 function deserializeKey(key) {
   if (key[0] === "\0")
@@ -1547,7 +1547,8 @@ function encode(value, { version, isGraph } = {}) {
         }
       }
     }
-    let putQuery = [], prefixPuts = [];
+    let putQuery = [];
+    let prefixPuts = [];
     if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
       putQuery = [encode$3({ $since: 0, $until: Infinity })];
     }
@@ -1606,7 +1607,7 @@ function encode(value, { version, isGraph } = {}) {
       if (children.length) {
         node.children = children;
       } else if (isGraph) {
-        if (!isDef($key) && !isDef($put))
+        if (!(isDef($key) || isDef($put)))
           return;
         if (node.key && !node.end)
           node.end = node.key;
@@ -1704,7 +1705,7 @@ function cloneObject(object) {
 }
 function wrapObject(object, path) {
   if (!Array.isArray(path))
-    throw Error("wrapObject.path_not_array " + path);
+    throw Error(`wrapObject.path_not_array ${path}`);
   for (let i = path.length - 1; i >= 0; i--) {
     const $key = path[i];
     if (typeof $key === "string") {
@@ -1719,19 +1720,19 @@ function wrapObject(object, path) {
 }
 function unwrapObject(object, path) {
   if (!Array.isArray(path))
-    throw Error("unwrapObject.path_not_array " + path);
+    throw Error(`unwrapObject.path_not_array ${path}`);
   for (let i = 0; i < path.length; i++) {
     if (!object || typeof object !== "object")
       return;
     const $key = path[i];
     if (typeof $key === "string") {
       if (Array.isArray(object)) {
-        throw Error("unwrapObject.string_key_array:" + $key);
+        throw Error(`unwrapObject.string_key_array:${$key}`);
       }
       object = object[$key];
     } else {
       if (!Array.isArray(object)) {
-        throw Error("unwrapObject.arg_key_object:" + JSON.stringify($key));
+        throw Error(`unwrapObject.arg_key_object:${JSON.stringify($key)}`);
       }
       const [page, filter] = splitArgs($key);
       if (page && !page.$cursor) {

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

package/types/util.d.ts

@@ -7,7 +7,7 @@ export function errIf(message: any, condition: any, args: any): void;
 export function isEmpty(object: any): boolean;
 export function isDef(value: any): boolean;
 export function isPlainObject(arg: any): boolean;
-export function cmp(a: any, b: any): 1 | -1 | 0;
+export function cmp(a: any, b: any): 0 | 1 | -1;
 export function find(items: any, compare: any, first?: number, last?: any): number;
 export function addStringify(buffer: any): any;
 export const MIN_KEY: Uint8Array;