@naturalcycles/dev-lib 19.26.0 → 19.28.0

package/cfg/_cnst.js

@@ -7,7 +7,7 @@ const prettierExtensionsAll =
 const eslintExtensions = 'ts,tsx,cts,mts,vue,html'
 const stylelintExtensions = 'css,scss'
 const lintExclude = ['./**/__exclude/**', './**/dist/**', './**/cache/**', './CHANGELOG.md']
-const minActionlintVersion = '1.7.4'
+const minActionlintVersion = '1.7.7'
 
 export {
   prettierDirs,

package/cfg/lint-staged.config.js

@@ -8,6 +8,7 @@ const {
   platform,
   arch,
   versions: { node },
+  // env: { ESLINT_CONCURRENCY },
 } = process
 
 console.log(`lint-staged.config.js runs on node ${node} ${platform} ${arch}`)
@@ -36,12 +37,21 @@ const stylelintConfigPath = [`stylelint.config.js`].find(fs.existsSync)
 // const tsconfigPathRoot = ['tsconfig.base.json'].find(p => fs.existsSync(p)) || 'tsconfig.json'
 // const tsconfigPathRoot = 'tsconfig.json'
 
-const eslintConfigPathRoot = ['eslint.config.js'].find(p => fs.existsSync(p))
+// const eslintConfigPathRoot = ['eslint.config.js'].find(p => fs.existsSync(p))
 
 const prettierCmd =
   !!prettierConfigPath &&
   `prettier --write --experimental-cli --config-path ${prettierConfigPath} --cache-location node_modules/.cache/prettier`
-const eslintCmd = `eslint --fix --cache`
+const eslintCmd = [
+  'eslint',
+  '--fix',
+  '--cache',
+  // concurrency is disabled here, as it's not expected to help,
+  // since we're running on a limited set of files already
+  // ESLINT_CONCURRENCY && `--concurrency=${ESLINT_CONCURRENCY}`,
+]
+  .filter(Boolean)
+  .join(' ')
 
 const stylelintExists =
   !!stylelintConfigPath &&
@@ -53,40 +63,25 @@ const stylelintCmd = stylelintExists ? `stylelint --fix --config ${stylelintConf
 const biomeConfigPath = ['biome.jsonc'].find(p => fs.existsSync(p))
 const biomeCmd = biomeConfigPath && `biome lint --write --unsafe --no-errors-on-unmatched`
 
-if (!eslintConfigPathRoot) {
-  console.log('eslint is skipped, because ./eslint.config.js is not present')
-}
-if (!prettierCmd) {
-  console.log('prettier is skipped, because ./prettier.config.js is not present')
-}
-if (!stylelintCmd) {
-  console.log(
-    'stylelint is skipped, because ./stylelint.config.js is not present, or stylelint and/or stylelint-config-standard-scss are not installed',
-  )
-}
+// if (!eslintConfigPathRoot) {
+//   console.log('eslint is skipped, because ./eslint.config.js is not present')
+// }
+// if (!prettierCmd) {
+//   console.log('prettier is skipped, because ./prettier.config.js is not present')
+// }
+// if (!stylelintCmd) {
+//   console.log(
+//     'stylelint is skipped, because ./stylelint.config.js is not present, or stylelint and/or stylelint-config-standard-scss are not installed',
+//   )
+// }
 
 const linters = {
   // biome, eslint, prettier
-  './src/**/*.{ts,tsx,cts,mts,vue,html}': match => {
-    const filesList = getFilesList(match)
-    if (!filesList) return []
-    return [
-      biomeCmd,
-      eslintConfigPathRoot &&
-        `${eslintCmd} --config ${eslintConfigPathRoot} --parser-options=tsconfigRootDir:. --cache-location node_modules/.cache/eslint_src`,
-      prettierCmd,
-    ]
-      .filter(Boolean)
-      .map(s => `${s} ${filesList}`)
-  },
+  './src/**/*.{ts,tsx,cts,mts,vue,html}': match => runBiomeEslintPrettier(match, 'src'),
 
   // For all other files we run only Prettier (because e.g eslint screws *.scss files)
   // todo: this should be no longer needed when flat eslint config is default and it has global ignore of scss files
-  [`./{${prettierDirs}}/**/*.{${prettierExtensionsExclusive}}`]: match => {
-    const filesList = getFilesList(match)
-    if (!filesList || !prettierCmd) return []
-    return [prettierCmd].map(s => `${s} ${filesList}`)
-  },
+  [`./{${prettierDirs}}/**/*.{${prettierExtensionsExclusive}}`]: runPrettier,
 
   // Files for ESLint + Prettier
   // doesn't work, cause typescript parser+rules are conflicting
@@ -99,92 +94,95 @@ const linters = {
   // },
 
   // Files for Biome + Stylelint + Prettier
-  [`./{${prettierDirs}}/**/*.{${stylelintExtensions}}`]: match => {
-    const filesList = getFilesList(match)
-    if (!filesList) return []
-    // Biome's css/scss support is still in nursery, so Biome is disabled for now
-    return [stylelintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
-  },
+  [`./{${prettierDirs}}/**/*.{${stylelintExtensions}}`]: runBiomeStylelintPrettier,
 
   // Files in root dir: prettier
-  [`./*.{${prettierExtensionsAll}}`]: match => {
-    const filesList = getFilesList(match)
-    if (!filesList || !prettierCmd) return []
-    return [prettierCmd].map(s => `${s} ${filesList}`)
-  },
+  [`./*.{${prettierExtensionsAll}}`]: runPrettier,
 
   // ktlint
-  '**/*.{kt,kts}': match => {
-    const filesList = getFilesList(match)
-    if (!filesList) return []
-    const dir = './node_modules/@naturalcycles/ktlint'
-
-    if (!fs.existsSync(dir)) {
-      console.log(`!!\n!! Please install @naturalcycles/ktlint to lint *.kt files\n!!\n`, filesList)
-      return []
-    }
-
-    return [`${dir}/resources/ktlint -F ${filesList}`]
-  },
-
-  './.github/**/*.{yml,yaml}': match => {
-    if (!match.length) return []
-
-    if (!canRunBinary('actionlint')) {
-      console.log(
-        `actionlint is not installed and won't be run.\nThis is how to install it: https://github.com/rhysd/actionlint/blob/main/docs/install.md`,
-      )
-      return []
-    }
-
-    requireActionlintVersion()
-
-    // run actionlint on all files at once, as it's fast anyway
-    return [`actionlint`]
-  },
+  '**/*.{kt,kts}': runKtlint,
+
+  './.github/**/*.{yml,yaml}': runActionlint,
 }
 
 // /scripts are separate, cause they require separate tsconfig.json
 if (fs.existsSync(`./scripts`)) {
-  const eslintConfigPathScripts = ['scripts/eslint.config.js'].find(p => fs.existsSync(p))
   Object.assign(linters, {
-    // biome, eslint, Prettier
-    './scripts/**/*.{ts,tsx,cts,mts,vue,html}': match => {
-      const filesList = getFilesList(match)
-      if (!filesList) return []
-      return [
-        biomeCmd,
-        eslintConfigPathScripts &&
-          `${eslintCmd} --config ${eslintConfigPathScripts} --parser-options=project:scripts/tsconfig.json --parser-options=tsconfigRootDir:. --cache-location node_modules/.cache/eslint_scripts`,
-        prettierCmd,
-      ]
-        .filter(Boolean)
-        .map(s => `${s} ${filesList}`)
-    },
+    './scripts/**/*.{ts,tsx,cts,mts,vue,html}': match => runBiomeEslintPrettier(match, 'scripts'),
   })
 }
 
 // /e2e
 if (fs.existsSync(`./e2e`)) {
-  const eslintConfigPathE2e = ['e2e/eslint.config.js'].find(p => fs.existsSync(p))
-
   Object.assign(linters, {
-    // biome, eslint, Prettier
-    './e2e/**/*.{ts,tsx,cts,mts}': match => {
-      const filesList = getFilesList(match)
-      if (!filesList) return []
-      return [
-        biomeCmd,
-        eslintConfigPathE2e &&
-          `${eslintCmd} --config ${eslintConfigPathE2e} --parser-options=project:e2e/tsconfig.json --parser-options=tsconfigRootDir:. --cache-location ./node_modules/.cache/eslint_e2e`,
-        prettierCmd,
-      ]
-        .filter(Boolean)
-        .map(s => `${s} ${filesList}`)
-    },
+    './e2e/**/*.{ts,tsx,cts,mts}': match => runBiomeEslintPrettier(match, 'e2e'),
   })
 }
 
