@naturalcycles/dev-lib 19.31.0 → 19.32.0

package/cfg/lint-staged.config.js

@@ -19,7 +19,7 @@ import { execSync } from 'node:child_process'
 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,
@@ -39,9 +39,22 @@ const stylelintConfigPath = [`stylelint.config.js`].find(fs.existsSync)
 
 // 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`
+let prettierCmd = undefined
+
+if (prettierConfigPath) {
+  const experimental = !hasPrettierOverrides()
+  prettierCmd = [
+    'prettier --write --log-level=warn',
+    experimental && '--cache-location',
+    experimental && 'node_modules/.cache/prettier',
+    experimental && `--experimental-cli`,
+    experimental ? '--config-path' : `--config`,
+    prettierConfigPath,
+  ]
+    .filter(Boolean)
+    .join(' ')
+}
+
 const eslintCmd = [
   'eslint',
   '--fix',
@@ -128,13 +141,16 @@ export function runBiomeEslintPrettier(match, dir) {
     configDir = '.'
   }
 
+  const cwd = process.cwd()
   const eslintConfigPath = `${configDir}/eslint.config.js`
-  const tsconfigPath = `${configDir}/tsconfig.json`
+  const tsconfigPath = [cwd, configDir !== '.' && configDir, 'tsconfig.json']
+    .filter(Boolean)
+    .join('/')
 
   return [
     biomeCmd,
     eslintConfigPath &&
-      `${eslintCmd} --config ${eslintConfigPath} --parser-options=tsconfigRootDir:. --parser-options=project:${tsconfigPath} --cache-location node_modules/.cache/eslint_${dir}`,
+      `${eslintCmd} --config ${eslintConfigPath} --parser-options=project:${tsconfigPath} --cache-location node_modules/.cache/eslint_${dir}`,
     prettierCmd,
   ]
     .filter(Boolean)
@@ -219,4 +235,12 @@ function getActionLintVersion() {
   }
 }
 
+function hasPrettierOverrides() {
+  try {
+    return fs2.readText('prettier.config.js').includes('overrides')
+  } catch {
+    return false
+  }
+}
+
 export default linters

package/dist/build.util.js

