@naturalcycles/dev-lib 19.38.1 → 20.0.0

package/cfg/biome.jsonc

@@ -7,6 +7,7 @@
       "src/**",
       "scripts/**",
       "!**/*.html",
+      "!**/*.scss",
       "!**/tsconfig.json",
       "!**/tsconfig.*.json",
       "!**/__exclude",

package/cfg/eslint.config.js

@@ -19,18 +19,23 @@ import eslintVueRules from './eslint-vue-rules.js'
 import eslintVitestRules from './eslint-vitest-rules.js'
 import eslintPrettierRules from './eslint-prettier-rules.js'
 import eslintBiomeRules from './eslint-biome-rules.js'
+import fs from 'node:fs'
 
 const defaultFiles = ['**/*.ts', '**/*.tsx', '**/*.cts', '**/*.mts']
+const srcFiles = ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.cts', 'src/**/*.mts']
+const scriptsFiles = ['scripts/**/*.ts', 'scripts/**/*.tsx', 'scripts/**/*.cts', 'scripts/**/*.mts']
+const e2eFiles = ['e2e/**/*.ts', 'e2e/**/*.tsx', 'e2e/**/*.cts', 'e2e/**/*.mts']
 const testFiles = ['**/*.test.ts', '**/*.test.tsx', '**/*.test.cts', '**/*.test.mts']
 
-const config = getEslintConfigForDir(process.cwd())
+const cwd = process.cwd()
+const config = getEslintConfigForDir()
 export default config
 
 /**
  * This function only exists, because typescript-eslint started to have an issue with auto-detecting tsconfigRootDir.
  * If the issue is fixed - we can remove this and come back to having just a single config.
  */
