@xylabs/ts-scripts-common 7.5.1 → 7.5.2

package/dist/xy/common/index.mjs

@@ -1142,24 +1142,24 @@ var npmignoreGen = (pkg) => generateIgnoreFiles(filename, pkg);
 
 // src/actions/packman/convert.ts
 import {
-  existsSync as existsSync11,
+  existsSync as existsSync12,
   readdirSync as readdirSync6,
-  readFileSync as readFileSync10,
+  readFileSync as readFileSync11,
   statSync as statSync3
 } from "fs";
-import PATH11 from "path";
-import chalk19 from "chalk";
+import PATH12 from "path";
+import chalk20 from "chalk";
 
 // src/actions/packman/convertToPnpm.ts
 import {
-  existsSync as existsSync9,
+  existsSync as existsSync10,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync8,
+  readFileSync as readFileSync9,
   rmSync as rmSync3,
-  writeFileSync as writeFileSync6
+  writeFileSync as writeFileSync7
 } from "fs";
-import PATH9 from "path";
-import chalk17 from "chalk";
+import PATH10 from "path";
+import chalk18 from "chalk";
 
 // src/actions/packman/rewriteScripts.ts
 function rewriteYarnToPnpm(script) {
@@ -1209,6 +1209,60 @@ function rewriteScriptsInPackageJson(pkg, direction) {
   return { ...pkg, scripts: rewritten };
 }
 
+// src/actions/packman/swapTsScriptsDependency.ts
+import {
+  existsSync as existsSync9,
+  readFileSync as readFileSync8,
+  writeFileSync as writeFileSync6
+} from "fs";
+import PATH9 from "path";
+import chalk17 from "chalk";
+var SWAP_MAP = {
+  "yarn-to-pnpm": [
+    ["@xylabs/ts-scripts-yarn3", "@xylabs/ts-scripts-pnpm"]
+  ],
+  "pnpm-to-yarn": [
+    ["@xylabs/ts-scripts-pnpm", "@xylabs/ts-scripts-yarn3"]
+  ]
+};
+function swapInPackageJson(pkgPath, direction) {
+  if (!existsSync9(pkgPath)) return false;
+  const raw = readFileSync8(pkgPath, "utf8");
+  const pkg = JSON.parse(raw);
+  let changed = false;
+  for (const depField of ["dependencies", "devDependencies"]) {
+    const deps = pkg[depField];
+    if (!deps) continue;
+    for (const [from, to] of SWAP_MAP[direction]) {
+      if (deps[from]) {
+        deps[to] = deps[from];
+        delete deps[from];
+        changed = true;
+      }
+    }
+  }
+  if (changed) {
+    writeFileSync6(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+  }
+  return changed;
+}
+function swapTsScriptsDependency(cwd, workspacePackageJsonPaths, direction) {
+  let count = 0;
+  if (swapInPackageJson(PATH9.join(cwd, "package.json"), direction)) {
+    count++;
+  }
+  for (const pkgPath of workspacePackageJsonPaths) {
+    const fullPath = PATH9.resolve(cwd, pkgPath, "package.json");
+    if (swapInPackageJson(fullPath, direction)) {
+      count++;
+    }
+  }
+  if (count > 0) {
+    const target = direction === "yarn-to-pnpm" ? "@xylabs/ts-scripts-pnpm" : "@xylabs/ts-scripts-yarn3";
+    console.log(chalk17.green(`  Swapped ts-scripts dependency to ${target} in ${count} package(s)`));
+  }
+}
+
 // src/actions/packman/convertToPnpm.ts
 var PNPM_VERSION = "10.12.1";
 function createPnpmWorkspaceYaml(cwd, workspacePatterns) {
@@ -1216,24 +1270,45 @@ function createPnpmWorkspaceYaml(cwd, workspacePatterns) {
   for (const pattern of workspacePatterns) {
     lines.push(`  - '${pattern}'`);
   }
-  writeFileSync6(PATH9.join(cwd, "pnpm-workspace.yaml"), lines.join("\n") + "\n", "utf8");
-  console.log(chalk17.green("  Created pnpm-workspace.yaml"));
+  writeFileSync7(PATH10.join(cwd, "pnpm-workspace.yaml"), lines.join("\n") + "\n", "utf8");
+  console.log(chalk18.green("  Created pnpm-workspace.yaml"));
+}
+function readPnpmWorkspacePatterns(cwd) {
+  const wsPath = PATH10.join(cwd, "pnpm-workspace.yaml");
+  if (!existsSync10(wsPath)) return [];
+  const content = readFileSync9(wsPath, "utf8");
+  const patterns = [];
+  const lines = content.split("\n");
+  let inPackages = false;
+  for (const line of lines) {
+    if (line.trim() === "packages:") {
+      inPackages = true;
+      continue;
+    }
+    if (inPackages && /^\s+-\s+/.test(line)) {
+      const pattern = line.replace(/^\s+-\s+/, "").replaceAll(/['"]/g, "").trim();
+      if (pattern) patterns.push(pattern);
+    } else if (inPackages && !/^\s/.test(line) && line.trim()) {
+      inPackages = false;
+    }
+  }
+  return patterns;
 }
 function updateRootPackageJson(cwd) {
-  const pkgPath = PATH9.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync8(pkgPath, "utf8"));
-  const workspacePatterns = pkg.workspaces ?? [];
+  const pkgPath = PATH10.join(cwd, "package.json");
+  const pkg = JSON.parse(readFileSync9(pkgPath, "utf8"));
+  const workspacePatterns = pkg.workspaces ?? readPnpmWorkspacePatterns(cwd);
   delete pkg.workspaces;
   pkg.packageManager = `pnpm@${PNPM_VERSION}`;
   const updated = rewriteScriptsInPackageJson(pkg, "yarn-to-pnpm");
-  writeFileSync6(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
-  console.log(chalk17.green("  Updated root package.json"));
+  writeFileSync7(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+  console.log(chalk18.green("  Updated root package.json"));
   return workspacePatterns;
 }
 function updateGitignore(cwd) {
-  const gitignorePath = PATH9.join(cwd, ".gitignore");
-  if (!existsSync9(gitignorePath)) return;
-  let content = readFileSync8(gitignorePath, "utf8");
+  const gitignorePath = PATH10.join(cwd, ".gitignore");
+  if (!existsSync10(gitignorePath)) return;
+  let content = readFileSync9(gitignorePath, "utf8");
   const yarnLines = [
     ".pnp.*",
     ".pnp",
@@ -1248,63 +1323,64 @@ function updateGitignore(cwd) {
     content = content.replaceAll(new RegExp(String.raw`^${line.replaceAll(".", String.raw`\.`).replaceAll("*", String.raw`\*`).replaceAll("!", String.raw`\!`)}\s*$`, "gm"), "");
   }
   content = content.replaceAll(/\n{3,}/g, "\n\n");
-  writeFileSync6(gitignorePath, content, "utf8");
-  console.log(chalk17.green("  Updated .gitignore"));
+  writeFileSync7(gitignorePath, content, "utf8");
+  console.log(chalk18.green("  Updated .gitignore"));
 }
 function deleteYarnArtifacts(cwd) {
-  const yarnLock = PATH9.join(cwd, "yarn.lock");
-  const yarnrc = PATH9.join(cwd, ".yarnrc.yml");
-  const yarnDir = PATH9.join(cwd, ".yarn");
-  if (existsSync9(yarnLock)) {
+  const yarnLock = PATH10.join(cwd, "yarn.lock");
+  const yarnrc = PATH10.join(cwd, ".yarnrc.yml");
+  const yarnDir = PATH10.join(cwd, ".yarn");
+  if (existsSync10(yarnLock)) {
     rmSync3(yarnLock);
-    console.log(chalk17.gray("  Deleted yarn.lock"));
+    console.log(chalk18.gray("  Deleted yarn.lock"));
   }
-  if (existsSync9(yarnrc)) {
+  if (existsSync10(yarnrc)) {
     rmSync3(yarnrc);
-    console.log(chalk17.gray("  Deleted .yarnrc.yml"));
+    console.log(chalk18.gray("  Deleted .yarnrc.yml"));
   }
-  if (existsSync9(yarnDir)) {
+  if (existsSync10(yarnDir)) {
     rmSync3(yarnDir, { force: true, recursive: true });
-    console.log(chalk17.gray("  Deleted .yarn/"));
+    console.log(chalk18.gray("  Deleted .yarn/"));
   }
 }
 function createNpmrc(cwd) {
-  const npmrcPath = PATH9.join(cwd, ".npmrc");
-  if (existsSync9(npmrcPath)) return;
-  mkdirSync5(PATH9.dirname(npmrcPath), { recursive: true });
-  writeFileSync6(npmrcPath, "", "utf8");
-  console.log(chalk17.green("  Created .npmrc"));
+  const npmrcPath = PATH10.join(cwd, ".npmrc");
+  if (existsSync10(npmrcPath)) return;
+  mkdirSync5(PATH10.dirname(npmrcPath), { recursive: true });
+  writeFileSync7(npmrcPath, "", "utf8");
+  console.log(chalk18.green("  Created .npmrc"));
 }
 function convertToPnpm(cwd, workspacePackageJsonPaths) {
-  console.log(chalk17.blue("\nConverting to pnpm...\n"));
+  console.log(chalk18.blue("\nConverting to pnpm...\n"));
   const workspacePatterns = updateRootPackageJson(cwd);
   createPnpmWorkspaceYaml(cwd, workspacePatterns);
   for (const pkgPath of workspacePackageJsonPaths) {
-    const fullPath = PATH9.resolve(cwd, pkgPath, "package.json");
-    if (!existsSync9(fullPath)) continue;
-    const pkg = JSON.parse(readFileSync8(fullPath, "utf8"));
+    const fullPath = PATH10.resolve(cwd, pkgPath, "package.json");
+    if (!existsSync10(fullPath)) continue;
+    const pkg = JSON.parse(readFileSync9(fullPath, "utf8"));
     const updated = rewriteScriptsInPackageJson(pkg, "yarn-to-pnpm");
     if (JSON.stringify(pkg) !== JSON.stringify(updated)) {
-      writeFileSync6(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+      writeFileSync7(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
     }
   }
-  console.log(chalk17.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
+  console.log(chalk18.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
   updateGitignore(cwd);
   createNpmrc(cwd);
+  swapTsScriptsDependency(cwd, workspacePackageJsonPaths, "yarn-to-pnpm");
   deleteYarnArtifacts(cwd);
-  console.log(chalk17.blue("\nConversion complete. Run `pnpm install` to generate pnpm-lock.yaml.\n"));
+  console.log(chalk18.blue("\nConversion complete. Run `pnpm install` to generate pnpm-lock.yaml.\n"));
   return 0;
 }
 
 // src/actions/packman/convertToYarn.ts
 import {
-  existsSync as existsSync10,
-  readFileSync as readFileSync9,
+  existsSync as existsSync11,
+  readFileSync as readFileSync10,
   rmSync as rmSync4,
-  writeFileSync as writeFileSync7
+  writeFileSync as writeFileSync8
 } from "fs";
-import PATH10 from "path";
-import chalk18 from "chalk";
+import PATH11 from "path";
+import chalk19 from "chalk";
 var YARN_VERSION = "4.13.0";
 var YARNRC_TEMPLATE = `compressionLevel: mixed
 
@@ -1325,10 +1401,10 @@ var YARN_GITIGNORE_ENTRIES = `
 !.yarn/sdks
 !.yarn/versions
 `;
-function readPnpmWorkspacePatterns(cwd) {
-  const wsPath = PATH10.join(cwd, "pnpm-workspace.yaml");
-  if (!existsSync10(wsPath)) return [];
-  const content = readFileSync9(wsPath, "utf8");
+function readPnpmWorkspacePatterns2(cwd) {
+  const wsPath = PATH11.join(cwd, "pnpm-workspace.yaml");
+  if (!existsSync11(wsPath)) return [];
+  const content = readFileSync10(wsPath, "utf8");
   const patterns = [];
   const lines = content.split("\n");
   let inPackages = false;
@@ -1347,91 +1423,103 @@ function readPnpmWorkspacePatterns(cwd) {
   return patterns;
 }
 function updateRootPackageJson2(cwd, workspacePatterns) {
-  const pkgPath = PATH10.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync9(pkgPath, "utf8"));
+  const pkgPath = PATH11.join(cwd, "package.json");
+  const pkg = JSON.parse(readFileSync10(pkgPath, "utf8"));
   pkg.workspaces = workspacePatterns;
   pkg.packageManager = `yarn@${YARN_VERSION}`;
   const updated = rewriteScriptsInPackageJson(pkg, "pnpm-to-yarn");
-  writeFileSync7(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
-  console.log(chalk18.green("  Updated root package.json"));
+  writeFileSync8(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+  console.log(chalk19.green("  Updated root package.json"));
 }
 function updateGitignore2(cwd) {
-  const gitignorePath = PATH10.join(cwd, ".gitignore");
-  let content = existsSync10(gitignorePath) ? readFileSync9(gitignorePath, "utf8") : "";
+  const gitignorePath = PATH11.join(cwd, ".gitignore");
+  let content = existsSync11(gitignorePath) ? readFileSync10(gitignorePath, "utf8") : "";
   if (!content.includes(".yarn/*")) {
     content = content.trimEnd() + "\n" + YARN_GITIGNORE_ENTRIES;
   }
-  writeFileSync7(gitignorePath, content, "utf8");
-  console.log(chalk18.green("  Updated .gitignore"));
+  writeFileSync8(gitignorePath, content, "utf8");
+  console.log(chalk19.green("  Updated .gitignore"));
 }
 function deletePnpmArtifacts(cwd) {
-  const lockfile = PATH10.join(cwd, "pnpm-lock.yaml");
-  const workspaceYaml = PATH10.join(cwd, "pnpm-workspace.yaml");
-  const npmrc = PATH10.join(cwd, ".npmrc");
-  if (existsSync10(lockfile)) {
+  const lockfile = PATH11.join(cwd, "pnpm-lock.yaml");
+  const workspaceYaml = PATH11.join(cwd, "pnpm-workspace.yaml");
+  const npmrc = PATH11.join(cwd, ".npmrc");
+  if (existsSync11(lockfile)) {
     rmSync4(lockfile);
-    console.log(chalk18.gray("  Deleted pnpm-lock.yaml"));
+    console.log(chalk19.gray("  Deleted pnpm-lock.yaml"));
   }
-  if (existsSync10(workspaceYaml)) {
+  if (existsSync11(workspaceYaml)) {
     rmSync4(workspaceYaml);
-    console.log(chalk18.gray("  Deleted pnpm-workspace.yaml"));
+    console.log(chalk19.gray("  Deleted pnpm-workspace.yaml"));
   }
-  if (existsSync10(npmrc)) {
-    const content = readFileSync9(npmrc, "utf8");
+  if (existsSync11(npmrc)) {
+    const content = readFileSync10(npmrc, "utf8");
     if (content.trim() === "" || content.includes("shamefully-hoist") || content.includes("node-linker")) {
       rmSync4(npmrc);
-      console.log(chalk18.gray("  Deleted .npmrc"));
+      console.log(chalk19.gray("  Deleted .npmrc"));
     }
   }
 }
 function createYarnrc(cwd) {
-  const yarnrcPath = PATH10.join(cwd, ".yarnrc.yml");
-  if (existsSync10(yarnrcPath)) return;
-  writeFileSync7(yarnrcPath, YARNRC_TEMPLATE, "utf8");
-  console.log(chalk18.green("  Created .yarnrc.yml"));
+  const yarnrcPath = PATH11.join(cwd, ".yarnrc.yml");
+  if (existsSync11(yarnrcPath)) return;
+  writeFileSync8(yarnrcPath, YARNRC_TEMPLATE, "utf8");
+  console.log(chalk19.green("  Created .yarnrc.yml"));
+}
+function readWorkspacePatternsFromPackageJson(cwd) {
+  const pkgPath = PATH11.join(cwd, "package.json");
+  if (!existsSync11(pkgPath)) return [];
+  const pkg = JSON.parse(readFileSync10(pkgPath, "utf8"));
+  return pkg.workspaces ?? [];
 }
 function convertToYarn(cwd, workspacePackageJsonPaths) {
-  console.log(chalk18.blue("\nConverting to yarn...\n"));
-  const workspacePatterns = readPnpmWorkspacePatterns(cwd);
+  console.log(chalk19.blue("\nConverting to yarn...\n"));
+  const workspacePatterns = readPnpmWorkspacePatterns2(cwd);
   if (workspacePatterns.length === 0) {
-    console.warn(chalk18.yellow("  No workspace patterns found in pnpm-workspace.yaml"));
+    const fromPkg = readWorkspacePatternsFromPackageJson(cwd);
+    if (fromPkg.length > 0) {
+      workspacePatterns.push(...fromPkg);
+    } else {
+      console.warn(chalk19.yellow("  No workspace patterns found"));
+    }
   }
   updateRootPackageJson2(cwd, workspacePatterns);
   for (const pkgPath of workspacePackageJsonPaths) {
-    const fullPath = PATH10.resolve(cwd, pkgPath, "package.json");
-    if (!existsSync10(fullPath)) continue;
-    const pkg = JSON.parse(readFileSync9(fullPath, "utf8"));
+    const fullPath = PATH11.resolve(cwd, pkgPath, "package.json");
+    if (!existsSync11(fullPath)) continue;
+    const pkg = JSON.parse(readFileSync10(fullPath, "utf8"));
     const updated = rewriteScriptsInPackageJson(pkg, "pnpm-to-yarn");
     if (JSON.stringify(pkg) !== JSON.stringify(updated)) {
-      writeFileSync7(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+      writeFileSync8(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
     }
   }
-  console.log(chalk18.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
+  console.log(chalk19.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
   updateGitignore2(cwd);
   createYarnrc(cwd);
+  swapTsScriptsDependency(cwd, workspacePackageJsonPaths, "pnpm-to-yarn");
   deletePnpmArtifacts(cwd);
-  console.log(chalk18.blue("\nConversion complete. Run `corepack enable yarn && yarn set version stable && yarn install` to finish setup.\n"));
+  console.log(chalk19.blue("\nConversion complete. Run `corepack enable yarn && yarn set version stable && yarn install` to finish setup.\n"));
   return 0;
 }
 
 // src/actions/packman/convert.ts
 function detectCurrentPM(cwd) {
-  if (existsSync11(PATH11.join(cwd, "pnpm-lock.yaml")) || existsSync11(PATH11.join(cwd, "pnpm-workspace.yaml"))) {
+  if (existsSync12(PATH12.join(cwd, "pnpm-lock.yaml")) || existsSync12(PATH12.join(cwd, "pnpm-workspace.yaml"))) {
     return "pnpm";
   }
-  if (existsSync11(PATH11.join(cwd, "yarn.lock")) || existsSync11(PATH11.join(cwd, ".yarnrc.yml"))) {
+  if (existsSync12(PATH12.join(cwd, "yarn.lock")) || existsSync12(PATH12.join(cwd, ".yarnrc.yml"))) {
     return "yarn";
   }
   return "unknown";
 }
 function findWorkspacePackagePaths(cwd) {
-  const pkgPath = PATH11.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync10(pkgPath, "utf8"));
+  const pkgPath = PATH12.join(cwd, "package.json");
+  const pkg = JSON.parse(readFileSync11(pkgPath, "utf8"));
   let patterns = pkg.workspaces ?? [];
   if (patterns.length === 0) {
-    const wsPath = PATH11.join(cwd, "pnpm-workspace.yaml");
-    if (existsSync11(wsPath)) {
-      const content = readFileSync10(wsPath, "utf8");
+    const wsPath = PATH12.join(cwd, "pnpm-workspace.yaml");
+    if (existsSync12(wsPath)) {
+      const content = readFileSync11(wsPath, "utf8");
       const lines = content.split("\n");
       let inPackages = false;
       for (const line of lines) {
@@ -1461,15 +1549,15 @@ function resolveWorkspaceGlob(cwd, pattern) {
 }
 function walkGlob(basePath, parts, currentPath) {
   if (parts.length === 0) {
-    const fullPath = PATH11.join(basePath, currentPath);
-    if (existsSync11(PATH11.join(fullPath, "package.json"))) {
+    const fullPath = PATH12.join(basePath, currentPath);
+    if (existsSync12(PATH12.join(fullPath, "package.json"))) {
       return [currentPath];
     }
     return [];
   }
   const [part, ...rest] = parts;
-  const dirPath = PATH11.join(basePath, currentPath);
-  if (!existsSync11(dirPath) || !statSync3(dirPath).isDirectory()) {
+  const dirPath = PATH12.join(basePath, currentPath);
+  if (!existsSync12(dirPath) || !statSync3(dirPath).isDirectory()) {
     return [];
   }
   if (part === "*" || part === "**") {
@@ -1497,26 +1585,25 @@ function walkGlob(basePath, parts, currentPath) {
 function convert({ target, verbose }) {
   const validTargets = ["pnpm", "yarn"];
   if (!validTargets.includes(target)) {
-    console.error(chalk19.red(`Invalid target "${target}". Must be one of: ${validTargets.join(", ")}`));
+    console.error(chalk20.red(`Invalid target "${target}". Must be one of: ${validTargets.join(", ")}`));
     return 1;
   }
   const cwd = process.cwd();
   const currentPM = detectCurrentPM(cwd);
   if (verbose) {
-    console.log(chalk19.gray(`Current package manager: ${currentPM}`));
-    console.log(chalk19.gray(`Target package manager: ${target}`));
+    console.log(chalk20.gray(`Current package manager: ${currentPM}`));
+    console.log(chalk20.gray(`Target package manager: ${target}`));
   }
   if (currentPM === target) {
-    console.error(chalk19.red(`Already using ${target}. No conversion needed.`));
-    return 1;
+    console.log(chalk20.yellow(`Already using ${target}. Re-applying conversion to fix any incomplete steps...`));
   }
   if (currentPM === "unknown") {
-    console.error(chalk19.red("Could not detect current package manager. No yarn.lock or pnpm-lock.yaml found."));
+    console.error(chalk20.red("Could not detect current package manager. No yarn.lock or pnpm-lock.yaml found."));
     return 1;
   }
   const workspacePaths = findWorkspacePackagePaths(cwd);
   if (verbose) {
-    console.log(chalk19.gray(`Found ${workspacePaths.length} workspace packages`));
+    console.log(chalk20.gray(`Found ${workspacePaths.length} workspace packages`));
   }
   if (target === "pnpm") {
     return convertToPnpm(cwd, workspacePaths);