@xylabs/ts-scripts-common 7.5.3 → 7.5.5

package/dist/xy/xy.mjs

@@ -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)}`);
@@ -1766,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,
@@ -2672,7 +2692,11 @@ function rewriteScriptsInPackageJson(pkg, direction) {
 }
 
 // src/actions/packman/rewriteSourceImports.ts
-import { existsSync as existsSync10, readFileSync as readFileSync11, writeFileSync as writeFileSync8 } from "fs";
+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 = {