@naturalcycles/dev-lib 20.16.1 → 20.17.0

package/cfg/biome.jsonc

@@ -3,18 +3,12 @@
   "root": false,
   "files": {
     "includes": [
-      "*",
-      "src/**",
-      "scripts/**",
-      "!**/*.html",
-      "!**/*.css",
-      "!**/*.scss",
-      "!**/tsconfig.json",
-      "!**/tsconfig.*.json",
+      "**/*.ts",
+      "**/*.tsx",
+      "**/*.js",
+      "**/*.jsx",
       "!**/__exclude",
-      "!**/try.ts",
-      "!**/*.compact.json",
-      "!**/*.mock.json"
+      "!**/try.ts"
     ]
   },
   "formatter": {

package/cfg/vitest.config.d.ts

@@ -10,10 +10,15 @@ import type { InlineConfig } from 'vitest/node'
    // bail: 1,
  })
 
+ Pass `import.meta.dirname` as cwd if running from a monorepo.
+
  */
 export function defineVitestConfig(config?: Partial<ViteUserConfig>, cwd?: string): ViteUserConfig
 
-export const sharedConfig: InlineConfig
+/**
+ * Pass `import.meta.dirname` as cwd if running from a monorepo.
+ */
+export function getSharedConfig(cwd?: string): InlineConfig
 
 export const CollectReporter: any
 export const SummaryReporter: any

package/cfg/vitest.config.js

