Skip to content

refactor(ast/estree): move start and end fields to last #12012

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
graphite-app merged 1 commit into from
Jul 1, 2025
Merged

refactor(ast/estree): move start and end fields to last #12012

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
2 changes: 1 addition & 1 deletion .github/actions/clone-submodules/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ runs:
show-progress: false
repository: oxc-project/acorn-test262
path: tasks/coverage/acorn-test262
ref: 25df720d20c5299b016dcaa99ce0ca917e2df5b9 # Latest main at 16/6/25
ref: d9ba02ddea22800a285c7ad24e3fbfbb00ccbb02 # Latest main at 1/7/25
34 changes: 17 additions & 17 deletions crates/oxc_ast/src/ast/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use super::{macros::inherit_variants, *};
)]
#[derive(Debug)]
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(field_order(span, body, source_type, hashbang), via = ProgramConverter)]
#[estree(field_order(body, source_type, hashbang, span), via = ProgramConverter)]
pub struct Program<'a> {
pub span: Span,
pub source_type: SourceType,
Expand Down Expand Up @@ -215,7 +215,7 @@ pub use match_expression;
#[estree(
rename = "Identifier",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, name, optional, typeAnnotation),
field_order(decorators, name, optional, typeAnnotation, span),
)]
pub struct IdentifierName<'a> {
pub span: Span,
Expand All @@ -234,7 +234,7 @@ pub struct IdentifierName<'a> {
#[estree(
rename = "Identifier",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, name, optional, typeAnnotation),
field_order(decorators, name, optional, typeAnnotation, span),
)]
pub struct IdentifierReference<'a> {
pub span: Span,
Expand Down Expand Up @@ -263,7 +263,7 @@ pub struct IdentifierReference<'a> {
#[estree(
rename = "Identifier",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, name, optional, typeAnnotation),
field_order(decorators, name, optional, typeAnnotation, span),
)]
pub struct BindingIdentifier<'a> {
pub span: Span,
Expand All @@ -290,7 +290,7 @@ pub struct BindingIdentifier<'a> {
#[estree(
rename = "Identifier",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, name, optional, typeAnnotation),
field_order(decorators, name, optional, typeAnnotation, span),
)]
pub struct LabelIdentifier<'a> {
pub span: Span,
Expand Down Expand Up @@ -708,7 +708,7 @@ pub struct BinaryExpression<'a> {
#[ast(visit)]
#[derive(Debug)]
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(rename = "BinaryExpression", add_fields(operator = In), field_order(span, left, operator, right))]
#[estree(rename = "BinaryExpression", add_fields(operator = In), field_order(left, operator, right, span))]
pub struct PrivateInExpression<'a> {
pub span: Span,
pub left: PrivateIdentifier<'a>,
Expand Down Expand Up @@ -855,7 +855,7 @@ pub use match_assignment_target_pattern;
#[estree(
rename = "ArrayPattern",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, elements, optional, typeAnnotation),
field_order(decorators, elements, optional, typeAnnotation, span),
)]
pub struct ArrayAssignmentTarget<'a> {
pub span: Span,
Expand All @@ -873,7 +873,7 @@ pub struct ArrayAssignmentTarget<'a> {
#[estree(
rename = "ObjectPattern",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, properties, optional, typeAnnotation),
field_order(decorators, properties, optional, typeAnnotation, span),
)]
pub struct ObjectAssignmentTarget<'a> {
pub span: Span,
Expand All @@ -891,7 +891,7 @@ pub struct ObjectAssignmentTarget<'a> {
#[estree(
rename = "RestElement",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull, value = TsNull),
field_order(span, decorators, target, optional, typeAnnotation, value),
field_order(decorators, target, optional, typeAnnotation, value, span),
)]
pub struct AssignmentTargetRest<'a> {
pub span: Span,
Expand Down Expand Up @@ -921,7 +921,7 @@ pub enum AssignmentTargetMaybeDefault<'a> {
#[estree(
rename = "AssignmentPattern",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, binding, init, optional, typeAnnotation),
field_order(decorators, binding, init, optional, typeAnnotation, span),
)]
pub struct AssignmentTargetWithDefault<'a> {
pub span: Span,
Expand Down Expand Up @@ -949,7 +949,7 @@ pub enum AssignmentTargetProperty<'a> {
#[estree(
rename = "Property",
add_fields(kind = Init, method = False, shorthand = True, computed = False, optional = TsFalse),
field_order(span, kind, binding, init, method, shorthand, computed, optional),
field_order(kind, binding, init, method, shorthand, computed, optional, span),
)]
pub struct AssignmentTargetPropertyIdentifier<'a> {
pub span: Span,
Expand All @@ -968,7 +968,7 @@ pub struct AssignmentTargetPropertyIdentifier<'a> {
#[estree(
rename = "Property",
add_fields(kind = Init, method = False, shorthand = False, optional = TsFalse),
field_order(span, kind, name, binding, method, shorthand, computed, optional),
field_order(kind, name, binding, method, shorthand, computed, optional, span),
)]
pub struct AssignmentTargetPropertyProperty<'a> {
pub span: Span,
Expand Down Expand Up @@ -1603,7 +1603,7 @@ pub enum BindingPatternKind<'a> {
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, left, right, optional, typeAnnotation),
field_order(decorators, left, right, optional, typeAnnotation, span),
)]
pub struct AssignmentPattern<'a> {
pub span: Span,
Expand All @@ -1619,7 +1619,7 @@ pub struct AssignmentPattern<'a> {
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, properties, optional, typeAnnotation),
field_order(decorators, properties, optional, typeAnnotation, span),
)]
pub struct ObjectPattern<'a> {
pub span: Span,
Expand All @@ -1634,7 +1634,7 @@ pub struct ObjectPattern<'a> {
#[estree(
rename = "Property",
add_fields(kind = Init, method = False, optional = TsFalse),
field_order(span, kind, key, value, method, shorthand, computed, optional),
field_order(kind, key, value, method, shorthand, computed, optional, span),
)]
pub struct BindingProperty<'a> {
pub span: Span,
Expand All @@ -1652,7 +1652,7 @@ pub struct BindingProperty<'a> {
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull),
field_order(span, decorators, elements, optional, typeAnnotation),
field_order(decorators, elements, optional, typeAnnotation, span),
)]
pub struct ArrayPattern<'a> {
pub span: Span,
Expand All @@ -1676,7 +1676,7 @@ pub struct ArrayPattern<'a> {
#[estree(
rename = "RestElement",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull, value = TsNull),
field_order(span, decorators, argument, optional, typeAnnotation, value),
field_order(decorators, argument, optional, typeAnnotation, value, span),
)]
pub struct BindingRestElement<'a> {
pub span: Span,
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_ast/src/ast/literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ pub struct StringLiteral<'a> {
#[estree(
rename = "Literal",
add_fields(bigint = BigIntLiteralBigint),
field_order(span, value, raw, bigint),
field_order(value, raw, bigint, span),
)]
pub struct BigIntLiteral<'a> {
/// Node location in source code
Expand All @@ -130,7 +130,7 @@ pub struct BigIntLiteral<'a> {
#[estree(
rename = "Literal",
add_fields(value = RegExpLiteralValue),
field_order(span, value, raw, regex),
field_order(value, raw, regex, span),
)]
pub struct RegExpLiteral<'a> {
/// Node location in source code
Expand Down
6 changes: 3 additions & 3 deletions crates/oxc_ast/src/ast/ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ use super::{inherit_variants, js::*, literal::*};
#[estree(
rename = "Identifier",
add_fields(name = This, decorators = EmptyArray, optional = False),
field_order(span, decorators, name, optional, type_annotation),
field_order(decorators, name, optional, type_annotation, span),
)]
pub struct TSThisParameter<'a> {
pub span: Span,
Expand Down Expand Up @@ -1084,7 +1084,7 @@ pub struct TSConstructSignatureDeclaration<'a> {
#[estree(
rename = "Identifier",
add_fields(decorators = EmptyArray, optional = False),
field_order(span, decorators, name, optional, type_annotation),
field_order(decorators, name, optional, type_annotation, span),
)]
pub struct TSIndexSignatureName<'a> {
pub span: Span,
Expand Down Expand Up @@ -1438,7 +1438,7 @@ pub struct TSConstructorType<'a> {
#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(
add_fields(key = TSMappedTypeKey, constraint = TSMappedTypeConstraint),
field_order(span, key, constraint, name_type, type_annotation, optional, readonly),
field_order(key, constraint, name_type, type_annotation, optional, readonly, span),
)]
pub struct TSMappedType<'a> {
pub span: Span,
Expand Down
Loading
Loading