chore: update rust test error

farm-fe · Oct 14, 2024 · 5e02941 · 5e02941
1 parent 3ff6758
commit 5e02941
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 215 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bench/Cargo.toml b/crates/bench/Cargo.toml
diff --git a/crates/bench/benches/compiler_bench.rs b/crates/bench/benches/compiler_bench.rs
diff --git a/crates/plugin_css/tests/analyze_deps.rs b/crates/plugin_css/tests/analyze_deps.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use farmfe_core::{
-  config::{Config, ResolveConfig},
+  config::{AliasItem, Config, ResolveConfig, StringOrRegex},
   context::CompilationContext,
   module::{ModuleId, ModuleType},
   plugin::{
@@ -17,10 +17,16 @@ fn analyze_deps() {
   fixture!("tests/fixtures/analyze_deps/basic.css", |file, cwd| {
     let config = Config {
       resolve: Box::new(ResolveConfig {
-        alias: HashMap::from([
-          ("/@".to_string(), cwd.to_string_lossy().to_string()),
-          ("@".to_string(), cwd.to_string_lossy().to_string()),
-        ]),
+        alias: vec![
+          AliasItem::Complex {
+            find: StringOrRegex::String("/@".to_string()),
+            replacement: cwd.to_string_lossy().to_string(),
+          },
+          AliasItem::Complex {
+            find: StringOrRegex::String("@".to_string()),
+            replacement: cwd.to_string_lossy().to_string(),
+          },
+        ],
         ..Default::default()
       }),
       ..Default::default()

diff --git a/crates/plugin_resolve/tests/mod.rs b/crates/plugin_resolve/tests/mod.rs
@@ -1,9 +1,9 @@
 use std::{collections::HashMap, sync::Arc};
 
 use farmfe_core::{
-  config::{Config, ResolveConfig},
+  config::{AliasItem, Config, ResolveConfig, StringOrRegex},
   context::CompilationContext,
-  plugin::ResolveKind,
+  plugin::ResolveKind, regex::Regex,
 };
 use farmfe_plugin_resolve::resolver::{ResolveOptions, Resolver};
 use farmfe_testing_helpers::fixture;
@@ -198,19 +198,24 @@ fn resolve_alias() {
       CompilationContext::new(
         Config {
           resolve: Box::new(ResolveConfig {
-            alias: HashMap::from([
-              ("@".to_string(), cwd.to_string_lossy().to_string()),
-              ("/@".to_string(), cwd.to_string_lossy().to_string()),
-              // long alias
-              (
-                "@/components".to_string(),
-                cwd.join("components").to_string_lossy().to_string(),
-              ),
-              (
-                "$__farm_regex:^/(utils)$".to_string(),
-                cwd.join("$1").to_string_lossy().to_string(),
-              ),
-            ]),
+            alias: vec![
+              AliasItem::Complex {
+                find: StringOrRegex::String("@".to_string()),
+                replacement: cwd.to_string_lossy().to_string(),
+              },
+              AliasItem::Complex {
+                find: StringOrRegex::String("/@".to_string()),
+                replacement: cwd.to_string_lossy().to_string(),
+              },
+              AliasItem::Complex {
+                find: StringOrRegex::String("@/components".to_string()),
+                replacement: cwd.join("components").to_string_lossy().to_string(),
+              },
+              AliasItem::Complex {
+                find: StringOrRegex::Regex(Regex::new("$__farm_regex:^/(utils)$").unwrap()),
+                replacement: cwd.join("$1").to_string_lossy().to_string(),
+              },
+            ],
             ..Default::default()
           }),
           ..Default::default()