@xylabs/toolchain 7.10.2 → 7.10.3

package/dist/index.mjs

@@ -700,6 +700,7 @@ function printWorkspaceCycles(cycles) {
 }
 
 // src/lib/deprecationMigrate.ts
+import { spawnSync as spawnSync5 } from "child_process";
 import {
   existsSync as existsSync2,
   readFileSync as readFileSync5,
@@ -708,6 +709,12 @@ import {
 import PATH4 from "path";
 import { createInterface } from "readline";
 import chalk5 from "chalk";
+var DEPRECATED_PACKAGES = [
+  "@xylabs/ts-scripts-common",
+  "@xylabs/ts-scripts-yarn3",
+  "@xylabs/ts-scripts-pnpm",
+  "@xylabs/ts-scripts-react-yarn3"
+];
 function findProjectRoot() {
   return process.env.INIT_CWD ?? process.cwd();
 }
@@ -720,56 +727,64 @@ function askYesNo(question) {
     });
   });
 }
-function replaceInFile(filePath, oldStr, newStr) {
+function replaceAllOldPackagesInFile(filePath) {
   if (!existsSync2(filePath)) return false;
-  const content = readFileSync5(filePath, "utf8");
-  if (!content.includes(oldStr)) return false;
-  writeFileSync(filePath, content.replaceAll(oldStr, newStr), "utf8");
-  return true;
-}
-function migrateRootPackageJson(pkg, pkgPath, oldPackage, depField) {
-  const version = pkg[depField][oldPackage];
-  delete pkg[depField][oldPackage];
-  pkg[depField]["@xylabs/toolchain"] = version;
-  writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
-`, "utf8");
-  console.warn(chalk5.green(`  \u2713 Replaced ${oldPackage} \u2192 @xylabs/toolchain in ${depField}`));
+  let content = readFileSync5(filePath, "utf8");
+  let changed = false;
+  for (const oldPkg of DEPRECATED_PACKAGES) {
+    if (content.includes(oldPkg)) {
+      content = content.replaceAll(oldPkg, "@xylabs/toolchain");
+      changed = true;
+    }
+  }
+  if (changed) {
+    writeFileSync(filePath, content, "utf8");
+  }
+  return changed;
 }
-function migrateWorkspacePackageJson(wsPkgPath, dir, oldPackage) {
-  if (!existsSync2(wsPkgPath)) return;
-  const wsPkg = JSON.parse(readFileSync5(wsPkgPath, "utf8"));
+function migratePackageJson(pkgPath, label) {
+  if (!existsSync2(pkgPath)) return false;
+  const pkg = JSON.parse(readFileSync5(pkgPath, "utf8"));
   let changed = false;
   for (const field of ["dependencies", "devDependencies", "peerDependencies"]) {
-    if (wsPkg[field]?.[oldPackage]) {
-      const ver = wsPkg[field][oldPackage];
-      delete wsPkg[field][oldPackage];
-      wsPkg[field]["@xylabs/toolchain"] = ver;
-      changed = true;
+    for (const oldPkg of DEPRECATED_PACKAGES) {
+      if (pkg[field]?.[oldPkg]) {
+        const ver = pkg[field][oldPkg];
+        delete pkg[field][oldPkg];
+        if (!pkg[field]["@xylabs/toolchain"]) {
+          pkg[field]["@xylabs/toolchain"] = ver;
+        }
+        changed = true;
+      }
     }
   }
   if (changed) {
-    writeFileSync(wsPkgPath, `${JSON.stringify(wsPkg, null, 2)}
+    writeFileSync(pkgPath, `${JSON.stringify(pkg, null, 2)}
 `, "utf8");
-    console.warn(chalk5.green(`  \u2713 Updated ${dir}/package.json`));
+    console.warn(chalk5.green(`  \u2713 Updated ${label}`));
   }
+  return changed;
 }
