Merge remote-tracking branch 'origin/main' into release-5.8

typescript-bot · typescript-bot · commit fb59c19064a5 · 2025-02-10T23:05:03.000Z
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -46,7 +46,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           config-file: ./.github/codeql/codeql-configuration.yml
         # Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
       # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below).
       - name: Autobuild
-        uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
       #     make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -55,6 +55,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -49148,11 +49148,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         }
         else if (isEntityName(name) && isTypeReferenceIdentifier(name)) {
             const meaning = name.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace;
-            const symbol = resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
+            const symbol = resolveEntityName(name, meaning, /*ignoreErrors*/ true, /*dontResolveAlias*/ true);
             return symbol && symbol !== unknownSymbol ? symbol : getUnresolvedSymbolForEntityName(name);
         }
         if (name.parent.kind === SyntaxKind.TypePredicate) {
-            return resolveEntityName(name as Identifier, /*meaning*/ SymbolFlags.FunctionScopedVariable);
+            return resolveEntityName(name as Identifier, /*meaning*/ SymbolFlags.FunctionScopedVariable, /*ignoreErrors*/ true);
         }
         return undefined;
     }
@@ -49383,7 +49383,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function getShorthandAssignmentValueSymbol(location: Node | undefined): Symbol | undefined {
         if (location && location.kind === SyntaxKind.ShorthandPropertyAssignment) {
-            return resolveEntityName((location as ShorthandPropertyAssignment).name, SymbolFlags.Value | SymbolFlags.Alias);
+            return resolveEntityName((location as ShorthandPropertyAssignment).name, SymbolFlags.Value | SymbolFlags.Alias, /*ignoreErrors*/ true);
         }
         return undefined;
     }
@@ -49395,10 +49395,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return node.parent.parent.moduleSpecifier ?
                 getExternalModuleMember(node.parent.parent, node) :
                 name.kind === SyntaxKind.StringLiteral ? undefined : // Skip for invalid syntax like this: export { "x" }
-                resolveEntityName(name, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias);
+                resolveEntityName(name, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias, /*ignoreErrors*/ true);
         }
         else {
-            return resolveEntityName(node, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias);
+            return resolveEntityName(node, SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias, /*ignoreErrors*/ true);
         }
     }
 
diff --git a/src/compiler/transformers/module/esnextAnd2015.ts b/src/compiler/transformers/module/esnextAnd2015.ts
@@ -158,7 +158,7 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S
                 if (node === importsAndRequiresToRewriteOrShim?.[0]) {
                     return visitImportOrRequireCall(importsAndRequiresToRewriteOrShim.shift()!);
                 }
