@xylabs/ts-scripts-yarn3 5.1.2 → 5.1.3

package/dist/index.d.ts

@@ -81,7 +81,7 @@ declare const depsAll: ({ incremental, jobs, verbose, }: DepsParams) => number;
 
 declare const dupdeps: () => number;
 
-declare const fix: () => number;
+declare const fix: () => Promise<number>;
 
 interface GenDocsParams {
     incremental?: boolean;

package/dist/index.mjs

@@ -1007,19 +1007,105 @@ var dupdeps = /* @__PURE__ */ __name(() => {
   return detectDuplicateDependencies(dependencies);
 }, "dupdeps");
 
-// src/actions/fix.ts
-var fix = /* @__PURE__ */ __name(() => {
-  return runSteps("Fix", [
+// src/actions/lint.ts
+import chalk15 from "chalk";
+import { ESLint as ESLint2 } from "eslint";
+var dumpMessages = /* @__PURE__ */ __name((lintResults) => {
+  const colors = [
+    "white",
+    "yellow",
+    "red"
+  ];
+  const severity = [
+    "none",
+    "warning",
+    "error"
+  ];
+  for (const lintResult of lintResults) {
+    if (lintResult.messages.length > 0) {
+      console.log(chalk15.gray(`${lintResult.filePath}`));
+      for (const message of lintResult.messages) {
+        console.log(chalk15.gray(`	${message.line}:${message.column}`), chalk15[colors[message.severity]](`	${severity[message.severity]}`), chalk15.white(`	${message.message}`), chalk15.gray(`	${message.ruleId}`));
+      }
+    }
+  }
+}, "dumpMessages");
+var lintPackage = /* @__PURE__ */ __name(async ({ pkg, fix: fix2 }) => {
+  const workspace = yarnWorkspaces().find((workspace2) => workspace2.name === pkg);
+  if (!workspace) {
+    console.error(chalk15.red(`Unable to locate package [${chalk15.magenta(pkg)}]`));
+    process.exit(1);
+  }
+  const engine = new ESLint2({
+    cache: true,
+    fix: fix2
+  });
+  const lintResults = await engine.lintFiles(workspace.location);
+  dumpMessages(lintResults);
+  return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0);
+}, "lintPackage");
+var lintAll = /* @__PURE__ */ __name(async ({ fix: fix2 }) => {
+  const workspace = yarnWorkspaces();
+  for (const ws of workspace) {
+    await lintPackage({
+      pkg: ws.name,
+      fix: fix2
+    });
+  }
+}, "lintAll");
+var lint = /* @__PURE__ */ __name(async ({ pkg, verbose, incremental, fix: fix2 } = {}) => {
+  return pkg ? await lintPackage({
+    pkg,
+    fix: fix2
+  }) : lintAllPackages({
+    verbose,
+    incremental,
+    fix: fix2
+  });
+}, "lint");
+var lintAllPackages = /* @__PURE__ */ __name(({ fix: fix2, verbose = true, incremental } = {}) => {
+  console.log(chalk15.gray("Linting [All-Packages]"));
+  const start = Date.now();
+  const verboseOptions = verbose ? [
+    "--verbose"
+  ] : [
+    "--no-verbose"
+  ];
+  const fixOptions = fix2 ? [
+    "--fix"
+  ] : [
+    ""
+  ];
+  const incrementalOptions = incremental ? [
+    "--since",
+    "-Apt"
+  ] : [
+    "--parallel",
+    "-Apt"
+  ];
+  const result = runSteps("Lint [All-Packages]", [
     [
       "yarn",
       [
-        "eslint",
-        ".",
-        "--fix",
-        "--cache"
+        "workspaces",
+        "foreach",
+        ...verboseOptions,
+        ...incrementalOptions,
+        "run",
+        "package-lint",
+        ...fixOptions
       ]
     ]
   ]);
+  console.log(`${chalk15.gray("Linted in")} [${chalk15.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk15.gray("seconds")}`);
+  return result;
+}, "lintAllPackages");
+
+// src/actions/fix.ts
+var fix = /* @__PURE__ */ __name(async () => {
+  return await lint({
+    fix: true
+  });
 }, "fix");
 
 // src/actions/gen-docs.ts
@@ -1075,7 +1161,7 @@ var filename = ".gitignore";
 var gitignoreGen = /* @__PURE__ */ __name((pkg) => generateIgnoreFiles(filename, pkg), "gitignoreGen");
 
 // src/actions/gitlint.ts
-import chalk15 from "chalk";
+import chalk16 from "chalk";
 import ParseGitConfig from "parse-git-config";
 var gitlint = /* @__PURE__ */ __name(() => {
   console.log(`
@@ -1086,7 +1172,7 @@ Gitlint Start [${process.cwd()}]
   const errors = 0;
   const gitConfig = ParseGitConfig.sync();
   const warn = /* @__PURE__ */ __name((message) => {
-    console.warn(chalk15.yellow(`Warning: ${message}`));
+    console.warn(chalk16.yellow(`Warning: ${message}`));
     warnings++;
   }, "warn");
   if (gitConfig.core.ignorecase) {
@@ -1106,13 +1192,13 @@ Gitlint Start [${process.cwd()}]
   }
   const resultMessages = [];
   if (valid > 0) {
-    resultMessages.push(chalk15.green(`Passed: ${valid}`));
+    resultMessages.push(chalk16.green(`Passed: ${valid}`));
   }
   if (warnings > 0) {
-    resultMessages.push(chalk15.yellow(`Warnings: ${warnings}`));
+    resultMessages.push(chalk16.yellow(`Warnings: ${warnings}`));
   }
   if (errors > 0) {
-    resultMessages.push(chalk15.red(` Errors: ${errors}`));
+    resultMessages.push(chalk16.red(` Errors: ${errors}`));
   }
   console.warn(`Gitlint Finish [ ${resultMessages.join(" | ")} ]
 `);
@@ -1121,7 +1207,7 @@ Gitlint Start [${process.cwd()}]
 
 // src/actions/gitlint-fix.ts
 import { execSync as execSync2 } from "node:child_process";
-import chalk16 from "chalk";
+import chalk17 from "chalk";
 import ParseGitConfig2 from "parse-git-config";
 var gitlintFix = /* @__PURE__ */ __name(() => {
   console.log(`
@@ -1132,25 +1218,25 @@ Gitlint Fix Start [${process.cwd()}]
     execSync2("git config core.ignorecase false", {
       stdio: "inherit"
     });
-    console.warn(chalk16.yellow("\nGitlint Fix: Updated core.ignorecase to be false\n"));
+    console.warn(chalk17.yellow("\nGitlint Fix: Updated core.ignorecase to be false\n"));
   }
   if (gitConfig.core.autocrlf !== false) {
     execSync2("git config core.autocrlf false", {
       stdio: "inherit"
     });
-    console.warn(chalk16.yellow("\nGitlint Fix: Updated core.autocrlf to be false\n"));
+    console.warn(chalk17.yellow("\nGitlint Fix: Updated core.autocrlf to be false\n"));
   }
   if (gitConfig.core.eol !== "lf") {
     execSync2("git config core.eol lf", {
       stdio: "inherit"
     });
-    console.warn(chalk16.yellow('\nGitlint Fix: Updated core.eol to be "lf"\n'));
+    console.warn(chalk17.yellow('\nGitlint Fix: Updated core.eol to be "lf"\n'));
   }
   return 1;
 }, "gitlintFix");
 
 // src/actions/license.ts
-import chalk17 from "chalk";
+import chalk18 from "chalk";
 import { init } from "license-checker";
 var license = /* @__PURE__ */ __name(async (pkg) => {
   const workspaces = yarnWorkspaces();
@@ -1175,7 +1261,7 @@ var license = /* @__PURE__ */ __name(async (pkg) => {
     "LGPL-3.0-or-later",
     "Python-2.0"
   ]);
-  console.log(chalk17.green("License Checker"));
+  console.log(chalk18.green("License Checker"));
   return (await Promise.all(workspaceList.map(({ location, name }) => {
     return new Promise((resolve) => {
       init({
@@ -1183,12 +1269,12 @@ var license = /* @__PURE__ */ __name(async (pkg) => {
         start: location
       }, (error, packages) => {
         if (error) {
-          console.error(chalk17.red(`License Checker [${name}] Error`));
-          console.error(chalk17.gray(error));
+          console.error(chalk18.red(`License Checker [${name}] Error`));
+          console.error(chalk18.gray(error));
           console.log("\n");
           resolve(1);
         } else {
-          console.log(chalk17.green(`License Checker [${name}]`));
+          console.log(chalk18.green(`License Checker [${name}]`));
           let count = 0;
           for (const [name2, info] of Object.entries(packages)) {
             const licenses = Array.isArray(info.licenses) ? info.licenses : [
@@ -1206,7 +1292,7 @@ var license = /* @__PURE__ */ __name(async (pkg) => {
                 }
                 if (!orLicenseFound) {
                   count++;
-                  console.warn(chalk17.yellow(`${name2}: Package License not allowed [${license2}]`));
+                  console.warn(chalk18.yellow(`${name2}: Package License not allowed [${license2}]`));
                 }
               }
             }
@@ -1219,100 +1305,6 @@ var license = /* @__PURE__ */ __name(async (pkg) => {
   }))).reduce((prev, value) => prev || value, 0);
 }, "license");
 
-// src/actions/lint.ts
-import chalk18 from "chalk";
-import { ESLint as ESLint2 } from "eslint";
-var dumpMessages = /* @__PURE__ */ __name((lintResults) => {
-  const colors = [
-    "white",
-    "yellow",
-    "red"
-  ];
-  const severity = [
-    "none",
-    "warning",
-    "error"
-  ];
-  for (const lintResult of lintResults) {
-    if (lintResult.messages.length > 0) {
-      console.log(chalk18.gray(`${lintResult.filePath}`));
-      for (const message of lintResult.messages) {
-        console.log(chalk18.gray(`	${message.line}:${message.column}`), chalk18[colors[message.severity]](`	${severity[message.severity]}`), chalk18.white(`	${message.message}`), chalk18.gray(`	${message.ruleId}`));
-      }
-    }
-  }
-}, "dumpMessages");
-var lintPackage = /* @__PURE__ */ __name(async ({ pkg, fix: fix2 }) => {
-  const workspace = yarnWorkspaces().find((workspace2) => workspace2.name === pkg);
-  if (!workspace) {
-    console.error(chalk18.red(`Unable to locate package [${chalk18.magenta(pkg)}]`));
-    process.exit(1);
-  }
-  const engine = new ESLint2({
-    cache: true,
-    fix: fix2
-  });
-  const lintResults = await engine.lintFiles(workspace.location);
-  dumpMessages(lintResults);
-  return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0);
-}, "lintPackage");
-var lintAll = /* @__PURE__ */ __name(async ({ fix: fix2 }) => {
-  const workspace = yarnWorkspaces();
-  for (const ws of workspace) {
-    await lintPackage({
-      pkg: ws.name,
-      fix: fix2
-    });
-  }
-}, "lintAll");
-var lint = /* @__PURE__ */ __name(async ({ pkg, verbose, incremental, fix: fix2 } = {}) => {
-  return pkg ? await lintPackage({
-    pkg,
-    fix: fix2
-  }) : lintAllPackages({
-    verbose,
-    incremental,
-    fix: fix2
-  });
-}, "lint");
-var lintAllPackages = /* @__PURE__ */ __name(({ fix: fix2, verbose = true, incremental } = {}) => {
-  console.log(chalk18.gray("Linting [All-Packages]"));
-  const start = Date.now();
-  const verboseOptions = verbose ? [
-    "--verbose"
-  ] : [
-    "--no-verbose"
-  ];
-  const fixOptions = fix2 ? [
-    "--fix"
-  ] : [
-    ""
-  ];
-  const incrementalOptions = incremental ? [
-    "--since",
-    "-Apt"
-  ] : [
-    "--parallel",
-    "-Apt"
-  ];
-  const result = runSteps("Lint [All-Packages]", [
-    [
-      "yarn",
-      [
-        "workspaces",
-        "foreach",
-        ...verboseOptions,
-        ...incrementalOptions,
-        "run",
-        "package-lint",
-        ...fixOptions
-      ]
-    ]
-  ]);
-  console.log(`${chalk18.gray("Linted in")} [${chalk18.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk18.gray("seconds")}`);
-  return result;
-}, "lintAllPackages");
-
 // src/actions/lint-clean.ts
 import { rmSync } from "node:fs";
 var lintClean = /* @__PURE__ */ __name(async () => {
@@ -2814,16 +2806,16 @@ var xyLintCommands = /* @__PURE__ */ __name((args) => {
   }, async (argv) => {
     if (argv.verbose) console.log("Lint");
     const start = Date.now();
-    process.exitCode = argv.fix ? fix() : argv.profile ? lintProfile() : await lint({
+    process.exitCode = argv.fix ? await fix() : argv.profile ? lintProfile() : await lint({
       pkg: argv.package
     });
     console.log(chalk31.blue(`Finished in ${Date.now() - start}ms`));
   }).command("fix [package]", "Fix - Run Eslint w/fix", (yargs2) => {
     return packagePositionalParam(yargs2);
-  }, (argv) => {
+  }, async (argv) => {
     const start = Date.now();
     if (argv.verbose) console.log("Fix");
-    process.exitCode = fix();
+    process.exitCode = await fix();
     console.log(chalk31.blue(`Finished in ${Date.now() - start}ms`));
   }).command("relint [package]", "Relint - Clean & Lint", (yargs2) => {
     return packagePositionalParam(yargs2);