@naturalcycles/dev-lib 13.53.0 → 13.55.0

package/cfg/_cnst.js

@@ -1,6 +1,6 @@
 module.exports = {
   prettierDirs: [
-    'src,scripts,e2e,playwright,docs,cfg,resources,.circleci,.github,public,static,components,content,layouts,pages,plugins,middleware,store,blocks',
+    'src,scripts,e2e,playwright,docs,cfg,resources,.github,public,static,components,content,layouts,pages,plugins,middleware,store,blocks',
   ],
   // ts,tsx,css,scss excluded, cause they need to run in special order (overlap between >1 tool):
   prettierExtensionsExclusive: 'js,jsx,json,md,graphql,yml,yaml,html',

package/cfg/tsconfig.json

@@ -5,9 +5,9 @@
 //
 {
   "compilerOptions": {
-    // Disabled because of https://github.com/Microsoft/TypeScript/issues/29172
-    // "outDir": "dist",
-    // "rootDir": "./src",
+    // ${configDir} is supported since ts 5.5
+    "rootDir": "${configDir}/src",
+    "outDir": "${configDir}/dist",
 
     // Target/module
     "target": "es2022",
@@ -39,7 +39,6 @@
     "noFallthroughCasesInSwitch": true,
     "forceConsistentCasingInFileNames": true,
     "resolveJsonModule": true,
-    "suppressImplicitAnyIndexErrors": false,
     "noImplicitOverride": true,
     "noUncheckedIndexedAccess": true,
     "noPropertyAccessFromIndexSignature": true,

package/dist/cmd/build-copy.command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCopyCommand = void 0;
+exports.buildCopyCommand = buildCopyCommand;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function buildCopyCommand() {
     const baseDir = 'src';
@@ -8,7 +8,7 @@ function buildCopyCommand() {
         '**',
         '!**/*.ts',
         '!**/__snapshots__',
-        '**/__exclude',
+        '!**/__exclude',
         '!test',
         '!**/*.test.js',
     ];
@@ -20,4 +20,3 @@ function buildCopyCommand() {
         dotfiles: true,
     });
 }
-exports.buildCopyCommand = buildCopyCommand;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProdESMCJSCommand = void 0;
+exports.buildProdESMCJSCommand = buildProdESMCJSCommand;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 // You cannot have a shared `tsconfig.prod.json` because of relative paths for `include`
 const TSCONF_CJS_PATH = `./tsconfig.cjs.prod.json`;
@@ -39,4 +39,3 @@ async function buildProdESMCJSCommand() {
         ]),
     ]);
 }
-exports.buildProdESMCJSCommand = buildProdESMCJSCommand;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildProdCommand = void 0;
+exports.buildProdCommand = buildProdCommand;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const build_copy_command_1 = require("./build-copy.command");
 const tsc_prod_command_1 = require("./tsc-prod.command");
@@ -10,4 +10,3 @@ function buildProdCommand() {
     (0, build_copy_command_1.buildCopyCommand)();
     (0, tsc_prod_command_1.tscProdCommand)();
 }
