Skip to content

refactor(ast/estree): remove temp vars for ranges from serializer #12007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

refactor(ast/estree): remove temp vars for ranges from serializer #12007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
537 changes: 179 additions & 358 deletions crates/oxc_ast/src/generated/derive_estree.rs
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 4 additions & 11 deletions crates/oxc_ast/src/serialize/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ struct BindingPatternKindAndTsFields<'a, 'b> {

impl ESTree for BindingPatternKindAndTsFields<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();

let mut state = serializer.serialize_struct();

let span = match &self.kind {
Expand Down Expand Up @@ -97,7 +95,7 @@ impl ESTree for BindingPatternKindAndTsFields<'_, '_> {
state.serialize_field("optional", &self.optional);
state.serialize_field("typeAnnotation", &self.type_annotation);

if ranges {
if state.ranges() {
state.serialize_field("range", &[span.start, span.end]);
}

Expand Down Expand Up @@ -175,7 +173,6 @@ struct FormalParametersRest<'a, 'b>(&'b BindingRestElement<'a>);
impl ESTree for FormalParametersRest<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let rest = self.0;
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("RestElement"));
state.serialize_field("start", &rest.span.start);
Expand All @@ -185,7 +182,7 @@ impl ESTree for FormalParametersRest<'_, '_> {
state.serialize_ts_field("optional", &rest.argument.optional);
state.serialize_ts_field("typeAnnotation", &rest.argument.type_annotation);
state.serialize_ts_field("value", &Null(()));
if ranges {
if state.ranges() {
state.serialize_field("range", &[rest.span.start, rest.span.end]);
}
state.end();
Expand Down Expand Up @@ -237,8 +234,6 @@ impl ESTree for FormalParameterConverter<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let param = self.0;

let ranges = serializer.ranges();

if S::INCLUDE_TS_FIELDS {
if param.has_modifier() {
let mut state = serializer.serialize_struct();
Expand All @@ -251,7 +246,7 @@ impl ESTree for FormalParameterConverter<'_, '_> {
state.serialize_field("parameter", &param.pattern);
state.serialize_field("readonly", &param.readonly);
state.serialize_field("static", &false);
if ranges {
if state.ranges() {
state.serialize_field("range", &[param.span.start, param.span.end]);
}
state.end();
Expand Down Expand Up @@ -456,8 +451,6 @@ pub struct AssignmentTargetPropertyIdentifierInit<'a>(
impl ESTree for AssignmentTargetPropertyIdentifierInit<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
if let Some(init) = &self.0.init {
let ranges = serializer.ranges();

let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("AssignmentPattern"));
state.serialize_field("start", &self.0.span.start);
Expand All @@ -467,7 +460,7 @@ impl ESTree for AssignmentTargetPropertyIdentifierInit<'_> {
state.serialize_field("right", init);
state.serialize_ts_field("optional", &false);
state.serialize_ts_field("typeAnnotation", &Null(()));
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.0.span.start, self.0.span.end]);
}
state.end();
Expand Down
4 changes: 1 addition & 3 deletions crates/oxc_ast/src/serialize/jsx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ impl ESTree for JSXElementOpeningElement<'_, '_> {
let element = self.0;
let opening_element = element.opening_element.as_ref();

let ranges = serializer.ranges();

let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("JSXOpeningElement"));
state.serialize_field("start", &opening_element.span.start);
Expand All @@ -32,7 +30,7 @@ impl ESTree for JSXElementOpeningElement<'_, '_> {
state.serialize_ts_field("typeArguments", &opening_element.type_arguments);
state.serialize_field("attributes", &opening_element.attributes);
state.serialize_field("selfClosing", &element.closing_element.is_none());
if ranges {
if state.ranges() {
state.serialize_field("range", &[opening_element.span.start, opening_element.span.end]);
}
state.end();
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_ast/src/serialize/literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ pub struct TemplateElementConverter<'a, 'b>(pub &'b TemplateElement<'a>);
impl ESTree for TemplateElementConverter<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let element = self.0;
let ranges = serializer.ranges();

let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("TemplateElement"));

Expand All @@ -224,7 +224,7 @@ impl ESTree for TemplateElementConverter<'_, '_> {
state.serialize_field("value", &TemplateElementValue(element));
state.serialize_field("tail", &element.tail);

if ranges {
if state.ranges() {
state.serialize_field("range", &[span.start, span.end]);
}

Expand Down
3 changes: 1 addition & 2 deletions crates/oxc_ast/src/serialize/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,14 @@ impl ESTree for ProgramConverter<'_, '_> {
let span_start =
if S::INCLUDE_TS_FIELDS { get_ts_start_span(program) } else { program.span.start };

let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("Program"));
state.serialize_field("start", &span_start);
state.serialize_field("end", &program.span.end);
state.serialize_field("body", &Concat2(&program.directives, &program.body));
state.serialize_field("sourceType", &program.source_type.module_kind());
state.serialize_field("hashbang", &program.hashbang);
if ranges {
if state.ranges() {
state.serialize_field("range", &[span_start, program.span.end]);
}
state.end();
Expand Down
12 changes: 3 additions & 9 deletions crates/oxc_ast/src/serialize/ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ impl ESTree for TSModuleDeclarationConverter<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let module = self.0;

let ranges = serializer.ranges();

let mut state = serializer.serialize_struct();
state.serialize_field("type", &JsonSafeString("TSModuleDeclaration"));
state.serialize_field("start", &module.span.start);
Expand Down Expand Up @@ -160,7 +158,7 @@ impl ESTree for TSModuleDeclarationConverter<'_, '_> {
state.serialize_field("declare", &module.declare);
state.serialize_field("global", &TSModuleDeclarationGlobal(module));

if ranges {
if state.ranges() {
state.serialize_field("range", &[module.span.start, module.span.end]);
}

Expand All @@ -172,8 +170,6 @@ struct TSModuleDeclarationIdParts<'a, 'b>(&'b [&'b BindingIdentifier<'a>]);

impl ESTree for TSModuleDeclarationIdParts<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();

let parts = self.0;
assert!(!parts.is_empty());

Expand All @@ -195,7 +191,7 @@ impl ESTree for TSModuleDeclarationIdParts<'_, '_> {

state.serialize_field("right", last);

if ranges {
if state.ranges() {
state.serialize_field("range", &[span_start, last.span.end]);
}

Expand Down Expand Up @@ -353,8 +349,6 @@ impl ESTree for TSTypeNameAsMemberExpression<'_, '_> {
TSTypeNameIdentifierReference(ident).serialize(serializer);
}
TSTypeName::QualifiedName(name) => {
let ranges = serializer.ranges();

// Convert to `TSQualifiedName` to `MemberExpression`.
// Recursively convert `left` to `MemberExpression` too if it's a `TSQualifiedName`.
let mut state = serializer.serialize_struct();
Expand All @@ -365,7 +359,7 @@ impl ESTree for TSTypeNameAsMemberExpression<'_, '_> {
state.serialize_field("property", &name.right);
state.serialize_field("optional", &false);
state.serialize_field("computed", &false);
if ranges {
if state.ranges() {
state.serialize_field("range", &[name.span.start, name.span.end]);
}
state.end();
Expand Down
9 changes: 3 additions & 6 deletions crates/oxc_syntax/src/generated/derive_estree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ use crate::operator::*;

impl ESTree for NameSpan<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("value", &self.name);
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
state.end();
Expand Down Expand Up @@ -50,7 +49,6 @@ impl ESTree for ImportImportName<'_> {

impl ESTree for ExportEntry<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
Expand All @@ -59,7 +57,7 @@ impl ESTree for ExportEntry<'_> {
state.serialize_field("exportName", &self.export_name);
state.serialize_field("localName", &self.local_name);
state.serialize_field("isType", &self.is_type);
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
state.end();
Expand Down Expand Up @@ -103,12 +101,11 @@ impl ESTree for ExportLocalName<'_> {

impl ESTree for DynamicImport {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("moduleRequest", &self.module_request);
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
state.end();
Expand Down
9 changes: 3 additions & 6 deletions napi/parser/src/generated/derive_estree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@ impl ESTree for ErrorSeverity {

impl ESTree for ErrorLabel<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("message", &self.message);
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
state.end();
Expand All @@ -70,13 +69,12 @@ impl ESTree for EcmaScriptModule<'_> {

impl ESTree for StaticImport<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("moduleRequest", &self.module_request);
state.serialize_field("entries", &self.entries);
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
state.end();
Expand All @@ -85,12 +83,11 @@ impl ESTree for StaticImport<'_> {

impl ESTree for StaticExport<'_> {
fn serialize<S: Serializer>(&self, serializer: S) {
let ranges = serializer.ranges();
let mut state = serializer.serialize_struct();
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("entries", &self.entries);
if ranges {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
state.end();
Expand Down
18 changes: 7 additions & 11 deletions tasks/ast_tools/src/derives/estree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,22 +377,18 @@ fn generate_body_for_struct(struct_def: &StructDef, schema: &Schema) -> TokenStr

// Check if struct has a span field for range support
let has_span_field = struct_def.fields.iter().any(|field| field.name() == "span");
let (range_declaration, range_field) = if has_span_field {
(
quote!( let ranges = serializer.ranges(); ),
quote! {
if ranges {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
},
)
let range_field = if has_span_field {
quote! {
if state.ranges() {
state.serialize_field("range", &[self.span.start, self.span.end]);
}
}
} else {
(quote!(), quote!())
quote!()
};

let stmts = g.stmts;
quote! {
#range_declaration
let mut state = serializer.serialize_struct();
#type_field
#stmts
Expand Down
Loading