Skip to content

Commit 6664f15

Browse files
hi-ogawaoverlookmotel
authored andcommitted
fix(ast): fix ArrayAssignmentTarget
1 parent d7802a7 commit 6664f15

File tree

4 files changed

+13
-363
lines changed

4 files changed

+13
-363
lines changed

crates/oxc_ast/src/ast/js.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@ pub use match_assignment_target_pattern;
805805
#[ast(visit)]
806806
#[derive(Debug)]
807807
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
808+
#[estree(rename = "ArrayPattern")]
808809
pub struct ArrayAssignmentTarget<'a> {
809810
pub span: Span,
810811
pub elements: Vec<'a, Option<AssignmentTargetMaybeDefault<'a>>>,
@@ -859,9 +860,12 @@ pub enum AssignmentTargetMaybeDefault<'a> {
859860
#[ast(visit)]
860861
#[derive(Debug)]
861862
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
863+
#[estree(rename = "AssignmentPattern")]
862864
pub struct AssignmentTargetWithDefault<'a> {
863865
pub span: Span,
866+
#[estree(rename = "left")]
864867
pub binding: AssignmentTarget<'a>,
868+
#[estree(rename = "right")]
865869
pub init: Expression<'a>,
866870
}
867871

crates/oxc_ast/src/generated/derive_estree.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ impl Serialize for AssignmentTargetPattern<'_> {
625625
impl Serialize for ArrayAssignmentTarget<'_> {
626626
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
627627
let mut map = serializer.serialize_map(None)?;
628-
map.serialize_entry("type", "ArrayAssignmentTarget")?;
628+
map.serialize_entry("type", "ArrayPattern")?;
629629
map.serialize_entry("start", &self.span.start)?;
630630
map.serialize_entry("end", &self.span.end)?;
631631
map.serialize_entry("elements", &AppendTo { array: &self.elements, after: &self.rest })?;
@@ -684,11 +684,11 @@ impl Serialize for AssignmentTargetMaybeDefault<'_> {
684684
impl Serialize for AssignmentTargetWithDefault<'_> {
685685
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
686686
let mut map = serializer.serialize_map(None)?;
687-
map.serialize_entry("type", "AssignmentTargetWithDefault")?;
687+
map.serialize_entry("type", "AssignmentPattern")?;
688688
map.serialize_entry("start", &self.span.start)?;
689689
map.serialize_entry("end", &self.span.end)?;
690-
map.serialize_entry("binding", &self.binding)?;
691-
map.serialize_entry("init", &self.init)?;
690+
map.serialize_entry("left", &self.binding)?;
691+
map.serialize_entry("right", &self.init)?;
692692
map.end()
693693
}
694694
}

npm/oxc-types/types.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export type SimpleAssignmentTarget =
243243
export type AssignmentTargetPattern = ArrayAssignmentTarget | ObjectAssignmentTarget;
244244

245245
export interface ArrayAssignmentTarget extends Span {
246-
type: 'ArrayAssignmentTarget';
246+
type: 'ArrayPattern';
247247
elements: Array<AssignmentTargetMaybeDefault | AssignmentTargetRest | null>;
248248
}
249249

@@ -260,9 +260,9 @@ export interface AssignmentTargetRest extends Span {
260260
export type AssignmentTargetMaybeDefault = AssignmentTargetWithDefault | AssignmentTarget;
261261

262262
export interface AssignmentTargetWithDefault extends Span {
263-
type: 'AssignmentTargetWithDefault';
264-
binding: AssignmentTarget;
265-
init: Expression;
263+
type: 'AssignmentPattern';
264+
left: AssignmentTarget;
265+
right: Expression;
266266
}
267267

268268
export type AssignmentTargetProperty = AssignmentTargetPropertyIdentifier | AssignmentTargetPropertyProperty;

0 commit comments

Comments
 (0)