@naturalcycles/dev-lib 19.31.1 → 19.33.0

package/cfg/init/scripts/tsconfig.json

@@ -2,6 +2,7 @@
 // tsconfig.json for /scripts
 //
 {
-  "extends": "@naturalcycles/dev-lib/scripts/tsconfig.json",
+  "extends": "@naturalcycles/dev-lib/cfg/tsconfig.scripts.json",
+  "compilerOptions": {},
   "exclude": ["**/__exclude"]
 }

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',
@@ -222,4 +235,12 @@ function getActionLintVersion() {
   }
 }
 
+function hasPrettierOverrides() {
+  try {
+    return fs2.readText('prettier.config.js').includes('overrides')
+  } catch {
+    return false
+  }
+}
+
 export default linters

package/cfg/tsconfig.backend.json

@@ -0,0 +1,15 @@
+//
+// @naturalcycles/dev-lib/cfg/tsconfig.backend.json
+//
+// Shared tsconfig for Backend services
+//
+{
+  "compilerOptions": {
+    "paths": {
+      "@src/*": ["${configDir}/src/*"]
+    }
+  }
+  // Need to be specified in the project tsconfig
+  // "include": ["src"],
+  // "exclude": ["**/__exclude"]
+}

package/cfg/tsconfig.e2e.json

@@ -0,0 +1,14 @@
+//
+// @naturalcycles/dev-lib/cfg/tsconfig.e2e.json
+//
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "${configDir}/..",
+    "baseUrl": "${configDir}",
+    "outDir": "${configDir}/../dist/e2e",
+    "noEmit": true,
+    "tsBuildInfoFile": "${configDir}/../node_modules/.cache/e2e.tsbuildinfo"
+  },
+  "exclude": ["**/__exclude"]
+}

package/cfg/tsconfig.frontend.json

@@ -0,0 +1,17 @@
+//
+// @naturalcycles/dev-lib/cfg/tsconfig.frontend.json
+//
+// Shared tsconfig for Frontend applications
+//
+{
+  "compilerOptions": {
+    "noEmit": true,
+    "target": "es2023", // es2023+ browsers, adjust to your requirements!
+    "lib": ["esnext", "dom", "dom.iterable"],
+    "module": "esnext",
+    "moduleResolution": "bundler"
+  }
+  // Need to be specified in the project tsconfig
+  // "include": ["src"],
+  // "exclude": ["**/__exclude"]
+}

package/cfg/tsconfig.json

@@ -5,10 +5,9 @@
 //
 {
   "compilerOptions": {
-    // ${configDir} is supported since ts 5.5
     "rootDir": "${configDir}/src",
+    "baseUrl": "${configDir}/src",
     "outDir": "${configDir}/dist",
-
     // Target/module
     "target": "es2023",
     "lib": ["esnext"], // add "dom" if needed
@@ -45,17 +44,11 @@
     "noUncheckedSideEffectImports": true,
     "noPropertyAccessFromIndexSignature": true,
 
-    // todo: monitor if we should have it default or not
     // Enabled should be faster, but will catch less errors
     // "skipLibCheck": true,
 
-    // Need to be specified in the project tsconfig
-    // "typeRoots": [
-    //   "node_modules/@types",
-    //   "src/@types"
-    // ],
-
     // Other
+    "jsx": "preserve",
     "incremental": true,
     "tsBuildInfoFile": "${configDir}/node_modules/.cache/src.tsbuildinfo",
     "pretty": true,

package/cfg/tsconfig.scripts.json

@@ -0,0 +1,14 @@
+//
+// @naturalcycles/dev-lib/cfg/tsconfig.scripts.json
+//
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "${configDir}/..",
+    "baseUrl": "${configDir}",
+    "outDir": "${configDir}/../dist/scripts",
+    "noEmit": true,
+    "tsBuildInfoFile": "${configDir}/../node_modules/.cache/scripts.tsbuildinfo"
+  },
+  "exclude": ["**/__exclude"]
+}

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,7 +110,7 @@ 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;
@@ -130,7 +130,7 @@ async function runESLint(dir, extensions = eslintExtensions.split(','), fix = tr
     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: [
@@ -164,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,
@@ -309,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.1",
+  "version": "19.33.0",
   "dependencies": {
     "@biomejs/biome": "^2",
     "@commitlint/cli": "^19",
@@ -53,8 +53,11 @@
     "./cfg/prettier.config.js": "./cfg/prettier.config.js",
     "./cfg/stylelint.config.js": "./cfg/stylelint.config.js",
     "./cfg/tsconfig.json": "./cfg/tsconfig.json",
+    "./cfg/tsconfig.scripts.json": "./cfg/tsconfig.scripts.json",
+    "./cfg/tsconfig.e2e.json": "./cfg/tsconfig.e2e.json",
+    "./cfg/tsconfig.backend.json": "./cfg/tsconfig.backend.json",
+    "./cfg/tsconfig.frontend.json": "./cfg/tsconfig.frontend.json",
     "./cfg/vitest.config.js": "./cfg/vitest.config.js",
-    "./scripts/tsconfig.json": "./scripts/tsconfig.json",
     ".": "./dist/index.js",
     "./testing": "./dist/testing/index.js",
     "./testing/time": "./dist/testing/time.js",

package/scripts/tsconfig.json

@@ -2,12 +2,7 @@
 // tsconfig.json for /scripts
 //
 {
-  "extends": "../cfg/tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "${configDir}/..",
-    "outDir": "${configDir}/../dist/scripts",
-    "noEmit": true,
-    "tsBuildInfoFile": "${configDir}/../node_modules/.cache/scripts.tsbuildinfo"
-  },
+  "extends": "../cfg/tsconfig.scripts.json",
+  "compilerOptions": {},
   "exclude": ["**/__exclude"]
 }