@graffy/link 0.15.25 → 0.16.0-alpha.1

package/index.cjs

@@ -12,14 +12,14 @@ function linkGraph(rootGraph, defs) {
       const realPath = makeRef(path, vars);
       const realRef = makeRef(value, vars);
       const node = { key: realPath.pop(), path: common.encodePath(realRef), version };
-      const [range] = common.splitRef(realRef);
+      const [range] = common.splitRef(value);
       if (range)
         node.prefix = true;
       let target = rootGraph;
       do {
         const key = realPath.shift();
         const nextTarget = target[common.findFirst(target, key)];
-        if (!nextTarget || nextTarget.key !== key || nextTarget.end) {
+        if (!nextTarget || common.cmp(nextTarget.key, key) !== 0 || nextTarget.end) {
           realPath.unshift(key);
           break;
         }
@@ -75,8 +75,9 @@ function linkGraph(rootGraph, defs) {
         return recurse(node2, rest, newVars);
       });
     }
-    let node = graph[common.findFirst(graph, key)];
-    if (!node || node.key !== key || node.end)
+    const encodedKey = common.encodeArgs(key).key;
+    let node = graph[common.findFirst(graph, encodedKey)];
+    if (!node || common.cmp(node.key, encodedKey) !== 0 || node.end)
       return [];
     return recurse(node, rest, vars);
   }
