Skip to content
Merged
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
11 changes: 6 additions & 5 deletions crates/oxc_transformer/src/typescript/enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,12 +425,13 @@ impl<'a> TypeScriptEnum<'a> {
quasi
} else {
let mut value = StringBuilder::new_in(ctx.ast.allocator);
for (quasi, expr) in lit.quasis.iter().zip(&lit.expressions) {
for (i, quasi) in lit.quasis.iter().enumerate() {
value.push_str(&quasi.value.cooked.unwrap_or(quasi.value.raw));
if let ConstantValue::String(str) =
self.evaluate(expr, prev_members, ctx)?
{
value.push_str(&str);
if i < lit.expressions.len() {
match self.evaluate(&lit.expressions[i], prev_members, ctx)? {
ConstantValue::String(str) => value.push_str(&str),
ConstantValue::Number(num) => value.push_str(&num.to_js_string()),
}
}
}
Atom::from(value.into_str())
Expand Down
50 changes: 48 additions & 2 deletions tasks/transform_conformance/snapshots/oxc.snap.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
commit: 4cc3d888

Passed: 188/317
Passed: 188/319

# All Passed:
* babel-plugin-transform-class-static-block
Expand Down Expand Up @@ -68,7 +68,7 @@ after transform: SymbolId(0): [ReferenceId(0), ReferenceId(2), ReferenceId(6), R
rebuilt : SymbolId(0): [ReferenceId(0), ReferenceId(2), ReferenceId(6), ReferenceId(10)]


# babel-plugin-transform-typescript (6/28)
# babel-plugin-transform-typescript (6/30)
* allow-declare-fields-false/input.ts
Unresolved references mismatch:
after transform: ["dce"]
Expand Down Expand Up @@ -228,6 +228,52 @@ Symbol flags mismatch for "AnimalSize":
after transform: SymbolId(6): SymbolFlags(RegularEnum)
rebuilt : SymbolId(4): SymbolFlags(FunctionScopedVariable)

* enum-template-literal-number/input.ts
Bindings mismatch:
after transform: ScopeId(1): ["NUM_1", "NUM_2", "NUM_3", "NUM_4", "NumberEnum"]
rebuilt : ScopeId(1): ["NumberEnum"]
Scope flags mismatch:
after transform: ScopeId(1): ScopeFlags(0x0)
rebuilt : ScopeId(1): ScopeFlags(Function)
Bindings mismatch:
after transform: ScopeId(2): ["COMPUTED_1", "COMPUTED_2", "ComputedEnum"]
rebuilt : ScopeId(2): ["ComputedEnum"]
Scope flags mismatch:
after transform: ScopeId(2): ScopeFlags(0x0)
rebuilt : ScopeId(2): ScopeFlags(Function)
Symbol flags mismatch for "NumberEnum":
after transform: SymbolId(0): SymbolFlags(RegularEnum)
rebuilt : SymbolId(0): SymbolFlags(FunctionScopedVariable)
Symbol reference IDs mismatch for "NumberEnum":
after transform: SymbolId(0): [ReferenceId(0), ReferenceId(1), ReferenceId(2), ReferenceId(3), ReferenceId(13)]
rebuilt : SymbolId(0): [ReferenceId(9)]
Symbol flags mismatch for "ComputedEnum":
after transform: SymbolId(5): SymbolFlags(RegularEnum)
rebuilt : SymbolId(2): SymbolFlags(FunctionScopedVariable)

* enum-template-literal-trailing-quasi/input.ts
Bindings mismatch:
after transform: ScopeId(1): ["A", "B", "NumberEnum"]
rebuilt : ScopeId(1): ["NumberEnum"]
Scope flags mismatch:
after transform: ScopeId(1): ScopeFlags(0x0)
rebuilt : ScopeId(1): ScopeFlags(Function)
Bindings mismatch:
after transform: ScopeId(2): ["C", "ComputedEnum", "D"]
rebuilt : ScopeId(2): ["ComputedEnum"]
Scope flags mismatch:
after transform: ScopeId(2): ScopeFlags(0x0)
rebuilt : ScopeId(2): ScopeFlags(Function)
Symbol flags mismatch for "NumberEnum":
after transform: SymbolId(0): SymbolFlags(RegularEnum)
rebuilt : SymbolId(0): SymbolFlags(FunctionScopedVariable)
Symbol reference IDs mismatch for "NumberEnum":
after transform: SymbolId(0): [ReferenceId(0), ReferenceId(1), ReferenceId(2), ReferenceId(8)]
rebuilt : SymbolId(0): [ReferenceId(5)]
Symbol flags mismatch for "ComputedEnum":
after transform: SymbolId(3): SymbolFlags(RegularEnum)
rebuilt : SymbolId(2): SymbolFlags(FunctionScopedVariable)

* export-elimination/input.ts
Bindings mismatch:
after transform: ScopeId(0): ["Bar", "Foo", "Func", "Im", "Name", "Ok"]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
enum NumberEnum {
NUM_1 = 1000,
NUM_2 = 2000,
NUM_3 = 3000,
NUM_4 = 4000,
}

enum ComputedEnum {
COMPUTED_1 = `${NumberEnum.NUM_1}-${NumberEnum.NUM_2}`,
COMPUTED_2 = `${NumberEnum.NUM_3}-${NumberEnum.NUM_4}`,
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
var NumberEnum = /* @__PURE__ */ function(NumberEnum) {
NumberEnum[NumberEnum["NUM_1"] = 1000] = "NUM_1";
NumberEnum[NumberEnum["NUM_2"] = 2000] = "NUM_2";
NumberEnum[NumberEnum["NUM_3"] = 3000] = "NUM_3";
NumberEnum[NumberEnum["NUM_4"] = 4000] = "NUM_4";
return NumberEnum;
}(NumberEnum || {});

var ComputedEnum = /* @__PURE__ */ function(ComputedEnum) {
ComputedEnum["COMPUTED_1"] = "1000-2000";
ComputedEnum["COMPUTED_2"] = "3000-4000";
return ComputedEnum;
}(ComputedEnum || {});
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
enum NumberEnum {
A = 1,
B = 2,
}

enum ComputedEnum {
C = `prefix-${NumberEnum.A}-middle-${NumberEnum.B}-suffix`,
D = `${NumberEnum.A}-suffix`,
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var NumberEnum = /* @__PURE__ */ function(NumberEnum) {
NumberEnum[NumberEnum["A"] = 1] = "A";
NumberEnum[NumberEnum["B"] = 2] = "B";
return NumberEnum;
}(NumberEnum || {});

var ComputedEnum = /* @__PURE__ */ function(ComputedEnum) {
ComputedEnum["C"] = "prefix-1-middle-2-suffix";
ComputedEnum["D"] = "1-suffix";
return ComputedEnum;
}(ComputedEnum || {});
Loading