@xylabs/ts-scripts-common 7.5.1 → 7.5.3

package/dist/bin/xy.mjs

@@ -1698,6 +1698,8 @@ function hasImportPlugin({ location, allDependencies }) {
   return false;
 }
 var hasVitest = ({ allDependencies }) => allDependencies.includes("vitest");
+var isYarnRepo = () => detectPackageManager() === "yarn";
+var isPnpmRepo = () => detectPackageManager() === "pnpm";
 var rules = [
   {
     package: "typescript",
@@ -1714,6 +1716,22 @@ var rules = [
   {
     package: "@vitest/coverage-v8",
     isNeeded: hasVitest
+  },
+  {
+    package: "@xylabs/ts-scripts-yarn3",
+    isNeeded: isYarnRepo
+  },
+  {
+    package: "@xylabs/ts-scripts-react-yarn3",
+    isNeeded: isYarnRepo
+  },
+  {
+    package: "@xylabs/ts-scripts-pnpm",
+    isNeeded: isPnpmRepo
+  },
+  {
+    package: "@xylabs/ts-scripts-react-pnpm",
+    isNeeded: isPnpmRepo
   }
 ];
 function getImplicitDevDependencies(context) {
@@ -2585,24 +2603,24 @@ function packageLintMonorepo(fix2 = false) {
 
 // src/actions/packman/convert.ts
 import {
-  existsSync as existsSync12,
+  existsSync as existsSync14,
   readdirSync as readdirSync6,
-  readFileSync as readFileSync13,
+  readFileSync as readFileSync15,
   statSync as statSync3
 } from "fs";
-import PATH14 from "path";
-import chalk33 from "chalk";
+import PATH15 from "path";
+import chalk35 from "chalk";
 
 // src/actions/packman/convertToPnpm.ts
 import {
-  existsSync as existsSync10,
+  existsSync as existsSync12,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync11,
+  readFileSync as readFileSync13,
   rmSync as rmSync3,
-  writeFileSync as writeFileSync8
+  writeFileSync as writeFileSync10
 } from "fs";
-import PATH12 from "path";
-import chalk31 from "chalk";
+import PATH13 from "path";
+import chalk33 from "chalk";
 
 // src/actions/packman/rewriteScripts.ts
 function rewriteYarnToPnpm(script) {
@@ -2652,6 +2670,113 @@ function rewriteScriptsInPackageJson(pkg, direction) {
   return { ...pkg, scripts: rewritten };
 }
 
+// src/actions/packman/rewriteSourceImports.ts
+import { existsSync as existsSync10, readFileSync as readFileSync11, writeFileSync as writeFileSync8 } from "fs";
+import chalk31 from "chalk";
+import { globSync as globSync3 } from "glob";
+var IMPORT_SWAP_MAP = {
+  "yarn-to-pnpm": [
+    ["@xylabs/ts-scripts-yarn3", "@xylabs/ts-scripts-pnpm"],
+    ["@xylabs/ts-scripts-react-yarn3", "@xylabs/ts-scripts-react-pnpm"]
+  ],
+  "pnpm-to-yarn": [
+    ["@xylabs/ts-scripts-pnpm", "@xylabs/ts-scripts-yarn3"],
+    ["@xylabs/ts-scripts-react-pnpm", "@xylabs/ts-scripts-react-yarn3"]
+  ]
+};
+var SOURCE_GLOBS = [
+  "**/*.ts",
+  "**/*.tsx",
+  "**/*.mts",
+  "**/*.cts",
+  "**/*.js",
+  "**/*.mjs"
+];
+var IGNORE_PATTERNS = [
+  "**/node_modules/**",
+  "**/dist/**",
+  "**/build/**",
+  "**/.yarn/**"
+];
+function rewriteSourceImports(cwd, direction) {
+  const swaps = IMPORT_SWAP_MAP[direction];
+  const files = globSync3(SOURCE_GLOBS, {
+    cwd,
+    absolute: true,
+    ignore: IGNORE_PATTERNS
+  });
+  let count = 0;
+  for (const file of files) {
+    if (!existsSync10(file)) continue;
+    const original = readFileSync11(file, "utf8");
+    let content = original;
+    for (const [from, to] of swaps) {
+      content = content.replaceAll(from, to);
+    }
+    if (content !== original) {
+      writeFileSync8(file, content, "utf8");
+      count++;
+    }
+  }
+  if (count > 0) {
+    console.log(chalk31.green(`  Rewrote ts-scripts imports in ${count} source file(s)`));
+  }
+}
+
+// src/actions/packman/swapTsScriptsDependency.ts
+import {
+  existsSync as existsSync11,
+  readFileSync as readFileSync12,
+  writeFileSync as writeFileSync9
+} from "fs";
+import PATH12 from "path";
+import chalk32 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 (!existsSync11(pkgPath)) return false;
+  const raw = readFileSync12(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) {
+    writeFileSync9(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+  }
+  return changed;
+}
+function swapTsScriptsDependency(cwd, workspacePackageJsonPaths, direction) {
+  let count = 0;
+  if (swapInPackageJson(PATH12.join(cwd, "package.json"), direction)) {
+    count++;
+  }
+  for (const pkgPath of workspacePackageJsonPaths) {
+    const fullPath = PATH12.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(chalk32.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) {
@@ -2659,24 +2784,45 @@ function createPnpmWorkspaceYaml(cwd, workspacePatterns) {
   for (const pattern of workspacePatterns) {
     lines.push(`  - '${pattern}'`);
   }
-  writeFileSync8(PATH12.join(cwd, "pnpm-workspace.yaml"), lines.join("\n") + "\n", "utf8");
-  console.log(chalk31.green("  Created pnpm-workspace.yaml"));
+  writeFileSync10(PATH13.join(cwd, "pnpm-workspace.yaml"), lines.join("\n") + "\n", "utf8");
+  console.log(chalk33.green("  Created pnpm-workspace.yaml"));
+}
+function readPnpmWorkspacePatterns(cwd) {
+  const wsPath = PATH13.join(cwd, "pnpm-workspace.yaml");
+  if (!existsSync12(wsPath)) return [];
+  const content = readFileSync13(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 = PATH12.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync11(pkgPath, "utf8"));
-  const workspacePatterns = pkg.workspaces ?? [];
+  const pkgPath = PATH13.join(cwd, "package.json");
+  const pkg = JSON.parse(readFileSync13(pkgPath, "utf8"));
+  const workspacePatterns = pkg.workspaces ?? readPnpmWorkspacePatterns(cwd);
   delete pkg.workspaces;
   pkg.packageManager = `pnpm@${PNPM_VERSION}`;
   const updated = rewriteScriptsInPackageJson(pkg, "yarn-to-pnpm");
-  writeFileSync8(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
-  console.log(chalk31.green("  Updated root package.json"));
+  writeFileSync10(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+  console.log(chalk33.green("  Updated root package.json"));
   return workspacePatterns;
 }
 function updateGitignore(cwd) {
-  const gitignorePath = PATH12.join(cwd, ".gitignore");
-  if (!existsSync10(gitignorePath)) return;
-  let content = readFileSync11(gitignorePath, "utf8");
+  const gitignorePath = PATH13.join(cwd, ".gitignore");
+  if (!existsSync12(gitignorePath)) return;
+  let content = readFileSync13(gitignorePath, "utf8");
   const yarnLines = [
     ".pnp.*",
     ".pnp",
@@ -2691,63 +2837,65 @@ 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");
-  writeFileSync8(gitignorePath, content, "utf8");
-  console.log(chalk31.green("  Updated .gitignore"));
+  writeFileSync10(gitignorePath, content, "utf8");
+  console.log(chalk33.green("  Updated .gitignore"));
 }
 function deleteYarnArtifacts(cwd) {
-  const yarnLock = PATH12.join(cwd, "yarn.lock");
-  const yarnrc = PATH12.join(cwd, ".yarnrc.yml");
-  const yarnDir = PATH12.join(cwd, ".yarn");
-  if (existsSync10(yarnLock)) {
+  const yarnLock = PATH13.join(cwd, "yarn.lock");
+  const yarnrc = PATH13.join(cwd, ".yarnrc.yml");
+  const yarnDir = PATH13.join(cwd, ".yarn");
+  if (existsSync12(yarnLock)) {
     rmSync3(yarnLock);
-    console.log(chalk31.gray("  Deleted yarn.lock"));
+    console.log(chalk33.gray("  Deleted yarn.lock"));
   }
-  if (existsSync10(yarnrc)) {
+  if (existsSync12(yarnrc)) {
     rmSync3(yarnrc);
-    console.log(chalk31.gray("  Deleted .yarnrc.yml"));
+    console.log(chalk33.gray("  Deleted .yarnrc.yml"));
   }
-  if (existsSync10(yarnDir)) {
+  if (existsSync12(yarnDir)) {
     rmSync3(yarnDir, { force: true, recursive: true });
-    console.log(chalk31.gray("  Deleted .yarn/"));
+    console.log(chalk33.gray("  Deleted .yarn/"));
   }
 }
 function createNpmrc(cwd) {
-  const npmrcPath = PATH12.join(cwd, ".npmrc");
-  if (existsSync10(npmrcPath)) return;
-  mkdirSync5(PATH12.dirname(npmrcPath), { recursive: true });
-  writeFileSync8(npmrcPath, "", "utf8");
-  console.log(chalk31.green("  Created .npmrc"));
+  const npmrcPath = PATH13.join(cwd, ".npmrc");
+  if (existsSync12(npmrcPath)) return;
+  mkdirSync5(PATH13.dirname(npmrcPath), { recursive: true });
+  writeFileSync10(npmrcPath, "", "utf8");
+  console.log(chalk33.green("  Created .npmrc"));
 }
 function convertToPnpm(cwd, workspacePackageJsonPaths) {
-  console.log(chalk31.blue("\nConverting to pnpm...\n"));
+  console.log(chalk33.blue("\nConverting to pnpm...\n"));
   const workspacePatterns = updateRootPackageJson(cwd);
   createPnpmWorkspaceYaml(cwd, workspacePatterns);
   for (const pkgPath of workspacePackageJsonPaths) {
-    const fullPath = PATH12.resolve(cwd, pkgPath, "package.json");
-    if (!existsSync10(fullPath)) continue;
-    const pkg = JSON.parse(readFileSync11(fullPath, "utf8"));
+    const fullPath = PATH13.resolve(cwd, pkgPath, "package.json");
+    if (!existsSync12(fullPath)) continue;
+    const pkg = JSON.parse(readFileSync13(fullPath, "utf8"));
     const updated = rewriteScriptsInPackageJson(pkg, "yarn-to-pnpm");
     if (JSON.stringify(pkg) !== JSON.stringify(updated)) {
-      writeFileSync8(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+      writeFileSync10(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
     }
   }
-  console.log(chalk31.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
+  console.log(chalk33.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
   updateGitignore(cwd);
   createNpmrc(cwd);
+  swapTsScriptsDependency(cwd, workspacePackageJsonPaths, "yarn-to-pnpm");
+  rewriteSourceImports(cwd, "yarn-to-pnpm");
   deleteYarnArtifacts(cwd);
-  console.log(chalk31.blue("\nConversion complete. Run `pnpm install` to generate pnpm-lock.yaml.\n"));
+  console.log(chalk33.blue("\nConversion complete. Run `pnpm install` to generate pnpm-lock.yaml.\n"));
   return 0;
 }
 
 // src/actions/packman/convertToYarn.ts
 import {
-  existsSync as existsSync11,
-  readFileSync as readFileSync12,
+  existsSync as existsSync13,
+  readFileSync as readFileSync14,
   rmSync as rmSync4,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync11
 } from "fs";
-import PATH13 from "path";
-import chalk32 from "chalk";
+import PATH14 from "path";
+import chalk34 from "chalk";
 var YARN_VERSION = "4.13.0";
 var YARNRC_TEMPLATE = `compressionLevel: mixed
 
@@ -2768,10 +2916,10 @@ var YARN_GITIGNORE_ENTRIES = `
 !.yarn/sdks
 !.yarn/versions
 `;
-function readPnpmWorkspacePatterns(cwd) {
-  const wsPath = PATH13.join(cwd, "pnpm-workspace.yaml");
-  if (!existsSync11(wsPath)) return [];
-  const content = readFileSync12(wsPath, "utf8");
+function readPnpmWorkspacePatterns2(cwd) {
+  const wsPath = PATH14.join(cwd, "pnpm-workspace.yaml");
+  if (!existsSync13(wsPath)) return [];
+  const content = readFileSync14(wsPath, "utf8");
   const patterns = [];
   const lines = content.split("\n");
   let inPackages = false;
@@ -2790,91 +2938,104 @@ function readPnpmWorkspacePatterns(cwd) {
   return patterns;
 }
 function updateRootPackageJson2(cwd, workspacePatterns) {
-  const pkgPath = PATH13.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync12(pkgPath, "utf8"));
+  const pkgPath = PATH14.join(cwd, "package.json");
+  const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
   pkg.workspaces = workspacePatterns;
   pkg.packageManager = `yarn@${YARN_VERSION}`;
   const updated = rewriteScriptsInPackageJson(pkg, "pnpm-to-yarn");
-  writeFileSync9(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
-  console.log(chalk32.green("  Updated root package.json"));
+  writeFileSync11(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+  console.log(chalk34.green("  Updated root package.json"));
 }
 function updateGitignore2(cwd) {
-  const gitignorePath = PATH13.join(cwd, ".gitignore");
-  let content = existsSync11(gitignorePath) ? readFileSync12(gitignorePath, "utf8") : "";
+  const gitignorePath = PATH14.join(cwd, ".gitignore");
+  let content = existsSync13(gitignorePath) ? readFileSync14(gitignorePath, "utf8") : "";
   if (!content.includes(".yarn/*")) {
     content = content.trimEnd() + "\n" + YARN_GITIGNORE_ENTRIES;
   }
-  writeFileSync9(gitignorePath, content, "utf8");
-  console.log(chalk32.green("  Updated .gitignore"));
+  writeFileSync11(gitignorePath, content, "utf8");
+  console.log(chalk34.green("  Updated .gitignore"));
 }
 function deletePnpmArtifacts(cwd) {
-  const lockfile = PATH13.join(cwd, "pnpm-lock.yaml");
-  const workspaceYaml = PATH13.join(cwd, "pnpm-workspace.yaml");
-  const npmrc = PATH13.join(cwd, ".npmrc");
-  if (existsSync11(lockfile)) {
+  const lockfile = PATH14.join(cwd, "pnpm-lock.yaml");
+  const workspaceYaml = PATH14.join(cwd, "pnpm-workspace.yaml");
+  const npmrc = PATH14.join(cwd, ".npmrc");
+  if (existsSync13(lockfile)) {
     rmSync4(lockfile);
-    console.log(chalk32.gray("  Deleted pnpm-lock.yaml"));
+    console.log(chalk34.gray("  Deleted pnpm-lock.yaml"));
   }
-  if (existsSync11(workspaceYaml)) {
+  if (existsSync13(workspaceYaml)) {
     rmSync4(workspaceYaml);
-    console.log(chalk32.gray("  Deleted pnpm-workspace.yaml"));
+    console.log(chalk34.gray("  Deleted pnpm-workspace.yaml"));
   }
-  if (existsSync11(npmrc)) {
-    const content = readFileSync12(npmrc, "utf8");
+  if (existsSync13(npmrc)) {
+    const content = readFileSync14(npmrc, "utf8");
     if (content.trim() === "" || content.includes("shamefully-hoist") || content.includes("node-linker")) {
       rmSync4(npmrc);
-      console.log(chalk32.gray("  Deleted .npmrc"));
+      console.log(chalk34.gray("  Deleted .npmrc"));
     }
   }
 }
 function createYarnrc(cwd) {
-  const yarnrcPath = PATH13.join(cwd, ".yarnrc.yml");
-  if (existsSync11(yarnrcPath)) return;
-  writeFileSync9(yarnrcPath, YARNRC_TEMPLATE, "utf8");
-  console.log(chalk32.green("  Created .yarnrc.yml"));
+  const yarnrcPath = PATH14.join(cwd, ".yarnrc.yml");
+  if (existsSync13(yarnrcPath)) return;
+  writeFileSync11(yarnrcPath, YARNRC_TEMPLATE, "utf8");
+  console.log(chalk34.green("  Created .yarnrc.yml"));
+}
+function readWorkspacePatternsFromPackageJson(cwd) {
+  const pkgPath = PATH14.join(cwd, "package.json");
+  if (!existsSync13(pkgPath)) return [];
+  const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
+  return pkg.workspaces ?? [];
 }
 function convertToYarn(cwd, workspacePackageJsonPaths) {
-  console.log(chalk32.blue("\nConverting to yarn...\n"));
-  const workspacePatterns = readPnpmWorkspacePatterns(cwd);
+  console.log(chalk34.blue("\nConverting to yarn...\n"));
+  const workspacePatterns = readPnpmWorkspacePatterns2(cwd);
   if (workspacePatterns.length === 0) {
-    console.warn(chalk32.yellow("  No workspace patterns found in pnpm-workspace.yaml"));
+    const fromPkg = readWorkspacePatternsFromPackageJson(cwd);
+    if (fromPkg.length > 0) {
+      workspacePatterns.push(...fromPkg);
+    } else {
+      console.warn(chalk34.yellow("  No workspace patterns found"));
+    }
   }
   updateRootPackageJson2(cwd, workspacePatterns);
   for (const pkgPath of workspacePackageJsonPaths) {
-    const fullPath = PATH13.resolve(cwd, pkgPath, "package.json");
-    if (!existsSync11(fullPath)) continue;
-    const pkg = JSON.parse(readFileSync12(fullPath, "utf8"));
+    const fullPath = PATH14.resolve(cwd, pkgPath, "package.json");
+    if (!existsSync13(fullPath)) continue;
+    const pkg = JSON.parse(readFileSync14(fullPath, "utf8"));
     const updated = rewriteScriptsInPackageJson(pkg, "pnpm-to-yarn");
     if (JSON.stringify(pkg) !== JSON.stringify(updated)) {
-      writeFileSync9(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+      writeFileSync11(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
     }
   }
-  console.log(chalk32.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
+  console.log(chalk34.green(`  Rewrote scripts in ${workspacePackageJsonPaths.length} workspace package(s)`));
   updateGitignore2(cwd);
   createYarnrc(cwd);
+  swapTsScriptsDependency(cwd, workspacePackageJsonPaths, "pnpm-to-yarn");
+  rewriteSourceImports(cwd, "pnpm-to-yarn");
   deletePnpmArtifacts(cwd);
-  console.log(chalk32.blue("\nConversion complete. Run `corepack enable yarn && yarn set version stable && yarn install` to finish setup.\n"));
+  console.log(chalk34.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 (existsSync12(PATH14.join(cwd, "pnpm-lock.yaml")) || existsSync12(PATH14.join(cwd, "pnpm-workspace.yaml"))) {
+  if (existsSync14(PATH15.join(cwd, "pnpm-lock.yaml")) || existsSync14(PATH15.join(cwd, "pnpm-workspace.yaml"))) {
     return "pnpm";
   }
-  if (existsSync12(PATH14.join(cwd, "yarn.lock")) || existsSync12(PATH14.join(cwd, ".yarnrc.yml"))) {
+  if (existsSync14(PATH15.join(cwd, "yarn.lock")) || existsSync14(PATH15.join(cwd, ".yarnrc.yml"))) {
     return "yarn";
   }
   return "unknown";
 }
 function findWorkspacePackagePaths(cwd) {
-  const pkgPath = PATH14.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync13(pkgPath, "utf8"));
+  const pkgPath = PATH15.join(cwd, "package.json");
+  const pkg = JSON.parse(readFileSync15(pkgPath, "utf8"));
   let patterns = pkg.workspaces ?? [];
   if (patterns.length === 0) {
-    const wsPath = PATH14.join(cwd, "pnpm-workspace.yaml");
-    if (existsSync12(wsPath)) {
-      const content = readFileSync13(wsPath, "utf8");
+    const wsPath = PATH15.join(cwd, "pnpm-workspace.yaml");
+    if (existsSync14(wsPath)) {
+      const content = readFileSync15(wsPath, "utf8");
       const lines = content.split("\n");
       let inPackages = false;
       for (const line of lines) {
@@ -2904,15 +3065,15 @@ function resolveWorkspaceGlob(cwd, pattern) {
 }
 function walkGlob(basePath, parts, currentPath) {
   if (parts.length === 0) {
-    const fullPath = PATH14.join(basePath, currentPath);
-    if (existsSync12(PATH14.join(fullPath, "package.json"))) {
+    const fullPath = PATH15.join(basePath, currentPath);
+    if (existsSync14(PATH15.join(fullPath, "package.json"))) {
       return [currentPath];
     }
     return [];
   }
   const [part, ...rest] = parts;
-  const dirPath = PATH14.join(basePath, currentPath);
-  if (!existsSync12(dirPath) || !statSync3(dirPath).isDirectory()) {
+  const dirPath = PATH15.join(basePath, currentPath);
+  if (!existsSync14(dirPath) || !statSync3(dirPath).isDirectory()) {
     return [];
   }
   if (part === "*" || part === "**") {
@@ -2940,26 +3101,25 @@ function walkGlob(basePath, parts, currentPath) {
 function convert({ target, verbose }) {
   const validTargets = ["pnpm", "yarn"];
   if (!validTargets.includes(target)) {
-    console.error(chalk33.red(`Invalid target "${target}". Must be one of: ${validTargets.join(", ")}`));
+    console.error(chalk35.red(`Invalid target "${target}". Must be one of: ${validTargets.join(", ")}`));
     return 1;
   }
   const cwd = process.cwd();
   const currentPM = detectCurrentPM(cwd);
   if (verbose) {
-    console.log(chalk33.gray(`Current package manager: ${currentPM}`));
-    console.log(chalk33.gray(`Target package manager: ${target}`));
+    console.log(chalk35.gray(`Current package manager: ${currentPM}`));
+    console.log(chalk35.gray(`Target package manager: ${target}`));
   }
   if (currentPM === target) {
-    console.error(chalk33.red(`Already using ${target}. No conversion needed.`));
-    return 1;
+    console.log(chalk35.yellow(`Already using ${target}. Re-applying conversion to fix any incomplete steps...`));
   }
   if (currentPM === "unknown") {
-    console.error(chalk33.red("Could not detect current package manager. No yarn.lock or pnpm-lock.yaml found."));
+    console.error(chalk35.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(chalk33.gray(`Found ${workspacePaths.length} workspace packages`));
+    console.log(chalk35.gray(`Found ${workspacePaths.length} workspace packages`));
   }
   if (target === "pnpm") {
     return convertToPnpm(cwd, workspacePaths);
@@ -3017,7 +3177,7 @@ var rebuild = ({ target }) => {
 };
 
 // src/actions/recompile.ts
-import chalk34 from "chalk";
+import chalk36 from "chalk";
 var recompile = async ({
   verbose,
   target,
@@ -3052,7 +3212,7 @@ var recompileAll = async ({
   const start = Date.now();
   const targetOptions = target ? ["-t", target] : [];
   if (jobs) {
-    console.log(chalk34.blue(`Jobs set to [${jobs}]`));
+    console.log(chalk36.blue(`Jobs set to [${jobs}]`));
   }
   const foreachOptions = {
     incremental,
@@ -3065,25 +3225,25 @@ var recompileAll = async ({
     pm.foreachWorkspace("package-compile", targetOptions, foreachOptions)
   ]);
   console.log(
-    `${chalk34.gray("Recompiled in")} [${chalk34.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk34.gray("seconds")}`
+    `${chalk36.gray("Recompiled in")} [${chalk36.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk36.gray("seconds")}`
   );
   return result;
 };
 
 // src/actions/relint.ts
-import chalk35 from "chalk";
+import chalk37 from "chalk";
 var relintPackage = ({
   pkg,
   fix: fix2,
   verbose
 }) => {
-  console.log(chalk35.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
+  console.log(chalk37.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
   const start = Date.now();
   const pm = getPackageManager();
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [${pkg}]`, [
     pm.runInWorkspace(pkg, fix2 ? "package-fix" : verbose ? "package-lint-verbose" : "package-lint")
   ]);
-  console.log(chalk35.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk35.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk35.gray("seconds")}`));
+  console.log(chalk37.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk37.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk37.gray("seconds")}`));
   return result;
 };
 var relint = ({
@@ -3103,13 +3263,13 @@ var relint = ({
   });
 };
 var relintAllPackages = ({ fix: fix2 = false } = {}) => {
-  console.log(chalk35.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
+  console.log(chalk37.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
   const start = Date.now();
   const fixOptions = fix2 ? ["--fix"] : [];
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
     ["eslint", fixOptions]
   ]);
-  console.log(chalk35.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk35.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk35.gray("seconds")}`));
+  console.log(chalk37.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk37.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk37.gray("seconds")}`));
   return result;
 };
 
@@ -3553,7 +3713,7 @@ var xyCommonCommands = (args) => {
 };
 
 // src/xy/lint/cycleCommand.ts
-import chalk36 from "chalk";
+import chalk38 from "chalk";
 var cycleCommand = {
   command: "cycle [package]",
   describe: "Cycle - Check for dependency cycles",
@@ -3564,12 +3724,12 @@ var cycleCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Cycle");
     process.exitCode = await cycle({ pkg: argv.package });
-    console.log(chalk36.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk38.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/deplintCommand.ts
-import chalk37 from "chalk";
+import chalk39 from "chalk";
 var deplintCommand = {
   command: "deplint [package]",
   describe: "Deplint - Run Deplint",
@@ -3607,12 +3767,12 @@ var deplintCommand = {
       peerDeps: !!argv.peerDeps,
       verbose: !!argv.verbose
     });
-    console.log(chalk37.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk39.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/fixCommand.ts
-import chalk38 from "chalk";
+import chalk40 from "chalk";
 var fixCommand = {
   command: "fix [package]",
   describe: "Fix - Run Eslint w/fix",
@@ -3623,12 +3783,12 @@ var fixCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Fix");
     process.exitCode = fix();
-    console.log(chalk38.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk40.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/knipCommand.ts
-import chalk39 from "chalk";
+import chalk41 from "chalk";
 var knipCommand = {
   command: "knip",
   describe: "Knip - Run Knip",
@@ -3639,12 +3799,12 @@ var knipCommand = {
     if (argv.verbose) console.log("Knip");
     const start = Date.now();
     process.exitCode = knip();
-    console.log(chalk39.blue(`Knip finished in ${Date.now() - start}ms`));
+    console.log(chalk41.blue(`Knip finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/lintCommand.ts
-import chalk40 from "chalk";
+import chalk42 from "chalk";
 var lintCommand = {
   command: "lint [package]",
   describe: "Lint - Run Eslint",
@@ -3673,7 +3833,7 @@ var lintCommand = {
       cache: argv.cache,
       verbose: !!argv.verbose
     });
-    console.log(chalk40.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk42.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
@@ -3715,7 +3875,7 @@ var packageLintCommand = {
 };
 
 // src/xy/lint/publintCommand.ts
-import chalk41 from "chalk";
+import chalk43 from "chalk";
 var publintCommand = {
   command: "publint [package]",
   describe: "Publint - Run Publint",
@@ -3726,12 +3886,12 @@ var publintCommand = {
     if (argv.verbose) console.log("Publint");
     const start = Date.now();
     process.exitCode = await publint({ pkg: argv.package, verbose: !!argv.verbose });
-    console.log(chalk41.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk43.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/relintCommand.ts
-import chalk42 from "chalk";
+import chalk44 from "chalk";
 var relintCommand = {
   command: "relint [package]",
   describe: "Relint - Clean & Lint",
@@ -3742,12 +3902,12 @@ var relintCommand = {
     if (argv.verbose) console.log("Relinting");
     const start = Date.now();
     process.exitCode = relint();
-    console.log(chalk42.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk44.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/sonarCommand.ts
-import chalk43 from "chalk";
+import chalk45 from "chalk";
 var sonarCommand = {
   command: "sonar",
   describe: "Sonar - Run Sonar Check",
@@ -3758,7 +3918,7 @@ var sonarCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Sonar Check");
     process.exitCode = sonar();
-    console.log(chalk43.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk45.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
@@ -3768,7 +3928,7 @@ var xyLintCommands = (args) => {
 };
 
 // src/xy/xy.ts
-import chalk44 from "chalk";
+import chalk46 from "chalk";
 
 // src/xy/xyParseOptions.ts
 import yargs from "yargs";
@@ -3811,8 +3971,8 @@ var xyBase = async (plugins) => {
   let args = xyBuildCommands(xyCommonCommands(xyLintCommands(options)));
   if (plugins) args = plugins(args);
   return await args.demandCommand(1).command("*", "", () => {
-    console.error(chalk44.yellow(`Command not found [${chalk44.magenta(process.argv[2])}]`));
-    console.log(chalk44.gray("Try 'xy --help' for list of commands"));
+    console.error(chalk46.yellow(`Command not found [${chalk46.magenta(process.argv[2])}]`));
+    console.log(chalk46.gray("Try 'xy --help' for list of commands"));
   }).version().help().argv;
 };