@xylabs/ts-scripts-yarn3 6.0.3 → 6.0.4

package/dist/bin/xy.mjs

@@ -3,7 +3,7 @@ var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
 // src/xy/xy.ts
-import chalk21 from "chalk";
+import chalk22 from "chalk";
 
 // src/actions/build.ts
 import chalk7 from "chalk";
@@ -972,43 +972,31 @@ var dupdeps = /* @__PURE__ */ __name(() => {
 
 // src/actions/lint.ts
 import chalk14 from "chalk";
-import { ESLint as ESLint2 } from "eslint";
-var dumpMessages = /* @__PURE__ */ __name((lintResults) => {
-  const colors = [
-    "white",
-    "yellow",
-    "red"
-  ];
-  const severity = [
-    "none",
-    "warning",
-    "error"
+var lintPackage = /* @__PURE__ */ __name(({ pkg, fix: fix2, verbose }) => {
+  console.log(chalk14.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
+  const start = Date.now();
+  const verboseOptions = verbose ? [
+    "--verbose"
+  ] : [
+    "--no-verbose"
   ];
-  for (const lintResult of lintResults) {
-    if (lintResult.messages.length > 0) {
-      console.log(chalk14.gray(`${lintResult.filePath}`));
-      for (const message of lintResult.messages) {
-        console.log(chalk14.gray(`	${message.line}:${message.column}`), chalk14[colors[message.severity]](`	${severity[message.severity]}`), chalk14.white(`	${message.message}`), chalk14.gray(`	${message.ruleId}`));
-      }
-    }
-  }
-}, "dumpMessages");
-var lintPackage = /* @__PURE__ */ __name(async ({ pkg, fix: fix2 }) => {
-  const workspace = yarnWorkspaces().find((workspace2) => workspace2.name === pkg);
-  if (!workspace) {
-    console.error(chalk14.red(`Unable to locate package [${chalk14.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);
+  const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
+    [
+      "yarn",
+      [
+        "workspace",
+        pkg,
+        ...verboseOptions,
+        "run",
+        fix2 ? "package-fix" : "package-lint"
+      ]
+    ]
+  ]);
+  console.log(chalk14.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk14.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk14.gray("seconds")}`));
+  return result;
 }, "lintPackage");
-var lint = /* @__PURE__ */ __name(async ({ pkg, verbose, incremental, fix: fix2 } = {}) => {
-  return pkg ? await lintPackage({
+var lint = /* @__PURE__ */ __name(({ pkg, verbose, incremental, fix: fix2 } = {}) => {
+  return pkg ? lintPackage({
     pkg,
     fix: fix2
   }) : lintAllPackages({
@@ -1050,8 +1038,9 @@ var lintAllPackages = /* @__PURE__ */ __name(({ fix: fix2, verbose = true, incre
 }, "lintAllPackages");
 
 // src/actions/fix.ts
-var fix = /* @__PURE__ */ __name(async () => {
-  return await lint({
+var fix = /* @__PURE__ */ __name((params) => {
+  return lint({
+    ...params,
     fix: true
   });
 }, "fix");
@@ -1253,25 +1242,6 @@ var license = /* @__PURE__ */ __name(async (pkg) => {
   }))).reduce((prev, value) => prev || value, 0);
 }, "license");
 
-// src/actions/lint-profile.ts
-var lintProfile = /* @__PURE__ */ __name(() => {
-  return runSteps("Lint Profile", [
-    [
-      "yarn",
-      [
-        "xy",
-        "lint"
-      ],
-      {
-        env: {
-          ...process.env,
-          TIMING: "1"
-        }
-      }
-    ]
-  ]);
-}, "lintProfile");
-
 // src/actions/npmignore-gen.ts
 var filename2 = ".npmignore";
 var npmignoreGen = /* @__PURE__ */ __name((pkg) => generateIgnoreFiles(filename2, pkg), "npmignoreGen");
@@ -1459,35 +1429,69 @@ var reinstall = /* @__PURE__ */ __name(() => {
 }, "reinstall");
 
 // src/actions/relint.ts
-import { rmSync as rmSync2 } from "node:fs";
-var relint = /* @__PURE__ */ __name(() => {
-  console.log("Relint - Cleaning [.eslintcache]");
-  const workspaces = yarnWorkspaces();
-  const result = workspaces.map(({ location, name }) => {
-    const dist = `${location}/.eslintcache`;
-    try {
-      rmSync2(dist, {
-        force: true,
-        recursive: true
-      });
-      return 0;
-    } catch (ex) {
-      const error = ex;
-      console.error(`Relint - Cleaning [.eslintcache] Failed [${name}, ${error.message}]`);
-      return 1;
-    }
-  }).reduce((prev, result2) => prev || result2, 0);
-  return result || runSteps("Relint", [
+import chalk19 from "chalk";
+var relintPackage = /* @__PURE__ */ __name(({ pkg, verbose }) => {
+  console.log(chalk19.gray(`${"Relint"} [All-Packages]`));
+  const start = Date.now();
+  const verboseOptions = verbose ? [
+    "--verbose"
+  ] : [
+    "--no-verbose"
+  ];
+  const result = runSteps("Relint [All-Packages]", [
     [
       "yarn",
       [
-        "eslint",
-        ".",
-        "--cache"
+        "workspace",
+        pkg,
+        ...verboseOptions,
+        "run",
+        "package-relint"
       ]
     ]
   ]);
+  console.log(chalk19.gray(`${"Relinted in"} [${chalk19.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk19.gray("seconds")}`));
+  return result;
+}, "relintPackage");
+var relint = /* @__PURE__ */ __name(({ pkg, verbose, incremental } = {}) => {
+  return pkg ? relintPackage({
+    pkg
+  }) : relintAllPackages({
+    verbose,
+    incremental
+  });
 }, "relint");
+var relintAllPackages = /* @__PURE__ */ __name(({ verbose = true, incremental } = {}) => {
+  console.log(chalk19.gray(`${"Relint"} [All-Packages]`));
+  const start = Date.now();
+  const verboseOptions = verbose ? [
+    "--verbose"
+  ] : [
+    "--no-verbose"
+  ];
+  const incrementalOptions = incremental ? [
+    "--since",
+    "-Ap"
+  ] : [
+    "--parallel",
+    "-Ap"
+  ];
+  const result = runSteps(`${"Relint"}  [All-Packages]`, [
+    [
+      "yarn",
+      [
+        "workspaces",
+        "foreach",
+        ...verboseOptions,
+        ...incrementalOptions,
+        "run",
+        "package-relint"
+      ]
+    ]
+  ]);
+  console.log(chalk19.gray(`Relinted in [${chalk19.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk19.gray("seconds")}`));
+  return result;
+}, "relintAllPackages");
 
 // src/actions/retest.ts
 var retest = /* @__PURE__ */ __name(() => {
@@ -1525,7 +1529,7 @@ var sonar = /* @__PURE__ */ __name(() => {
 }, "sonar");
 
 // src/actions/statics.ts
-import chalk19 from "chalk";
+import chalk20 from "chalk";
 var DefaultDependencies = [
   "axios",
   "@xylabs/pixel",
@@ -1536,7 +1540,7 @@ var DefaultDependencies = [
   "@mui/system"
 ];
 var statics = /* @__PURE__ */ __name(() => {
-  console.log(chalk19.green("Check Required Static Dependencies"));
+  console.log(chalk20.green("Check Required Static Dependencies"));
   const statics2 = parsedPackageJSON()?.xy?.deps?.statics;
   return detectDuplicateDependencies(statics2, DefaultDependencies);
 }, "statics");
@@ -1892,7 +1896,7 @@ var xyInstallCommands = /* @__PURE__ */ __name((args) => {
 }, "xyInstallCommands");
 
 // src/xy/xyLintCommands.ts
-import chalk20 from "chalk";
+import chalk21 from "chalk";
 var xyLintCommands = /* @__PURE__ */ __name((args) => {
   return args.command("cycle [package]", "Cycle - Check for dependency cycles", (yargs2) => {
     return packagePositionalParam(yargs2);
@@ -1900,30 +1904,32 @@ var xyLintCommands = /* @__PURE__ */ __name((args) => {
     const start = Date.now();
     if (argv.verbose) console.log("Cycle");
     process.exitCode = await cycle();
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   }).command("lint [package]", "Lint - Run Eslint", (yargs2) => {
     return packagePositionalParam(yargs2);
-  }, async (argv) => {
+  }, (argv) => {
     if (argv.verbose) console.log("Lint");
     const start = Date.now();
-    process.exitCode = argv.fix ? await fix() : argv.profile ? lintProfile() : await lint({
+    process.exitCode = argv.fix ? fix({
+      pkg: argv.package
+    }) : lint({
       pkg: argv.package
     });
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   }).command("fix [package]", "Fix - Run Eslint w/fix", (yargs2) => {
     return packagePositionalParam(yargs2);
-  }, async (argv) => {
+  }, (argv) => {
     const start = Date.now();
     if (argv.verbose) console.log("Fix");
-    process.exitCode = await fix();
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    process.exitCode = fix();
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   }).command("relint [package]", "Relint - Clean & Lint", (yargs2) => {
     return packagePositionalParam(yargs2);
   }, (argv) => {
     if (argv.verbose) console.log("Relinting");
     const start = Date.now();
     process.exitCode = relint();
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   }).command("publint [package]", "Publint - Run Publint", (yargs2) => {
     return packagePositionalParam(yargs2);
   }, async (argv) => {
@@ -1933,14 +1939,14 @@ var xyLintCommands = /* @__PURE__ */ __name((args) => {
       pkg: argv.package,
       verbose: !!argv.verbose
     });
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   }).command("sonar", "Sonar - Run Sonar Check", (yargs2) => {
     return packagePositionalParam(yargs2);
   }, (argv) => {
     const start = Date.now();
     if (argv.verbose) console.log("Sonar Check");
     process.exitCode = sonar();
-    console.log(chalk20.blue(`Finished in ${Date.now() - start}ms`));
+    console.log(chalk21.blue(`Finished in ${Date.now() - start}ms`));
   });
 }, "xyLintCommands");
 
@@ -2002,8 +2008,8 @@ var xyParseOptions = /* @__PURE__ */ __name(() => {
 var xy = /* @__PURE__ */ __name(async () => {
   const options = xyParseOptions();
   return await xyBuildCommands(xyCommonCommands(xyInstallCommands(xyDeployCommands(xyLintCommands(options))))).demandCommand(1).command("*", "", () => {
-    console.error(chalk21.yellow(`Command not found [${chalk21.magenta(process.argv[2])}]`));
-    console.log(chalk21.gray("Try 'yarn xy --help' for list of commands"));
+    console.error(chalk22.yellow(`Command not found [${chalk22.magenta(process.argv[2])}]`));
+    console.log(chalk22.gray("Try 'yarn xy --help' for list of commands"));
   }).version().help().argv;
 }, "xy");