@naturalcycles/dev-lib 13.38.1 → 13.38.3

package/dist/cmd/build-prod-esm-cjs.command.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildProdESMCJSCommand = void 0;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const exec_util_1 = require("../util/exec.util");
 // You cannot have a shared `tsconfig.prod.json` because of relative paths for `include`
 const TSCONF_CJS_PATH = `./tsconfig.cjs.prod.json`;
 const TSCONF_ESM_PATH = `./tsconfig.esm.prod.json`;
@@ -20,8 +19,8 @@ async function buildProdESMCJSCommand() {
     const cjsPath = cjsExists ? TSCONF_CJS_PATH : TSCONF_PATH;
     const esmPath = esmExists ? TSCONF_ESM_PATH : TSCONF_PATH;
     await Promise.all([
-        (0, exec_util_1.execVoidCommand)('tsc', ['-P', cjsPath, '--outDir', './dist', '--module', 'commonjs']),
-        (0, exec_util_1.execVoidCommand)('tsc', [
+        (0, nodejs_lib_1.execVoidCommand)('tsc', ['-P', cjsPath, '--outDir', './dist', '--module', 'commonjs']),
+        (0, nodejs_lib_1.execVoidCommand)('tsc', [
             '-P',
             esmPath,
             '--outDir',

package/dist/cmd/eslint-all.command.d.ts

@@ -1,4 +1,4 @@
 /**
  * Runs `eslint` command for all predefined paths (e.g /src, /scripts, etc).
  */
-export declare function eslintAllCommand(): void;
+export declare function eslintAllCommand(): Promise<void>;

package/dist/cmd/eslint-all.command.js

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintAllCommand = void 0;
 const fs = require("node:fs");
+const js_lib_1 = require("@naturalcycles/js-lib");
+const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const yargs = require("yargs");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 const lint_util_1 = require("../util/lint.util");
 /**
  * Runs `eslint` command for all predefined paths (e.g /src, /scripts, etc).
  */
-function eslintAllCommand() {
+async function eslintAllCommand() {
+    const started = Date.now();
     const { ext, fix } = yargs.options({
         ext: {
             type: 'string',
@@ -29,12 +32,25 @@ function eslintAllCommand() {
     const tsconfigPathScripts = (0, lint_util_1.getTSConfigPathScripts)();
     const tsconfigPathE2e = `./e2e/tsconfig.json`;
     // todo: run on other dirs too, e.g pages, components, layouts
-    // /src
-    // await runESLint(`./src`, eslintConfigPathRoot, tsconfigPath, extensions)
-    (0, lint_util_1.runESLint)(`./src`, eslintConfigPathRoot, undefined, extensions, fix);
-    // /scripts
-    (0, lint_util_1.runESLint)(`./scripts`, eslintConfigPathScripts, tsconfigPathScripts, undefined, fix);
-    // /e2e
-    (0, lint_util_1.runESLint)(`./e2e`, eslintConfigPathE2e, tsconfigPathE2e, undefined, fix);
+    if (fix) {
+        await Promise.all([
+            // /src
+            (0, lint_util_1.runESLintAsync)(`./src`, eslintConfigPathRoot, undefined, extensions, fix),
+            // /scripts
+            (0, lint_util_1.runESLintAsync)(`./scripts`, eslintConfigPathScripts, tsconfigPathScripts, undefined, fix),
+            // /e2e
+            (0, lint_util_1.runESLintAsync)(`./e2e`, eslintConfigPathE2e, tsconfigPathE2e, undefined, fix),
+        ]);
+    }
+    else {
+        // with no-fix - let's run serially
+        // /src
+        await (0, lint_util_1.runESLintAsync)(`./src`, eslintConfigPathRoot, undefined, extensions, fix);
+        // /scripts
+        await (0, lint_util_1.runESLintAsync)(`./scripts`, eslintConfigPathScripts, tsconfigPathScripts, undefined, fix);
+        // /e2e
+        await (0, lint_util_1.runESLintAsync)(`./e2e`, eslintConfigPathE2e, tsconfigPathE2e, undefined, fix);
+    }
+    console.log(`${(0, colors_1.boldGrey)('eslint-all')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.eslintAllCommand = eslintAllCommand;

package/dist/cmd/lint-all.command.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintAllCommand = void 0;
 const fs = require("node:fs");
+const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const yargs = require("yargs");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -12,6 +13,7 @@ const eslint_all_command_1 = require("./eslint-all.command");
  * We run eslint BEFORE Prettier, because eslint can delete e.g unused imports.
  */
 async function lintAllCommand() {
+    const started = Date.now();
     const { commitOnChanges, failOnChanges } = yargs.options({
         commitOnChanges: {
             type: 'boolean',
@@ -23,7 +25,7 @@ async function lintAllCommand() {
         },
     }).argv;
     const hadChangesBefore = (0, nodejs_lib_1.gitHasUncommittedChanges)();
-    (0, eslint_all_command_1.eslintAllCommand)();
+    await (0, eslint_all_command_1.eslintAllCommand)();
     if (fs.existsSync(`node_modules/stylelint`) &&
         fs.existsSync(`node_modules/stylelint-config-standard-scss`)) {
         (0, stylelint_util_1.stylelintAll)();
@@ -33,6 +35,7 @@ async function lintAllCommand() {
         const ktlintLib = require('@naturalcycles/ktlint');
         await ktlintLib.ktlintAll();
     }
+    console.log(`${(0, colors_1.boldGrey)('lint-all')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
     if (commitOnChanges || failOnChanges) {
         // detect changes
         const hasChanges = (0, nodejs_lib_1.gitHasUncommittedChanges)();

package/dist/cmd/tsc-prod.command.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tscProdCommand = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const exec_util_1 = require("../util/exec.util");
 function tscProdCommand() {
     // You cannot have a shared `tsconfig.prod.json` because of relative paths for `include`
     const projectTsconfigPath = `./tsconfig.prod.json`;
     const args = ['-P', projectTsconfigPath];
     const started = Date.now();
-    (0, exec_util_1.execVoidCommandSync)(`tsc`, args);
+    (0, nodejs_lib_1.execVoidCommandSync)(`tsc`, args);
     console.log(`${(0, colors_1.boldGrey)('tsc prod')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscProdCommand = tscProdCommand;

package/dist/util/jest.util.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runJest = exports.isRunningAllTests = exports.getJestManualConfigPath = exports.getJestIntegrationConfigPath = exports.getJestConfigPath = void 0;
 const fs = require("node:fs");
 const os = require("node:os");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const exec_util_1 = require("./exec.util");
 const test_util_1 = require("./test.util");
 function getJestConfigPath() {
     return fs.existsSync(`./jest.config.js`) ? './jest.config.js' : `${paths_cnst_1.cfgDir}/jest.config.js`;
@@ -128,13 +128,13 @@ function runJest(opt = {}) {
         const totalShards = Number(JEST_SHARDS);
         const shards = (0, js_lib_1._range)(1, totalShards + 1);
         for (const shard of shards) {
-            (0, exec_util_1.execVoidCommandSync)('jest', (0, js_lib_1._uniq)([...args, `--shard=${shard}/${totalShards}`]), {
+            (0, nodejs_lib_1.execVoidCommandSync)('jest', (0, js_lib_1._uniq)([...args, `--shard=${shard}/${totalShards}`]), {
                 env,
             });
         }
     }
     else {
-        (0, exec_util_1.execVoidCommandSync)('jest', (0, js_lib_1._uniq)(args), {
+        (0, nodejs_lib_1.execVoidCommandSync)('jest', (0, js_lib_1._uniq)(args), {
             env,
         });
     }

package/dist/util/lint.util.d.ts

@@ -1,3 +1,4 @@
 export declare function getTSConfigPath(): string;
 export declare function getTSConfigPathScripts(): string;
-export declare function runESLint(dir: string, eslintConfigPath: string, tsconfigPath: string | undefined, extensions?: string[], fix?: boolean): void;
+export declare function runESLint(dir: string, eslintConfigPath: string, tsconfigPath?: string, extensions?: string[], fix?: boolean): void;
+export declare function runESLintAsync(dir: string, eslintConfigPath: string, tsconfigPath?: string, extensions?: string[], fix?: boolean): Promise<void>;

package/dist/util/lint.util.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runESLint = exports.getTSConfigPathScripts = exports.getTSConfigPath = void 0;
+exports.runESLintAsync = exports.runESLint = exports.getTSConfigPathScripts = exports.getTSConfigPath = void 0;
 const fs = require("node:fs");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const exec_util_1 = require("./exec.util");
 function getTSConfigPath() {
     // this is to support "Solution style tsconfig.json" (as used in Angular10, for example)
     // return [`./tsconfig.base.json`].find(p => fs.existsSync(p)) || `./tsconfig.json`
@@ -17,7 +17,17 @@ exports.getTSConfigPathScripts = getTSConfigPathScripts;
 function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
     if (!fs.existsSync(dir))
         return; // faster to bail-out like this
-    const args = [
+    (0, nodejs_lib_1.execVoidCommandSync)('eslint', getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions, fix));
+}
+exports.runESLint = runESLint;
+async function runESLintAsync(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
+    if (!fs.existsSync(dir))
+        return; // faster to bail-out like this
+    await (0, nodejs_lib_1.execVoidCommand)('eslint', getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions, fix));
+}
+exports.runESLintAsync = runESLintAsync;
+function getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
+    return [
         `--config`,
         eslintConfigPath,
         `${dir}/**/*.{${extensions.join(',')}}`,
@@ -26,6 +36,4 @@ function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx
         `--report-unused-disable-directives`,
         fix ? `--fix` : '',
     ].filter(Boolean);
-    (0, exec_util_1.execVoidCommandSync)('eslint', args);
 }
-exports.runESLint = runESLint;

package/dist/util/prettier.util.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runPrettier = void 0;
 const fs = require("node:fs");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const exec_util_1 = require("./exec.util");
 const { prettierDirs, prettierExtensionsAll, lintExclude } = require('../../cfg/_cnst');
 const prettierPaths = [
     // Everything inside these folders
@@ -18,6 +18,6 @@ function runPrettier() {
     const prettierConfigPath = [`./prettier.config.js`].find(f => fs.existsSync(f)) || `${paths_cnst_1.cfgDir}/prettier.config.js`;
     // prettier --write 'src/**/*.{js,ts,css,scss,graphql}'
     const args = [`--write`, `--log-level=warn`, `--config`, prettierConfigPath, ...prettierPaths];
-    (0, exec_util_1.execVoidCommandSync)('prettier', args);
+    (0, nodejs_lib_1.execVoidCommandSync)('prettier', args);
 }
 exports.runPrettier = runPrettier;

package/dist/util/stylelint.util.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stylelintAll = exports.stylelintPaths = void 0;
 const fs = require("node:fs");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yargs = require("yargs");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const exec_util_1 = require("./exec.util");
 const { prettierDirs, stylelintExtensions, lintExclude } = require('../../cfg/_cnst');
 exports.stylelintPaths = [
     // Everything inside these folders
@@ -27,6 +27,6 @@ function stylelintAll() {
         config,
         ...exports.stylelintPaths,
     ].filter(Boolean);
-    (0, exec_util_1.execVoidCommandSync)('stylelint', args);
+    (0, nodejs_lib_1.execVoidCommandSync)('stylelint', args);
 }
 exports.stylelintAll = stylelintAll;

package/dist/util/tsc.util.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureProjectTsconfigScripts = exports.tscScriptsAsync = exports.tscScripts = exports.tscAsync = exports.tsc = exports.tscMainAndScripts = void 0;
 const fs = require("node:fs");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const fs_1 = require("@naturalcycles/nodejs-lib/dist/fs");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-const exec_util_1 = require("./exec.util");
 async function tscMainAndScripts(noEmit = false) {
     await Promise.all([tscAsync(noEmit), tscScriptsAsync()]);
 }
@@ -14,14 +14,14 @@ exports.tscMainAndScripts = tscMainAndScripts;
 function tsc(noEmit = false) {
     const started = Date.now();
     const args = [noEmit && '--noEmit'].filter(js_lib_1._isTruthy);
-    (0, exec_util_1.execVoidCommandSync)('tsc', args);
+    (0, nodejs_lib_1.execVoidCommandSync)('tsc', args);
     console.log(`${(0, colors_1.boldGrey)('tsc')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tsc = tsc;
 async function tscAsync(noEmit = false) {
     const started = Date.now();
     const args = [noEmit && '--noEmit'].filter(js_lib_1._isTruthy);
-    await (0, exec_util_1.execVoidCommand)('tsc', args);
+    await (0, nodejs_lib_1.execVoidCommand)('tsc', args);
     console.log(`${(0, colors_1.boldGrey)('tsc')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscAsync = tscAsync;
@@ -33,7 +33,7 @@ function tscScripts() {
     const projectTsconfigPath = ensureProjectTsconfigScripts();
     const args = ['-P', projectTsconfigPath, '--noEmit'];
     const started = Date.now();
-    (0, exec_util_1.execVoidCommandSync)(`tsc`, args);
+    (0, nodejs_lib_1.execVoidCommandSync)(`tsc`, args);
     console.log(`${(0, colors_1.boldGrey)('tsc scripts')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscScripts = tscScripts;
@@ -45,7 +45,7 @@ async function tscScriptsAsync() {
     const projectTsconfigPath = ensureProjectTsconfigScripts();
     const args = ['-P', projectTsconfigPath, '--noEmit'];
     const started = Date.now();
-    await (0, exec_util_1.execVoidCommand)(`tsc`, args);
+    await (0, nodejs_lib_1.execVoidCommand)(`tsc`, args);
     console.log(`${(0, colors_1.boldGrey)('tsc scripts')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscScriptsAsync = tscScriptsAsync;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.38.1",
+  "version": "13.38.3",
   "scripts": {
     "prepare": "husky install",
     "tsn-debug": "tsn testScript.ts",

package/dist/util/exec.util.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import { SpawnOptions } from 'node:child_process';
-export declare function execVoidCommand(cmd: string, args?: string[], opt?: SpawnOptions): Promise<void>;
-export declare function execVoidCommandSync(cmd: string, args?: string[], opt?: SpawnOptions): void;

package/dist/util/exec.util.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execVoidCommandSync = exports.execVoidCommand = void 0;
-const cp = require("node:child_process");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-async function execVoidCommand(cmd, args = [], opt = {}) {
-    logExec(cmd, args, opt);
-    await new Promise(resolve => {
-        const p = cp.spawn(cmd, [...args], {
-            stdio: 'inherit',
-            // shell: true,
-            ...opt,
-            env: {
-                ...process.env,
-                ...opt.env,
-            },
-        });
-        p.on('close', code => {
-            if (code) {
-                console.log(`${cmd} exited with code ${code}`);
-                process.exit(code);
-            }
-            resolve();
-        });
-    });
-}
-exports.execVoidCommand = execVoidCommand;
-function execVoidCommandSync(cmd, args = [], opt = {}) {
-    logExec(cmd, args, opt);
-    const r = cp.spawnSync(cmd, [...args], {
-        encoding: 'utf8',
-        stdio: 'inherit',
-        // shell: true, // removing shell breaks executing `tsc`
-        ...opt,
-        env: {
-            ...process.env,
-            ...opt.env,
-        },
-    });
-    if (r.status) {
-        console.log(`${cmd} exited with code ${r.status}`);
-        process.exit(r.status);
-    }
-    if (r.error) {
-        console.log(r.error);
-        process.exit(r.error.errno || 1);
-    }
-}
-exports.execVoidCommandSync = execVoidCommandSync;
-function logExec(cmd, args = [], opt = {}) {
-    const cmdline = [
-        ...Object.entries(opt.env || {}).map(([k, v]) => [k, v].join('=')),
-        cmd,
-        ...args,
-    ].join(' ');
-    console.log((0, colors_1.grey)(cmdline));
-}