@nocobase/cli-v1 2.1.0-beta.16 → 2.1.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-beta.16",
+  "version": "2.1.0-beta.19",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,9 +8,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.0-beta.16",
+    "@nocobase/cli": "2.1.0-beta.19",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-beta.16",
+    "@nocobase/utils": "2.1.0-beta.19",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -28,12 +28,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-beta.16"
+    "@nocobase/devtools": "2.1.0-beta.19"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "b9a191705a440a336c85d82fd877fdf152bec70f"
+  "gitHead": "d89ab08dbcb25877de69827d5bad6823c27b2cbb"
 }

package/src/__tests__/test-command.test.js

@@ -0,0 +1,37 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+const testCommandModule = require('../commands/test');
+
+const { buildVitestNodeArgs, requiresNoNodeSnapshot } = testCommandModule._test;
+
+describe('cli-v1 test command helpers', () => {
+  test('requiresNoNodeSnapshot enables the Node 20+ compatibility flag', () => {
+    expect(requiresNoNodeSnapshot('18.20.8')).toBe(false);
+    expect(requiresNoNodeSnapshot('20.19.5')).toBe(true);
+    expect(requiresNoNodeSnapshot('22.22.2')).toBe(true);
+  });
+
+  test('buildVitestNodeArgs prefixes no-node-snapshot on Node 20+', () => {
+    expect(buildVitestNodeArgs(['foo.test.ts', '--single-thread=true'], '20.19.5')).toEqual([
+      '--no-node-snapshot',
+      '--max_old_space_size=14096',
+      './node_modules/vitest/vitest.mjs',
+      'foo.test.ts',
+    ]);
+  });
+
+  test('buildVitestNodeArgs leaves older Node versions unchanged', () => {
+    expect(buildVitestNodeArgs(['foo.test.ts'], '18.20.8')).toEqual([
+      '--max_old_space_size=14096',
+      './node_modules/vitest/vitest.mjs',
+      'foo.test.ts',
+    ]);
+  });
+});

package/src/commands/test.js

@@ -11,6 +11,46 @@ const { Command } = require('commander');
 const { run, checkDBDialect } = require('../util');
 const path = require('path');
 
+function stripSingleThreadArgs(argv) {
+  const nextArgv = [];
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const token = argv[index];
+
+    if (token === '--single-thread') {
+      const next = argv[index + 1];
+      if (next && !next.startsWith('-')) {
+        index += 1;
+      }
+      continue;
+    }
+
+    if (token.startsWith('--single-thread=')) {
+      continue;
+    }
+
+    nextArgv.push(token);
+  }
+
+  return nextArgv;
+}
+
+function requiresNoNodeSnapshot(nodeVersion = process.versions.node) {
+  const major = Number.parseInt(String(nodeVersion).split('.')[0], 10);
+  return Number.isFinite(major) && major >= 20;
+}
+
+function buildVitestNodeArgs(argv, nodeVersion = process.versions.node) {
+  const cliArgs = ['--max_old_space_size=14096', './node_modules/vitest/vitest.mjs', ...stripSingleThreadArgs(argv)];
+
+  // `isolated-vm` requires `--no-node-snapshot` on Node 20+.
+  if (requiresNoNodeSnapshot(nodeVersion)) {
+    cliArgs.unshift('--no-node-snapshot');
+  }
+
+  return cliArgs;
+}
+
 /**
  *
  * @param {String} name
@@ -65,28 +105,24 @@ function addTestCommand(name, cli) {
         process.argv.push('--poolOptions.threads.singleThread=true');
       }
 
-      if (opts.singleThread === 'false') {
-        process.argv.splice(process.argv.indexOf('--single-thread=false'), 1);
-      }
-
-      const cliArgs = ['--max_old_space_size=14096', './node_modules/vitest/vitest.mjs', ...process.argv.slice(3)];
+      const cliArgs = buildVitestNodeArgs(process.argv.slice(3));
 
       if (process.argv.includes('-h') || process.argv.includes('--help')) {
-        await run('node', cliArgs);
+        await run(process.execPath, cliArgs);
         return;
       }
 
       if (process.env.TEST_ENV) {
         console.log('process.env.TEST_ENV', process.env.TEST_ENV, cliArgs);
-        await run('node', cliArgs);
+        await run(process.execPath, cliArgs);
       } else {
         await Promise.all([
-          run('node', cliArgs, {
+          run(process.execPath, cliArgs, {
             env: {
               TEST_ENV: 'client-side',
             },
           }),
-          run('node', cliArgs, {
+          run(process.execPath, cliArgs, {
             env: {
               TEST_ENV: 'server-side',
             },
@@ -105,3 +141,9 @@ module.exports = (cli) => {
   addTestCommand('test:client', cli);
   addTestCommand('test', cli).option('--client').option('--server');
 };
+
+module.exports._test = {
+  stripSingleThreadArgs,
+  requiresNoNodeSnapshot,
+  buildVitestNodeArgs,
+};