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
1 change: 1 addition & 0 deletions crates/oxc_ast/src/ast/ts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,7 @@ pub struct TSInterfaceDeclaration<'a> {
pub id: BindingIdentifier<'a>,
/// Other interfaces/types this interface extends.
#[scope(enter_before)]
#[estree(via = TSInterfaceDeclarationExtends)]
pub extends: Option<Vec<'a, TSInterfaceHeritage<'a>>>,
/// Type parameters that get bound to the interface.
pub type_parameters: Option<Box<'a, TSTypeParameterDeclaration<'a>>>,
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 @@ -2841,7 +2841,7 @@ impl ESTree for TSInterfaceDeclaration<'_> {
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("id", &self.id);
state.serialize_field("extends", &self.extends);
state.serialize_field("extends", &crate::serialize::TSInterfaceDeclarationExtends(self));
state.serialize_field("typeParameters", &self.type_parameters);
state.serialize_field("body", &self.body);
state.serialize_field("declare", &self.declare);
Expand Down
23 changes: 23 additions & 0 deletions crates/oxc_ast/src/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,29 @@ impl ESTree for FunctionFormalParameters<'_, '_> {
}
}

/// Serializer for `extends` field of `TSInterfaceDeclaration`.
///
/// Serialize `extends` as an empty array if it's `None`.
#[ast_meta]
#[estree(
ts_type = "Array<TSInterfaceHeritage>",
raw_deser = "
const extendsArr = DESER[Option<Vec<TSInterfaceHeritage>>](POS_OFFSET.extends);
extendsArr === null ? [] : extendsArr
"
)]
pub struct TSInterfaceDeclarationExtends<'a, 'b>(pub &'b TSInterfaceDeclaration<'a>);

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

/// Serializer for `specifiers` field of `ImportDeclaration`.
///
/// Serialize `specifiers` as an empty array if it's `None`.
Expand Down
3 changes: 2 additions & 1 deletion napi/parser/deserialize-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -1610,12 +1610,13 @@ function deserializeTSClassImplements(pos) {
}

function deserializeTSInterfaceDeclaration(pos) {
const extendsArr = deserializeOptionVecTSInterfaceHeritage(pos + 40);
return {
type: 'TSInterfaceDeclaration',
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
id: deserializeBindingIdentifier(pos + 8),
extends: deserializeOptionVecTSInterfaceHeritage(pos + 40),
extends: extendsArr === null ? [] : extendsArr,
typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 72),
body: deserializeBoxTSInterfaceBody(pos + 80),
declare: deserializeBool(pos + 88),
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 @@ -1676,12 +1676,13 @@ function deserializeTSClassImplements(pos) {
}

function deserializeTSInterfaceDeclaration(pos) {
const extendsArr = deserializeOptionVecTSInterfaceHeritage(pos + 40);
return {
type: 'TSInterfaceDeclaration',
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
id: deserializeBindingIdentifier(pos + 8),
extends: deserializeOptionVecTSInterfaceHeritage(pos + 40),
extends: extendsArr === null ? [] : extendsArr,
typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 72),
body: deserializeBoxTSInterfaceBody(pos + 80),
declare: deserializeBool(pos + 88),
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 @@ -1173,7 +1173,7 @@ export interface TSClassImplements extends Span {
export interface TSInterfaceDeclaration extends Span {
type: 'TSInterfaceDeclaration';
id: BindingIdentifier;
extends: Array<TSInterfaceHeritage> | null;
extends: Array<TSInterfaceHeritage>;
typeParameters: TSTypeParameterDeclaration | null;
body: TSInterfaceBody;
declare: boolean;
Expand Down
Loading