@reddoorla/maintenance 0.5.0 → 0.6.1

package/dist/cli/bin.js

@@ -10,7 +10,7 @@ import { resolve as resolve2 } from "path";
 
 // src/audits/util/spawn.ts
 import { spawn } from "child_process";
-var defaultSpawn = (cmd, args, opts = {}) => new Promise((resolve8, reject) => {
+var defaultSpawn = (cmd, args, opts = {}) => new Promise((resolve9, reject) => {
   const streaming = opts.streaming === true;
   const child = spawn(cmd, [...args], {
     cwd: opts.cwd,
@@ -33,7 +33,7 @@ var defaultSpawn = (cmd, args, opts = {}) => new Promise((resolve8, reject) => {
   });
   child.on("close", (code) => {
     if (timer) clearTimeout(timer);
-    resolve8({ code: code ?? -1, stdout, stderr });
+    resolve9({ code: code ?? -1, stdout, stderr });
   });
 });
 
@@ -1443,9 +1443,9 @@ function onEventToHandler(source) {
 }
 
 // src/recipes/svelte-5/codemods/dollar-props.ts
-var SCRIPT_TS = /<script\b[^>]*lang=["']ts["'][^>]*>([\s\S]*?)<\/script>/;
+var SCRIPT_BLOCK2 = /<script\b([^>]*)>([\s\S]*?)<\/script>/;
 var EXPORT_LET = /^\s*export\s+let\s+(\w+)\s*(?::\s*([^=;\n]+))?\s*(?:=\s*([^;\n]+))?;?\s*$/gm;
-function transformScript(scriptBody) {
+function transformScript(scriptBody, isTs) {
   const props = [];
   const cleaned = scriptBody.replace(
     EXPORT_LET,
@@ -1459,23 +1459,30 @@ function transformScript(scriptBody) {
     }
   );
   if (props.length === 0) return { body: scriptBody, changed: false };
-  const typeSig = props.map((p) => {
-    const optional = p.defaultExpr ? "?" : "";
-    return `${p.name}${optional}: ${p.type ?? "unknown"}`;
-  }).join("; ");
   const destructured = props.map((p) => p.defaultExpr ? `${p.name} = ${p.defaultExpr}` : p.name).join(", ");
-  const decl = `  let { ${destructured} }: { ${typeSig} } = $props();`;
+  let decl;
+  if (isTs) {
+    const typeSig = props.map((p) => {
+      const optional = p.defaultExpr ? "?" : "";
+      return `${p.name}${optional}: ${p.type ?? "unknown"}`;
+    }).join("; ");
+    decl = `  let { ${destructured} }: { ${typeSig} } = $props();`;
+  } else {
+    decl = `  let { ${destructured} } = $props();`;
+  }
   const next = cleaned.replace(/^(\s*)/, (m) => `${m}${decl}
 `);
   return { body: next, changed: true };
 }
 function exportLetToProps(source) {
-  const match = source.match(SCRIPT_TS);
+  const match = source.match(SCRIPT_BLOCK2);
   if (!match) return source;
-  const inner = match[1] ?? "";
-  const { body, changed } = transformScript(inner);
+  const attrs = match[1] ?? "";
+  const inner = match[2] ?? "";
+  const isTs = /\blang=["']ts["']/.test(attrs);
+  const { body, changed } = transformScript(inner, isTs);
   if (!changed) return source;
-  return source.replace(SCRIPT_TS, (full) => full.replace(inner, body));
+  return source.replace(SCRIPT_BLOCK2, (full) => full.replace(inner, body));
 }
 
 // src/recipes/svelte-5/codemods/dollar-restprops.ts
@@ -1508,23 +1515,90 @@ function removeDollarRestProps(source) {
   return next;
 }
 
+// src/recipes/svelte-5/codemods/state-effect-sync.ts
+var PATTERN = /let\s+(\w+)\s*=\s*\$state\(\s*([^)]+?)\s*\)\s*;[ \t\r\n]*\$effect\(\s*\(\s*\)\s*=>\s*\{\s*\w+\s*;\s*\1\s*=\s*([^;}]+?)\s*\}\s*\)\s*;?/g;
+function stateEffectSyncToDerived(source) {
+  return source.replace(PATTERN, (full, name, initExpr, effectExpr) => {
+    if (initExpr.trim() !== effectExpr.trim()) return full;
+    return `let ${name} = $derived(${initExpr.trim()});`;
+  });
+}
+
+// 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 DOLLAR_PROPS_ANY = /\$\$props\b/;
+var SCRIPT_BLOCK3 = /<script\b[^>]*>[\s\S]*?<\/script>/g;
+var MIGRATION_TASK = /^<!--\s*@migration-task[\s\S]*?-->\s*\n?/gm;
+var IDENT = "className";
+function maskScripts(source) {
+  const blocks = [];
+  const masked = source.replace(SCRIPT_BLOCK3, (m) => {
+    blocks.push(m);
+    return `__SCRIPT_${blocks.length - 1}__`;
+  });
+  return { masked, blocks };
+}
+function restoreScripts(masked, blocks) {
+  let out = masked;
+  blocks.forEach((blk, i) => {
+    out = out.replace(`__SCRIPT_${i}__`, blk);
+  });
+  return out;
+}
+function dollarPropsClass(source) {
+  const { masked } = maskScripts(source);
+  if (!DOLLAR_PROPS_CLASS.test(masked)) return source;
+  DOLLAR_PROPS_CLASS.lastIndex = 0;
+  if (!PROPS_DESTRUCTURE.test(source)) return source;
+  let updated = source.replace(PROPS_DESTRUCTURE, (full, body, typeAnno, typeBody) => {
+    if (/\bclass\s*:/.test(body)) return full;
+    const cleanBody = body.trim().replace(/,\s*$/, "").trim();
+    const newBody = cleanBody ? `${cleanBody}, class: ${IDENT} = ""` : `class: ${IDENT} = ""`;
+    if (typeAnno) {
+      const cleanType = (typeBody ?? "").trim().replace(/;\s*$/, "").trim();
+      const newType = cleanType ? `${cleanType}; class?: string` : `class?: string`;
+      return `let { ${newBody} }: { ${newType} } = $props()`;
+    }
+    return `let { ${newBody} } = $props()`;
+  });
+  const reMasked = maskScripts(updated);
+  const templateRewritten = reMasked.masked.replace(DOLLAR_PROPS_CLASS, IDENT);
+  updated = restoreScripts(templateRewritten, reMasked.blocks);
+  const stripped = updated.replace(MIGRATION_TASK, "");
+  if (!DOLLAR_PROPS_ANY.test(stripped)) {
+    updated = stripped;
+  }
+  return updated;
+}
+
 // src/recipes/svelte-5/step-gotchas.ts
 var SVELTE_GLOBS = ["src/**/*.svelte"];
 var IGNORE2 = ["node_modules/**", ".svelte-kit/**", "build/**"];
-var CODEMODS = [onEventToHandler, exportLetToProps, removeDollarRestProps];
-async function applyGotchaCodemods(cwd) {
-  let filesChanged = 0;
+var CODEMODS = [
+  onEventToHandler,
+  exportLetToProps,
+  removeDollarRestProps,
+  stateEffectSyncToDerived,
+  dollarPropsClass
+];
+async function planGotchaCodemods(cwd) {
+  const changes = [];
   const relPaths = await glob2(SVELTE_GLOBS, { cwd, ignore: IGNORE2, absolute: false });
   for (const rel of relPaths) {
     const path = join11(cwd, rel);
     const before = await readFile10(path, "utf-8");
     const after = CODEMODS.reduce((s, fn) => fn(s), before);
-    if (after !== before) {
-      await writeFile6(path, after, "utf-8");
-      filesChanged += 1;
-    }
+    if (after !== before) changes.push({ rel, after });
+  }
+  return changes;
+}
+async function applyGotchaCodemods(cwd) {
+  const changes = await planGotchaCodemods(cwd);
+  for (const c of changes) {
+    await writeFile6(join11(cwd, c.rel), c.after, "utf-8");
   }
-  return { filesChanged };
+  return { filesChanged: changes.length };
 }
 
 // src/recipes/svelte-5/step-verify.ts
@@ -1968,12 +2042,79 @@ async function runOnboardCommand(site, opts) {
   return { output, code };
 }
 
+// src/cli/commands/svelte-codemods.ts
+import { resolve as resolve8 } from "path";
+
+// src/recipes/svelte-codemods.ts
+import { writeFile as writeFile8 } from "fs/promises";
+import { join as join16 } from "path";
+function siteLabel11(site) {
+  return site.name ?? site.path;
+}
+async function svelteCodemods(site) {
+  const label = siteLabel11(site);
+  const changes = await planGotchaCodemods(site.path);
+  if (changes.length === 0) {
+    return {
+      recipe: "svelte-codemods",
+      site: label,
+      status: "noop",
+      commits: [],
+      notes: "no codemod targets matched"
+    };
+  }
+  if (!await isWorkingTreeClean(site.path)) {
+    throw new Error(`refusing to run: working tree is not clean at ${site.path}`);
+  }
+  const branch = branchName("svelte-codemods");
+  await createBranch(site.path, branch);
+  for (const c of changes) {
+    await writeFile8(join16(site.path, c.rel), c.after, "utf-8");
+  }
+  const sha = await commit(
+    site.path,
+    `refactor(svelte5): apply codemods (${changes.length} files)`
+  );
+  return {
+    recipe: "svelte-codemods",
+    site: label,
+    status: "applied",
+    commits: sha ? [sha] : [],
+    notes: `branch: ${branch}`
+  };
+}
+
+// src/cli/commands/svelte-codemods.ts
+function formatResult6(r) {
+  if (r.status === "noop") return `[${r.site}] noop: ${r.notes ?? ""}`;
+  if (r.status === "failed") return `[${r.site}] failed: ${r.notes ?? ""}`;
+  return `[${r.site}] applied: ${r.commits.length} commit(s)
+${r.notes ?? ""}`;
+}
+async function runSvelteCodemodsCommand(site, opts) {
+  const cwd = opts.cwd ? resolve8(opts.cwd) : process.cwd();
+  let sites = await resolveSites({
+    ...site !== void 0 ? { site } : {},
+    ...opts.fleet !== void 0 ? { fleet: opts.fleet } : {},
+    cwd
+  });
+  if (opts.fleet) {
+    const workdir = opts.workdir ?? `${process.env.HOME ?? ""}/.reddoor-maint/sites`;
+    sites = await Promise.all(sites.map((s) => cloneIfNeeded(s, { workdir })));
+  }
+  const results = [];
+  for (const s of sites) results.push(await svelteCodemods(s));
+  const output = results.map(formatResult6).join("\n");
+  const code = results.some((r) => r.status === "failed") ? 1 : 0;
+  return { output, code };
+}
+
 // src/cli/version.ts
 import { readFileSync } from "fs";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function resolvePackageVersion(fromDir) {
   try {
-    const raw = readFileSync(join16(fromDir, "..", "..", "package.json"), "utf-8");
+    const raw = readFileSync(join17(fromDir, "..", "..", "package.json"), "utf-8");
     const pkg = JSON.parse(raw);
     return pkg.version ?? "unknown";
   } catch {
@@ -1995,6 +2136,7 @@ var RECIPE_DESCRIPTIONS = {
   "sync-configs": "Overwrite a site's canonical configs to match @reddoorla/maintenance.",
   "bump-deps": "Bump dependencies and commit the lockfile change.",
   "svelte-4-to-5": "Run the 7-commit Svelte 4 \u2192 5 upgrade recipe.",
+  "svelte-codemods": "Apply Svelte 5 gotcha codemods to an already-migrated site (state_referenced_locally, etc.).",
   "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)."
 };
@@ -2079,6 +2221,19 @@ cli.command(
     }
   }
 );
+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);
+    }
+  }
+);
 cli.command(
   "onboard [site]",
   "Install @reddoorla/maintenance + audit deps on a site (run after convert-to-pnpm)."