Suppress resolvedUsingTsExtension during loadModuleFromDirectory

Author: jakebailey

src/compiler/moduleNameResolver.ts

@@ -259,6 +259,7 @@ export interface ModuleResolutionState {
     requestContainingDirectory: string | undefined;
     reportDiagnostic: DiagnosticReporter;
     isConfigLookup: boolean;
+    suppressResolvedUsingTsExtension: boolean;
 }
 
 /** Just the fields that we use for module resolution.
@@ -526,6 +527,7 @@ export function resolveTypeReferenceDirective(typeReferenceDirectiveName: string
         requestContainingDirectory: containingDirectory,
         reportDiagnostic: diag => void diagnostics.push(diag),
         isConfigLookup: false,
+        suppressResolvedUsingTsExtension: false,
     };
     let resolved = primaryLookup();
     let primary = true;
@@ -1652,6 +1654,7 @@ function nodeModuleNameResolverWorker(features: NodeResolutionFeatures, moduleNa
         requestContainingDirectory: containingDirectory,
         reportDiagnostic: diag => void diagnostics.push(diag),
         isConfigLookup,
+        suppressResolvedUsingTsExtension: false,
     };
 
     if (traceEnabled && getEmitModuleResolutionKind(compilerOptions) >= ModuleResolutionKind.Node16 && getEmitModuleResolutionKind(compilerOptions) <= ModuleResolutionKind.NodeNext) {
@@ -1948,7 +1951,7 @@ function tryAddingExtensions(candidate: string, extensions: Extensions, original
 
     function tryExtension(ext: string, resolvedUsingTsExtension?: boolean): PathAndExtension | undefined {
         const path = tryFile(candidate + ext, onlyRecordFailures, state);
-        return path === undefined ? undefined : { path, ext, resolvedUsingTsExtension };
+        return path === undefined ? undefined : { path, ext, resolvedUsingTsExtension: !state.suppressResolvedUsingTsExtension && resolvedUsingTsExtension };
     }
 }
 
@@ -2111,6 +2114,7 @@ export function getTemporaryModuleResolutionState(packageJsonInfoCache: PackageJ
         requestContainingDirectory: undefined,
         reportDiagnostic: noop,
         isConfigLookup: false,
+        suppressResolvedUsingTsExtension: false,
     };
 }
 
@@ -2232,11 +2236,14 @@ function loadNodeModuleFromDirectoryWorker(extensions: Extensions, candidate: st
         // (technically it only emits a deprecation warning in esm packages right now, but that's probably
         // enough to mean we don't need to support it)
         const features = state.features;
+        const suppressResolvedUsingTsExtension = state.suppressResolvedUsingTsExtension;
+        state.suppressResolvedUsingTsExtension = true;
         if (jsonContent?.type !== "module") {
             state.features &= ~NodeResolutionFeatures.EsmMode;
         }
         const result = nodeLoadModuleByRelativeName(expandedExtensions, candidate, onlyRecordFailures, state, /*considerPackageJson*/ false);
         state.features = features;
+        state.suppressResolvedUsingTsExtension = suppressResolvedUsingTsExtension;
         return result;
     };
 
@@ -2935,6 +2942,7 @@ export function classicNameResolver(moduleName: string, containingFile: string,
         requestContainingDirectory: containingDirectory,
         reportDiagnostic: diag => void diagnostics.push(diag),
         isConfigLookup: false,
+        suppressResolvedUsingTsExtension: false,
     };
 
     const resolved =
@@ -3015,6 +3023,7 @@ export function loadModuleFromGlobalCache(moduleName: string, projectName: strin
         requestContainingDirectory: undefined,
         reportDiagnostic: diag => void diagnostics.push(diag),
         isConfigLookup: false,
+        suppressResolvedUsingTsExtension: false,
     };
     const resolved = loadModuleFromImmediateNodeModulesDirectory(Extensions.Declaration, moduleName, globalCache, state, /*typesScopeOnly*/ false, /*cache*/ undefined, /*redirectedReference*/ undefined);
     return createResolvedModuleWithFailedLookupLocations(

tests/baselines/reference/issue52182.js

@@ -0,0 +1,22 @@
+//// [tests/cases/compiler/issue52182.ts] ////
+
+//// [package.json]
+{
+    "name": "@angular/core",
+    "typings": "index.d.ts"
+}
+
+//// [index.ts]
+export {};
+
+//// [test.ts]
+import "@angular/core";
+
+
+//// [index.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//// [test.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("@angular/core");

tests/baselines/reference/issue52182.symbols

@@ -0,0 +1,8 @@
+=== tests/cases/compiler/@angular/core/index.ts ===
+
+export {};
+
+=== tests/cases/compiler/@angular/core/testing/test.ts ===
+
+import "@angular/core";
+

tests/baselines/reference/issue52182.types

@@ -0,0 +1,8 @@
+=== tests/cases/compiler/@angular/core/index.ts ===
+
+export {};
+
+=== tests/cases/compiler/@angular/core/testing/test.ts ===
+
+import "@angular/core";
+