fix(typescript): correctly use getModeForUsageLocation to calculate the resolution mode

johnsoncodehk · johnsoncodehk · commit 09dbd89e0cd4 · 2025-07-02T14:53:45.000+08:00
fix #274, fix vuejs/language-tools#5464
diff --git a/packages/typescript/lib/node/decorateLanguageServiceHost.ts b/packages/typescript/lib/node/decorateLanguageServiceHost.ts
@@ -60,7 +60,8 @@ export function decorateLanguageServiceHost(
 					return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, ...rest);
 				}
 				return moduleLiterals.map(moduleLiteral => {
-					return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, containingSourceFile.impliedNodeFormat);
+					const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, options);
+					return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, mode);
 				});
 			};
 		}
@@ -77,7 +78,7 @@ export function decorateLanguageServiceHost(
 					return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile);
 				}
 				return moduleNames.map(moduleName => {
-					return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference, containingSourceFile?.impliedNodeFormat).resolvedModule;
+					return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference).resolvedModule;
 				});
 			};
 		}
diff --git a/packages/typescript/lib/node/proxyCreateProgram.ts b/packages/typescript/lib/node/proxyCreateProgram.ts
@@ -198,7 +198,8 @@ export function proxyCreateProgram(
 						return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, compilerOptions, containingSourceFile, ...rest);
 					}
 					return moduleLiterals.map(moduleLiteral => {
-						return resolveModuleName(moduleLiteral.text, containingFile, compilerOptions, moduleResolutionCache, redirectedReference, containingSourceFile.impliedNodeFormat);
+						const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, compilerOptions);
+						return resolveModuleName(moduleLiteral.text, containingFile, compilerOptions, moduleResolutionCache, redirectedReference, mode);
 					});
 				};
 				options.host.resolveModuleNames = (

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ export function decorateLanguageServiceHost(`
`60`	`60`	`return resolveModuleNameLiterals(moduleLiterals, containingFile, redirectedReference, options, containingSourceFile, ...rest);`
`61`	`61`	`}`
`62`	`62`	`return moduleLiterals.map(moduleLiteral => {`
`63`		`- return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, containingSourceFile.impliedNodeFormat);`
	`63`	`+ const mode = ts.getModeForUsageLocation(containingSourceFile, moduleLiteral, options);`
	`64`	`+ return resolveModuleName(moduleLiteral.text, containingFile, options, moduleResolutionCache, redirectedReference, mode);`
`64`	`65`	`});`
`65`	`66`	`};`
`66`	`67`	`}`
`@@ -77,7 +78,7 @@ export function decorateLanguageServiceHost(`
`77`	`78`	`return resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile);`
`78`	`79`	`}`
`79`	`80`	`return moduleNames.map(moduleName => {`
`80`		`- return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference, containingSourceFile?.impliedNodeFormat).resolvedModule;`
	`81`	`+ return resolveModuleName(moduleName, containingFile, options, moduleResolutionCache, redirectedReference).resolvedModule;`
`81`	`82`	`});`
`82`	`83`	`};`
`83`	`84`	`}`