Defer new check until after everything else has run

Author: jakebailey

src/compiler/checker.ts

@@ -2213,6 +2213,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     var potentialReflectCollisions: Node[] = [];
     var potentialUnusedRenamedBindingElementsInTypes: BindingElement[] = [];
     var awaitedTypeStack: number[] = [];
+    var ambiguousVariableDeclarationsWhenWidened: [node: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement, type: Type, widenedLiteralType: Type][] = [];
 
     var diagnostics = createDiagnosticCollection();
     var suggestionDiagnostics = createDiagnosticCollection();
@@ -41978,28 +41979,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             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)) {
-                return some(elem.name.elements, isVisibleExternally);
-            }
-            else {
-                return isDeclarationVisible(elem);
-            }
-        }
-
         if (
             getEmitDeclarations(compilerOptions)
             && !(symbol.flags & (SymbolFlags.TypeLiteral | SymbolFlags.Signature))
             && !shouldPrintWithInitializer(node)
             && !isPrivateDeclaration(node)
-            && isVisibleExternally(node)
         ) {
             const widenedLiteralType = getWidenedLiteralType(type);
             if (!isTypeIdenticalTo(type, widenedLiteralType)) {
-                error(node.name, Diagnostics.The_type_of_this_declaration_is_ambiguous_and_may_be_observed_as_either_0_or_1, typeToString(widenedLiteralType), typeToString(type));
+                ambiguousVariableDeclarationsWhenWidened.push([node, type, widenedLiteralType]);
             }
         }
     }
@@ -46079,6 +46067,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             clear(potentialWeakMapSetCollisions);
             clear(potentialReflectCollisions);
             clear(potentialUnusedRenamedBindingElementsInTypes);
+            clear(ambiguousVariableDeclarationsWhenWidened);
 
             forEach(node.statements, checkSourceElement);
             checkSourceElement(node.endOfFileToken);
@@ -46103,6 +46092,26 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 }
             });
 
+            addLazyDiagnostic(() => {
+                function isVisibleExternally(elem: ParameterDeclaration | PropertyDeclaration | PropertySignature | VariableDeclaration | BindingElement | OmittedExpression): boolean {
+                    if (isOmittedExpression(elem)) {
+                        return false;
+                    }
+                    if (isBindingPattern(elem.name)) {
+                        return some(elem.name.elements, isVisibleExternally);
+                    }
+                    else {
+                        return isDeclarationVisible(elem);
+                    }
+                }
+
+                for (const [node, type, widenedLiteralType] of ambiguousVariableDeclarationsWhenWidened) {
+                    if (isVisibleExternally(node)) {
+                        error(node.name, Diagnostics.The_type_of_this_declaration_is_ambiguous_and_may_be_observed_as_either_0_or_1, typeToString(widenedLiteralType), typeToString(type));
+                    }
+                }
+            });
+
             if (
                 compilerOptions.importsNotUsedAsValues === ImportsNotUsedAsValues.Error &&
                 !node.isDeclarationFile &&
@@ -46135,6 +46144,11 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 clear(potentialReflectCollisions);
             }
 
+            if (ambiguousVariableDeclarationsWhenWidened.length) {
+                // forEach(potentialAmbiguousDeclarationsWhenWidened, checkAmbiguousDeclaration);
+                clear(ambiguousVariableDeclarationsWhenWidened);
+            }
+
             links.flags |= NodeCheckFlags.TypeChecked;
         }
     }

tests/baselines/reference/declFileExportAssignmentImportInternalModule.js

@@ -34,6 +34,20 @@ module.exports = m;
 
 //// [declFileExportAssignmentImportInternalModule.d.ts]
 declare namespace m3 {
+    namespace m2 {
+        interface connectModule {
+            (res: any, req: any, next: any): void;
+        }
+        interface connectExport {
+            use: (mod: connectModule) => connectExport;
+            listen: (port: number) => void;
+        }
+    }
+    var server: {
+        (): m2.connectExport;
+        test1: m2.connectModule;
+        test2(): m2.connectModule;
+    };
 }
 import m = m3;
 export = m;

tests/baselines/reference/declFileImportModuleWithExportAssignment.js

@@ -41,6 +41,13 @@ 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;
@@ -56,47 +63,3 @@ 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/declarationEmitImportInExportAssignmentModule.js

@@ -30,5 +30,11 @@ module.exports = m;
 
 //// [declarationEmitImportInExportAssignmentModule.d.ts]
 declare namespace m {
+    namespace c {
+        class c {
+        }
+    }
+    import x = c;
+    var a: typeof x;
 }
 export = m;