@graffy/link 0.15.14 → 0.15.15

package/index.cjs

@@ -19,63 +19,151 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var common = require("@graffy/common");
+var debug = require("debug");
+function _interopDefaultLegacy(e) {
+  return e && typeof e === "object" && "default" in e ? e : { "default": e };
+}
+var debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 function linkGraph(rootGraph, defs) {
-  for (const { path, def } of defs)
-    linkGraphDef(rootGraph, path, def);
+  let version = rootGraph[0].version;
+  for (const { path, def } of defs) {
+    const braid = def.map(getKeyValues);
+    const strands = unbraid(braid);
+    const pathReqs = path.filter((key) => key[0] === "$").reduce((acc, key) => {
+      acc[key.slice(1)] = true;
+      return acc;
+    }, {});
+    outer:
+      for (const { value, vars, reqs } of strands) {
+        for (const req in reqs)
+          if (!(req in vars))
+            continue outer;
+        for (const req in pathReqs)
+          if (!(req in vars))
+            continue outer;
+        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);
+        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) {
+            realPath.unshift(key);
+            break;
+          }
+          target = nextTarget.path ? common.unwrap(rootGraph, nextTarget.path) : nextTarget.children;
+        } while (target && realPath.length);
+        if (!target)
+          return;
+        common.merge(target, realPath.length ? common.wrap([node], realPath, version) : [node]);
+      }
+  }
   return rootGraph;
