@reddoorla/maintenance 0.6.0 → 0.6.2

package/dist/cli/bin.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 // src/cli/bin.ts
-import { dirname } from "path";
-import { fileURLToPath } from "url";
+import { dirname as dirname2 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 import { cac } from "cac";
 
 // src/cli/commands/audit.ts
@@ -761,6 +761,13 @@ function assertSafeName(name) {
     throw new Error(`unsafe site name (traversal segment not allowed): ${name}`);
   }
 }
+function assertSafeRepoUrl(repoUrl) {
+  if (!/^(https?|ssh|git|file):\/\//.test(repoUrl) && !/^[A-Za-z0-9._-]+@[A-Za-z0-9._-]+:/.test(repoUrl)) {
+    throw new Error(
+      `unsafe repoUrl: must start with a scheme (https://, ssh://, git://, file://) or use scp-style "user@host:path" (got: ${JSON.stringify(repoUrl)})`
+    );
+  }
+}
 async function isNonEmptyDir(path) {
   try {
     const s = await stat(path);
@@ -778,13 +785,14 @@ async function cloneIfNeeded(site, opts) {
   }
   const name = site.name ?? deriveNameFromRepoUrl(site.repoUrl);
   assertSafeName(name);
+  assertSafeRepoUrl(site.repoUrl);
   const target = join5(opts.workdir, name);
   await mkdir(opts.workdir, { recursive: true });
   if (await isNonEmptyDir(target)) {
     return { ...site, name, path: target };
   }
   const spawn2 = opts.spawn ?? defaultSpawn;
-  const result = await spawn2("git", ["clone", site.repoUrl, target], {
+  const result = await spawn2("git", ["clone", "--", site.repoUrl, target], {
     cwd: opts.workdir,
     timeoutMs: 5 * 6e4
   });
@@ -1443,9 +1451,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 +1467,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
@@ -1517,6 +1532,128 @@ 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 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/codemods/legacy-reactive.ts
+var SCRIPT_BLOCK4 = /<script\b([^>]*)>([\s\S]*?)<\/script>/g;
+var SIMPLE_REACTIVE = /^([ \t]*)\$:\s*(\w+)\s*=\s*([^;\n]+);?[ \t]*$/gm;
+var BLOCK_REACTIVE_HEAD = /(^|\n)([ \t]*)\$:\s*\{/g;
+function findMatchingClose(source, openIdx) {
+  let depth = 0;
+  let i = openIdx;
+  while (i < source.length) {
+    const ch = source[i];
+    if (ch === '"' || ch === "'" || ch === "`") {
+      const closeStr = findStringClose(source, i);
+      if (closeStr === -1) return -1;
+      i = closeStr + 1;
+      continue;
+    }
+    if (ch === "{") depth++;
+    else if (ch === "}") {
+      depth--;
+      if (depth === 0) return i;
+    }
+    i++;
+  }
+  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;
+}
+function transformBlocks(body) {
+  const out = [];
+  let last = 0;
+  BLOCK_REACTIVE_HEAD.lastIndex = 0;
+  let m;
+  while ((m = BLOCK_REACTIVE_HEAD.exec(body)) !== null) {
+    const leadingNewline = m[1] ?? "";
+    const indent = m[2] ?? "";
+    const headEnd = m.index + m[0].length;
+    const openBraceIdx = headEnd - 1;
+    const closeBraceIdx = findMatchingClose(body, openBraceIdx);
+    if (closeBraceIdx === -1) continue;
+    out.push(body.slice(last, m.index));
+    out.push(leadingNewline);
+    const blockBody = body.slice(openBraceIdx + 1, closeBraceIdx);
+    out.push(`${indent}$effect(() => {${blockBody}});`);
+    last = closeBraceIdx + 1;
+    BLOCK_REACTIVE_HEAD.lastIndex = last;
+  }
+  out.push(body.slice(last));
+  return out.join("");
+}
+function transformSimple(body) {
+  return body.replace(SIMPLE_REACTIVE, (_full, indent, name, expr) => {
+    return `${indent}let ${name} = $derived(${expr.trim()});`;
+  });
+}
+function legacyReactiveToRunes(source) {
+  return source.replace(SCRIPT_BLOCK4, (full, _attrs, body) => {
+    let next = transformBlocks(body);
+    next = transformSimple(next);
+    if (next === body) return full;
+    return full.replace(body, next);
+  });
+}
+
 // src/recipes/svelte-5/step-gotchas.ts
 var SVELTE_GLOBS = ["src/**/*.svelte"];
 var IGNORE2 = ["node_modules/**", ".svelte-kit/**", "build/**"];
@@ -1524,7 +1661,9 @@ var CODEMODS = [
   onEventToHandler,
   exportLetToProps,
   removeDollarRestProps,
-  stateEffectSyncToDerived
+  stateEffectSyncToDerived,
+  dollarPropsClass,
+  legacyReactiveToRunes
 ];
 async function planGotchaCodemods(cwd) {
   const changes = [];
@@ -1849,9 +1988,28 @@ import { resolve as resolve7 } from "path";
 
 // src/recipes/onboard.ts
 import { stat as stat3 } from "fs/promises";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
+
+// src/util/self-version.ts
+import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
+import { dirname, join as join15 } from "path";
+function selfPackageVersion(callerImportMetaUrl) {
+  try {
+    const here2 = dirname(fileURLToPath(callerImportMetaUrl));
+    const raw = readFileSync(join15(here2, "..", "..", "package.json"), "utf-8");
+    const pkg = JSON.parse(raw);
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+function selfCaretRange(callerImportMetaUrl) {
+  return `^${selfPackageVersion(callerImportMetaUrl)}`;
+}
+
+// src/recipes/onboard.ts
 var PACKAGE_NAME = "@reddoorla/maintenance";
-var DEFAULT_PACKAGE_VERSION = "^0.2.0";
 var AUDIT_DEPS = {
   lighthouse: [{ name: "@lhci/cli", version: "^0.15.1" }],
   a11y: [
@@ -1877,8 +2035,8 @@ async function onboard(site, opts = {}) {
   const label = siteLabel10(site);
   const spawn2 = opts.spawn ?? defaultSpawn;
   const audits = opts.audits ?? ["lighthouse", "a11y"];
-  const packageVersion = opts.packageVersion ?? DEFAULT_PACKAGE_VERSION;
-  if (!await exists2(join15(site.path, "pnpm-lock.yaml"))) {
+  const packageVersion = opts.packageVersion ?? selfCaretRange(import.meta.url);
+  if (!await exists2(join16(site.path, "pnpm-lock.yaml"))) {
     return {
       recipe: "onboard",
       site: label,
@@ -1887,7 +2045,7 @@ async function onboard(site, opts = {}) {
       notes: "no pnpm-lock.yaml at site root \u2014 run convert-to-pnpm first"
     };
   }
-  const pkgPath = join15(site.path, "package.json");
+  const pkgPath = join16(site.path, "package.json");
   const pkg = await readPackageJson(pkgPath);
   const toAdd = [];
   if (!isDeclared(pkg, PACKAGE_NAME)) {
@@ -1991,7 +2149,7 @@ import { resolve as resolve8 } from "path";
 
 // src/recipes/svelte-codemods.ts
 import { writeFile as writeFile8 } from "fs/promises";
-import { join as join16 } from "path";
+import { join as join17 } from "path";
 function siteLabel11(site) {
   return site.name ?? site.path;
 }
@@ -2013,7 +2171,7 @@ async function svelteCodemods(site) {
   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");
+    await writeFile8(join17(site.path, c.rel), c.after, "utf-8");
   }
   const sha = await commit(
     site.path,
@@ -2054,11 +2212,11 @@ async function runSvelteCodemodsCommand(site, opts) {
 }
 
 // src/cli/version.ts
-import { readFileSync } from "fs";
-import { join as join17 } from "path";
+import { readFileSync as readFileSync2 } from "fs";
+import { join as join18 } from "path";
 function resolvePackageVersion(fromDir) {
   try {
-    const raw = readFileSync(join17(fromDir, "..", "..", "package.json"), "utf-8");
+    const raw = readFileSync2(join18(fromDir, "..", "..", "package.json"), "utf-8");
     const pkg = JSON.parse(raw);
     return pkg.version ?? "unknown";
   } catch {
@@ -2067,7 +2225,7 @@ function resolvePackageVersion(fromDir) {
 }
 
 // src/cli/bin.ts
-var here = dirname(fileURLToPath(import.meta.url));
+var here = dirname2(fileURLToPath2(import.meta.url));
 var version = resolvePackageVersion(here);
 var AUDIT_DESCRIPTIONS = {
   deps: "Diff site package.json against the bundled baseline version map.",