@naturalcycles/dev-lib 13.40.1 → 13.41.0

package/cfg/eslint-rules.js

@@ -167,11 +167,23 @@ module.exports = {
       'undefined',
     ],
     'id-match': 2,
-    'import/order': 2,
+    'import/order': [
+      2,
+      {
+        alphabetize: {
+          order: 'asc',
+        },
+      },
+    ],
     'import/no-anonymous-default-export': 2,
     // 'import/namespace': 0, // issues with e.g globby
     // 'import/no-unresolved': 0, // breaks for type-aliases, e.g '@/store'
-    // 'import/no-duplicates': 0,
+    'import/no-duplicates': [2, { 'prefer-inline': false }],
+    'import/export': 2,
+    'import/no-empty-named-blocks': 2,
+    'import/no-cycle': 2,
+    'import/no-useless-path-segments': 2,
+    'import/no-default-export': 2,
     'jsdoc/check-alignment': 2,
     // "jsdoc/check-indentation": "error",
     // 'jsdoc/newline-after-description': 2,

package/dist/bin/bt.js

@@ -2,10 +2,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const jest_util_1 = require("../util/jest.util");
 const tsc_util_1 = require("../util/tsc.util");
-(0, nodejs_lib_2.runScript)(async () => {
+(0, nodejs_lib_1.runScript)(async () => {
     (0, nodejs_lib_1._emptyDirSync)('./dist'); // it doesn't delete the dir itself, to prevent IDE jumping
     // fs.rmSync('./dist', { recursive: true, force: true })
     await (0, tsc_util_1.tscMainAndScripts)(true);

package/dist/bin/btl.js

@@ -2,11 +2,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const lint_all_command_1 = require("../cmd/lint-all.command");
 const jest_util_1 = require("../util/jest.util");
 const tsc_util_1 = require("../util/tsc.util");
-(0, nodejs_lib_2.runScript)(async () => {
+(0, nodejs_lib_1.runScript)(async () => {
     await (0, lint_all_command_1.lintAllCommand)();
     (0, nodejs_lib_1._emptyDirSync)('./dist'); // it doesn't delete the dir itself, to prevent IDE jumping
     // fs.rmSync('./dist', { recursive: true, force: true })

package/dist/bin/build.js

@@ -2,9 +2,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const tsc_util_1 = require("../util/tsc.util");
-(0, nodejs_lib_2.runScript)(async () => {
+(0, nodejs_lib_1.runScript)(async () => {
     (0, nodejs_lib_1._emptyDirSync)('./dist'); // it doesn't delete the dir itself, to prevent IDE jumping
     // fs.rmSync('./dist', { recursive: true, force: true })
     await (0, tsc_util_1.tscMainAndScripts)(true);

package/dist/bin/update-from-dev-lib.js

@@ -2,9 +2,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
-(0, nodejs_lib_2.runScript)(() => {
+(0, nodejs_lib_1.runScript)(() => {
     (0, nodejs_lib_1.kpySync)({
         baseDir: paths_cnst_1.cfgOverwriteDir,
         outputDir: './',

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

@@ -17,7 +17,16 @@ async function buildProdESMCJSCommand() {
     const cjsPath = cjsExists ? TSCONF_CJS_PATH : TSCONF_PATH;
     const esmPath = esmExists ? TSCONF_ESM_PATH : TSCONF_PATH;
     await Promise.all([
-        (0, nodejs_lib_1.execVoidCommand)('tsc', ['-P', cjsPath, '--outDir', './dist', '--module', 'commonjs']),
+        (0, nodejs_lib_1.execVoidCommand)('tsc', [
+            '-P',
+            cjsPath,
+            '--outDir',
+            './dist',
+            '--module',
+            'commonjs',
+            '--moduleResolution',
+            'node',
+        ]),
         (0, nodejs_lib_1.execVoidCommand)('tsc', [
             '-P',
             esmPath,

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

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintAllCommand = void 0;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const yargs_1 = tslib_1.__importDefault(require("yargs"));
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 const prettier_util_1 = require("../util/prettier.util");
 const stylelint_util_1 = require("../util/stylelint.util");
 const eslint_all_command_1 = require("./eslint-all.command");
@@ -25,7 +24,7 @@ async function lintAllCommand() {
             default: false,
         },
     }).argv;
-    const hadChangesBefore = (0, nodejs_lib_2.gitHasUncommittedChanges)();
+    const hadChangesBefore = (0, nodejs_lib_1.gitHasUncommittedChanges)();
     await (0, eslint_all_command_1.eslintAllCommand)();
     if (node_fs_1.default.existsSync(`node_modules/stylelint`) &&
         node_fs_1.default.existsSync(`node_modules/stylelint-config-standard-scss`)) {
@@ -39,17 +38,17 @@ async function lintAllCommand() {
     console.log(`${(0, nodejs_lib_1.boldGrey)('lint-all')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
     if (commitOnChanges || failOnChanges) {
         // detect changes
-        const hasChanges = (0, nodejs_lib_2.gitHasUncommittedChanges)();
+        const hasChanges = (0, nodejs_lib_1.gitHasUncommittedChanges)();
         if (hasChanges) {
             if (hadChangesBefore) {
                 console.log(`lint-all: there are changes before running lint-all, will not commit`);
             }
             else {
-                const msg = 'style(ci): ' + (0, js_lib_1._truncate)((0, nodejs_lib_2.commitMessageToTitleMessage)((0, nodejs_lib_2.getLastGitCommitMsg)()), 60);
+                const msg = 'style(ci): ' + (0, js_lib_1._truncate)((0, nodejs_lib_1.commitMessageToTitleMessage)((0, nodejs_lib_1.getLastGitCommitMsg)()), 60);
                 // pull, commit, push changes
-                (0, nodejs_lib_2.gitPull)();
-                (0, nodejs_lib_2.gitCommitAll)(msg);
-                (0, nodejs_lib_2.gitPush)();
+                (0, nodejs_lib_1.gitPull)();
+                (0, nodejs_lib_1.gitCommitAll)(msg);
+                (0, nodejs_lib_1.gitPush)();
             }
             // fail on changes
             if (failOnChanges) {

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

@@ -3,13 +3,12 @@ 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 nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
 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, nodejs_lib_1.execVoidCommandSync)(`tsc`, args);
-    console.log(`${(0, nodejs_lib_2.boldGrey)('tsc prod')} ${(0, nodejs_lib_2.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    console.log(`${(0, nodejs_lib_1.boldGrey)('tsc prod')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscProdCommand = tscProdCommand;

package/dist/testing/index.d.ts

@@ -1,8 +1,8 @@
+import { expectTypeOf } from 'expect-type';
 import timekeeper from 'timekeeper';
 export * from '../jestOffline.util';
 export * from './expect.util';
 export * from './mockAllKindsOfThings';
 export * from './testing.util';
 export * from './time.util';
-import { expectTypeOf } from 'expect-type';
 export { timekeeper, expectTypeOf };

package/dist/testing/index.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expectTypeOf = exports.timekeeper = void 0;
 const tslib_1 = require("tslib");
+const expect_type_1 = require("expect-type");
+Object.defineProperty(exports, "expectTypeOf", { enumerable: true, get: function () { return expect_type_1.expectTypeOf; } });
 const timekeeper_1 = tslib_1.__importDefault(require("timekeeper"));
 exports.timekeeper = timekeeper_1.default;
 tslib_1.__exportStar(require("../jestOffline.util"), exports);
@@ -9,5 +11,3 @@ tslib_1.__exportStar(require("./expect.util"), exports);
 tslib_1.__exportStar(require("./mockAllKindsOfThings"), exports);
 tslib_1.__exportStar(require("./testing.util"), exports);
 tslib_1.__exportStar(require("./time.util"), exports);
-const expect_type_1 = require("expect-type");
-Object.defineProperty(exports, "expectTypeOf", { enumerable: true, get: function () { return expect_type_1.expectTypeOf; } });

package/dist/util/jest.util.js

@@ -4,9 +4,8 @@ exports.runJest = exports.isRunningAllTests = exports.getJestManualConfigPath =
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_os_1 = tslib_1.__importDefault(require("node:os"));
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 const test_util_1 = require("./test.util");
 function getJestConfigPath() {
@@ -40,7 +39,7 @@ exports.isRunningAllTests = isRunningAllTests;
  */
 function runJest(opt = {}) {
     if (!(0, test_util_1.nodeModuleExists)('jest')) {
-        console.log((0, nodejs_lib_2.dimGrey)(`node_modules/${(0, nodejs_lib_2.white)('jest')} not found, skipping tests`));
+        console.log((0, nodejs_lib_1.dimGrey)(`node_modules/${(0, nodejs_lib_1.white)('jest')} not found, skipping tests`));
         return;
     }
     const { CI, CIRCLECI, CPU_LIMIT, TZ = 'UTC', APP_ENV, JEST_NO_ALPHABETIC, JEST_SHARDS, NODE_OPTIONS = 'not defined', } = process.env;
@@ -116,7 +115,7 @@ function runJest(opt = {}) {
     }
     const availableParallelism = node_os_1.default.availableParallelism?.();
     const cpus = node_os_1.default.cpus().length;
-    console.log(`${(0, nodejs_lib_2.dimGrey)(Object.entries({
+    console.log(`${(0, nodejs_lib_1.dimGrey)(Object.entries({
         node,
         NODE_OPTIONS,
         cpus,

package/dist/util/tsc.util.js

@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureProjectTsconfigScripts = exports.tscScriptsAsync = exports.tscScripts = exports.tscAsync = exports.tsc = exports.tscMainAndScripts = void 0;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const js_lib_1 = require("@naturalcycles/js-lib");
-const nodejs_lib_2 = require("@naturalcycles/nodejs-lib");
-const nodejs_lib_3 = require("@naturalcycles/nodejs-lib");
+const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 async function tscMainAndScripts(noEmit = false) {
     await Promise.all([tscAsync(noEmit), tscScriptsAsync()]);
@@ -16,14 +14,14 @@ function tsc(noEmit = false) {
     const started = Date.now();
     const args = [noEmit && '--noEmit'].filter(js_lib_1._isTruthy);
     (0, nodejs_lib_1.execVoidCommandSync)('tsc', args);
-    console.log(`${(0, nodejs_lib_2.boldGrey)('tsc')} ${(0, nodejs_lib_2.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    console.log(`${(0, nodejs_lib_1.boldGrey)('tsc')} ${(0, nodejs_lib_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, nodejs_lib_1.execVoidCommand)('tsc', args);
-    console.log(`${(0, nodejs_lib_2.boldGrey)('tsc')} ${(0, nodejs_lib_2.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    console.log(`${(0, nodejs_lib_1.boldGrey)('tsc')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscAsync = tscAsync;
 function tscScripts() {
@@ -35,7 +33,7 @@ function tscScripts() {
     const args = ['-P', projectTsconfigPath, '--noEmit'];
     const started = Date.now();
     (0, nodejs_lib_1.execVoidCommandSync)(`tsc`, args);
-    console.log(`${(0, nodejs_lib_2.boldGrey)('tsc scripts')} ${(0, nodejs_lib_2.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    console.log(`${(0, nodejs_lib_1.boldGrey)('tsc scripts')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscScripts = tscScripts;
 async function tscScriptsAsync() {
@@ -47,7 +45,7 @@ async function tscScriptsAsync() {
     const args = ['-P', projectTsconfigPath, '--noEmit'];
     const started = Date.now();
     await (0, nodejs_lib_1.execVoidCommand)(`tsc`, args);
-    console.log(`${(0, nodejs_lib_2.boldGrey)('tsc scripts')} ${(0, nodejs_lib_2.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    console.log(`${(0, nodejs_lib_1.boldGrey)('tsc scripts')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tscScriptsAsync = tscScriptsAsync;
 /**
@@ -58,12 +56,12 @@ function ensureProjectTsconfigScripts() {
     if (!node_fs_1.default.existsSync(projectTsconfigPath)) {
         // You cannot just use a shared `tsconfig.scripts.json` because of relative paths for `include`
         // So, it will be copied into the project
-        (0, nodejs_lib_3.kpySync)({
+        (0, nodejs_lib_1.kpySync)({
             baseDir: `${paths_cnst_1.cfgDir}/init/scripts/`,
             inputPatterns: ['tsconfig.json'],
             outputDir: './scripts',
         });
-        console.log(`${(0, nodejs_lib_2.boldGrey)('/scripts/tsconfig.json')} file is automatically added`);
+        console.log(`${(0, nodejs_lib_1.boldGrey)('/scripts/tsconfig.json')} file is automatically added`);
     }
     return projectTsconfigPath;
 }

package/package.json

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