Save & recalculate declare flag modifier on late printed statements (#29412)

* Save & recalculate declre flag modifier on late printed statements

* Accept related baseline updates

Author: weswigham

src/compiler/transformers/declarations.ts

@@ -634,7 +634,10 @@ namespace ts {
                 if (!isLateVisibilityPaintedStatement(i)) {
                     return Debug.fail(`Late replaced statement was found which is not handled by the declaration transformer!: ${(ts as any).SyntaxKind ? (ts as any).SyntaxKind[(i as any).kind] : (i as any).kind}`);
                 }
+                const priorNeedsDeclare = needsDeclare;
+                needsDeclare = i.parent && isSourceFile(i.parent) && !(isExternalModule(i.parent) && isBundledEmit);
                 const result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true);
+                needsDeclare = priorNeedsDeclare;
                 lateStatementReplacementMap.set("" + getOriginalNodeId(i), result);
             }
 

tests/baselines/reference/declarationEmitLocalClassHasRequiredDeclare.js

@@ -0,0 +1,54 @@
+//// [declarationEmitLocalClassHasRequiredDeclare.ts]
+export declare namespace A {
+    namespace X { }
+}
+
+class X { }
+
+export class A {
+    static X = X;
+}
+
+export declare namespace Y {
+
+}
+
+export class Y { }
+
+//// [declarationEmitLocalClassHasRequiredDeclare.js]
+"use strict";
+exports.__esModule = true;
+var X = /** @class */ (function () {
+    function X() {
+    }
+    return X;
+}());
+var A = /** @class */ (function () {
+    function A() {
+    }
+    A.X = X;
+    return A;
+}());
+exports.A = A;
+var Y = /** @class */ (function () {
+    function Y() {
+    }
+    return Y;
+}());
+exports.Y = Y;
+
+
+//// [declarationEmitLocalClassHasRequiredDeclare.d.ts]
+export declare namespace A {
+    namespace X { }
+}
+declare class X {
+}
+export declare class A {
+    static X: typeof X;
+}
+export declare namespace Y {
+}
+export declare class Y {
+}
+export {};

tests/baselines/reference/declarationEmitLocalClassHasRequiredDeclare.symbols

@@ -0,0 +1,27 @@
+=== tests/cases/compiler/declarationEmitLocalClassHasRequiredDeclare.ts ===
+export declare namespace A {
+>A : Symbol(A, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 0, 0), Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 4, 11))
+
+    namespace X { }
+>X : Symbol(X, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 0, 28), Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 6, 16))
+}
+
+class X { }
+>X : Symbol(X, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 2, 1))
+
+export class A {
+>A : Symbol(A, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 0, 0), Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 4, 11))
+
+    static X = X;
+>X : Symbol(A.X, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 0, 28), Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 6, 16))
+>X : Symbol(X, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 2, 1))
+}
+
+export declare namespace Y {
+>Y : Symbol(Y, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 8, 1), Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 12, 1))
+
+}
+
+export class Y { }
+>Y : Symbol(Y, Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 8, 1), Decl(declarationEmitLocalClassHasRequiredDeclare.ts, 12, 1))
+

tests/baselines/reference/declarationEmitLocalClassHasRequiredDeclare.types

@@ -0,0 +1,23 @@
+=== tests/cases/compiler/declarationEmitLocalClassHasRequiredDeclare.ts ===
+export declare namespace A {
+    namespace X { }
+}
+
+class X { }
+>X : X
+
+export class A {
+>A : A
+
+    static X = X;
+>X : typeof X
+>X : typeof X
+}
+
+export declare namespace Y {
+
+}
+
+export class Y { }
+>Y : Y
+

tests/baselines/reference/getEmitOutputWithEmitterErrors2.baseline

@@ -16,7 +16,7 @@ define(["require", "exports"], function (require, exports) {
 });
 
 FileName : /tests/cases/fourslash/inputFile.d.ts
-class C {
+declare class C {
 }
 export declare module M {
     var foo: C;

tests/baselines/reference/moduleAugmentationImportsAndExports2.js

@@ -77,7 +77,7 @@ export declare class B {
     n: number;
 }
 //// [f3.d.ts]
-namespace N {
+declare namespace N {
     interface Ifc {
         a: any;
     }

tests/baselines/reference/moduleAugmentationImportsAndExports3.js

@@ -75,7 +75,7 @@ export declare class B {
     n: number;
 }
 //// [f3.d.ts]
-namespace N {
+declare namespace N {
     interface Ifc {
         a: any;
     }

tests/baselines/reference/moduleAugmentationImportsAndExports5.js

@@ -80,7 +80,7 @@ export declare class B {
 }
 //// [f3.d.ts]
 import { B } from "./f2";
-namespace N {
+declare namespace N {
     interface Ifc {
         a: number;
     }
@@ -100,46 +100,3 @@ declare module "./f1" {
 export {};
 //// [f4.d.ts]
 import "./f3";
-
-
-//// [DtsFileErrors]
-
-
-tests/cases/compiler/f3.d.ts(2,1): error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
-
-
-==== tests/cases/compiler/f1.d.ts (0 errors) ====
-    export declare class A {
-    }
-    
-==== tests/cases/compiler/f2.d.ts (0 errors) ====
-    export declare class B {
-        n: number;
-    }
-    
-==== tests/cases/compiler/f3.d.ts (1 errors) ====
-    import { B } from "./f2";
-    namespace N {
-    ~~~~~~~~~
-!!! error TS1046: A 'declare' modifier is required for a top level declaration in a .d.ts file.
-        interface Ifc {
-            a: number;
-        }
-        interface Cls {
-            b: number;
-        }
-    }
-    import I = N.Ifc;
-    import C = N.Cls;
-    declare module "./f1" {
-        interface A {
-            foo(): B;
-            bar(): I;
-            baz(): C;
-        }
-    }
-    export {};
-    
-==== tests/cases/compiler/f4.d.ts (0 errors) ====
-    import "./f3";
-