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
10 changes: 8 additions & 2 deletions crates/oxc_ast/src/ast/js.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,10 @@ pub use match_expression;
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(rename = "Identifier")]
#[estree(
rename = "Identifier",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull)
)]
pub struct IdentifierName<'a> {
pub span: Span,
#[estree(json_safe)]
Expand All @@ -224,7 +227,10 @@ pub struct IdentifierName<'a> {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(rename = "Identifier")]
#[estree(
rename = "Identifier",
add_fields(decorators = TsEmptyArray, optional = TsFalse, typeAnnotation = TsNull)
)]
pub struct IdentifierReference<'a> {
pub span: Span,
/// The name of the identifier being referenced.
Expand Down
6 changes: 6 additions & 0 deletions crates/oxc_ast/src/generated/derive_estree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ impl ESTree for IdentifierName<'_> {
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("name", &JsonSafeString(self.name.as_str()));
state.serialize_ts_field("decorators", &crate::serialize::TsEmptyArray(self));
state.serialize_ts_field("optional", &crate::serialize::TsFalse(self));
state.serialize_ts_field("typeAnnotation", &crate::serialize::TsNull(self));
state.end();
}
}
Expand All @@ -98,6 +101,9 @@ impl ESTree for IdentifierReference<'_> {
state.serialize_field("start", &self.span.start);
state.serialize_field("end", &self.span.end);
state.serialize_field("name", &JsonSafeString(self.name.as_str()));
state.serialize_ts_field("decorators", &crate::serialize::TsEmptyArray(self));
state.serialize_ts_field("optional", &crate::serialize::TsFalse(self));
state.serialize_ts_field("typeAnnotation", &crate::serialize::TsNull(self));
state.end();
}
}
Expand Down
36 changes: 36 additions & 0 deletions crates/oxc_ast/src/serialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,17 @@ impl<T> ESTree for Null<'_, T> {
}
}

#[ast_meta]
#[estree(ts_type = "null", raw_deser = "null")]
#[ts]
pub struct TsNull<'b, T>(#[expect(dead_code)] pub &'b T);

impl<T> ESTree for TsNull<'_, T> {
fn serialize<S: Serializer>(&self, serializer: S) {
().serialize(serializer);
}
}

/// Serialized as `true`.
#[ast_meta]
#[estree(ts_type = "true", raw_deser = "true")]
Expand All @@ -106,6 +117,17 @@ impl<T> ESTree for False<'_, T> {
}
}

#[ast_meta]
#[estree(ts_type = "false", raw_deser = "false")]
#[ts]
pub struct TsFalse<'b, T>(#[expect(dead_code)] pub &'b T);

impl<T> ESTree for TsFalse<'_, T> {
fn serialize<S: Serializer>(&self, serializer: S) {
false.serialize(serializer);
}
}

/// Serialized as `"in"`.
#[ast_meta]
#[estree(ts_type = "'in'", raw_deser = "'in'")]
Expand All @@ -128,6 +150,17 @@ impl<T> ESTree for Init<'_, T> {
}
}

#[ast_meta]
#[estree(ts_type = "[]", raw_deser = "[]")]
#[ts]
pub struct TsEmptyArray<'b, T>(#[expect(dead_code)] pub &'b T);

impl<T> ESTree for TsEmptyArray<'_, T> {
fn serialize<S: Serializer>(&self, serializer: S) {
[(); 0].serialize(serializer);
}
}

// --------------------
// Literals
// --------------------
Expand Down Expand Up @@ -538,6 +571,9 @@ impl ESTree for ClassImplements<'_, '_> {
raw_deser = "
const ident = DESER[Box<IdentifierReference>](POS);
ident.type = 'JSXIdentifier';
delete ident.decorators;
delete ident.optional;
delete ident.typeAnnotation;
ident
"
)]
Expand Down
6 changes: 6 additions & 0 deletions napi/parser/deserialize-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -3362,6 +3362,9 @@ function deserializeJSXElementName(pos) {
case 1:
const ident = deserializeBoxIdentifierReference(pos + 8);
ident.type = 'JSXIdentifier';
delete ident.decorators;
delete ident.optional;
delete ident.typeAnnotation;
return ident;
case 2:
return deserializeBoxJSXNamespacedName(pos + 8);
Expand All @@ -3380,6 +3383,9 @@ function deserializeJSXMemberExpressionObject(pos) {
case 0:
const ident = deserializeBoxIdentifierReference(pos + 8);
ident.type = 'JSXIdentifier';
delete ident.decorators;
delete ident.optional;
delete ident.typeAnnotation;
return ident;
case 1:
return deserializeBoxJSXMemberExpression(pos + 8);
Expand Down
12 changes: 12 additions & 0 deletions napi/parser/deserialize-ts.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ function deserializeIdentifierName(pos) {
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
name: deserializeStr(pos + 8),
decorators: [],
optional: false,
typeAnnotation: null,
};
}

Expand All @@ -62,6 +65,9 @@ function deserializeIdentifierReference(pos) {
start: deserializeU32(pos),
end: deserializeU32(pos + 4),
name: deserializeStr(pos + 8),
decorators: [],
optional: false,
typeAnnotation: null,
};
}

Expand Down Expand Up @@ -3417,6 +3423,9 @@ function deserializeJSXElementName(pos) {
case 1:
const ident = deserializeBoxIdentifierReference(pos + 8);
ident.type = 'JSXIdentifier';
delete ident.decorators;
delete ident.optional;
delete ident.typeAnnotation;
return ident;
case 2:
return deserializeBoxJSXNamespacedName(pos + 8);
Expand All @@ -3435,6 +3444,9 @@ function deserializeJSXMemberExpressionObject(pos) {
case 0:
const ident = deserializeBoxIdentifierReference(pos + 8);
ident.type = 'JSXIdentifier';
delete ident.decorators;
delete ident.optional;
delete ident.typeAnnotation;
return ident;
case 1:
return deserializeBoxJSXMemberExpression(pos + 8);
Expand Down
6 changes: 6 additions & 0 deletions npm/oxc-types/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,17 @@ export type Expression =
export interface IdentifierName extends Span {
type: 'Identifier';
name: string;
decorators?: [];
optional?: false;
typeAnnotation?: null;
}

export interface IdentifierReference extends Span {
type: 'Identifier';
name: string;
decorators?: [];
optional?: false;
typeAnnotation?: null;
}

export interface BindingIdentifier extends Span {
Expand Down
Loading
Loading