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

fix(ast): do not include trailing_comma in JSON AST (#3073)

Browse source 
Don't include `trailing_comma` fields in JSON AST, for compat with
ESTree (#2854).
This commit is contained in:
overlookmotel 2024-04-22 19:04:32 +01:00 committed by GitHub
parent be9cdfcd83
commit 81f90fd8b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/oxc_ast/src/ast/js.rs
View file

@ -429,6 +429,7 @@ pub struct ArrayExpression<'a> {
pub elements: Vec<'a, ArrayExpressionElement<'a>>, pub elements: Vec<'a, ArrayExpressionElement<'a>>,
/// Array trailing comma /// Array trailing comma
/// <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Trailing_commas#arrays> /// <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Trailing_commas#arrays>
#[cfg_attr(feature = "serialize", serde(skip))]
pub trailing_comma: Option<Span>, pub trailing_comma: Option<Span>,
} }
@ -458,11 +459,12 @@ impl<'a> ArrayExpressionElement<'a> {
/// Object Expression /// Object Expression
#[derive(Debug, Hash)] #[derive(Debug, Hash)]
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))] #[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
#[cfg_attr(feature = "serialize", serde(tag = "type", rename_all = "camelCase"))] #[cfg_attr(feature = "serialize", serde(tag = "type"))]
pub struct ObjectExpression<'a> { pub struct ObjectExpression<'a> {
#[cfg_attr(feature = "serialize", serde(flatten))] #[cfg_attr(feature = "serialize", serde(flatten))]
pub span: Span, pub span: Span,
pub properties: Vec<'a, ObjectPropertyKind<'a>>, pub properties: Vec<'a, ObjectPropertyKind<'a>>,
#[cfg_attr(feature = "serialize", serde(skip))]
pub trailing_comma: Option<Span>, pub trailing_comma: Option<Span>,
} }
@ -1015,7 +1017,7 @@ pub enum AssignmentTargetPattern<'a> {
// See serializer in serialize.rs // See serializer in serialize.rs
#[derive(Debug, Hash)] #[derive(Debug, Hash)]
#[cfg_attr(feature = "serialize", derive(Tsify))] #[cfg_attr(feature = "serialize", derive(Tsify))]
#[cfg_attr(feature = "serialize", serde(tag = "type", rename_all = "camelCase"))] #[cfg_attr(feature = "serialize", serde(tag = "type"))]
pub struct ArrayAssignmentTarget<'a> { pub struct ArrayAssignmentTarget<'a> {
#[cfg_attr(feature = "serialize", serde(flatten))] #[cfg_attr(feature = "serialize", serde(flatten))]
pub span: Span, pub span: Span,
@ -1026,6 +1028,7 @@ pub struct ArrayAssignmentTarget<'a> {
pub elements: Vec<'a, Option<AssignmentTargetMaybeDefault<'a>>>, pub elements: Vec<'a, Option<AssignmentTargetMaybeDefault<'a>>>,
#[cfg_attr(feature = "serialize", serde(skip))] #[cfg_attr(feature = "serialize", serde(skip))]
pub rest: Option<AssignmentTargetRest<'a>>, pub rest: Option<AssignmentTargetRest<'a>>,
#[cfg_attr(feature = "serialize", serde(skip))]
pub trailing_comma: Option<Span>, pub trailing_comma: Option<Span>,
} }

2
crates/oxc_ast/src/serialize.rs
View file

@ -64,7 +64,6 @@ impl<'a> Serialize for ArrayAssignmentTarget<'a> {
let converted = SerArrayAssignmentTarget { let converted = SerArrayAssignmentTarget {
span: self.span, span: self.span,
elements: ElementsAndRest::new(&self.elements, &self.rest), elements: ElementsAndRest::new(&self.elements, &self.rest),
trailing_comma: self.trailing_comma,
}; };
converted.serialize(serializer) converted.serialize(serializer)
} }
@ -77,7 +76,6 @@ struct SerArrayAssignmentTarget<'a, 'b> {
span: Span, span: Span,
elements: elements:
ElementsAndRest<'a, 'b, Option<AssignmentTargetMaybeDefault<'a>>, AssignmentTargetRest<'a>>, ElementsAndRest<'a, 'b, Option<AssignmentTargetMaybeDefault<'a>>, AssignmentTargetRest<'a>>,
trailing_comma: Option<Span>,
} }
impl<'a> Serialize for ObjectAssignmentTarget<'a> { impl<'a> Serialize for ObjectAssignmentTarget<'a> {