@loomweaver/cli 0.7.5 → 0.7.6

package/dist/main.mjs

@@ -6,7 +6,7 @@ function isUnsafePath(path) {
 }
 function generate(recipe, input) {
   const files = recipe.build(input);
-  const unsafe = Object.keys(files).find(isUnsafePath);
+  const unsafe = Object.keys(files).find((path) => isUnsafePath(path));
   if (unsafe !== void 0) {
     throw new Error(`Recipe "${recipe.id}" produced an unsafe path: "${unsafe}".`);
   }
@@ -17,8 +17,16 @@ function amendments(recipe, input) {
 }
 
 // ../devkit/src/lib/amend/merge.ts
+function normalizeProjectRoot(value) {
+  const rooted = value.replace(/^\.?\/*/, "");
+  let end = rooted.length;
+  while (end > 0 && rooted[end - 1] === "/") {
+    end -= 1;
+  }
+  return rooted.slice(0, end);
+}
 function joinProjectPath(projectRoot, path) {
-  const root = projectRoot.replace(/^\.?\/*/, "").replace(/\/+$/, "");
+  const root = normalizeProjectRoot(projectRoot);
   return root ? `${root}/${path}` : path;
 }
 function resolveAssetInput(glob, projectRoot) {
@@ -34,8 +42,8 @@ function ensurePostcssPlugin(existing, amendment) {
       declined: [`${amendment.file}: "plugins" is not an object`]
     };
   }
-  const next = { ...plugins ?? {} };
-  if (amendment.plugin in next) {
+  const next = { ...plugins };
+  if (Object.hasOwn(next, amendment.plugin)) {
     return { value: root, added: [], declined: [] };
   }
   next[amendment.plugin] = {};
@@ -46,10 +54,10 @@ function ensurePostcssPlugin(existing, amendment) {
   };
 }
 function ensureBuildTarget(target, amendment, projectRoot) {
-  const next = { ...asObject(target) ?? {} };
+  const next = { ...asObject(target) };
   const added = [];
   const declined = [];
-  const options = { ...asObject(next["options"]) ?? {} };
+  const options = { ...asObject(next["options"]) };
   const styles = ensureStrings(
     options["styles"],
     amendment.styles.map((style) => joinProjectPath(projectRoot, style))
@@ -65,8 +73,8 @@ function ensureBuildTarget(target, amendment, projectRoot) {
   }
   next["options"] = options;
   if (amendment.inlineCritical !== void 0 || amendment.serviceWorker) {
-    const configurations = { ...asObject(next["configurations"]) ?? {} };
-    const production = { ...asObject(configurations["production"]) ?? {} };
+    const configurations = { ...asObject(next["configurations"]) };
+    const production = { ...asObject(configurations["production"]) };
     if (amendment.serviceWorker && production["serviceWorker"] === void 0) {
       production["serviceWorker"] = joinProjectPath(
         projectRoot,
@@ -96,8 +104,8 @@ function ensureBuildTarget(target, amendment, projectRoot) {
   return { value: next, added, declined };
 }
 function ensureStylesheetSource(css, source) {
-  const quoted = source.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  if (new RegExp(`@source\\s+['"]${quoted}/?['"]`).test(css)) {
+  const quoted = source.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+  if (new RegExp(String.raw`@source\s+['"]${quoted}/?['"]`).test(css)) {
     return css;
   }
   return `${css.trimEnd()}
@@ -109,7 +117,7 @@ function ensureInlineCritical(optimization, inlineCritical) {
   if (typeof optimization === "boolean") {
     return { value: optimization, changed: false, declined: true };
   }
-  const root = { ...asObject(optimization) ?? {} };
+  const root = { ...asObject(optimization) };
   const styles = asObject(root["styles"]);
   if (styles === void 0 && root["styles"] !== void 0) {
     return { value: optimization, changed: false, declined: true };
@@ -118,7 +126,7 @@ function ensureInlineCritical(optimization, inlineCritical) {
     return { value: optimization, changed: false, declined: false };
   }
   return {
-    value: { ...root, styles: { ...styles ?? {}, inlineCritical } },
+    value: { ...root, styles: { ...styles, inlineCritical } },
     changed: true,
     declined: false
   };
@@ -127,10 +135,11 @@ function ensureStrings(existing, wanted) {
   const list2 = Array.isArray(existing) ? [...existing] : [];
   const added = [];
   for (const entry of wanted) {
-    if (!list2.includes(entry)) {
-      list2.push(entry);
-      added.push(entry);
+    if (list2.includes(entry)) {
+      continue;
     }
+    list2.push(entry);
+    added.push(entry);
   }
   return { value: list2, added };
 }
@@ -145,7 +154,7 @@ function ensureAssets(existing, wanted, projectRoot) {
     list2.push({
       glob: glob.glob,
       input,
-      ...glob.output === void 0 ? {} : { output: glob.output }
+      ...glob.output !== void 0 && { output: glob.output }
     });
     added.push(input);
   }
@@ -163,34 +172,60 @@ function asObject(value) {
 }
 
 // ../devkit/src/lib/amend/compose.ts
-var PROVIDERS = /(export\s+const\s+appConfig\s*:[^=]*=\s*\{[\s\S]*?providers\s*:\s*\[)([\s\S]*?)(\n(\s*)\],)/;
+var APP_CONFIG = /export\s+const\s+appConfig\s*:[^=]*=\s*\{/;
+var PROVIDERS_OPEN = /providers\s*:\s*\[/g;
 var SHELL_IMPORT = /import\s*\{([^}]*)\}\s*from\s*'@loomweaver\/shell';/;
+function closingLine(source, from) {
+  let close = source.indexOf("],", from);
+  while (close !== -1) {
+    let start = close;
+    while (start > from && source.charAt(start - 1).trim() === "") {
+      start -= 1;
+    }
+    const gap = source.slice(start, close);
+    const newline = gap.indexOf("\n");
+    if (newline !== -1) {
+      return { insertAt: start + newline, indent: gap.slice(newline + 1) };
+    }
+    close = source.indexOf("],", close + 2);
+  }
+  return null;
+}
+function providersBlock(source) {
+  const declaration = APP_CONFIG.exec(source);
+  if (!declaration) {
+    return null;
+  }
+  PROVIDERS_OPEN.lastIndex = declaration.index + declaration[0].length;
+  const open = PROVIDERS_OPEN.exec(source);
+  return open ? closingLine(source, open.index + open[0].length) : null;
+}
 function composePlugin(source, amendment, importPath) {
   if (source.includes(amendment.symbol)) {
     return { source, composed: true };
   }
-  const providers = PROVIDERS.exec(source);
   const shellImport = SHELL_IMPORT.exec(source);
-  if (!providers || !shellImport) {
+  if (!shellImport || !providersBlock(source)) {
     return { source, composed: false };
   }
   const withImports = source.replace(
     SHELL_IMPORT,
-    `import {${withShellSymbols(shellImport[1])}} from '@loomweaver/shell';
+    () => `import {${withShellSymbols(shellImport[1])}} from '@loomweaver/shell';
 import { ${amendment.symbol} } from '${importPath}';`
   );
-  const indent = `${providers[4]}  `;
+  const block = providersBlock(withImports);
+  if (!block) {
+    return { source, composed: false };
+  }
+  const indent = `${block.indent}  `;
   const lines = [
     `${indent}provideTranslationNamespaces('${amendment.id}'),`,
     `${indent}provideCapabilityGrants({ ${amendment.id}: [${amendment.capabilities.map((capability) => `'${capability}'`).join(", ")}] }),`,
     `${indent}...providePlugins(${amendment.symbol}),`
   ].join("\n");
   return {
-    source: withImports.replace(
-      PROVIDERS,
-      (_all, head, body, tail) => `${head}${body}
-${lines}${tail}`
-    ),
+    source: `${withImports.slice(0, block.insertAt)}
+${lines}${withImports.slice(block.insertAt)}`,
     composed: true
   };
 }
@@ -211,13 +246,13 @@ function withShellSymbols(existing) {
   ];
   const present = existing.split(",").map((symbol) => symbol.trim()).filter(Boolean);
   const missing = wanted.filter(
-    (symbol) => !present.some((entry) => entry.replace(/^type\s+/, "") === symbol)
+    (symbol) => present.every((entry) => entry.replace(/^type\s+/, "") !== symbol)
   );
   if (missing.length === 0) {
     return existing;
   }
   const multiline = existing.includes("\n");
-  const all = [...present, ...missing].sort((a, b) => a.localeCompare(b));
+  const all = [...present, ...missing].toSorted((a, b) => a.localeCompare(b));
   return multiline ? `
   ${all.join(",\n  ")},
 ` : ` ${all.join(", ")} `;
@@ -384,17 +419,17 @@ function resolveMenuSlot(menu) {
   }
   return typeof menu === "string" && menu.length ? menu : void 0;
 }
-var PLATFORM_BOUND_CHORD_TOKENS = [
+var PLATFORM_BOUND_CHORD_TOKENS = /* @__PURE__ */ new Set([
   "cmd",
   "command",
   "ctrl",
   "control",
   "meta"
-];
+]);
 function assertPlatformNeutralChord(shortcut) {
   const tokens = shortcut.toLowerCase().split("+").map((token) => token.trim());
   const bound = tokens.find(
-    (token) => PLATFORM_BOUND_CHORD_TOKENS.includes(token)
+    (token) => PLATFORM_BOUND_CHORD_TOKENS.has(token)
   );
   if (bound) {
     throw new Error(
@@ -1384,7 +1419,7 @@ import { provideProductIdentity } from '@loomweaver/plugin-sdk';
    'status-bar' (bar) are what the scaffolded weaver targets. */
 export const layout: ShellLayout = {
   regions: [
-${renderRegions("    ")}
+${renderRegions(" ".repeat(4))}
   ],
 };
 
@@ -1569,7 +1604,7 @@ var angularDistribution = {
     return {
       "src/main.ts": mainTs(),
       "src/app/app.config.ts": appConfigTs(d),
-      ...d.withTests ? { "src/app/app.config.spec.ts": appConfigSpec() } : {},
+      ...d.withTests && { "src/app/app.config.spec.ts": appConfigSpec() },
       "src/app/app.ts": appTs(),
       "src/app/app.html": appHtml(),
       "src/index.html": indexHtml(d),
@@ -1841,7 +1876,7 @@ import { ShellLayout } from '@loomweaver/shell';
 
 export const ${l.propertyName}Layout: ShellLayout = {
   regions: [
-${renderRegions("    ")}
+${renderRegions(" ".repeat(4))}
   ],
 };
 `;
@@ -1857,7 +1892,7 @@ var layout = {
 // ../devkit/src/recipes/angular-weaver/amendments.ts
 function weaverAmendments(input, where) {
   const w = resolveWeaverInput(input);
-  const directory = (where ?? "").replace(/^\.?\/*/, "").replace(/\/+$/, "");
+  const directory = normalizeProjectRoot(where ?? "");
   if (!directory) {
     return [];
   }
@@ -1925,7 +1960,7 @@ function bool(values, name) {
   return typeof value === "boolean" ? value : void 0;
 }
 function kebabCase(name) {
-  return name.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
+  return name.replaceAll(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
 }
 var ID_PATTERN = "^[a-z][a-z0-9]*(-[a-z0-9]+)*$";
 var PLACEMENT_OPTIONS = [
@@ -2338,6 +2373,14 @@ function validateEntry(raw, index, known) {
       }
     ];
   }
+  return [
+    ...validateEntryIdentity(raw, index),
+    ...validateCapabilities2(raw["capabilities"], index, known),
+    ...validateEntryMetadata(raw, index),
+    ...validateEntryKeys(raw, index)
+  ];
+}
+function validateEntryIdentity(raw, index) {
   const findings = [];
   if (typeof raw["id"] !== "string" || raw["id"].length === 0) {
     findings.push({
@@ -2379,7 +2422,10 @@ function validateEntry(raw, index, known) {
       path: at(index, "version")
     });
   }
-  findings.push(...validateCapabilities2(raw["capabilities"], index, known));
+  return findings;
+}
+function validateEntryMetadata(raw, index) {
+  const findings = [];
   if (raw["downloads"] !== void 0 && (typeof raw["downloads"] !== "number" || raw["downloads"] < 0)) {
     findings.push({
       level: "warning",
@@ -2404,6 +2450,10 @@ function validateEntry(raw, index, known) {
       path: at(index, "repository")
     });
   }
+  return findings;
+}
+function validateEntryKeys(raw, index) {
+  const findings = [];
   for (const key of Object.keys(raw)) {
     if (!CATALOG_ENTRY_KEYS.includes(key)) {
       findings.push({
@@ -2443,7 +2493,7 @@ function validateCatalog(catalog, known = KNOWN_CAPABILITIES) {
   }
   const findings = [];
   const seen = /* @__PURE__ */ new Set();
-  catalog.forEach((entry, index) => {
+  for (const [index, entry] of catalog.entries()) {
     findings.push(...validateEntry(entry, index, known));
     const id = isPlainObject(entry) ? entry["id"] : void 0;
     if (typeof id === "string" && id.length > 0) {
@@ -2457,7 +2507,7 @@ function validateCatalog(catalog, known = KNOWN_CAPABILITIES) {
       }
       seen.add(id);
     }
-  });
+  }
   return findings;
 }
 
@@ -2489,8 +2539,8 @@ function assign(flags, token, next) {
 function parseArgs(argv) {
   const flags = {};
   let command = "";
-  for (let i = 0; i < argv.length; i++) {
-    const token = argv[i];
+  for (let index = 0; index < argv.length; index++) {
+    const token = argv[index];
     if (token === "-h" || token === "--help") {
       flags["help"] = true;
       continue;
@@ -2500,8 +2550,8 @@ function parseArgs(argv) {
       continue;
     }
     if (token.startsWith("--")) {
-      if (assign(flags, token, argv[i + 1])) {
-        i++;
+      if (assign(flags, token, argv[index + 1])) {
+        index++;
       }
       continue;
     }
@@ -2581,7 +2631,7 @@ function resolveBuildProject(workspace, target) {
       `No project with a build target found in ${workspace.configFile ?? workspace.root}.`
     );
   }
-  const inside = projects.filter((project) => contains(project.root, relativeTo(workspace.root, target))).sort((a, b) => b.root.length - a.root.length);
+  const inside = projects.filter((project) => contains(project.root, relativeTo(workspace.root, target))).toSorted((a, b) => b.root.length - a.root.length);
   if (inside.length > 0) {
     return inside[0];
   }
@@ -2633,8 +2683,15 @@ function contains(projectRoot, target) {
 function relativeTo(root, target) {
   return relative(root, resolve(target)).split(sep).join("/");
 }
+function withoutTrailingSlashes(path) {
+  let end = path.length;
+  while (end > 0 && path[end - 1] === "/") {
+    end -= 1;
+  }
+  return path.slice(0, end);
+}
 function normalise(value) {
-  return typeof value === "string" ? value.replace(/^\.?\/*/, "").replace(/\/+$/, "") : "";
+  return typeof value === "string" ? withoutTrailingSlashes(value.replace(/^\.?\/*/, "")) : "";
 }
 function asObject2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
@@ -2656,7 +2713,7 @@ function planAmend(amendments2, target) {
     return {
       amendments: [],
       remaining: [
-        `No workspace was found above the target directory, so nothing could be wired here. Add it by hand, or generate inside the workspace: ${amendments2.map(describeAmendment).join(" \xB7 ")}`
+        `No workspace was found above the target directory, so nothing could be wired here. Add it by hand, or generate inside the workspace: ${amendments2.map((amendment) => describeAmendment(amendment)).join(" \xB7 ")}`
       ]
     };
   }
@@ -2671,10 +2728,14 @@ var Amender = class {
   constructor(workspace, target) {
     this.workspace = workspace;
     this.target = target;
-    this.planned = [];
-    this.remaining = [];
-    this.configAdded = [];
   }
+  workspace;
+  target;
+  planned = [];
+  remaining = [];
+  configAdded = [];
+  config;
+  project;
   plan(amendments2) {
     for (const amendment of amendments2) {
       this.planOne(amendment);
@@ -2972,7 +3033,7 @@ function planWrite(files, root) {
   const absoluteRoot = resolve4(root);
   const planned = [];
   const conflicts = [];
-  for (const path of Object.keys(files).sort()) {
+  for (const path of Object.keys(files).toSorted((a, b) => a.localeCompare(b))) {
     const absolute = resolve4(absoluteRoot, path);
     const inside = relative4(absoluteRoot, absolute);
     if (inside.startsWith("..") || isAbsolute(inside)) {
@@ -3016,7 +3077,7 @@ function replaceSymlinkEntry(absolute) {
 }
 
 // src/lib/run.ts
-var VERSION = "0.7.5";
+var VERSION = "0.7.6";
 function help() {
   const commands = SCAFFOLDS.map((s) => `  ${s.name.padEnd(16)}${s.summary}`);
   return [
@@ -3061,7 +3122,7 @@ function reportFindings(io, findings, strict) {
     io.out("No findings.");
     return 0;
   }
-  findings.forEach((f) => io.err(`${f.level}: ${f.message}`));
+  for (const f of findings) io.err(`${f.level}: ${f.message}`);
   if (findings.some((f) => f.level === "error")) {
     return 1;
   }
@@ -3134,12 +3195,16 @@ function reportAmendments(io, amend, done) {
     );
     for (const amendment of amend.amendments) {
       io.out(`  ${amendment.display}`);
-      amendment.added.forEach((entry) => io.out(`    + ${entry}`));
+      for (const entry of amendment.added) {
+        io.out(`    + ${entry}`);
+      }
     }
   }
   if (amend.remaining.length > 0) {
     io.out("Still to do by hand:");
-    amend.remaining.forEach((entry) => io.out(`  - ${entry}`));
+    for (const entry of amend.remaining) {
+      io.out(`  - ${entry}`);
+    }
   }
 }
 function scaffold(args, io) {
@@ -3157,12 +3222,16 @@ function scaffold(args, io) {
   const amend = planAmend(amendmentsFor(descriptor, args), out);
   if (boolFlag(args, "dry-run")) {
     io.out(`Would write ${paths.length} file(s) into ${plan.root}:`);
-    paths.forEach((path) => io.out(`  ${path}`));
+    for (const path of paths) {
+      io.out(`  ${path}`);
+    }
     if (plan.conflicts.length > 0) {
       io.out(
         `${plan.conflicts.length} of them already exist and would need --force:`
       );
-      plan.conflicts.forEach((path) => io.out(`  ${path}`));
+      for (const path of plan.conflicts) {
+        io.out(`  ${path}`);
+      }
     }
     reportAmendments(io, amend, false);
     return 0;
@@ -3171,13 +3240,17 @@ function scaffold(args, io) {
     io.err(
       `${plan.conflicts.length} file(s) already exist; pass --force to overwrite:`
     );
-    plan.conflicts.forEach((path) => io.err(`  ${path}`));
+    for (const path of plan.conflicts) {
+      io.err(`  ${path}`);
+    }
     return 1;
   }
   applyWrite(files, plan);
   applyAmend(amend);
   io.out(`Wrote ${paths.length} file(s) into ${plan.root}:`);
-  paths.forEach((path) => io.out(`  ${path}`));
+  for (const path of paths) {
+    io.out(`  ${path}`);
+  }
   reportAmendments(io, amend, true);
   return 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomweaver/cli",
-  "version": "0.7.5",
+  "version": "0.7.6",
   "description": "LoomWeaver scaffolding CLI: generates weavers, distributions and integrations into any project — no Nx workspace, no LoomWeaver checkout and no AI assistant required.",
   "keywords": [
     "loomweaver",