@graffy/link 0.15.20 → 0.15.21-alpha.3

package/index.cjs

@@ -27,65 +27,54 @@ var debug__default = /* @__PURE__ */ _interopDefaultLegacy(debug);
 function linkGraph(rootGraph, defs) {
   let version = rootGraph[0].version;
   for (const { path, def } of defs) {
-    const braid = def.map(getKeyValues);
+    const braid = def.map(getChoices);
     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]);
-      }
+    for (const { value, vars } of strands) {
+      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 getKeyValues(key) {
+  function getChoices(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));
+      return unbraid(key.map(getChoices));
     }
     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;
+      const [range = {}, filter = {}] = common.splitArgs(key);
+      const entries = unbraid(Object.entries(filter).flat().map(getChoices));
+      return entries.map(({ value, vars }) => ({
+        value: __spreadValues(__spreadValues({}, range), Object.fromEntries(value.reduce((acc, item, i) => {
+          if (i % 2) {
+            acc[acc.length - 1].push(item);
+          } else {
+            acc.push([item]);
+          }
           return acc;
-        }, {}),
-        vars,
-        reqs
+        }, []))),
+        vars
       }));
     }
-    if (typeof key === "string" && key[0] === "$") {
-      return [{ value: key, vars: {}, reqs: { [key.slice(1)]: true } }];
-    }
-    return [{ value: key, vars: {}, reqs: {} }];
+    return [{ value: key, vars: {} }];
   }
   function lookupValues(graph, path, vars = {}) {
     const [key, ...rest] = path;
@@ -104,7 +93,7 @@ function linkGraph(rootGraph, defs) {
   }
   function recurse(node, path, vars) {
     if (!path.length)
-      return [{ value: node.value, vars, reqs: {} }];
+      return [{ value: node.value, vars }];
     if (node.children)
       return lookupValues(node.children, path, vars);
     if (node.path) {
@@ -116,19 +105,19 @@ function linkGraph(rootGraph, defs) {
   }
 }
 function unbraid(braid) {
+  if (!braid.length)
+    return [];
   const [options, ...rest] = braid;
   if (!rest.length) {
     return options.map((option) => ({
       value: [option.value],
-      vars: option.vars,
-      reqs: option.reqs
+      vars: option.vars
     }));
   }
   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)
+    vars: __spreadValues(__spreadValues({}, option.vars), strand.vars)
   })));
 }
 function isCompatible(oVars, sVars) {
@@ -142,7 +131,7 @@ function makeRef(def, vars) {
   function getValue(key) {
     if (typeof key !== "string")
       return key;
-    return key[0] === "$" ? vars[key.slice(1)] : key;
+    return key[0] === "$" && key.slice(1) in vars ? vars[key.slice(1)] : key;
   }
   function replacePlaceholders(key) {
     if (Array.isArray(key)) {
@@ -150,8 +139,9 @@ function makeRef(def, vars) {
     }
     if (typeof key === "object" && key) {
       const result = {};
-      for (const prop in key)
-        result[prop] = replacePlaceholders(key[prop]);
+      for (const prop in key) {
+        result[replacePlaceholders(prop)] = replacePlaceholders(key[prop]);
+      }
       return result;
     }
     return getValue(key);
@@ -168,9 +158,12 @@ function prepQueryLinks(rootQuery, defs) {
       const [range, filter] = common.splitRef(def);
       if (range && subQuery.length) {
         return subQuery.map((node) => {
+          if (!node.prefix && !node.end) {
+            throw Error("link.range_expected: " + path.concat(node.key).join("."));
+          }
           return {
             path: path.concat(node.key),
-            def: prepareDef(def.slice(0, -1).concat(__spreadValues(__spreadValues(__spreadValues({}, filter), common.decodeArgs(node)), range)), vars)
+            def: prepareDef(def.slice(0, -1).concat(__spreadValues(__spreadValues(__spreadValues({}, filter), node.prefix ? common.decodeArgs(node) : {}), range)), vars)
           };
         });
       } else {
@@ -251,8 +244,10 @@ function getDefQuery(def, vars, version) {
       key.map(addDefQueries);
     }
     if (typeof key === "object" && key) {
-      for (const prop in key)
+      for (const prop in key) {
+        addDefQueries(prop);
         addDefQueries(key[prop]);
+      }
     }
   }
   def.map(addDefQueries);
@@ -262,7 +257,7 @@ function prepareDef(def, vars) {
   function getValue(key) {
     if (typeof key !== "string")
       return key;
-    return key[0] === "$" ? vars[key.slice(1)] : key;
+    return key[0] === "$" && key.slice(1) in vars ? vars[key.slice(1)] : key;
   }
   function replacePlaceholders(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
@@ -273,8 +268,9 @@ function prepareDef(def, vars) {
     }
     if (typeof key === "object" && key) {
       const result = {};
-      for (const prop in key)
-        result[prop] = replacePlaceholders(key[prop]);
+      for (const prop in key) {
+        result[replacePlaceholders(prop)] = replacePlaceholders(key[prop]);
+      }
       return result;
     }
     return getValue(key);

package/index.mjs

@@ -17,70 +17,59 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { encodePath, splitRef, findFirst, unwrap, merge, wrap, decodeArgs, isBranch, add, wrapValue, finalize } from "@graffy/common";
+import { encodePath, splitRef, findFirst, unwrap, merge, wrap, splitArgs, decodeArgs, isBranch, add, wrapValue, finalize } from "@graffy/common";
 import debug from "debug";
 function linkGraph(rootGraph, defs) {
   let version = rootGraph[0].version;
   for (const { path, def } of defs) {
-    const braid = def.map(getKeyValues);
+    const braid = def.map(getChoices);
     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]);
-      }
+    for (const { value, vars } of strands) {
+      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 getKeyValues(key) {
+  function getChoices(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));
+      return unbraid(key.map(getChoices));
     }
     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;
+      const [range = {}, filter = {}] = splitArgs(key);
+      const entries = unbraid(Object.entries(filter).flat().map(getChoices));
+      return entries.map(({ value, vars }) => ({
+        value: __spreadValues(__spreadValues({}, range), Object.fromEntries(value.reduce((acc, item, i) => {
+          if (i % 2) {
+            acc[acc.length - 1].push(item);
+          } else {
+            acc.push([item]);
+          }
           return acc;
-        }, {}),
-        vars,
-        reqs
+        }, []))),
+        vars
       }));
     }
-    if (typeof key === "string" && key[0] === "$") {
-      return [{ value: key, vars: {}, reqs: { [key.slice(1)]: true } }];
-    }
-    return [{ value: key, vars: {}, reqs: {} }];
+    return [{ value: key, vars: {} }];
   }
   function lookupValues(graph, path, vars = {}) {
     const [key, ...rest] = path;
@@ -99,7 +88,7 @@ function linkGraph(rootGraph, defs) {
   }
   function recurse(node, path, vars) {
     if (!path.length)
-      return [{ value: node.value, vars, reqs: {} }];
+      return [{ value: node.value, vars }];
     if (node.children)
       return lookupValues(node.children, path, vars);
     if (node.path) {
@@ -111,19 +100,19 @@ function linkGraph(rootGraph, defs) {
   }
 }
 function unbraid(braid) {
+  if (!braid.length)
+    return [];
   const [options, ...rest] = braid;
   if (!rest.length) {
     return options.map((option) => ({
       value: [option.value],
-      vars: option.vars,
-      reqs: option.reqs
+      vars: option.vars
     }));
   }
   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)
+    vars: __spreadValues(__spreadValues({}, option.vars), strand.vars)
   })));
 }
 function isCompatible(oVars, sVars) {
@@ -137,7 +126,7 @@ function makeRef(def, vars) {
   function getValue(key) {
     if (typeof key !== "string")
       return key;
-    return key[0] === "$" ? vars[key.slice(1)] : key;
+    return key[0] === "$" && key.slice(1) in vars ? vars[key.slice(1)] : key;
   }
   function replacePlaceholders(key) {
     if (Array.isArray(key)) {
@@ -145,8 +134,9 @@ function makeRef(def, vars) {
     }
     if (typeof key === "object" && key) {
       const result = {};
-      for (const prop in key)
-        result[prop] = replacePlaceholders(key[prop]);
+      for (const prop in key) {
+        result[replacePlaceholders(prop)] = replacePlaceholders(key[prop]);
+      }
       return result;
     }
     return getValue(key);
@@ -163,9 +153,12 @@ function prepQueryLinks(rootQuery, defs) {
       const [range, filter] = splitRef(def);
       if (range && subQuery.length) {
         return subQuery.map((node) => {
+          if (!node.prefix && !node.end) {
+            throw Error("link.range_expected: " + path.concat(node.key).join("."));
+          }
           return {
             path: path.concat(node.key),
-            def: prepareDef(def.slice(0, -1).concat(__spreadValues(__spreadValues(__spreadValues({}, filter), decodeArgs(node)), range)), vars)
+            def: prepareDef(def.slice(0, -1).concat(__spreadValues(__spreadValues(__spreadValues({}, filter), node.prefix ? decodeArgs(node) : {}), range)), vars)
           };
         });
       } else {
@@ -246,8 +239,10 @@ function getDefQuery(def, vars, version) {
       key.map(addDefQueries);
     }
     if (typeof key === "object" && key) {
-      for (const prop in key)
+      for (const prop in key) {
+        addDefQueries(prop);
         addDefQueries(key[prop]);
+      }
     }
   }
   def.map(addDefQueries);
@@ -257,7 +252,7 @@ function prepareDef(def, vars) {
   function getValue(key) {
     if (typeof key !== "string")
       return key;
-    return key[0] === "$" ? vars[key.slice(1)] : key;
+    return key[0] === "$" && key.slice(1) in vars ? vars[key.slice(1)] : key;
   }
   function replacePlaceholders(key) {
     if (typeof key === "string" && key[0] === "$" && key[1] === "$") {
@@ -268,8 +263,9 @@ function prepareDef(def, vars) {
     }
     if (typeof key === "object" && key) {
       const result = {};
-      for (const prop in key)
-        result[prop] = replacePlaceholders(key[prop]);
+      for (const prop in key) {
+        result[replacePlaceholders(prop)] = replacePlaceholders(key[prop]);
+      }
       return result;
     }
     return getValue(key);

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.20",
+  "version": "0.15.21-alpha.3",
   "main": "./index.cjs",
   "exports": {
     "import": "./index.mjs",
@@ -16,7 +16,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@graffy/common": "0.15.20",
+    "@graffy/common": "0.15.21-alpha.3",
     "debug": "^4.3.3"
   }
 }