+export function runBiomeEslintPrettier(match, dir) {
+  const filesList = getFilesList(match)
+  if (!filesList) return []
+
+  let configDir = dir
+  if (dir === 'src') {
+    configDir = '.'
+  }
+
+  const eslintConfigPath = `${configDir}/eslint.config.js`
+  const tsconfigPath = `${configDir}/tsconfig.json`
+
+  return [
+    biomeCmd,
+    eslintConfigPath &&
+      `${eslintCmd} --config ${eslintConfigPath} --parser-options=tsconfigRootDir:. --parser-options=project:${tsconfigPath} --cache-location node_modules/.cache/eslint_${dir}`,
+    prettierCmd,
+  ]
+    .filter(Boolean)
+    .map(s => `${s} ${filesList}`)
+}
+
+export function runPrettier(match) {
+  const filesList = getFilesList(match)
+  if (!filesList || !prettierCmd) return []
+  return [prettierCmd].map(s => `${s} ${filesList}`)
+}
+
+export function runBiomeStylelintPrettier(match) {
+  const filesList = getFilesList(match)
+  if (!filesList) return []
+  // Biome's css/scss support is still in nursery, so Biome is disabled for now
+  return [stylelintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
+}
+
+export function runKtlint(match) {
+  const filesList = getFilesList(match)
+  if (!filesList) return []
+  const dir = './node_modules/@naturalcycles/ktlint'
+
+  if (!fs.existsSync(dir)) {
+    console.log(`!!\n!! Please install @naturalcycles/ktlint to lint *.kt files\n!!\n`, filesList)
+    return []
+  }
+
+  return [`${dir}/resources/ktlint -F ${filesList}`]
+}
+
+export function runActionlint(match) {
+  if (!match.length) return []
+
+  if (!canRunBinary('actionlint')) {
+    console.log(
+      `actionlint is not installed and won't be run.\nThis is how to install it: https://github.com/rhysd/actionlint/blob/main/docs/install.md`,
+    )
+    return []
+  }
+
+  requireActionlintVersion()
+
+  // run actionlint on all files at once, as it's fast anyway
+  return [`actionlint`]
+}
+
 function getFilesList(match) {
   return micromatch.not(match, lintExclude).join(' ')
 }

package/dist/lint.util.js

@@ -15,7 +15,7 @@ import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
 import { eslintExtensions, lintExclude, minActionlintVersion, prettierDirs, prettierExtensionsAll, stylelintExtensions, } from '../cfg/_cnst.js';
 import { cfgDir } from './paths.js';
-const { CI } = process.env;
+const { CI, ESLINT_CONCURRENCY } = process.env;
 /**
  * Run all linters.
  */
@@ -132,13 +132,14 @@ async function runESLint(dir, extensions = eslintExtensions.split(','), fix = tr
             `--parser-options=project:${tsconfigPath}`,
             // The next line fixes the `typescript-eslint` 8.37 bug of resolving tsconfig.json
             `--parser-options=tsconfigRootDir:.`,
+            ESLINT_CONCURRENCY && `--concurrency=${ESLINT_CONCURRENCY}`,
             '--cache',
             '--cache-location',
             cacheLocation,
             `--no-error-on-unmatched-pattern`,
             `--report-unused-disable-directives`, // todo: unnecessary with flat, as it's defined in the config
             fix ? `--fix` : '',
-        ].filter(Boolean),
+        ].filter(_isTruthy),
         shell: false,
         env: _filterFalsyValues({
             // Print eslint plugin timing, but only in CI

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/dev-lib",
   "type": "module",
-  "version": "19.26.0",
+  "version": "19.28.0",
   "dependencies": {
     "@biomejs/biome": "2.1.3",
     "@commitlint/cli": "^19",
@@ -15,7 +15,7 @@
     "@vitest/eslint-plugin": "^1",
     "eslint": "^9",
     "eslint-plugin-import-x": "^4",
-    "eslint-plugin-jsdoc": "^53",
+    "eslint-plugin-jsdoc": "^54",
     "eslint-plugin-simple-import-sort": "^12",
     "eslint-plugin-unicorn": "^60",
     "eslint-plugin-vue": "^10",