exclude expando initializers

a-tarasyuk · a-tarasyuk · commit 5f6eb6eeb720 · 2025-10-09T18:43:15.000+03:00
diff --git a/internal/transformers/declarations/transform.go b/internal/transformers/declarations/transform.go
@@ -1826,11 +1826,17 @@ 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
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.js b/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.js
@@ -36,8 +36,8 @@ export interface Rect<p extends Point> {
     readonly a: p;
     readonly b: p;
 }
-export declare function Point(x: number, y: number): Point;
+export declare const Point: {
+    (x: number, y: number): Point;
+    zero: () => Point;
+};
 export declare const Rect: <p extends Point>(a: p, b: p) => Rect<p>;
-export declare namespace Point {
-    const zero: () => Point;
-}
diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExpandoWithGenericConstraint.js.diff
@@ -1,15 +1,10 @@
 --- old.declarationEmitExpandoWithGenericConstraint.js
 +++ new.declarationEmitExpandoWithGenericConstraint.js
-@@= skipped -35, +35 lines =@@
-     readonly a: p;
-     readonly b: p;
+@@= skipped -37, +37 lines =@@
  }
--export declare const Point: {
--    (x: number, y: number): Point;
+ export declare const Point: {
+     (x: number, y: number): Point;
 -    zero(): Point;
--};
-+export declare function Point(x: number, y: number): Point;
- export declare const Rect: <p extends Point>(a: p, b: p) => Rect<p>;
-+export declare namespace Point {
-+    const zero: () => Point;
-+}
++    zero: () => Point;
+ };
+ export declare const Rect: <p extends Point>(a: p, b: p) => Rect<p>;
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsExpandoFunctions.js b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsExpandoFunctions.js
@@ -25,21 +25,6 @@ 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;
 }
