@naturalcycles/dev-lib 13.24.0 → 13.25.1

package/dist/util/jest.util.js

@@ -42,8 +42,9 @@ async function runJest(opt = {}) {
         console.log((0, colors_1.dimGrey)(`node_modules/${(0, colors_1.white)('jest')} not found, skipping tests`));
         return;
     }
-    const { CI, CIRCLECI, TZ = 'UTC', APP_ENV, JEST_NO_ALPHABETIC, JEST_SHARDS, NODE_OPTIONS = 'not defined', } = process.env;
+    const { CI, CIRCLECI, 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;
     const processArgs = process.argv.slice(2);
     let jestConfig;
@@ -75,13 +76,18 @@ async function runJest(opt = {}) {
             // Coverage only makes sense for unit tests, not for integration/manual
             args.push('--coverage');
         }
-        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) {
+            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';
+            }
         }
     }
     // Running all tests - will use `--silent` to suppress console-logs, will also set process.env.JEST_SILENT=1
@@ -107,9 +113,17 @@ async function runJest(opt = {}) {
     if (!JEST_NO_ALPHABETIC) {
         args.push(`--testSequencer=${paths_cnst_1.cfgDir}/jest.alphabetic.sequencer.js`);
     }
-    const par = os.availableParallelism?.();
+    const availableParallelism = os.availableParallelism?.();
     const cpus = os.cpus().length;
-    console.log(`${(0, colors_1.dimGrey)(`node ${node}, NODE_OPTIONS: ${NODE_OPTIONS}, cpus: ${cpus}, availableParallelism: ${par}`)}`);
+    console.log(`${(0, colors_1.dimGrey)(Object.entries({
+        node,
+        NODE_OPTIONS,
+        cpus,
+        availableParallelism,
+        cpuLimit,
+    })
+        .map(([k, v]) => `${k}: ${v}`)
+        .join(', '))}`);
     if (JEST_SHARDS) {
         const totalShards = Number(JEST_SHARDS);
         const shards = (0, js_lib_1._range)(1, totalShards + 1);

package/package.json

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