@naturalcycles/dev-lib 20.26.1 → 20.27.1

package/cfg/_cnst.js

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

package/cfg/biome.jsonc

@@ -2,14 +2,7 @@
   "$schema": "https://biomejs.dev/schemas/2.3.10/schema.json",
   "root": false,
   "files": {
-    "includes": [
-      "**/*.ts",
-      "**/*.tsx",
-      "**/*.js",
-      "**/*.jsx",
-      "!**/__exclude",
-      "!**/try.ts"
-    ]
+    "includes": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", "!**/__exclude", "!**/try.ts"],
   },
   "formatter": {
     "enabled": true,
@@ -18,7 +11,7 @@
     "indentWidth": 2,
     "lineEnding": "lf",
     "lineWidth": 100,
-    "attributePosition": "auto"
+    "attributePosition": "auto",
   },
   "assist": { "actions": { "source": { "organizeImports": "off" } } },
   "linter": {
@@ -28,7 +21,7 @@
       "performance": {
         "noAccumulatingSpread": "off", // oxlint
         // "useTopLevelRegex": "error" // consider
-        "noDelete": "off" // oxlint
+        "noDelete": "off", // oxlint
       },
       "correctness": {
         "useImportExtensions": "off", // oxlint
@@ -41,8 +34,8 @@
         "noUnusedVariables": {
           "fix": "none",
           "level": "off", // oxlint
-          "options": {}
-        }
+          "options": {},
+        },
       },
       "style": {
         // "useDefaultSwitchClause": "error", // consider`
@@ -68,7 +61,7 @@
         "useSingleVarDeclarator": "error",
         "noInferrableTypes": "error",
         "noUselessElse": "error",
-        "useArrayLiterals": "error"
+        "useArrayLiterals": "error",
         // "noCommonJs": "error" // oxlint
       },
       "suspicious": {
@@ -86,7 +79,7 @@
         "noImportAssign": "off",
         "noDoubleEquals": "off", // oxlint
         "noDocumentCookie": "off", // ox
-        "noEmptyInterface": "off"
+        "noEmptyInterface": "off",
       },
       "complexity": {
         "useDateNow": "error",
@@ -99,10 +92,10 @@
         "useLiteralKeys": "off",
         "noBannedTypes": "off",
         "noCommaOperator": "off", // ox
-        "noArguments": "error"
+        "noArguments": "error",
       },
-      "nursery": {}
-    }
+      "nursery": {},
+    },
   },
   "javascript": {
     "formatter": {
@@ -114,8 +107,8 @@
       "bracketSpacing": true,
       "bracketSameLine": false,
       "quoteStyle": "single",
-      "attributePosition": "auto"
-    }
+      "attributePosition": "auto",
+    },
   },
   "overrides": [
     {
@@ -125,10 +118,10 @@
           "correctness": {
             // doesn't work well with *.vue files
             "noUnusedImports": "off",
-            "noUnusedVariables": "off"
-          }
-        }
-      }
-    }
-  ]
+            "noUnusedVariables": "off",
+          },
+        },
+      },
+    },
+  ],
 }

package/cfg/eslint-rules.js

@@ -168,21 +168,21 @@ export default {
       'undefined',
     ],
     'id-match': 2,
-    'simple-import-sort/imports': [
-      2,
-      {
-        // This is what "removes any newlines between imports":
-        groups: [[String.raw`^\u0000`, '^node:', String.raw`^@?\w`, '^', String.raw`^\.`]],
-      },
-    ],
-    'simple-import-sort/exports': 2,
+    // 'simple-import-sort/imports': [
+    //   2,
+    //   {
+    //     // This is what "removes any newlines between imports":
+    //     groups: [[String.raw`^\u0000`, '^node:', String.raw`^@?\w`, '^', String.raw`^\.`]],
+    //   },
+    // ],
+    // 'simple-import-sort/exports': 2,
     // 'import-x/order': 0, // disabled in favor of `simple-import-sort`
     // 'import-x/namespace': 0, // issues with e.g globby
     // 'import-x/no-unresolved': 0, // breaks for type-aliases, e.g '@/store'
-    'import-x/no-anonymous-default-export': 0, // oxlint
-    'import-x/no-duplicates': [0, { 'prefer-inline': false }], // oxlint
-    'import-x/export': 2, // todo: oxlint when it matures
-    'import-x/no-empty-named-blocks': 0, // oxlint
+    // 'import-x/no-anonymous-default-export': 0, // oxlint
+    // 'import-x/no-duplicates': [0, { 'prefer-inline': false }], // oxlint
+    // 'import-x/export': 2, // todo: oxlint when it matures
+    // 'import-x/no-empty-named-blocks': 0, // oxlint
     // Disabling no-cycle as the slowest rule. Oxlint is to be adopted instead
     // 'import-x/no-cycle': [
     //   2,
