@xylabs/ts-scripts-yarn3 5.1.7 → 5.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/ts-scripts-yarn3",
-  "version": "5.1.7",
+  "version": "5.1.9",
   "description": "TypeScript project scripts",
   "keywords": [
     "xylabs",
@@ -93,8 +93,8 @@
     "@swc/core": "^1.11.5",
     "@types/node": "^22.13.5",
     "@types/yargs": "^17.0.33",
-    "@xylabs/tsconfig": "^5.1.7",
-    "@xylabs/tsconfig-dom": "^5.1.7",
+    "@xylabs/tsconfig": "^5.1.9",
+    "@xylabs/tsconfig-dom": "^5.1.9",
     "async-mutex": "^0.5.0",
     "chalk": "^5.4.1",
     "cosmiconfig": "^9.0.0",
@@ -113,6 +113,7 @@
     "npm-package-json-lint": "^8.0.0",
     "npm-package-json-lint-config-default": "^7.0.1",
     "parse-git-config": "^3.0.0",
+    "picomatch": "^4.0.2",
     "publint": "^0.3.7",
     "reflect-metadata": "^0.2.2",
     "rollup": "^4.34.8",
@@ -134,7 +135,8 @@
     "@types/eslint": "^9.6.1",
     "@types/license-checker": "^25.0.6",
     "@types/parse-git-config": "^3.0.4",
-    "@xylabs/tsconfig": "^5.1.7",
+    "@types/picomatch": "^3.0.2",
+    "@xylabs/tsconfig": "^5.1.9",
     "publint": "^0.3.7",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.3"

package/src/actions/package/lint.ts

@@ -6,6 +6,7 @@ import { pathToFileURL } from 'node:url'
 import chalk from 'chalk'
 import { ESLint } from 'eslint'
 import { findUp } from 'find-up'
+import picomatch from 'picomatch'
 
 const dumpMessages = (lintResults: ESLint.LintResult[]) => {
   const colors: ('white' | 'red' | 'yellow')[] = ['white', 'yellow', 'red']
@@ -37,35 +38,46 @@ async function getRootESLintConfig() {
   return pathToFileURL(configPath)
 }
 
+function getFiles(dir: string, ignoreFolders: string[]): string[] {
+  const currentDirectory = cwd()
+  const subDirectory = dir.split(currentDirectory)[1]
+  if (ignoreFolders.includes(subDirectory)) return []
+  console.log('subDirectory:', subDirectory)
+  return readdirSync(dir, { withFileTypes: true })
+    .flatMap((dirent) => {
+      const res = path.resolve(dir, dirent.name)
+      const relativePath = subDirectory ? `${subDirectory}/${dirent.name}` : dirent.name
+
+      const ignoreMatchers = ignoreFolders.map(pattern => picomatch(pattern))
+
+      // Exclude ignored paths
+      if (ignoreMatchers.some(isMatch => isMatch(relativePath))) return []
+
+      return dirent.isDirectory()
+        ? getFiles(res, ignoreFolders)
+        : [res]
+    })
+}
+
 export const packageLint = async (fix = false) => {
   const configPath = await getRootESLintConfig()
   const { default: eslintConfig } = await import(configPath.href)
 
   // List of folders to ignore
-  const ignoreFolders = new Set(['node_modules', 'dist', 'packages'])
-
-  function getFiles(dir: string, ignorePatterns: string[]): string[] {
-    return readdirSync(dir, { withFileTypes: true })
-      .flatMap((dirent) => {
-        const res = path.resolve(dir, dirent.name)
+  const ignoreFolders = ['node_modules', 'dist', 'packages', '.git', 'build', '.yarn', '.vscode', '.github']
 
-        // Exclude ignored paths
-        if (ignorePatterns.some(pattern => dir.includes(pattern))) return []
-
-        return dirent.isDirectory()
-          ? getFiles(res, ignorePatterns)
-          : (res.endsWith('.ts') || res.endsWith('.tsx') || res.endsWith('.js') || res.endsWith('.jsx')) ? [res] : []
-      })
-  }
+  const engine = new ESLint({
+    baseConfig: [...eslintConfig], fix, warnIgnored: false,
+  })
 
-  const engine = new ESLint({ baseConfig: [...eslintConfig], fix })
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const ignorePatterns = [...eslintConfig.find((cfg: any) => cfg.ignores)?.ignores ?? [], ...ignoreFolders]
-
-  const lintResults = await engine.lintFiles(getFiles(cwd(), ignorePatterns))
+  const files = getFiles(cwd(), ignoreFolders)
+  const lintResults = await engine.lintFiles(files)
 
   dumpMessages(lintResults)
 
+  if (fix) {
+    await ESLint.outputFixes(lintResults)
+  }
+
   return lintResults.reduce((prev, lintResult) => prev + lintResult.errorCount, 0)
 }