Skip to content

Commit 5f1c7ec

Browse files
rzvxarzvxa
committed
refactor(ast): rename the visited_node marker to ast. (#4289)
closes #4282 I went with `#[ast(visit)]` but we can change it to 2 separate markers as suggested by @overlookmotel in the issue.
1 parent 7a75e0f commit 5f1c7ec

File tree

13 files changed

+317
-265
lines changed

13 files changed

+317
-265
lines changed

‎crates/oxc_ast/src/ast/js.rs

Lines changed: 118 additions & 118 deletions
Large diffs are not rendered by default.

‎crates/oxc_ast/src/ast/jsx.rs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#![allow(non_snake_case)]
99

1010
use oxc_allocator::{Box, Vec};
11-
use oxc_ast_macros::visited_node;
11+
use oxc_ast_macros::ast;
1212
use oxc_span::{Atom, Span};
1313
#[cfg(feature = "serialize")]
1414
use serde::Serialize;
@@ -20,7 +20,7 @@ use super::{inherit_variants, js::*, literal::*, ts::*};
2020
// 1.2 JSX Elements
2121

2222
/// JSX Element
23-
#[visited_node]
23+
#[ast(visit)]
2424
#[derive(Debug, Hash)]
2525
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
2626
#[cfg_attr(feature = "serialize", serde(tag = "type", rename_all = "camelCase"))]
@@ -33,7 +33,7 @@ pub struct JSXElement<'a> {
3333
}
3434

3535
/// JSX Opening Element
36-
#[visited_node]
36+
#[ast(visit)]
3737
#[derive(Debug, Hash)]
3838
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
3939
#[cfg_attr(feature = "serialize", serde(tag = "type", rename_all = "camelCase"))]
@@ -47,7 +47,7 @@ pub struct JSXOpeningElement<'a> {
4747
}
4848

4949
/// JSX Closing Element
50-
#[visited_node]
50+
#[ast(visit)]
5151
#[derive(Debug, Hash)]
5252
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
5353
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -58,7 +58,7 @@ pub struct JSXClosingElement<'a> {
5858
}
5959

6060
/// JSX Fragment
61-
#[visited_node]
61+
#[ast(visit)]
6262
#[derive(Debug, Hash)]
6363
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
6464
#[cfg_attr(feature = "serialize", serde(tag = "type", rename_all = "camelCase"))]
@@ -87,7 +87,7 @@ pub struct JSXClosingFragment {
8787
}
8888

8989
/// JSX Element Name
90-
#[visited_node]
90+
#[ast(visit)]
9191
#[derive(Debug, Hash)]
9292
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
9393
#[cfg_attr(feature = "serialize", serde(untagged))]
@@ -101,7 +101,7 @@ pub enum JSXElementName<'a> {
101101
}
102102

103103
/// JSX Namespaced Name
104-
#[visited_node]
104+
#[ast(visit)]
105105
#[derive(Debug, Hash)]
106106
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
107107
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -113,7 +113,7 @@ pub struct JSXNamespacedName<'a> {
113113
}
114114

115115
/// JSX Member Expression
116-
#[visited_node]
116+
#[ast(visit)]
117117
#[derive(Debug, Hash)]
118118
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
119119
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -124,7 +124,7 @@ pub struct JSXMemberExpression<'a> {
124124
pub property: JSXIdentifier<'a>,
125125
}
126126

127-
#[visited_node]
127+
#[ast(visit)]
128128
#[derive(Debug, Hash)]
129129
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
130130
#[cfg_attr(feature = "serialize", serde(untagged))]
@@ -133,7 +133,7 @@ pub enum JSXMemberExpressionObject<'a> {
133133
MemberExpression(Box<'a, JSXMemberExpression<'a>>),
134134
}
135135

136-
#[visited_node]
136+
#[ast(visit)]
137137
#[derive(Debug, Hash)]
138138
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
139139
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -149,7 +149,7 @@ inherit_variants! {
149149
/// Inherits variants from [`Expression`]. See [`ast` module docs] for explanation of inheritance.
150150
///
151151
/// [`ast` module docs]: `super`
152-
#[visited_node]
152+
#[ast(visit)]
153153
#[repr(C, u8)]
154154
#[derive(Debug, Hash)]
155155
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
@@ -161,7 +161,7 @@ pub enum JSXExpression<'a> {
161161
}
162162
}
163163

164-
#[visited_node]
164+
#[ast(visit)]
165165
#[derive(Debug, Hash)]
166166
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
167167
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -173,7 +173,7 @@ pub struct JSXEmptyExpression {
173173
// 1.3 JSX Attributes
174174

175175
/// JSX Attributes
176-
#[visited_node]
176+
#[ast(visit)]
177177
#[derive(Debug, Hash)]
178178
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
179179
#[cfg_attr(feature = "serialize", serde(untagged))]
@@ -183,7 +183,7 @@ pub enum JSXAttributeItem<'a> {
183183
}
184184

