fix(plugin): fix expand_typeof_replacements (#2196)

AliceLanniste · web-flow · commit d6233d867cca · 2024-09-11T02:44:48.000Z
### Description  Related issue:#2057 . fix the function of `expand_typeof_replacements`
diff --git a/crates/rolldown_plugin_replace/src/utils.rs b/crates/rolldown_plugin_replace/src/utils.rs
@@ -10,23 +10,36 @@ static OBJECT_RE: LazyLock<Regex> = LazyLock::new(|| {
 pub(crate) fn expand_typeof_replacements(
   values: &HashMap<String, String>,
 ) -> HashMap<String, String> {
-  values
-    .keys()
-    .filter_map(|key| {
-      if let Ok(true) = OBJECT_RE.is_match(key) {
-        Some(key.char_indices().filter_map(|(pos, c)| {
-          if c == '.' {
-            Some((format!("typeof {}", &key[0..pos]), "\"object\"".to_string()))
-          } else {
-            None
-          }
-        }))
-      } else {
-        None
-      }
-    })
-    .flatten()
-    .collect()
+  let mut replacements: Vec<(String, String)> = Vec::new();
+
+  for key in values.keys() {
+    if let Ok(matched) = OBJECT_RE.captures(key) {
+      let capture_str = matched.unwrap().get(0).unwrap().as_str();
+
+      let capture_vec: Vec<&str> = capture_str.split('.').collect::<Vec<&str>>();
+
+      let capture_arr = capture_vec.as_slice();
+
+      let replaces: Vec<(String, String)> = capture_arr[0..capture_arr.len() - 1]
+        .iter()
+        .flat_map(|x| {
+          vec![
+            (format!("typeof {} ===", *x), "\"object\" ===".to_string()),
+            (format!("typeof {}===", *x), "\"object\"===".to_string()),
+            (format!("typeof {} !==", *x), "\"object\" !==".to_string()),
+            (format!("typeof {}!==", *x), "\"object\"!==".to_string()),
+            (format!("typeof {} ==", *x), "\"object\" ===".to_string()),
+            (format!("typeof {}==", *x), "\"object\"===".to_string()),
+            (format!("typeof {}!=", *x), "\"object\"!==".to_string()),
+            (format!("typeof {} !=", *x), "\"object\" !==".to_string()),
+          ]
+        })
+        .collect();
+      replacements.extend(replaces);
+    };
+  }
+
+  HashMap::from_iter(replacements)
 }
 
 #[cfg(test)]
@@ -42,9 +55,30 @@ mod tests {
     let result = expand_typeof_replacements(&map);
 
     let expected = HashMap::from([
-      ("typeof a".to_string(), "\"object\"".to_string()),
-      ("typeof a.b".to_string(), "\"object\"".to_string()),
-      ("typeof a.b.c".to_string(), "\"object\"".to_string()),
+      ("typeof a===".to_string(), "\"object\"===".to_string()),
+      ("typeof a ===".to_string(), "\"object\" ===".to_string()),
+      ("typeof a==".to_string(), "\"object\"===".to_string()),
+      ("typeof a ==".to_string(), "\"object\" ===".to_string()),
+      ("typeof a!==".to_string(), "\"object\"!==".to_string()),
+      ("typeof a !==".to_string(), "\"object\" !==".to_string()),
+      ("typeof a!=".to_string(), "\"object\"!==".to_string()),
+      ("typeof a !=".to_string(), "\"object\" !==".to_string()),
+      ("typeof b===".to_string(), "\"object\"===".to_string()),
+      ("typeof b ===".to_string(), "\"object\" ===".to_string()),
+      ("typeof b==".to_string(), "\"object\"===".to_string()),
+      ("typeof b ==".to_string(), "\"object\" ===".to_string()),
+      ("typeof b!==".to_string(), "\"object\"!==".to_string()),
+      ("typeof b !==".to_string(), "\"object\" !==".to_string()),
+      ("typeof b!=".to_string(), "\"object\"!==".to_string()),
+      ("typeof b !=".to_string(), "\"object\" !==".to_string()),
+      ("typeof c===".to_string(), "\"object\"===".to_string()),
+      ("typeof c ===".to_string(), "\"object\" ===".to_string()),
+      ("typeof c==".to_string(), "\"object\"===".to_string()),
+      ("typeof c ==".to_string(), "\"object\" ===".to_string()),
+      ("typeof c!==".to_string(), "\"object\"!==".to_string()),
+      ("typeof c !==".to_string(), "\"object\" !==".to_string()),
+      ("typeof c!=".to_string(), "\"object\"!==".to_string()),
+      ("typeof c !=".to_string(), "\"object\" !==".to_string()),
     ]);
 
     assert_eq!(result, expected);
diff --git a/crates/rolldown_plugin_replace/tests/form/process_check/artifacts.snap b/crates/rolldown_plugin_replace/tests/form/process_check/artifacts.snap
@@ -8,7 +8,7 @@ source: crates/rolldown_testing/src/integration_test.rs
 ```js
 
 //#region input.js
-{
+if (typeof process !== "undefined" && typeof process.env === "object" && true) {
 	console.log("production");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ source: crates/rolldown_testing/src/integration_test.rs`
`8`	`8`	```js
`9`	`9`
`10`	`10`	`//#region input.js`
`11`		`-{`
	`11`	`+if (typeof process !== "undefined" && typeof process.env === "object" && true) {`
`12`	`12`	`console.log("production");`
`13`	`13`	`}`
`14`	`14`