@xylabs/ts-scripts-yarn3 6.5.0 → 6.5.1

package/dist/xy/xyLintCommands.mjs

@@ -1,5 +1,5 @@
 // src/xy/xyLintCommands.ts
-import chalk8 from "chalk";
+import chalk13 from "chalk";
 
 // src/lib/checkResult.ts
 import chalk from "chalk";
@@ -216,12 +216,33 @@ var cycleAll = async ({ verbose = false }) => {
   return result.exitCode;
 };
 
-// src/actions/deplint.ts
+// src/actions/deplint/deplint.ts
+import chalk10 from "chalk";
+
+// src/actions/deplint/findFilesByGlob.ts
+import { globSync } from "glob";
+function findFilesByGlob(cwd, pattern) {
+  return globSync(pattern, { cwd, absolute: true });
+}
+
+// src/actions/deplint/findFiles.ts
+function findFiles(path3) {
+  const allSourceInclude = ["./src/**/*.{ts,tsx}", "./dist/**/*.d.ts"];
+  const prodExcludeEndswith = [".spec.ts", ".stories.tsx"];
+  const prodExcludeIncludes = ["/spec/", "/stories/", "/scripts/"];
+  const allSourceFiles = allSourceInclude.flatMap((pattern) => findFilesByGlob(path3, pattern));
+  const prodSourceFiles = allSourceFiles.filter((file) => !prodExcludeEndswith.some((ext) => file.endsWith(ext)) && !prodExcludeIncludes.some((excl) => file.includes(excl)));
+  const devSourceFiles = allSourceFiles.filter((file) => !prodSourceFiles.includes(file));
+  return {
+    allSourceFiles,
+    prodSourceFiles,
+    devSourceFiles
+  };
+}
+
+// src/actions/deplint/getDependenciesFromPackageJson.ts
 import fs from "node:fs";
 import path from "node:path";
-import chalk5 from "chalk";
-import { globSync } from "glob";
-import ts from "typescript";
 function getDependenciesFromPackageJson(packageJsonPath) {
   const packageJsonFullPath = path.resolve(packageJsonPath);
   const rawContent = fs.readFileSync(packageJsonFullPath, "utf8");
@@ -235,6 +256,13 @@ function getDependenciesFromPackageJson(packageJsonPath) {
     peerDependencies
   };
 }