-export function getEslintConfigForDir(dir) {
+function getEslintConfigForDir() {
   return [
     {
       ...eslint.configs.recommended,
@@ -52,7 +57,6 @@ export function getEslintConfigForDir(dir) {
       files: defaultFiles,
     },
     // https://eslint.vuejs.org/user-guide/#user-guide
-    // ...require('eslint-plugin-vue').configs['flat/recommended'],
     ...eslintPluginVue.configs['flat/recommended'].map(c => ({
       ...c,
       files: defaultFiles,
@@ -73,8 +77,16 @@ export function getEslintConfigForDir(dir) {
       },
     },
     {
-      files: defaultFiles,
-      ...getConfig(dir),
+      files: srcFiles,
+      ...getConfig(`${cwd}/tsconfig.json`),
+    },
+    {
+      files: scriptsFiles,
+      ...getConfig(`${cwd}/tsconfig.scripts.json`),
+    },
+    {
+      files: e2eFiles,
+      ...getConfig(`${cwd}/tsconfig.e2e.json`),
     },
     {
       ignores: ['**/__exclude/**', '**/*.scss', '**/*.js'],
@@ -82,7 +94,7 @@ export function getEslintConfigForDir(dir) {
   ].filter(Boolean)
 }
 
-function getConfig(dir) {
+function getConfig(tsconfigPath) {
   return {
     plugins: {
       '@typescript-eslint': tseslint.plugin,
@@ -100,9 +112,8 @@ function getConfig(dir) {
         ...globals.vitest,
         NodeJS: 'readonly',
       },
-      // parser: tseslint.parser,
       parserOptions: {
-        project: `${dir}/tsconfig.json`,
+        project: fs.existsSync(tsconfigPath) ? tsconfigPath : undefined,
         // tsconfigRootDir: cwd,
         parser: tseslint.parser,
         extraFileExtensions: ['.vue', '.html'],

package/cfg/lint-staged.config.js

@@ -20,24 +20,13 @@ import { _assert } from '@naturalcycles/js-lib/error/assert.js'
 import { semver2 } from '@naturalcycles/js-lib/semver'
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2'
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2'
-import {
-  prettierDirs,
-  prettierExtensionsExclusive,
-  prettierExtensionsAll,
-  stylelintExtensions,
-  lintExclude,
-  minActionlintVersion,
-} from './_cnst.js'
+import { prettierExtensionsAll, lintExclude, minActionlintVersion } from './_cnst.js'
 
 const prettierConfigPath = [`prettier.config.js`].find(fs.existsSync)
 
 const stylelintConfigPath = [`stylelint.config.js`].find(fs.existsSync)
 
-// this is to support "Solution style tsconfig.json" (as used in Angular10, for example)
-// 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 eslintConfigPath = ['eslint.config.js'].find(fs.existsSync)
 
 let prettierCmd = undefined
 
@@ -55,16 +44,22 @@ if (prettierConfigPath) {
     .join(' ')
 }
 
-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(' ')
+let eslintCmd = undefined
+
+if (eslintConfigPath) {
+  eslintCmd = [
+    'eslint',
+    '--fix',
+    `--config ${eslintConfigPath}`,
+    '--cache',
+    '--cache-location node_modules/.cache/eslint',
+    // 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 &&
@@ -72,42 +67,13 @@ const stylelintExists =
   fs.existsSync('node_modules/stylelint-config-standard-scss')
 const stylelintCmd = stylelintExists ? `stylelint --fix --config ${stylelintConfigPath}` : undefined
 
-// const biomeInstalled = fs.existsSync('node_modules/@biomejs/biome')
 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',
-//   )
-// }
-
 const linters = {
-  // biome, eslint, prettier
-  './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}}`]: runPrettier,
-
-  // Files for ESLint + Prettier
-  // doesn't work, cause typescript parser+rules are conflicting
-  // [`./{${prettierDirs}}/**/*.{js,jsx}`]: match => {
-  //   const filesList = micromatch.not(match, lintExclude).join(' ')
-  //   if (!filesList) return []
-  //   return [
-  //     `${eslintCmd} --config ${eslintConfigPathRoot} --parser=espree`,
-  //     prettierCmd].map(s => `${s} ${filesList}`)
-  // },
-
-  // Files for Biome + Stylelint + Prettier
-  [`./{${prettierDirs}}/**/*.{${stylelintExtensions}}`]: runBiomeStylelintPrettier,
+  // biome, eslint, stylelint, prettier
+  [`./{src,scripts,e2e}/**/*.{${prettierExtensionsAll}}`]: match =>
+    runBiomeEslintStylelintPrettier(match),
 
   // Files in root dir: prettier
   [`./*.{${prettierExtensionsAll}}`]: runPrettier,
@@ -118,41 +84,11 @@ const linters = {
   './.github/**/*.{yml,yaml}': runActionlint,
 }
 
-// /scripts are separate, cause they require separate tsconfig.json
-if (fs.existsSync(`./scripts`)) {
-  Object.assign(linters, {
-    './scripts/**/*.{ts,tsx,cts,mts,vue,html}': match => runBiomeEslintPrettier(match, 'scripts'),
-  })
-}
-
-// /e2e
-if (fs.existsSync(`./e2e`)) {
-  Object.assign(linters, {
-    './e2e/**/*.{ts,tsx,cts,mts}': match => runBiomeEslintPrettier(match, 'e2e'),
-  })
-}
-
-export function runBiomeEslintPrettier(match, dir) {
+export function runBiomeEslintStylelintPrettier(match) {
   const filesList = getFilesList(match)
   if (!filesList) return []
 
-  let configDir = dir
-  if (dir === 'src') {
-    configDir = '.'
-  }
-
-  const cwd = process.cwd()
-  const eslintConfigPath = `${configDir}/eslint.config.js`
-  const tsconfigPath = [cwd, configDir !== '.' && configDir, 'tsconfig.json']
-    .filter(Boolean)
-    .join('/')
-
-  return [
-    biomeCmd,
-    eslintConfigPath &&
-      `${eslintCmd} --config ${eslintConfigPath} --parser-options=project:${tsconfigPath} --cache-location node_modules/.cache/eslint_${dir}`,
-    prettierCmd,
-  ]
+  return [biomeCmd, eslintCmd, stylelintCmd, prettierCmd]
     .filter(Boolean)
     .map(s => `${s} ${filesList}`)
 }
@@ -163,13 +99,6 @@ export function runPrettier(match) {
   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 []

package/cfg/tsconfig.e2e.json

@@ -4,13 +4,13 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "rootDir": "${configDir}/..",
+    "rootDir": "${configDir}",
     "baseUrl": "${configDir}",
-    "outDir": "${configDir}/../dist/e2e",
+    "outDir": "${configDir}/dist/e2e",
     "paths": {
-      "@src/*": ["${configDir}/../src/*"]
+      "@src/*": ["${configDir}/src/*"]
     },
-    "tsBuildInfoFile": "${configDir}/../node_modules/.cache/e2e.tsbuildinfo",
+    "tsBuildInfoFile": "${configDir}/node_modules/.cache/e2e.tsbuildinfo",
     "module": "esnext",
     "moduleResolution": "bundler",
     "lib": ["esnext", "dom", "dom.iterable"]
@@ -18,8 +18,9 @@
     // it's needed, because playwright doesn't support ${configDir} properly
     //    "baseUrl": ".",
     //    "paths": {
-    //      "@src/*": ["../src/*"],
+    //      "@src/*": ["./src/*"],
     //    },
   },
+  // "include": ["e2e"],
   "exclude": ["**/__exclude"]
 }

package/cfg/tsconfig.json

@@ -5,7 +5,7 @@
 //
 {
   "compilerOptions": {
-    "rootDir": "${configDir}/src",
+    "rootDir": "${configDir}",
     "baseUrl": "${configDir}/src",
     "outDir": "${configDir}/dist",
     // Target/module

package/cfg/tsconfig.scripts.json

@@ -4,13 +4,14 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "rootDir": "${configDir}/..",
+    "rootDir": "${configDir}",
     "baseUrl": "${configDir}",
-    "outDir": "${configDir}/../dist/scripts",
+    "outDir": "${configDir}/dist/scripts",
     "paths": {
-      "@src/*": ["${configDir}/../src/*"]
+      "@src/*": ["${configDir}/src/*"]
     },
-    "tsBuildInfoFile": "${configDir}/../node_modules/.cache/scripts.tsbuildinfo"
+    "tsBuildInfoFile": "${configDir}/node_modules/.cache/scripts.tsbuildinfo"
   },
+  // "include": ["scripts"],
   "exclude": ["**/__exclude"]
 }

package/dist/{lint.util.js → src/lint.util.js}

@@ -95,49 +95,28 @@ export async function eslintAll(opt) {
         ...opt,
     };
     const extensions = ext.split(',');
-    // The only time we don't parallelize is when run locally with no-fix,
-    // so errors can be seen properly
-    const runInParallel = fix || !!CI;
-    if (runInParallel) {
-        await Promise.all([
-            runESLint(`src`, extensions, fix),
-            runESLint(`scripts`, extensions, fix),
-            runESLint(`e2e`, extensions, fix),
-        ]);
-    }
-    else {
-        await runESLint(`src`, extensions, fix);
-        await runESLint(`scripts`, extensions, fix);
-        await runESLint(`e2e`, extensions, fix);
-    }
+    await runESLint(extensions, fix);
     console.log(`${check(true)}${white(`eslint-all`)} ${dimGrey(`took ` + _since(started))}`);
 }
-async function runESLint(dir, extensions = eslintExtensions.split(','), fix = true) {
-    let configDir = dir;
-    if (dir === 'src') {
-        configDir = '.';
-    }
-    const cwd = process.cwd();
-    const eslintConfigPath = `${configDir}/eslint.config.js`;
-    const tsconfigPath = [cwd, configDir !== '.' && configDir, 'tsconfig.json']
-        .filter(Boolean)
-        .join('/');
-    if (!existsSync(dir) || !existsSync(eslintConfigPath) || !existsSync(tsconfigPath)) {
+async function runESLint(extensions = eslintExtensions.split(','), fix = true) {
+    const eslintConfigPath = `eslint.config.js`;
+    const tsconfigPath = 'tsconfig.json';
+    if (!existsSync(eslintConfigPath) || !existsSync(tsconfigPath)) {
         // faster to bail-out like this
         return;
     }
     // const tsconfigRootDir = [cwd, configDir !== '.' && configDir].filter(Boolean).join('/')
     const eslintPath = findPackageBinPath('eslint', 'eslint');
-    const cacheLocation = `node_modules/.cache/eslint_${dir}`;
+    const cacheLocation = `node_modules/.cache/eslint`;
     const cacheFound = existsSync(cacheLocation);
-    console.log(dimGrey(`${check(cacheFound)}eslint ${dir} cache found: ${cacheFound}`));
+    console.log(dimGrey(`${check(cacheFound)}eslint cache found: ${cacheFound}`));
     await exec2.spawnAsync(eslintPath, {
-        name: ['eslint', dir, !fix && '--no-fix'].filter(Boolean).join(' '),
+        name: ['eslint', !fix && '--no-fix'].filter(Boolean).join(' '),
         args: [
             `--config`,
             eslintConfigPath,
-            `${dir}/**/*.{${extensions.join(',')}}`,
-            `--parser-options=project:${tsconfigPath}`,
+            `{src,scripts,e2e}/**/*.{${extensions.join(',')}}`,
+            // `--parser-options=project:${tsconfigPath}`,
             // The next line fixes the `typescript-eslint` 8.37 bug of resolving tsconfig.json
             // `--parser-options=tsconfigRootDir:${tsconfigRootDir}`,
             ESLINT_CONCURRENCY && `--concurrency=${ESLINT_CONCURRENCY}`,
@@ -145,7 +124,6 @@ async function runESLint(dir, extensions = eslintExtensions.split(','), fix = tr
             '--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` : '--no-fix',
         ].filter(_isTruthy),
         shell: false,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/dev-lib",
   "type": "module",
-  "version": "19.38.1",
+  "version": "20.0.0",
   "dependencies": {
     "@biomejs/biome": "^2",
     "@commitlint/cli": "^19",

package/scripts/tsconfig.json

@@ -1,8 +0,0 @@
-//
-// tsconfig.json for /scripts
-//
-{
-  "extends": "../cfg/tsconfig.scripts.json",
-  "compilerOptions": {},
-  "exclude": ["**/__exclude"]
-}