dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(transformer): remove an AstBuilder::copy call from TS enum transform (#4985)

Browse source 
Replace an unsafe `AstBuilder::copy` call with `AstBuilder::move_expression` in TS enum transform.
This commit is contained in:
overlookmotel 2024-08-19 21:09:10 +00:00
parent 1365feb6b1
commit 1467eb306c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/oxc_transformer/src/typescript/enum.rs
View file

@ -31,8 +31,9 @@ impl<'a> TypeScriptEnum<'a> {
self.transform_ts_enum(ts_enum_decl, None, ctx)
}
Statement::ExportNamedDeclaration(decl) => {
if let Some(Declaration::TSEnumDeclaration(ts_enum_decl)) = &decl.declaration {
self.transform_ts_enum(ts_enum_decl, Some(decl.span), ctx)
let span = decl.span;
if let Some(Declaration::TSEnumDeclaration(ts_enum_decl)) = &mut decl.declaration {
self.transform_ts_enum(ts_enum_decl, Some(span), ctx)
} else {
None
}
@ -60,7 +61,7 @@ impl<'a> TypeScriptEnum<'a> {
/// ```
fn transform_ts_enum(
&mut self,
decl: &TSEnumDeclaration<'a>,
decl: &mut TSEnumDeclaration<'a>,
export_span: Option<Span>,
ctx: &mut TraverseCtx<'a>,
) -> Option<Statement<'a>> {
@ -104,7 +105,7 @@ impl<'a> TypeScriptEnum<'a> {
// Foo[Foo["X"] = 0] = "X";
let is_already_declared = self.enums.contains_key(&enum_name);
let statements = self.transform_ts_enum_members(&decl.members, &ident, ctx);
let statements = self.transform_ts_enum_members(&mut decl.members, &ident, ctx);
let body = ast.alloc_function_body(decl.span, ast.vec(), statements);
let callee = Expression::FunctionExpression(ctx.alloc(Function {
r#type: FunctionType::FunctionExpression,
@ -192,7 +193,7 @@ impl<'a> TypeScriptEnum<'a> {
#[allow(clippy::needless_pass_by_value)]
fn transform_ts_enum_members(
&mut self,
members: &Vec<'a, TSEnumMember<'a>>,
members: &mut Vec<'a, TSEnumMember<'a>>,
param: &BindingIdentifier<'a>,
ctx: &mut TraverseCtx<'a>,
) -> Vec<'a, Statement<'a>> {
@ -214,7 +215,7 @@ impl<'a> TypeScriptEnum<'a> {
let mut prev_member_name: Option<Atom<'a>> = None;
for member in members {
for member in members.iter_mut() {
let member_name: &Atom<'_> = match &member.id {
TSEnumMemberName::StaticIdentifier(id) => &id.name,
TSEnumMemberName::StaticStringLiteral(str)
@ -230,7 +231,7 @@ impl<'a> TypeScriptEnum<'a> {
}
};
let init = if let Some(initializer) = member.initializer.as_ref() {
let init = if let Some(initializer) = &mut member.initializer {
let constant_value =
self.computed_constant_value(initializer, &previous_enum_members);
@ -238,8 +239,7 @@ impl<'a> TypeScriptEnum<'a> {
let init = match constant_value {
None => {
prev_constant_value = None;
// SAFETY: `ast.copy` is unsound! We need to fix.
let mut new_initializer = unsafe { ast.copy(initializer) };
let mut new_initializer = ast.move_expression(initializer);
// If the initializer is a binding identifier,
// and it is not a binding in the current scope and parent scopes,