@graffy/common 0.15.17 → 0.15.18

package/index.cjs

@@ -1063,9 +1063,10 @@ function decode(nodes = [], { isGraph } = {}) {
         const { $key, $val } = item;
         delete item.$key;
         delete item.$val;
-        if (typeof $val === "object")
-          $val.$val = true;
-        collection[$key] = isDef($val) ? $val : !isEmpty(item) ? item : isGraph ? null : true;
+        if (typeof $val === "object") {
+          Object.defineProperty($val, "$val", { value: true });
+        }
+        collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
         return collection;
       }, allStrs ? {} : []);
     }
@@ -1095,7 +1096,9 @@ function decode(nodes = [], { isGraph } = {}) {
         throw Error("decode.unencoded_prefix_ref: " + node.path);
       }
       lastKey.$all = true;
-      return [{ $key: args, $ref }];
+      const linkObject = { $key: args };
+      Object.defineProperty(linkObject, "$ref", { value: $ref });
+      return [linkObject];
     }
     const children = decodeChildren(node.children);
     if (!Array.isArray(children)) {
@@ -1127,7 +1130,9 @@ function decode(nodes = [], { isGraph } = {}) {
       return { $key: decode$2({ key: node.key }) };
   }
   function decodeLinkNode(node) {
-    return { $key: decode$2(node), $ref: decode$1(node.path) };
+    const linkObject = { $key: decode$2(node) };
+    Object.defineProperty(linkObject, "$ref", { value: decode$1(node.path) });
+    return linkObject;
   }
   return decodeChildren(nodes);
 }