-                break;
+                // fallthrough
             default:
                 if (importsAndRequiresToRewriteOrShim?.length && rangeContainsRange(node, importsAndRequiresToRewriteOrShim[0])) {
                     return visitEachChild(node, visitor, context);
diff --git a/tests/baselines/reference/emit(jsx=preserve).errors.txt b/tests/baselines/reference/emit(jsx=preserve).errors.txt
@@ -6,6 +6,8 @@ main.ts(6,22): error TS2307: Cannot find module './foo.ts' or its corresponding
 main.ts(8,15): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
 main.ts(10,8): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
 main.ts(11,8): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+main.ts(13,18): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+main.ts(14,8): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
 no.ts(1,16): error TS2307: Cannot find module './foo.ts/foo.js' or its corresponding type declarations.
 no.ts(2,16): error TS2307: Cannot find module 'foo.ts' or its corresponding type declarations.
 no.ts(3,16): error TS2307: Cannot find module 'pkg/foo.ts' or its corresponding type declarations.
@@ -21,7 +23,7 @@ no.ts(11,8): error TS2307: Cannot find module 'node:path' or its corresponding t
 ==== globals.d.ts (0 errors) ====
     declare function require(module: string): any;
     
-==== main.ts (8 errors) ====
+==== main.ts (10 errors) ====
     // Rewrite
     import {} from "./foo.ts";
                    ~~~~~~~~~~
@@ -45,6 +47,13 @@ no.ts(11,8): error TS2307: Cannot find module 'node:path' or its corresponding t
     //Shim
     import("./foo.ts");
            ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    import("./foo.ts").then(() => {});
+           ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    function acceptAny(arg: any) {}
+    acceptAny(import("./foo.ts"));
+                     ~~~~~~~~~~
 !!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
     import("./foo.ts", { with: { attr: "value" } });
            ~~~~~~~~~~
diff --git a/tests/baselines/reference/emit(jsx=preserve).js b/tests/baselines/reference/emit(jsx=preserve).js
@@ -14,6 +14,9 @@ import "./foo.ts";
 export * from "./foo.ts";
 //Shim
 import("./foo.ts");
+import("./foo.ts").then(() => {});
+function acceptAny(arg: any) {}
+acceptAny(import("./foo.ts"));
 import("./foo.ts", { with: { attr: "value" } });
 import("" + "./foo.ts");
 //// [js.js]
@@ -71,6 +74,9 @@ import "./foo.js";
 export * from "./foo.js";
 //Shim
 import("./foo.js");
+import("./foo.js").then(() => { });
+function acceptAny(arg) { }
+acceptAny(import("./foo.js"));
 import("./foo.js", { with: { attr: "value" } });
 import(__rewriteRelativeImportExtension("" + "./foo.ts", true));
 //// [js.js]
diff --git a/tests/baselines/reference/emit(jsx=react).errors.txt b/tests/baselines/reference/emit(jsx=react).errors.txt
@@ -6,6 +6,8 @@ main.ts(6,22): error TS2307: Cannot find module './foo.ts' or its corresponding
 main.ts(8,15): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
 main.ts(10,8): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
 main.ts(11,8): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+main.ts(13,18): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+main.ts(14,8): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
 no.ts(1,16): error TS2307: Cannot find module './foo.ts/foo.js' or its corresponding type declarations.
 no.ts(2,16): error TS2307: Cannot find module 'foo.ts' or its corresponding type declarations.
 no.ts(3,16): error TS2307: Cannot find module 'pkg/foo.ts' or its corresponding type declarations.
@@ -21,7 +23,7 @@ no.ts(11,8): error TS2307: Cannot find module 'node:path' or its corresponding t
 ==== globals.d.ts (0 errors) ====
     declare function require(module: string): any;
     
-==== main.ts (8 errors) ====
+==== main.ts (10 errors) ====
     // Rewrite
     import {} from "./foo.ts";
                    ~~~~~~~~~~
@@ -45,6 +47,13 @@ no.ts(11,8): error TS2307: Cannot find module 'node:path' or its corresponding t
     //Shim
     import("./foo.ts");
            ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    import("./foo.ts").then(() => {});
+           ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    function acceptAny(arg: any) {}
+    acceptAny(import("./foo.ts"));
+                     ~~~~~~~~~~
 !!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
     import("./foo.ts", { with: { attr: "value" } });
            ~~~~~~~~~~
diff --git a/tests/baselines/reference/emit(jsx=react).js b/tests/baselines/reference/emit(jsx=react).js
@@ -14,6 +14,9 @@ import "./foo.ts";
 export * from "./foo.ts";
 //Shim
 import("./foo.ts");
+import("./foo.ts").then(() => {});
+function acceptAny(arg: any) {}
+acceptAny(import("./foo.ts"));
 import("./foo.ts", { with: { attr: "value" } });
 import("" + "./foo.ts");
 //// [js.js]
@@ -71,6 +74,9 @@ import "./foo.js";
 export * from "./foo.js";
 //Shim
 import("./foo.js");
+import("./foo.js").then(() => { });
+function acceptAny(arg) { }
+acceptAny(import("./foo.js"));
 import("./foo.js", { with: { attr: "value" } });
 import(__rewriteRelativeImportExtension("" + "./foo.ts"));
 //// [js.js]
diff --git a/tests/cases/conformance/externalModules/rewriteRelativeImportExtensions/emit.ts b/tests/cases/conformance/externalModules/rewriteRelativeImportExtensions/emit.ts
@@ -21,6 +21,9 @@ import "./foo.ts";
 export * from "./foo.ts";
 //Shim
 import("./foo.ts");
+import("./foo.ts").then(() => {});
+function acceptAny(arg: any) {}
+acceptAny(import("./foo.ts"));
 import("./foo.ts", { with: { attr: "value" } });
 import("" + "./foo.ts");
 // @Filename: js.js

Original file line number	Diff line number	Diff line change
`@@ -49148,11 +49148,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`49148`	`49148`	`}`
`49149`	`49149`	`else if (isEntityName(name) && isTypeReferenceIdentifier(name)) {`
`49150`	`49150`	`const meaning = name.parent.kind === SyntaxKind.TypeReference ? SymbolFlags.Type : SymbolFlags.Namespace;`
`49151`		`- const symbol = resolveEntityName(name, meaning, /ignoreErrors/ false, /dontResolveAlias/ true);`
	`49151`	`+ const symbol = resolveEntityName(name, meaning, /ignoreErrors/ true, /dontResolveAlias/ true);`
`49152`	`49152`	`return symbol && symbol !== unknownSymbol ? symbol : getUnresolvedSymbolForEntityName(name);`
`49153`	`49153`	`}`
`49154`	`49154`	`if (name.parent.kind === SyntaxKind.TypePredicate) {`
`49155`		`- return resolveEntityName(name as Identifier, /meaning/ SymbolFlags.FunctionScopedVariable);`
	`49155`	`+ return resolveEntityName(name as Identifier, /meaning/ SymbolFlags.FunctionScopedVariable, /ignoreErrors/ true);`
`49156`	`49156`	`}`
`49157`	`49157`	`return undefined;`
`49158`	`49158`	`}`
`@@ -49383,7 +49383,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`49383`	`49383`
`49384`	`49384`	`function getShorthandAssignmentValueSymbol(location: Node \| undefined): Symbol \| undefined {`
`49385`	`49385`	`if (location && location.kind === SyntaxKind.ShorthandPropertyAssignment) {`
`49386`		`- return resolveEntityName((location as ShorthandPropertyAssignment).name, SymbolFlags.Value \| SymbolFlags.Alias);`
	`49386`	`+ return resolveEntityName((location as ShorthandPropertyAssignment).name, SymbolFlags.Value \| SymbolFlags.Alias, /ignoreErrors/ true);`
