fix(1632): erase const enums after inlining

internal/core/compileroptions.go

@@ -277,7 +277,7 @@ func (options *CompilerOptions) GetResolveJsonModule() bool {
 }
 
 func (options *CompilerOptions) ShouldPreserveConstEnums() bool {
-	return options.PreserveConstEnums == TSTrue || options.IsolatedModules == TSTrue
+	return options.PreserveConstEnums == TSTrue || options.GetIsolatedModules()
 }
 
 func (options *CompilerOptions) GetAllowJS() bool {

internal/transformers/tstransforms/runtimesyntax.go

@@ -64,7 +64,7 @@ func (tx *RuntimeSyntaxTransformer) pushScope(node *ast.Node) (savedCurrentScope
 	case ast.KindCaseBlock, ast.KindModuleBlock, ast.KindBlock:
 		tx.currentScope = node
 		tx.currentScopeFirstDeclarationsOfName = nil
-	case ast.KindFunctionDeclaration, ast.KindClassDeclaration, ast.KindEnumDeclaration, ast.KindModuleDeclaration, ast.KindVariableStatement:
+	case ast.KindFunctionDeclaration, ast.KindClassDeclaration, ast.KindVariableStatement:
 		tx.recordDeclarationInScope(node)
 	}
 	return savedCurrentScope, savedCurrentScopeFirstDeclarationsOfName
@@ -309,6 +309,10 @@ func (tx *RuntimeSyntaxTransformer) addVarForDeclaration(statements []*ast.State
 }
 
 func (tx *RuntimeSyntaxTransformer) visitEnumDeclaration(node *ast.EnumDeclaration) *ast.Node {
+	if !tx.shouldEmitEnumDeclaration(node) {
+		return tx.Factory().NewNotEmittedStatement()
+	}
+
 	statements := []*ast.Statement{}
 
 	// If needed, we should emit a variable declaration for the enum:
@@ -1130,6 +1134,10 @@ func (tx *RuntimeSyntaxTransformer) evaluateEntity(node *ast.Node, location *ast
 	return result
 }
 
+func (tx *RuntimeSyntaxTransformer) shouldEmitEnumDeclaration(node *ast.EnumDeclaration) bool {
+	return !ast.IsEnumConst(node.AsNode()) || tx.compilerOptions.ShouldPreserveConstEnums()
+}
+
 func getInnermostModuleDeclarationFromDottedModule(moduleDeclaration *ast.ModuleDeclaration) *ast.ModuleDeclaration {
 	for moduleDeclaration.Body != nil && moduleDeclaration.Body.Kind == ast.KindModuleDeclaration {
 		moduleDeclaration = moduleDeclaration.Body.AsModuleDeclaration()

internal/transformers/tstransforms/runtimesyntax_test.go

@@ -200,11 +200,7 @@ var E;
     E[E["B"] = 1] = "B";
 })(E || (E = {}));`},
 
-		{title: "const enum", input: "const enum E {A, B}", output: `var E;
-(function (E) {
-    E[E["A"] = 0] = "A";
-    E[E["B"] = 1] = "B";
-})(E || (E = {}));`},
+		{title: "const enum", input: "const enum E {A, B}", output: ""},
 
 		{title: "merged enum", input: "enum E {A} enum E {B=A}", output: `var E;
 (function (E) {

internal/transformers/tstransforms/typeeraser.go

@@ -343,6 +343,12 @@ func (tx *TypeEraserTransformer) visit(node *ast.Node) *ast.Node {
 		}
 		return node
 
+	case ast.KindEnumDeclaration:
+		if ast.IsEnumConst(node) {
+			return node
+		}
+		return tx.Visitor().VisitEachChild(node)
+
 	default:
 		return tx.Visitor().VisitEachChild(node)
 	}

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

@@ -22,12 +22,6 @@ bar(new B);
 
 
 //// [assignmentNonObjectTypeConstraints.js]
-var E;
-(function (E) {
-    E[E["A"] = 0] = "A";
-    E[E["B"] = 1] = "B";
-    E[E["C"] = 2] = "C";
-})(E || (E = {}));
 function foo(x) {
     var y = x; // Ok
 }

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

@@ -1,18 +1,6 @@
 --- old.assignmentNonObjectTypeConstraints.js
 +++ new.assignmentNonObjectTypeConstraints.js
-@@= skipped -21, +21 lines =@@
-
-
- //// [assignmentNonObjectTypeConstraints.js]
-+var E;
-+(function (E) {
-+    E[E["A"] = 0] = "A";
-+    E[E["B"] = 1] = "B";
-+    E[E["C"] = 2] = "C";
-+})(E || (E = {}));
- function foo(x) {
-     var y = x; // Ok
- }
+@@= skipped -27, +27 lines =@@
  foo(5);
  foo(0 /* E.A */);
  class A {

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

@@ -30,15 +30,7 @@ function foo1() {
 }
 function foo2() {
     return 0 /* E.A */;
-    let E;
-    (function (E) {
-        E[E["A"] = 0] = "A";
-    })(E || (E = {}));
 }
 const config = {
     a: 2 /* AfterObject.A */,
 };
-var AfterObject;
-(function (AfterObject) {
-    AfterObject[AfterObject["A"] = 2] = "A";
-})(AfterObject || (AfterObject = {}));

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

@@ -156,11 +156,5 @@ function foo(node) {
 function bar(node) {
     const a = tryCast(node, isExpression); // tryCast<Expression, Node>
 }
-// Repro from #49924
-var SyntaxKind1;
-(function (SyntaxKind1) {
-    SyntaxKind1[SyntaxKind1["ClassExpression"] = 0] = "ClassExpression";
-    SyntaxKind1[SyntaxKind1["ClassStatement"] = 1] = "ClassStatement";
-})(SyntaxKind1 || (SyntaxKind1 = {}));
 const maybeClassStatement = tryCast(statement, isClassLike); // ClassLike1
 const x = tryCast(types, isNodeArray); // NodeAray<TypeNode>

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

@@ -7,16 +7,4 @@
 -"use strict";
  function f1(a, b) {
      const x1 = cast(a, isC); // cast<A, C>
-     const x2 = cast(b, isC); // cast<A, C>
-@@= skipped -35, +34 lines =@@
- function bar(node) {
-     const a = tryCast(node, isExpression); // tryCast<Expression, Node>
- }
-+// Repro from #49924
-+var SyntaxKind1;
-+(function (SyntaxKind1) {
-+    SyntaxKind1[SyntaxKind1["ClassExpression"] = 0] = "ClassExpression";
-+    SyntaxKind1[SyntaxKind1["ClassStatement"] = 1] = "ClassStatement";
-+})(SyntaxKind1 || (SyntaxKind1 = {}));
- const maybeClassStatement = tryCast(statement, isClassLike); // ClassLike1
- const x = tryCast(types, isNodeArray); // NodeAray<TypeNode>
+     const x2 = cast(b, isC); // cast<A, C>

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

@@ -126,14 +126,6 @@ function foo() {
 
 
 //// [coAndContraVariantInferences3.js]
-var SyntaxKind;
-(function (SyntaxKind) {
-    SyntaxKind[SyntaxKind["ImportDeclaration"] = 0] = "ImportDeclaration";
-    SyntaxKind[SyntaxKind["Modifier"] = 1] = "Modifier";
-    SyntaxKind[SyntaxKind["ImportClause"] = 2] = "ImportClause";
-    SyntaxKind[SyntaxKind["AssertClause"] = 3] = "AssertClause";
-    SyntaxKind[SyntaxKind["Decorator"] = 4] = "Decorator";
-})(SyntaxKind || (SyntaxKind = {}));
 ;
 buildOverload("updateImportDeclaration")
     .overload({

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

@@ -5,14 +5,6 @@
 
  //// [coAndContraVariantInferences3.js]
 -"use strict";
-+var SyntaxKind;
-+(function (SyntaxKind) {
-+    SyntaxKind[SyntaxKind["ImportDeclaration"] = 0] = "ImportDeclaration";
-+    SyntaxKind[SyntaxKind["Modifier"] = 1] = "Modifier";
-+    SyntaxKind[SyntaxKind["ImportClause"] = 2] = "ImportClause";
-+    SyntaxKind[SyntaxKind["AssertClause"] = 3] = "AssertClause";
-+    SyntaxKind[SyntaxKind["Decorator"] = 4] = "Decorator";
-+})(SyntaxKind || (SyntaxKind = {}));
  ;
  buildOverload("updateImportDeclaration")
      .overload({

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

@@ -27,11 +27,6 @@ function foo() {
 
 
 //// [coAndContraVariantInferences4.js]
-var SyntaxKind;
-(function (SyntaxKind) {
-    SyntaxKind[SyntaxKind["Modifier"] = 0] = "Modifier";
-    SyntaxKind[SyntaxKind["Decorator"] = 1] = "Decorator";
-})(SyntaxKind || (SyntaxKind = {}));
 function foo() {
     every(modifiers, isModifier);
     every(modifiers, isDecorator);

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

@@ -5,11 +5,6 @@
 
  //// [coAndContraVariantInferences4.js]
 -"use strict";
-+var SyntaxKind;
-+(function (SyntaxKind) {
-+    SyntaxKind[SyntaxKind["Modifier"] = 0] = "Modifier";
-+    SyntaxKind[SyntaxKind["Decorator"] = 1] = "Decorator";
-+})(SyntaxKind || (SyntaxKind = {}));
  function foo() {
      every(modifiers, isModifier);
      every(modifiers, isDecorator);

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

@@ -130,12 +130,6 @@ var m1;
     }
     m1.b = b;
 })(m1 || (m1 = {}));
-var color;
-(function (color) {
-    color[color["red"] = 0] = "red";
-    color[color["green"] = 1] = "green";
-    color[color["blue"] = 2] = "blue";
-})(color || (color = {}));
 var shade = 1;
 
 

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

@@ -26,17 +26,7 @@
          constructor(x) {
              this.x = x;
          }
-     }
-     m1.b = b;
- })(m1 || (m1 = {}));
-+var color;
-+(function (color) {
-+    color[color["red"] = 0] = "red";
-+    color[color["green"] = 1] = "green";
-+    color[color["blue"] = 2] = "blue";
-+})(color || (color = {}));
- var shade = 1;
-
+@@= skipped -11, +12 lines =@@
 
  //// [commentsdoNotEmitComments.d.ts]
  declare var myVariable: number;
@@ -45,7 +35,7 @@
  declare var fooVar: () => void;
  declare class c {
      constructor();
-@@= skipped -27, +34 lines =@@
+@@= skipped -16, +16 lines =@@
      (a: number): number;
      new (b: string): any;
      [a: number]: string;

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

@@ -25,10 +25,6 @@ foo[k] = ['foo'];
 
 //// [a.js]
 const k = Symbol();
-var Props;
-(function (Props) {
-    Props["k"] = "k";
-})(Props || (Props = {}));
 foo.k = ['foo'];
 foo['k'] = ['foo'];
 foo["k" /* Props.k */] = ['foo'];

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

@@ -6,10 +6,5 @@
  //// [a.js]
 -"use strict";
  const k = Symbol();
-+var Props;
-+(function (Props) {
-+    Props["k"] = "k";
-+})(Props || (Props = {}));
  foo.k = ['foo'];
- foo['k'] = ['foo'];
- foo["k" /* Props.k */] = ['foo'];
+ foo['k'] = ['foo'];

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

@@ -5,8 +5,4 @@ const enum E { A }
 var x = E["B"]
 
 //// [constEnumBadPropertyNames.js]
-var E;
-(function (E) {
-    E[E["A"] = 0] = "A";
-})(E || (E = {}));
 var x = E["B"];

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

@@ -14,18 +14,6 @@ const enum E2 {
 }
 
 //// [constEnumDeclarations.js]
-var E;
-(function (E) {
-    E[E["A"] = 1] = "A";
-    E[E["B"] = 2] = "B";
-    E[E["C"] = 3] = "C";
-})(E || (E = {}));
-var E2;
-(function (E2) {
-    E2[E2["A"] = 1] = "A";
-    E2[E2["B"] = 2] = "B";
-    E2[E2["C"] = 3] = "C";
-})(E2 || (E2 = {}));
 
 
 //// [constEnumDeclarations.d.ts]

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

@@ -48,28 +48,9 @@ const enum NaNOrInfinity {
 
 //// [constEnumErrors.js]
 var E;
-(function (E) {
-    E[E["A"] = 0] = "A";
-})(E || (E = {}));
 (function (E) {
     var x = 1;
 })(E || (E = {}));
-var E1;
-(function (E1) {
-    // illegal case
-    // forward reference to the element of the same enum
-    E1["X"] = E1.Y;
-    if (typeof E1.X !== "string") E1[E1.X] = "X";
-    // forward reference to the element of the same enum
-    E1["Y"] = E1.Z;
-    if (typeof E1.Y !== "string") E1[E1.Y] = "Y";
-    E1["Y1"] = E1["Z"];
-    if (typeof E1.Y1 !== "string") E1[E1.Y1] = "Y1";
-})(E1 || (E1 = {}));
-var E2;
-(function (E2) {
-    E2[E2["A"] = 0] = "A";
-})(E2 || (E2 = {}));
 var y0 = E2[1];
 var name = "A";
 var y1 = E2[name];
@@ -79,14 +60,3 @@ var y = [E2];
 function foo(t) {
 }
 foo(E2);
-var NaNOrInfinity;
-(function (NaNOrInfinity) {
-    NaNOrInfinity[NaNOrInfinity["A"] = 9007199254740992] = "A";
-    NaNOrInfinity[NaNOrInfinity["B"] = 8.112963841460668e+31] = "B";
-    NaNOrInfinity[NaNOrInfinity["C"] = 6.582018229284824e+63] = "C";
-    NaNOrInfinity[NaNOrInfinity["D"] = 4.332296397063773e+127] = "D";
-    NaNOrInfinity[NaNOrInfinity["E"] = 1.876879207201175e+255] = "E";
-    NaNOrInfinity[NaNOrInfinity["F"] = NaNOrInfinity.E * NaNOrInfinity.E] = "F";
-    NaNOrInfinity[NaNOrInfinity["G"] = 1 / 0] = "G";
-    NaNOrInfinity[NaNOrInfinity["H"] = 0 / 0] = "H"; // NaN
-})(NaNOrInfinity || (NaNOrInfinity = {}));