Fix up visibility

Author: jakebailey

src/compiler/checker.ts

@@ -41974,47 +41974,27 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             return canHaveLiteralInitializer(node) && isLiteralConstDeclaration(node as CanHaveLiteralInitializer); // TODO: Make safe
         }
 
-        function getBindingNameVisible(elem: BindingElement | VariableDeclaration | OmittedExpression): boolean {
+        function isPrivateDeclaration(node: Node) {
+            return hasEffectiveModifier(node, ModifierFlags.Private) || isPrivateIdentifierClassElementDeclaration(node);
+        }
+
+        function isVisibleExternally(elem: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement | OmittedExpression): boolean {
             if (isOmittedExpression(elem)) {
                 return false;
             }
             if (isBindingPattern(elem.name)) {
-                // If any child binding pattern element has been marked visible (usually by collect linked aliases), then this is visible
-                return some(elem.name.elements, getBindingNameVisible);
+                return some(elem.name.elements, isVisibleExternally);
             }
             else {
                 return isDeclarationVisible(elem);
             }
         }
 
-        function isDeclarationAndNotVisible(node: NamedDeclaration) {
-            switch (node.kind) {
-                case SyntaxKind.FunctionDeclaration:
-                case SyntaxKind.ModuleDeclaration:
-                case SyntaxKind.InterfaceDeclaration:
-                case SyntaxKind.ClassDeclaration:
-                case SyntaxKind.TypeAliasDeclaration:
-                case SyntaxKind.EnumDeclaration:
-                    return !isDeclarationVisible(node);
-                // The following should be doing their own visibility checks based on filtering their members
-                case SyntaxKind.VariableDeclaration:
-                    return !getBindingNameVisible(node as VariableDeclaration);
-                case SyntaxKind.ImportEqualsDeclaration:
-                case SyntaxKind.ImportDeclaration:
-                case SyntaxKind.ExportDeclaration:
-                case SyntaxKind.ExportAssignment:
-                    return false;
-                case SyntaxKind.ClassStaticBlockDeclaration:
-                    return true;
-            }
-            return false;
-        }
-
         if (
             !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
             && !shouldPrintWithInitializer(node)
-            && !(hasEffectiveModifier(node, ModifierFlags.Private) || isPrivateIdentifierClassElementDeclaration(node))
-            && !isDeclarationAndNotVisible(node)
+            && !isPrivateDeclaration(node)
+            && isVisibleExternally(node)
         ) {
             const widenedLiteralType = getWidenedLiteralType(type);
             if (!isTypeIdenticalTo(type, widenedLiteralType)) {

tests/baselines/reference/ambiguousLiteralWideningEmit.errors.txt

@@ -1,17 +1,14 @@
 contextualTypingWithFixedTypeParameters1.ts(2,22): error TS2339: Property 'foo' does not exist on type 'string'.
-contextualTypingWithFixedTypeParameters1.ts(3,25): error TS2856: The type of this declaration is ambiguous and may be observed as either 'string' or '""'.
 contextualTypingWithFixedTypeParameters1.ts(3,32): error TS2339: Property 'foo' does not exist on type '""'.
 contextualTypingWithFixedTypeParameters1.ts(3,38): error TS2345: Argument of type '1' is not assignable to parameter of type '""'.
 
 
-==== contextualTypingWithFixedTypeParameters1.ts (4 errors) ====
+==== contextualTypingWithFixedTypeParameters1.ts (3 errors) ====
     var f10: <T>(x: T, b: () => (a: T) => void, y: T) => T;
     f10('', () => a => a.foo, ''); // a is ""
                          ~~~
 !!! error TS2339: Property 'foo' does not exist on type 'string'.
     var r9 = f10('', () => (a => a.foo), 1); // error
-                            ~
-!!! error TS2856: The type of this declaration is ambiguous and may be observed as either 'string' or '""'.
                                    ~~~
 !!! error TS2339: Property 'foo' does not exist on type '""'.
                                          ~

tests/baselines/reference/contextualTypingWithFixedTypeParameters1.errors.txt

@@ -41,13 +41,6 @@ exports.a.test1(null, null, null);
 
 //// [declFileImportModuleWithExportAssignment_0.d.ts]
 declare namespace m2 {
-    interface connectModule {
-        (res: any, req: any, next: any): void;
-    }
-    interface connectExport {
-        use: (mod: connectModule) => connectExport;
-        listen: (port: number) => void;
-    }
 }
 declare var m2: {
     (): m2.connectExport;
@@ -63,3 +56,47 @@ export declare var a: {
     test1: a1.connectModule;
     test2(): a1.connectModule;
 };
+
+
+//// [DtsFileErrors]
+
+
+declFileImportModuleWithExportAssignment_0.d.ts(4,12): error TS2694: Namespace 'm2' has no exported member 'connectExport'.
+declFileImportModuleWithExportAssignment_0.d.ts(5,15): error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+declFileImportModuleWithExportAssignment_0.d.ts(6,17): error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+declFileImportModuleWithExportAssignment_1.d.ts(4,12): error TS2694: Namespace 'm2' has no exported member 'connectExport'.
+declFileImportModuleWithExportAssignment_1.d.ts(5,15): error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+declFileImportModuleWithExportAssignment_1.d.ts(6,17): error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+
+
+==== declFileImportModuleWithExportAssignment_1.d.ts (3 errors) ====
+    /**This is on import declaration*/
+    import a1 = require("./declFileImportModuleWithExportAssignment_0");
+    export declare var a: {
+        (): a1.connectExport;
+               ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectExport'.
+        test1: a1.connectModule;
+                  ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+        test2(): a1.connectModule;
+                    ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+    };
+    
+==== declFileImportModuleWithExportAssignment_0.d.ts (3 errors) ====
+    declare namespace m2 {
+    }
+    declare var m2: {
+        (): m2.connectExport;
+               ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectExport'.
+        test1: m2.connectModule;
+                  ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+        test2(): m2.connectModule;
+                    ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+    };
+    export = m2;
+    

tests/baselines/reference/declFileImportModuleWithExportAssignment.js

@@ -28,18 +28,36 @@ module.exports = m2;
 
 //// [declarationMaps.d.ts]
 declare namespace m2 {
-    interface connectModule {
-        (res: any, req: any, next: any): void;
-    }
-    interface connectExport {
-        use: (mod: connectModule) => connectExport;
-        listen: (port: number) => void;
-    }
 }
 declare var m2: {
     (): m2.connectExport;
     test1: m2.connectModule;
     test2(): m2.connectModule;
 };
 export = m2;
-//# sourceMappingURL=declarationMaps.d.ts.map
+//# sourceMappingURL=declarationMaps.d.ts.map
+
+//// [DtsFileErrors]
+
+
+declarationMaps.d.ts(4,12): error TS2694: Namespace 'm2' has no exported member 'connectExport'.
+declarationMaps.d.ts(5,15): error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+declarationMaps.d.ts(6,17): error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+
+
+==== declarationMaps.d.ts (3 errors) ====
+    declare namespace m2 {
+    }
+    declare var m2: {
+        (): m2.connectExport;
+               ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectExport'.
+        test1: m2.connectModule;
+                  ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+        test2(): m2.connectModule;
+                    ~~~~~~~~~~~~~
+!!! error TS2694: Namespace 'm2' has no exported member 'connectModule'.
+    };
+    export = m2;
+    //# sourceMappingURL=declarationMaps.d.ts.map