Support trailing commas in typeof import()

nicolo-ribaudo · nicolo-ribaudo · commit b70f094de2d3 · 2025-03-27T15:22:40.000+01:00
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4551,7 +4551,7 @@ namespace Parser {
         parseExpected(SyntaxKind.OpenParenToken);
         const type = parseType();
         let attributes: ImportAttributes | undefined;
-        if (parseOptional(SyntaxKind.CommaToken)) {
+        if (parseOptional(SyntaxKind.CommaToken) && token() !== SyntaxKind.CloseParenToken) {
             const openBracePosition = scanner.getTokenStart();
             parseExpected(SyntaxKind.OpenBraceToken);
             const currentToken = token();
@@ -4572,6 +4572,7 @@ namespace Parser {
                     );
                 }
             }
+            parseOptional(SyntaxKind.CommaToken);
         }
         parseExpected(SyntaxKind.CloseParenToken);
         const qualifier = parseOptional(SyntaxKind.DotToken) ? parseEntityNameOfTypeReference() : undefined;
diff --git a/tests/baselines/reference/typeofImportInvalidElision.errors.txt b/tests/baselines/reference/typeofImportInvalidElision.errors.txt
@@ -0,0 +1,12 @@
+main.ts(1,39): error TS1005: '{' expected.
+
+
+==== input.ts (0 errors) ====
+    export type X = 1;
+    
+==== main.ts (1 errors) ====
+    type T2 = typeof import('./input.js', ,);
+                                          ~
+!!! error TS1005: '{' expected.
+!!! related TS1007 main.ts:1:39: The parser expected to find a '}' to match the '{' token here.
+    
diff --git a/tests/baselines/reference/typeofImportInvalidElision.js b/tests/baselines/reference/typeofImportInvalidElision.js
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/typeofImportInvalidElision.ts] ////
+
+//// [input.ts]
+export type X = 1;
+
+//// [main.ts]
+type T2 = typeof import('./input.js', ,);
+
+
+//// [input.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//// [main.js]
diff --git a/tests/baselines/reference/typeofImportInvalidElision.symbols b/tests/baselines/reference/typeofImportInvalidElision.symbols
@@ -0,0 +1,10 @@
+//// [tests/cases/compiler/typeofImportInvalidElision.ts] ////
+
+=== input.ts ===
+export type X = 1;
+>X : Symbol(X, Decl(input.ts, 0, 0))
+
+=== main.ts ===
+type T2 = typeof import('./input.js', ,);
+>T2 : Symbol(T2, Decl(main.ts, 0, 0))
+
diff --git a/tests/baselines/reference/typeofImportInvalidElision.types b/tests/baselines/reference/typeofImportInvalidElision.types
@@ -0,0 +1,12 @@
+//// [tests/cases/compiler/typeofImportInvalidElision.ts] ////
+
+=== input.ts ===
+export type X = 1;
+>X : 1
+>  : ^
+
+=== main.ts ===
+type T2 = typeof import('./input.js', ,);
+>T2 : typeof import("input")
+>   : ^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/tests/baselines/reference/typeofImportTrailingCommas.js b/tests/baselines/reference/typeofImportTrailingCommas.js
@@ -0,0 +1,14 @@
+//// [tests/cases/compiler/typeofImportTrailingCommas.ts] ////
+
+//// [input.ts]
+export type X = 1;
+
+//// [main.ts]
+type T1 = typeof import('./input.js',)
+type T2 = typeof import('./input.js', { with: { "resolution-mode": "import" } },);
+
+
+//// [input.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//// [main.js]
diff --git a/tests/baselines/reference/typeofImportTrailingCommas.symbols b/tests/baselines/reference/typeofImportTrailingCommas.symbols
@@ -0,0 +1,13 @@
+//// [tests/cases/compiler/typeofImportTrailingCommas.ts] ////
+
+=== input.ts ===
+export type X = 1;
+>X : Symbol(X, Decl(input.ts, 0, 0))
+
+=== main.ts ===
+type T1 = typeof import('./input.js',)
+>T1 : Symbol(T1, Decl(main.ts, 0, 0))
+
+type T2 = typeof import('./input.js', { with: { "resolution-mode": "import" } },);
+>T2 : Symbol(T2, Decl(main.ts, 0, 38))
+
diff --git a/tests/baselines/reference/typeofImportTrailingCommas.types b/tests/baselines/reference/typeofImportTrailingCommas.types
@@ -0,0 +1,16 @@
+//// [tests/cases/compiler/typeofImportTrailingCommas.ts] ////
+
+=== input.ts ===
+export type X = 1;
+>X : 1
+>  : ^
+
+=== main.ts ===
+type T1 = typeof import('./input.js',)
+>T1 : typeof import("input")
+>   : ^^^^^^^^^^^^^^^^^^^^^^
+
+type T2 = typeof import('./input.js', { with: { "resolution-mode": "import" } },);
+>T2 : typeof import("input")
+>   : ^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/tests/cases/compiler/typeofImportInvalidElision.ts b/tests/cases/compiler/typeofImportInvalidElision.ts
@@ -0,0 +1,5 @@
+// @filename: input.ts
+export type X = 1;
+
+// @filename: main.ts
+type T2 = typeof import('./input.js', ,);
diff --git a/tests/cases/compiler/typeofImportTrailingCommas.ts b/tests/cases/compiler/typeofImportTrailingCommas.ts
@@ -0,0 +1,6 @@
+// @filename: input.ts
+export type X = 1;
+
+// @filename: main.ts
+type T1 = typeof import('./input.js',)
+type T2 = typeof import('./input.js', { with: { "resolution-mode": "import" } },);

Original file line number	Diff line number	Diff line change
`@@ -4551,7 +4551,7 @@ namespace Parser {`
`4551`	`4551`	`parseExpected(SyntaxKind.OpenParenToken);`
`4552`	`4552`	`const type = parseType();`
`4553`	`4553`	`let attributes: ImportAttributes \| undefined;`
`4554`		`- if (parseOptional(SyntaxKind.CommaToken)) {`
	`4554`	`+ if (parseOptional(SyntaxKind.CommaToken) && token() !== SyntaxKind.CloseParenToken) {`
`4555`	`4555`	`const openBracePosition = scanner.getTokenStart();`
`4556`	`4556`	`parseExpected(SyntaxKind.OpenBraceToken);`
`4557`	`4557`	`const currentToken = token();`
`@@ -4572,6 +4572,7 @@ namespace Parser {`
`4572`	`4572`	`);`
`4573`	`4573`	`}`
`4574`	`4574`	`}`
	`4575`	`+ parseOptional(SyntaxKind.CommaToken);`
`4575`	`4576`	`}`
`4576`	`4577`	`parseExpected(SyntaxKind.CloseParenToken);`
`4577`	`4578`	`const qualifier = parseOptional(SyntaxKind.DotToken) ? parseEntityNameOfTypeReference() : undefined;`