-async function migrateWorkspaces(root, workspacesGlob, oldPackage) {
-  if (!Array.isArray(workspacesGlob)) return;
+async function migrateWorkspaces(root) {
   const { globSync: globSync5 } = await import("glob");
-  for (const pattern of workspacesGlob) {
-    const dirs = globSync5(pattern, { cwd: root });
-    for (const dir of dirs) {
-      if (replaceInFile(PATH4.join(root, dir, "xy.config.ts"), oldPackage, "@xylabs/toolchain")) {
-        console.warn(chalk5.green(`  \u2713 Updated ${dir}/xy.config.ts imports`));
-      }
-      migrateWorkspacePackageJson(PATH4.join(root, dir, "package.json"), dir, oldPackage);
+  const packageJsonFiles = globSync5("**/package.json", {
+    cwd: root,
+    ignore: ["node_modules/**", "**/node_modules/**", "dist/**", "**/dist/**"]
+  });
+  for (const relPath of packageJsonFiles) {
+    if (relPath === "package.json") continue;
+    const dir = PATH4.dirname(relPath);
+    migratePackageJson(PATH4.join(root, relPath), relPath);
+    const xyConfigPath = PATH4.join(root, dir, "xy.config.ts");
+    if (replaceAllOldPackagesInFile(xyConfigPath)) {
+      console.warn(chalk5.green(`  \u2713 Updated ${dir}/xy.config.ts`));
     }
   }
 }
-function printManualInstructions(oldPackage) {
+function printManualInstructions() {
   console.warn(chalk5.gray("  Skipped. To migrate manually:\n"));
-  console.warn(chalk5.gray(`    1. Replace "${oldPackage}" with "@xylabs/toolchain" in package.json`));
-  console.warn(chalk5.gray("    2. Update xy.config.ts imports"));
+  console.warn(chalk5.gray("    1. Replace all @xylabs/ts-scripts-* deps with @xylabs/toolchain in package.json"));
+  console.warn(chalk5.gray("    2. Update imports in xy.config.ts files"));
   console.warn(chalk5.gray("    3. Run your package manager install\n"));
 }
 async function deprecationMigrate(oldPackage) {
@@ -777,22 +792,33 @@ async function deprecationMigrate(oldPackage) {
   const pkgPath = PATH4.join(root, "package.json");
   if (!existsSync2(pkgPath)) return;
   const pkg = JSON.parse(readFileSync5(pkgPath, "utf8"));
-  const depField = pkg.dependencies?.[oldPackage] ? "dependencies" : pkg.devDependencies?.[oldPackage] ? "devDependencies" : void 0;
-  if (!depField) return;
+  const hasOldDep = DEPRECATED_PACKAGES.some((dep) => pkg.dependencies?.[dep] || pkg.devDependencies?.[dep]);
+  if (!hasOldDep) return;
   console.warn(chalk5.yellow(`
 \u26A0  ${oldPackage} is deprecated. Use @xylabs/toolchain instead.
 `));
   const shouldMigrate = await askYesNo(chalk5.cyan("  Auto-migrate to @xylabs/toolchain? [y/N] "));
   if (!shouldMigrate) {
-    printManualInstructions(oldPackage);
+    printManualInstructions();
     return;
   }
-  migrateRootPackageJson(pkg, pkgPath, oldPackage, depField);
-  if (replaceInFile(PATH4.join(root, "xy.config.ts"), oldPackage, "@xylabs/toolchain")) {
-    console.warn(chalk5.green("  \u2713 Updated xy.config.ts imports"));
+  migratePackageJson(pkgPath, "package.json");
+  if (replaceAllOldPackagesInFile(PATH4.join(root, "xy.config.ts"))) {
+    console.warn(chalk5.green("  \u2713 Updated xy.config.ts"));
   }
-  await migrateWorkspaces(root, pkg.workspaces, oldPackage);
-  console.warn(chalk5.yellow("\n  Run your package manager install to complete the migration.\n"));
+  await migrateWorkspaces(root);
+  const pm = detectPackageManager();
+  console.warn(chalk5.cyan(`
+  Running ${pm} install...
+`));
+  const result = spawnSync5(pm, ["install"], { cwd: root, stdio: "inherit" });
+  if (result.status === 0) {
+    console.warn(chalk5.green("  \u2713 Migration complete. Re-run your command.\n"));
+  } else {
+    console.warn(chalk5.red(`  Install failed (exit ${result.status}). Run "${pm} install" manually.
+`));
+  }
+  process.exit(result.status ?? 1);
 }
 
 // src/lib/file/constants.ts
@@ -1260,12 +1286,12 @@ function listRepoTemplates() {
 }
 
 // src/lib/runInstall.ts
-import { spawnSync as spawnSync5 } from "child_process";
+import { spawnSync as spawnSync6 } from "child_process";
 import chalk9 from "chalk";
 function runInstall(cwd6) {
   const pm = detectPackageManager();
   console.log(chalk9.gray(`Running ${pm} install...`));
-  const result = spawnSync5(pm, ["install"], {
+  const result = spawnSync6(pm, ["install"], {
     cwd: cwd6,
     stdio: "inherit"
   });
@@ -1278,7 +1304,7 @@ function runInstall(cwd6) {
 }
 
 // src/lib/runSteps.ts
-import { spawnSync as spawnSync6 } from "child_process";
+import { spawnSync as spawnSync7 } from "child_process";
 import { existsSync as existsSync5 } from "fs";
 import chalk10 from "chalk";
 var runSteps = (name, steps, exitOnFail = true, messages) => {
@@ -1294,7 +1320,7 @@ var runSteps = (name, steps, exitOnFail = true, messages) => {
       if (command === "node" && !existsSync5(argList[0])) {
         throw new Error(`File not found [${argList[0]}]`);
       }
-      const status = spawnSync6(command, Array.isArray(args) ? args : args.split(" "), {
+      const status = spawnSync7(command, Array.isArray(args) ? args : args.split(" "), {
         ...config2,
         encoding: "utf8",
         env: { FORCE_COLOR: "3", ...process.env },
@@ -1377,7 +1403,7 @@ var runXyWithWarning = (command) => {
 };
 
 // src/lib/tryRunLocalScript.ts
-import { spawnSync as spawnSync7 } from "child_process";
+import { spawnSync as spawnSync8 } from "child_process";
 import { readFileSync as readFileSync13 } from "fs";
 import PATH8 from "path";
 import chalk13 from "chalk";
@@ -1394,7 +1420,7 @@ function tryRunLocalScript(commandName) {
   const extraArgs = process.argv.slice(process.argv.indexOf(commandName) + 1);
   console.log(chalk13.blue(`Delegating "${commandName}" to local script`));
   const pm = getPackageManager();
-  const result = spawnSync7(pm.command, ["run", commandName, ...extraArgs], {
+  const result = spawnSync8(pm.command, ["run", commandName, ...extraArgs], {
     cwd: process.cwd(),
     encoding: "utf8",
     env: {
@@ -2163,7 +2189,7 @@ var claudeCommands = () => {
 };
 
 // src/actions/claude-rules.ts
-import { spawnSync as spawnSync8 } from "child_process";
+import { spawnSync as spawnSync9 } from "child_process";
 import {
   existsSync as existsSync10,
   mkdirSync as mkdirSync2,
@@ -2231,7 +2257,7 @@ var ensureProjectClaudeMd = (cwd6, force) => {
       console.log(chalk21.yellow("Regenerating CLAUDE.md"));
     }
     console.log(chalk21.green("Generating CLAUDE.md via claude /init..."));
-    const result = spawnSync8("claude", ["-p", "/init", "--allowedTools", "Read", "Write", "Glob", "Grep"], {
+    const result = spawnSync9("claude", ["-p", "/init", "--allowedTools", "Read", "Write", "Glob", "Grep"], {
       cwd: cwd6,
       shell: true,
       stdio: "inherit"
@@ -5415,7 +5441,7 @@ async function lintInit({ verbose } = {}) {
 }
 
 // src/actions/lintlint.ts
-import { spawnSync as spawnSync9 } from "child_process";
+import { spawnSync as spawnSync10 } from "child_process";
 import {
   existsSync as existsSync14,
   readFileSync as readFileSync23,
@@ -5620,7 +5646,7 @@ Fixed: removed ${redundant.length} redundant rule(s)`));
   }
 }
 function formatConfigFile(eslintConfigPath) {
-  spawnSync9("eslint", ["--fix", eslintConfigPath], { stdio: "inherit" });
+  spawnSync10("eslint", ["--fix", eslintConfigPath], { stdio: "inherit" });
 }
 function fixConfigMismatch(eslintConfigPath, configDir, source, sharedPkg, expectedPkg) {
   const updated = source.replaceAll(sharedPkg, expectedPkg);
@@ -7302,7 +7328,7 @@ import PATH24 from "path";
 import chalk65 from "chalk";
 
 // src/actions/packman/convertToPnpm.ts
-import { spawnSync as spawnSync10 } from "child_process";
+import { spawnSync as spawnSync11 } from "child_process";
 import {
   existsSync as existsSync19,
   mkdirSync as mkdirSync5,
@@ -7579,7 +7605,7 @@ function convertToPnpm(cwd6, workspacePackageJsonPaths) {
   rewriteSourceImports(cwd6, "yarn-to-pnpm");
   deleteYarnArtifacts(cwd6);
   console.log(chalk63.blue("\nRunning pnpm install..."));
-  const install = spawnSync10("pnpm", ["install"], {
+  const install = spawnSync11("pnpm", ["install"], {
     cwd: cwd6,
     encoding: "utf8",
     shell: true,
@@ -7594,7 +7620,7 @@ function convertToPnpm(cwd6, workspacePackageJsonPaths) {
 }
 
 // src/actions/packman/convertToYarn.ts
-import { spawnSync as spawnSync11 } from "child_process";
+import { spawnSync as spawnSync12 } from "child_process";
 import {
   existsSync as existsSync20,
   readFileSync as readFileSync28,
@@ -7722,7 +7748,7 @@ function convertToYarn(cwd6, workspacePackageJsonPaths) {
   rewriteSourceImports(cwd6, "pnpm-to-yarn");
   deletePnpmArtifacts(cwd6);
   console.log(chalk64.blue("\nRunning yarn install..."));
-  const install = spawnSync11("yarn", ["install"], {
+  const install = spawnSync12("yarn", ["install"], {
     cwd: cwd6,
     encoding: "utf8",
     shell: true,
@@ -8524,7 +8550,7 @@ var relintAllPackages = ({ fix: fix2 = false } = {}) => {
 };
 
 // src/actions/repo-init.ts
-import { spawnSync as spawnSync12 } from "child_process";
+import { spawnSync as spawnSync13 } from "child_process";
 import {
   existsSync as existsSync25,
   mkdirSync as mkdirSync6,
@@ -8627,7 +8653,7 @@ function scaffoldFiles(templateName, layer, outputDir, pm, variables, verbose) {
 }
 function initGitRepo(projectDir, verbose) {
   if (verbose) console.log(chalk70.gray("Initializing git repository..."));
-  const result = spawnSync12("git", ["init", "-b", "main"], {
+  const result = spawnSync13("git", ["init", "-b", "main"], {
     cwd: projectDir,
     stdio: verbose ? "inherit" : "pipe"
   });
@@ -8639,7 +8665,7 @@ function initGitRepo(projectDir, verbose) {
 }
 function installDependencies(projectDir, pm) {
   console.log(chalk70.gray(`Running ${pm} install...`));
-  const result = spawnSync12(pm, ["install"], {
+  const result = spawnSync13(pm, ["install"], {
     cwd: projectDir,
     stdio: "inherit"
   });