-  function linkGraphDef(graph, path, def, version = 0) {
+  function getKeyValues(key) {
+    if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
+      return lookupValues(rootGraph, key.slice(2).split("."));
+    }
+    if (Array.isArray(key)) {
+      return unbraid(key.map(getKeyValues));
+    }
+    if (typeof key === "object" && key) {
+      const values = unbraid(Object.values(key).map(getKeyValues));
+      const keys = Object.keys(key);
+      return values.map(({ value, vars, reqs }) => ({
+        value: value.reduce((acc, val, i) => {
+          acc[keys[i]] = val;
+          return acc;
+        }, {}),
+        vars,
+        reqs
+      }));
+    }
+    if (typeof key === "string" && key[0] === "$") {
+      return [{ value: key, vars: {}, reqs: { [key.slice(1)]: true } }];
+    }
+    return [{ value: key, vars: {}, reqs: {} }];
+  }
+  function lookupValues(graph, path, vars = {}) {
     const [key, ...rest] = path;
-    if (rest.length === 0) {
-      const ref = makeRef(def);
-      const [range] = common.splitRef(def);
-      const node2 = { key, path: common.encodePath(ref), version };
-      if (range)
-        node2.prefix = true;
-      common.merge(graph, [node2]);
-      return;
+    if (key[0] === "$") {
+      return graph.flatMap((node2) => {
+        if (node2.end)
+          return [];
+        const newVars = __spreadProps(__spreadValues({}, vars), { [key.slice(1)]: node2.key });
+        return recurse(node2, rest, newVars);
+      });
     }
     let node = graph[common.findFirst(graph, key)];
-    if (!node || node.key !== key || node.end) {
-      node = { key, version, value: 1 };
-      common.merge(graph, [node]);
-      delete node.value;
-      node.children = [];
-    }
-    if (!node.children) {
-      throw Error("linkGraph.unexpected_leaf " + key);
+    if (!node || node.key !== key || node.end)
+      return [];
+    return recurse(node, rest, vars);
+  }
+  function recurse(node, path, vars) {
+    if (!path.length)
+      return [{ value: node.value, vars, reqs: {} }];
+    if (node.children)
+      return lookupValues(node.children, path, vars);
+    if (node.path) {
+      const linked = common.unwrap(rootGraph, node.path);
+      if (Array.isArray(linked))
+        return lookupValues(linked, path, vars);
     }
-    linkGraphDef(node.children, rest, def, node.version);
+    throw Error("link.no_children " + JSON.stringify(node));
   }
-  function makeRef(def) {
-    function replacePlaceholders(key) {
-      if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
-        return common.unwrap(rootGraph, key.slice(2).split("."));
-      }
-      if (Array.isArray(key)) {
-        return key.map(replacePlaceholders);
-      }
-      if (typeof key === "object" && key) {
-        const result = {};
-        for (const prop in key)
-          result[prop] = replacePlaceholders(key[prop]);
-        return result;
-      }
+}
+function unbraid(braid) {
+  const [options, ...rest] = braid;
+  if (!rest.length) {
+    return options.map((option) => ({
+      value: [option.value],
+      vars: option.vars,
+      reqs: option.reqs
+    }));
+  }
+  const strands = unbraid(rest);
+  return options.flatMap((option) => strands.filter((strand) => isCompatible(option.vars, strand.vars)).map((strand) => ({
+    value: [option.value, ...strand.value],
+    vars: __spreadValues(__spreadValues({}, option.vars), strand.vars),
+    reqs: __spreadValues(__spreadValues({}, option.reqs), strand.reqs)
+  })));
+}
+function isCompatible(oVars, sVars) {
+  for (const name in oVars) {
+    if (name in sVars && oVars[name] !== sVars[name])
+      return false;
+  }
+  return true;
+}
+function makeRef(def, vars) {
+  function getValue(key) {
+    if (typeof key !== "string")
       return key;
+    return key[0] === "$" ? vars[key.slice(1)] : key;
+  }
+  function replacePlaceholders(key) {
+    if (Array.isArray(key)) {
+      return key.map(replacePlaceholders);
+    }
+    if (typeof key === "object" && key) {
+      const result = {};
+      for (const prop in key)
+        result[prop] = replacePlaceholders(key[prop]);
+      return result;
     }
-    const ref = def.map(replacePlaceholders);
-    return ref;
+    return getValue(key);
   }
+  const ref = def.map(replacePlaceholders);
+  return ref;
 }
 function prepQueryLinks(rootQuery, defs) {
   return defs.flatMap(({ path, def }) => prepQueryDef(rootQuery, path, def));
   function prepQueryDef(query, path, def, vars = {}, version = 0) {
     var _a;
-    const [key, ...rest] = path;
-    if (rest.length === 0) {
-      const ix = common.findFirst(query, key);
-      if (((_a = query[ix]) == null ? void 0 : _a.key) !== key)
-        return [];
-      const [{ children: subQuery }] = query.splice(ix, 1);
+    function addDefQuery(subQuery) {
       common.add(rootQuery, getDefQuery(def, vars, version));
       const [range, filter] = common.splitRef(def);
       if (range && subQuery.length) {
@@ -95,23 +183,54 @@ function prepQueryLinks(rootQuery, defs) {
         def: def2
       }));
     }
+    function makePager(pager) {
+      Object.defineProperty(pager, "toString", { value: () => key });
+      return pager;
+    }
+    const [key, ...rest] = path;
+    if (rest.length === 0) {
+      if (key[0] === "$") {
+        return query.splice(0).flatMap((node) => {
+          vars[key.slice(1)] = makePager(common.decodeArgs(node));
+          return addDefQuery(node.children);
+        });
+      } else {
+        const ix = common.findFirst(query, key);
+        if (((_a = query[ix]) == null ? void 0 : _a.key) !== key)
+          return [];
+        const [{ children: subQuery }] = query.splice(ix, 1);
+        return addDefQuery(subQuery);
+      }
+    }
     let used = [];
-    if (key[0] !== "$") {
-      const node = query[common.findFirst(query, key)];
-      if (!node || node.key !== key || !node.children)
-        return [];
-      used = prepQueryDef(node.children, rest, def, vars, node.version);
-      used = prefixKey(used, node.key);
-    } else {
+    if (key[0] === "$") {
       for (const node of query) {
         if (!common.isBranch(node))
           continue;
-        let usedHere = prepQueryDef(node.children, rest, def, __spreadProps(__spreadValues({}, vars), {
-          [key.slice(1)]: node.key
-        }), node.version);
+        let usedHere;
+        if (node.prefix) {
+          usedHere = node.children.flatMap((subNode) => {
+            const pager = makePager(common.decodeArgs(subNode));
+            return prefixKey(prepQueryDef(subNode.children, rest, def, __spreadProps(__spreadValues({}, vars), { [key.slice(1)]: [node.key, pager] }), node.version), key);
+          });
+        } else {
+          usedHere = prepQueryDef(node.children, rest, def, __spreadProps(__spreadValues({}, vars), { [key.slice(1)]: node.key }), node.version);
+        }
         usedHere = prefixKey(usedHere, node.key);
         used = used.concat(usedHere);
       }
+    } else {
+      const node = query[common.findFirst(query, key)];
+      if (!node || node.key !== key || !node.children)
+        return [];
+      used = prepQueryDef(node.children, rest, def, vars, node.version);
+      used = prefixKey(used, node.key);
+    }
+    for (let i = 0; i < query.length; i++) {
+      if (query[i].children && query[i].children.length === 0) {
+        query.splice(i, 1);
+        i--;
+      }
     }
     return used;
   }
@@ -121,7 +240,7 @@ function getDefQuery(def, vars, version) {
     return key[0] === "$" ? vars[key.slice(1)] : key;
   }
   function getPath(template) {
-    return template.split(".").map(getValue);
+    return template.split(".").flatMap(getValue);
   }
   const defQuery = [];
   function addDefQueries(key) {
@@ -141,14 +260,16 @@ function getDefQuery(def, vars, version) {
 }
 function prepareDef(def, vars) {
   function getValue(key) {
+    if (typeof key !== "string")
+      return key;
     return key[0] === "$" ? vars[key.slice(1)] : key;
   }
   function replacePlaceholders(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
-      return "$$" + key.slice(2).split(".").map(getValue).join(".");
+      return "$$" + key.slice(2).split(".").flatMap(getValue).join(".");
     }
     if (Array.isArray(key)) {
-      return key.map(replacePlaceholders);
+      return key.flatMap(replacePlaceholders);
     }
     if (typeof key === "object" && key) {
       const result = {};
@@ -158,8 +279,10 @@ function prepareDef(def, vars) {
     }
     return getValue(key);
   }
-  return def.map(replacePlaceholders);
+  const ref = def.flatMap(replacePlaceholders);
+  return ref;
 }
+const log = debug__default["default"]("graffy:link");
 var index = (defs) => (store) => {
   const prefix = store.path;
   const defEntries = Object.entries(defs).map(([prop, def]) => ({
@@ -169,10 +292,18 @@ var index = (defs) => (store) => {
   store.on("read", async (query, options, next) => {
     const unwrappedQuery = clone(common.unwrap(query, prefix));
     const usedDefs = prepQueryLinks(unwrappedQuery, defEntries);
+    if (!usedDefs.length)
+      return next(query, options);
     const result = await next(common.wrap(unwrappedQuery, prefix), options);
+    const version = result[0].version;
     const unwrappedResult = common.unwrap(result, prefix);
-    linkGraph(unwrappedResult, usedDefs);
-    return result;
+    common.add(unwrappedQuery, common.unwrap(query, prefix));
+    log("finalizing", prefix, unwrappedQuery);
+    const finalizedResult = common.finalize(unwrappedResult, unwrappedQuery, version);
+    log("beforeAddingLinks", prefix, finalizedResult);
+    linkGraph(finalizedResult, usedDefs);
+    log("afterAddingLinks", prefix, finalizedResult);
+    return common.wrap(finalizedResult, prefix, version);
   });
 };
 function clone(tree) {

package/index.mjs

@@ -17,64 +17,148 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { splitRef, encodePath, merge, findFirst, unwrap, add, decodeArgs, isBranch, wrapValue, wrap } from "@graffy/common";
+import { encodePath, splitRef, findFirst, unwrap, merge, wrap, decodeArgs, isBranch, add, wrapValue, finalize } from "@graffy/common";
+import debug from "debug";
 function linkGraph(rootGraph, defs) {
-  for (const { path, def } of defs)
-    linkGraphDef(rootGraph, path, def);
+  let version = rootGraph[0].version;
+  for (const { path, def } of defs) {
+    const braid = def.map(getKeyValues);
+    const strands = unbraid(braid);
+    const pathReqs = path.filter((key) => key[0] === "$").reduce((acc, key) => {
+      acc[key.slice(1)] = true;
+      return acc;
+    }, {});
+    outer:
+      for (const { value, vars, reqs } of strands) {
+        for (const req in reqs)
+          if (!(req in vars))
+            continue outer;
+        for (const req in pathReqs)
+          if (!(req in vars))
+            continue outer;
+        const realPath = makeRef(path, vars);
+        const realRef = makeRef(value, vars);
+        const node = { key: realPath.pop(), path: encodePath(realRef), version };
+        const [range] = splitRef(realRef);
+        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) {
+            realPath.unshift(key);
+            break;
+          }
+          target = nextTarget.path ? unwrap(rootGraph, nextTarget.path) : nextTarget.children;
+        } while (target && realPath.length);
+        if (!target)
+          return;
+        merge(target, realPath.length ? wrap([node], realPath, version) : [node]);
+      }
+  }
   return rootGraph;
-  function linkGraphDef(graph, path, def, version = 0) {
+  function getKeyValues(key) {
+    if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
+      return lookupValues(rootGraph, key.slice(2).split("."));
+    }
+    if (Array.isArray(key)) {
+      return unbraid(key.map(getKeyValues));
+    }
+    if (typeof key === "object" && key) {
+      const values = unbraid(Object.values(key).map(getKeyValues));
+      const keys = Object.keys(key);
+      return values.map(({ value, vars, reqs }) => ({
+        value: value.reduce((acc, val, i) => {
+          acc[keys[i]] = val;
+          return acc;
+        }, {}),
+        vars,
+        reqs
+      }));
+    }
+    if (typeof key === "string" && key[0] === "$") {
+      return [{ value: key, vars: {}, reqs: { [key.slice(1)]: true } }];
+    }
+    return [{ value: key, vars: {}, reqs: {} }];
+  }
+  function lookupValues(graph, path, vars = {}) {
     const [key, ...rest] = path;
-    if (rest.length === 0) {
-      const ref = makeRef(def);
-      const [range] = splitRef(def);
-      const node2 = { key, path: encodePath(ref), version };
-      if (range)
-        node2.prefix = true;
-      merge(graph, [node2]);
-      return;
+    if (key[0] === "$") {
+      return graph.flatMap((node2) => {
+        if (node2.end)
+          return [];
+        const newVars = __spreadProps(__spreadValues({}, vars), { [key.slice(1)]: node2.key });
+        return recurse(node2, rest, newVars);
+      });
     }
     let node = graph[findFirst(graph, key)];
-    if (!node || node.key !== key || node.end) {
-      node = { key, version, value: 1 };
-      merge(graph, [node]);
-      delete node.value;
-      node.children = [];
-    }
-    if (!node.children) {
-      throw Error("linkGraph.unexpected_leaf " + key);
+    if (!node || node.key !== key || node.end)
+      return [];
+    return recurse(node, rest, vars);
+  }
+  function recurse(node, path, vars) {
+    if (!path.length)
+      return [{ value: node.value, vars, reqs: {} }];
+    if (node.children)
+      return lookupValues(node.children, path, vars);
+    if (node.path) {
+      const linked = unwrap(rootGraph, node.path);
+      if (Array.isArray(linked))
+        return lookupValues(linked, path, vars);
     }
-    linkGraphDef(node.children, rest, def, node.version);
+    throw Error("link.no_children " + JSON.stringify(node));
   }
-  function makeRef(def) {
-    function replacePlaceholders(key) {
-      if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
-        return unwrap(rootGraph, key.slice(2).split("."));
-      }
-      if (Array.isArray(key)) {
-        return key.map(replacePlaceholders);
-      }
-      if (typeof key === "object" && key) {
-        const result = {};
-        for (const prop in key)
-          result[prop] = replacePlaceholders(key[prop]);
-        return result;
-      }
+}
+function unbraid(braid) {
+  const [options, ...rest] = braid;
+  if (!rest.length) {
+    return options.map((option) => ({
+      value: [option.value],
+      vars: option.vars,
+      reqs: option.reqs
+    }));
+  }
+  const strands = unbraid(rest);
+  return options.flatMap((option) => strands.filter((strand) => isCompatible(option.vars, strand.vars)).map((strand) => ({
+    value: [option.value, ...strand.value],
+    vars: __spreadValues(__spreadValues({}, option.vars), strand.vars),
+    reqs: __spreadValues(__spreadValues({}, option.reqs), strand.reqs)
+  })));
+}
+function isCompatible(oVars, sVars) {
+  for (const name in oVars) {
+    if (name in sVars && oVars[name] !== sVars[name])
+      return false;
+  }
+  return true;
+}
+function makeRef(def, vars) {
+  function getValue(key) {
+    if (typeof key !== "string")
       return key;
+    return key[0] === "$" ? vars[key.slice(1)] : key;
+  }
+  function replacePlaceholders(key) {
+    if (Array.isArray(key)) {
+      return key.map(replacePlaceholders);
     }
-    const ref = def.map(replacePlaceholders);
-    return ref;
+    if (typeof key === "object" && key) {
+      const result = {};
+      for (const prop in key)
+        result[prop] = replacePlaceholders(key[prop]);
+      return result;
+    }
+    return getValue(key);
   }
+  const ref = def.map(replacePlaceholders);
+  return ref;
 }
 function prepQueryLinks(rootQuery, defs) {
   return defs.flatMap(({ path, def }) => prepQueryDef(rootQuery, path, def));
   function prepQueryDef(query, path, def, vars = {}, version = 0) {
     var _a;
-    const [key, ...rest] = path;
-    if (rest.length === 0) {
-      const ix = findFirst(query, key);
-      if (((_a = query[ix]) == null ? void 0 : _a.key) !== key)
-        return [];
-      const [{ children: subQuery }] = query.splice(ix, 1);
+    function addDefQuery(subQuery) {
       add(rootQuery, getDefQuery(def, vars, version));
       const [range, filter] = splitRef(def);
       if (range && subQuery.length) {
@@ -94,23 +178,54 @@ function prepQueryLinks(rootQuery, defs) {
         def: def2
       }));
     }
+    function makePager(pager) {
+      Object.defineProperty(pager, "toString", { value: () => key });
+      return pager;
+    }
+    const [key, ...rest] = path;
+    if (rest.length === 0) {
+      if (key[0] === "$") {
+        return query.splice(0).flatMap((node) => {
+          vars[key.slice(1)] = makePager(decodeArgs(node));
+          return addDefQuery(node.children);
+        });
+      } else {
+        const ix = findFirst(query, key);
+        if (((_a = query[ix]) == null ? void 0 : _a.key) !== key)
+          return [];
+        const [{ children: subQuery }] = query.splice(ix, 1);
+        return addDefQuery(subQuery);
+      }
+    }
     let used = [];
-    if (key[0] !== "$") {
-      const node = query[findFirst(query, key)];
-      if (!node || node.key !== key || !node.children)
-        return [];
-      used = prepQueryDef(node.children, rest, def, vars, node.version);
-      used = prefixKey(used, node.key);
-    } else {
+    if (key[0] === "$") {
       for (const node of query) {
         if (!isBranch(node))
           continue;
-        let usedHere = prepQueryDef(node.children, rest, def, __spreadProps(__spreadValues({}, vars), {
-          [key.slice(1)]: node.key
-        }), node.version);
+        let usedHere;
+        if (node.prefix) {
+          usedHere = node.children.flatMap((subNode) => {
+            const pager = makePager(decodeArgs(subNode));
+            return prefixKey(prepQueryDef(subNode.children, rest, def, __spreadProps(__spreadValues({}, vars), { [key.slice(1)]: [node.key, pager] }), node.version), key);
+          });
+        } else {
+          usedHere = prepQueryDef(node.children, rest, def, __spreadProps(__spreadValues({}, vars), { [key.slice(1)]: node.key }), node.version);
+        }
         usedHere = prefixKey(usedHere, node.key);
         used = used.concat(usedHere);
       }
+    } else {
+      const node = query[findFirst(query, key)];
+      if (!node || node.key !== key || !node.children)
+        return [];
+      used = prepQueryDef(node.children, rest, def, vars, node.version);
+      used = prefixKey(used, node.key);
+    }
+    for (let i = 0; i < query.length; i++) {
+      if (query[i].children && query[i].children.length === 0) {
+        query.splice(i, 1);
+        i--;
+      }
     }
     return used;
   }
@@ -120,7 +235,7 @@ function getDefQuery(def, vars, version) {
     return key[0] === "$" ? vars[key.slice(1)] : key;
   }
   function getPath(template) {
-    return template.split(".").map(getValue);
+    return template.split(".").flatMap(getValue);
   }
   const defQuery = [];
   function addDefQueries(key) {
@@ -140,14 +255,16 @@ function getDefQuery(def, vars, version) {
 }
 function prepareDef(def, vars) {
   function getValue(key) {
+    if (typeof key !== "string")
+      return key;
     return key[0] === "$" ? vars[key.slice(1)] : key;
   }
   function replacePlaceholders(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
-      return "$$" + key.slice(2).split(".").map(getValue).join(".");
+      return "$$" + key.slice(2).split(".").flatMap(getValue).join(".");
     }
     if (Array.isArray(key)) {
-      return key.map(replacePlaceholders);
+      return key.flatMap(replacePlaceholders);
     }
     if (typeof key === "object" && key) {
       const result = {};
@@ -157,8 +274,10 @@ function prepareDef(def, vars) {
     }
     return getValue(key);
   }
-  return def.map(replacePlaceholders);
+  const ref = def.flatMap(replacePlaceholders);
+  return ref;
 }
+const log = debug("graffy:link");
 var index = (defs) => (store) => {
   const prefix = store.path;
   const defEntries = Object.entries(defs).map(([prop, def]) => ({
@@ -168,10 +287,18 @@ var index = (defs) => (store) => {
   store.on("read", async (query, options, next) => {
     const unwrappedQuery = clone(unwrap(query, prefix));
     const usedDefs = prepQueryLinks(unwrappedQuery, defEntries);
+    if (!usedDefs.length)
+      return next(query, options);
     const result = await next(wrap(unwrappedQuery, prefix), options);
+    const version = result[0].version;
     const unwrappedResult = unwrap(result, prefix);
-    linkGraph(unwrappedResult, usedDefs);
-    return result;
+    add(unwrappedQuery, unwrap(query, prefix));
+    log("finalizing", prefix, unwrappedQuery);
+    const finalizedResult = finalize(unwrappedResult, unwrappedQuery, version);
+    log("beforeAddingLinks", prefix, finalizedResult);
+    linkGraph(finalizedResult, usedDefs);
+    log("afterAddingLinks", prefix, finalizedResult);
+    return wrap(finalizedResult, prefix, version);
   });
 };
 function clone(tree) {

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.14",
+  "version": "0.15.15",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,6 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.14"
+    "@graffy/common": "0.15.15",
+    "debug": "^4.3.2"
   }
 }