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_regular_expression/src/ast_impl/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mod allocator;
mod display;
mod span;
pub mod support;
pub mod visit;
53 changes: 53 additions & 0 deletions crates/oxc_regular_expression/src/ast_impl/support.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
use crate::ast::{CharacterClass, CharacterClassContents, LookAroundAssertionKind, Pattern, Term};

pub struct RegexUnsupportedPatterns {
pub named_capture_groups: bool,
pub unicode_property_escapes: bool,
pub look_behind_assertions: bool,
}

/// Check if the regular expression contains any unsupported syntax.
///
/// Based on parsed regular expression pattern.
pub fn has_unsupported_regular_expression_pattern(
pattern: &Pattern,
unsupported: &RegexUnsupportedPatterns,
) -> bool {
pattern.body.body.iter().any(|alternative| {
alternative.body.iter().any(|term| term_contains_unsupported(term, unsupported))
})
}

fn term_contains_unsupported(mut term: &Term, unsupported: &RegexUnsupportedPatterns) -> bool {
// Loop because `Term::Quantifier` contains a nested `Term`
loop {
match term {
Term::CapturingGroup(_) => return unsupported.named_capture_groups,
Term::UnicodePropertyEscape(_) => return unsupported.unicode_property_escapes,
Term::CharacterClass(character_class) => {
return unsupported.unicode_property_escapes
&& character_class_has_unicode_property_escape(character_class);
}
Term::LookAroundAssertion(assertion) => {
return unsupported.look_behind_assertions
&& matches!(
assertion.kind,
LookAroundAssertionKind::Lookbehind
| LookAroundAssertionKind::NegativeLookbehind
);
}
Term::Quantifier(quantifier) => term = &quantifier.body,
_ => return false,
}
}
}

fn character_class_has_unicode_property_escape(character_class: &CharacterClass) -> bool {
character_class.body.iter().any(|element| match element {
CharacterClassContents::UnicodePropertyEscape(_) => true,
CharacterClassContents::NestedCharacterClass(character_class) => {
character_class_has_unicode_property_escape(character_class)
}
_ => false,
})
}
1 change: 1 addition & 0 deletions crates/oxc_regular_expression/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ mod generated {

pub mod ast;
pub use crate::{
ast_impl::support::{RegexUnsupportedPatterns, has_unsupported_regular_expression_pattern},
ast_impl::visit,
options::Options,
parser::{ConstructorParser, LiteralParser},
Expand Down
61 changes: 9 additions & 52 deletions crates/oxc_transformer/src/regexp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
//! (actually these would be improvements on ESBuild, not Babel)

use oxc_ast::{NONE, ast::*};
use oxc_regular_expression::ast::{
CharacterClass, CharacterClassContents, LookAroundAssertionKind, Pattern, Term,
use oxc_regular_expression::{
RegexUnsupportedPatterns, has_unsupported_regular_expression_pattern,
};
use oxc_semantic::ReferenceFlags;
use oxc_span::{Atom, SPAN};
Expand All @@ -65,9 +65,7 @@ pub struct RegExp<'a, 'ctx> {
ctx: &'ctx TransformCtx<'a>,
unsupported_flags: RegExpFlags,
some_unsupported_patterns: bool,
look_behind_assertions: bool,
named_capture_groups: bool,
unicode_property_escapes: bool,
unsupported_patterns: RegexUnsupportedPatterns,
}

impl<'a, 'ctx> RegExp<'a, 'ctx> {
Expand Down Expand Up @@ -105,9 +103,11 @@ impl<'a, 'ctx> RegExp<'a, 'ctx> {
ctx,
unsupported_flags,
some_unsupported_patterns,
look_behind_assertions,
named_capture_groups,
unicode_property_escapes,
unsupported_patterns: RegexUnsupportedPatterns {
look_behind_assertions,
named_capture_groups,
unicode_property_escapes,
},
}
}
}
Expand Down Expand Up @@ -156,7 +156,7 @@ impl<'a> RegExp<'a, '_> {
}
};

if !self.has_unsupported_regular_expression_pattern(pattern) {
if !has_unsupported_regular_expression_pattern(pattern, &self.unsupported_patterns) {
return;
}
}
Expand All @@ -177,47 +177,4 @@ impl<'a> RegExp<'a, '_> {

*expr = ctx.ast.expression_new(regexp.span, callee, NONE, arguments);
}

/// Check if the regular expression contains any unsupported syntax.
///
/// Based on parsed regular expression pattern.
fn has_unsupported_regular_expression_pattern(&self, pattern: &Pattern<'a>) -> bool {
pattern.body.body.iter().any(|alternative| {
alternative.body.iter().any(|term| self.term_contains_unsupported(term))
})
}

fn term_contains_unsupported(&self, mut term: &Term) -> bool {
// Loop because `Term::Quantifier` contains a nested `Term`
loop {
match term {
Term::CapturingGroup(_) => return self.named_capture_groups,
Term::UnicodePropertyEscape(_) => return self.unicode_property_escapes,
Term::CharacterClass(character_class) => {
return self.unicode_property_escapes
&& character_class_has_unicode_property_escape(character_class);
}
Term::LookAroundAssertion(assertion) => {
return self.look_behind_assertions
&& matches!(
assertion.kind,
LookAroundAssertionKind::Lookbehind
| LookAroundAssertionKind::NegativeLookbehind
);
}
Term::Quantifier(quantifier) => term = &quantifier.body,
_ => return false,
}
}
}
}

fn character_class_has_unicode_property_escape(character_class: &CharacterClass) -> bool {
character_class.body.iter().any(|element| match element {
CharacterClassContents::UnicodePropertyEscape(_) => true,
CharacterClassContents::NestedCharacterClass(character_class) => {
character_class_has_unicode_property_escape(character_class)
}
_ => false,
})
}
Loading