@graffy/common 0.16.15-alpha.5 → 0.16.16

package/index.cjs

@@ -514,81 +514,6 @@ function isOlder(node, version) {
 function isNewer(node, version) {
   return typeof node.version !== "undefined" && node.version > version;
 }
-const NULL_VAL = {};
-Object.defineProperty(NULL_VAL, "$val", { value: null });
-Object.defineProperty(NULL_VAL, "toJSON", { value: () => null });
-function mergeObject(base, change) {
-  if (typeof change !== "object" || typeof base !== "object" || !base || !change) {
-    return change;
-  }
-  for (const prop in change) {
-    if (prop in base) {
-      const value = mergeObject(base[prop], change[prop]);
-      if (value === null) {
-        delete base[prop];
-      } else {
-        base[prop] = value;
-      }
-    } else {
-      base[prop] = change[prop];
-    }
-  }
-  return isEmpty(base) ? null : base;
-}
-function cloneObject(object) {
-  if (typeof object !== "object" || !object) {
-    return object;
-  }
-  const clone2 = {};
-  for (const prop in object) {
-    const value = cloneObject(object[prop]);
-    if (value === null)
-      continue;
-    clone2[prop] = value;
-  }
-  return isEmpty(clone2) ? null : clone2;
-}
-function wrapObject(object, path) {
-  if (!Array.isArray(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") {
-      object = { [$key]: object };
-    } else if (Array.isArray(object)) {
-      object = [{ $key, $chi: object }];
-    } else {
-      object = [{ $key, ...object }];
-    }
-  }
-  return object;
-}
-function unwrapObject(object, path) {
-  if (!Array.isArray(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}`);
-      }
-      object = object[$key];
-    } else {
-      if (!Array.isArray(object)) {
-        throw Error(`unwrapObject.arg_key_object:${JSON.stringify($key)}`);
-      }
-      const [page, filter] = splitArgs($key);
-      if (page && !page.$cursor) {
-        return object;
-      }
-      const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
-      object = object.find(({ $key: $key2 }) => isEqual($key2, target));
-    }
-  }
-  return object;
-}
 function add(base, diff) {
   let changed = false;
   let index = 0;
@@ -777,9 +702,7 @@ function unwrap(tree, path) {
 function getNodeValue(node) {
   if (node.children)
     return node.children;
-  if (node.value === null)
-    return NULL_VAL;
-  if (typeof node.value === "object") {
+  if (node.value && typeof node.value === "object") {
     node.value[IS_VAL] = true;
   }
   return node.value;
@@ -1201,7 +1124,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
           delete item.$key;
           delete item.$val;
           if ($val === null) {
-            $val = NULL_VAL;
+            $val = { $val };
           } else if (typeof $val === "object") {
             $val = clone$1($val);
             Object.defineProperty($val, "$val", { value: true });
@@ -1301,8 +1224,8 @@ const REF = Symbol();
 const PRE = Symbol();
 function decorate(rootGraph, rootQuery) {
   function construct(plumGraph, query) {
-    if (plumGraph === null || plumGraph === NULL_VAL)
-      return plumGraph;
+    if (plumGraph === null)
+      return null;
     if (!isDef(plumGraph))
       plumGraph = [];
     if (query.$key)
@@ -1359,13 +1282,13 @@ function decorate(rootGraph, rootQuery) {
     } else if (query) {
       if (Array.isArray(plumGraph) && !plumGraph.length) {
         graph = void 0;
-      } else if (typeof plumGraph !== "object") {
+      } else if (typeof plumGraph !== "object" || !plumGraph) {
         graph = plumGraph;
       } else if (plumGraph[IS_VAL]) {
         graph = Array.isArray(plumGraph) ? plumGraph.slice(0) : { ...plumGraph };
         graph.$val = true;
       } else if (Array.isArray(plumGraph)) {
-        graph = decodeGraph(plumGraph);
+        graph = deValNull(decodeGraph(plumGraph));
       } else {
         throw Error("decorate.unexpected_graph");
       }
@@ -1438,6 +1361,15 @@ function decorate(rootGraph, rootQuery) {
   const result = construct(rootGraph, rootQuery);
   return result;
 }
+function deValNull(graph) {
+  if (typeof graph !== "object" || !graph)
+    return graph;
+  if ("$val" in graph && graph.$val !== true)
+    return graph.$val;
+  for (const prop in graph)
+    graph[prop] = deValNull(graph[prop]);
+  return graph;
+}
 function addPageMeta(graph, args) {
   if (args.$all) {
     Object.assign(graph, { $page: args, $prev: null, $next: null });
@@ -1765,10 +1697,81 @@ function makeWatcher() {
   }
   return { write, watch };
 }
+function mergeObject(base, change) {
+  if (typeof change !== "object" || typeof base !== "object" || !base || !change) {
+    return change;
+  }
+  for (const prop in change) {
+    if (prop in base) {
+      const value = mergeObject(base[prop], change[prop]);
+      if (value === null) {
+        delete base[prop];
+      } else {
+        base[prop] = value;
+      }
+    } else {
+      base[prop] = change[prop];
+    }
+  }
+  return isEmpty(base) ? null : base;
+}
+function cloneObject(object) {
+  if (typeof object !== "object" || !object) {
+    return object;
+  }
+  const clone2 = {};
+  for (const prop in object) {
+    const value = cloneObject(object[prop]);
+    if (value === null)
+      continue;
+    clone2[prop] = value;
+  }
+  return isEmpty(clone2) ? null : clone2;
+}
+function wrapObject(object, path) {
+  if (!Array.isArray(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") {
+      object = { [$key]: object };
+    } else if (Array.isArray(object)) {
+      object = [{ $key, $chi: object }];
+    } else {
+      object = [{ $key, ...object }];
+    }
+  }
+  return object;
+}
+function unwrapObject(object, path) {
+  if (!Array.isArray(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}`);
+      }
+      object = object[$key];
+    } else {
+      if (!Array.isArray(object)) {
+        throw Error(`unwrapObject.arg_key_object:${JSON.stringify($key)}`);
+      }
+      const [page, filter] = splitArgs($key);
+      if (page && !page.$cursor) {
+        return object;
+      }
+      const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
+      object = object.find(({ $key: $key2 }) => isEqual($key2, target));
+    }
+  }
+  return object;
+}
 exports.IS_VAL = IS_VAL;
 exports.MAX_KEY = MAX_KEY;
 exports.MIN_KEY = MIN_KEY;
