@graffy/common 0.16.3-alpha.5 → 0.16.3-alpha.6

package/index.cjs

@@ -70,6 +70,13 @@ function isDef(value) {
 function isPlainObject(arg) {
   return typeof arg === "object" && arg && !Array.isArray(arg) && !ArrayBuffer.isView(arg);
 }
+function clone$1(obj) {
+  if (Array.isArray(obj)) {
+    return obj.slice(0);
+  } else {
+    return { ...obj };
+  }
+}
 function cmp(a, b) {
   const l = a.length < b.length ? a.length : b.length;
   for (let i = 0; i < l; i++) {
@@ -413,10 +420,10 @@ function decode$3(node) {
   } else if (isMinKey(key) && isMaxKey(end) || isMinKey(end) && isMaxKey(key)) {
     args.$all = true;
   }
-  if (lower.key && !isMinKey(lower.key)) {
+  if (isDef(lower.key) && !isMinKey(lower.key)) {
     args[lower.step === 1 ? "$after" : "$since"] = lower.key;
   }
-  if (upper.key && !isMaxKey(upper.key)) {
+  if (isDef(upper.key) && !isMaxKey(upper.key)) {
     args[upper.step === -1 ? "$before" : "$until"] = upper.key;
   }
   return args;
@@ -1119,10 +1126,11 @@ function decode$1(nodes = [], { isGraph } = {}) {
             delete item.$key;
             return collection;
           }
-          const { $key, $val } = item;
+          let { $key, $val } = item;
           delete item.$key;
           delete item.$val;
           if (typeof $val === "object") {
+            $val = clone$1($val);
             Object.defineProperty($val, "$val", { value: true });
           }
           collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
@@ -1551,7 +1559,7 @@ function encode(value, { version, isGraph } = {}) {
     }
     let putRange = [];
     let prefixPuts = [];
-    if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
+    if (Array.isArray(object) && !isDef($put) && !isDef($val) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
       putRange = [encode$3({ $since: 0, $until: Infinity })];
     }
     function classifyPut(put) {
@@ -1586,7 +1594,7 @@ function encode(value, { version, isGraph } = {}) {
         return;
       node.path = encode$2($ref);
     } else if ($val === true) {
-      node.value = props2;
+      node.value = Array.isArray(object) ? clone$1(object) : props2;
     } else if (isDef($val)) {
       node.value = $val;
     } else if (typeof object !== "object") {
@@ -1608,7 +1616,9 @@ function encode(value, { version, isGraph } = {}) {
       const children = Object.keys(props2).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
       if (children.length) {
         node.children = children;
-      } else if (isGraph) {
+      } else if (putRange.length)
+        ;
+      else if (isGraph) {
         if (!(isDef($key) || isDef($put)))
           return;
         if (node.key && !node.end)
@@ -1619,8 +1629,12 @@ function encode(value, { version, isGraph } = {}) {
         node.value = 1;
       }
     }
-    if (isGraph && putRange.length) {
-      const putRangeClone = putRange.map(({ key: key2, end }) => ({ key: key2, end, version: 0 }));
+    if (isGraph && putRange.length && !isDef(node.path) && !isDef(node.value)) {
+      const putRangeClone = putRange.map(({ key: key2, end }) => ({
+        key: key2,
+        end,
+        version: 0
+      }));
       node.children = merge(putRangeClone, node.children || []);
     }
     if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
@@ -1753,6 +1767,7 @@ exports.MAX_KEY = MAX_KEY;
 exports.MIN_KEY = MIN_KEY;
 exports.add = add;
 exports.addStringify = addStringify;
+exports.clone = clone$1;
 exports.cloneObject = cloneObject;
 exports.cmp = cmp;
 exports.decodeArgs = decode$3;

package/index.mjs

@@ -68,6 +68,13 @@ function isDef(value) {
 function isPlainObject(arg) {
   return typeof arg === "object" && arg && !Array.isArray(arg) && !ArrayBuffer.isView(arg);
 }
+function clone$1(obj) {
+  if (Array.isArray(obj)) {
+    return obj.slice(0);
+  } else {
+    return { ...obj };
+  }
+}
 function cmp(a, b) {
   const l = a.length < b.length ? a.length : b.length;
   for (let i = 0; i < l; i++) {
@@ -411,10 +418,10 @@ function decode$3(node) {
   } else if (isMinKey(key) && isMaxKey(end) || isMinKey(end) && isMaxKey(key)) {
     args.$all = true;
   }
-  if (lower.key && !isMinKey(lower.key)) {
+  if (isDef(lower.key) && !isMinKey(lower.key)) {
     args[lower.step === 1 ? "$after" : "$since"] = lower.key;
   }
-  if (upper.key && !isMaxKey(upper.key)) {
+  if (isDef(upper.key) && !isMaxKey(upper.key)) {
     args[upper.step === -1 ? "$before" : "$until"] = upper.key;
   }
   return args;
@@ -1117,10 +1124,11 @@ function decode$1(nodes = [], { isGraph } = {}) {
             delete item.$key;
             return collection;
           }
-          const { $key, $val } = item;
+          let { $key, $val } = item;
           delete item.$key;
           delete item.$val;
           if (typeof $val === "object") {
+            $val = clone$1($val);
             Object.defineProperty($val, "$val", { value: true });
           }
           collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
@@ -1549,7 +1557,7 @@ function encode(value, { version, isGraph } = {}) {
     }
     let putRange = [];
     let prefixPuts = [];
-    if (Array.isArray(object) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
+    if (Array.isArray(object) && !isDef($put) && !isDef($val) && !object.some((it) => isDef(it == null ? void 0 : it.$key))) {
       putRange = [encode$3({ $since: 0, $until: Infinity })];
     }
     function classifyPut(put) {
@@ -1584,7 +1592,7 @@ function encode(value, { version, isGraph } = {}) {
         return;
       node.path = encode$2($ref);
     } else if ($val === true) {
-      node.value = props2;
+      node.value = Array.isArray(object) ? clone$1(object) : props2;
     } else if (isDef($val)) {
       node.value = $val;
     } else if (typeof object !== "object") {
@@ -1606,7 +1614,9 @@ function encode(value, { version, isGraph } = {}) {
       const children = Object.keys(props2).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
       if (children.length) {
         node.children = children;
-      } else if (isGraph) {
+      } else if (putRange.length)
+        ;
+      else if (isGraph) {
         if (!(isDef($key) || isDef($put)))
           return;
         if (node.key && !node.end)
@@ -1617,8 +1627,12 @@ function encode(value, { version, isGraph } = {}) {
         node.value = 1;
       }
     }
-    if (isGraph && putRange.length) {
-      const putRangeClone = putRange.map(({ key: key2, end }) => ({ key: key2, end, version: 0 }));
+    if (isGraph && putRange.length && !isDef(node.path) && !isDef(node.value)) {
+      const putRangeClone = putRange.map(({ key: key2, end }) => ({
+        key: key2,
+        end,
+        version: 0
+      }));
       node.children = merge(putRangeClone, node.children || []);
     }
     if (((_a2 = node.children) == null ? void 0 : _a2.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
@@ -1752,6 +1766,7 @@ export {
   MIN_KEY,
   add,
   addStringify,
+  clone$1 as clone,
   cloneObject,
   cmp,
   decode$3 as decodeArgs,

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.3-alpha.5",
+  "version": "0.16.3-alpha.6",
   "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.3-alpha.5"
+    "@graffy/stream": "0.16.3-alpha.6"
   }
 }

package/types/util.d.ts

@@ -7,6 +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 clone(obj: any): any;
 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;