@@ -192,8 +192,8 @@ export default {
     //     maxDepth: 10,
     //   },
     // ],
-    'import-x/no-useless-path-segments': 2,
-    'import-x/no-default-export': 0, // biome, oxlint
+    // 'import-x/no-useless-path-segments': 2,
+    // 'import-x/no-default-export': 0, // biome, oxlint
     // 'import-x/no-commonjs': 2, // biome `noCommonJs`
     // 'import-x/extensions': [2, 'always'], // biome useImportExtensions
     'no-array-constructor': 0,

package/cfg/eslint.config.js

@@ -4,15 +4,13 @@
  * Shared eslint FLAT config.
  */
 
-import globals from 'globals'
 import eslint from '@eslint/js'
-import tseslint from 'typescript-eslint'
 import eslintPluginOxlint from 'eslint-plugin-oxlint'
-import eslintPluginImportX from 'eslint-plugin-import-x'
-import eslintPluginSimpleImportSort from 'eslint-plugin-simple-import-sort'
-import eslintRules from './eslint-rules.js'
-import eslintPrettierRules from './eslint-prettier-rules.js'
+import globals from 'globals'
+import tseslint from 'typescript-eslint'
 import eslintBiomeRules from './eslint-biome-rules.js'
+import eslintPrettierRules from './eslint-prettier-rules.js'
+import eslintRules from './eslint-rules.js'
 
 const defaultFiles = ['**/*.ts', '**/*.tsx', '**/*.cts', '**/*.mts']
 const srcFiles = ['src/**/*.ts', 'src/**/*.tsx', 'src/**/*.cts', 'src/**/*.mts']
@@ -95,9 +93,9 @@ function getConfig(_tsconfigPath) {
   return {
     plugins: {
       '@typescript-eslint': tseslint.plugin,
-      'import-x': eslintPluginImportX,
+      // 'import-x': eslintPluginImportX,
       // 'unused-imports': require('eslint-plugin-unused-imports'), // disabled in favor of biome rules
-      'simple-import-sort': eslintPluginSimpleImportSort,
+      // 'simple-import-sort': eslintPluginSimpleImportSort,
       // jsdoc: eslintPluginJsdoc, // oxlint
       // '@stylistic': eslintPluginStylistic, // oxlint custom plugin
     },

package/cfg/lint-staged.config.js

@@ -12,16 +12,15 @@ const {
 
 console.log(`lint-staged.config.js runs on node ${node} ${platform} ${arch}`)
 
-import fs from 'node:fs'
-import micromatch from 'micromatch'
 import { execSync } from 'node:child_process'
+import fs from 'node:fs'
 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 micromatch from 'micromatch'
 import { prettierExtensionsAll, lintExclude, minActionlintVersion } from './_cnst.js'
 
-const prettierConfigPath = [`prettier.config.js`].find(fs.existsSync)
+const oxfmtConfigPath = ['.oxfmtrc.jsonc', '.oxfmtrc.json'].find(fs.existsSync)
 
 const stylelintConfigPath = [`stylelint.config.js`].find(fs.existsSync)
 
@@ -29,20 +28,10 @@ const eslintConfigPath = ['eslint.config.js'].find(fs.existsSync)
 
 const oxlintConfigPath = ['.oxlintrc.json'].find(fs.existsSync)
 
-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(' ')
+let oxfmtCmd = undefined
+
+if (oxfmtConfigPath) {
+  oxfmtCmd = 'oxfmt'
 }
 
 let eslintCmd = undefined
@@ -89,12 +78,12 @@ const biomeConfigPath = ['biome.jsonc'].find(p => fs.existsSync(p))
 const biomeCmd = biomeConfigPath && `biome lint --write --unsafe --no-errors-on-unmatched`
 
 const linters = {
-  // biome, oxlint, eslint, stylelint, prettier
+  // biome, oxlint, eslint, stylelint, oxfmt
   [`./{src,scripts,e2e}/**/*.{${prettierExtensionsAll}}`]: match =>
-    runBiomeEslintStylelintPrettier(match),
+    runBiomeEslintStylelintOxfmt(match),
 
-  // Files in root dir: prettier
-  [`./*.{${prettierExtensionsAll}}`]: runPrettier,
+  // Files in root dir: oxfmt
+  [`./*.{${prettierExtensionsAll}}`]: runOxfmt,
 
   // ktlint
   '**/*.{kt,kts}': runKtlint,
@@ -102,31 +91,31 @@ const linters = {
   './.github/**/*.{yml,yaml}': runActionlint,
 }
 
-export function runBiomeEslintStylelintPrettier(match) {
+export function runBiomeEslintStylelintOxfmt(match) {
   const filesList = getFilesList(match)
   if (!filesList) return []
 
-  return [biomeCmd, oxlintCmd, eslintCmd, stylelintCmd, prettierCmd]
+  return [biomeCmd, oxlintCmd, eslintCmd, stylelintCmd, oxfmtCmd]
     .filter(Boolean)
     .map(s => `${s} ${filesList}`)
 }
 
-export function runBiomeOxlintPrettier(match) {
+export function runBiomeOxlintOxfmt(match) {
   const filesList = getFilesList(match)
   if (!filesList) return []
-  return [biomeCmd, oxlintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
+  return [biomeCmd, oxlintCmd, oxfmtCmd].filter(Boolean).map(s => `${s} ${filesList}`)
 }
 
-export function runOxlintPrettier(match) {
+export function runOxlintOxfmt(match) {
   const filesList = getFilesList(match)
   if (!filesList) return []
-  return [oxlintCmd, prettierCmd].filter(Boolean).map(s => `${s} ${filesList}`)
+  return [oxlintCmd, oxfmtCmd].filter(Boolean).map(s => `${s} ${filesList}`)
 }
 
-export function runPrettier(match) {
+export function runOxfmt(match) {
   const filesList = getFilesList(match)
-  if (!filesList || !prettierCmd) return []
-  return [prettierCmd].map(s => `${s} ${filesList}`)
+  if (!filesList || !oxfmtCmd) return []
+  return [oxfmtCmd].map(s => `${s} ${filesList}`)
 }
 
 export function runKtlint(match) {
@@ -194,12 +183,4 @@ function getActionLintVersion() {
   }
 }
 
-function hasPrettierOverrides() {
-  try {
-    return fs2.readText('prettier.config.js').includes('overrides')
-  } catch {
-    return false
-  }
-}
-
 export default linters

package/cfg/vitest.config.js

@@ -1,8 +1,8 @@
 import fs from 'node:fs'
-import { VitestAlphabeticSequencer } from './vitestAlphabeticSequencer.js'
 import { defineConfig } from 'vitest/config'
-import { SummaryReporter } from './summaryReporter.js'
 import { SummaryOnlyReporter } from './summaryOnlyReporter.js'
+import { SummaryReporter } from './summaryReporter.js'
+import { VitestAlphabeticSequencer } from './vitestAlphabeticSequencer.js'
 export { SummaryReporter } from './summaryReporter.js'
 export { CollectReporter } from './collectReporter.js'
 export { SummaryOnlyReporter } from './summaryOnlyReporter.js'

package/cfg/vitestAlphabeticSequencer.js

@@ -1,5 +1,5 @@
-import { BaseSequencer } from 'vitest/node'
 import { _sortBy } from '@naturalcycles/js-lib/array/sort.js'
+import { BaseSequencer } from 'vitest/node'
 
 export class VitestAlphabeticSequencer extends BaseSequencer {
   async sort(files) {

package/dist/bin/dev-lib.js

@@ -3,7 +3,7 @@ import { _by } from '@naturalcycles/js-lib/array/array.util.js';
 import { _assert } from '@naturalcycles/js-lib/error/assert.js';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { runScript } from '@naturalcycles/nodejs-lib/runScript';
-import { buildCopy, buildProd, eslintAll, lintStagedCommand, requireOxlintConfig, runBiome, runCheck, runOxlint, runPrettier, runTest, stylelintAll, typecheckWithTS, typecheckWithTSC, typecheckWithTSGO, } from '../check.util.js';
+import { buildCopy, buildProd, eslintAll, lintStagedCommand, requireOxlintConfig, runBiome, runCheck, runOxfmt, runOxlint, runTest, stylelintAll, typecheckWithTS, typecheckWithTSC, typecheckWithTSGO, } from '../check.util.js';
 import { runCommitlint } from '../commitlint.js';
 const commands = [
     { name: 'check', fn: runCheck, desc: '"Run all possible checks": lint, typecheck, then test.' },
@@ -70,7 +70,7 @@ const commands = [
             typecheck: false,
             test: false,
         }),
-        desc: 'Run all linters: eslint, prettier, stylelint, ktlint, actionlint.',
+        desc: 'Run all linters: eslint, oxfmt, stylelint, ktlint, actionlint.',
     },
     {
         name: 'lint-staged',
@@ -105,7 +105,7 @@ const commands = [
         desc: 'Run biome linter on all files with "auto-fix" disabled. Useful for debugging.',
         interactiveOnly: true,
     },
-    { name: 'prettier', fn: runPrettier, desc: 'Run prettier on all files.' },
+    { name: 'oxfmt', fn: runOxfmt, desc: 'Run oxfmt on all files.' },
     { name: 'stylelint', fn: stylelintAll, desc: 'Run stylelint on all files.' },
     {
         name: 'stylelint --no-fix',
@@ -164,7 +164,7 @@ runScript(async () => {
 async function quickCheck() {
     await runCheck({
         eslint: false,
-        prettier: false,
+        oxfmt: false,
         stylelint: false,
         typecheck: false,
     });

package/dist/check.util.d.ts

@@ -7,7 +7,7 @@ export interface CheckOptions {
     fastLinters?: boolean;
     eslint?: boolean;
     stylelint?: boolean;
-    prettier?: boolean;
+    oxfmt?: boolean;
     ktlint?: boolean;
     /**
      * true - run tsgo, otherwise tsc
@@ -38,16 +38,13 @@ export declare function eslintAll(opt?: EslintAllOptions): boolean;
  * Returns true if it ran.
  */
 export declare function runOxlint(fix?: boolean): boolean;
-export declare function requireOxlintConfig(): void;
-export declare function hasOxlintConfig(): boolean;
-interface RunPrettierOptions {
-    experimentalCli?: boolean;
-    fix?: boolean;
-}
 /**
  * Returns true if it ran.
  */
-export declare function runPrettier(opt?: RunPrettierOptions): boolean;
+export declare function runOxfmt(fix?: boolean): boolean;
+export declare function requireOxlintConfig(): void;
+export declare function hasOxlintConfig(): boolean;
+export declare function hasOxfmtConfig(): boolean;
 /**
  * Returns true if it ran.
  */

package/dist/check.util.js

@@ -14,7 +14,7 @@ import { exec2 } from '@naturalcycles/nodejs-lib/exec2';
 import { fs2 } from '@naturalcycles/nodejs-lib/fs2';
 import { kpySync } from '@naturalcycles/nodejs-lib/kpy';
 import { _yargs } from '@naturalcycles/nodejs-lib/yargs';
-import { eslintExtensions, lintExclude, minActionlintVersion, prettierDirs, prettierExtensionsAll, stylelintExtensions, } from '../cfg/_cnst.js';
+import { eslintExtensions, lintExclude, minActionlintVersion, prettierDirs, stylelintExtensions, } from '../cfg/_cnst.js';
 import { cfgDir } from './paths.js';
 const { CI, ESLINT_CONCURRENCY } = process.env;
 /**
@@ -23,7 +23,7 @@ const { CI, ESLINT_CONCURRENCY } = process.env;
  * If full=false - the "slow" linters are skipped.
  */
 export async function runCheck(opt = {}) {
-    const { fastLinters = true, eslint = true, stylelint = true, prettier = true, ktlint = true, typecheck = true, test = true, } = opt;
+    const { fastLinters = true, eslint = true, stylelint = true, oxfmt = true, ktlint = true, typecheck = true, test = true, } = opt;
     const started = Date.now();
     let s;
     const timings = {};
@@ -75,10 +75,10 @@ export async function runCheck(opt = {}) {
             timings['stylelint'] = Date.now() - s;
         }
     }
-    if (prettier) {
+    if (oxfmt) {
         s = Date.now();
-        if (runPrettier({ fix })) {
-            timings['prettier'] = Date.now() - s;
+        if (runOxfmt(fix)) {
+            timings['oxfmt'] = Date.now() - s;
         }
     }
     if (ktlint) {
@@ -217,56 +217,32 @@ export function runOxlint(fix = true) {
     });
     return true;
 }
-export function requireOxlintConfig() {
-    _assert(hasOxlintConfig(), '.oxlintrc.json config is not found');
-}
-export function hasOxlintConfig() {
-    const oxlintConfigPath = `.oxlintrc.json`;
-    return existsSync(oxlintConfigPath);
-}
-const prettierPaths = [
-    // Everything inside these folders
-    `./{${prettierDirs.join(',')}}/**/*.{${prettierExtensionsAll}}`,
-    // Root
-    `./*.{${prettierExtensionsAll}}`,
-    // Exclude
-    ...lintExclude.map((s) => `!${s}`),
-];
 /**
  * Returns true if it ran.
  */
-export function runPrettier(opt = {}) {
-    let { experimentalCli = true, fix = true } = opt;
-    const prettierConfigPath = [`./prettier.config.js`].find(f => existsSync(f));
-    if (!prettierConfigPath) {
+export function runOxfmt(fix = true) {
+    if (!hasOxfmtConfig()) {
+        console.log('.oxfmtrc.json(c) is not found, skipping to run oxfmt');
         return false;
     }
-    const prettierPath = findPackageBinPath('prettier', 'prettier');
-    const cacheLocation = 'node_modules/.cache/prettier';
-    const cacheFound = existsSync(cacheLocation);
-    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`,
-            // non-experimental-cli has different cache format, hence disabling it
-            experimentalCli && '--cache-location',
-            experimentalCli && cacheLocation,
-            experimentalCli && `--experimental-cli`,
-            experimentalCli ? '--config-path' : `--config`,
-            prettierConfigPath,
-            ...prettierPaths,
-        ].filter(_isTruthy),
+    const oxlintPath = findPackageBinPath('oxfmt', 'oxfmt');
+    exec2.spawn(oxlintPath, {
+        name: ['oxfmt', !fix && '--check'].filter(Boolean).join(' '),
+        args: [!fix && '--check', '--no-error-on-unmatched-pattern'].filter(_isTruthy),
         shell: false,
     });
     return true;
 }
+export function requireOxlintConfig() {
+    _assert(hasOxlintConfig(), '.oxlintrc.json config is not found');
+}
+export function hasOxlintConfig() {
+    const oxlintConfigPath = `.oxlintrc.json`;
+    return existsSync(oxlintConfigPath);
+}
+export function hasOxfmtConfig() {
+    return ['.oxfmtrc.jsonc', '.oxfmtrc.json'].some(existsSync);
+}
 const stylelintPaths = [
     // Everything inside these folders
     `./{${prettierDirs.join(',')}}/**/*.{${stylelintExtensions}}`,
@@ -541,14 +517,6 @@ 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 ? ' ✓ ' : '   ';
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/dev-lib",
   "type": "module",
-  "version": "20.26.1",
+  "version": "20.27.1",
   "dependencies": {
     "@biomejs/biome": "^2",
     "@eslint/js": "^9",
@@ -10,15 +10,13 @@
     "@naturalcycles/nodejs-lib": "^15",
     "@vitest/coverage-v8": "^4",
     "eslint": "^9",
-    "eslint-plugin-import-x": "^4",
     "eslint-plugin-oxlint": "^1",
-    "eslint-plugin-simple-import-sort": "^12",
     "globals": "^17",
     "lint-staged": "^16",
     "micromatch": "^4",
+    "oxfmt": "^0",
     "oxlint": "^1",
     "oxlint-tsgolint": "*",
-    "prettier": "^3",
     "typescript-eslint": "^8"
   },
   "peerDependencies": {
@@ -48,7 +46,6 @@
     "./cfg/biome.jsonc": "./cfg/biome.jsonc",
     "./cfg/eslint.config.js": "./cfg/eslint.config.js",
     "./cfg/oxlint.config.json": "./cfg/oxlint.config.json",
-    "./cfg/prettier.config.js": "./cfg/prettier.config.js",
     "./cfg/stylelint.config.js": "./cfg/stylelint.config.js",
     "./cfg/tsconfig.src.json": "./cfg/tsconfig.src.json",
     "./cfg/tsconfig.scripts.json": "./cfg/tsconfig.scripts.json",

package/cfg/init/.prettierignore

@@ -1,4 +0,0 @@
-#
-# .prettierignore
-#
-/**/__exclude/**/*

package/cfg/init/prettier.config.js

@@ -1,3 +0,0 @@
-import sharedConfig from '@naturalcycles/dev-lib/cfg/prettier.config.js'
-
-export default sharedConfig

package/cfg/prettier.config.js

@@ -1,30 +0,0 @@
-/**
- * Default config for `prettier`.
- * Extendable.
- */
-
-export default {
-  printWidth: 100,
-  tabWidth: 2,
-  useTabs: false,
-  semi: false,
-  singleQuote: true,
-  quoteProps: 'as-needed',
-  jsxSingleQuote: false,
-  trailingComma: 'all',
-  bracketSpacing: true,
-  bracketSameLine: false,
-  arrowParens: 'avoid',
-  proseWrap: 'always',
-  htmlWhitespaceSensitivity: 'css',
-  endOfLine: 'lf',
-  overrides: [
-    {
-      // https://github.com/prettier/prettier/blob/main/CHANGELOG.md#use-json-parser-for-tsconfigjson-by-default-16012-by-sosukesuzuki
-      files: ['**/tsconfig.json', '**/tsconfig.*.json'],
-      options: {
-        parser: 'jsonc',
-      },
-    },
-  ],
-}