@reddoorla/maintenance 0.6.3 → 0.6.4

package/dist/cli/bin.js

@@ -1516,11 +1516,83 @@ 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 = "";
+  let i = 0;
+  while (i < source.length) {
+    const ch = source[i];
+    if (ch === '"' || ch === "'" || ch === "`") {
+      const closeIdx = findStringEnd(source, i);
+      if (closeIdx === -1) {
+        out += source.slice(i);
+        break;
+      }
+      const literal = source.slice(i, closeIdx + 1);
+      out += `__RDMNT_STR_${strings.length}__`;
+      strings.push(literal);
+      i = closeIdx + 1;
+    } else {
+      out += ch;
+      i++;
+    }
+  }
+  return {
+    masked: out,
+    restore: (s) => s.replace(/__RDMNT_STR_(\d+)__/g, (_full, idx) => strings[Number(idx)] ?? "")
+  };
+}
+var PROPS_DECL = /let\s*\{([^}]*)\}\s*(?::\s*\{([^}]*)\})?\s*=\s*\$props\(\)\s*;?/;
+function injectRestIntoProps(scriptBody) {
+  const match = scriptBody.match(PROPS_DECL);
+  if (!match) return scriptBody;
+  const destructured = match[1] ?? "";
+  if (/\.\.\.\s*\w+/.test(destructured)) return scriptBody;
+  const trimmed = destructured.trim();
+  const newDestructured = trimmed === "" ? " ...rest " : ` ${trimmed}, ...rest `;
+  let replacement;
+  if (match[2] !== void 0) {
+    const typeBody = match[2];
+    const hasIndexSig = /\[\s*key\s*:\s*string\s*\]\s*:/.test(typeBody);
+    const newTypeBody = hasIndexSig ? typeBody : `${typeBody.trimEnd().replace(/;?\s*$/, "")}; [key: string]: unknown `;
+    replacement = `let {${newDestructured}}: {${newTypeBody}} = $props();`;
+  } else {
+    replacement = `let {${newDestructured}} = $props();`;
+  }
+  return scriptBody.replace(PROPS_DECL, replacement);
+}
+var SCRIPT_BLOCK3 = /<script\b([^>]*)>([\s\S]*?)<\/script>/;
+var HAS_PROPS_CALL = /\$props\(\s*\)/;
 function removeDollarRestProps(source) {
-  let next = source;
-  next = next.replace(/\$\$restProps/g, "rest");
-  next = removeInterfaceBlock(next);
-  return next;
+  const next = removeInterfaceBlock(source);
+  const scriptMatch = next.match(SCRIPT_BLOCK3);
+  if (!scriptMatch) return next;
+  if (!HAS_PROPS_CALL.test(scriptMatch[2] ?? "")) {
+    return next;
+  }
+  const scriptInner = scriptMatch[2] ?? "";
+  const { masked, restore } = maskStringLiterals(scriptInner);
+  let processed = injectRestIntoProps(masked);
+  processed = processed.replace(/\$\$restProps/g, "rest");
+  const restoredInner = restore(processed);
+  const newScriptBlock = scriptMatch[0].replace(scriptInner, () => restoredInner);
+  const before = next.slice(0, scriptMatch.index);
+  const after = next.slice(scriptMatch.index + scriptMatch[0].length);
+  return before.replace(/\$\$restProps/g, "rest") + newScriptBlock + after.replace(/\$\$restProps/g, "rest");
 }
 
 // src/recipes/svelte-5/codemods/state-effect-sync.ts
@@ -1536,12 +1608,12 @@ function stateEffectSyncToDerived(source) {
 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 SCRIPT_BLOCK4 = /<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) => {
+  const masked = source.replace(SCRIPT_BLOCK4, (m) => {
     blocks.push(m);
     return `__SCRIPT_${blocks.length - 1}__`;
   });
@@ -1581,7 +1653,7 @@ function dollarPropsClass(source) {
 }
 
 // src/recipes/svelte-5/codemods/legacy-reactive.ts
-var SCRIPT_BLOCK4 = /<script\b([^>]*)>([\s\S]*?)<\/script>/g;
+var SCRIPT_BLOCK5 = /<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) {
@@ -1646,7 +1718,7 @@ function transformSimple(body) {
   });
 }
 function legacyReactiveToRunes(source) {
-  return source.replace(SCRIPT_BLOCK4, (full, _attrs, body) => {
+  return source.replace(SCRIPT_BLOCK5, (full, _attrs, body) => {
     let next = transformBlocks(body);
     next = transformSimple(next);
     if (next === body) return full;