@xylabs/ts-scripts-common 7.5.2 → 7.5.4

package/dist/xy/xy.mjs

@@ -1,5 +1,5 @@
 // src/xy/xy.ts
-import chalk45 from "chalk";
+import chalk46 from "chalk";
 
 // src/actions/build.ts
 import chalk9 from "chalk";
@@ -1387,6 +1387,24 @@ function getExternalImportsFromFiles({
 // src/actions/deplint/checkPackage/getUnlistedDependencies.ts
 import { builtinModules } from "module";
 import chalk18 from "chalk";
+
+// src/actions/deplint/tsScriptsAliases.ts
+var VARIANT_MAP = {
+  "@xylabs/ts-scripts-yarn3": "@xylabs/ts-scripts-pnpm",
+  "@xylabs/ts-scripts-pnpm": "@xylabs/ts-scripts-yarn3",
+  "@xylabs/ts-scripts-react-yarn3": "@xylabs/ts-scripts-react-pnpm",
+  "@xylabs/ts-scripts-react-pnpm": "@xylabs/ts-scripts-react-yarn3"
+};
+function isSatisfiedByTsScriptsVariant(imp, allDeps) {
+  const variant = VARIANT_MAP[imp];
+  return variant !== void 0 && allDeps.includes(variant);
+}
+function isUsedViaTsScriptsVariant(dep, imports) {
+  const variant = VARIANT_MAP[dep];
+  return variant !== void 0 && imports.includes(variant);
+}
+
+// src/actions/deplint/checkPackage/getUnlistedDependencies.ts
 function isRuntimeImportListed(imp, name, dependencies, peerDependencies) {
   return dependencies.includes(imp) || imp === name || peerDependencies.includes(imp) || builtinModules.includes(imp);
 }
@@ -1409,14 +1427,15 @@ function getUnlistedDependencies({ name, location }, {
   distImportPaths
 }) {
   let unlistedDependencies = 0;
+  const allDeps = [...dependencies, ...devDependencies, ...peerDependencies];
   for (const imp of externalDistImports) {
-    if (!isRuntimeImportListed(imp, name, dependencies, peerDependencies)) {
+    if (!isRuntimeImportListed(imp, name, dependencies, peerDependencies) && !isSatisfiedByTsScriptsVariant(imp, allDeps)) {
       unlistedDependencies++;
       logMissing(name, imp, distImportPaths);
     }
   }
   for (const imp of externalDistTypeImports) {
-    if (!isTypeImportListed(imp, name, dependencies, devDependencies, peerDependencies)) {
+    if (!isTypeImportListed(imp, name, dependencies, devDependencies, peerDependencies) && !isSatisfiedByTsScriptsVariant(imp, allDeps)) {
       unlistedDependencies++;
       logMissing(name, imp, distImportPaths);
     }
@@ -1443,7 +1462,7 @@ function getUnlistedDevDependencies({ name, location }, {
 }) {
   let unlistedDevDependencies = 0;
   for (const imp of externalAllImports) {
-    if (!distImports.includes(imp) && imp !== name && !dependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && !peerDependencies.includes(`@types/${imp}`) && !devDependencies.includes(imp) && !devDependencies.includes(`@types/${imp}`) && !builtinModules2.includes(imp)) {
+    if (!distImports.includes(imp) && imp !== name && !dependencies.includes(imp) && !dependencies.includes(`@types/${imp}`) && !peerDependencies.includes(imp) && !peerDependencies.includes(`@types/${imp}`) && !devDependencies.includes(imp) && !devDependencies.includes(`@types/${imp}`) && !builtinModules2.includes(imp) && !isSatisfiedByTsScriptsVariant(imp, [...dependencies, ...devDependencies, ...peerDependencies])) {
       unlistedDevDependencies++;
       console.log(`[${chalk19.blue(name)}] Missing devDependency in package.json: ${chalk19.red(imp)}`);
       if (allImportPaths[imp]) {
@@ -1469,7 +1488,7 @@ function getUnusedDependencies({ name, location }, { dependencies }, {
   let unusedDependencies = 0;
   for (const dep of dependencies) {
     if (exclude?.has(dep)) continue;
-    if (!externalDistImports.includes(dep) && !externalDistImports.includes(dep.replace(/^@types\//, "")) && !externalDistTypeImports.includes(dep) && !externalDistTypeImports.includes(dep.replace(/^@types\//, ""))) {
+    if (!externalDistImports.includes(dep) && !externalDistImports.includes(dep.replace(/^@types\//, "")) && !externalDistTypeImports.includes(dep) && !externalDistTypeImports.includes(dep.replace(/^@types\//, "")) && !isUsedViaTsScriptsVariant(dep, [...externalDistImports, ...externalDistTypeImports])) {
       unusedDependencies++;
       if (externalAllImports.includes(dep)) {
         console.log(`[${chalk20.blue(name)}] dependency should be devDependency in package.json: ${chalk20.red(dep)}`);
@@ -1699,6 +1718,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",
@@ -1715,6 +1736,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) {
@@ -1748,7 +1785,8 @@ function isDevDepUsed(dep, allImports, implicitDeps, requiredPeers, scriptRefs,
     const baseName = dep.replace(/^@types\//, "");
     return allImports.has(baseName) || allImports.has(dep) || implicitDeps.has(baseName);
   }
-  return allImports.has(dep);
+  if (allImports.has(dep)) return true;
+  return isUsedViaTsScriptsVariant(dep, [...allImports]);
 }
 function getUnusedDevDependencies({ name, location }, {
   devDependencies,
@@ -2586,24 +2624,24 @@ function packageLintMonorepo(fix2 = false) {
 
 // src/actions/packman/convert.ts
 import {
-  existsSync as existsSync13,
+  existsSync as existsSync14,
   readdirSync as readdirSync6,
-  readFileSync as readFileSync14,
+  readFileSync as readFileSync15,
   statSync as statSync3
 } from "fs";
 import PATH15 from "path";
-import chalk34 from "chalk";
+import chalk35 from "chalk";
 
 // src/actions/packman/convertToPnpm.ts
 import {
-  existsSync as existsSync11,
+  existsSync as existsSync12,
   mkdirSync as mkdirSync5,
-  readFileSync as readFileSync12,
+  readFileSync as readFileSync13,
   rmSync as rmSync3,
-  writeFileSync as writeFileSync9
+  writeFileSync as writeFileSync10
 } from "fs";
 import PATH13 from "path";
-import chalk32 from "chalk";
+import chalk33 from "chalk";
 
 // src/actions/packman/rewriteScripts.ts
 function rewriteYarnToPnpm(script) {
@@ -2653,14 +2691,71 @@ function rewriteScriptsInPackageJson(pkg, direction) {
   return { ...pkg, scripts: rewritten };
 }
 
-// src/actions/packman/swapTsScriptsDependency.ts
+// src/actions/packman/rewriteSourceImports.ts
 import {
   existsSync as existsSync10,
   readFileSync as readFileSync11,
   writeFileSync as writeFileSync8
 } from "fs";
-import PATH12 from "path";
 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"]
@@ -2670,8 +2765,8 @@ var SWAP_MAP = {
   ]
 };
 function swapInPackageJson(pkgPath, direction) {
-  if (!existsSync10(pkgPath)) return false;
-  const raw = readFileSync11(pkgPath, "utf8");
+  if (!existsSync11(pkgPath)) return false;
+  const raw = readFileSync12(pkgPath, "utf8");
   const pkg = JSON.parse(raw);
   let changed = false;
   for (const depField of ["dependencies", "devDependencies"]) {
@@ -2686,7 +2781,7 @@ function swapInPackageJson(pkgPath, direction) {
     }
   }
   if (changed) {
-    writeFileSync8(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
+    writeFileSync9(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
   }
   return changed;
 }
@@ -2703,7 +2798,7 @@ function swapTsScriptsDependency(cwd, workspacePackageJsonPaths, direction) {
   }
   if (count > 0) {
     const target = direction === "yarn-to-pnpm" ? "@xylabs/ts-scripts-pnpm" : "@xylabs/ts-scripts-yarn3";
-    console.log(chalk31.green(`  Swapped ts-scripts dependency to ${target} in ${count} package(s)`));
+    console.log(chalk32.green(`  Swapped ts-scripts dependency to ${target} in ${count} package(s)`));
   }
 }
 
@@ -2714,13 +2809,13 @@ function createPnpmWorkspaceYaml(cwd, workspacePatterns) {
   for (const pattern of workspacePatterns) {
     lines.push(`  - '${pattern}'`);
   }
-  writeFileSync9(PATH13.join(cwd, "pnpm-workspace.yaml"), lines.join("\n") + "\n", "utf8");
-  console.log(chalk32.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 (!existsSync11(wsPath)) return [];
-  const content = readFileSync12(wsPath, "utf8");
+  if (!existsSync12(wsPath)) return [];
+  const content = readFileSync13(wsPath, "utf8");
   const patterns = [];
   const lines = content.split("\n");
   let inPackages = false;
@@ -2740,19 +2835,19 @@ function readPnpmWorkspacePatterns(cwd) {
 }
 function updateRootPackageJson(cwd) {
   const pkgPath = PATH13.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync12(pkgPath, "utf8"));
+  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");
-  writeFileSync9(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
-  console.log(chalk32.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 = PATH13.join(cwd, ".gitignore");
-  if (!existsSync11(gitignorePath)) return;
-  let content = readFileSync12(gitignorePath, "utf8");
+  if (!existsSync12(gitignorePath)) return;
+  let content = readFileSync13(gitignorePath, "utf8");
   const yarnLines = [
     ".pnp.*",
     ".pnp",
@@ -2767,64 +2862,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");
-  writeFileSync9(gitignorePath, content, "utf8");
-  console.log(chalk32.green("  Updated .gitignore"));
+  writeFileSync10(gitignorePath, content, "utf8");
+  console.log(chalk33.green("  Updated .gitignore"));
 }
 function deleteYarnArtifacts(cwd) {
   const yarnLock = PATH13.join(cwd, "yarn.lock");
   const yarnrc = PATH13.join(cwd, ".yarnrc.yml");
   const yarnDir = PATH13.join(cwd, ".yarn");
-  if (existsSync11(yarnLock)) {
+  if (existsSync12(yarnLock)) {
     rmSync3(yarnLock);
-    console.log(chalk32.gray("  Deleted yarn.lock"));
+    console.log(chalk33.gray("  Deleted yarn.lock"));
   }
-  if (existsSync11(yarnrc)) {
+  if (existsSync12(yarnrc)) {
     rmSync3(yarnrc);
-    console.log(chalk32.gray("  Deleted .yarnrc.yml"));
+    console.log(chalk33.gray("  Deleted .yarnrc.yml"));
   }
-  if (existsSync11(yarnDir)) {
+  if (existsSync12(yarnDir)) {
     rmSync3(yarnDir, { force: true, recursive: true });
-    console.log(chalk32.gray("  Deleted .yarn/"));
+    console.log(chalk33.gray("  Deleted .yarn/"));
   }
 }
 function createNpmrc(cwd) {
   const npmrcPath = PATH13.join(cwd, ".npmrc");
-  if (existsSync11(npmrcPath)) return;
+  if (existsSync12(npmrcPath)) return;
   mkdirSync5(PATH13.dirname(npmrcPath), { recursive: true });
-  writeFileSync9(npmrcPath, "", "utf8");
-  console.log(chalk32.green("  Created .npmrc"));
+  writeFileSync10(npmrcPath, "", "utf8");
+  console.log(chalk33.green("  Created .npmrc"));
 }
 function convertToPnpm(cwd, workspacePackageJsonPaths) {
-  console.log(chalk32.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 = PATH13.resolve(cwd, pkgPath, "package.json");
-    if (!existsSync11(fullPath)) continue;
-    const pkg = JSON.parse(readFileSync12(fullPath, "utf8"));
+    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)) {
-      writeFileSync9(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+      writeFileSync10(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
     }
   }
-  console.log(chalk32.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(chalk32.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 existsSync12,
-  readFileSync as readFileSync13,
+  existsSync as existsSync13,
+  readFileSync as readFileSync14,
   rmSync as rmSync4,
-  writeFileSync as writeFileSync10
+  writeFileSync as writeFileSync11
 } from "fs";
 import PATH14 from "path";
-import chalk33 from "chalk";
+import chalk34 from "chalk";
 var YARN_VERSION = "4.13.0";
 var YARNRC_TEMPLATE = `compressionLevel: mixed
 
@@ -2847,8 +2943,8 @@ var YARN_GITIGNORE_ENTRIES = `
 `;
 function readPnpmWorkspacePatterns2(cwd) {
   const wsPath = PATH14.join(cwd, "pnpm-workspace.yaml");
-  if (!existsSync12(wsPath)) return [];
-  const content = readFileSync13(wsPath, "utf8");
+  if (!existsSync13(wsPath)) return [];
+  const content = readFileSync14(wsPath, "utf8");
   const patterns = [];
   const lines = content.split("\n");
   let inPackages = false;
@@ -2868,102 +2964,103 @@ function readPnpmWorkspacePatterns2(cwd) {
 }
 function updateRootPackageJson2(cwd, workspacePatterns) {
   const pkgPath = PATH14.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync13(pkgPath, "utf8"));
+  const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
   pkg.workspaces = workspacePatterns;
   pkg.packageManager = `yarn@${YARN_VERSION}`;
   const updated = rewriteScriptsInPackageJson(pkg, "pnpm-to-yarn");
-  writeFileSync10(pkgPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
-  console.log(chalk33.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 = PATH14.join(cwd, ".gitignore");
-  let content = existsSync12(gitignorePath) ? readFileSync13(gitignorePath, "utf8") : "";
+  let content = existsSync13(gitignorePath) ? readFileSync14(gitignorePath, "utf8") : "";
   if (!content.includes(".yarn/*")) {
     content = content.trimEnd() + "\n" + YARN_GITIGNORE_ENTRIES;
   }
-  writeFileSync10(gitignorePath, content, "utf8");
-  console.log(chalk33.green("  Updated .gitignore"));
+  writeFileSync11(gitignorePath, content, "utf8");
+  console.log(chalk34.green("  Updated .gitignore"));
 }
 function deletePnpmArtifacts(cwd) {
   const lockfile = PATH14.join(cwd, "pnpm-lock.yaml");
   const workspaceYaml = PATH14.join(cwd, "pnpm-workspace.yaml");
   const npmrc = PATH14.join(cwd, ".npmrc");
-  if (existsSync12(lockfile)) {
+  if (existsSync13(lockfile)) {
     rmSync4(lockfile);
-    console.log(chalk33.gray("  Deleted pnpm-lock.yaml"));
+    console.log(chalk34.gray("  Deleted pnpm-lock.yaml"));
   }
-  if (existsSync12(workspaceYaml)) {
+  if (existsSync13(workspaceYaml)) {
     rmSync4(workspaceYaml);
-    console.log(chalk33.gray("  Deleted pnpm-workspace.yaml"));
+    console.log(chalk34.gray("  Deleted pnpm-workspace.yaml"));
   }
-  if (existsSync12(npmrc)) {
-    const content = readFileSync13(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(chalk33.gray("  Deleted .npmrc"));
+      console.log(chalk34.gray("  Deleted .npmrc"));
     }
   }
 }
 function createYarnrc(cwd) {
   const yarnrcPath = PATH14.join(cwd, ".yarnrc.yml");
-  if (existsSync12(yarnrcPath)) return;
-  writeFileSync10(yarnrcPath, YARNRC_TEMPLATE, "utf8");
-  console.log(chalk33.green("  Created .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 (!existsSync12(pkgPath)) return [];
-  const pkg = JSON.parse(readFileSync13(pkgPath, "utf8"));
+  if (!existsSync13(pkgPath)) return [];
+  const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
   return pkg.workspaces ?? [];
 }
 function convertToYarn(cwd, workspacePackageJsonPaths) {
-  console.log(chalk33.blue("\nConverting to yarn...\n"));
+  console.log(chalk34.blue("\nConverting to yarn...\n"));
   const workspacePatterns = readPnpmWorkspacePatterns2(cwd);
   if (workspacePatterns.length === 0) {
     const fromPkg = readWorkspacePatternsFromPackageJson(cwd);
     if (fromPkg.length > 0) {
       workspacePatterns.push(...fromPkg);
     } else {
-      console.warn(chalk33.yellow("  No workspace patterns found"));
+      console.warn(chalk34.yellow("  No workspace patterns found"));
     }
   }
   updateRootPackageJson2(cwd, workspacePatterns);
   for (const pkgPath of workspacePackageJsonPaths) {
     const fullPath = PATH14.resolve(cwd, pkgPath, "package.json");
-    if (!existsSync12(fullPath)) continue;
-    const pkg = JSON.parse(readFileSync13(fullPath, "utf8"));
+    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)) {
-      writeFileSync10(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
+      writeFileSync11(fullPath, JSON.stringify(updated, null, 2) + "\n", "utf8");
     }
   }
-  console.log(chalk33.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(chalk33.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 (existsSync13(PATH15.join(cwd, "pnpm-lock.yaml")) || existsSync13(PATH15.join(cwd, "pnpm-workspace.yaml"))) {
+  if (existsSync14(PATH15.join(cwd, "pnpm-lock.yaml")) || existsSync14(PATH15.join(cwd, "pnpm-workspace.yaml"))) {
     return "pnpm";
   }
-  if (existsSync13(PATH15.join(cwd, "yarn.lock")) || existsSync13(PATH15.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 = PATH15.join(cwd, "package.json");
-  const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
+  const pkg = JSON.parse(readFileSync15(pkgPath, "utf8"));
   let patterns = pkg.workspaces ?? [];
   if (patterns.length === 0) {
     const wsPath = PATH15.join(cwd, "pnpm-workspace.yaml");
-    if (existsSync13(wsPath)) {
-      const content = readFileSync14(wsPath, "utf8");
+    if (existsSync14(wsPath)) {
+      const content = readFileSync15(wsPath, "utf8");
       const lines = content.split("\n");
       let inPackages = false;
       for (const line of lines) {
@@ -2994,14 +3091,14 @@ function resolveWorkspaceGlob(cwd, pattern) {
 function walkGlob(basePath, parts, currentPath) {
   if (parts.length === 0) {
     const fullPath = PATH15.join(basePath, currentPath);
-    if (existsSync13(PATH15.join(fullPath, "package.json"))) {
+    if (existsSync14(PATH15.join(fullPath, "package.json"))) {
       return [currentPath];
     }
     return [];
   }
   const [part, ...rest] = parts;
   const dirPath = PATH15.join(basePath, currentPath);
-  if (!existsSync13(dirPath) || !statSync3(dirPath).isDirectory()) {
+  if (!existsSync14(dirPath) || !statSync3(dirPath).isDirectory()) {
     return [];
   }
   if (part === "*" || part === "**") {
@@ -3029,25 +3126,25 @@ function walkGlob(basePath, parts, currentPath) {
 function convert({ target, verbose }) {
   const validTargets = ["pnpm", "yarn"];
   if (!validTargets.includes(target)) {
-    console.error(chalk34.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(chalk34.gray(`Current package manager: ${currentPM}`));
-    console.log(chalk34.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.log(chalk34.yellow(`Already using ${target}. Re-applying conversion to fix any incomplete steps...`));
+    console.log(chalk35.yellow(`Already using ${target}. Re-applying conversion to fix any incomplete steps...`));
   }
   if (currentPM === "unknown") {
-    console.error(chalk34.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(chalk34.gray(`Found ${workspacePaths.length} workspace packages`));
+    console.log(chalk35.gray(`Found ${workspacePaths.length} workspace packages`));
   }
   if (target === "pnpm") {
     return convertToPnpm(cwd, workspacePaths);
@@ -3105,7 +3202,7 @@ var rebuild = ({ target }) => {
 };
 
 // src/actions/recompile.ts
-import chalk35 from "chalk";
+import chalk36 from "chalk";
 var recompile = async ({
   verbose,
   target,
@@ -3140,7 +3237,7 @@ var recompileAll = async ({
   const start = Date.now();
   const targetOptions = target ? ["-t", target] : [];
   if (jobs) {
-    console.log(chalk35.blue(`Jobs set to [${jobs}]`));
+    console.log(chalk36.blue(`Jobs set to [${jobs}]`));
   }
   const foreachOptions = {
     incremental,
@@ -3153,25 +3250,25 @@ var recompileAll = async ({
     pm.foreachWorkspace("package-compile", targetOptions, foreachOptions)
   ]);
   console.log(
-    `${chalk35.gray("Recompiled in")} [${chalk35.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk35.gray("seconds")}`
+    `${chalk36.gray("Recompiled in")} [${chalk36.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk36.gray("seconds")}`
   );
   return result;
 };
 
 // src/actions/relint.ts
-import chalk36 from "chalk";
+import chalk37 from "chalk";
 var relintPackage = ({
   pkg,
   fix: fix2,
   verbose
 }) => {
-  console.log(chalk36.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(chalk36.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk36.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk36.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 = ({
@@ -3191,13 +3288,13 @@ var relint = ({
   });
 };
 var relintAllPackages = ({ fix: fix2 = false } = {}) => {
-  console.log(chalk36.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(chalk36.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk36.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk36.gray("seconds")}`));
+  console.log(chalk37.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk37.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk37.gray("seconds")}`));
   return result;
 };
 
@@ -3641,7 +3738,7 @@ var xyCommonCommands = (args) => {
 };
 
 // src/xy/lint/cycleCommand.ts
-import chalk37 from "chalk";
+import chalk38 from "chalk";
 var cycleCommand = {
   command: "cycle [package]",
   describe: "Cycle - Check for dependency cycles",
@@ -3652,12 +3749,12 @@ var cycleCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Cycle");
     process.exitCode = await cycle({ pkg: argv.package });
-    console.log(chalk37.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk38.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/deplintCommand.ts
-import chalk38 from "chalk";
+import chalk39 from "chalk";
 var deplintCommand = {
   command: "deplint [package]",
   describe: "Deplint - Run Deplint",
@@ -3695,12 +3792,12 @@ var deplintCommand = {
       peerDeps: !!argv.peerDeps,
       verbose: !!argv.verbose
     });
-    console.log(chalk38.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk39.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/fixCommand.ts
-import chalk39 from "chalk";
+import chalk40 from "chalk";
 var fixCommand = {
   command: "fix [package]",
   describe: "Fix - Run Eslint w/fix",
@@ -3711,12 +3808,12 @@ var fixCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Fix");
     process.exitCode = fix();
-    console.log(chalk39.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk40.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/knipCommand.ts
-import chalk40 from "chalk";
+import chalk41 from "chalk";
 var knipCommand = {
   command: "knip",
   describe: "Knip - Run Knip",
@@ -3727,12 +3824,12 @@ var knipCommand = {
     if (argv.verbose) console.log("Knip");
     const start = Date.now();
     process.exitCode = knip();
-    console.log(chalk40.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 chalk41 from "chalk";
+import chalk42 from "chalk";
 var lintCommand = {
   command: "lint [package]",
   describe: "Lint - Run Eslint",
@@ -3761,7 +3858,7 @@ var lintCommand = {
       cache: argv.cache,
       verbose: !!argv.verbose
     });
-    console.log(chalk41.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk42.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
@@ -3803,7 +3900,7 @@ var packageLintCommand = {
 };
 
 // src/xy/lint/publintCommand.ts
-import chalk42 from "chalk";
+import chalk43 from "chalk";
 var publintCommand = {
   command: "publint [package]",
   describe: "Publint - Run Publint",
@@ -3814,12 +3911,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(chalk42.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk43.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/relintCommand.ts
-import chalk43 from "chalk";
+import chalk44 from "chalk";
 var relintCommand = {
   command: "relint [package]",
   describe: "Relint - Clean & Lint",
@@ -3830,12 +3927,12 @@ var relintCommand = {
     if (argv.verbose) console.log("Relinting");
     const start = Date.now();
     process.exitCode = relint();
-    console.log(chalk43.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk44.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
 // src/xy/lint/sonarCommand.ts
-import chalk44 from "chalk";
+import chalk45 from "chalk";
 var sonarCommand = {
   command: "sonar",
   describe: "Sonar - Run Sonar Check",
@@ -3846,7 +3943,7 @@ var sonarCommand = {
     const start = Date.now();
     if (argv.verbose) console.log("Sonar Check");
     process.exitCode = sonar();
-    console.log(chalk44.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk45.blue(`Finished in ${Date.now() - start}ms`));
   }
 };
 
@@ -3896,8 +3993,8 @@ var xyBase = async (plugins) => {
   let args = xyBuildCommands(xyCommonCommands(xyLintCommands(options)));
   if (plugins) args = plugins(args);
   return await args.demandCommand(1).command("*", "", () => {
-    console.error(chalk45.yellow(`Command not found [${chalk45.magenta(process.argv[2])}]`));
-    console.log(chalk45.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;
 };
 export {