Do not consider import.defer in import.defer(...) as an expression

microsoft · Jan 17, 2025 · 831d771 · 831d771
1 parent 455d843
commit 831d771
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -37607,7 +37607,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
         if (node.keywordToken === SyntaxKind.ImportKeyword) {
             if (node.name.escapedText === "defer") {
-                // 'checkGrammarMetaProperty' already reported the error for the standalone import.defer.
+                Debug.assert(!isCallExpression(node.parent) || node.parent.expression !== node, "Trying to get the type of `import.defer` in `import.defer(...)`");
                 return errorType;
             } else {
                 return checkImportMetaProperty(node);
@@ -41023,7 +41023,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
         // Optimize for the common case of a call to a function with a single non-generic call
         // signature where we can just fetch the return type without checking the arguments.
-        if (isCallExpression(expr) && expr.expression.kind !== SyntaxKind.SuperKeyword && !isRequireCall(expr, /*requireStringLiteralLikeArgument*/ true) && !isSymbolOrSymbolForCall(expr)) {
+        if (isCallExpression(expr) && expr.expression.kind !== SyntaxKind.SuperKeyword && !isRequireCall(expr, /*requireStringLiteralLikeArgument*/ true) && !isSymbolOrSymbolForCall(expr) && !isImportCall(expr)) {
             return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) :
                 getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
         }
@@ -49681,6 +49681,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 return isExportAssignment(node.parent) ? Debug.checkDefined(node.parent.symbol) : undefined;
 
             case SyntaxKind.ImportKeyword:
+                if (isMetaProperty(node.parent) && node.parent.name.escapedText === "defer") {
+                    return undefined;
+                }
+                // falls through
             case SyntaxKind.NewKeyword:
                 return isMetaProperty(node.parent) ? checkMetaPropertyKeyword(node.parent).symbol : undefined;
             case SyntaxKind.InstanceOfKeyword:
@@ -49753,7 +49757,12 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
 
         if (isExpressionNode(node)) {
+            try {
             return getRegularTypeOfExpression(node as Expression);
+            } catch (e) {
+                console.error("Error while getting the type of", isExpressionNode(node), node.kind, (node as MetaProperty).keywordToken !== SyntaxKind.ImportKeyword, (node as MetaProperty).name?.escapedText)
+                throw e;
+            }
         }
 
         if (classType && !classDecl.isImplements) {

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -3589,8 +3589,10 @@ export function isExpressionNode(node: Node): boolean {
         case SyntaxKind.JsxFragment:
         case SyntaxKind.YieldExpression:
         case SyntaxKind.AwaitExpression:
-        case SyntaxKind.MetaProperty:
             return true;
+        case SyntaxKind.MetaProperty:
+            // `import.defer` in `import.defer(...)` is not an expression
+            return !isImportCall(node.parent) || node.parent.expression !== node;
         case SyntaxKind.ExpressionWithTypeArguments:
             return !isHeritageClause(node.parent) && !isJSDocAugmentsTag(node.parent);
         case SyntaxKind.QualifiedName:

diff --git a/tests/baselines/reference/dynamicImportDefer(module=commonjs).types b/tests/baselines/reference/dynamicImportDefer(module=commonjs).types
@@ -26,8 +26,6 @@ import.defer("./a.js").then(ns => {
 >                            : ^        ^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import.defer("./a.js") : Promise<typeof import("a")>
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->import.defer : any
->             : ^^^
 >defer : any
 >      : ^^^
 >"./a.js" : "./a.js"

diff --git a/tests/baselines/reference/dynamicImportDefer(module=es2015).types b/tests/baselines/reference/dynamicImportDefer(module=es2015).types
@@ -26,8 +26,6 @@ import.defer("./a.js").then(ns => {
 >                            : ^        ^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import.defer("./a.js") : Promise<typeof import("a")>
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->import.defer : any
->             : ^^^
 >defer : any
 >      : ^^^
 >"./a.js" : "./a.js"

diff --git a/tests/baselines/reference/dynamicImportDefer(module=es2020).types b/tests/baselines/reference/dynamicImportDefer(module=es2020).types
@@ -26,8 +26,6 @@ import.defer("./a.js").then(ns => {
 >                            : ^        ^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import.defer("./a.js") : Promise<typeof import("a")>
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->import.defer : any
->             : ^^^
 >defer : any
 >      : ^^^
 >"./a.js" : "./a.js"

diff --git a/tests/baselines/reference/dynamicImportDefer(module=esnext).types b/tests/baselines/reference/dynamicImportDefer(module=esnext).types
@@ -26,7 +26,6 @@ import.defer("./a.js").then(ns => {
 >                            : ^        ^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import.defer("./a.js") : Promise<typeof import("a")>
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->import.defer : error
 >defer : any
 >      : ^^^
 >"./a.js" : "./a.js"

diff --git a/tests/baselines/reference/dynamicImportDefer(module=nodenext).types b/tests/baselines/reference/dynamicImportDefer(module=nodenext).types
@@ -26,7 +26,6 @@ import.defer("./a.js").then(ns => {
 >                            : ^        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        ^^^^^^^^^^           ^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^          ^^^^      ^^   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 >import.defer("./a.js") : Promise<{ default: typeof import("a"); foo(): void; }>
 >                       : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->import.defer : error
 >defer : any
 >      : ^^^
 >"./a.js" : "./a.js"