fix typeof enclosing declaration

Author: a-tarasyuk

internal/transformers/declarations/transform.go

@@ -1812,12 +1812,39 @@ func (tx *DeclarationTransformer) collectExpandoAssignments(node *ast.BinaryExpr
 		return
 	}
 
+	namespaceName := ast.GetFirstIdentifier(left.AsPropertyAccessExpression().Expression).Text()
+	id := ast.GetSymbolId(host)
+	modifierFlags := ast.ModifierFlagsAmbient
+	if host.ValueDeclaration.ModifierFlags()&ast.ModifierFlagsExport != 0 && host.ValueDeclaration.ModifierFlags()&ast.ModifierFlagsDefault == 0 {
+		modifierFlags |= ast.ModifierFlagsExport
+	}
+	modifiers := tx.Factory().NewModifierList(ast.CreateModifiersFromModifierFlags(modifierFlags, tx.Factory().NewModifier))
+
+	synthesizedModuleDeclaration := core.IfElse(
+		tx.pendingExpando[id] == nil,
+		tx.Factory().NewModuleDeclaration(
+			modifiers,
+			ast.KindNamespaceKeyword,
+			tx.Factory().NewIdentifier(namespaceName),
+			tx.Factory().NewModuleBlock(tx.Factory().NewNodeList([]*ast.Node{})),
+		),
+		tx.pendingExpando[id],
+	).AsModuleDeclaration()
+
+	synthesizedModuleDeclaration.Parent = tx.enclosingDeclaration
+
+	declarationData := synthesizedModuleDeclaration.DeclarationData()
+	declarationData.Symbol = host
+
+	containerData := synthesizedModuleDeclaration.LocalsContainerData()
+	containerData.Locals = make(ast.SymbolTable, 0)
+
 	saveDiag := tx.state.getSymbolAccessibilityDiagnostic
 	tx.state.getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(node.AsNode())
 	t := tx.resolver.CreateTypeOfExpression(
 		tx.EmitContext(),
 		right,
-		host.ValueDeclaration,
+		synthesizedModuleDeclaration.AsNode(),
 		declarationEmitNodeBuilderFlags,
 		declarationEmitInternalNodeBuilderFlags|nodebuilder.InternalFlagsNoSyntacticPrinter,
 		tx.tracker,
@@ -1849,33 +1876,16 @@ func (tx *DeclarationTransformer) collectExpandoAssignments(node *ast.BinaryExpr
 		)
 	}
 
