Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions tsc/internal/transformers/inliners/constenum.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@ func (tx *ConstEnumInliningTransformer) visit(node *ast.Node) *ast.Node {
switch v := value.(type) {
case jsnum.Number:
if v.IsInf() {
inf := tx.Factory().NewBinaryExpression(nil, tx.Factory().NewNumericLiteral("1", ast.TokenFlagsNone), nil, tx.Factory().NewToken(ast.KindSlashToken), tx.Factory().NewNumericLiteral("0", ast.TokenFlagsNone))
if v.Abs() == v {
replacement = tx.Factory().NewIdentifier("Infinity")
replacement = inf
} else {
replacement = tx.Factory().NewPrefixUnaryExpression(ast.KindMinusToken, tx.Factory().NewIdentifier("Infinity"))
replacement = tx.Factory().NewPrefixUnaryExpression(ast.KindMinusToken, inf)
}
} else if v.IsNaN() {
replacement = tx.Factory().NewIdentifier("NaN")
replacement = tx.Factory().NewBinaryExpression(nil, tx.Factory().NewNumericLiteral("0", ast.TokenFlagsNone), nil, tx.Factory().NewToken(ast.KindSlashToken), tx.Factory().NewNumericLiteral("0", ast.TokenFlagsNone))
} else if v.Abs() == v {
replacement = tx.Factory().NewNumericLiteral(v.String(), ast.TokenFlagsNone)
} else {
Expand Down
7 changes: 4 additions & 3 deletions tsc/internal/transformers/tstransforms/utilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ func constantExpression(value any, factory *printer.NodeFactory) *ast.Expression
return factory.NewStringLiteral(value, ast.TokenFlagsNone)
case jsnum.Number:
if value.IsInf() {
inf := factory.NewBinaryExpression(nil, factory.NewNumericLiteral("1", ast.TokenFlagsNone), nil, factory.NewToken(ast.KindSlashToken), factory.NewNumericLiteral("0", ast.TokenFlagsNone))
if value > 0 {
return factory.NewIdentifier("Infinity")
return inf
}
return factory.NewPrefixUnaryExpression(ast.KindMinusToken, factory.NewIdentifier("Infinity"))
return factory.NewPrefixUnaryExpression(ast.KindMinusToken, inf)
}
if value.IsNaN() {
return factory.NewIdentifier("NaN")
return factory.NewBinaryExpression(nil, factory.NewNumericLiteral("0", ast.TokenFlagsNone), nil, factory.NewToken(ast.KindSlashToken), factory.NewNumericLiteral("0", ast.TokenFlagsNone))
}
if value < 0 {
return factory.NewPrefixUnaryExpression(ast.KindMinusToken, constantExpression(-value, factory))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ enum E {
"use strict";
var E;
(function (E) {
E[E["A"] = NaN] = "A";
E[E["B"] = NaN] = "B";
E[E["A"] = 0 / 0] = "A";
E[E["B"] = 0 / 0] = "B";
})(E || (E = {}));
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
enumInfinityShadowed.ts(13,9): error TS2477: 'const' enum member initializer was evaluated to a non-finite value.
enumInfinityShadowed.ts(14,9): error TS2477: 'const' enum member initializer was evaluated to a non-finite value.
enumInfinityShadowed.ts(15,9): error TS2478: 'const' enum member initializer was evaluated to disallowed value 'NaN'.


==== enumInfinityShadowed.ts (3 errors) ====
// Fixes https://github.com/microsoft/TypeScript/issues/55091
// Enum values that evaluate to Infinity, -Infinity, or NaN must not emit
// bare Infinity/NaN identifiers, because those can be shadowed by local
// variables. Instead, emit 1/0, -(1/0), and 0/0 respectively.

enum A {
X = 1 / 0,
Y = -1 / 0,
Z = 0 / 0,
}

const enum B {
X = 1 / 0,
~~~~~
!!! error TS2477: 'const' enum member initializer was evaluated to a non-finite value.
Y = -1 / 0,
~~~~~~
!!! error TS2477: 'const' enum member initializer was evaluated to a non-finite value.
Z = 0 / 0,
~~~~~
!!! error TS2478: 'const' enum member initializer was evaluated to disallowed value 'NaN'.
}

{
let Infinity = 3;
let NaN = 42;
console.log(A.X, A.Y, A.Z);
console.log(B.X, B.Y, B.Z);
}

46 changes: 46 additions & 0 deletions tsc/testdata/baselines/reference/compiler/enumInfinityShadowed.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//// [tests/cases/compiler/enumInfinityShadowed.ts] ////

//// [enumInfinityShadowed.ts]
// Fixes https://github.com/microsoft/TypeScript/issues/55091
// Enum values that evaluate to Infinity, -Infinity, or NaN must not emit
// bare Infinity/NaN identifiers, because those can be shadowed by local
// variables. Instead, emit 1/0, -(1/0), and 0/0 respectively.

enum A {
X = 1 / 0,
Y = -1 / 0,
Z = 0 / 0,
}

const enum B {
X = 1 / 0,
Y = -1 / 0,
Z = 0 / 0,
}

{
let Infinity = 3;
let NaN = 42;
console.log(A.X, A.Y, A.Z);
console.log(B.X, B.Y, B.Z);
}


//// [enumInfinityShadowed.js]
"use strict";
// Fixes https://github.com/microsoft/TypeScript/issues/55091
// Enum values that evaluate to Infinity, -Infinity, or NaN must not emit
// bare Infinity/NaN identifiers, because those can be shadowed by local
// variables. Instead, emit 1/0, -(1/0), and 0/0 respectively.
var A;
(function (A) {
A[A["X"] = 1 / 0] = "X";
A[A["Y"] = -(1 / 0)] = "Y";
A[A["Z"] = 0 / 0] = "Z";
})(A || (A = {}));
{
let Infinity = 3;
let NaN = 42;
console.log(A.X, A.Y, A.Z);
console.log(1 / 0 /* B.X */, -(1 / 0) /* B.Y */, 0 / 0 /* B.Z */);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
//// [tests/cases/compiler/enumInfinityShadowed.ts] ////

=== enumInfinityShadowed.ts ===
// Fixes https://github.com/microsoft/TypeScript/issues/55091
// Enum values that evaluate to Infinity, -Infinity, or NaN must not emit
// bare Infinity/NaN identifiers, because those can be shadowed by local
// variables. Instead, emit 1/0, -(1/0), and 0/0 respectively.

enum A {
>A : Symbol(A, Decl(enumInfinityShadowed.ts, 0, 0))

X = 1 / 0,
>X : Symbol(A.X, Decl(enumInfinityShadowed.ts, 5, 8))

Y = -1 / 0,
>Y : Symbol(A.Y, Decl(enumInfinityShadowed.ts, 6, 14))

Z = 0 / 0,
>Z : Symbol(A.Z, Decl(enumInfinityShadowed.ts, 7, 15))
}

const enum B {
>B : Symbol(B, Decl(enumInfinityShadowed.ts, 9, 1))

X = 1 / 0,
>X : Symbol(B.X, Decl(enumInfinityShadowed.ts, 11, 14))

Y = -1 / 0,
>Y : Symbol(B.Y, Decl(enumInfinityShadowed.ts, 12, 14))

Z = 0 / 0,
>Z : Symbol(B.Z, Decl(enumInfinityShadowed.ts, 13, 15))
}

{
let Infinity = 3;
>Infinity : Symbol(Infinity, Decl(enumInfinityShadowed.ts, 18, 7))

let NaN = 42;
>NaN : Symbol(NaN, Decl(enumInfinityShadowed.ts, 19, 7))

console.log(A.X, A.Y, A.Z);
>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>A.X : Symbol(A.X, Decl(enumInfinityShadowed.ts, 5, 8))
>A : Symbol(A, Decl(enumInfinityShadowed.ts, 0, 0))
>X : Symbol(A.X, Decl(enumInfinityShadowed.ts, 5, 8))
>A.Y : Symbol(A.Y, Decl(enumInfinityShadowed.ts, 6, 14))
>A : Symbol(A, Decl(enumInfinityShadowed.ts, 0, 0))
>Y : Symbol(A.Y, Decl(enumInfinityShadowed.ts, 6, 14))
>A.Z : Symbol(A.Z, Decl(enumInfinityShadowed.ts, 7, 15))
>A : Symbol(A, Decl(enumInfinityShadowed.ts, 0, 0))
>Z : Symbol(A.Z, Decl(enumInfinityShadowed.ts, 7, 15))

console.log(B.X, B.Y, B.Z);
>console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>console : Symbol(console, Decl(lib.dom.d.ts, --, --))
>log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --))
>B.X : Symbol(B.X, Decl(enumInfinityShadowed.ts, 11, 14))
>B : Symbol(B, Decl(enumInfinityShadowed.ts, 9, 1))
>X : Symbol(B.X, Decl(enumInfinityShadowed.ts, 11, 14))
>B.Y : Symbol(B.Y, Decl(enumInfinityShadowed.ts, 12, 14))
>B : Symbol(B, Decl(enumInfinityShadowed.ts, 9, 1))
>Y : Symbol(B.Y, Decl(enumInfinityShadowed.ts, 12, 14))
>B.Z : Symbol(B.Z, Decl(enumInfinityShadowed.ts, 13, 15))
>B : Symbol(B, Decl(enumInfinityShadowed.ts, 9, 1))
>Z : Symbol(B.Z, Decl(enumInfinityShadowed.ts, 13, 15))
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
//// [tests/cases/compiler/enumInfinityShadowed.ts] ////

=== enumInfinityShadowed.ts ===
// Fixes https://github.com/microsoft/TypeScript/issues/55091
// Enum values that evaluate to Infinity, -Infinity, or NaN must not emit
// bare Infinity/NaN identifiers, because those can be shadowed by local
// variables. Instead, emit 1/0, -(1/0), and 0/0 respectively.

enum A {
>A : A

X = 1 / 0,
>X : A.X
>1 / 0 : number
>1 : 1
>0 : 0

Y = -1 / 0,
>Y : A.Y
>-1 / 0 : number
>-1 : -1
>1 : 1
>0 : 0

Z = 0 / 0,
>Z : A.Z
>0 / 0 : number
>0 : 0
>0 : 0
}

const enum B {
>B : B

X = 1 / 0,
>X : B.X
>1 / 0 : number
>1 : 1
>0 : 0

Y = -1 / 0,
>Y : B.Y
>-1 / 0 : number
>-1 : -1
>1 : 1
>0 : 0

Z = 0 / 0,
>Z : B.Z
>0 / 0 : number
>0 : 0
>0 : 0
}

{
let Infinity = 3;
>Infinity : number
>3 : 3

let NaN = 42;
>NaN : number
>42 : 42

console.log(A.X, A.Y, A.Z);
>console.log(A.X, A.Y, A.Z) : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>A.X : A.X
>A : typeof A
>X : A.X
>A.Y : A.Y
>A : typeof A
>Y : A.Y
>A.Z : A.Z
>A : typeof A
>Z : A.Z

console.log(B.X, B.Y, B.Z);
>console.log(B.X, B.Y, B.Z) : void
>console.log : (...data: any[]) => void
>console : Console
>log : (...data: any[]) => void
>B.X : B.X
>B : typeof B
>X : B.X
>B.Y : B.Y
>B : typeof B
>Y : B.Y
>B.Z : B.Z
>B : typeof B
>Z : B.Z
}

4 changes: 2 additions & 2 deletions tsc/testdata/baselines/reference/compiler/fakeInfinity2.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ export const m = X.f();
//// [fakeInfinity2.js]
export var Foo;
(function (Foo) {
Foo[Foo["A"] = Infinity] = "A";
Foo[Foo["B"] = -Infinity] = "B";
Foo[Foo["A"] = 1 / 0] = "A";
Foo[Foo["B"] = -(1 / 0)] = "B";
})(Foo || (Foo = {}));
var X;
(function (X) {
Expand Down
4 changes: 2 additions & 2 deletions tsc/testdata/baselines/reference/compiler/fakeInfinity3.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.Infinity = exports.m = exports.Foo = void 0;
var Foo;
(function (Foo) {
Foo[Foo["A"] = Infinity] = "A";
Foo[Foo["B"] = -Infinity] = "B";
Foo[Foo["A"] = 1 / 0] = "A";
Foo[Foo["B"] = -(1 / 0)] = "B";
})(Foo || (exports.Foo = Foo = {}));
var X;
(function (X) {
Expand Down
26 changes: 26 additions & 0 deletions tsc/testdata/tests/cases/compiler/enumInfinityShadowed.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// @target: es2015
// @strict: true

// Fixes https://github.com/microsoft/TypeScript/issues/55091
// Enum values that evaluate to Infinity, -Infinity, or NaN must not emit
// bare Infinity/NaN identifiers, because those can be shadowed by local
// variables. Instead, emit 1/0, -(1/0), and 0/0 respectively.

enum A {
X = 1 / 0,
Y = -1 / 0,
Z = 0 / 0,
}

const enum B {
X = 1 / 0,
Y = -1 / 0,
Z = 0 / 0,
}

{
let Infinity = 3;
let NaN = 42;
console.log(A.X, A.Y, A.Z);
console.log(B.X, B.Y, B.Z);
}