Merge pull request #1 from Justinidlerz/fix/correct_replace

correct replace
Justinidlerz · Oct 21, 2024 · 56b9cc8 · 56b9cc8
2 parents 8776d2d + 0cdfc70
commit 56b9cc8
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 61 deletions.
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
   ],
   "preferUnplugged": true,
   "devDependencies": {
-    "@swc/core": "^1.7.11",
+    "@swc/core": "^1.7.36",
     "@types/node": "^22.3.0",
     "prettier": "^3.3.3",
     "typescript": "^5.5.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib.rs b/src/lib.rs
@@ -11,8 +11,7 @@ use regex::Regex;
 use serde::Deserialize;
 use serde_json::from_str;
 use swc_core::atoms::Atom;
-use swc_core::common::DUMMY_SP;
-use swc_core::ecma::ast::{CallExpr, ExportAll, ExportDecl, ExportDefaultDecl, FnExpr, Import, ImportDecl, ImportSpecifier, NamedExport, TplElement};
+use swc_core::ecma::ast::{CallExpr, ExportAll, ExportDefaultDecl, Import, ImportDecl, ImportSpecifier, NamedExport, TplElement};
 
 #[derive(Deserialize, Default)]
 struct Config {
@@ -33,15 +32,19 @@ impl RemoveInvalidContent {
         }
     }
 
-    fn replace_with<'h>(&self, matcher: &Regex, str: &'h str) -> Cow<'h, str> {
-        matcher.replace_all(str, |caps: &regex::Captures| {
+    fn replace_with<'h>(&self, matcher: &Regex, str: &'h str) -> Result<Cow<'h, str>, bool> {
+        if !matcher.is_match(str) {
+            return Err(false);
+        }
+
+        Ok(matcher.replace_all(str, |caps: &regex::Captures| {
             if self.replace_with.is_empty() {
                 return "".to_string();
             }
 
             let matched_str = &caps[0];
             self.replace_with.repeat(matched_str.len())
-        })
+        }))
     }
 }
 
@@ -62,27 +65,30 @@ impl VisitMut for RemoveInvalidContent {
 
     fn visit_mut_str(&mut self, node: &mut Str) {
         for matcher in self.matchers.iter() {
-            let new_value = self.replace_with(matcher, node.value.as_str());
-
-            let new_content = new_value.to_string();
-
-            node.clone_from(&Str::from(new_content))
+            if let Ok(new_value) = self.replace_with(matcher, node.value.as_str()) {
+                node.clone_from(&Str::from(new_value.to_string()))
+            }
         }
         node.visit_mut_children_with(self);
     }
 
     fn visit_mut_tpl_element(&mut self, node: &mut TplElement) {
         for matcher in self.matchers.iter() {
-            let new_value = self.replace_with(matcher, node.raw.as_str());
+            if let (Ok(cooked_value), Ok(raw_value)) = (
+                self.replace_with(matcher, node.cooked.clone().unwrap().as_str()), self.replace_with(matcher, node.raw.as_str())) {
 
-            let tpl_element = TplElement {
-                span: DUMMY_SP,
-                tail: false,
-                cooked: Some(Atom::from(new_value.to_string())),
-                raw: Atom::from(new_value.to_string()),
-            };
+                let cooked_value = cooked_value.clone().into();
+                let new_atom = Atom::from(raw_value);
 
-            node.clone_from(&tpl_element)
+                let tpl_element = TplElement {
+                    span: node.span,
+                    tail: node.tail,
+                    raw: new_atom,
+                    cooked: Some(cooked_value),
+                };
+
+                node.clone_from(&tpl_element)
+            }
         }
         node.visit_mut_children_with(self);
     }
@@ -190,6 +196,45 @@ test_inline!(
     r#"console.log("https:///faker-url");"#
 );
 
+test_inline!(
+    Default::default(),
+    |_| as_folder(RemoveInvalidContent::new(
+        Config{
+        matches: vec![r"[\u4E00-\u9FFF]".to_string()],
+        ..Default::default()
+    }
+    )),
+    should_not_remove_slack,
+    r#"const a = {
+      cde: {
+        code: 1,
+        message: "\\\\",
+      }
+     }"#,
+    r#"const a = {
+      cde: {
+        code: 1,
+        message: "\\\\",
+      }
+     }"#
+);
+
+
+test_inline!(
+    Default::default(),
+    |_| as_folder(RemoveInvalidContent::new(
+        Config{
+        matches: vec![r"[\u4E00-\u9FFF]".to_string()],
+        ..Default::default()
+    }
+    )),
+    should_not_remove_slack_from_tpl,
+    r#"const a = `\\中文${b}`"#,
+    r#"const a = `\\${b}`"#
+);
+
+
+
 test_inline!(
     Default::default(),
     |_| as_folder(RemoveInvalidContent::new(Config{