-	id := ast.GetSymbolId(host)
-	if tx.pendingExpando[id] == nil {
-		modifierFlags := ast.ModifierFlagsAmbient
-		if host.ValueDeclaration.ModifierFlags()&ast.ModifierFlagsExport != 0 && host.ValueDeclaration.ModifierFlags()&ast.ModifierFlagsDefault == 0 {
-			modifierFlags |= ast.ModifierFlagsExport
-		}
-		modifiers := tx.Factory().NewModifierList(ast.CreateModifiersFromModifierFlags(modifierFlags, tx.Factory().NewModifier))
-		name := tx.Factory().NewIdentifier(ast.GetFirstIdentifier(left.AsPropertyAccessExpression().Expression).Text())
-		tx.pendingExpando[id] = tx.Factory().NewModuleDeclaration(
-			modifiers,
-			ast.KindNamespaceKeyword,
-			name,
-			tx.Factory().NewModuleBlock(tx.Factory().NewNodeList(statements)),
-		)
-	} else {
-		namespace := tx.pendingExpando[id].AsModuleDeclaration()
-		tx.pendingExpando[id] = tx.Factory().UpdateModuleDeclaration(
-			namespace,
-			namespace.Modifiers(),
-			namespace.Keyword,
-			namespace.Name(),
-			tx.Factory().UpdateModuleBlock(
-				namespace.Body.AsModuleBlock(),
-				tx.Factory().NewNodeList(append(namespace.Body.AsModuleBlock().Statements.Nodes, statements...)),
-			),
-		)
-	}
+	tx.pendingExpando[id] = tx.Factory().UpdateModuleDeclaration(
+		synthesizedModuleDeclaration,
+		synthesizedModuleDeclaration.Modifiers(),
+		synthesizedModuleDeclaration.Keyword,
+		synthesizedModuleDeclaration.Name(),
+		tx.Factory().UpdateModuleBlock(
+			synthesizedModuleDeclaration.Body.AsModuleBlock(),
+			tx.Factory().NewNodeList(append(synthesizedModuleDeclaration.Body.AsModuleBlock().Statements.Nodes, statements...)),
+		),
+	)
 }
 
 func (tx *DeclarationTransformer) transformPendingExpandoAssignments() []*ast.Node {

testdata/baselines/reference/compiler/declarationEmitExpandoFunction.js

@@ -47,9 +47,9 @@ export declare enum C {
     C = 0
 }
 export declare namespace A {
-    var a: typeof C;
-    var b: typeof C;
+    const a: typeof C;
+    const b: typeof C;
 }
 export declare namespace B {
-    var c: typeof C;
+    const c: typeof C;
 }

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

@@ -82,94 +82,30 @@ C.B = B;
 export declare class Foo {
 }
 //// [index1.d.ts]
-import { Foo } from './foo';
 declare function Example(): void;
 declare namespace Example {
-    var Foo: typeof Foo;
+    const Foo: typeof import("./foo").Foo;
 }
 export default Example;
 //// [index2.d.ts]
 import { Foo } from './foo';
 export { Foo };
 declare function Example(): void;
 declare namespace Example {
-    var Foo: typeof Foo;
+    const Foo: typeof import("./foo").Foo;
 }
 export default Example;
 //// [index3.d.ts]
 export declare class Bar {
 }
 declare function Example(): void;
 declare namespace Example {
-    var Bar: typeof Bar;
+    const Bar: typeof import("./index3").Bar;
 }
 export default Example;
 //// [index4.d.ts]
-declare function A(): void;
-declare function B(): void;
 export declare function C(): any;
 export declare namespace C {
-    var A: typeof A;
-    var B: typeof B;
+    const A: () => void;
+    const B: () => void;
 }
-
-
-//// [DtsFileErrors]
-
-
-index1.d.ts(4,9): error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-index2.d.ts(5,9): error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-index3.d.ts(5,9): error TS2502: 'Bar' is referenced directly or indirectly in its own type annotation.
-index4.d.ts(5,9): error TS2502: 'A' is referenced directly or indirectly in its own type annotation.
-index4.d.ts(6,9): error TS2502: 'B' is referenced directly or indirectly in its own type annotation.
-
-
-==== foo.d.ts (0 errors) ====
-    export declare class Foo {
-    }
-    
-==== index1.d.ts (1 errors) ====
-    import { Foo } from './foo';
-    declare function Example(): void;
-    declare namespace Example {
-        var Foo: typeof Foo;
-            ~~~
-!!! error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-    }
-    export default Example;
-    
-==== index2.d.ts (1 errors) ====
-    import { Foo } from './foo';
-    export { Foo };
-    declare function Example(): void;
-    declare namespace Example {
-        var Foo: typeof Foo;
-            ~~~
-!!! error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-    }
-    export default Example;
-    
-==== index3.d.ts (1 errors) ====
-    export declare class Bar {
-    }
-    declare function Example(): void;
-    declare namespace Example {
-        var Bar: typeof Bar;
-            ~~~
-!!! error TS2502: 'Bar' is referenced directly or indirectly in its own type annotation.
-    }
-    export default Example;
-    
-==== index4.d.ts (2 errors) ====
-    declare function A(): void;
-    declare function B(): void;
-    export declare function C(): any;
-    export declare namespace C {
-        var A: typeof A;
-            ~
-!!! error TS2502: 'A' is referenced directly or indirectly in its own type annotation.
-        var B: typeof B;
-            ~
-!!! error TS2502: 'B' is referenced directly or indirectly in its own type annotation.
-    }
-    

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

@@ -18,24 +18,21 @@
  Object.defineProperty(exports, "Foo", { enumerable: true, get: function () { return foo_1.Foo; } });
  function Example() { }
  Example.Foo = foo_1.Foo;
-@@= skipped -31, +31 lines =@@
- export declare class Foo {
- }
+@@= skipped -33, +33 lines =@@
  //// [index1.d.ts]
-+import { Foo } from './foo';
  declare function Example(): void;
  declare namespace Example {
 -    var Foo: typeof import("./foo").Foo;
-+    var Foo: typeof Foo;
++    const Foo: typeof import("./foo").Foo;
  }
  export default Example;
  //// [index2.d.ts]
-@@= skipped -10, +11 lines =@@
+@@= skipped -8, +8 lines =@@
  export { Foo };
  declare function Example(): void;
  declare namespace Example {
 -    var Foo: typeof import("./foo").Foo;
-+    var Foo: typeof Foo;
++    const Foo: typeof import("./foo").Foo;
  }
  export default Example;
  //// [index3.d.ts]
@@ -44,77 +41,14 @@
  declare function Example(): void;
  declare namespace Example {
 -    var Bar: typeof import("./index3").Bar;
-+    var Bar: typeof Bar;
++    const Bar: typeof import("./index3").Bar;
  }
  export default Example;
  //// [index4.d.ts]
-+declare function A(): void;
-+declare function B(): void;
  export declare function C(): any;
  export declare namespace C {
 -    var A: () => void;
 -    var B: () => void;
-+    var A: typeof A;
-+    var B: typeof B;
- }
-+
-+
-+//// [DtsFileErrors]
-+
-+
-+index1.d.ts(4,9): error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-+index2.d.ts(5,9): error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-+index3.d.ts(5,9): error TS2502: 'Bar' is referenced directly or indirectly in its own type annotation.
-+index4.d.ts(5,9): error TS2502: 'A' is referenced directly or indirectly in its own type annotation.
-+index4.d.ts(6,9): error TS2502: 'B' is referenced directly or indirectly in its own type annotation.
-+
-+
-+==== foo.d.ts (0 errors) ====
-+    export declare class Foo {
-+    }
-+    
-+==== index1.d.ts (1 errors) ====
-+    import { Foo } from './foo';
-+    declare function Example(): void;
-+    declare namespace Example {
-+        var Foo: typeof Foo;
-+            ~~~
-+!!! error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-+    }
-+    export default Example;
-+    
-+==== index2.d.ts (1 errors) ====
-+    import { Foo } from './foo';
-+    export { Foo };
-+    declare function Example(): void;
-+    declare namespace Example {
-+        var Foo: typeof Foo;
-+            ~~~
-+!!! error TS2502: 'Foo' is referenced directly or indirectly in its own type annotation.
-+    }
-+    export default Example;
-+    
-+==== index3.d.ts (1 errors) ====
-+    export declare class Bar {
-+    }
-+    declare function Example(): void;
-+    declare namespace Example {
-+        var Bar: typeof Bar;
-+            ~~~
-+!!! error TS2502: 'Bar' is referenced directly or indirectly in its own type annotation.
-+    }
-+    export default Example;
-+    
-+==== index4.d.ts (2 errors) ====
-+    declare function A(): void;
-+    declare function B(): void;
-+    export declare function C(): any;
-+    export declare namespace C {
-+        var A: typeof A;
-+            ~
-+!!! error TS2502: 'A' is referenced directly or indirectly in its own type annotation.
-+        var B: typeof B;
-+            ~
-+!!! error TS2502: 'B' is referenced directly or indirectly in its own type annotation.
-+    }
-+    
++    const A: () => void;
++    const B: () => void;
+ }

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

