@xylabs/ts-scripts-yarn3 5.1.6 → 5.1.8

package/dist/index.mjs

@@ -1062,18 +1062,13 @@ var lint = /* @__PURE__ */ __name(async ({ pkg, verbose, incremental, fix: fix2
   });
 }, "lint");
 var lintAllPackages = /* @__PURE__ */ __name(({ fix: fix2, verbose = true, incremental } = {}) => {
-  console.log(chalk15.gray("Linting [All-Packages]"));
+  console.log(chalk15.gray(`${fix2 ? "Fix" : "Lint"} [All-Packages]`));
   const start = Date.now();
   const verboseOptions = verbose ? [
     "--verbose"
   ] : [
     "--no-verbose"
   ];
-  const fixOptions = fix2 ? [
-    "--fix"
-  ] : [
-    ""
-  ];
   const incrementalOptions = incremental ? [
     "--since",
     "-Apt"
@@ -1081,7 +1076,7 @@ var lintAllPackages = /* @__PURE__ */ __name(({ fix: fix2, verbose = true, incre
     "--parallel",
     "-Apt"
   ];
-  const result = runSteps("Lint [All-Packages]", [
+  const result = runSteps(`${fix2 ? "Fix" : "Lint"}  [All-Packages]`, [
     [
       "yarn",
       [
@@ -1090,12 +1085,11 @@ var lintAllPackages = /* @__PURE__ */ __name(({ fix: fix2, verbose = true, incre
         ...verboseOptions,
         ...incrementalOptions,
         "run",
-        fix2 ? "package-fix" : "package-lint",
-        ...fixOptions
+        fix2 ? "package-fix" : "package-lint"
       ]
     ]
   ]);
-  console.log(`${chalk15.gray("Linted in")} [${chalk15.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk15.gray("seconds")}`);
+  console.log(chalk15.gray(`${fix2 ? "Fixed in" : "Linted in"} [${chalk15.magenta(((Date.now() - start) / 1e3).toFixed(2))}] ${chalk15.gray("seconds")}`));
   return result;
 }, "lintAllPackages");
 
@@ -2107,6 +2101,7 @@ import { pathToFileURL } from "node:url";
 import chalk28 from "chalk";
 import { ESLint as ESLint3 } from "eslint";
 import { findUp } from "find-up";
+import picomatch from "picomatch";
 var dumpMessages2 = /* @__PURE__ */ __name((lintResults) => {
   const colors = [
     "white",
@@ -2136,37 +2131,41 @@ async function getRootESLintConfig() {
   return pathToFileURL(configPath);
 }
 __name(getRootESLintConfig, "getRootESLintConfig");
+function getFiles(dir, ignoreFolders) {
+  const currentDirectory = cwd4();
+  return readdirSync(dir, {
+    withFileTypes: true
+  }).flatMap((dirent) => {
+    const res = path7.resolve(dir, dirent.name);
+    const subDirectory = dir.split(currentDirectory)[1];
+    const relativePath = subDirectory ? `${subDirectory}/${dirent.name}` : dirent.name;
+    const ignoreMatchers = ignoreFolders.map((pattern) => picomatch(pattern));
+    if (ignoreMatchers.some((isMatch) => isMatch(relativePath))) return [];
+    return dirent.isDirectory() ? getFiles(res, ignoreFolders) : [
+      res
+    ];
+  });
+}
+__name(getFiles, "getFiles");
 var packageLint = /* @__PURE__ */ __name(async (fix2 = false) => {
   const configPath = await getRootESLintConfig();
   const { default: eslintConfig } = await import(configPath.href);
-  const ignoreFolders = /* @__PURE__ */ new Set([
+  const ignoreFolders = [
     "node_modules",
     "dist",
-    "packages"
-  ]);
-  function getFiles(dir, ignorePatterns2) {
-    return readdirSync(dir, {
-      withFileTypes: true
-    }).flatMap((dirent) => {
-      const res = path7.resolve(dir, dirent.name);
-      if (ignorePatterns2.some((pattern) => dir.includes(pattern))) return [];
-      return dirent.isDirectory() ? getFiles(res, ignorePatterns2) : res.endsWith(".ts") || res.endsWith(".tsx") || res.endsWith(".js") || res.endsWith(".jsx") ? [
-        res
-      ] : [];
-    });
-  }
-  __name(getFiles, "getFiles");
+    "packages",
+    ".git",
+    "build"
+  ];
   const engine = new ESLint3({
     baseConfig: [
       ...eslintConfig
     ],
-    fix: fix2
+    fix: fix2,
+    warnIgnored: false
   });
-  const ignorePatterns = [
-    ...eslintConfig.find((cfg) => cfg.ignores)?.ignores ?? [],
-    ...ignoreFolders
-  ];
-  const lintResults = await engine.lintFiles(getFiles(cwd4(), ignorePatterns));
+  const files = getFiles(cwd4(), ignoreFolders);
+  const lintResults = await engine.lintFiles(files);
   dumpMessages2(lintResults);
   return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0);
 }, "packageLint");