@@ -37,13 +37,10 @@ if (silent) {
  * })
  */
 export function defineVitestConfig(config, cwd) {
-  const setupFiles = getSetupFiles(testType, cwd)
-
   const mergedConfig = defineConfig({
     ...config,
     test: {
-      ...sharedConfig,
-      setupFiles,
+      ...getSharedConfig(cwd),
       ...config?.test,
     },
   })
@@ -70,65 +67,67 @@ export function defineVitestConfig(config, cwd) {
 /**
  * Shared config for Vitest.
  */
-export const sharedConfig = {
-  pool,
-  maxWorkers,
-  isolate: false,
-  watch: false,
-  // dir: 'src',
-  restoreMocks: true,
-  silent,
-  setupFiles: getSetupFiles(testType),
-  logHeapUsage: true,
-  testTimeout: 60_000,
-  slowTestThreshold: isCI ? 500 : 300, // higher threshold in CI
-  sequence: {
-    sequencer: VitestAlphabeticSequencer,
-    // shuffle: {
-    //   files: true,
-    //   tests: false,
-    // },
-    // seed: 1, // this makes the order of tests deterministic (but still not alphabetic)
-  },
-  include,
-  exclude,
-  reporters: [
-    'default',
-    new SummaryReporter(),
-    junitReporterEnabled && [
-      'junit',
-      {
-        suiteName: `${testType} tests`,
-        // classNameTemplate: '{filename} - {classname}',
-      },
-    ],
-  ].filter(Boolean),
-  // outputFile location is specified for compatibility with the previous jest config
-  outputFile: junitReporterEnabled ? `./tmp/jest/${testType}.xml` : undefined,
-  coverage: {
-    enabled: coverageEnabled,
-    reporter: ['html', 'lcov', 'json', 'json-summary', !isCI && 'text'].filter(Boolean),
-    include: ['src/**/*.{ts,tsx}'],
-    exclude: [
-      '**/__exclude/**',
-      'scripts/**',
-      'public/**',
-      'src/index.{ts,tsx}',
-      'src/test/**',
-      'src/typings/**',
-      'src/{env,environment,environments}/**',
-      'src/bin/**',
-      'src/vendor/**',
-      '**/*.test.*',
-      '**/*.script.*',
-      '**/*.module.*',
-      '**/*.mock.*',
-      '**/*.page.{ts,tsx}',
-      '**/*.component.{ts,tsx}',
-      '**/*.directive.{ts,tsx}',
-      '**/*.modal.{ts,tsx}',
-    ],
-  },
+export function getSharedConfig(cwd) {
+  return {
+    pool,
+    maxWorkers,
+    isolate: false,
+    watch: false,
+    // dir: 'src',
+    restoreMocks: true,
+    silent,
+    setupFiles: getSetupFiles(testType, cwd),
+    logHeapUsage: true,
+    testTimeout: 60_000,
+    slowTestThreshold: isCI ? 500 : 300, // higher threshold in CI
+    sequence: {
+      sequencer: VitestAlphabeticSequencer,
+      // shuffle: {
+      //   files: true,
+      //   tests: false,
+      // },
+      // seed: 1, // this makes the order of tests deterministic (but still not alphabetic)
+    },
+    include,
+    exclude,
+    reporters: [
+      'default',
+      new SummaryReporter(),
+      junitReporterEnabled && [
+        'junit',
+        {
+          suiteName: `${testType} tests`,
+          // classNameTemplate: '{filename} - {classname}',
+        },
+      ],
+    ].filter(Boolean),
+    // outputFile location is specified for compatibility with the previous jest config
+    outputFile: junitReporterEnabled ? `./tmp/jest/${testType}.xml` : undefined,
+    coverage: {
+      enabled: coverageEnabled,
+      reporter: ['html', 'lcov', 'json', 'json-summary', !isCI && 'text'].filter(Boolean),
+      include: ['src/**/*.{ts,tsx}'],
+      exclude: [
+        '**/__exclude/**',
+        'scripts/**',
+        'public/**',
+        'src/index.{ts,tsx}',
+        'src/test/**',
+        'src/typings/**',
+        'src/{env,environment,environments}/**',
+        'src/bin/**',
+        'src/vendor/**',
+        '**/*.test.*',
+        '**/*.script.*',
+        '**/*.module.*',
+        '**/*.mock.*',
+        '**/*.page.{ts,tsx}',
+        '**/*.component.{ts,tsx}',
+        '**/*.directive.{ts,tsx}',
+        '**/*.modal.{ts,tsx}',
+      ],
+    },
+  }
 }
 
 function doesItRunInIDE() {
@@ -184,14 +183,14 @@ function isRunningAllTests() {
   return !hasPositionalArgs
 }
 
-function getSetupFiles(testType, cwd = '.') {
+function getSetupFiles(testType, cwd = process.cwd()) {
   // Set 'setupFiles' only if setup files exist
   const setupFiles = []
   if (fs.existsSync(`${cwd}/src/test/setupVitest.ts`)) {
-    setupFiles.push('./src/test/setupVitest.ts')
+    setupFiles.push(`${cwd}/src/test/setupVitest.ts`)
   }
   if (fs.existsSync(`${cwd}/src/test/setupVitest.${testType}.ts`)) {
-    setupFiles.push(`./src/test/setupVitest.${testType}.ts`)
+    setupFiles.push(`${cwd}/src/test/setupVitest.${testType}.ts`)
   }
   return setupFiles
 }

package/dist/bin/dev-lib.js

@@ -5,17 +5,22 @@ 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, runTSCInFolders } from '../build.util.js';
-import { eslintAll, lintAllCommand, lintStagedCommand, runBiome, runCommitlintCommand, runOxlint, runPrettier, stylelintAll, } from '../lint.util.js';
+import { eslintAll, lintAllCommand, lintStagedCommand, requireOxlintConfig, runBiome, runCommitlintCommand, runOxlint, runPrettier, stylelintAll, } from '../lint.util.js';
 import { runTest } from '../test.util.js';
 const commands = [
     new Separator(), // build
+    { name: 'check', fn: check, desc: '"Run all possible checks": lint, typecheck, then test.' },
+    { name: 'bt', fn: bt, desc: 'Build & Test: run "typecheck" (via oxlint) and then "test".' },
     {
         name: 'typecheck',
-        fn: typecheck,
-        desc: 'Run typecheck (tsc) in folders (src, scripts, e2e) if there is tsconfig.json present',
+        fn: typecheckWithOxlint,
+        desc: 'Run typecheck via oxlint --type-aware',
+    },
+    {
+        name: 'typecheck-with-tsc',
+        fn: typecheckWithTSC,
+        desc: 'Run typecheck (tsc) in folders (src, scripts, e2e) if there is tsconfig.json present. Deprecated, use oxlint type-checking instead.',
     },
-    { name: 'bt', fn: bt, desc: 'Build & Test: run "typecheck" (tsc) and then "test".' },
-    { name: 'check', fn: lbt, desc: '"Run all possible checks": lint, typecheck, then test.' },
     {
         name: 'build',
         fn: buildProd,
@@ -145,15 +150,20 @@ runScript(async () => {
     }
     await commandMap[cmd].fn();
 });
-async function lbt() {
+async function check() {
     await lintAllCommand();
-    await bt();
+    runTest();
 }
 async function bt() {
-    await typecheck();
+    await typecheckWithOxlint();
     runTest();
 }
-async function typecheck() {
+async function typecheckWithOxlint() {
+    requireOxlintConfig();
+    const fix = !CI;
+    runOxlint(fix);
+}
+async function typecheckWithTSC() {
     await runTSCInFolders(['src', 'scripts', 'e2e'], ['--noEmit']);
 }
 async function cleanDist() {

package/dist/build.util.d.ts

@@ -1,11 +1,9 @@
 export declare function buildProd(): Promise<void>;
 /**
  * Use 'src' to indicate root.
+ *
+ * @deprecated - oxlint should be used for type-checking instead, it's faster.
  */
 export declare function runTSCInFolders(dirs: string[], args?: string[], parallel?: boolean): Promise<void>;
-/**
- * Pass 'src' to run in root.
- */
-export declare function runTSCInFolder(dir: string, args?: string[]): Promise<void>;
 export declare function runTSCProd(args?: string[]): Promise<void>;
 export declare function buildCopy(): void;

package/dist/build.util.js

@@ -11,6 +11,8 @@ export async function buildProd() {
 }
 /**
  * Use 'src' to indicate root.
+ *
+ * @deprecated - oxlint should be used for type-checking instead, it's faster.
  */
 export async function runTSCInFolders(dirs, args = [], parallel = true) {
     if (parallel) {
@@ -25,7 +27,7 @@ export async function runTSCInFolders(dirs, args = [], parallel = true) {
 /**
  * Pass 'src' to run in root.
  */
-export async function runTSCInFolder(dir, args = []) {
+async function runTSCInFolder(dir, args = []) {
     let configDir = dir;
     if (dir === 'src') {
         configDir = '';

package/dist/lint.util.d.ts

@@ -12,6 +12,8 @@ interface EslintAllOptions {
  */
 export declare function eslintAll(opt?: EslintAllOptions): void;
 export declare function runOxlint(fix?: boolean): void;
+export declare function requireOxlintConfig(): void;
+export declare function hasOxlintConfig(): boolean;
 interface RunPrettierOptions {
     experimentalCli?: boolean;
     fix?: boolean;

package/dist/lint.util.js

@@ -132,8 +132,8 @@ function runESLint(extensions = eslintExtensions.split(','), fix = true) {
     });
 }
 export function runOxlint(fix = true) {
-    const oxlintConfigPath = `.oxlintrc.json`;
-    if (!existsSync(oxlintConfigPath)) {
+    if (!hasOxlintConfig()) {
+        console.log('.oxlintrc.json is not found, skipping to run oxlint');
         return;
     }
     const oxlintPath = findPackageBinPath('oxlint', 'oxlint');
@@ -151,6 +151,13 @@ export function runOxlint(fix = true) {
         shell: false,
     });
 }
+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}}`,

package/package.json

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