@@ -32,5 +32,5 @@ export {};
 //// [b.d.ts]
 export declare function q(): void;
 export declare namespace q {
-    var val: I;
+    const val: I;
 }

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

@@ -16,5 +16,5 @@
 +//// [b.d.ts]
 +export declare function q(): void;
 +export declare namespace q {
-+    var val: I;
++    const val: I;
 +}

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

@@ -42,7 +42,7 @@ export declare const Point: {
 };
 export declare const Rect: <p extends Point>(a: p, b: p) => Rect<p>;
 declare namespace Point {
-    var zero: () => Point;
+    const zero: () => Point;
 }
 
 
@@ -81,6 +81,6 @@ declarationEmitExpandoWithGenericConstraint.d.ts(14,19): error TS2451: Cannot re
 !!! error TS2395: Individual declarations in merged declaration 'Point' must be all exported or all local.
                       ~~~~~
 !!! error TS2451: Cannot redeclare block-scoped variable 'Point'.
-        var zero: () => Point;
+        const zero: () => Point;
     }
 

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

@@ -9,7 +9,7 @@
  };
  export declare const Rect: <p extends Point>(a: p, b: p) => Rect<p>;
 +declare namespace Point {
-+    var zero: () => Point;
++    const zero: () => Point;
 +}
 +
 +
@@ -48,6 +48,6 @@
 +!!! error TS2395: Individual declarations in merged declaration 'Point' must be all exported or all local.
 +                      ~~~~~
 +!!! error TS2451: Cannot redeclare block-scoped variable 'Point'.
-+        var zero: () => Point;
++        const zero: () => Point;
 +    }
 +    

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

@@ -21,5 +21,5 @@ f.x = 2;
 declare function f(a: 0): 0;
 declare function f(a: 1): 1;
 declare namespace f {
-    var x: 2;
+    const x: 2;
 }

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

@@ -5,5 +5,5 @@
  declare function f(a: 1): 1;
  declare namespace f {
 -    var x: number;
-+    var x: 2;
++    const x: 2;
  }