deduplicate emitted namespaces

Author: a-tarasyuk

internal/transformers/declarations/transform.go

@@ -1826,17 +1826,12 @@ func (tx *DeclarationTransformer) visitExpressionStatement(node *ast.ExpressionS
 
 func (tx *DeclarationTransformer) transformExpandoAssignment(node *ast.BinaryExpression) *ast.Node {
 	left := node.Left
-	right := node.Right
 
 	symbol := node.Symbol
 	if symbol == nil || symbol.Flags&ast.SymbolFlagsAssignment == 0 {
 		return nil
 	}
 
-	if ast.IsExpandoInitializer(right) {
-		return nil
-	}
-
 	ns := ast.GetLeftmostAccessExpression(left)
 	if ns == nil || ns.Kind != ast.KindIdentifier {
 		return nil
@@ -1847,6 +1842,13 @@ func (tx *DeclarationTransformer) transformExpandoAssignment(node *ast.BinaryExp
 		return nil
 	}
 
+	if ast.IsVariableDeclaration(declaration) {
+		id := ast.GetNodeId(tx.EmitContext().MostOriginal(declaration.Parent.Parent))
+		if tx.lateStatementReplacementMap[id] != nil {
+			return nil
+		}
+	}
+
 	host := declaration.Symbol()
 	if host == nil {
 		return nil

testdata/baselines/reference/submodule/compiler/declarationEmitLateBoundAssignments2.js

@@ -136,14 +136,14 @@ export declare function decl7(): void;
 export declare function decl8(): void;
 export declare function decl9(): void;
 export declare function decl10(): void;
-export declare function arrow(): void;
-export declare namespace arrow {
-    const B: string;
-}
-export declare function arrow2(): void;
-export declare namespace arrow2 {
-    const C: number;
-}
+export declare const arrow: {
+    (): void;
+    B: string;
+};
+export declare const arrow2: {
+    (): void;
+    C: number;
+};
 export declare const arrow3: {
     (): void;
     77: number;

testdata/baselines/reference/submodule/compiler/declarationEmitLateBoundAssignments2.js.diff

@@ -28,22 +28,6 @@
 -export declare namespace decl9 { }
  export declare function decl10(): void;
 -export declare namespace decl10 { }
--export declare const arrow: {
--    (): void;
--    B: string;
--};
--export declare const arrow2: {
--    (): void;
--    C: number;
--};
-+export declare function arrow(): void;
-+export declare namespace arrow {
-+    const B: string;
-+}
-+export declare function arrow2(): void;
-+export declare namespace arrow2 {
-+    const C: number;
-+}
- export declare const arrow3: {
+ export declare const arrow: {
      (): void;
-     77: number;
+     B: string;

testdata/baselines/reference/submodule/compiler/expandoFunctionExpressionsWithDynamicNames.js

@@ -27,11 +27,11 @@ exports.expr2[s] = 0;
 
 
 //// [expandoFunctionExpressionsWithDynamicNames.d.ts]
-export declare function expr(): void;
-export declare namespace expr {
-    const X: number;
-}
-export declare function expr2(): void;
-export declare namespace expr2 {
-    const X: number;
-}
+export declare const expr: {
+    (): void;
+    X: number;
+};
+export declare const expr2: {
+    (): void;
+    X: number;
+};

testdata/baselines/reference/submodule/compiler/expandoFunctionExpressionsWithDynamicNames.js.diff

@@ -10,24 +10,4 @@
 +// https://github.com/microsoft/TypeScript/issues/54809
  const s = "X";
  const expr = () => { };
- exports.expr = expr;
-@@= skipped -13, +13 lines =@@
-
-
- //// [expandoFunctionExpressionsWithDynamicNames.d.ts]
--export declare const expr: {
--    (): void;
--    X: number;
--};
--export declare const expr2: {
--    (): void;
--    X: number;
--};
-+export declare function expr(): void;
-+export declare namespace expr {
-+    const X: number;
-+}
-+export declare function expr2(): void;
-+export declare namespace expr2 {
-+    const X: number;
-+}
+ exports.expr = expr;

testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrors.js

@@ -25,11 +25,11 @@ declare function errorOnAssignmentBelowDecl(): void;
 declare namespace errorOnAssignmentBelowDecl {
     const a: string;
 }
-declare function errorOnAssignmentBelow(): void;
-declare namespace errorOnAssignmentBelow {
-    const a: string;
-}
-declare function errorOnMissingReturn(): void;
-declare namespace errorOnMissingReturn {
-    const a: string;
-}
+declare const errorOnAssignmentBelow: {
+    (): void;
+    a: string;
+};
+declare const errorOnMissingReturn: {
+    (): void;
+    a: string;
+};

testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrors.js.diff

@@ -11,11 +11,11 @@
 +declare namespace errorOnAssignmentBelowDecl {
 +    const a: string;
 +}
-+declare function errorOnAssignmentBelow(): void;
-+declare namespace errorOnAssignmentBelow {
-+    const a: string;
-+}
-+declare function errorOnMissingReturn(): void;
-+declare namespace errorOnMissingReturn {
-+    const a: string;
-+}
++declare const errorOnAssignmentBelow: {
++    (): void;
++    a: string;
++};
++declare const errorOnMissingReturn: {
++    (): void;
++    a: string;
++};

testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsExpandoFunctions.js

@@ -25,6 +25,21 @@ foo.length = 10;
 
 //// [isolatedDeclarationErrorsExpandoFunctions.d.ts]
 export declare function foo(): void;
+export declare namespace foo {
+    const apply: () => void;
+}
+export declare namespace foo {
+    const call: () => void;
+}
+export declare namespace foo {
+    const bind: () => void;
+}
+export declare namespace foo {
+    const caller: () => void;
+}
+export declare namespace foo {
+    const toString: () => void;
+}
 export declare namespace foo {
     const length: number;
 }
@@ -36,12 +51,27 @@ export declare namespace foo {
 //// [DtsFileErrors]
 
 
-isolatedDeclarationErrorsExpandoFunctions.d.ts(3,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
-isolatedDeclarationErrorsExpandoFunctions.d.ts(6,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
+isolatedDeclarationErrorsExpandoFunctions.d.ts(18,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
+isolatedDeclarationErrorsExpandoFunctions.d.ts(21,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
 
 
 ==== isolatedDeclarationErrorsExpandoFunctions.d.ts (2 errors) ====
     export declare function foo(): void;
+    export declare namespace foo {
+        const apply: () => void;
+    }
+    export declare namespace foo {
+        const call: () => void;
+    }
+    export declare namespace foo {
+        const bind: () => void;
+    }
+    export declare namespace foo {
+        const caller: () => void;
+    }
+    export declare namespace foo {
+        const toString: () => void;
+    }
     export declare namespace foo {
         const length: number;
               ~~~~~~

testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsExpandoFunctions.js.diff

@@ -9,6 +9,21 @@
 +//// [isolatedDeclarationErrorsExpandoFunctions.d.ts]
 +export declare function foo(): void;
 +export declare namespace foo {
++    const apply: () => void;
++}
++export declare namespace foo {
++    const call: () => void;
++}
++export declare namespace foo {
++    const bind: () => void;
++}
++export declare namespace foo {
++    const caller: () => void;
++}
++export declare namespace foo {
++    const toString: () => void;
++}
++export declare namespace foo {
 +    const length: number;
 +}
 +export declare namespace foo {
@@ -19,13 +34,28 @@
 +//// [DtsFileErrors]
 +
 +
-+isolatedDeclarationErrorsExpandoFunctions.d.ts(3,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
-+isolatedDeclarationErrorsExpandoFunctions.d.ts(6,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
++isolatedDeclarationErrorsExpandoFunctions.d.ts(18,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
++isolatedDeclarationErrorsExpandoFunctions.d.ts(21,11): error TS2451: Cannot redeclare block-scoped variable 'length'.
 +
 +
 +==== isolatedDeclarationErrorsExpandoFunctions.d.ts (2 errors) ====
 +    export declare function foo(): void;
 +    export declare namespace foo {
++        const apply: () => void;
++    }
++    export declare namespace foo {
++        const call: () => void;
++    }
++    export declare namespace foo {
++        const bind: () => void;
++    }
++    export declare namespace foo {
++        const caller: () => void;
++    }
++    export declare namespace foo {
++        const toString: () => void;
++    }
++    export declare namespace foo {
 +        const length: number;
 +              ~~~~~~
 +!!! error TS2451: Cannot redeclare block-scoped variable 'length'.

testdata/baselines/reference/submodule/compiler/jsDeclarationsGlobalFileConstFunction.js

@@ -19,11 +19,11 @@ SomeConstructor3.staticMember = "str";
 
 //// [file.d.ts]
 declare const SomeConstructor: () => void;
-declare function SomeConstructor2(): void;
-declare namespace SomeConstructor2 {
-    const staticMember: string;
-}
-declare function SomeConstructor3(): void;
-declare namespace SomeConstructor3 {
-    const staticMember: string;
-}
+declare const SomeConstructor2: {
+    (): void;
+    staticMember: string;
+};
+declare const SomeConstructor3: {
+    (): void;
+    staticMember: string;
+};