@@ -128,7 +129,7 @@ function makeRef(def, vars) {
     if (Array.isArray(key)) {
       return key.map(replacePlaceholders);
     }
-    if (typeof key === "object" && key) {
+    if (typeof key === "object" && !ArrayBuffer.isView(key) && key) {
       const result = {};
       for (const prop in key) {
         result[replacePlaceholders(prop)] = replacePlaceholders(key[prop]);
@@ -137,13 +138,11 @@ function makeRef(def, vars) {
     }
     return getValue(key);
   }
-  const ref = def.map(replacePlaceholders);
-  return ref;
+  return common.encodePath(def.map(replacePlaceholders));
 }
 function prepQueryLinks(rootQuery, defs) {
   return defs.flatMap(({ path, def }) => prepQueryDef(rootQuery, path, def));
   function prepQueryDef(query, path, def, vars = {}, version = 0) {
-    var _a;
     function addDefQuery(subQuery) {
       common.add(rootQuery, getDefQuery(def, vars, version));
       const [range, filter] = common.splitRef(def);
@@ -155,7 +154,7 @@ function prepQueryLinks(rootQuery, defs) {
             );
           }
           return {
-            path: path.concat(node.key),
+            path: path.concat(node.prefix ? common.decodeArgs(node) : common.MIN_KEY),
             def: prepareDef(
               def.slice(0, -1).concat({
                 ...filter,
@@ -176,22 +175,19 @@ function prepQueryLinks(rootQuery, defs) {
         def: def2
       }));
     }
-    function makePager(pager) {
-      Object.defineProperty(pager, "toString", { value: () => key });
-      return pager;
-    }
     if (!Array.isArray(query) || !query.length)
       return [];
     const [key, ...rest] = path;
+    const encodedKey = common.encodeArgs(key).key;
     if (rest.length === 0) {
       if (key[0] === "$") {
         return query.splice(0).flatMap((node) => {
-          vars[key.slice(1)] = makePager(common.decodeArgs(node));
+          vars[key.slice(1)] = common.decodeArgs(node);
           return addDefQuery(node.children);
         });
       } else {
-        const ix = common.findFirst(query, key);
-        if (((_a = query[ix]) == null ? void 0 : _a.key) !== key)
+        const ix = common.findFirst(query, encodedKey);
+        if (!query[ix] || common.cmp(query[ix].key, encodedKey) !== 0)
           return [];
         const [{ children: subQuery }] = query.splice(ix, 1);
         return addDefQuery(subQuery);
@@ -205,13 +201,18 @@ function prepQueryLinks(rootQuery, defs) {
         let usedHere;
         if (node.prefix) {
           usedHere = node.children.flatMap((subNode) => {
-            const pager = makePager(common.decodeArgs(subNode));
             return prefixKey(
               prepQueryDef(
                 subNode.children,
                 rest,
                 def,
-                { ...vars, [key.slice(1)]: [node.key, pager] },
+                {
+                  ...vars,
+                  [key.slice(1)]: {
+                    ...common.decodeArgs(node),
+                    ...common.decodeArgs(subNode)
+                  }
+                },
                 node.version
               ),
               key
@@ -222,19 +223,21 @@ function prepQueryLinks(rootQuery, defs) {
             node.children,
             rest,
             def,
-            { ...vars, [key.slice(1)]: node.key },
+            { ...vars, [key.slice(1)]: common.decodeArgs(node) },
             node.version
           );
         }
-        usedHere = prefixKey(usedHere, node.key);
+        if (!node.prefix)
+          usedHere = prefixKey(usedHere, common.decodeArgs(node));
         used = used.concat(usedHere);
       }
     } else {
-      const node = query[common.findFirst(query, key)];
-      if (!node || node.key !== key || !node.children)
+      const node = query[common.findFirst(query, encodedKey)];
+      if (!node || common.cmp(node.key, encodedKey) !== 0 || !node.children)
         return [];
       used = prepQueryDef(node.children, rest, def, vars, node.version);
-      used = prefixKey(used, node.key);
+      if (!node.prefix)
+        used = prefixKey(used, common.decodeArgs(node));
     }
     for (let i = 0; i < query.length; i++) {
       if (query[i].children && query[i].children.length === 0) {
@@ -255,7 +258,14 @@ function getDefQuery(def, vars, version) {
   const defQuery = [];
   function addDefQueries(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
-      common.add(defQuery, common.wrapValue(1, getPath(key.slice(2)), version));
+      const path = getPath(key.slice(2));
+      let porcelainQuery = { $key: path.pop() };
+      let $key;
+      while ($key = path.pop()) {
+        porcelainQuery = { $key, $chi: [porcelainQuery] };
+      }
+      const query = common.encodeQuery(porcelainQuery, version);
+      common.add(defQuery, query);
     }
     if (Array.isArray(key)) {
       key.map(addDefQueries);
@@ -274,7 +284,11 @@ function prepareDef(def, vars) {
   function getValue(key) {
     if (typeof key !== "string")
       return key;
-    return key[0] === "$" && key.slice(1) in vars ? vars[key.slice(1)] : key;
+    if (key[0] === "$" && key.slice(1) in vars) {
+      const value = vars[key.slice(1)];
+      return typeof value === "object" && value !== null ? key : value;
+    }
+    return key;
   }
   function replacePlaceholders(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
@@ -297,7 +311,7 @@ function prepareDef(def, vars) {
 }
 const log = debug__default.default("graffy:link");
 const index = (defs) => (store) => {
-  const prefix = store.path;
+  const prefix = common.encodePath(store.path);
   const defEntries = Object.entries(defs).map(([prop, def]) => ({
     path: prop.split("."),
     def
@@ -320,6 +334,6 @@ const index = (defs) => (store) => {
   });
 };
 function clone(tree) {
-  return JSON.parse(JSON.stringify(tree));
+  return common.deserialize(common.serialize(tree));
 }
 module.exports = index;

package/index.mjs

@@ -1,4 +1,4 @@
-import { encodePath, splitRef, findFirst, unwrap, merge, wrap, splitArgs, decodeArgs, isBranch, add, wrapValue, finalize } from "@graffy/common";
+import { encodePath, splitRef, findFirst, cmp, unwrap, merge, wrap, splitArgs, encodeArgs, decodeArgs, isBranch, add, MIN_KEY, encodeQuery, finalize, deserialize, serialize } from "@graffy/common";
 import debug from "debug";
 function linkGraph(rootGraph, defs) {
   let version = rootGraph[0].version;
@@ -9,14 +9,14 @@ function linkGraph(rootGraph, defs) {
       const realPath = makeRef(path, vars);
       const realRef = makeRef(value, vars);
       const node = { key: realPath.pop(), path: encodePath(realRef), version };
-      const [range] = splitRef(realRef);
+      const [range] = splitRef(value);
       if (range)
         node.prefix = true;
       let target = rootGraph;
       do {
         const key = realPath.shift();
         const nextTarget = target[findFirst(target, key)];
-        if (!nextTarget || nextTarget.key !== key || nextTarget.end) {
+        if (!nextTarget || cmp(nextTarget.key, key) !== 0 || nextTarget.end) {
           realPath.unshift(key);
           break;
         }
@@ -72,8 +72,9 @@ function linkGraph(rootGraph, defs) {
         return recurse(node2, rest, newVars);
       });
     }
-    let node = graph[findFirst(graph, key)];
-    if (!node || node.key !== key || node.end)
+    const encodedKey = encodeArgs(key).key;
+    let node = graph[findFirst(graph, encodedKey)];
+    if (!node || cmp(node.key, encodedKey) !== 0 || node.end)
       return [];
     return recurse(node, rest, vars);
   }
@@ -125,7 +126,7 @@ function makeRef(def, vars) {
     if (Array.isArray(key)) {
       return key.map(replacePlaceholders);
     }
-    if (typeof key === "object" && key) {
+    if (typeof key === "object" && !ArrayBuffer.isView(key) && key) {
       const result = {};
       for (const prop in key) {
         result[replacePlaceholders(prop)] = replacePlaceholders(key[prop]);
@@ -134,13 +135,11 @@ function makeRef(def, vars) {
     }
     return getValue(key);
   }
-  const ref = def.map(replacePlaceholders);
-  return ref;
+  return encodePath(def.map(replacePlaceholders));
 }
 function prepQueryLinks(rootQuery, defs) {
   return defs.flatMap(({ path, def }) => prepQueryDef(rootQuery, path, def));
   function prepQueryDef(query, path, def, vars = {}, version = 0) {
-    var _a;
     function addDefQuery(subQuery) {
       add(rootQuery, getDefQuery(def, vars, version));
       const [range, filter] = splitRef(def);
@@ -152,7 +151,7 @@ function prepQueryLinks(rootQuery, defs) {
             );
           }
           return {
-            path: path.concat(node.key),
+            path: path.concat(node.prefix ? decodeArgs(node) : MIN_KEY),
             def: prepareDef(
               def.slice(0, -1).concat({
                 ...filter,
@@ -173,22 +172,19 @@ function prepQueryLinks(rootQuery, defs) {
         def: def2
       }));
     }
-    function makePager(pager) {
-      Object.defineProperty(pager, "toString", { value: () => key });
-      return pager;
-    }
     if (!Array.isArray(query) || !query.length)
       return [];
     const [key, ...rest] = path;
+    const encodedKey = encodeArgs(key).key;
     if (rest.length === 0) {
       if (key[0] === "$") {
         return query.splice(0).flatMap((node) => {
-          vars[key.slice(1)] = makePager(decodeArgs(node));
+          vars[key.slice(1)] = decodeArgs(node);
           return addDefQuery(node.children);
         });
       } else {
-        const ix = findFirst(query, key);
-        if (((_a = query[ix]) == null ? void 0 : _a.key) !== key)
+        const ix = findFirst(query, encodedKey);
+        if (!query[ix] || cmp(query[ix].key, encodedKey) !== 0)
           return [];
         const [{ children: subQuery }] = query.splice(ix, 1);
         return addDefQuery(subQuery);
@@ -202,13 +198,18 @@ function prepQueryLinks(rootQuery, defs) {
         let usedHere;
         if (node.prefix) {
           usedHere = node.children.flatMap((subNode) => {
-            const pager = makePager(decodeArgs(subNode));
             return prefixKey(
               prepQueryDef(
                 subNode.children,
                 rest,
                 def,
-                { ...vars, [key.slice(1)]: [node.key, pager] },
+                {
+                  ...vars,
+                  [key.slice(1)]: {
+                    ...decodeArgs(node),
+                    ...decodeArgs(subNode)
+                  }
+                },
                 node.version
               ),
               key
@@ -219,19 +220,21 @@ function prepQueryLinks(rootQuery, defs) {
             node.children,
             rest,
             def,
-            { ...vars, [key.slice(1)]: node.key },
+            { ...vars, [key.slice(1)]: decodeArgs(node) },
             node.version
           );
         }
-        usedHere = prefixKey(usedHere, node.key);
+        if (!node.prefix)
+          usedHere = prefixKey(usedHere, decodeArgs(node));
         used = used.concat(usedHere);
       }
     } else {
-      const node = query[findFirst(query, key)];
-      if (!node || node.key !== key || !node.children)
+      const node = query[findFirst(query, encodedKey)];
+      if (!node || cmp(node.key, encodedKey) !== 0 || !node.children)
         return [];
       used = prepQueryDef(node.children, rest, def, vars, node.version);
-      used = prefixKey(used, node.key);
+      if (!node.prefix)
+        used = prefixKey(used, decodeArgs(node));
     }
     for (let i = 0; i < query.length; i++) {
       if (query[i].children && query[i].children.length === 0) {
@@ -252,7 +255,14 @@ function getDefQuery(def, vars, version) {
   const defQuery = [];
   function addDefQueries(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
-      add(defQuery, wrapValue(1, getPath(key.slice(2)), version));
+      const path = getPath(key.slice(2));
+      let porcelainQuery = { $key: path.pop() };
+      let $key;
+      while ($key = path.pop()) {
+        porcelainQuery = { $key, $chi: [porcelainQuery] };
+      }
+      const query = encodeQuery(porcelainQuery, version);
+      add(defQuery, query);
     }
     if (Array.isArray(key)) {
       key.map(addDefQueries);
@@ -271,7 +281,11 @@ function prepareDef(def, vars) {
   function getValue(key) {
     if (typeof key !== "string")
       return key;
-    return key[0] === "$" && key.slice(1) in vars ? vars[key.slice(1)] : key;
+    if (key[0] === "$" && key.slice(1) in vars) {
+      const value = vars[key.slice(1)];
+      return typeof value === "object" && value !== null ? key : value;
+    }
+    return key;
   }
   function replacePlaceholders(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
@@ -294,7 +308,7 @@ function prepareDef(def, vars) {
 }
 const log = debug("graffy:link");
 const index = (defs) => (store) => {
-  const prefix = store.path;
+  const prefix = encodePath(store.path);
   const defEntries = Object.entries(defs).map(([prop, def]) => ({
     path: prop.split("."),
     def
@@ -317,7 +331,7 @@ const index = (defs) => (store) => {
   });
 };
 function clone(tree) {
-  return JSON.parse(JSON.stringify(tree));
+  return deserialize(serialize(tree));
 }
 export {
   index as default

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graffy/link",
   "description": "Graffy module for constructing links using an intuitive, declarative notation.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.15.25",
+  "version": "0.16.0-alpha.1",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.25",
+    "@graffy/common": "0.16.0-alpha.1",
     "debug": "^4.3.3"
   }
 }