Skip to content

Commit 6fcd342

Browse files
fix(ast/estree): Fix FormalParameter (#9954)
Align our AST's ESTree output with that of TS-ESLint's for the `FormalParameter` node. Relates to #9705 Skips the estree serialization of `accessibility` `readonly` and `overrides` fields.
1 parent 5ff50e6 commit 6fcd342

File tree

5 files changed

+4
-477
lines changed

5 files changed

+4
-477
lines changed

crates/oxc_ast/src/ast/js.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,10 +1775,13 @@ pub struct FormalParameter<'a> {
17751775
#[estree(flatten)]
17761776
pub pattern: BindingPattern<'a>,
17771777
#[ts]
1778+
#[estree(skip)]
17781779
pub accessibility: Option<TSAccessibility>,
17791780
#[ts]
1781+
#[estree(skip)]
17801782
pub readonly: bool,
17811783
#[ts]
1784+
#[estree(skip)]
17821785
pub r#override: bool,
17831786
}
17841787

crates/oxc_ast/src/generated/derive_estree.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,9 +1382,6 @@ impl ESTree for FormalParameter<'_> {
13821382
state.serialize_ts_field("typeAnnotation", &self.pattern.type_annotation);
13831383
state.serialize_ts_field("optional", &self.pattern.optional);
13841384
state.serialize_ts_field("decorators", &self.decorators);
1385-
state.serialize_ts_field("accessibility", &self.accessibility);
1386-
state.serialize_ts_field("readonly", &self.readonly);
1387-
state.serialize_ts_field("override", &self.r#override);
13881385
state.end();
13891386
}
13901387
}

napi/parser/deserialize-ts.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -814,9 +814,6 @@ function deserializeFormalParameter(pos) {
814814
typeAnnotation: deserializeOptionBoxTSTypeAnnotation(pos + 56),
815815
optional: deserializeBool(pos + 64),
816816
decorators: deserializeVecDecorator(pos + 8),
817-
accessibility: deserializeOptionTSAccessibility(pos + 72),
818-
readonly: deserializeBool(pos + 73),
819-
override: deserializeBool(pos + 74),
820817
};
821818
}
822819

npm/oxc-types/types.d.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,6 @@ export interface FormalParameterRest extends Span {
574574
export type FormalParameter =
575575
& ({
576576
decorators?: Array<Decorator>;
577-
accessibility?: TSAccessibility | null;
578-
readonly?: boolean;
579-
override?: boolean;
580577
})
581578
& BindingPattern;
582579

0 commit comments

Comments
 (0)