module: improve typescript error message format

deps/amaro/README.md

@@ -29,6 +29,7 @@ console.log(code); // "const foo         = 'bar';"
 
 It is possible to use Amaro as an external loader to execute TypeScript files.
 This allows the installed Amaro to override the Amaro version used by Node.js.
+In order to use Amaro as an external loader, type stripping needs to be enabled.
 
 ```bash
 node --experimental-strip-types --import="amaro/register" script.ts
@@ -51,7 +52,7 @@ node --experimental-transform-types --import="amaro/transform" script.ts
 
 ### TypeScript Version
 
-The supported TypeScript version is 5.5.4, except the stage 3 decorator proposal.
+The supported TypeScript version is 5.8.
 
 ## License (MIT)
 

deps/amaro/dist/errors.js

@@ -3,14 +3,19 @@ export function isSwcError(error) {
   return error.code !== void 0;
 }
 export function wrapAndReThrowSwcError(error) {
+  const errorHints = `${error.filename}:${error.startLine}${error.snippet}`;
   switch (error.code) {
     case "UnsupportedSyntax": {
       const unsupportedSyntaxError = new Error(error.message);
       unsupportedSyntaxError.name = "UnsupportedSyntaxError";
+      unsupportedSyntaxError.stack = `${errorHints}${unsupportedSyntaxError.stack}`;
       throw unsupportedSyntaxError;
     }
-    case "InvalidSyntax":
-      throw new SyntaxError(error.message);
+    case "InvalidSyntax": {
+      const syntaxError = new SyntaxError(error.message);
+      syntaxError.stack = `${errorHints}${syntaxError.stack}`;
+      throw syntaxError;
+    }
     default:
       throw new Error(error.message);
   }

deps/amaro/dist/package.json

@@ -4,7 +4,7 @@
     "강동윤 <[email protected]>"
   ],
   "description": "wasm module for swc",
-  "version": "1.11.5",
+  "version": "1.11.12",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

deps/amaro/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "amaro",
-	"version": "0.4.1",
+	"version": "0.5.0",
 	"description": "Node.js TypeScript wrapper",
 	"license": "MIT",
 	"type": "commonjs",
@@ -24,8 +24,8 @@
 		"build": "node esbuild.config.mjs",
 		"build:wasm": "node tools/build-wasm.js",
 		"typecheck": "tsc --noEmit",
-		"test": "node --test --experimental-test-snapshots \"**/*.test.js\"",
-		"test:regenerate": "node --test --experimental-test-snapshots --test-update-snapshots \"**/*.test.js\""
+		"test": "node --test \"**/*.test.js\"",
+		"test:regenerate": "node --test --test-update-snapshots \"**/*.test.js\""
 	},
 	"devDependencies": {
 		"@biomejs/biome": "1.8.3",

lib/internal/modules/typescript.js

@@ -63,10 +63,14 @@ function parseTypeScript(source, options) {
      * It allows us to distinguish between invalid syntax and unsupported syntax.
      */
     switch (error?.code) {
-      case 'UnsupportedSyntax':
-        throw new ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX(error.message);
-      case 'InvalidSyntax':
-        throw new ERR_INVALID_TYPESCRIPT_SYNTAX(error.message);
+      case 'UnsupportedSyntax': {
+        const unsupportedSyntaxError = new ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX(error.message);
+        throw decorateErrorWithSnippet(unsupportedSyntaxError, error); /* node-do-not-add-exception-line */
+      }
+      case 'InvalidSyntax': {
+        const invalidSyntaxError = new ERR_INVALID_TYPESCRIPT_SYNTAX(error.message);
+        throw decorateErrorWithSnippet(invalidSyntaxError, error); /* node-do-not-add-exception-line */
+      }
       default:
         // SWC may throw strings when something goes wrong.
         if (typeof error === 'string') { assert.fail(error); }
@@ -76,6 +80,18 @@ function parseTypeScript(source, options) {
   }
 }
 
+/**
+ *
+ * @param {Error} error the error to decorate: ERR_INVALID_TYPESCRIPT_SYNTAX, ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX
+ * @param {object} amaroError the error object from amaro
+ * @returns {Error} the decorated error
+ */
+function decorateErrorWithSnippet(error, amaroError) {
+  const errorHints = `${amaroError.filename}:${amaroError.startLine}${amaroError.snippet}`;
+  error.stack = `${errorHints}${error.stack}`;
+  return error;
+}
+
 /**
  * Performs type-stripping to TypeScript source code.
  * @param {string} code TypeScript code to parse.

lib/internal/process/execution.js

@@ -44,6 +44,8 @@ const { emitExperimentalWarning } = require('internal/util');
 // communication with JS.
 const { shouldAbortOnUncaughtToggle } = internalBinding('util');
 
+const kEvalTag = '[eval]';
+
 function tryGetCwd() {
   try {
     return process.cwd();
@@ -259,7 +261,7 @@ function evalTypeScript(name, source, breakFirstLine, print, shouldLoadESM = fal
     compiledScript = compileScript(name, source, baseUrl);
   } catch (originalError) {
     try {
-      sourceToRun = stripTypeScriptModuleTypes(source, name, false);
+      sourceToRun = stripTypeScriptModuleTypes(source, kEvalTag, false);
       // Retry the CJS/ESM syntax detection after stripping the types.
       if (shouldUseModuleEntryPoint(name, sourceToRun)) {
         return evalTypeScriptModuleEntryPoint(source, print);
@@ -322,7 +324,7 @@ function evalTypeScriptModuleEntryPoint(source, print) {
         moduleWrap = loader.createModuleWrap(source, url);
       } catch (originalError) {
         try {
-          const strippedSource = stripTypeScriptModuleTypes(source, url, false);
+          const strippedSource = stripTypeScriptModuleTypes(source, kEvalTag, false);
           // If the moduleWrap was successfully created, execute the module job.
           // outside the try-catch block to avoid catching runtime errors.
           moduleWrap = loader.createModuleWrap(strippedSource, url);
@@ -355,7 +357,7 @@ function evalTypeScriptModuleEntryPoint(source, print) {
  */
 function parseAndEvalModuleTypeScript(source, print) {
   // We know its a TypeScript module, we can safely emit the experimental warning.
-  const strippedSource = stripTypeScriptModuleTypes(source, getEvalModuleUrl());
+  const strippedSource = stripTypeScriptModuleTypes(source, kEvalTag);
   evalModuleEntryPoint(strippedSource, print);
 }
 
@@ -370,7 +372,7 @@ function parseAndEvalModuleTypeScript(source, print) {
  */
 function parseAndEvalCommonjsTypeScript(name, source, breakFirstLine, print, shouldLoadESM = false) {
   // We know its a TypeScript module, we can safely emit the experimental warning.
-  const strippedSource = stripTypeScriptModuleTypes(source, getEvalModuleUrl());
+  const strippedSource = stripTypeScriptModuleTypes(source, kEvalTag);
   evalScript(name, strippedSource, breakFirstLine, print, shouldLoadESM);
 }
 

src/amaro_version.h

@@ -2,5 +2,5 @@
 // Refer to tools/dep_updaters/update-amaro.sh
 #ifndef SRC_AMARO_VERSION_H_
 #define SRC_AMARO_VERSION_H_
-#define AMARO_VERSION "0.4.1"
+#define AMARO_VERSION "0.5.0"
 #endif  // SRC_AMARO_VERSION_H_

test/es-module/test-typescript-eval.mjs

@@ -262,3 +262,23 @@ test('should not allow declare module keyword', async () => {
   match(result.stderr, /ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX/);
   strictEqual(result.code, 1);
 });
+
+// TODO (marco-ippolito) Remove the extra padding from the error message
+// The padding comes from swc it will be removed in a future amaro release
+test('the error message should not contain extra padding', async () => {
+  const result = await spawnPromisified(process.execPath, [
+    '--input-type=module-typescript',
+    '--eval',
+    'declare module F { export type x = number }']);
+  strictEqual(result.stdout, '');
+  // Windows uses \r\n as line endings
+  const lines = result.stderr.replace(/\r\n/g, '\n').split('\n');
+  // The extra padding at the end should not be present
+  strictEqual(lines[0], '[eval]:1   ');
+  // The extra padding at the beginning should not be present
+  strictEqual(lines[2], '     declare module F { export type x = number }');
+  strictEqual(lines[3], '             ^^^^^^^^');
+  strictEqual(lines[5], 'SyntaxError [ERR_UNSUPPORTED_TYPESCRIPT_SYNTAX]:' +
+    ' `module` keyword is not supported. Use `namespace` instead.');
+  strictEqual(result.code, 1);
+});

test/fixtures/eval/eval_messages.snapshot

@@ -2,11 +2,7 @@
 [eval]:1
 with(this){__filename}
 ^^^^
-  x The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
-   ,----
- 1 | with(this){__filename}
-   : ^^^^
-   `----
+The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
 
 SyntaxError: Strict mode code may not include a with statement
 