@@ -1156,7 +1161,7 @@ function decorate(rootGraph, rootQuery) {
       if (range)
         targetPlumGraph[PRE] = filter;
       graph = construct(targetPlumGraph, range ? __spreadValues({ $key: range }, props) : props);
-      graph.$ref = $ref;
+      Object.defineProperty(graph, "$ref", { value: $ref });
     } else if (Array.isArray(query)) {
       let pageKey;
       graph = query.flatMap((item, i) => {
@@ -1203,8 +1208,9 @@ function decorate(rootGraph, rootQuery) {
         throw Error("decorate.unexpected_graph");
       }
     }
-    if (plumGraph[REF])
-      graph.$ref = decode$1(plumGraph[REF]);
+    if (plumGraph[REF]) {
+      Object.defineProperty(graph, "$ref", decode$1(plumGraph[REF]));
+    }
     return graph;
   }
   function descend(children, $key) {
@@ -1310,18 +1316,17 @@ function encode(value, { version, isGraph } = {}) {
   }
   const combine = isGraph ? merge : add;
   function makeNode(object, key, ver) {
-    var _c;
+    var _b;
     if (!isDef(object))
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const _a2 = object || {}, { $key, $ver } = _a2, data = __objRest(_a2, ["$key", "$ver"]);
-    const _b = data, { $ref, $val, $chi, $put } = _b, props = __objRest(_b, ["$ref", "$val", "$chi", "$put"]);
+    const _a2 = object || {}, { $key, $ver, $ref, $val, $chi, $put } = _a2, props = __objRest(_a2, ["$key", "$ver", "$ref", "$val", "$chi", "$put"]);
     if (isDef($ver))
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
-      if (isGraph && page && !isDef(page.$cursor) && !isEmpty(data)) {
+      if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props))) {
         const node2 = makeNode(__spreadProps(__spreadValues({}, object), { $key: filter || "" }), key, ver);
         node2.prefix = true;
         return node2;
@@ -1399,7 +1404,7 @@ function encode(value, { version, isGraph } = {}) {
     if (isGraph && isDef(putQuery)) {
       node.children = finalize(node.children || [], putQuery, node.version);
     }
-    if (((_c = node.children) == null ? void 0 : _c.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
+    if (((_b = node.children) == null ? void 0 : _b.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
     }
   }

package/index.mjs

@@ -1055,9 +1055,10 @@ function decode(nodes = [], { isGraph } = {}) {
         const { $key, $val } = item;
         delete item.$key;
         delete item.$val;
-        if (typeof $val === "object")
-          $val.$val = true;
-        collection[$key] = isDef($val) ? $val : !isEmpty(item) ? item : isGraph ? null : true;
+        if (typeof $val === "object") {
+          Object.defineProperty($val, "$val", { value: true });
+        }
+        collection[$key] = isDef($val) ? $val : !isEmpty(item) || item.$ref || item.$put ? item : isGraph ? null : true;
         return collection;
       }, allStrs ? {} : []);
     }
@@ -1087,7 +1088,9 @@ function decode(nodes = [], { isGraph } = {}) {
         throw Error("decode.unencoded_prefix_ref: " + node.path);
       }
       lastKey.$all = true;
-      return [{ $key: args, $ref }];
+      const linkObject = { $key: args };
+      Object.defineProperty(linkObject, "$ref", { value: $ref });
+      return [linkObject];
     }
     const children = decodeChildren(node.children);
     if (!Array.isArray(children)) {
@@ -1119,7 +1122,9 @@ function decode(nodes = [], { isGraph } = {}) {
       return { $key: decode$2({ key: node.key }) };
   }
   function decodeLinkNode(node) {
-    return { $key: decode$2(node), $ref: decode$1(node.path) };
+    const linkObject = { $key: decode$2(node) };
+    Object.defineProperty(linkObject, "$ref", { value: decode$1(node.path) });
+    return linkObject;
   }
   return decodeChildren(nodes);
 }
@@ -1148,7 +1153,7 @@ function decorate(rootGraph, rootQuery) {
       if (range)
         targetPlumGraph[PRE] = filter;
       graph = construct(targetPlumGraph, range ? __spreadValues({ $key: range }, props) : props);
-      graph.$ref = $ref;
+      Object.defineProperty(graph, "$ref", { value: $ref });
     } else if (Array.isArray(query)) {
       let pageKey;
       graph = query.flatMap((item, i) => {
@@ -1195,8 +1200,9 @@ function decorate(rootGraph, rootQuery) {
         throw Error("decorate.unexpected_graph");
       }
     }
-    if (plumGraph[REF])
-      graph.$ref = decode$1(plumGraph[REF]);
+    if (plumGraph[REF]) {
+      Object.defineProperty(graph, "$ref", decode$1(plumGraph[REF]));
+    }
     return graph;
   }
   function descend(children, $key) {
@@ -1302,18 +1308,17 @@ function encode(value, { version, isGraph } = {}) {
   }
   const combine = isGraph ? merge : add;
   function makeNode(object, key, ver) {
-    var _c;
+    var _b;
     if (!isDef(object))
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const _a2 = object || {}, { $key, $ver } = _a2, data = __objRest(_a2, ["$key", "$ver"]);
-    const _b = data, { $ref, $val, $chi, $put } = _b, props = __objRest(_b, ["$ref", "$val", "$chi", "$put"]);
+    const _a2 = object || {}, { $key, $ver, $ref, $val, $chi, $put } = _a2, props = __objRest(_a2, ["$key", "$ver", "$ref", "$val", "$chi", "$put"]);
     if (isDef($ver))
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
-      if (isGraph && page && !isDef(page.$cursor) && !isEmpty(data)) {
+      if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props))) {
         const node2 = makeNode(__spreadProps(__spreadValues({}, object), { $key: filter || "" }), key, ver);
         node2.prefix = true;
         return node2;
@@ -1391,7 +1396,7 @@ function encode(value, { version, isGraph } = {}) {
     if (isGraph && isDef(putQuery)) {
       node.children = finalize(node.children || [], putQuery, node.version);
     }
-    if (((_c = node.children) == null ? void 0 : _c.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
+    if (((_b = node.children) == null ? void 0 : _b.length) || isDef(node.end) || isDef(node.value) || isDef(node.path)) {
       return node;
     }
   }

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.15.17",
+  "version": "0.15.18",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -17,8 +17,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "lodash": "^4.17.19",
+    "nanoid": "^3.2.0",
     "merge-async-iterators": "^0.2.1",
-    "@graffy/stream": "0.15.17",
-    "nanoid": "^3.2.0"
+    "@graffy/stream": "0.15.18"
   }
 }