@xeonr/console-shell 0.5.11 → 0.5.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeonr/console-shell",
-  "version": "0.5.11",
+  "version": "0.5.12",
   "description": "The Xeonr Cloud Console chrome: product rail, team switcher, section sidebar, top bar, ⌘K and the All-products launcher, plus the console context hooks every product console mounts.",
   "license": "UNLICENSED",
   "type": "module",

package/scripts/check-entity-crumbs.mjs

@@ -160,10 +160,43 @@ function ancestorObjects(src, open) {
   }
 }
 
+/**
+ * The string values of an object literal `name = { key: "…" }` defined in
+ * `file`, or imported into it from a relative module: Lantern declares its
+ * routes as `path: routePatterns.trace` against one such table (CON-62).
+ */
+function pathTable(file, name, seen = new Set()) {
+  const key = `${file}#${name}`;
+  if (seen.has(key)) return null;
+  seen.add(key);
+  const src = read(file);
+  const def = src.match(new RegExp(`(?:^|\\n)(?:export\\s+)?(?:const|let)\\s+${name}\\b[^=\\n]*=\\s*\\{`));
+  if (def) {
+    const open = def.index + def[0].length - 1;
+    const body = src.slice(open, matchClose(src, open));
+    const table = {};
+    for (const m of body.matchAll(/(?:^|[\s,{])(["']?)([A-Za-z_$][\w$]*)\1\s*:\s*(["'`])([^"'`]*)\3/g)) table[m[2]] = m[4];
+    return table;
+  }
+  const imp = importOf(file, name);
+  return imp?.file ? pathTable(imp.file, imp.name, seen) : null;
+}
+
 /** Every route declaration in a file: { path, elements, parents, layout, at }. */
-function routesIn(src) {
+function routesIn(src, file) {
   const out = [];
-  for (const m of src.matchAll(/\bpath\s*:\s*(["'`])([^"'`]*)\1/g)) {
+  const tables = new Map();
+  const lookup = (obj, key) => {
+    if (!tables.has(obj)) tables.set(obj, file ? pathTable(file, obj) : null);
+    return tables.get(obj)?.[key];
+  };
+  const literal = /\bpath\s*:\s*(["'`])([^"'`]*)\1/g;
+  const member = /\bpath\s*:\s*()([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)\b/g;
+  const hits = [
+    ...[...src.matchAll(literal)].map((m) => ({ index: m.index, path: m[2] })),
+    ...[...src.matchAll(member)].map((m) => ({ index: m.index, path: lookup(m[2], m[3]) })).filter((h) => typeof h.path === "string"),
+  ];
+  for (const m of hits) {
     const open = enclosingBrace(src, m.index);
     if (open < 0) continue;
     const obj = topLevel(src.slice(open, matchClose(src, open)));
@@ -173,7 +206,7 @@ function routesIn(src) {
       const pe = o.match(/\belement\s*:\s*(<[\s\S]*)/);
       return pe ? componentsIn(pe[1]) : [];
     });
-    out.push({ path: m[2], elements: el ? componentsIn(el[1]) : [], parents, layout: /\bchildren\s*:/.test(obj), at: m.index });
+    out.push({ path: m.path, elements: el ? componentsIn(el[1]) : [], parents, layout: /\bchildren\s*:/.test(obj), at: m.index });
   }
   for (const m of src.matchAll(/<Route\b/g)) {
     // the opening tag ends at the first `>` outside braces
@@ -185,10 +218,12 @@ function routesIn(src) {
       else if (src[i] === ">" && depth === 0) break;
     }
     const tag = src.slice(m.index, i + 1);
-    const path = tag.match(/\bpath\s*=\s*(?:\{\s*)?(["'`])([^"'`]*)\1/);
-    if (!path) continue;
+    const lit = tag.match(/\bpath\s*=\s*(?:\{\s*)?(["'`])([^"'`]*)\1/);
+    const mem = lit ? null : tag.match(/\bpath\s*=\s*\{\s*([A-Za-z_$][\w$]*)\.([A-Za-z_$][\w$]*)\s*\}/);
+    const p = lit ? lit[2] : mem ? lookup(mem[1], mem[2]) : undefined;
+    if (typeof p !== "string") continue;
     const el = tag.match(/\belement\s*=\s*\{\s*(<[\s\S]*)/);
-    out.push({ path: path[2], elements: el ? componentsIn(el[1]) : [], parents: [], layout: !tag.endsWith("/>"), at: m.index });
+    out.push({ path: p, elements: el ? componentsIn(el[1]) : [], parents: [], layout: !tag.endsWith("/>"), at: m.index });
   }
   return out;
 }
@@ -295,7 +330,7 @@ for (const dir of dirs) {
   }
   for (const file of collect(abs)) {
     const src = read(file);
-    for (const r of routesIn(src)) {
+    for (const r of routesIn(src, file)) {
       if (r.layout || r.elements.length === 0) continue;
       const params = entityParams(r.path, ignore);
       if (params.length === 0) continue;