-exports.buildProdCommand = buildProdCommand;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintAllCommand = void 0;
+exports.eslintAllCommand = eslintAllCommand;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_lib_1 = require("@naturalcycles/js-lib");
@@ -61,4 +61,3 @@ async function eslintAllCommand() {
     }
     console.log(`${(0, nodejs_lib_1.boldGrey)('eslint-all')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
-exports.eslintAllCommand = eslintAllCommand;

package/dist/cmd/init-from-dev-lib.command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initFromDevLibCommand = void 0;
+exports.initFromDevLibCommand = initFromDevLibCommand;
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 function initFromDevLibCommand() {
@@ -11,4 +11,3 @@ function initFromDevLibCommand() {
         verbose: true,
     });
 }
-exports.initFromDevLibCommand = initFromDevLibCommand;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintAllCommand = void 0;
+exports.lintAllCommand = lintAllCommand;
 const tslib_1 = require("tslib");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
@@ -58,7 +58,6 @@ async function lintAllCommand() {
         }
     }
 }
-exports.lintAllCommand = lintAllCommand;
 async function runKTLint() {
     if (node_fs_1.default.existsSync(`node_modules/@naturalcycles/ktlint`)) {
         const ktlintLib = require('@naturalcycles/ktlint');

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tscProdCommand = void 0;
+exports.tscProdCommand = tscProdCommand;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function tscProdCommand() {
@@ -11,4 +11,3 @@ function tscProdCommand() {
     (0, nodejs_lib_1.execVoidCommandSync)(`tsc`, args);
     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/jestOffline.util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jestOnline = exports.jestOffline = void 0;
+exports.jestOffline = jestOffline;
+exports.jestOnline = jestOnline;
 const testing_1 = require("./testing");
 const LOCAL_HOSTS = ['localhost', '127.0.0.1'];
 const detectLeaks = process.argv.some(a => a.includes('detectLeaks'));
@@ -24,11 +25,9 @@ function jestOffline() {
         socket.bypass();
     });
 }
-exports.jestOffline = jestOffline;
 /**
  * Undo/reset the jestOffline() function by allowing network calls again.
  */
 function jestOnline() {
     mitm?.disable();
 }
-exports.jestOnline = jestOnline;

package/dist/testing/expect.util.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 /**
  * expectResults(v => JSON.stringify(v), [
  *   1,

package/dist/testing/expect.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectResults = void 0;
+exports.expectResults = expectResults;
 /**
  * expectResults(v => JSON.stringify(v), [
  *   1,
@@ -11,4 +11,3 @@ exports.expectResults = void 0;
 function expectResults(fn, values) {
     return expect(new Map(values.map(v => [v, fn(v)])));
 }
-exports.expectResults = expectResults;

package/dist/testing/testing.util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.jestLog = exports.jestLogger = exports.silentConsole = void 0;
+exports.jestLog = exports.jestLogger = void 0;
+exports.silentConsole = silentConsole;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function silentConsole() {
@@ -12,7 +13,6 @@ function silentConsole() {
     console.time = () => { };
     console.table = () => { };
 }
-exports.silentConsole = silentConsole;
 exports.jestLogger = (0, js_lib_1.commonLoggerCreate)((_level, args) => {
     if (process.env['JEST_SILENT'])
         return; // no-op

package/dist/testing/time.util.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetTime = exports.mockTimeMillis = exports.mockTime = exports.MOCK_TS_2018_06_21 = void 0;
+exports.MOCK_TS_2018_06_21 = void 0;
+exports.mockTime = mockTime;
+exports.mockTimeMillis = mockTimeMillis;
+exports.resetTime = resetTime;
 const tslib_1 = require("tslib");
 const timekeeper_1 = tslib_1.__importDefault(require("timekeeper"));
 exports.MOCK_TS_2018_06_21 = 1_529_539_200;
@@ -11,12 +14,9 @@ exports.MOCK_TS_2018_06_21 = 1_529_539_200;
 function mockTime(ts = exports.MOCK_TS_2018_06_21) {
     mockTimeMillis(ts * 1000);
 }
-exports.mockTime = mockTime;
 function mockTimeMillis(millis = exports.MOCK_TS_2018_06_21 * 1000) {
     timekeeper_1.default.freeze(millis);
 }
-exports.mockTimeMillis = mockTimeMillis;
 function resetTime() {
     timekeeper_1.default.reset();
 }
-exports.resetTime = resetTime;

package/dist/util/jest.util.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runJest = exports.isRunningAllTests = exports.getJestManualConfigPath = exports.getJestIntegrationConfigPath = exports.getJestConfigPath = void 0;
+exports.getJestConfigPath = getJestConfigPath;
+exports.getJestIntegrationConfigPath = getJestIntegrationConfigPath;
+exports.getJestManualConfigPath = getJestManualConfigPath;
+exports.isRunningAllTests = isRunningAllTests;
+exports.runJest = runJest;
 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"));
@@ -11,19 +15,16 @@ const test_util_1 = require("./test.util");
 function getJestConfigPath() {
     return node_fs_1.default.existsSync(`./jest.config.js`) ? './jest.config.js' : `${paths_cnst_1.cfgDir}/jest.config.js`;
 }
-exports.getJestConfigPath = getJestConfigPath;
 function getJestIntegrationConfigPath() {
     return node_fs_1.default.existsSync(`./jest.integration-test.config.js`)
         ? `./jest.integration-test.config.js`
         : `${paths_cnst_1.cfgDir}/jest.integration-test.config.js`;
 }
-exports.getJestIntegrationConfigPath = getJestIntegrationConfigPath;
 function getJestManualConfigPath() {
     return node_fs_1.default.existsSync(`./jest.manual-test.config.js`)
         ? `./jest.manual-test.config.js`
         : `${paths_cnst_1.cfgDir}/jest.manual-test.config.js`;
 }
-exports.getJestManualConfigPath = getJestManualConfigPath;
 /**
  * Detects if jest is run with all tests, or with specific tests.
  */
@@ -33,7 +34,6 @@ function isRunningAllTests() {
     // console.log(process.argv, positionalArgs)
     return !positionalArgs.length;
 }
-exports.isRunningAllTests = isRunningAllTests;
 /**
  * 1. Adds `--silent` if running all tests at once.
  */
@@ -42,7 +42,7 @@ function runJest(opt = {}) {
         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;
+    const { CI, CPU_LIMIT, TZ = 'UTC', APP_ENV, JEST_NO_ALPHABETIC, JEST_SHARDS, NODE_OPTIONS = 'not defined', } = process.env;
     const { node } = process.versions;
     const cpuLimit = Number(CPU_LIMIT) || undefined;
     const { integration, manual, leaks } = opt;
@@ -76,18 +76,8 @@ function runJest(opt = {}) {
             // Coverage only makes sense for unit tests, not for integration/manual
             args.push('--coverage');
         }
-        if (!maxWorkers) {
-            if (cpuLimit && cpuLimit > 1) {
-                maxWorkers = `--maxWorkers=${cpuLimit - 1}`;
-            }
-            else if (CIRCLECI) {
-                // We used to default to 2, but due to memory being an issue for Jest - now we default to 1,
-                // as it's the most memory-efficient way
-                // Since `workerIdleMemoryLimit` was introduced by default - we're changing default back to 2 workers
-                // We now only do it for CircleCI (not for CI in general), as it reports cpus as 36
-                // Github Actions don't do that and report correct number of cpus
-                maxWorkers = '--maxWorkers=2';
-            }
+        if (!maxWorkers && cpuLimit && cpuLimit > 1) {
+            maxWorkers = `--maxWorkers=${cpuLimit - 1}`;
         }
     }
     // Running all tests - will use `--silent` to suppress console-logs, will also set process.env.JEST_SILENT=1
@@ -139,4 +129,3 @@ function runJest(opt = {}) {
         });
     }
 }
-exports.runJest = runJest;

package/dist/util/lint.util.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runESLintAsync = exports.runESLint = exports.getTSConfigPathScripts = exports.getTSConfigPath = void 0;
+exports.getTSConfigPath = getTSConfigPath;
+exports.getTSConfigPathScripts = getTSConfigPathScripts;
+exports.runESLint = runESLint;
+exports.runESLintAsync = runESLintAsync;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -11,11 +14,9 @@ function getTSConfigPath() {
     // return [`./tsconfig.base.json`].find(p => fs.existsSync(p)) || `./tsconfig.json`
     return './tsconfig.json';
 }
-exports.getTSConfigPath = getTSConfigPath;
 function getTSConfigPathScripts() {
     return [`./scripts/tsconfig.json`].find(p => node_fs_1.default.existsSync(p)) || `${paths_cnst_1.scriptsDir}/tsconfig.json`;
 }
-exports.getTSConfigPathScripts = getTSConfigPathScripts;
 function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
     if (!node_fs_1.default.existsSync(dir))
         return; // faster to bail-out like this
@@ -25,7 +26,6 @@ function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx
         },
     });
 }
-exports.runESLint = runESLint;
 async function runESLintAsync(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
     if (!node_fs_1.default.existsSync(dir))
         return; // faster to bail-out like this
@@ -35,7 +35,6 @@ async function runESLintAsync(dir, eslintConfigPath, tsconfigPath, extensions =
         },
     });
 }
-exports.runESLintAsync = runESLintAsync;
 function getEslintArgs(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
     return [
         `--config`,

package/dist/util/prettier.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runPrettier = void 0;
+exports.runPrettier = runPrettier;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -21,4 +21,3 @@ function runPrettier() {
     const args = [`--write`, `--log-level=warn`, `--config`, prettierConfigPath, ...prettierPaths];
     (0, nodejs_lib_1.execVoidCommandSync)('prettier', args);
 }
-exports.runPrettier = runPrettier;

package/dist/util/stylelint.util.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stylelintAll = exports.stylelintPaths = void 0;
+exports.stylelintPaths = void 0;
+exports.stylelintAll = stylelintAll;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
@@ -30,4 +31,3 @@ function stylelintAll() {
     ].filter(Boolean);
     (0, nodejs_lib_1.execVoidCommandSync)('stylelint', args);
 }
-exports.stylelintAll = stylelintAll;

package/dist/util/test.util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeModuleExists = void 0;
+exports.nodeModuleExists = nodeModuleExists;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 /**
@@ -9,4 +9,3 @@ const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 function nodeModuleExists(moduleName) {
     return node_fs_1.default.existsSync(`./node_modules/${moduleName}`);
 }
-exports.nodeModuleExists = nodeModuleExists;

package/dist/util/tsc.util.js

@@ -1,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureProjectTsconfigScripts = exports.tscScriptsAsync = exports.tscScripts = exports.tscAsync = exports.tsc = exports.tscMainAndScripts = void 0;
+exports.tscMainAndScripts = tscMainAndScripts;
+exports.tsc = tsc;
+exports.tscAsync = tscAsync;
+exports.tscScripts = tscScripts;
+exports.tscScriptsAsync = tscScriptsAsync;
+exports.ensureProjectTsconfigScripts = ensureProjectTsconfigScripts;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const js_lib_1 = require("@naturalcycles/js-lib");
@@ -9,21 +14,18 @@ const paths_cnst_1 = require("../cnst/paths.cnst");
 async function tscMainAndScripts(noEmit = false) {
     await Promise.all([tscAsync(noEmit), tscScriptsAsync()]);
 }
-exports.tscMainAndScripts = tscMainAndScripts;
 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_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_1.boldGrey)('tsc')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
-exports.tscAsync = tscAsync;
 function tscScripts() {
     if (!node_fs_1.default.existsSync('./scripts')) {
         // ./scripts folder doesn't exist, skipping
@@ -35,7 +37,6 @@ function tscScripts() {
     (0, nodejs_lib_1.execVoidCommandSync)(`tsc`, args);
     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() {
     if (!node_fs_1.default.existsSync('./scripts')) {
         // ./scripts folder doesn't exist, skipping
@@ -47,7 +48,6 @@ async function tscScriptsAsync() {
     await (0, nodejs_lib_1.execVoidCommand)(`tsc`, args);
     console.log(`${(0, nodejs_lib_1.boldGrey)('tsc scripts')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
-exports.tscScriptsAsync = tscScriptsAsync;
 /**
  * Returns path to /scripts/tsconfig.json
  */
@@ -65,4 +65,3 @@ function ensureProjectTsconfigScripts() {
     }
     return projectTsconfigPath;
 }
-exports.ensureProjectTsconfigScripts = ensureProjectTsconfigScripts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.53.0",
+  "version": "13.55.0",
   "scripts": {
     "prepare": "husky",
     "tsn-debug": "tsn testScript.ts",
@@ -44,7 +44,7 @@
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^28.0.0",
     "eslint-plugin-jsdoc": "^48.0.1",
-    "eslint-plugin-unicorn": "^53.0.0",
+    "eslint-plugin-unicorn": "^54.0.0",
     "eslint-plugin-unused-imports": "^4.0.0",
     "eslint-plugin-vue": "^9.0.0",
     "expect-type": "^0.19.0",

package/readme.md

@@ -99,7 +99,7 @@ adds `--silent` (and `JEST_SILENT` env var) if all tests are run.
 
 - `test`: runs unit tests (all tests _except_ `*.integration.test.ts` and `*.manual.test.ts`).
   Detects `CI` env variable, adds `--coverage` if in CI. Uses `default` reporter in `!CI`, otherwise
-  `jest-junit` reporter. Includes fix for "CircleCI out of memory issue"
+  `jest-junit` reporter.
 - `test-integration`: runs `*.integration.test.ts` with `jest.integration-test.config.js` config.
 - `test-manual`: runs `*.manual.test.ts` with `jest.manual-test.config.js`.
 - `test-leaks`: runs Jest with `--logHeapUsage --detectOpenHandles --detectLeaks`.

package/scripts/tsconfig.json

@@ -4,8 +4,8 @@
 {
   "extends": "../cfg/tsconfig.json",
   "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "../dist",
+    "rootDir": "${configDir}/..",
+    "outDir": "${configDir}/../dist",
   },
   "exclude": ["**/__exclude"],
 }

package/dist/__exclude/excluded.css

@@ -1,2 +0,0 @@
-
-some invalid css {