src: make the default value of strip_types AMARO

the default value of strip_types is controlled by node_options.h
and we need to change the default value there

Fixes: #60815

Author: y-okt

src/node_options.h

@@ -259,7 +259,7 @@ class EnvironmentOptions : public Options {
 
   std::vector<std::string> preload_esm_modules;
 
-  bool strip_types = true;
+  bool strip_types = HAVE_AMARO;
   bool experimental_transform_types = false;
 
   std::vector<std::string> user_argv;

test/es-module/test-esm-detect-ambiguous.mjs

@@ -4,6 +4,8 @@ import { spawn } from 'node:child_process';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 describe('Module syntax detection', { concurrency: !process.env.TEST_PARALLEL }, () => {
   describe('string input', { concurrency: !process.env.TEST_PARALLEL }, () => {
     it('permits ESM syntax in --eval input without requiring --input-type=module', async () => {
@@ -264,7 +266,7 @@ describe('Module syntax detection', { concurrency: !process.env.TEST_PARALLEL },
     });
 
     it('still throws on `await` in an ordinary sync function',
-       { skip: !process.config.variables.node_use_amaro },
+       onlyWithAmaro,
        async () => {
          const { stdout, stderr, code, signal } = await spawnPromisified(process.execPath, [
            '--eval',
@@ -317,7 +319,7 @@ describe('Module syntax detection', { concurrency: !process.env.TEST_PARALLEL },
     });
 
     it('still throws on double `const` declaration not at the top level',
-       { skip: !process.config.variables.node_use_amaro },
+       onlyWithAmaro,
        async () => {
          const { stdout, stderr, code, signal } = await spawnPromisified(process.execPath, [
            '--eval',

test/es-module/test-esm-import-meta-main-eval.mjs

@@ -21,6 +21,8 @@ function wrapScriptInUrlWorker(script) {
   `;
 }
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 describe('import.meta.main in evaluated scripts', () => {
   const importMetaMainScript = `
 import assert from 'node:assert/strict';
@@ -85,7 +87,7 @@ const { isMain: importedModuleIsMain } = await import(
 assert.strictEqual(importedModuleIsMain, false, 'import.meta.main should evaluate false in imported module');
 `;
 
-  it('should evaluate true in evaluated script', { skip: !process.config.variables.node_use_amaro }, async () => {
+  it('should evaluate true in evaluated script', onlyWithAmaro, async () => {
     const result = await spawnPromisified(
       process.execPath,
       ['--input-type=module-typescript', '--disable-warning=ExperimentalWarning', '--eval', importMetaMainTSScript],
@@ -99,7 +101,7 @@ assert.strictEqual(importedModuleIsMain, false, 'import.meta.main should evaluat
   });
 
   it('should evaluate true in worker instantiated with module source by evaluated script',
-     { skip: !process.config.variables.node_use_amaro },
+     onlyWithAmaro,
      async () => {
        const result = await spawnPromisified(
          process.execPath,
@@ -117,7 +119,7 @@ assert.strictEqual(importedModuleIsMain, false, 'import.meta.main should evaluat
      });
 
   it('should evaluate true in worker instantiated with `data:` URL by evaluated script',
-     { skip: !process.config.variables.node_use_amaro },
+     onlyWithAmaro,
      async () => {
        const result = await spawnPromisified(
          process.execPath,

test/es-module/test-esm-loader-entry-url.mjs

@@ -23,6 +23,8 @@ async function assertSpawnedProcess(args, options = {}, expected = {}) {
 // Common expectation for experimental feature warning in stderr
 const experimentalFeatureWarning = { stderr: /--entry-url is an experimental feature/ };
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 describe('--entry-url', { concurrency: true }, () => {
   it('should reject loading a path that contains %', async () => {
     await assertSpawnedProcess(
@@ -76,7 +78,7 @@ describe('--entry-url', { concurrency: true }, () => {
     );
   });
 
-  it('should support loading TypeScript URLs', { skip: !process.config.variables.node_use_amaro }, async () => {
+  it('should support loading TypeScript URLs', onlyWithAmaro, async () => {
     const typescriptUrls = [
       'typescript/cts/test-require-ts-file.cts',
       'typescript/mts/test-import-ts-file.mts',

test/es-module/test-esm-tla-syntax-errors-not-recognized-as-tla-error.mjs

@@ -2,6 +2,8 @@ import { spawnPromisified } from '../common/index.mjs';
 import { describe, it } from 'node:test';
 import assert from 'node:assert';
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 describe('unusual top-level await syntax errors', () => {
   const expressions = [
     // string
@@ -50,7 +52,7 @@ describe('unusual top-level await syntax errors', () => {
   });
 
   it('should throw the error for unrelated syntax errors',
-     { skip: !process.config.variables.node_use_amaro },
+     onlyWithAmaro,
      async () => {
        const expression = 'foo bar';
        const wrapperExpressions = [

test/parallel/test-cli-node-options-docs.js

@@ -64,7 +64,7 @@ for (const [, envVar, config] of nodeOptionsCC.matchAll(addOptionRE)) {
   }
 
   // Exception for HAVE_AMARO conditional default (defaults to true when Amaro is available)
-  if (config.includes('HAVE_AMARO')) {
+  if (process.config.variables.node_use_amaro) {
     hasTrueAsDefaultValue = true;
   }
 

test/parallel/test-config-file.js

@@ -13,6 +13,8 @@ const { test, it, describe } = require('node:test');
 const { chmodSync, writeFileSync, constants } = require('node:fs');
 const { join } = require('node:path');
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 test('should handle non existing json', async () => {
   const result = await spawnPromisified(process.execPath, [
     '--experimental-config-file',
@@ -49,7 +51,7 @@ test('should handle empty object json', async () => {
   assert.strictEqual(result.code, 0);
 });
 
-test('should parse boolean flag', { skip: !process.config.variables.node_use_amaro }, async () => {
+test('should parse boolean flag', onlyWithAmaro, async () => {
   const result = await spawnPromisified(process.execPath, [
     '--experimental-config-file',
     fixtures.path('rc/transform-types.json'),
@@ -84,7 +86,7 @@ test('should throw an error when a flag is declared twice', async () => {
 });
 
 
-test('should override env-file', { skip: !process.config.variables.node_use_amaro }, async () => {
+test('should override env-file', onlyWithAmaro, async () => {
   const result = await spawnPromisified(process.execPath, [
     '--no-warnings',
     '--experimental-config-file',
@@ -97,7 +99,7 @@ test('should override env-file', { skip: !process.config.variables.node_use_amar
   assert.strictEqual(result.code, 0);
 });
 
-test('should not override NODE_OPTIONS', { skip: !process.config.variables.node_use_amaro }, async () => {
+test('should not override NODE_OPTIONS', onlyWithAmaro, async () => {
   const result = await spawnPromisified(process.execPath, [
     '--no-warnings',
     '--experimental-config-file',
@@ -114,7 +116,7 @@ test('should not override NODE_OPTIONS', { skip: !process.config.variables.node_
   assert.strictEqual(result.code, 1);
 });
 
-test('should not override CLI flags', { skip: !process.config.variables.node_use_amaro }, async () => {
+test('should not override CLI flags', onlyWithAmaro, async () => {
   const result = await spawnPromisified(process.execPath, [
     '--no-warnings',
     '--no-experimental-transform-types',

test/parallel/test-runner-coverage-default-exclusion.mjs

@@ -16,6 +16,8 @@ async function setupFixtures() {
   await cp(fixtureDir, tmpdir.path, { recursive: true });
 }
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 describe('test runner coverage default exclusion', skipIfNoInspector, () => {
   before(async () => {
     await setupFixtures();
@@ -86,7 +88,7 @@ describe('test runner coverage default exclusion', skipIfNoInspector, () => {
     assert.strictEqual(result.status, 0);
   });
 
-  it('should exclude ts test files', { skip: !process.config.variables.node_use_amaro }, async () => {
+  it('should exclude ts test files', onlyWithAmaro, async () => {
     const report = [
       '# start of coverage report',
       '# --------------------------------------------------------------',

test/parallel/test-runner-global-setup-teardown.mjs

@@ -10,6 +10,8 @@ import { join } from 'node:path';
 
 const testFixtures = fixtures.path('test-runner');
 
+const onlyWithAmaro = { skip: !process.config.variables.node_use_amaro };
+
 async function runTest(
   {
     isolation,
@@ -257,7 +259,7 @@ async function runTest(
     });
 
     it('should run TypeScript globalSetup and globalTeardown functions',
-       { skip: !process.config.variables.node_use_amaro },
+       onlyWithAmaro,
        async () => {
          const setupFlagPath = tmpdir.resolve('setup-executed-ts.tmp');
          const teardownFlagPath = tmpdir.resolve('teardown-executed-ts.tmp');

test/parallel/test-runner-run-global-hooks.mjs

@@ -167,7 +167,7 @@ describe('require(\'node:test\').run with global hooks', { concurrency: false },
       });
 
       it('should run TypeScript globalSetup and globalTeardown functions',
-         { skip: !process.config.variables.node_use_amaro },
+         onlyWithAmaro,
          async () => {
            const setupFlagPath = tmpdir.resolve('setup-executed-ts.tmp');
            const teardownFlagPath = tmpdir.resolve('teardown-executed-ts.tmp');