Skip to content
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

Jump to bottom

fix: items_to_regexp for chinese #8368

Merged
merged 4 commits into from
Nov 7, 2024
Merged

fix: items_to_regexp for chinese #8368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7554da
fix: items_to_regexp for chinese
SyMind Nov 7, 2024
2b04ae0
fix
SyMind Nov 7, 2024
34fa2fb
Merge branch 'main' into fix-items_to_regexp
SyMind Nov 7, 2024
d6b54d9
fix
SyMind Nov 7, 2024
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
54 changes: 54 additions & 0 deletions crates/rspack_core/src/dependency/runtime_template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,7 @@ pub fn define_es_module_flag_statement(
#[allow(unused_imports)]
mod test_items_to_regexp {
use crate::items_to_regexp;

#[test]
fn basic() {
assert_eq!(
Expand Down Expand Up @@ -812,5 +813,58 @@ mod test_items_to_regexp {
),
"[1234a]".to_string()
);

assert_eq!(
items_to_regexp(
vec!["foo_js", "_js"]
.into_iter()
.map(String::from)
.collect::<Vec<_>>(),
),
"(|foo)_js".to_string()
);
}

#[test]
fn multibyte() {
assert_eq!(
items_to_regexp(
vec!["🍉", "🍊", "🍓", "🍐", "🍍🫙"]
.into_iter()
.map(String::from)
.collect::<Vec<_>>(),
),
"([🍉🍊🍐🍓]|🍍🫙)".to_string()
);

assert_eq!(
items_to_regexp(
vec!["🫙🍉", "🫙🍊", "🫙🍓", "🫙🍐", "🍽🍍"]
.into_iter()
.map(String::from)
.collect::<Vec<_>>(),
),
"(🫙[🍉🍊🍐🍓]|🍽🍍)".to_string()
);

assert_eq!(
items_to_regexp(
vec!["🍉🍭", "🍊🍭", "🍓🍭", "🍐🍭", "🍍🫙"]
.into_iter()
.map(String::from)
.collect::<Vec<_>>(),
),
"([🍉🍊🍐🍓]🍭|🍍🫙)".to_string()
);

assert_eq!(
items_to_regexp(
vec!["🍉", "🍊", "🍓", "🍐", "🫙"]
.into_iter()
.map(String::from)
.collect::<Vec<_>>(),
),
"[🍉🍊🍐🍓🫙]".to_string()
);
}
}
96 changes: 55 additions & 41 deletions crates/rspack_core/src/utils/compile_boolean_matcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ pub(crate) fn items_to_regexp(items_arr: Vec<String>) -> String {
items_set.sort_unstable();

// Merge single char items: (a|b|c|d|ef) => ([abcd]|ef)
let count_of_single_char_items = items_set.iter().filter(|&item| item.len() == 1).count();
let count_of_single_char_items = items_set
.iter()
.filter(|&item| item.chars().count() == 1)
.count();

// Special case for only single char items
if count_of_single_char_items == items_set.len() {
Expand All @@ -108,7 +111,7 @@ pub(crate) fn items_to_regexp(items_arr: Vec<String>) -> String {
let mut single_char_items: String = String::new();
let mut new_items = BTreeSet::new();
for item in items {
if item.len() == 1 {
if item.chars().count() == 1 {
single_char_items += &item;
continue;
}
Expand All @@ -126,19 +129,19 @@ pub(crate) fn items_to_regexp(items_arr: Vec<String>) -> String {
if !prefix.is_empty() || !suffix.is_empty() {
return format!(
"{}{}{}",
quote_meta(&prefix),
quote_meta(prefix),
items_to_regexp(
items
.iter()
.map(|item| item
.strip_prefix(&prefix)
.strip_prefix(prefix)
.expect("should strip prefix")
.strip_suffix(&suffix)
.expect("should strip suffix")
.to_string())
.collect::<Vec<_>>()
),
quote_meta(&suffix)
quote_meta(suffix)
);
}
}
Expand Down Expand Up @@ -199,12 +202,12 @@ pub(crate) fn items_to_regexp(items_arr: Vec<String>) -> String {
let prefix = get_common_prefix(prefixed_items.iter().map(|item| item.as_str()));
finished_items.push(format!(
"{}{}",
quote_meta(&prefix),
quote_meta(prefix),
items_to_regexp(
prefixed_items
.iter()
.map(|item| item
.strip_prefix(&prefix)
.strip_prefix(prefix)
.expect("should strip prefix")
.to_string())
.collect::<Vec<_>>()
Expand All @@ -217,7 +220,13 @@ pub(crate) fn items_to_regexp(items_arr: Vec<String>) -> String {
&mut items,
|item| {
if !item.is_empty() {
Some(item[item.len() - 1..].to_string())
Some(
item
.chars()
.last()
.expect("should have at least one char")
.to_string(),
)
} else {
None
}
Expand Down Expand Up @@ -256,7 +265,7 @@ pub(crate) fn items_to_regexp(items_arr: Vec<String>) -> String {
.to_string())
.collect::<Vec<_>>()
),
quote_meta(&suffix)
quote_meta(suffix)
));
}

Expand Down Expand Up @@ -309,20 +318,18 @@ where
result
}

fn get_common_prefix<'a>(mut items: impl Iterator<Item = &'a str> + Clone) -> String {
if items.clone().count() == 0 {
return String::new();
}
fn get_common_prefix<'a>(mut items: impl Iterator<Item = &'a str> + Clone) -> &'a str {
let mut prefix = if let Some(prefix) = items.next() {
prefix
} else {
return "";
};

let mut prefix = items
.next()
.expect("should have at least one element")
.to_string();
for item in items {
for (p, c) in item.chars().enumerate() {
if let Some(prefix_char) = prefix.chars().nth(p) {
for (char_index, (byte_index, c)) in item.char_indices().enumerate() {
if let Some(prefix_char) = prefix.chars().nth(char_index) {
if c != prefix_char {
prefix = prefix[..p].to_string();
prefix = &prefix[..byte_index];
break;
}
} else {
Expand All @@ -334,37 +341,44 @@ fn get_common_prefix<'a>(mut items: impl Iterator<Item = &'a str> + Clone) -> St
prefix
}

fn get_common_suffix<'a, I: Iterator<Item = &'a str> + Clone>(mut items: I) -> String {
if items.clone().count() == 0 {
return String::new();
}
fn is_utf8_start_byte(c: u8) -> bool {
c.is_ascii()
|| ((c & 0b1110_0000) == 0b1100_0000)
|| ((c & 0b1111_0000) == 0b1110_0000)
|| ((c & 0b1111_1000) == 0b1111_0000)
}

fn get_common_suffix<'a, I: Iterator<Item = &'a str>>(mut items: I) -> &'a str {
let mut suffix = if let Some(suffix) = items.next() {
suffix.as_bytes()
} else {
return "";
};

let mut suffix = items
.next()
.expect("should have at least one element")
.to_string();
for item in items {
let item = item.as_bytes();

let mut p = item.len();
let mut s = suffix.len();

while s > 0 {
s -= 1;
let Some(suffix_char) = suffix.chars().nth(s) else {
break;
};
let suffix_byte = suffix[s];

let item_char = if p > 0 { item.chars().nth(p - 1) } else { None };

if let Some(item_char) = item_char
&& item_char == suffix_char
{
p -= 1;
} else {
suffix = suffix[s + 1..].to_string();
break;
if p > 0 {
let item_byte = item[p - 1];
if suffix_byte == item_byte {
p -= 1;
continue;
}
}
suffix = &suffix[s + 1..];
break;
}
}

suffix
while !suffix.is_empty() && !is_utf8_start_byte(suffix[0]) {
suffix = &suffix[1..]
}
unsafe { std::str::from_utf8_unchecked(suffix) }
}
Loading