Dont look at object or function type when looking for members of export= type to be resolved by named imports

Fixes #37165

Author: sheetalkamat

src/compiler/checker.ts

@@ -2522,7 +2522,7 @@ namespace ts {
                     let symbolFromVariable: Symbol | undefined;
                     // First check if module was specified with "export=". If so, get the member from the resolved type
                     if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports.get(InternalSymbolName.ExportEquals)) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name.escapedText);
+                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name.escapedText, /*skipObjectFunctionPropertyAugment*/ true);
                     }
                     else {
                         symbolFromVariable = getPropertyOfVariable(targetSymbol, name.escapedText);
@@ -10367,7 +10367,7 @@ namespace ts {
                 t;
         }
 
-        function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: __String): Symbol | undefined {
+        function createUnionOrIntersectionProperty(containingType: UnionOrIntersectionType, name: __String, skipObjectFunctionPropertyAugment?: boolean): Symbol | undefined {
             const propSet = createMap<Symbol>();
             let indexTypes: Type[] | undefined;
             const isUnion = containingType.flags & TypeFlags.Union;
@@ -10379,7 +10379,7 @@ namespace ts {
             for (const current of containingType.types) {
                 const type = getApparentType(current);
                 if (!(type === errorType || type.flags & TypeFlags.Never)) {
-                    const prop = getPropertyOfType(type, name);
+                    const prop = getPropertyOfType(type, name, skipObjectFunctionPropertyAugment);
                     const modifiers = prop ? getDeclarationModifierFlagsFromSymbol(prop) : 0;
                     if (prop && !(modifiers & excludeModifiers)) {
                         if (isUnion) {
@@ -10485,20 +10485,21 @@ namespace ts {
         // constituents, in which case the isPartial flag is set when the containing type is union type. We need
         // these partial properties when identifying discriminant properties, but otherwise they are filtered out
         // and do not appear to be present in the union type.
-        function getUnionOrIntersectionProperty(type: UnionOrIntersectionType, name: __String): Symbol | undefined {
+        function getUnionOrIntersectionProperty(type: UnionOrIntersectionType, name: __String, skipObjectFunctionPropertyAugment?: boolean): Symbol | undefined {
             const properties = type.propertyCache || (type.propertyCache = createSymbolTable());
             let property = properties.get(name);
             if (!property) {
-                property = createUnionOrIntersectionProperty(type, name);
-                if (property) {
+                property = createUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
+                // Dont set the result since it might not be correct if skipping lookup from property of Object and function type
+                if (property && !skipObjectFunctionPropertyAugment) {
                     properties.set(name, property);
                 }
             }
             return property;
         }
 
-        function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: __String): Symbol | undefined {
-            const property = getUnionOrIntersectionProperty(type, name);
+        function getPropertyOfUnionOrIntersectionType(type: UnionOrIntersectionType, name: __String, skipObjectFunctionPropertyAugment?: boolean): Symbol | undefined {
+            const property = getUnionOrIntersectionProperty(type, name, skipObjectFunctionPropertyAugment);
             // We need to filter out partial properties in union types
             return property && !(getCheckFlags(property) & CheckFlags.ReadPartial) ? property : undefined;
         }
@@ -10576,14 +10577,15 @@ namespace ts {
          * @param type a type to look up property from
          * @param name a name of property to look up in a given type
          */
-        function getPropertyOfType(type: Type, name: __String): Symbol | undefined {
+        function getPropertyOfType(type: Type, name: __String, skipObjectFunctionPropertyAugment?: boolean): Symbol | undefined {
             type = getApparentType(getReducedType(type));
             if (type.flags & TypeFlags.Object) {
                 const resolved = resolveStructuredTypeMembers(<ObjectType>type);
                 const symbol = resolved.members.get(name);
                 if (symbol && symbolIsValue(symbol)) {
                     return symbol;
                 }
+                if (skipObjectFunctionPropertyAugment) return undefined;
                 const functionType = resolved === anyFunctionType ? globalFunctionType :
                     resolved.callSignatures.length ? globalCallableFunctionType :
                     resolved.constructSignatures.length ? globalNewableFunctionType :
@@ -10597,7 +10599,7 @@ namespace ts {
                 return getPropertyOfObjectType(globalObjectType, name);
             }
             if (type.flags & TypeFlags.UnionOrIntersection) {
-                return getPropertyOfUnionOrIntersectionType(<UnionOrIntersectionType>type, name);
+                return getPropertyOfUnionOrIntersectionType(<UnionOrIntersectionType>type, name, skipObjectFunctionPropertyAugment);
             }
             return undefined;
         }

tests/baselines/reference/moduleAugmentationWithNonExistentNamedImport.errors.txt

@@ -0,0 +1,21 @@
+tests/cases/compiler/bar.d.ts(1,10): error TS2305: Module '"./foo"' has no exported member 'Bar'.
+
+
+==== tests/cases/compiler/foo.d.ts (0 errors) ====
+    export = Foo;
+    export as namespace Foo;
+    
+    declare namespace Foo {
+        function foo();
+    }
+    
+    declare global {
+        namespace Bar { }
+    }
+    
+==== tests/cases/compiler/bar.d.ts (1 errors) ====
+    import { Bar } from './foo';
+             ~~~
+!!! error TS2305: Module '"./foo"' has no exported member 'Bar'.
+    export = Bar;
+    export as namespace Bar;

tests/baselines/reference/moduleAugmentationWithNonExistentNamedImport.symbols

@@ -0,0 +1,31 @@
+=== tests/cases/compiler/foo.d.ts ===
+export = Foo;
+>Foo : Symbol(Foo, Decl(foo.d.ts, 1, 24))
+
+export as namespace Foo;
+>Foo : Symbol(Foo, Decl(foo.d.ts, 0, 13))
+
+declare namespace Foo {
+>Foo : Symbol(Foo, Decl(foo.d.ts, 1, 24))
+
+    function foo();
+>foo : Symbol(foo, Decl(foo.d.ts, 3, 23))
+}
+
+declare global {
+>global : Symbol(global, Decl(foo.d.ts, 5, 1))
+
+    namespace Bar { }
+>Bar : Symbol(Bar, Decl(foo.d.ts, 7, 16))
+}
+
+=== tests/cases/compiler/bar.d.ts ===
+import { Bar } from './foo';
+>Bar : Symbol(Bar, Decl(bar.d.ts, 0, 8))
+
+export = Bar;
+>Bar : Symbol(Bar, Decl(bar.d.ts, 0, 8))
+
+export as namespace Bar;
+>Bar : Symbol(Bar, Decl(bar.d.ts, 1, 13))
+

tests/baselines/reference/moduleAugmentationWithNonExistentNamedImport.types

@@ -0,0 +1,30 @@
+=== tests/cases/compiler/foo.d.ts ===
+export = Foo;
+>Foo : typeof Foo
+
+export as namespace Foo;
+>Foo : typeof Foo
+
+declare namespace Foo {
+>Foo : typeof Foo
+
+    function foo();
+>foo : () => any
+}
+
+declare global {
+>global : any
+
+    namespace Bar { }
+}
+
+=== tests/cases/compiler/bar.d.ts ===
+import { Bar } from './foo';
+>Bar : any
+
+export = Bar;
+>Bar : any
+
+export as namespace Bar;
+>Bar : any
+

tests/baselines/reference/namedImportNonExistentName.errors.txt

@@ -1,4 +1,9 @@
 tests/cases/compiler/bar.ts(1,10): error TS2305: Module '"./foo"' has no exported member 'Bar'.
+tests/cases/compiler/bar.ts(1,15): error TS2305: Module '"./foo"' has no exported member 'toString'.
+tests/cases/compiler/bar.ts(3,10): error TS2305: Module '"./foo2"' has no exported member 'a'.
+tests/cases/compiler/bar.ts(3,13): error TS2305: Module '"./foo2"' has no exported member 'b'.
+tests/cases/compiler/bar.ts(3,19): error TS2305: Module '"./foo2"' has no exported member 'd'.
+tests/cases/compiler/bar.ts(3,22): error TS2305: Module '"./foo2"' has no exported member 'toString'.
 
 
 ==== tests/cases/compiler/foo.d.ts (0 errors) ====
@@ -9,8 +14,24 @@ tests/cases/compiler/bar.ts(1,10): error TS2305: Module '"./foo"' has no exporte
         function foo();
     }
 
-==== tests/cases/compiler/bar.ts (1 errors) ====
+==== tests/cases/compiler/foo2.ts (0 errors) ====
+    let x: { a: string; c: string; } | { b: number; c: number; };
+    export = x
+    
+==== tests/cases/compiler/bar.ts (6 errors) ====
     import { Bar, toString, foo } from './foo';
              ~~~
 !!! error TS2305: Module '"./foo"' has no exported member 'Bar'.
-    foo();
+                  ~~~~~~~~
+!!! error TS2305: Module '"./foo"' has no exported member 'toString'.
+    foo();
+    import { a, b, c, d, toString as foo2String } from './foo2';
+             ~
+!!! error TS2305: Module '"./foo2"' has no exported member 'a'.
+                ~
+!!! error TS2305: Module '"./foo2"' has no exported member 'b'.
+                      ~
+!!! error TS2305: Module '"./foo2"' has no exported member 'd'.
+                         ~~~~~~~~
+!!! error TS2305: Module '"./foo2"' has no exported member 'toString'.
+    c;

tests/baselines/reference/namedImportNonExistentName.js

@@ -8,12 +8,24 @@ declare namespace Foo {
     function foo();
 }
 
+//// [foo2.ts]
+let x: { a: string; c: string; } | { b: number; c: number; };
+export = x
+
 //// [bar.ts]
 import { Bar, toString, foo } from './foo';
-foo();
+foo();
+import { a, b, c, d, toString as foo2String } from './foo2';
+c;
 
+//// [foo2.js]
+"use strict";
+var x;
+module.exports = x;
 //// [bar.js]
 "use strict";
 exports.__esModule = true;
 var foo_1 = require("./foo");
 foo_1.foo();
+var foo2_1 = require("./foo2");
+foo2_1.c;

tests/baselines/reference/namedImportNonExistentName.symbols

@@ -12,6 +12,17 @@ declare namespace Foo {
 >foo : Symbol(foo, Decl(foo.d.ts, 3, 23))
 }
 
+=== tests/cases/compiler/foo2.ts ===
+let x: { a: string; c: string; } | { b: number; c: number; };
+>x : Symbol(x, Decl(foo2.ts, 0, 3))
+>a : Symbol(a, Decl(foo2.ts, 0, 8))
+>c : Symbol(c, Decl(foo2.ts, 0, 19))
+>b : Symbol(b, Decl(foo2.ts, 0, 36))
+>c : Symbol(c, Decl(foo2.ts, 0, 47))
+
+export = x
+>x : Symbol(x, Decl(foo2.ts, 0, 3))
+
 === tests/cases/compiler/bar.ts ===
 import { Bar, toString, foo } from './foo';
 >Bar : Symbol(Bar, Decl(bar.ts, 0, 8))
@@ -21,3 +32,13 @@ import { Bar, toString, foo } from './foo';
 foo();
 >foo : Symbol(foo, Decl(bar.ts, 0, 23))
 
+import { a, b, c, d, toString as foo2String } from './foo2';
+>a : Symbol(a, Decl(bar.ts, 2, 8))
+>b : Symbol(b, Decl(bar.ts, 2, 11))
+>c : Symbol(c, Decl(bar.ts, 2, 14))
+>d : Symbol(d, Decl(bar.ts, 2, 17))
+>foo2String : Symbol(foo2String, Decl(bar.ts, 2, 20))
+
+c;
+>c : Symbol(c, Decl(bar.ts, 2, 14))
+

tests/baselines/reference/namedImportNonExistentName.types

@@ -12,13 +12,35 @@ declare namespace Foo {
 >foo : () => any
 }
 
+=== tests/cases/compiler/foo2.ts ===
+let x: { a: string; c: string; } | { b: number; c: number; };
+>x : { a: string; c: string; } | { b: number; c: number; }
+>a : string
+>c : string
+>b : number
+>c : number
+
+export = x
+>x : { a: string; c: string; } | { b: number; c: number; }
+
 === tests/cases/compiler/bar.ts ===
 import { Bar, toString, foo } from './foo';
 >Bar : any
->toString : () => string
+>toString : any
 >foo : () => any
 
 foo();
 >foo() : any
 >foo : () => any
 
+import { a, b, c, d, toString as foo2String } from './foo2';
+>a : any
+>b : any
+>c : string | number
+>d : any
+>toString : any
+>foo2String : any
+
+c;
+>c : string | number
+

tests/cases/compiler/namedImportNonExistentName.ts

@@ -6,6 +6,12 @@ declare namespace Foo {
     function foo();
 }
 
+// @filename: foo2.ts
+let x: { a: string; c: string; } | { b: number; c: number; };
+export = x
+
 // @filename: bar.ts
 import { Bar, toString, foo } from './foo';
-foo();
+foo();
+import { a, b, c, d, toString as foo2String } from './foo2';
+c;