-exports.NULL_VAL = NULL_VAL;
 exports.add = add;
 exports.addStringify = addStringify;
 exports.clone = clone$1;

package/index.mjs

@@ -512,81 +512,6 @@ function isOlder(node, version) {
 function isNewer(node, version) {
   return typeof node.version !== "undefined" && node.version > version;
 }
-const NULL_VAL = {};
-Object.defineProperty(NULL_VAL, "$val", { value: null });
-Object.defineProperty(NULL_VAL, "toJSON", { value: () => null });
-function mergeObject(base, change) {
-  if (typeof change !== "object" || typeof base !== "object" || !base || !change) {
-    return change;
-  }
-  for (const prop in change) {
-    if (prop in base) {
-      const value = mergeObject(base[prop], change[prop]);
-      if (value === null) {
-        delete base[prop];
-      } else {
-        base[prop] = value;
-      }
-    } else {
-      base[prop] = change[prop];
-    }
-  }
-  return isEmpty(base) ? null : base;
-}
-function cloneObject(object) {
-  if (typeof object !== "object" || !object) {
-    return object;
-  }
-  const clone2 = {};
-  for (const prop in object) {
-    const value = cloneObject(object[prop]);
-    if (value === null)
-      continue;
-    clone2[prop] = value;
-  }
-  return isEmpty(clone2) ? null : clone2;
-}
-function wrapObject(object, path) {
-  if (!Array.isArray(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") {
-      object = { [$key]: object };
-    } else if (Array.isArray(object)) {
-      object = [{ $key, $chi: object }];
-    } else {
-      object = [{ $key, ...object }];
-    }
-  }
-  return object;
-}
-function unwrapObject(object, path) {
-  if (!Array.isArray(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}`);
-      }
-      object = object[$key];
-    } else {
-      if (!Array.isArray(object)) {
-        throw Error(`unwrapObject.arg_key_object:${JSON.stringify($key)}`);
-      }
-      const [page, filter] = splitArgs($key);
-      if (page && !page.$cursor) {
-        return object;
-      }
-      const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
-      object = object.find(({ $key: $key2 }) => isEqual($key2, target));
-    }
-  }
-  return object;
-}
 function add(base, diff) {
   let changed = false;
   let index = 0;
@@ -775,9 +700,7 @@ function unwrap(tree, path) {
 function getNodeValue(node) {
   if (node.children)
     return node.children;
-  if (node.value === null)
-    return NULL_VAL;
-  if (typeof node.value === "object") {
+  if (node.value && typeof node.value === "object") {
     node.value[IS_VAL] = true;
   }
   return node.value;
@@ -1199,7 +1122,7 @@ function decode$1(nodes = [], { isGraph } = {}) {
           delete item.$key;
           delete item.$val;
           if ($val === null) {
-            $val = NULL_VAL;
+            $val = { $val };
           } else if (typeof $val === "object") {
             $val = clone$1($val);
             Object.defineProperty($val, "$val", { value: true });
@@ -1299,8 +1222,8 @@ const REF = Symbol();
 const PRE = Symbol();
 function decorate(rootGraph, rootQuery) {
   function construct(plumGraph, query) {
-    if (plumGraph === null || plumGraph === NULL_VAL)
-      return plumGraph;
+    if (plumGraph === null)
+      return null;
     if (!isDef(plumGraph))
       plumGraph = [];
     if (query.$key)
@@ -1357,13 +1280,13 @@ function decorate(rootGraph, rootQuery) {
     } else if (query) {
       if (Array.isArray(plumGraph) && !plumGraph.length) {
         graph = void 0;
-      } else if (typeof plumGraph !== "object") {
+      } else if (typeof plumGraph !== "object" || !plumGraph) {
         graph = plumGraph;
       } else if (plumGraph[IS_VAL]) {
         graph = Array.isArray(plumGraph) ? plumGraph.slice(0) : { ...plumGraph };
         graph.$val = true;
       } else if (Array.isArray(plumGraph)) {
-        graph = decodeGraph(plumGraph);
+        graph = deValNull(decodeGraph(plumGraph));
       } else {
         throw Error("decorate.unexpected_graph");
       }
@@ -1436,6 +1359,15 @@ function decorate(rootGraph, rootQuery) {
   const result = construct(rootGraph, rootQuery);
   return result;
 }
+function deValNull(graph) {
+  if (typeof graph !== "object" || !graph)
+    return graph;
+  if ("$val" in graph && graph.$val !== true)
+    return graph.$val;
+  for (const prop in graph)
+    graph[prop] = deValNull(graph[prop]);
+  return graph;
+}
 function addPageMeta(graph, args) {
   if (args.$all) {
     Object.assign(graph, { $page: args, $prev: null, $next: null });
@@ -1763,11 +1695,82 @@ function makeWatcher() {
   }
   return { write, watch };
 }
+function mergeObject(base, change) {
+  if (typeof change !== "object" || typeof base !== "object" || !base || !change) {
+    return change;
+  }
+  for (const prop in change) {
+    if (prop in base) {
+      const value = mergeObject(base[prop], change[prop]);
+      if (value === null) {
+        delete base[prop];
+      } else {
+        base[prop] = value;
+      }
+    } else {
+      base[prop] = change[prop];
+    }
+  }
+  return isEmpty(base) ? null : base;
+}
+function cloneObject(object) {
+  if (typeof object !== "object" || !object) {
+    return object;
+  }
+  const clone2 = {};
+  for (const prop in object) {
+    const value = cloneObject(object[prop]);
+    if (value === null)
+      continue;
+    clone2[prop] = value;
+  }
+  return isEmpty(clone2) ? null : clone2;
+}
+function wrapObject(object, path) {
+  if (!Array.isArray(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") {
+      object = { [$key]: object };
+    } else if (Array.isArray(object)) {
+      object = [{ $key, $chi: object }];
+    } else {
+      object = [{ $key, ...object }];
+    }
+  }
+  return object;
+}
+function unwrapObject(object, path) {
+  if (!Array.isArray(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}`);
+      }
+      object = object[$key];
+    } else {
+      if (!Array.isArray(object)) {
+        throw Error(`unwrapObject.arg_key_object:${JSON.stringify($key)}`);
+      }
+      const [page, filter] = splitArgs($key);
+      if (page && !page.$cursor) {
+        return object;
+      }
+      const target = (page == null ? void 0 : page.$cursor) ? { ...filter, $cursor: page.$cursor } : filter;
+      object = object.find(({ $key: $key2 }) => isEqual($key2, target));
+    }
+  }
+  return object;
+}
 export {
   IS_VAL,
   MAX_KEY,
   MIN_KEY,
-  NULL_VAL,
   add,
   addStringify,
   clone$1 as clone,

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.15-alpha.5",
+  "version": "0.16.16",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -19,6 +19,6 @@
     "lodash": "^4.17.19",
     "debug": "^4.3.3",
     "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.16.15-alpha.5"
+    "@graffy/stream": "0.16.16"
   }
 }

package/types/object.d.ts

@@ -2,6 +2,3 @@ export function mergeObject(base: any, change: any): any;
 export function cloneObject(object: any): any;
 export function wrapObject(object: any, path: any): any;
 export function unwrapObject(object: any, path: any): any;
-export namespace NULL_VAL {
-    let $val: any;
-}