Unverified Commit 9dfbc938 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Turbopack: support character class ranges in regex (#97502)

Closes https://github.com/vercel/next.js/issues/97467

---------
Co-authored-by: 's avatarvercel-fleet[bot] <308483924+vercel-fleet[bot]@users.noreply.github.com>
parent f0088acc
...@@ -237,6 +237,7 @@ mod tests { ...@@ -237,6 +237,7 @@ mod tests {
#[case::alternatives_empty1("react{,-dom}", "react")] #[case::alternatives_empty1("react{,-dom}", "react")]
#[case::alternatives_empty2("react{,-dom}", "react-dom")] #[case::alternatives_empty2("react{,-dom}", "react-dom")]
#[case::alternatives_chars("[abc]", "b")] #[case::alternatives_chars("[abc]", "b")]
#[case::character_range("[a-z].js", "b.js")]
fn glob_match(#[case] glob: &str, #[case] path: &str) { fn glob_match(#[case] glob: &str, #[case] path: &str) {
let glob = Glob::parse(RcStr::from(glob), GlobOptions::default()).unwrap(); let glob = Glob::parse(RcStr::from(glob), GlobOptions::default()).unwrap();
...@@ -245,6 +246,13 @@ mod tests { ...@@ -245,6 +246,13 @@ mod tests {
assert!(glob.matches(path)); assert!(glob.matches(path));
} }
#[test]
fn glob_rejects_invalid_character_range() {
let error = Glob::parse(rcstr!("[z-a]"), GlobOptions::default()).unwrap_err();
assert!(format!("{error:#}").contains("invalid character range"));
}
#[rstest] #[rstest]
#[case::early_end("*.raw", "hello.raw.js")] #[case::early_end("*.raw", "hello.raw.js")]
#[case::early_end( #[case::early_end(
......
...@@ -585,7 +585,7 @@ impl<'a> Parser<'a> { ...@@ -585,7 +585,7 @@ impl<'a> Parser<'a> {
if in_range { if in_range {
// invariant: in_range is only set when there is // invariant: in_range is only set when there is
// already at least one character seen. // already at least one character seen.
if let Some(kind) = add_to_last_range(ranges.last_mut().unwrap(), '-') { if let Some(kind) = add_to_last_range(ranges.last_mut().unwrap(), c) {
return Err(self.error(kind)); return Err(self.error(kind));
} }
} else { } else {
...@@ -653,6 +653,7 @@ mod tests { ...@@ -653,6 +653,7 @@ mod tests {
"(?:a|b|c(?:/)?)(?:/h(?:/.*)?)?" "(?:a|b|c(?:/)?)(?:/h(?:/.*)?)?"
)] )]
#[case::classes("[abc]/d/**", "[abc]/d/.*", "[abc](?:/d(?:/.*)?)?")] #[case::classes("[abc]/d/**", "[abc]/d/.*", "[abc](?:/d(?:/.*)?)?")]
#[case::ranges("[a-z]/d/**", "[a-z]/d/.*", "[a-z](?:/d(?:/.*)?)?")]
fn glob_regex_mapping( fn glob_regex_mapping(
#[case] glob: &str, #[case] glob: &str,
#[case] glob_regex: &str, #[case] glob_regex: &str,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment