Skip to content

fix(estree): Ensure the same key order for AssignmentPattern #10953

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
overlookmotel merged 1 commit into from
May 12, 2025
Merged

fix(estree): Ensure the same key order for AssignmentPattern #10953

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
16 changes: 8 additions & 8 deletions crates/oxc_ast/src/serialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,11 +610,11 @@ impl ESTree for ElisionConverter<'_> {
end: DESER[u32]( POS_OFFSET<BindingRestElement>.span.end ),
argument: DESER[BindingPatternKind]( POS_OFFSET<BindingRestElement>.argument.kind ),
/* IF_TS */
decorators: [],
optional: DESER[bool]( POS_OFFSET<BindingRestElement>.argument.optional ),
typeAnnotation: DESER[Option<Box<TSTypeAnnotation>>](
POS_OFFSET<BindingRestElement>.argument.type_annotation
),
optional: DESER[bool]( POS_OFFSET<BindingRestElement>.argument.optional ),
decorators: [],
value: null,
/* END_IF_TS */
});
Expand Down Expand Up @@ -649,9 +649,9 @@ impl ESTree for FormalParametersRest<'_, '_> {
state.serialize_field("start", &rest.span.start);
state.serialize_field("end", &rest.span.end);
state.serialize_field("argument", &rest.argument.kind);
state.serialize_ts_field("typeAnnotation", &rest.argument.type_annotation);
state.serialize_ts_field("optional", &rest.argument.optional);
state.serialize_ts_field("decorators", &EmptyArray(()));
state.serialize_ts_field("optional", &rest.argument.optional);
state.serialize_ts_field("typeAnnotation", &rest.argument.type_annotation);
state.serialize_ts_field("value", &Null(()));
state.end();
}
Expand Down Expand Up @@ -881,9 +881,9 @@ impl ESTree for ArrowFunctionExpressionBody<'_> {
left: keyCopy,
right: init,
/* IF_TS */
typeAnnotation: null,
optional: false,
decorators: [],
optional: false,
typeAnnotation: null,
/* END_IF_TS */
};
value
Expand All @@ -902,9 +902,9 @@ impl ESTree for AssignmentTargetPropertyIdentifierValue<'_> {
state.serialize_field("end", &self.0.span.end);
state.serialize_field("left", &self.0.binding);
state.serialize_field("right", init);
state.serialize_ts_field("typeAnnotation", &Null(()));
state.serialize_ts_field("optional", &False(()));
state.serialize_ts_field("decorators", &EmptyArray(()));
state.serialize_ts_field("optional", &False(()));
state.serialize_ts_field("typeAnnotation", &Null(()));
state.end();
} else {
self.0.binding.serialize(serializer);
Expand Down
8 changes: 4 additions & 4 deletions napi/parser/generated/deserialize/ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,9 @@ function deserializeAssignmentTargetPropertyIdentifier(pos) {
end: end,
left: keyCopy,
right: init,
typeAnnotation: null,
optional: false,
decorators: [],
optional: false,
typeAnnotation: null,
};
return {
type: 'Property',
Expand Down Expand Up @@ -858,11 +858,11 @@ function deserializeFormalParameters(pos) {
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
argument: deserializeBindingPatternKind(pos + 8),
decorators: [],
optional: deserializeBool(pos + 32),
typeAnnotation: deserializeOptionBoxTSTypeAnnotation(
pos + 24,
),
optional: deserializeBool(pos + 32),
decorators: [],
value: null,
});
}
Expand Down
Loading