@graffy/common 0.16.0-alpha.1 → 0.16.0-alpha.2

package/index.cjs

@@ -639,10 +639,10 @@ function getNewer(node, base) {
   }
 }
 const IS_VAL = Symbol("IS_VAL");
-function makeNode(seg, props) {
+function makeNode(seg, props2) {
   if (ArrayBuffer.isView(seg))
-    return { key: seg, ...props };
-  return { ...seg, ...props };
+    return { key: seg, ...props2 };
+  return { ...seg, ...props2 };
 }
 function wrapValue(value, path, version = 0) {
   const node = makeNode(path[path.length - 1], { value, version });
@@ -1202,7 +1202,7 @@ function decorate(rootGraph, rootQuery) {
       query = [query];
     let graph;
     if (query.$ref) {
-      const { $ref, ...props } = query;
+      const { $ref, ...props2 } = query;
       const [range, filter] = splitRef($ref);
       const path = encode$2($ref);
       const targetPlumGraph = unwrap(rootGraph, path);
@@ -1211,7 +1211,7 @@ function decorate(rootGraph, rootQuery) {
           targetPlumGraph[PRE] = filter;
         graph = construct(
           targetPlumGraph,
-          range ? { $key: range, ...props } : props
+          range ? { $key: range, ...props2 } : props2
         );
         Object.defineProperty(graph, "$ref", { value: $ref });
       }
@@ -1221,8 +1221,8 @@ function decorate(rootGraph, rootQuery) {
         if (!(item == null ? void 0 : item.$key)) {
           return construct(descend(plumGraph, i), item);
         }
-        const { $key, $chi, ...props } = item;
-        const subQuery = $chi || (isEmpty(props) ? 1 : props);
+        const { $key, $chi, ...props2 } = item;
+        const subQuery = $chi || (isEmpty(props2) ? 1 : props2);
         if (!isPlainObject($key) || !splitArgs($key)[0]) {
           return construct(descend(plumGraph, $key), subQuery);
         }
@@ -1388,25 +1388,84 @@ function decode(string, start = 0) {
   }
   return addStringify(new Uint8Array(buffer));
 }
-function serialize(obj) {
-  return JSON.stringify(obj, (_key, value) => {
-    return ArrayBuffer.isView(value) ? "\0" + encode$1(value) : value;
-  });
+const props = [
+  "end",
+  "version",
+  "limit",
+  "value",
+  "path",
+  "prefix",
+  "children"
+];
+function serializeKey(key) {
+  if (key[0] === STR)
+    return decode$4(key);
+  return "\0" + encode$1(key);
+}
+function deserializeKey(key) {
+  if (key[0] === "\0")
+    return decode(key.slice(1));
+  return encode$4(key);
+}
+function serializeNodes(children, parentVersion) {
+  const array = children.map(
+    (node) => props.reduce(
+      (array2, prop, i) => {
+        if (!(prop in node))
+          return array2;
+        let value = node[prop];
+        if (prop === "version" && value === parentVersion)
+          return array2;
+        if (prop === "children")
+          value = serializeNodes(value, node.version);
+        if (prop === "end")
+          value = serializeKey(value);
+        if (prop === "path")
+          value = value.map(serializeKey);
+        array2[1] |= 1 << i;
+        array2.push(value);
+        return array2;
+      },
+      [serializeKey(node.key), 0]
+    )
+  );
+  return array;
+}
+function deserializeNodes(children, parentVersion) {
+  const node = children.map(
+    ([key, type, ...values]) => props.reduce(
+      (node2, prop, i) => {
+        if (!(type & 1 << i))
+          return node2;
+        let value = values.shift();
+        if (prop === "children")
+          value = deserializeNodes(value, node2.version);
+        if (prop === "end")
+          value = deserializeKey(value);
+        if (prop === "path")
+          value = value.map(deserializeKey);
+        node2[prop] = value;
+        return node2;
+      },
+      { key: deserializeKey(key), version: parentVersion }
+    )
+  );
+  return node;
+}
+function serialize(payload) {
+  return JSON.stringify(serializeNodes(payload));
 }
 function deserialize(str) {
-  return JSON.parse(
-    str,
-    (_key, value) => typeof value === "string" && value[0] === "\0" ? decode(value.slice(1)) : value
-  );
+  return deserializeNodes(JSON.parse(str));
 }
 const ROOT_KEY = Symbol();
 function encode(value, { version, isGraph } = {}) {
   var _a;
   const links = [];
-  function pushLink($ref, $ver, props, $val, $chi) {
+  function pushLink($ref, $ver, props2, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props) ? makeNode2(
-      range ? [{ $key: range, ...props }] : props,
+    let children = !isEmpty(props2) ? makeNode2(
+      range ? [{ $key: range, ...props2 }] : props2,
       void 0,
       $ver
     ).children : isDef($chi) ? makeNode2(
@@ -1425,12 +1484,12 @@ function encode(value, { version, isGraph } = {}) {
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const { $key, $ver, $ref, $val, $chi, $put, ...props } = object || {};
+    const { $key, $ver, $ref, $val, $chi, $put, ...props2 } = object || {};
     if (isDef($ver))
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
-      if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props))) {
+      if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props2))) {
         const node2 = makeNode2({ ...object, $key: filter || {} }, key, ver);
         if (!filter)
           node2.key = MIN_KEY;
@@ -1464,12 +1523,12 @@ function encode(value, { version, isGraph } = {}) {
       node.children = [makeNode2(object, void 0, ver)].filter(Boolean);
       return node;
     } else if ($ref) {
-      pushLink($ref, node.version, props, $val, $chi);
+      pushLink($ref, node.version, props2, $val, $chi);
       if (!isGraph)
         return;
       node.path = encode$2($ref);
     } else if ($val === true) {
-      node.value = props;
+      node.value = props2;
     } else if (isDef($val)) {
       node.value = $val;
     } else if (typeof object !== "object") {
@@ -1488,7 +1547,7 @@ function encode(value, { version, isGraph } = {}) {
         node.children = children;
       }
     } else {
-      const children = Object.keys(props).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
+      const children = Object.keys(props2).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
       if (children.length) {
         node.children = children;
       } else if (isGraph) {

package/index.mjs

@@ -634,10 +634,10 @@ function getNewer(node, base) {
   }
 }
 const IS_VAL = Symbol("IS_VAL");
-function makeNode(seg, props) {
+function makeNode(seg, props2) {
   if (ArrayBuffer.isView(seg))
-    return { key: seg, ...props };
-  return { ...seg, ...props };
+    return { key: seg, ...props2 };
+  return { ...seg, ...props2 };
 }
 function wrapValue(value, path, version = 0) {
   const node = makeNode(path[path.length - 1], { value, version });
@@ -1197,7 +1197,7 @@ function decorate(rootGraph, rootQuery) {
       query = [query];
     let graph;
     if (query.$ref) {
-      const { $ref, ...props } = query;
+      const { $ref, ...props2 } = query;
       const [range, filter] = splitRef($ref);
       const path = encode$2($ref);
       const targetPlumGraph = unwrap(rootGraph, path);
@@ -1206,7 +1206,7 @@ function decorate(rootGraph, rootQuery) {
           targetPlumGraph[PRE] = filter;
         graph = construct(
           targetPlumGraph,
-          range ? { $key: range, ...props } : props
+          range ? { $key: range, ...props2 } : props2
         );
         Object.defineProperty(graph, "$ref", { value: $ref });
       }
@@ -1216,8 +1216,8 @@ function decorate(rootGraph, rootQuery) {
         if (!(item == null ? void 0 : item.$key)) {
           return construct(descend(plumGraph, i), item);
         }
-        const { $key, $chi, ...props } = item;
-        const subQuery = $chi || (isEmpty(props) ? 1 : props);
+        const { $key, $chi, ...props2 } = item;
+        const subQuery = $chi || (isEmpty(props2) ? 1 : props2);
         if (!isPlainObject($key) || !splitArgs($key)[0]) {
           return construct(descend(plumGraph, $key), subQuery);
         }
@@ -1383,25 +1383,84 @@ function decode(string, start = 0) {
   }
   return addStringify(new Uint8Array(buffer));
 }
-function serialize(obj) {
-  return JSON.stringify(obj, (_key, value) => {
-    return ArrayBuffer.isView(value) ? "\0" + encode$1(value) : value;
-  });
+const props = [
+  "end",
+  "version",
+  "limit",
+  "value",
+  "path",
+  "prefix",
+  "children"
+];
+function serializeKey(key) {
+  if (key[0] === STR)
+    return decode$4(key);
+  return "\0" + encode$1(key);
+}
+function deserializeKey(key) {
+  if (key[0] === "\0")
+    return decode(key.slice(1));
+  return encode$4(key);
+}
+function serializeNodes(children, parentVersion) {
+  const array = children.map(
+    (node) => props.reduce(
+      (array2, prop, i) => {
+        if (!(prop in node))
+          return array2;
+        let value = node[prop];
+        if (prop === "version" && value === parentVersion)
+          return array2;
+        if (prop === "children")
+          value = serializeNodes(value, node.version);
+        if (prop === "end")
+          value = serializeKey(value);
+        if (prop === "path")
+          value = value.map(serializeKey);
+        array2[1] |= 1 << i;
+        array2.push(value);
+        return array2;
+      },
+      [serializeKey(node.key), 0]
+    )
+  );
+  return array;
+}
+function deserializeNodes(children, parentVersion) {
+  const node = children.map(
+    ([key, type, ...values]) => props.reduce(
+      (node2, prop, i) => {
+        if (!(type & 1 << i))
+          return node2;
+        let value = values.shift();
+        if (prop === "children")
+          value = deserializeNodes(value, node2.version);
+        if (prop === "end")
+          value = deserializeKey(value);
+        if (prop === "path")
+          value = value.map(deserializeKey);
+        node2[prop] = value;
+        return node2;
+      },
+      { key: deserializeKey(key), version: parentVersion }
+    )
+  );
+  return node;
+}
+function serialize(payload) {
+  return JSON.stringify(serializeNodes(payload));
 }
 function deserialize(str) {
-  return JSON.parse(
-    str,
-    (_key, value) => typeof value === "string" && value[0] === "\0" ? decode(value.slice(1)) : value
-  );
+  return deserializeNodes(JSON.parse(str));
 }
 const ROOT_KEY = Symbol();
 function encode(value, { version, isGraph } = {}) {
   var _a;
   const links = [];
-  function pushLink($ref, $ver, props, $val, $chi) {
+  function pushLink($ref, $ver, props2, $val, $chi) {
     const [range, _] = splitRef($ref);
-    let children = !isEmpty(props) ? makeNode2(
-      range ? [{ $key: range, ...props }] : props,
+    let children = !isEmpty(props2) ? makeNode2(
+      range ? [{ $key: range, ...props2 }] : props2,
       void 0,
       $ver
     ).children : isDef($chi) ? makeNode2(
@@ -1420,12 +1479,12 @@ function encode(value, { version, isGraph } = {}) {
       return;
     if (typeof object === "object" && object && isEmpty(object))
       return;
-    const { $key, $ver, $ref, $val, $chi, $put, ...props } = object || {};
+    const { $key, $ver, $ref, $val, $chi, $put, ...props2 } = object || {};
     if (isDef($ver))
       ver = $ver;
     if (isPlainObject($key)) {
       const [page, filter] = splitArgs($key);
-      if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props))) {
+      if (isGraph && page && !isDef(page.$cursor) && ($ref || $val || $chi || $put || !isEmpty(props2))) {
         const node2 = makeNode2({ ...object, $key: filter || {} }, key, ver);
         if (!filter)
           node2.key = MIN_KEY;
@@ -1459,12 +1518,12 @@ function encode(value, { version, isGraph } = {}) {
       node.children = [makeNode2(object, void 0, ver)].filter(Boolean);
       return node;
     } else if ($ref) {
-      pushLink($ref, node.version, props, $val, $chi);
+      pushLink($ref, node.version, props2, $val, $chi);
       if (!isGraph)
         return;
       node.path = encode$2($ref);
     } else if ($val === true) {
-      node.value = props;
+      node.value = props2;
     } else if (isDef($val)) {
       node.value = $val;
     } else if (typeof object !== "object") {
@@ -1483,7 +1542,7 @@ function encode(value, { version, isGraph } = {}) {
         node.children = children;
       }
     } else {
-      const children = Object.keys(props).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
+      const children = Object.keys(props2).sort().map((key2) => makeNode2(object[key2], key2, ver)).filter(Boolean);
       if (children.length) {
         node.children = children;
       } else if (isGraph) {

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

package/types/coding/serialize.d.ts

@@ -1,2 +1,2 @@
-export function serialize(obj: any): string;
+export function serialize(payload: any): string;
 export function deserialize(str: any): any;