Skip to content

refactor(ast): rename #[estree(type)] attr on types to #[estree(rename)] #8766

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
graphite-app merged 1 commit into from
Jan 28, 2025
Merged

refactor(ast): rename #[estree(type)] attr on types to #[estree(rename)] #8766

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
12 changes: 6 additions & 6 deletions crates/oxc_ast/src/ast/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ pub use match_expression;
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Identifier")]
#[estree(rename = "Identifier")]
pub struct IdentifierName<'a> {
pub span: Span,
pub name: Atom<'a>,
Expand All @@ -216,7 +216,7 @@ pub struct IdentifierName<'a> {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Identifier")]
#[estree(rename = "Identifier")]
pub struct IdentifierReference<'a> {
pub span: Span,
/// The name of the identifier being referenced.
Expand All @@ -239,7 +239,7 @@ pub struct IdentifierReference<'a> {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Identifier")]
#[estree(rename = "Identifier")]
pub struct BindingIdentifier<'a> {
pub span: Span,
/// The identifier name being bound.
Expand All @@ -263,7 +263,7 @@ pub struct BindingIdentifier<'a> {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Identifier")]
#[estree(rename = "Identifier")]
pub struct LabelIdentifier<'a> {
pub span: Span,
pub name: Atom<'a>,
Expand Down Expand Up @@ -832,7 +832,7 @@ pub struct ObjectAssignmentTarget<'a> {
#[ast(visit)]
#[derive(Debug)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "RestElement")]
#[estree(rename = "RestElement")]
pub struct AssignmentTargetRest<'a> {
pub span: Span,
#[estree(rename = "argument")]
Expand Down Expand Up @@ -1520,7 +1520,7 @@ pub struct ArrayPattern<'a> {
#[ast(visit)]
#[derive(Debug)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "RestElement")]
#[estree(rename = "RestElement")]
pub struct BindingRestElement<'a> {
pub span: Span,
pub argument: BindingPattern<'a>,
Expand Down
12 changes: 6 additions & 6 deletions crates/oxc_ast/src/ast/literal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use oxc_syntax::number::{BigintBase, NumberBase};
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Literal", via = crate::serialize::ESTreeLiteral, add_ts = "raw: string | null")]
#[estree(rename = "Literal", via = crate::serialize::ESTreeLiteral, add_ts = "raw: string | null")]
pub struct BooleanLiteral {
/// Node location in source code
pub span: Span,
Expand All @@ -34,7 +34,7 @@ pub struct BooleanLiteral {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Literal", via = crate::serialize::ESTreeLiteral, add_ts = "value: null, raw: \"null\" | null")]
#[estree(rename = "Literal", via = crate::serialize::ESTreeLiteral, add_ts = "value: null, raw: \"null\" | null")]
pub struct NullLiteral {
/// Node location in source code
pub span: Span,
Expand All @@ -46,7 +46,7 @@ pub struct NullLiteral {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ESTree)]
#[estree(type = "Literal", via = crate::serialize::ESTreeLiteral)]
#[estree(rename = "Literal", via = crate::serialize::ESTreeLiteral)]
pub struct NumericLiteral<'a> {
/// Node location in source code
pub span: Span,
Expand All @@ -67,7 +67,7 @@ pub struct NumericLiteral<'a> {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ESTree)]
#[estree(type = "Literal", via = crate::serialize::ESTreeLiteral)]
#[estree(rename = "Literal", via = crate::serialize::ESTreeLiteral)]
pub struct StringLiteral<'a> {
/// Node location in source code
pub span: Span,
Expand All @@ -86,7 +86,7 @@ pub struct StringLiteral<'a> {
#[ast(visit)]
#[derive(Debug, Clone)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ESTree)]
#[estree(type = "Literal", via = crate::serialize::ESTreeLiteral, add_ts = "value: null, bigint: string")]
#[estree(rename = "Literal", via = crate::serialize::ESTreeLiteral, add_ts = "value: null, bigint: string")]
pub struct BigIntLiteral<'a> {
/// Node location in source code
pub span: Span,
Expand All @@ -105,7 +105,7 @@ pub struct BigIntLiteral<'a> {
#[derive(Debug)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ESTree)]
#[estree(
type = "Literal",
rename = "Literal",
via = crate::serialize::ESTreeLiteral,
add_ts = "value: {} | null, regex: { pattern: string, flags: string }"
)]
Expand Down
2 changes: 1 addition & 1 deletion crates/oxc_ast/src/ast/ts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ pub struct TSConstructSignatureDeclaration<'a> {
#[ast(visit)]
#[derive(Debug)]
#[generate_derive(CloneIn, GetSpan, GetSpanMut, ContentEq, ESTree)]
#[estree(type = "Identifier")]
#[estree(rename = "Identifier")]
pub struct TSIndexSignatureName<'a> {
pub span: Span,
pub name: Atom<'a>,
Expand Down
10 changes: 2 additions & 8 deletions tasks/ast_tools/src/markers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,7 @@ impl Parse for ESTreeStructAttribute {
let mut add_ts = None;

loop {
let is_type = input.peek(Token![type]);
let ident = if is_type {
input.parse::<Token![type]>()?;
"type".to_string()
} else {
input.call(Ident::parse_any).unwrap().to_string()
};
let ident = input.call(Ident::parse_any).unwrap().to_string();
match ident.as_str() {
"always_flatten" => {
if always_flatten {
Expand All @@ -146,7 +140,7 @@ impl Parse for ESTreeStructAttribute {
"Duplicate tag mode in #[estree(...)]"
);
}
"type" => {
"rename" => {
input.parse::<Token![=]>()?;
let value = input.parse::<LitStr>()?.value();
assert!(
Expand Down
Loading