Skip to content

refactor(estree): remove regular expression types from ESTree AST #10855

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
May 7, 2025
Merged

refactor(estree): remove regular expression types from ESTree AST #10855

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
1 change: 0 additions & 1 deletion .github/generated/ast_changes_watch_list.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ src:
- 'crates/oxc_regular_expression/src/generated/assert_layouts.rs'
- 'crates/oxc_regular_expression/src/generated/derive_clone_in.rs'
- 'crates/oxc_regular_expression/src/generated/derive_content_eq.rs'
- 'crates/oxc_regular_expression/src/generated/derive_estree.rs'
- 'crates/oxc_regular_expression/src/generated/derive_get_address.rs'
- 'crates/oxc_span/src/generated/assert_layouts.rs'
- 'crates/oxc_span/src/generated/derive_dummy.rs'
Expand Down
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/oxc_ast/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ cow-utils = { workspace = true }
default = []
serialize = [
"oxc_allocator/serialize",
"oxc_regular_expression/serialize",
"oxc_span/serialize",
"oxc_syntax/serialize",
"oxc_estree/serialize",
Expand Down
9 changes: 0 additions & 9 deletions crates/oxc_regular_expression/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,8 @@ doctest = false
oxc_allocator = { workspace = true }
oxc_ast_macros = { workspace = true }
oxc_diagnostics = { workspace = true }
oxc_estree = { workspace = true }
oxc_span = { workspace = true }

phf = { workspace = true, features = ["macros"] }
rustc-hash = { workspace = true }
unicode-id-start = { workspace = true }

[features]
default = []
serialize = [
"oxc_allocator/serialize",
"oxc_span/serialize",
"oxc_estree/serialize",
]
55 changes: 27 additions & 28 deletions crates/oxc_regular_expression/src/ast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use oxc_allocator::{Box, CloneIn, GetAddress, Vec};
use oxc_ast_macros::ast;
use oxc_estree::ESTree;
use oxc_span::{Atom, ContentEq, Span};

/// The root of the `PatternParser` result.
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Pattern<'a> {
pub span: Span,
pub body: Disjunction<'a>,
Expand All @@ -15,7 +14,7 @@ pub struct Pattern<'a> {
/// Pile of [`Alternative`]s separated by `|`.
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Disjunction<'a> {
pub span: Span,
pub body: Vec<'a, Alternative<'a>>,
Expand All @@ -24,7 +23,7 @@ pub struct Disjunction<'a> {
/// Single unit of `|` separated alternatives.
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Alternative<'a> {
pub span: Span,
pub body: Vec<'a, Term<'a>>,
Expand All @@ -33,7 +32,7 @@ pub struct Alternative<'a> {
/// Single unit of [`Alternative`], containing various kinds.
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub enum Term<'a> {
// Assertion, QuantifiableAssertion
BoundaryAssertion(Box<'a, BoundaryAssertion>) = 0,
Expand All @@ -56,15 +55,15 @@ pub enum Term<'a> {
/// e.g. `^`, `$`, `\b`, `\B`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct BoundaryAssertion {
pub span: Span,
pub kind: BoundaryAssertionKind,
}

#[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub enum BoundaryAssertionKind {
Start = 0,
End = 1,
Expand All @@ -76,7 +75,7 @@ pub enum BoundaryAssertionKind {
/// e.g. `(?=...)`, `(?!...)`, `(?<=...)`, `(?<!...)`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct LookAroundAssertion<'a> {
pub span: Span,
pub kind: LookAroundAssertionKind,
Expand All @@ -85,7 +84,7 @@ pub struct LookAroundAssertion<'a> {

#[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub enum LookAroundAssertionKind {
Lookahead = 0,
NegativeLookahead = 1,
Expand All @@ -97,7 +96,7 @@ pub enum LookAroundAssertionKind {
/// e.g. `a*`, `b+`, `c?`, `d{3}`, `e{4,}`, `f{5,6}`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Quantifier<'a> {
pub span: Span,
pub min: u64,
Expand All @@ -110,7 +109,7 @@ pub struct Quantifier<'a> {
/// Single character.
#[ast]
#[derive(Debug, Clone, Copy)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Character {
/// This will be invalid position when `UnicodeMode` is disabled and `value` is a surrogate pair.
pub span: Span,
Expand All @@ -121,7 +120,7 @@ pub struct Character {

#[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub enum CharacterKind {
ControlLetter = 0,
HexadecimalEscape = 1,
Expand All @@ -140,15 +139,15 @@ pub enum CharacterKind {
/// e.g. `\d`, `\D`, `\s`, `\S`, `\w`, `\W`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct CharacterClassEscape {
pub span: Span,
pub kind: CharacterClassEscapeKind,
}

#[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub enum CharacterClassEscapeKind {
D = 0,
NegativeD = 1,
Expand All @@ -162,7 +161,7 @@ pub enum CharacterClassEscapeKind {
/// e.g. `\p{ASCII}`, `\P{ASCII}`, `\p{sc=Hiragana}`, `\P{sc=Hiragana}`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct UnicodePropertyEscape<'a> {
pub span: Span,
pub negative: bool,
Expand All @@ -175,7 +174,7 @@ pub struct UnicodePropertyEscape<'a> {
/// The `.`.
#[ast]
#[derive(Debug, Clone, Copy)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Dot {
pub span: Span,
}
Expand All @@ -184,7 +183,7 @@ pub struct Dot {
/// e.g. `[a-z]`, `[^A-Z]`, `[abc]`, `[a&&b&&c]`, `[[a-z]--x--y]`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct CharacterClass<'a> {
pub span: Span,
pub negative: bool,
Expand All @@ -198,7 +197,7 @@ pub struct CharacterClass<'a> {

#[ast]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub enum CharacterClassContentsKind {
Union = 0,
/// `UnicodeSetsMode` only.
Expand All @@ -209,7 +208,7 @@ pub enum CharacterClassContentsKind {

#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, GetAddress, ESTree)]
#[generate_derive(CloneIn, ContentEq, GetAddress)]
pub enum CharacterClassContents<'a> {
CharacterClassRange(Box<'a, CharacterClassRange>) = 0,
CharacterClassEscape(Box<'a, CharacterClassEscape>) = 1,
Expand All @@ -225,7 +224,7 @@ pub enum CharacterClassContents<'a> {
/// e.g. `a-z`, `A-Z`, `0-9`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct CharacterClassRange {
pub span: Span,
pub min: Character,
Expand All @@ -235,7 +234,7 @@ pub struct CharacterClassRange {
/// `|` separated string of characters wrapped by `\q{}`.
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct ClassStringDisjunction<'a> {
pub span: Span,
/// `true` if body is empty or contains [`ClassString`] which `strings` is `true`.
Expand All @@ -246,7 +245,7 @@ pub struct ClassStringDisjunction<'a> {
/// Single unit of [`ClassStringDisjunction`].
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct ClassString<'a> {
pub span: Span,
/// `true` if body is empty or contain 2 more characters.
Expand All @@ -258,7 +257,7 @@ pub struct ClassString<'a> {
/// e.g. `(...)`, `(?<name>...)`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct CapturingGroup<'a> {
pub span: Span,
/// Group name to be referenced by [`NamedReference`].
Expand All @@ -270,7 +269,7 @@ pub struct CapturingGroup<'a> {
/// e.g. `(?:...)`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct IgnoreGroup<'a> {
pub span: Span,
pub modifiers: Option<Modifiers>,
Expand All @@ -281,7 +280,7 @@ pub struct IgnoreGroup<'a> {
/// e.g. `i` in `(?i:...)`, `-s` in `(?-s:...)`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Modifiers {
pub span: Span,
pub enabling: Option<Modifier>,
Expand All @@ -291,7 +290,7 @@ pub struct Modifiers {
/// Each part of modifier in [`Modifiers`].
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct Modifier {
pub ignore_case: bool,
pub multiline: bool,
Expand All @@ -302,7 +301,7 @@ pub struct Modifier {
/// e.g. `\1`, `\2`, `\3`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct IndexedReference {
pub span: Span,
pub index: u32,
Expand All @@ -312,7 +311,7 @@ pub struct IndexedReference {
/// e.g. `\k<name>`
#[ast]
#[derive(Debug)]
#[generate_derive(CloneIn, ContentEq, ESTree)]
#[generate_derive(CloneIn, ContentEq)]
pub struct NamedReference<'a> {
pub span: Span,
pub name: Atom<'a>,
Expand Down
Loading
Loading