@@ -38,7 +38,7 @@ export async function runTSCInFolder(dir, args = []) {
     const tscPath = findPackageBinPath('typescript', 'tsc');
     const cacheLocation = `node_modules/.cache/${dir}.tsbuildinfo`;
     const cacheFound = existsSync(cacheLocation);
-    console.log(dimGrey(`${check(cacheFound)} tsc ${dir} cache found: ${cacheFound}`));
+    console.log(dimGrey(`${check(cacheFound)}tsc ${dir} cache found: ${cacheFound}`));
     await exec2.spawnAsync(tscPath, {
         args: ['-P', tsconfigPath, ...args],
         shell: false,
@@ -74,5 +74,5 @@ export function buildCopy() {
     });
 }
 function check(predicate) {
-    return predicate ? '✔️ ' : '   ';
+    return predicate ? ' ✓ ' : '   ';
 }

package/dist/lint.util.js

@@ -8,7 +8,7 @@ import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { _filterFalsyValues } from '@naturalcycles/js-lib/object/object.util.js';
 import { semver2 } from '@naturalcycles/js-lib/semver';
 import { git2 } from '@naturalcycles/nodejs-lib';
-import { boldGrey, dimGrey } from '@naturalcycles/nodejs-lib/colors';
+import { dimGrey, white } from '@naturalcycles/nodejs-lib/colors';
 import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
@@ -54,7 +54,7 @@ export async function lintAllCommand() {
     }
     runPrettier({ fix });
     await runKTLint(fix);
-    console.log(`${boldGrey(`${check(true)} lint-all`)} ${dimGrey(`took ` + _since(started))}`);
+    console.log(`${check(true)}${white(`lint-all`)} ${dimGrey(`took ` + _since(started))}`);
     // if (needToTrackChanges) {
     //   const gitStatusAfter = gitStatus()
     //   const hasChanges = gitStatusAfter !== gitStatusAtStart
@@ -110,23 +110,27 @@ export async function eslintAll(opt) {
         await runESLint(`scripts`, extensions, fix);
         await runESLint(`e2e`, extensions, fix);
     }
-    console.log(`${boldGrey(`${check(true)} eslint-all`)} ${dimGrey(`took ` + _since(started))}`);
+    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 = `${configDir}/tsconfig.json`;
+    const tsconfigPath = [cwd, configDir !== '.' && configDir, 'tsconfig.json']
+        .filter(Boolean)
+        .join('/');
     if (!existsSync(dir) || !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 cacheFound = existsSync(cacheLocation);
-    console.log(dimGrey(`${check(cacheFound)} eslint ${dir} cache found: ${cacheFound}`));
+    console.log(dimGrey(`${check(cacheFound)}eslint ${dir} cache found: ${cacheFound}`));
     await exec2.spawnAsync(eslintPath, {
         name: ['eslint', dir, !fix && '--no-fix'].filter(Boolean).join(' '),
         args: [
@@ -135,7 +139,7 @@ async function runESLint(dir, extensions = eslintExtensions.split(','), fix = tr
             `${dir}/**/*.{${extensions.join(',')}}`,
             `--parser-options=project:${tsconfigPath}`,
             // The next line fixes the `typescript-eslint` 8.37 bug of resolving tsconfig.json
-            `--parser-options=tsconfigRootDir:.`,
+            // `--parser-options=tsconfigRootDir:${tsconfigRootDir}`,
             ESLINT_CONCURRENCY && `--concurrency=${ESLINT_CONCURRENCY}`,
             '--cache',
             '--cache-location',
@@ -160,22 +164,27 @@ const prettierPaths = [
     ...lintExclude.map((s) => `!${s}`),
 ];
 export function runPrettier(opt = {}) {
-    const { experimentalCli = true, fix = true } = opt;
+    let { experimentalCli = true, fix = true } = opt;
     const prettierConfigPath = [`./prettier.config.js`].find(f => existsSync(f));
     if (!prettierConfigPath)
         return;
     const prettierPath = findPackageBinPath('prettier', 'prettier');
     const cacheLocation = 'node_modules/.cache/prettier';
     const cacheFound = existsSync(cacheLocation);
-    console.log(dimGrey(`${check(cacheFound)} prettier cache found: ${cacheFound}`));
+    console.log(dimGrey(`${check(cacheFound)}prettier cache found: ${cacheFound}`));
+    if (hasPrettierOverrides()) {
+        experimentalCli = false;
+        console.log('   prettier experimental mode disabled due to "overrides" in prettier.config.js');
+    }
     // prettier --write 'src/**/*.{js,ts,css,scss,graphql}'
     exec2.spawn(prettierPath, {
         name: fix ? 'prettier' : 'prettier --check',
         args: [
             fix ? `--write` : '--check',
             `--log-level=warn`,
-            '--cache-location',
-            cacheLocation,
+            // non-experimental-cli has different cache format, hence disabling it
+            experimentalCli && '--cache-location',
+            experimentalCli && cacheLocation,
             experimentalCli && `--experimental-cli`,
             experimentalCli ? '--config-path' : `--config`,
             prettierConfigPath,
@@ -305,6 +314,14 @@ export function findPackageBinPath(pkg, cmd) {
     const { bin } = fs2.readJson(packageJsonPath);
     return path.join(path.dirname(packageJsonPath), typeof bin === 'string' ? bin : bin[cmd]);
 }
+function hasPrettierOverrides() {
+    try {
+        return fs2.readText('prettier.config.js').includes('overrides');
+    }
+    catch {
+        return false;
+    }
+}
 function check(predicate) {
-    return predicate ? '✔️ ' : '   ';
+    return predicate ? ' ✓ ' : '   ';
 }

package/package.json

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