185185
/// JSX Attribute
186-
#[visited_node]
186+
#[ast(visit)]
187187
#[derive(Debug, Hash)]
188188
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
189189
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -195,7 +195,7 @@ pub struct JSXAttribute<'a> {
195195
}
196196

197197
/// JSX Spread Attribute
198-
#[visited_node]
198+
#[ast(visit)]
199199
#[derive(Debug, Hash)]
200200
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
201201
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -206,7 +206,7 @@ pub struct JSXSpreadAttribute<'a> {
206206
}
207207

208208
/// JSX Attribute Name
209-
#[visited_node]
209+
#[ast(visit)]
210210
#[derive(Debug, Hash)]
211211
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
212212
#[cfg_attr(feature = "serialize", serde(untagged))]
@@ -216,7 +216,7 @@ pub enum JSXAttributeName<'a> {
216216
}
217217

218218
/// JSX Attribute Value
219-
#[visited_node]
219+
#[ast(visit)]
220220
#[derive(Debug, Hash)]
221221
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
222222
#[cfg_attr(feature = "serialize", serde(untagged))]
@@ -227,7 +227,7 @@ pub enum JSXAttributeValue<'a> {
227227
Fragment(Box<'a, JSXFragment<'a>>),
228228
}
229229

230-
#[visited_node]
230+
#[ast(visit)]
231231
#[derive(Debug, Hash)]
232232
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
233233
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -240,7 +240,7 @@ pub struct JSXIdentifier<'a> {
240240
// 1.4 JSX Children
241241

242242
/// JSX Child
243-
#[visited_node]
243+
#[ast(visit)]
244244
#[derive(Debug, Hash)]
245245
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
246246
#[cfg_attr(feature = "serialize", serde(untagged))]
@@ -252,7 +252,7 @@ pub enum JSXChild<'a> {
252252
Spread(Box<'a, JSXSpreadChild<'a>>),
253253
}
254254

255-
#[visited_node]
255+
#[ast(visit)]
256256
#[derive(Debug, Hash)]
257257
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
258258
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -262,7 +262,7 @@ pub struct JSXSpreadChild<'a> {
262262
pub expression: Expression<'a>,
263263
}
264264

265-
#[visited_node]
265+
#[ast(visit)]
266266
#[derive(Debug, Hash)]
267267
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
268268
#[cfg_attr(feature = "serialize", serde(tag = "type"))]

‎crates/oxc_ast/src/ast/literal.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
use std::hash::Hash;
1111

1212
use bitflags::bitflags;
13-
use oxc_ast_macros::visited_node;
13+
use oxc_ast_macros::ast;
1414
use oxc_span::{Atom, Span};
1515
use oxc_syntax::number::{BigintBase, NumberBase};
1616
#[cfg(feature = "serialize")]
1717
use serde::Serialize;
1818
#[cfg(feature = "serialize")]
1919
use tsify::Tsify;
2020

21-
#[visited_node]
21+
#[ast(visit)]
2222
#[derive(Debug, Clone, Hash)]
2323
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
2424
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -28,7 +28,7 @@ pub struct BooleanLiteral {
2828
pub value: bool,
2929
}
3030

31-
#[visited_node]
31+
#[ast(visit)]
3232
#[derive(Debug, Clone)]
3333
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
3434
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -37,7 +37,7 @@ pub struct NullLiteral {
3737
pub span: Span,
3838
}
3939

40-
#[visited_node]
40+
#[ast(visit)]
4141
#[derive(Debug, Clone)]
4242
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
4343
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -50,7 +50,7 @@ pub struct NumericLiteral<'a> {
5050
pub base: NumberBase,
5151
}
5252

53-
#[visited_node]
53+
#[ast(visit)]
5454
#[derive(Debug, Hash)]
5555
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
5656
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -62,7 +62,7 @@ pub struct BigIntLiteral<'a> {
6262
pub base: BigintBase,
6363
}
6464

65-
#[visited_node]
65+
#[ast(visit)]
6666
#[derive(Debug, Clone, Hash)]
6767
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
6868
#[cfg_attr(feature = "serialize", serde(tag = "type"))]
@@ -86,7 +86,7 @@ pub struct RegExp<'a> {
8686
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
8787
pub struct EmptyObject;
8888

89-
#[visited_node]
89+
#[ast(visit)]
9090
#[derive(Debug, Clone, Hash)]
9191
#[cfg_attr(feature = "serialize", derive(Serialize, Tsify))]
9292
#[cfg_attr(feature = "serialize", serde(tag = "type"))]

0 commit comments

Comments
 (0)