Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
fix(ast/extree): fix Class.implements (#9817)
No effect on conformance yet since basic `Identifier` mismatches.
  • Loading branch information
hi-ogawa committed Mar 18, 2025
commit cd18358420879da1e23a625b92779510d5e51598
1 change: 1 addition & 0 deletions crates/oxc_ast/src/ast/js.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1899,6 +1899,7 @@ pub struct Class<'a> {
/// // ^^^
/// ```
#[ts]
#[estree(via = ClassImplements)]
pub implements: Option<Vec<'a, TSClassImplements<'a>>>,
pub body: Box<'a, ClassBody<'a>>,
/// Whether the class is abstract
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_ast/src/generated/derive_estree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,7 @@ impl ESTree for Class<'_> {
state.serialize_ts_field("decorators", &self.decorators);
state.serialize_ts_field("typeParameters", &self.type_parameters);
state.serialize_ts_field("superTypeArguments", &self.super_type_arguments);
state.serialize_ts_field("implements", &self.implements);
state.serialize_ts_field("implements", &crate::serialize::ClassImplements(self));
state.serialize_ts_field("abstract", &self.r#abstract);
state.serialize_ts_field("declare", &self.declare);
state.end();
Expand Down
20 changes: 20 additions & 0 deletions crates/oxc_ast/src/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,26 @@ impl ESTree for ExportAllDeclarationWithClause<'_, '_> {
}
}

#[ast_meta]
#[estree(
ts_type = "Array<TSClassImplements>",
raw_deser = "
const classImplements = DESER[Option<Vec<TSClassImplements>>](POS_OFFSET.implements);
classImplements === null ? [] : classImplements
"
)]
pub struct ClassImplements<'a, 'b>(pub &'b Class<'a>);

impl ESTree for ClassImplements<'_, '_> {
fn serialize<S: Serializer>(&self, serializer: S) {
if let Some(implements) = &self.0.implements {
implements.serialize(serializer);
} else {
[(); 0].serialize(serializer);
}
}
}

// --------------------
// JSX
// --------------------
Expand Down
3 changes: 2 additions & 1 deletion napi/parser/deserialize-ts.js
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ function deserializeYieldExpression(pos) {
}

function deserializeClass(pos) {
const classImplements = deserializeOptionVecTSClassImplements(pos + 112);
return {
type: deserializeClassType(pos + 8),
start: deserializeU32(pos),
Expand All @@ -854,7 +855,7 @@ function deserializeClass(pos) {
decorators: deserializeVecDecorator(pos + 16),
typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 80),
superTypeArguments: deserializeOptionBoxTSTypeParameterInstantiation(pos + 104),
implements: deserializeOptionVecTSClassImplements(pos + 112),
implements: classImplements === null ? [] : classImplements,
abstract: deserializeBool(pos + 152),
declare: deserializeBool(pos + 153),
};
Expand Down
2 changes: 1 addition & 1 deletion npm/oxc-types/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ export interface Class extends Span {
decorators: Array<Decorator>;
typeParameters: TSTypeParameterDeclaration | null;
superTypeArguments: TSTypeParameterInstantiation | null;
implements: Array<TSClassImplements> | null;
implements: Array<TSClassImplements>;
abstract: boolean;
declare: boolean;
}
Expand Down
Loading