test/fixtures/eval/eval_typescript.snapshot

@@ -1,11 +1,7 @@
 [eval]:1
 enum Foo{};
 ^^^^
-  x TypeScript enum is not supported in strip-only mode
-   ,----
- 1 | enum Foo{};
-   : ^^^^^^^^^^
-   `----
+TypeScript enum is not supported in strip-only mode
 
 SyntaxError: Unexpected reserved word
 
@@ -20,11 +16,7 @@ Node.js *
 [eval]:1
 const foo;
       ^^^
-  x 'const' declarations must be initialized
-   ,----
- 1 | const foo;
-   :       ^^^
-   `----
+'const' declarations must be initialized
 
 SyntaxError: Missing initializer in const declaration
 
@@ -35,23 +27,15 @@ false
 [eval]:1
 interface Foo{};const foo;
           ^^^
-  x 'const' declarations must be initialized
-   ,----
- 1 | interface Foo{};const foo;
-   :                       ^^^
-   `----
+'const' declarations must be initialized
 
 SyntaxError: Unexpected identifier 'Foo'
 
 Node.js *
 [eval]:1
 function foo(){ await Promise.resolve(1)};
                 ^^^^^
-  x await isn't allowed in non-async function
-   ,----
- 1 | function foo(){ await Promise.resolve(1)};
-   :                       ^^^^^^^
-   `----
+await isn't allowed in non-async function
 
 SyntaxError: await is only valid in async functions and the top level bodies of modules
 

