Change export = structurally to allow other exported elements in the same file

src/compiler/types.ts

@@ -5454,13 +5454,6 @@ export interface TypeChecker {
     getAccessibleSymbolChain(symbol: Symbol, enclosingDeclaration: Node | undefined, meaning: SymbolFlags, useOnlyExternalAliasing: boolean): Symbol[] | undefined;
     getTypePredicateOfSignature(signature: Signature): TypePredicate | undefined;
     /** @internal */ resolveExternalModuleName(moduleSpecifier: Expression): Symbol | undefined;
-    /**
-     * An external module with an 'export =' declaration resolves to the target of the 'export =' declaration,
-     * and an external module with no 'export =' declaration resolves to the module itself.
-     *
-     * @internal
-     */
-    resolveExternalModuleSymbol(symbol: Symbol): Symbol;
     /**
      * @param node A location where we might consider accessing `this`. Not necessarily a ThisExpression.
      *

src/services/codefixes/importFixes.ts

@@ -1289,10 +1289,9 @@ function getNewImportFixes(
                 //
                 // import fs = require("fs"); // or const in JS
                 // fs.writeFile
-                const exportEquals = checker.resolveExternalModuleSymbol(exportInfo.moduleSymbol);
                 let namespacePrefix;
-                if (exportEquals !== exportInfo.moduleSymbol) {
-                    namespacePrefix = forEachNameOfDefaultExport(exportEquals, checker, getEmitScriptTarget(compilerOptions), identity)!;
+                if (exportInfo.moduleSymbol.exports?.has(InternalSymbolName.ExportEquals)) {
+                    namespacePrefix = forEachNameOfDefaultExport(exportInfo.moduleSymbol.exports?.get(InternalSymbolName.ExportEquals)!, checker, getEmitScriptTarget(compilerOptions), identity)!;
                 }
                 namespacePrefix ||= moduleSymbolToValidIdentifier(
                     exportInfo.moduleSymbol,

src/services/completions.ts

@@ -5386,7 +5386,7 @@ function getAutoImportSymbolFromCompletionEntryData(name: string, data: Completi
 
     if (!moduleSymbol) return undefined;
     let symbol = data.exportName === InternalSymbolName.ExportEquals
-        ? checker.resolveExternalModuleSymbol(moduleSymbol)
+        ? moduleSymbol.exports?.get(InternalSymbolName.ExportEquals)
         : checker.tryGetMemberInModuleExportsAndProperties(data.exportName, moduleSymbol);
     if (!symbol) return undefined;
     const isDefaultExport = data.exportName === InternalSymbolName.Default;

src/services/exportInfoMap.ts

@@ -302,7 +302,7 @@ export function createCacheableExportInfoMap(host: CacheableExportInfoMapHost):
         );
         const symbol = info.symbol || cachedSymbol || Debug.checkDefined(
             exportKind === ExportKind.ExportEquals
-                ? checker.resolveExternalModuleSymbol(moduleSymbol)
+                ? moduleSymbol
                 : checker.tryGetMemberInModuleExportsAndProperties(unescapeLeadingUnderscores(info.symbolTableKey), moduleSymbol),
             `Could not find symbol '${info.symbolName}' by key '${info.symbolTableKey}' in module ${moduleSymbol.name}`,
         );
@@ -604,14 +604,11 @@ export function getDefaultLikeExportInfo(moduleSymbol: Symbol, checker: TypeChec
     symbol: Symbol;
     exportKind: ExportKind;
 } | undefined {
-    const exportEquals = checker.resolveExternalModuleSymbol(moduleSymbol);
-    if (exportEquals !== moduleSymbol) {
-        const defaultExport = checker.tryGetMemberInModuleExports(InternalSymbolName.Default, exportEquals);
-        if (defaultExport) return { symbol: defaultExport, exportKind: ExportKind.Default };
-        return { symbol: exportEquals, exportKind: ExportKind.ExportEquals };
-    }
     const defaultExport = checker.tryGetMemberInModuleExports(InternalSymbolName.Default, moduleSymbol);
     if (defaultExport) return { symbol: defaultExport, exportKind: ExportKind.Default };
+    if (moduleSymbol.exports?.has(InternalSymbolName.ExportEquals)) {
+        return { symbol: moduleSymbol.exports.get(InternalSymbolName.ExportEquals)!, exportKind: ExportKind.ExportEquals };
+    }
 }
 
 function isImportableSymbol(symbol: Symbol, checker: TypeChecker) {

src/services/refactors/convertImport.ts

@@ -21,6 +21,7 @@ import {
     ImportDeclaration,
     ImportKind,
     ImportSpecifier,
+    InternalSymbolName,
     isExportSpecifier,
     isImportDeclaration,
     isJSDocImportTag,
@@ -281,8 +282,7 @@ export function doChangeNamedToNamespaceOrDefault(sourceFile: SourceFile, progra
 function isExportEqualsModule(moduleSpecifier: Expression, checker: TypeChecker) {
     const externalModule = checker.resolveExternalModuleName(moduleSpecifier);
     if (!externalModule) return false;
-    const exportEquals = checker.resolveExternalModuleSymbol(externalModule);
-    return externalModule !== exportEquals;
+    return !!externalModule.exports?.has(InternalSymbolName.ExportEquals);
 }
 
 function createImport(node: ImportDeclaration, defaultImportName: Identifier | undefined, elements: readonly ImportSpecifier[] | undefined): ImportDeclaration {