`49387`	`49387`	`}`
`49388`	`49388`	`return undefined;`
`49389`	`49389`	`}`
`@@ -49395,10 +49395,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {`
`49395`	`49395`	`return node.parent.parent.moduleSpecifier ?`
`49396`	`49396`	`getExternalModuleMember(node.parent.parent, node) :`
`49397`	`49397`	`name.kind === SyntaxKind.StringLiteral ? undefined : // Skip for invalid syntax like this: export { "x" }`
`49398`		`- resolveEntityName(name, SymbolFlags.Value \| SymbolFlags.Type \| SymbolFlags.Namespace \| SymbolFlags.Alias);`
	`49398`	`+ resolveEntityName(name, SymbolFlags.Value \| SymbolFlags.Type \| SymbolFlags.Namespace \| SymbolFlags.Alias, /ignoreErrors/ true);`
`49399`	`49399`	`}`
`49400`	`49400`	`else {`
`49401`		`- return resolveEntityName(node, SymbolFlags.Value \| SymbolFlags.Type \| SymbolFlags.Namespace \| SymbolFlags.Alias);`
	`49401`	`+ return resolveEntityName(node, SymbolFlags.Value \| SymbolFlags.Type \| SymbolFlags.Namespace \| SymbolFlags.Alias, /ignoreErrors/ true);`
`49402`	`49402`	`}`
`49403`	`49403`	`}`
`49404`	`49404`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S`
`158`	`158`	`if (node === importsAndRequiresToRewriteOrShim?.[0]) {`
`159`	`159`	`return visitImportOrRequireCall(importsAndRequiresToRewriteOrShim.shift()!);`
`160`	`160`	`}`
`161`		`- break;`
	`161`	`+ // fallthrough`
`162`	`162`	`default:`
`163`	`163`	`if (importsAndRequiresToRewriteOrShim?.length && rangeContainsRange(node, importsAndRequiresToRewriteOrShim[0])) {`
`164`	`164`	`return visitEachChild(node, visitor, context);`