test/fixtures/eval/stdin_messages.snapshot

@@ -2,11 +2,7 @@
 [stdin]:1
 with(this){__filename}
 ^^^^
-  x The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
-   ,----
- 1 | with(this){__filename}
-   : ^^^^
-   `----
+The 'with' statement is not supported. All symbols in a 'with' block will have type 'any'.
 
 SyntaxError: Strict mode code may not include a with statement
 

test/fixtures/eval/stdin_typescript.snapshot

@@ -1,23 +1,15 @@
 [stdin]:1
 enum Foo{};
 ^^^^
-  x TypeScript enum is not supported in strip-only mode
-   ,----
- 1 | enum Foo{};
-   : ^^^^^^^^^^
-   `----
+TypeScript enum is not supported in strip-only mode
 
 SyntaxError: Unexpected reserved word
 
 Node.js *
 [stdin]:1
 enum Foo{};
 ^^^^
-  x TypeScript enum is not supported in strip-only mode
-   ,----
- 1 | enum Foo{};
-   : ^^^^^^^^^^
-   `----
+TypeScript enum is not supported in strip-only mode
 
 SyntaxError: Unexpected reserved word
 
@@ -39,23 +31,15 @@ Node.js *
 [stdin]:1
 const foo;
       ^^^
-  x 'const' declarations must be initialized
-   ,----
- 1 | const foo;
-   :       ^^^
-   `----
+'const' declarations must be initialized
 
 SyntaxError: Missing initializer in const declaration
 
 Node.js *
 [stdin]:1
 const foo;
       ^^^
-  x 'const' declarations must be initialized
-   ,----
- 1 | const foo;
-   :       ^^^
-   `----
+'const' declarations must be initialized
 
 SyntaxError: Missing initializer in const declaration
 
@@ -69,47 +53,31 @@ false
 [stdin]:1
 interface Foo{};const foo;
           ^^^
-  x 'const' declarations must be initialized
-   ,----
- 1 | interface Foo{};const foo;
-   :                       ^^^
-   `----
+'const' declarations must be initialized
 
 SyntaxError: Unexpected identifier 'Foo'
 
 Node.js *
 [stdin]:1
 interface Foo{};const foo;
 ^^^^^^^^^
-  x 'const' declarations must be initialized
-   ,----
- 1 | interface Foo{};const foo;
-   :                       ^^^
-   `----
+'const' declarations must be initialized
 
 SyntaxError: Unexpected strict mode reserved word
 
 Node.js *
 [stdin]:1
 function foo(){ await Promise.resolve(1)};
                 ^^^^^
-  x await isn't allowed in non-async function
-   ,----
- 1 | function foo(){ await Promise.resolve(1)};
-   :                       ^^^^^^^
-   `----
+await isn't allowed in non-async function
 
 SyntaxError: await is only valid in async functions and the top level bodies of modules
 
 Node.js *
 [stdin]:1
 function foo(){ await Promise.resolve(1)};
                 ^^^^^
-  x await isn't allowed in non-async function
-   ,----
- 1 | function foo(){ await Promise.resolve(1)};
-   :                       ^^^^^^^
-   `----
+await isn't allowed in non-async function
 
 SyntaxError: await is only valid in async functions and the top level bodies of modules