@@ -51,27 +36,12 @@ export declare namespace foo {
 //// [DtsFileErrors]
 
 
-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(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 (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;
               ~~~~~~
diff --git a/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsExpandoFunctions.js.diff b/testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsExpandoFunctions.js.diff
@@ -9,21 +9,6 @@
 +//// [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 {
@@ -34,28 +19,13 @@
 +//// [DtsFileErrors]
 +
 +
-+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(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 (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'.
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.js b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.js
@@ -38,13 +38,6 @@ function f(k) {
 
 
 //// [mod1.d.ts]
-declare namespace NS {
-    const K: {
-        new (): {
-            values(): /*elided*/ any;
-        };
-    };
-}
 export var K = NS.K;
 export {};
 //// [main.d.ts]
diff --git a/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.js.diff b/testdata/baselines/reference/submodule/conformance/commonJSImportNestedClassTypeReference.js.diff
@@ -22,14 +22,8 @@
 -export var K: {
 -    new (): {
 -        values(): /*elided*/ any;
-+declare namespace NS {
-+    const K: {
-+        new (): {
-+            values(): /*elided*/ any;
-+        };
-     };
+-    };
 -};
-+}
 +export var K = NS.K;
 +export {};
  //// [main.d.ts]
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassMethod.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassMethod.js
@@ -129,9 +129,6 @@ C2.staticProp = function (x, y) {
 
 //// [jsDeclarationsClassMethod.d.ts]
 declare function C1(): void;
-declare namespace C1 {
-    const staticProp: (x: any, y: any) => any;
-}
 declare class C2 {
     /**
      * A comment method1
@@ -141,6 +138,3 @@ declare class C2 {
      */
     method1(x: number, y: number): number;
 }
-declare namespace C2 {
-    const staticProp: (x: any, y: any) => any;
-}
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassMethod.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassMethod.js.diff
@@ -20,19 +20,19 @@
 -     */
 -    method(x: number, y: number): number;
 -}
- declare namespace C1 {
+-declare namespace C1 {
 -    /**
 -     * A comment staticProp
 -     * @param {number} x
 -     * @param {number} y
 -     * @returns {number}
 -     */
 -    function staticProp(x: number, y: number): number;
-+    const staticProp: (x: any, y: any) => any;
- }
+-}
  declare class C2 {
      /**
-@@= skipped -33, +11 lines =@@
+      * A comment method1
+@@= skipped -33, +8 lines =@@
       * @returns {number}
       */
      method1(x: number, y: number): number;
@@ -43,14 +43,13 @@
 -     * @returns {number}
 -     */
 -    method2(x: number, y: number): number;
- }
- declare namespace C2 {
+-}
+-declare namespace C2 {
 -    /**
 -     * A comment staticProp
 -     * @param {number} x
 -     * @param {number} y
 -     * @returns {number}
 -     */
 -    function staticProp(x: number, y: number): number;
-+    const staticProp: (x: any, y: any) => any;
  }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.js
@@ -52,9 +52,6 @@ module.exports.Strings = Strings;
 
 
 //// [source.d.ts]
-declare namespace Handler {
-    const statische: () => void;
-}
 export = Handler;
 export var Strings = Strings;
 export type HandlerOptions = {
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsClassStatic.js.diff
@@ -19,16 +19,15 @@
  module.exports.Strings = Strings;
  /**
   * @typedef {Object} HandlerOptions
-@@= skipped -10, +12 lines =@@
-
+@@= skipped -11, +13 lines =@@
 
  //// [source.d.ts]
--export = Handler;
+ export = Handler;
 -declare class Handler {
 -    static get OPTIONS(): number;
 -    process(): void;
 -}
- declare namespace Handler {
+-declare namespace Handler {
 -    export { statische, Strings, HandlerOptions };
 -}
 -declare function statische(): void;
@@ -41,9 +40,6 @@
 -     * Should be able to export a type alias at the same time.
 -     */
 -    name: string;
-+    const statische: () => void;
-+}
-+export = Handler;
 +export var Strings = Strings;
 +export type HandlerOptions = {
 +    name: String;
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.js
@@ -35,9 +35,6 @@ MyClass.staticProperty = 123;
 //// [source.d.ts]
 export = MyClass;
 declare function MyClass(): void;
-declare namespace MyClass {
-    const staticMethod: () => void;
-}
 declare namespace MyClass {
     const staticProperty: number;
 }
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctionPrototypeStatic.js.diff
@@ -17,17 +17,12 @@
 -declare class MyClass {
 -    method(): void;
 -}
--declare namespace MyClass {
+ declare namespace MyClass {
 -    export { staticMethod, staticProperty, DoneCB };
--}
++    const staticProperty: number;
+ }
 -declare function staticMethod(): void;
 -declare var staticProperty: number;
-+declare namespace MyClass {
-+    const staticMethod: () => void;
-+}
-+declare namespace MyClass {
-+    const staticProperty: number;
-+}
 +export type DoneCB = (failures: number) ;
  /**
   * Callback to be invoked when test execution is complete.
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctions.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctions.js
@@ -127,11 +127,6 @@ export declare namespace b {
     const cat: string;
 }
 export declare function c(): void;
-export declare namespace c {
-    const Cls: {
-        new (): {};
-    };
-}
 /**
  * @param {number} a
  * @param {number} b
diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctions.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsFunctions.js.diff
@@ -25,20 +25,17 @@
 -export function b(): void;
 -export namespace b {
 -    let cat: string;
+-}
+-export function c(): void;
+-export namespace c {
+-    export { Cls };
+-}
 +export declare function a(): void;
 +export declare function b(): void;
 +export declare namespace b {
 +    const cat: string;
- }
--export function c(): void;
--export namespace c {
--    export { Cls };
++}
 +export declare function c(): void;
-+export declare namespace c {
-+    const Cls: {
-+        new (): {};
-+    };
- }
  /**
   * @param {number} a
   * @param {number} b
@@ -85,7 +82,7 @@
  /**
   * @param {{x: string}} a
   * @param {{y: typeof b}} b
-@@= skipped -50, +49 lines =@@
+@@= skipped -50, +44 lines =@@
  declare function hh(a: {
      x: string;
  }, b: {
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImplements_class.js b/testdata/baselines/reference/submodule/conformance/jsdocImplements_class.js
@@ -83,13 +83,6 @@ declare var Ns: {
     /** @implements {A} */
     C5: any;
 };
-declare namespace Ns {
-    const C1: {
-        new (): {
-            method(): number;
-        };
-    };
-}
 /** @implements {A} */
 declare var C2: {
     new (): {
diff --git a/testdata/baselines/reference/submodule/conformance/jsdocImplements_class.js.diff b/testdata/baselines/reference/submodule/conformance/jsdocImplements_class.js.diff
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment29.js b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment29.js
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment29.js.diff b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment29.js.diff
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment39.js b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment39.js
diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment39.js.diff b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment39.js.diff
