@reddoorla/maintenance 0.6.6 → 0.6.7

package/dist/cli/bin.js

@@ -41,6 +41,11 @@ var defaultSpawn = (cmd, args, opts = {}) => new Promise((resolve9, reject) => {
 import { readFile } from "fs/promises";
 import { join } from "path";
 
+// src/util/site.ts
+function siteLabel(site) {
+  return site.name ?? site.path;
+}
+
 // src/configs/baseline-versions.ts
 var baselineVersions = {
   // SvelteKit core
@@ -81,9 +86,6 @@ var baselineVersions = {
 };
 
 // src/audits/deps.ts
-function siteLabel(site) {
-  return site.name ?? site.path;
-}
 function stripCaret(range) {
   return range.replace(/^[\^~]/, "");
 }
@@ -156,9 +158,6 @@ import { check as prettierCheck, resolveConfig as prettierResolveConfig } from "
 import { glob } from "tinyglobby";
 var TARGET_GLOBS = ["**/*.{ts,js,svelte}"];
 var IGNORE = ["node_modules/**", "dist/**", ".svelte-kit/**", "build/**", ".netlify/**"];
-function siteLabel2(site) {
-  return site.name ?? site.path;
-}
 async function listFiles(cwd) {
   return glob(TARGET_GLOBS, { cwd, ignore: IGNORE, absolute: false });
 }
@@ -168,7 +167,7 @@ async function lintAudit(ctx) {
   if (!existsSync(configPath)) {
     return {
       audit: "lint",
-      site: siteLabel2(site),
+      site: siteLabel(site),
       status: "skip",
       summary: "no eslint config at site root"
     };
@@ -194,7 +193,7 @@ async function lintAudit(ctx) {
   const summary = status === "pass" ? `lint clean across ${relFiles.length} files` : `${eslintErrors} eslint errors, ${eslintWarnings} warnings, ${prettierUnformatted.length} unformatted`;
   return {
     audit: "lint",
-    site: siteLabel2(site),
+    site: siteLabel(site),
     status,
     summary,
     details: {
@@ -207,9 +206,6 @@ async function lintAudit(ctx) {
 }
 
 // src/audits/security.ts
-function siteLabel3(site) {
-  return site.name ?? site.path;
-}
 function classify(v) {
   if (v.critical > 0 || v.high > 0) return "fail";
   if (v.moderate > 0 || v.low > 0) return "warn";
@@ -295,7 +291,8 @@ async function runAuditTool(spawn2, cmd, args, cwd) {
   if (errEnvelope && typeof errEnvelope === "object") {
     return { kind: "error", reason: errEnvelope.code ?? "error envelope returned" };
   }
-  if (!parsed.metadata?.vulnerabilities) {
+  const vulnsMeta = parsed.metadata?.vulnerabilities;
+  if (!vulnsMeta || Object.keys(vulnsMeta).length === 0) {
     return { kind: "error", reason: "no metadata.vulnerabilities in output" };
   }
   return { kind: "ok", parsed };
@@ -303,7 +300,7 @@ async function runAuditTool(spawn2, cmd, args, cwd) {
 async function securityAudit(ctx) {
   const spawn2 = ctx.spawn ?? defaultSpawn;
   const site = ctx.site;
-  const label = siteLabel3(site);
+  const label = siteLabel(site);
   let used = "pnpm audit";
   let result = await runAuditTool(spawn2, "pnpm", ["audit", "--json", "--prod"], site.path);
   if (result.kind !== "ok") {
@@ -384,9 +381,6 @@ var lighthouseConfig = {
 };
 
 // src/audits/lighthouse.ts
-function siteLabel4(site) {
-  return site.name ?? site.path;
-}
 async function readJsonMaybe(path) {
   try {
     const raw = await readFile3(path, "utf-8");
@@ -424,7 +418,7 @@ function messageForAssertion(a) {
 async function lighthouseAudit(ctx) {
   const spawn2 = ctx.spawn ?? defaultSpawn;
   const site = ctx.site;
-  const label = siteLabel4(site);
+  const label = siteLabel(site);
   const configDir = await mkdtemp(join3(tmpdir(), "reddoor-lhci-"));
   const configPath = join3(configDir, "lighthouserc.json");
   await writeFile(configPath, JSON.stringify(lighthouseConfig), "utf-8");
@@ -522,9 +516,6 @@ var playwrightA11yConfig = defineConfig({
 
 // src/audits/a11y.ts
 var RESULTS_REL = ".reddoor-a11y/results.json";
-function siteLabel5(site) {
-  return site.name ?? site.path;
-}
 async function readJsonMaybe2(path) {
   try {
     const raw = await readFile4(path, "utf-8");
@@ -582,7 +573,7 @@ test("a11y across configured routes", async ({ page }) => {
 async function a11yAudit(ctx) {
   const spawn2 = ctx.spawn ?? defaultSpawn;
   const site = ctx.site;
-  const label = siteLabel5(site);
+  const label = siteLabel(site);
   const specDir = await mkdtemp2(join4(tmpdir2(), "reddoor-a11y-spec-"));
   const specPath = join4(specDir, "a11y.spec.ts");
   await writeFile2(specPath, buildSpec(), "utf-8");
@@ -1007,9 +998,8 @@ async function git(cwd, args) {
   return exec("git", args, { cwd, env: process.env });
 }
 function branchName(recipe, when = /* @__PURE__ */ new Date()) {
-  const iso = when.toISOString().replace(/[-:.]/g, "").replace(/Z$/, "Z");
-  const trimmed = iso.replace(/(\d{8}T\d{6})\d+(Z)$/, "$1$2");
-  return `maint/${recipe}-${trimmed}`;
+  const compact = when.toISOString().replace(/[-:.]/g, "");
+  return `maint/${recipe}-${compact}`;
 }
 async function isWorkingTreeClean(cwd) {
   const { stdout } = await git(cwd, ["status", "--porcelain"]);
@@ -1051,9 +1041,6 @@ var ALL_CONFIG_NAMES = [
 function isConfigName(value) {
   return ALL_CONFIG_NAMES.includes(value);
 }
-function siteLabel6(site) {
-  return site.name ?? site.path;
-}
 async function readMaybe(path) {
   try {
     return await readFile6(path, "utf-8");
@@ -1084,7 +1071,7 @@ async function applyGitignore(cwd, plan) {
   }
 }
 async function syncConfigs(site, opts = {}) {
-  const label = siteLabel6(site);
+  const label = siteLabel(site);
   const requested = opts.which ?? ALL_TEMPLATES.map((t) => t.config).concat(GITIGNORE_CONFIG);
   const templateNames = requested.filter((c) => c !== GITIGNORE_CONFIG);
   const templates = templatesByName(templateNames);
@@ -1209,9 +1196,6 @@ import { resolve as resolve4 } from "path";
 // src/recipes/bump-deps.ts
 import { stat as stat2 } from "fs/promises";
 import { join as join8 } from "path";
-function siteLabel7(site) {
-  return site.name ?? site.path;
-}
 async function exists(path) {
   try {
     await stat2(path);
@@ -1230,7 +1214,7 @@ function upFlagsForGroup(group) {
   return [];
 }
 async function bumpDeps(site, opts = {}) {
-  const label = siteLabel7(site);
+  const label = siteLabel(site);
   const group = opts.group ?? "minor";
   const spawn2 = opts.spawn ?? defaultSpawn;
   const hasPnpmLock = await exists(join8(site.path, "pnpm-lock.yaml"));
@@ -1507,6 +1491,34 @@ import { glob as glob2 } from "tinyglobby";
 // src/recipes/svelte-5/codemods/on-event-to-handler.ts
 var SCRIPT_BLOCK = /<script\b[^>]*>[\s\S]*?<\/script>/g;
 var SIMPLE_ON_EVENT = /\bon:([a-z]+)(?=\s*=)/g;
+var MODIFIER_EVENT = /\bon:[a-z]+\|[a-zA-Z]+(?=\s*=)/g;
+function flagEventModifiers(source) {
+  const insertions = [];
+  let m;
+  MODIFIER_EVENT.lastIndex = 0;
+  while ((m = MODIFIER_EVENT.exec(source)) !== null) {
+    const tagStart = source.lastIndexOf("<", m.index);
+    if (tagStart === -1) continue;
+    const prevLineEnd = tagStart - 1;
+    if (prevLineEnd >= 0) {
+      const prevLineStart = source.lastIndexOf("\n", prevLineEnd - 1) + 1;
+      const prevLine = source.slice(prevLineStart, prevLineEnd + 1);
+      if (/<!--\s*@migration-task/.test(prevLine)) continue;
+    }
+    const lineStart = source.lastIndexOf("\n", tagStart - 1) + 1;
+    const indent = source.slice(lineStart, tagStart);
+    const safeIndent = /^[ \t]*$/.test(indent) ? indent : "";
+    insertions.push({ tagStart, indent: safeIndent, modifier: m[0] });
+  }
+  let out = source;
+  for (let i = insertions.length - 1; i >= 0; i--) {
+    const { tagStart, indent, modifier } = insertions[i];
+    const comment = `<!-- @migration-task: Svelte 5 removed event modifier syntax (\`${modifier}\`). Rewrite inline, e.g. onclick={(e) => { e.preventDefault(); ... }}. -->
+${indent}`;
+    out = out.slice(0, tagStart) + comment + out.slice(tagStart);
+  }
+  return out;
+}
 function onEventToHandler(source) {
   const masked = [];
   const placeholder = (i) => ` SCRIPT_${i} `;
@@ -1514,8 +1526,9 @@ function onEventToHandler(source) {
     masked.push(match);
     return placeholder(masked.length - 1);
   });
-  const rewritten = intermediate.replace(SIMPLE_ON_EVENT, (_full, name) => `on${name}`);
-  let out = rewritten;
+  let processed = intermediate.replace(SIMPLE_ON_EVENT, (_full, name) => `on${name}`);
+  processed = flagEventModifiers(processed);
+  let out = processed;
   masked.forEach((blk, i) => {
     out = out.replace(placeholder(i), blk);
   });
@@ -1565,6 +1578,22 @@ function exportLetToProps(source) {
   return source.replace(SCRIPT_BLOCK2, (full) => full.replace(inner, body));
 }
 
+// src/util/svelte-source.ts
+function findStringEnd(source, openIdx) {
+  const quote = source[openIdx];
+  let i = openIdx + 1;
+  while (i < source.length) {
+    const ch = source[i];
+    if (ch === "\\") {
+      i += 2;
+      continue;
+    }
+    if (ch === quote) return i;
+    i++;
+  }
+  return -1;
+}
+
 // src/recipes/svelte-5/codemods/dollar-restprops.ts
 function removeInterfaceBlock(source) {
   const re = /^\s*interface\s+\$\$Props\s*\{/m;
@@ -1588,20 +1617,6 @@ function removeInterfaceBlock(source) {
     out = out.slice(0, match.index) + out.slice(endIdx);
   }
 }
-function findStringEnd(source, openIdx) {
-  const quote = source[openIdx];
-  let i = openIdx + 1;
-  while (i < source.length) {
-    const ch = source[i];
-    if (ch === "\\") {
-      i += 2;
-      continue;
-    }
-    if (ch === quote) return i;
-    i++;
-  }
-  return -1;
-}
 function maskStringLiterals(source) {
   const strings = [];
   let out = "";
@@ -1678,7 +1693,8 @@ function stateEffectSyncToDerived(source) {
 
 // src/recipes/svelte-5/codemods/dollar-props-class.ts
 var PROPS_DESTRUCTURE = /let\s*\{([\s\S]*?)\}(\s*:\s*\{([\s\S]*?)\})?\s*=\s*\$props\(\)/;
-var DOLLAR_PROPS_CLASS = /\$\$props\.class\b/g;
+var HAS_DOLLAR_PROPS_CLASS = /\$\$props\.class\b/;
+var DOLLAR_PROPS_CLASS_GLOBAL = /\$\$props\.class\b/g;
 var DOLLAR_PROPS_ANY = /\$\$props\b/;
 var SCRIPT_BLOCK4 = /<script\b[^>]*>[\s\S]*?<\/script>/g;
 var MIGRATION_TASK = /^<!--\s*@migration-task[\s\S]*?-->\s*\n?/gm;
@@ -1700,8 +1716,7 @@ function restoreScripts(masked, blocks) {
 }
 function dollarPropsClass(source) {
   const { masked } = maskScripts(source);
-  if (!DOLLAR_PROPS_CLASS.test(masked)) return source;
-  DOLLAR_PROPS_CLASS.lastIndex = 0;
+  if (!HAS_DOLLAR_PROPS_CLASS.test(masked)) return source;
   if (!PROPS_DESTRUCTURE.test(source)) return source;
   let updated = source.replace(PROPS_DESTRUCTURE, (full, body, typeAnno, typeBody) => {
     if (/\bclass\s*:/.test(body)) return full;
@@ -1715,7 +1730,7 @@ function dollarPropsClass(source) {
     return `let { ${newBody} } = $props()`;
   });
   const reMasked = maskScripts(updated);
-  const templateRewritten = reMasked.masked.replace(DOLLAR_PROPS_CLASS, IDENT);
+  const templateRewritten = reMasked.masked.replace(DOLLAR_PROPS_CLASS_GLOBAL, IDENT);
   updated = restoreScripts(templateRewritten, reMasked.blocks);
   const stripped = updated.replace(MIGRATION_TASK, "");
   if (!DOLLAR_PROPS_ANY.test(stripped)) {
@@ -1734,7 +1749,7 @@ function findMatchingClose(source, openIdx) {
   while (i < source.length) {
     const ch = source[i];
     if (ch === '"' || ch === "'" || ch === "`") {
-      const closeStr = findStringClose(source, i);
+      const closeStr = findStringEnd(source, i);
       if (closeStr === -1) return -1;
       i = closeStr + 1;
       continue;
@@ -1748,20 +1763,6 @@ function findMatchingClose(source, openIdx) {
   }
   return -1;
 }
-function findStringClose(source, openIdx) {
-  const quote = source[openIdx];
-  let i = openIdx + 1;
-  while (i < source.length) {
-    const ch = source[i];
-    if (ch === "\\") {
-      i += 2;
-      continue;
-    }
-    if (ch === quote) return i;
-    i++;
-  }
-  return -1;
-}
 var MIGRATION_MARKER = "// @migration-task: $effect won't trigger UI updates on plain `let` bindings \u2014 refine mutated locals to $state or split into per-variable $derived.";
 function transformBlocks(body) {
   const out = [];
@@ -1873,9 +1874,6 @@ async function writeMigrationSummary(input) {
 }
 
 // src/recipes/svelte-5/index.ts
-function siteLabel8(site) {
-  return site.name ?? site.path;
-}
 async function alreadyOnSvelte5(cwd) {
   try {
     const pkg = await readPackageJson(join14(cwd, "package.json"));
@@ -1886,7 +1884,7 @@ async function alreadyOnSvelte5(cwd) {
   }
 }
 async function upgradeSvelte4to5(site, opts = {}) {
-  const label = siteLabel8(site);
+  const label = siteLabel(site);
   const spawn2 = opts.spawn ?? defaultSpawn;
   if (await alreadyOnSvelte5(site.path)) {
     return {
@@ -2026,11 +2024,8 @@ async function exists2(path) {
     return false;
   }
 }
-function siteLabel9(site) {
-  return site.name ?? site.path;
-}
 async function convertToPnpm(site, opts = {}) {
-  const label = siteLabel9(site);
+  const label = siteLabel(site);
   const spawn2 = opts.spawn ?? defaultSpawn;
   const pnpmVersion = opts.pnpmVersion ?? DEFAULT_PNPM_VERSION;
   const pnpmLockPath = join15(site.path, "pnpm-lock.yaml");
@@ -2184,14 +2179,11 @@ async function exists3(path) {
     return false;
   }
 }
-function siteLabel10(site) {
-  return site.name ?? site.path;
-}
 function isDeclared(pkg, name) {
   return Boolean(pkg.dependencies?.[name] ?? pkg.devDependencies?.[name]);
 }
 async function onboard(site, opts = {}) {
-  const label = siteLabel10(site);
+  const label = siteLabel(site);
   const spawn2 = opts.spawn ?? defaultSpawn;
   const audits = opts.audits ?? ["lighthouse", "a11y"];
   const packageVersion = opts.packageVersion ?? selfCaretRange(import.meta.url);
@@ -2309,11 +2301,8 @@ import { resolve as resolve8 } from "path";
 // src/recipes/svelte-codemods.ts
 import { writeFile as writeFile8 } from "fs/promises";
 import { join as join18 } from "path";
-function siteLabel11(site) {
-  return site.name ?? site.path;
-}
 async function svelteCodemods(site) {
-  const label = siteLabel11(site);
+  const label = siteLabel(site);
   const changes = await planGotchaCodemods(site.path);
   if (changes.length === 0) {
     return {
@@ -2401,6 +2390,17 @@ var RECIPE_DESCRIPTIONS = {
   "convert-to-pnpm": "Convert an npm/yarn site to pnpm (lockfile, packageManager, scripts).",
   onboard: "Install @reddoorla/maintenance + audit deps on a site (preferred first step)."
 };
+async function runOrExit(fn, opts) {
+  try {
+    const { output, code } = await fn();
+    console.log(output);
+    process.exit(code);
+  } catch (err) {
+    const e = err;
+    console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
+    process.exit(e.exitCode ?? 1);
+  }
+}
 var cli = cac("reddoor-maint");
 cli.option("--cwd <path>", "Override working directory (default: process.cwd())");
 cli.option("--verbose", "Verbose output (full stack on errors)");
@@ -2415,101 +2415,31 @@ cli.command("list-recipes", "Print the available recipes.").action(() => {
   }
 });
 cli.command("audit [site]", "Run audits against a site (default: cwd).").option("--only <names>", "Comma-separated audit names (e.g. deps,lighthouse)").option("--json", "Machine-readable JSON output").option("--fleet <inventory>", "Inventory file (.json or .mjs/.js); aggregates across sites").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (site, opts) => {
-    try {
-      const { output, code } = await runAuditCommand(site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (site, opts) => runOrExit(() => runAuditCommand(site, opts), opts)
 );
 cli.command("sync-configs [site]", "Sync canonical configs into a site.").option("--only <names>", "Comma-separated config names (e.g. eslint,prettier)").option("--dry", "Print diff without writing").option("--fleet <inventory>", "Inventory file (.json or .mjs/.js)").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (site, opts) => {
-    try {
-      const { output, code } = await runSyncConfigsCommand(site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (site, opts) => runOrExit(() => runSyncConfigsCommand(site, opts), opts)
 );
 cli.command("bump-deps [site]", "Bump dependencies.").option("--group <group>", "patch | minor | major", { default: "minor" }).option("--fleet <inventory>", "Inventory file (.json or .mjs/.js)").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (site, opts) => {
-    try {
-      const { output, code } = await runBumpDepsCommand(site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (site, opts) => runOrExit(() => runBumpDepsCommand(site, opts), opts)
 );
 cli.command("upgrade <upgrade> [site]", "Run a named upgrade recipe (svelte-4-to-5).").example("reddoor-maint upgrade svelte-4-to-5 ./my-site").option("--fleet <inventory>", "Inventory file (.json or .mjs/.js)").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (upgrade, site, opts) => {
-    try {
-      const { output, code } = await runUpgradeCommand(upgrade, site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (upgrade, site, opts) => runOrExit(() => runUpgradeCommand(upgrade, site, opts), opts)
 );
 cli.command(
   "convert-to-pnpm [site]",
   "Convert an npm/yarn site to pnpm (lockfile, packageManager, scripts)."
 ).option("--fleet <inventory>", "Inventory file (.json or .mjs/.js)").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (site, opts) => {
-    try {
-      const { output, code } = await runConvertToPnpmCommand(site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (site, opts) => runOrExit(() => runConvertToPnpmCommand(site, opts), opts)
 );
 cli.command("svelte-codemods [site]", "Apply Svelte 5 gotcha codemods to an already-migrated site.").option("--fleet <inventory>", "Inventory file (.json or .mjs/.js)").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (site, opts) => {
-    try {
-      const { output, code } = await runSvelteCodemodsCommand(site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (site, opts) => runOrExit(() => runSvelteCodemodsCommand(site, opts), opts)
 );
 cli.command(
   "onboard [site]",
   "Install @reddoorla/maintenance + audit deps on a site (run after convert-to-pnpm)."
 ).option("--audits <names>", "Comma-separated audit subset: lighthouse,a11y (default: both)").option("--fleet <inventory>", "Inventory file (.json or .mjs/.js)").option("--workdir <path>", "Clone target for fleet mode (default ~/.reddoor-maint/sites)").action(
-  async (site, opts) => {
-    try {
-      const { output, code } = await runOnboardCommand(site, opts);
-      console.log(output);
-      process.exit(code);
-    } catch (err) {
-      const e = err;
-      console.error(opts.verbose ? e.stack ?? e.message : e.message ?? String(err));
-      process.exit(e.exitCode ?? 1);
-    }
-  }
+  async (site, opts) => runOrExit(() => runOnboardCommand(site, opts), opts)
 );
 cli.help();
 cli.version(version);