+
+// src/actions/deplint/getImportsFromFile.ts
+import fs2 from "node:fs";
+import path2 from "node:path";
+import ts from "typescript";
+
+// src/actions/deplint/getBasePackageName.ts
 function getBasePackageName(importName) {
   if (importName.startsWith("@")) {
     const parts = importName.split("/");
@@ -242,10 +270,12 @@ function getBasePackageName(importName) {
   }
   return importName.split("/")[0];
 }
+
+// src/actions/deplint/getImportsFromFile.ts
 function getImportsFromFile(filePath, importPaths, typeImportPaths) {
-  const sourceCode = fs.readFileSync(filePath, "utf8");
+  const sourceCode = fs2.readFileSync(filePath, "utf8");
   const sourceFile = ts.createSourceFile(
-    path.basename(filePath),
+    path2.basename(filePath),
     sourceCode,
     ts.ScriptTarget.Latest,
     true
@@ -288,36 +318,26 @@ function getImportsFromFile(filePath, importPaths, typeImportPaths) {
   }
   return [cleanedImports, cleanedTypeImports];
 }
-function findFilesByGlob(cwd, pattern) {
-  return globSync(pattern, { cwd, absolute: true });
-}
-function findFiles(path2) {
-  const allSourceInclude = ["./src/**/*.{ts,tsx}", "./dist/**/*.d.ts"];
-  const prodExcludeEndswith = [".spec.ts", ".stories.tsx"];
-  const prodExcludeIncludes = ["/spec/", "/stories/", "/scripts/"];
-  const allSourceFiles = allSourceInclude.flatMap((pattern) => findFilesByGlob(path2, pattern));
-  const prodSourceFiles = allSourceFiles.filter((file) => !prodExcludeEndswith.some((ext) => file.endsWith(ext)) && !prodExcludeIncludes.some((excl) => file.includes(excl)));
-  const devSourceFiles = allSourceFiles.filter((file) => !prodSourceFiles.includes(file));
-  return {
-    allSourceFiles,
-    prodSourceFiles,
-    devSourceFiles
-  };
-}
+
+// src/actions/deplint/getExternalImportsFromFiles.ts
+var internalImportPrefixes = [".", "#", "node:"];
+var removeInternalImports = (imports) => {
+  return imports.filter((imp) => !internalImportPrefixes.some((prefix) => imp.startsWith(prefix)));
+};
 function getExternalImportsFromFiles({ prodSourceFiles, devSourceFiles }) {
   const prodImportPaths = {};
   const prodTypeImportPaths = {};
-  const prodImportPairs = prodSourceFiles.map((path2) => getImportsFromFile(path2, prodImportPaths, prodTypeImportPaths));
+  const prodImportPairs = prodSourceFiles.map((path3) => getImportsFromFile(path3, prodImportPaths, prodTypeImportPaths));
   const prodImports = prodImportPairs.flatMap((pair) => pair[0]);
   const prodTypeImports = prodImportPairs.flatMap((pair) => pair[1]);
   const devImportPaths = {};
   const devTypeImportPaths = {};
-  const devImportPairs = devSourceFiles.map((path2) => getImportsFromFile(path2, devImportPaths, devTypeImportPaths));
+  const devImportPairs = devSourceFiles.map((path3) => getImportsFromFile(path3, devImportPaths, devTypeImportPaths));
   const devImports = devImportPairs.flatMap((pair) => pair[0]);
   const devTypeImports = devImportPairs.flatMap((pair) => pair[1]);
-  const externalProdImports = prodImports.filter((imp) => !imp.startsWith(".") && !imp.startsWith("#") && !imp.startsWith("node:"));
-  const externalProdTypeImports = prodTypeImports.filter((imp) => !imp.startsWith(".") && !imp.startsWith("#") && !imp.startsWith("node:"));
-  const externalDevImports = devImports.filter((imp) => !imp.startsWith(".") && !imp.startsWith("#") && !imp.startsWith("node:"));
+  const externalProdImports = removeInternalImports(prodImports);
+  const externalProdTypeImports = removeInternalImports(prodTypeImports);
+  const externalDevImports = removeInternalImports(devImports);
   return {
     prodImports,
     devImports,
@@ -331,34 +351,40 @@ function getExternalImportsFromFiles({ prodSourceFiles, devSourceFiles }) {
     externalProdTypeImports
   };
 }
-function check({
-  name,
-  location,
-  devDeps = false,
-  peerDeps = false
+
+// src/actions/deplint/checkPackage/getTypesInDependencies.ts
+import chalk5 from "chalk";
+function getTypesInDependencies({ name, location }, { dependencies }, {}) {
+  let typesInDependencies = 0;
+  for (const dep of dependencies) {
+    if (dep.startsWith("@types/")) {
+      typesInDependencies++;
+      console.log(`[${chalk5.blue(name)}] @types in dependencies in package.json: ${chalk5.red(dep)}`);
+      console.log(`  ${location}/package.json
+`);
+      console.log("");
+    }
+  }
+  return typesInDependencies;
+}
+
+// src/actions/deplint/checkPackage/getUnlistedDependencies.ts
+import chalk6 from "chalk";
+function getUnlistedDependencies({ name }, {
+  dependencies,
+  devDependencies,
+  peerDependencies
+}, {
+  externalProdTypeImports,
+  prodTypeImportPaths,
+  externalProdImports,
+  prodImportPaths
 }) {
-  const { prodSourceFiles, devSourceFiles } = findFiles(location);
-  const {
-    prodTypeImportPaths,
-    prodImportPaths,
-    externalProdTypeImports,
-    devImportPaths,
-    externalProdImports,
-    externalDevImports
-  } = getExternalImportsFromFiles({ prodSourceFiles, devSourceFiles });
-  const {
-    dependencies,
-    devDependencies,
-    peerDependencies
-  } = getDependenciesFromPackageJson(`${location}/package.json`);
   let unlistedDependencies = 0;
-  let unlistedDevDependencies = 0;
-  let unusedDependencies = 0;
-  let typesInDependencies = 0;
   for (const imp of externalProdTypeImports) {
     if (!dependencies.includes(imp) && !peerDependencies.includes(imp) && !devDependencies.includes(imp) && !devDependencies.includes(`@types/${imp}`)) {
       unlistedDependencies++;
-      console.log(`[${chalk5.blue(name)}] Missing dependency in package.json: ${chalk5.red(imp)}`);
+      console.log(`[${chalk6.blue(name)}] Missing dependency in package.json: ${chalk6.red(imp)}`);
       console.log(`  ${prodTypeImportPaths[imp].join("\n")}`);
       console.log("");
     }
@@ -366,79 +392,128 @@ function check({
   for (const imp of externalProdImports) {
     if (!dependencies.includes(imp) && !peerDependencies.includes(imp)) {
       unlistedDependencies++;
-      console.log(`[${chalk5.blue(name)}] Missing dependency in package.json: ${chalk5.red(imp)}`);
+      console.log(`[${chalk6.blue(name)}] Missing dependency in package.json: ${chalk6.red(imp)}`);
       console.log(`  ${prodImportPaths[imp].join("\n")}`);
       console.log("");
     }
   }
+  return unlistedDependencies;
+}
+
+// src/actions/deplint/checkPackage/getUnlistedDevDependencies.ts
+import chalk7 from "chalk";
+function getUnlistedDevDependencies({ name }, { devDependencies }, { devImportPaths, externalDevImports }) {
+  let unlistedDevDependencies = 0;
+  for (const imp of externalDevImports) {
+    if (!devDependencies.includes(imp)) {
+      unlistedDevDependencies++;
+      console.log(`[${chalk7.blue(name)}] Missing devDependency in package.json: ${chalk7.red(imp)}`);
+      console.log(`  Found in: ${devImportPaths[imp].join(", ")}`);
+    }
+  }
+  return unlistedDevDependencies;
+}
+
+// src/actions/deplint/checkPackage/getUnusedDependencies.ts
+import chalk8 from "chalk";
+function getUnusedDependencies({ name, location }, { dependencies }, {
+  externalProdImports,
+  externalProdTypeImports
+}) {
+  let unusedDependencies = 0;
   for (const dep of dependencies) {
-    if (dep.startsWith("@types/")) {
-      typesInDependencies++;
-      console.log(`[${chalk5.blue(name)}] @types in dependencies in package.json: ${chalk5.red(dep)}`);
+    if (!externalProdImports.includes(dep) && !externalProdTypeImports.includes(dep)) {
+      unusedDependencies++;
+      console.log(`[${chalk8.blue(name)}] Unused dependency in package.json: ${chalk8.red(dep)}`);
       console.log(`  ${location}/package.json
 `);
       console.log("");
     }
-    if (!externalProdImports.includes(dep)) {
+  }
+  return unusedDependencies;
+}
+
+// src/actions/deplint/checkPackage/getUnusedPeerDependencies.ts
+import chalk9 from "chalk";
+function getUnusedPeerDependencies({ name, location }, { peerDependencies }, { externalProdImports, externalProdTypeImports }) {
+  let unusedDependencies = 0;
+  for (const dep of peerDependencies) {
+    if (!externalProdImports.includes(dep) && !externalProdTypeImports.includes(dep)) {
       unusedDependencies++;
-      console.log(`[${chalk5.blue(name)}] Unused dependency in package.json: ${chalk5.red(dep)}`);
+      console.log(`[${chalk9.blue(name)}] Unused peerDependency in package.json: ${chalk9.red(dep)}`);
       console.log(`  ${location}/package.json
 `);
       console.log("");
     }
   }
-  if (peerDeps) {
-    for (const dep of peerDependencies) {
-      if (!externalProdImports.includes(dep)) {
-        unusedDependencies++;
-        console.log(`[${chalk5.blue(name)}] Unused peerDependency in package.json: ${chalk5.red(dep)}`);
-        console.log(`  ${location}/package.json
-`);
-        console.log("");
-      }
-    }
-  }
-  if (devDeps) {
-    for (const imp of externalDevImports) {
-      if (!devDependencies.includes(imp)) {
-        unlistedDevDependencies++;
-        console.log(`[${chalk5.blue(name)}] Missing devDependency in package.json: ${chalk5.red(imp)}`);
-        console.log(`  Found in: ${devImportPaths[imp].join(", ")}`);
-      }
-    }
-  }
-  const totalErrors = unlistedDependencies + unlistedDevDependencies + unusedDependencies + typesInDependencies;
+  return unusedDependencies;
+}
+
+// src/actions/deplint/checkPackage/checkPackage.ts
+function checkPackage({
+  name,
+  location,
+  deps = false,
+  devDeps = false,
+  peerDeps = false
+}) {
+  const { prodSourceFiles, devSourceFiles } = findFiles(location);
+  const checkDeps = deps || !(deps || devDeps || peerDeps);
+  const checkDevDeps = devDeps || !(deps || devDeps || peerDeps);
+  const checkPeerDeps = peerDeps || !(deps || devDeps || peerDeps);
+  const sourceParams = getExternalImportsFromFiles({ prodSourceFiles, devSourceFiles });
+  const packageParams = getDependenciesFromPackageJson(`${location}/package.json`);
+  const unlistedDependencies = checkDeps ? getUnlistedDependencies({ name, location }, packageParams, sourceParams) : 0;
+  const unusedDependencies = checkDeps ? getUnusedDependencies({ name, location }, packageParams, sourceParams) : 0;
+  const typesInDependencies = checkDeps ? getTypesInDependencies({ name, location }, packageParams, sourceParams) : 0;
+  const unlistedDevDependencies = checkDevDeps ? getUnlistedDevDependencies({ name, location }, packageParams, sourceParams) : 0;
+  const unusedPeerDependencies = checkPeerDeps ? getUnusedPeerDependencies({ name, location }, packageParams, sourceParams) : 0;
+  const totalErrors = unlistedDependencies + unlistedDevDependencies + unusedDependencies + typesInDependencies + unusedPeerDependencies;
   return totalErrors;
 }
-var deplint = ({ pkg }) => {
+
+// src/actions/deplint/deplint.ts
+var deplint = ({
+  pkg,
+  deps,
+  devDeps,
+  peerDeps
+}) => {
   if (pkg) {
     const { location, name } = yarnWorkspace(pkg);
     console.log(`Running Deplint for ${name}`);
-    check({
+    checkPackage({
       name,
       location,
-      devDeps: true
+      devDeps,
+      deps,
+      peerDeps
     });
   } else {
     const workspaces = yarnWorkspaces();
     console.log("Deplint Started...");
     let totalErrors = 0;
     for (const workspace of workspaces) {
-      totalErrors += check(workspace);
+      totalErrors += checkPackage({
+        ...workspace,
+        deps,
+        devDeps,
+        peerDeps
+      });
     }
     if (totalErrors > 0) {
-      console.log(`Found ${chalk5.red(totalErrors)} unlisted imports.`);
+      console.log(`Deplint: Found ${chalk10.red(totalErrors)} dependency problems. ${chalk10.red("\u2716")}`);
     } else {
-      console.log(`No unlisted imports found. ${chalk5.green("\u2714")}`);
+      console.log(`Deplint: Found no dependency problems. ${chalk10.green("\u2714")}`);
     }
   }
   return 0;
 };
 
 // src/actions/lint.ts
-import chalk6 from "chalk";
+import chalk11 from "chalk";
 var lintPackage = ({ pkg, fix: fix2 }) => {
-  console.log(chalk6.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
+  console.log(chalk11.gray(`${fix2 ? "Fix" : "Lint"} [${pkg}]`));
   const start = Date.now();
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [${pkg}]`, [
     ["yarn", [
@@ -448,7 +523,7 @@ var lintPackage = ({ pkg, fix: fix2 }) => {
       fix2 ? "package-fix" : "package-lint"
     ]]
   ]);
-  console.log(chalk6.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk6.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk6.gray("seconds")}`));
+  console.log(chalk11.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk11.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk11.gray("seconds")}`));
   return result;
 };
 var lint = ({
@@ -464,13 +539,13 @@ var lint = ({
   });
 };
 var lintAllPackages = ({ fix: fix2 = false } = {}) => {
-  console.log(chalk6.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
+  console.log(chalk11.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
   const start = Date.now();
   const fixOptions = fix2 ? ["--fix"] : [];
   const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
     ["yarn", ["eslint", ...fixOptions]]
   ]);
-  console.log(chalk6.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk6.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk6.gray("seconds")}`));
+  console.log(chalk11.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk11.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk11.gray("seconds")}`));
   return result;
 };
 
@@ -497,9 +572,9 @@ var publintAll = ({ verbose }) => {
 };
 
 // src/actions/relint.ts
-import chalk7 from "chalk";
+import chalk12 from "chalk";
 var relintPackage = ({ pkg }) => {
-  console.log(chalk7.gray(`${"Relint"} [All-Packages]`));
+  console.log(chalk12.gray(`${"Relint"} [All-Packages]`));
   const start = Date.now();
   const result = runSteps("Relint [All-Packages]", [
     ["yarn", [
@@ -509,7 +584,7 @@ var relintPackage = ({ pkg }) => {
       "package-relint"
     ]]
   ]);
-  console.log(chalk7.gray(`${"Relinted in"} [${chalk7.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk7.gray("seconds")}`));
+  console.log(chalk12.gray(`${"Relinted in"} [${chalk12.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk12.gray("seconds")}`));
   return result;
 };
 var relint = ({
@@ -520,7 +595,7 @@ var relint = ({
   return pkg ? relintPackage({ pkg }) : relintAllPackages({ verbose, incremental });
 };
 var relintAllPackages = ({ verbose = true, incremental } = {}) => {
-  console.log(chalk7.gray(`${"Relint"} [All-Packages]`));
+  console.log(chalk12.gray(`${"Relint"} [All-Packages]`));
   const start = Date.now();
   const verboseOptions = verbose ? ["--verbose"] : ["--no-verbose"];
   const incrementalOptions = incremental ? ["--since", "-Ap"] : ["--parallel", "-Ap"];
@@ -534,7 +609,7 @@ var relintAllPackages = ({ verbose = true, incremental } = {}) => {
       "package-relint"
     ]]
   ]);
-  console.log(chalk7.gray(`Relinted in [${chalk7.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk7.gray("seconds")}`));
+  console.log(chalk12.gray(`Relinted in [${chalk12.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk12.gray("seconds")}`));
   return result;
 };
 
@@ -545,7 +620,7 @@ var sonar = () => {
 
 // src/xy/param.ts
 var packagePositionalParam = (yargs) => {
-  return yargs.positional("package", { describe: "Specific package to target" });
+  return yargs.positional("package", { describe: "Specific package to target", type: "string" });
 };
 
 // src/xy/xyLintCommands.ts
@@ -560,31 +635,61 @@ var xyLintCommands = (args) => {
       const start = Date.now();
       if (argv.verbose) console.log("Cycle");
       process.exitCode = await cycle({ pkg: argv.package });
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   ).command(
     "lint [package]",
     "Lint - Run Eslint",
     (yargs) => {
-      return packagePositionalParam(yargs);
+      return packagePositionalParam(yargs).option("fix", {
+        alias: "f",
+        default: false,
+        description: "Fix fixable issues",
+        type: "boolean"
+      }).option("cache", {
+        alias: "c",
+        default: false,
+        description: "Use caching for performance",
+        type: "boolean"
+      });
     },
     (argv) => {
       if (argv.verbose) console.log("Lint");
       const start = Date.now();
-      process.exitCode = argv.fix ? fix({ pkg: argv.package }) : lint({ pkg: argv.package });
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      process.exitCode = argv.fix ? fix({ pkg: argv.package, cache: argv.cache }) : lint({ pkg: argv.package, cache: argv.cache });
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   ).command(
     "deplint [package]",
     "Deplint - Run Deplint",
     (yargs) => {
-      return packagePositionalParam(yargs);
+      return packagePositionalParam(yargs).option("deps", {
+        alias: "d",
+        default: false,
+        description: "Check dependencies",
+        type: "boolean"
+      }).option("devDeps", {
+        alias: "v",
+        default: false,
+        description: "Check devDependencies",
+        type: "boolean"
+      }).option("peerDeps", {
+        alias: "p",
+        default: false,
+        description: "Check peerDependencies",
+        type: "boolean"
+      });
     },
     (argv) => {
       if (argv.verbose) console.log("Deplint");
       const start = Date.now();
-      process.exitCode = deplint({ pkg: argv.package });
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      process.exitCode = deplint({
+        pkg: argv.package,
+        deps: !!argv.deps,
+        devDeps: !!argv.devDeps,
+        peerDeps: !!argv.peerDeps
+      });
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   ).command(
     "fix [package]",
@@ -596,7 +701,7 @@ var xyLintCommands = (args) => {
       const start = Date.now();
       if (argv.verbose) console.log("Fix");
       process.exitCode = fix();
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   ).command(
     "relint [package]",
@@ -608,7 +713,7 @@ var xyLintCommands = (args) => {
       if (argv.verbose) console.log("Relinting");
       const start = Date.now();
       process.exitCode = relint();
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   ).command(
     "publint [package]",
@@ -620,7 +725,7 @@ var xyLintCommands = (args) => {
       if (argv.verbose) console.log("Publint");
       const start = Date.now();
       process.exitCode = await publint({ pkg: argv.package, verbose: !!argv.verbose });
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   ).command(
     "knip",
@@ -632,7 +737,7 @@ var xyLintCommands = (args) => {
       if (argv.verbose) console.log("Knip");
       const start = Date.now();
       process.exitCode = knip();
-      console.log(chalk8.blue(`Knip finished in ${Date.now() - start}ms`));
+      console.log(chalk13.blue(`Knip finished in ${Date.now() - start}ms`));
     }
   ).command(
     "sonar",
@@ -644,7 +749,7 @@ var xyLintCommands = (args) => {
       const start = Date.now();
       if (argv.verbose) console.log("Sonar Check");
       process.exitCode = sonar();
-      console.log(chalk8.blue(`Finished in ${Date.now() - start}ms`));
+      console.log(chalk13.blue(`Finished in ${Date.now() - start}ms`));
     }
   );
 };