vona-cli-set-api 1.1.128 → 1.1.130

package/dist/index.js

@@ -991,15 +991,12 @@ class CliBinTest extends BeanCliBase {
     }
     args = args.concat([getImportEsm(), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
     // args = args.concat(['--experimental-transform-types', getImportEsm(), testFile, projectPath, (!!argv.coverage).toString(), patterns.join(',')]);
-    // ignore error special in windows
-    await catchError(() => {
-      return this.helper.spawnExe({
-        cmd: 'node',
-        args,
-        options: {
-          cwd: projectPath
-        }
-      });
+    await this.helper.spawnExe({
+      cmd: 'node',
+      args,
+      options: {
+        cwd: projectPath
+      }
     });
   }
   async _outputCoverageReportViewer(projectPath) {

package/dist-toolsIsolate/test.js

@@ -5,6 +5,7 @@ import { globby } from 'globby';
 import { createWriteStream } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import { pipeline } from 'node:stream/promises';
 import { run } from 'node:test';
 import { lcov, spec } from 'node:test/reporters';
 import { fileURLToPath } from 'node:url';
@@ -59,9 +60,27 @@ async function testRun(projectPath, coverage, patterns) {
     ];
     // app
     const app = await createGeneralApp(projectPath);
-    // concurrency
-    const concurrency = await prepareConcurrency(app);
-    return new Promise(resolve => {
+    let testError;
+    let closeError;
+    let closePromise;
+    const closeApplication = async () => {
+        const [_, error] = await catchError(() => app.close());
+        closeError = error;
+        // handles
+        if (process.env.TEST_WHYISNODERUNNING === 'true') {
+            await sleep(2000);
+            const handles = process._getActiveHandles();
+            if (handles.length > 3) {
+                whyIsNodeRunning();
+            }
+        }
+    };
+    const closeApplicationOnce = () => {
+        return (closePromise ??= closeApplication());
+    };
+    try {
+        // concurrency
+        const concurrency = await prepareConcurrency(app);
         const testStream = run({
             isolation: 'none',
             concurrency,
@@ -76,49 +95,69 @@ async function testRun(projectPath, coverage, patterns) {
             .on('test:coverage', data => {
             outputCoverageReport(data.summary.totals);
         })
-            .on('test:summary', async () => {
-            resolve(undefined);
-        })
-            .on('test:pass', async (t) => {
+            .on('test:pass', t => {
             if (t.name === '---done---') {
-                const [_, err] = await catchError(() => {
-                    return app.close();
-                });
-                if (err) {
-                    console.error(err);
-                }
-                // handles
-                if (process.env.TEST_WHYISNODERUNNING === 'true') {
-                    await sleep(2000);
-                    const handles = process._getActiveHandles();
-                    if (handles.length > 3) {
-                        whyIsNodeRunning();
-                    }
-                }
+                void closeApplicationOnce();
             }
         });
-        if (coverage) {
-            const reporterDir = path.join(projectPath, 'coverage');
-            fse.ensureDirSync(reporterDir);
-            const reporterLcov = createWriteStream(path.join(reporterDir, 'lcov.info'));
-            testStream.compose(lcov).pipe(reporterLcov);
+        const summaryPromise = waitForTestSummary(testStream);
+        const reporterPromise = coverage
+            ? (() => {
+                const reporterDir = path.join(projectPath, 'coverage');
+                fse.ensureDirSync(reporterDir);
+                const reporterLcov = createWriteStream(path.join(reporterDir, 'lcov.info'));
+                return pipeline(testStream.compose(lcov), reporterLcov);
+            })()
+            : pipeline(testStream.compose(spec), process.stdout, { end: false });
+        const [summarySuccess, [, reporterError]] = await Promise.all([
+            summaryPromise,
+            catchError(() => reporterPromise),
+        ]);
+        if (!summarySuccess) {
+            throw new Error('node:test reported failed tests');
         }
-        else {
-            testStream.compose(spec).pipe(process.stdout);
+        if (reporterError) {
+            throw reporterError;
         }
+    }
+    catch (error) {
+        testError = error;
+    }
+    finally {
+        await closeApplicationOnce();
+    }
+    if (testError) {
+        if (closeError)
+            console.error(closeError);
+        throw toError(testError);
+    }
+    if (closeError) {
+        throw toError(closeError);
+    }
+}
+function toError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}
+function waitForTestSummary(testStream) {
+    return new Promise((resolve, reject) => {
+        testStream.once('test:summary', summary => resolve(summary.success)).once('error', reject);
     });
 }
 async function prepareConcurrency(app) {
     // check
+    const configured = process.env.TEST_CONCURRENCY;
     let concurrency = 1;
-    if (process.env.TEST_CONCURRENCY === 'true') {
-        concurrency = os.cpus().length;
-    }
-    else if (process.env.TEST_CONCURRENCY === 'false') {
+    if (configured === 'false') {
         concurrency = 1;
     }
+    else if (configured === undefined || configured === 'true') {
+        concurrency = Math.max(1, os.cpus().length);
+    }
     else {
-        concurrency = Number.parseInt(process.env.TEST_CONCURRENCY);
+        concurrency = Number.parseInt(configured, 10);
+        if (!Number.isSafeInteger(concurrency) || concurrency < 1) {
+            throw new Error(`TEST_CONCURRENCY must be true, false, or a positive integer; received ${configured}`);
+        }
     }
     if (concurrency === 1)
         return concurrency;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.128",
-  "gitHead": "93d6ccaace7d8eca543adb7b2dd0b295603eeec0",
+  "version": "1.1.130",
+  "gitHead": "94b4f86ba6b9015d9add7de4e03e19db9a084fd2",
   "description": "vona cli-set-api",
   "keywords": [
     "framework",
@@ -73,7 +73,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.9.0",
     "uuid": "^11.1.0",
-    "vona-core": "^5.1.32",
+    "vona-core": "^5.1.33",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^22.0.0"
   }