Improve test for 'symbol.exports' (#25523)

* Improve test for 'symbol.exports'

* Remove SymbolFlags.HasExports and SymbolFlags.HasMembers

* Update baseline

Author: Andy

src/compiler/binder.ts

@@ -225,11 +225,11 @@ namespace ts {
             node.symbol = symbol;
             symbol.declarations = append(symbol.declarations, node);
 
-            if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
+            if (symbolFlags & (SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.Module | SymbolFlags.Variable) && !symbol.exports) {
                 symbol.exports = createSymbolTable();
             }
 
-            if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
+            if (symbolFlags & (SymbolFlags.Class | SymbolFlags.Interface | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) && !symbol.members) {
                 symbol.members = createSymbolTable();
             }
 

src/compiler/checker.ts

@@ -2417,12 +2417,12 @@ namespace ts {
             // The ES6 spec permits export * declarations in a module to circularly reference the module itself. For example,
             // module 'a' can 'export * from "b"' and 'b' can 'export * from "a"' without error.
             function visit(symbol: Symbol | undefined): SymbolTable | undefined {
-                if (!(symbol && symbol.flags & SymbolFlags.HasExports && pushIfUnique(visitedSymbols, symbol))) {
+                if (!(symbol && symbol.exports && pushIfUnique(visitedSymbols, symbol))) {
                     return;
                 }
-                const symbols = cloneMap(symbol.exports!);
+                const symbols = cloneMap(symbol.exports);
                 // All export * declarations are collected in an __export symbol by the binder
-                const exportStars = symbol.exports!.get(InternalSymbolName.ExportStar);
+                const exportStars = symbol.exports.get(InternalSymbolName.ExportStar);
                 if (exportStars) {
                     const nestedSymbols = createSymbolTable();
                     const lookupTable = createMap<ExportCollisionTracker>() as ExportCollisionTrackerTable;

src/compiler/symbolWalker.ts

@@ -171,8 +171,8 @@ namespace ts {
                 }
                 const t = getTypeOfSymbol(symbol);
                 visitType(t); // Should handle members on classes and such
-                if (symbol.flags & SymbolFlags.HasExports) {
-                    symbol.exports!.forEach(visitSymbol);
+                if (symbol.exports) {
+                    symbol.exports.forEach(visitSymbol);
                 }
                 forEach(symbol.declarations, d => {
                     // Type queries are too far resolved when we just visit the symbol's type

src/compiler/types.ts

@@ -3439,9 +3439,6 @@ namespace ts {
 
         ExportHasLocal = Function | Class | Enum | ValueModule,
 
-        HasExports = Class | Enum | Module | Variable,
-        HasMembers = Class | Interface | TypeLiteral | ObjectLiteral,
-
         BlockScoped = BlockScopedVariable | Class | Enum,
 
         PropertyOrAccessor = Property | Accessor,

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -2075,8 +2075,6 @@ declare namespace ts {
         AliasExcludes = 2097152,
         ModuleMember = 2623475,
         ExportHasLocal = 944,
-        HasExports = 1955,
-        HasMembers = 6240,
         BlockScoped = 418,
         PropertyOrAccessor = 98308,
         ClassMember = 106500

tests/baselines/reference/api/typescript.d.ts

@@ -2075,8 +2075,6 @@ declare namespace ts {
         AliasExcludes = 2097152,
         ModuleMember = 2623475,
         ExportHasLocal = 944,
-        HasExports = 1955,
-        HasMembers = 6240,
         BlockScoped = 418,
         PropertyOrAccessor = 98308,
         ClassMember = 106500

tests/baselines/reference/moduleExportWithExportPropertyAssignment4.errors.txt

@@ -2,6 +2,10 @@ tests/cases/conformance/salsa/a.js(4,17): error TS2339: Property 'toFixed' does
   Property 'toFixed' does not exist on type 'string'.
 tests/cases/conformance/salsa/a.js(5,16): error TS2339: Property 'toFixed' does not exist on type 'string | number'.
   Property 'toFixed' does not exist on type 'string'.
+tests/cases/conformance/salsa/mod1.js(2,1): error TS2323: Cannot redeclare exported variable 'bothBefore'.
+tests/cases/conformance/salsa/mod1.js(4,1): error TS2323: Cannot redeclare exported variable 'bothBefore'.
+tests/cases/conformance/salsa/mod1.js(5,1): error TS2323: Cannot redeclare exported variable 'bothAfter'.
+tests/cases/conformance/salsa/mod1.js(10,1): error TS2323: Cannot redeclare exported variable 'bothAfter'.
 
 
 ==== tests/cases/conformance/salsa/a.js (2 errors) ====
@@ -21,16 +25,24 @@ tests/cases/conformance/salsa/a.js(5,16): error TS2339: Property 'toFixed' does
 ==== tests/cases/conformance/salsa/requires.d.ts (0 errors) ====
     declare var module: { exports: any };
     declare function require(name: string): any;
-==== tests/cases/conformance/salsa/mod1.js (0 errors) ====
+==== tests/cases/conformance/salsa/mod1.js (4 errors) ====
     /// <reference path='./requires.d.ts' />
     module.exports.bothBefore = 'string'
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2323: Cannot redeclare exported variable 'bothBefore'.
     A.justExport = 4
     A.bothBefore = 2
+    ~~~~~~~~~~~~
+!!! error TS2323: Cannot redeclare exported variable 'bothBefore'.
     A.bothAfter = 3
+    ~~~~~~~~~~~
+!!! error TS2323: Cannot redeclare exported variable 'bothAfter'.
     module.exports = A
     function A() {
         this.p = 1
     }
     module.exports.bothAfter = 'string'
+    ~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2323: Cannot redeclare exported variable 'bothAfter'.
     module.exports.justProperty = 'string'