skip emitting function properties

Author: a-tarasyuk

internal/transformers/declarations/transform.go

@@ -1842,13 +1842,6 @@ 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
@@ -1861,6 +1854,11 @@ func (tx *DeclarationTransformer) transformExpandoAssignment(node *ast.BinaryExp
 	}
 
 	tx.transformExpandoHost(name, declaration)
+
+	if ast.IsFunctionDeclaration(declaration) && !shouldEmitFunctionProperties(declaration.AsFunctionDeclaration()) {
+		return nil
+	}
+
 	isNonContextualKeywordName := ast.IsNonContextualKeyword(scanner.StringToToken(property))
 	exportName := core.IfElse(isNonContextualKeywordName, tx.Factory().NewGeneratedNameForNode(left), tx.Factory().NewIdentifier(property))
 

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 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;
+}

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

@@ -1,10 +1,15 @@
 --- old.declarationEmitExpandoWithGenericConstraint.js
 +++ new.declarationEmitExpandoWithGenericConstraint.js
-@@= skipped -37, +37 lines =@@
+@@= skipped -35, +35 lines =@@
+     readonly a: p;
+     readonly b: p;
  }
- export declare const Point: {
-     (x: number, y: number): Point;
+-export declare const Point: {
+-    (x: number, y: number): Point;
 -    zero(): Point;
-+    zero: () => Point;
- };
- export declare const Rect: <p extends Point>(a: p, b: p) => Rect<p>;
+-};
++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;
++}

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

@@ -20,6 +20,3 @@ f.x = 2;
 //// [declarationEmitFunctionDuplicateNamespace.d.ts]
 declare function f(a: 0): 0;
 declare function f(a: 1): 1;
-declare namespace f {
-    const x: number;
-}

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

@@ -1,9 +1,9 @@
 --- old.declarationEmitFunctionDuplicateNamespace.js
 +++ new.declarationEmitFunctionDuplicateNamespace.js
-@@= skipped -20, +20 lines =@@
+@@= skipped -19, +19 lines =@@
+ //// [declarationEmitFunctionDuplicateNamespace.d.ts]
  declare function f(a: 0): 0;
  declare function f(a: 1): 1;
- declare namespace f {
+-declare namespace f {
 -    var x: number;
-+    const x: number;
- }
+-}

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 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: {
     (): void;
     77: number;

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

@@ -28,6 +28,22 @@
 -export declare namespace decl9 { }
  export declare function decl10(): void;
 -export declare namespace decl10 { }
- export declare const arrow: {
+-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: {
      (): void;
-     B: string;
+     77: number;

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

@@ -27,11 +27,11 @@ exports.expr2[s] = 0;
 
 
 //// [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;
+}

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

@@ -10,4 +10,24 @@
 +// https://github.com/microsoft/TypeScript/issues/54809
  const s = "X";
  const expr = () => { };
- exports.expr = 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;
++}

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

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