fix(crosstarget-utils): fixes on regex and derive_more

Cargo.toml

@@ -51,6 +51,7 @@ tokio = { version = "1", features = [
   "time",
 ] }
 chrono = { version = "0.4.38", features = ["serde"] }
+derive_more = "0.99.17"
 user-facing-errors = { path = "./libs/user-facing-errors" }
 uuid = { version = "1", features = ["serde", "v4", "v7", "js"] }
 indoc = "2.0.1"

libs/crosstarget-utils/Cargo.toml

@@ -6,8 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-futures = "0.3"
+derive_more.workspace = true
 enumflags2.workspace = true
+futures = "0.3"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys.workspace = true

libs/crosstarget-utils/src/common/regex.rs

@@ -1,7 +1,7 @@
 use derive_more::Display;
 
 #[derive(Debug, Display)]
-#[display("Regular expression error: {message}")]
+#[display(fmt = "Regular expression error: {message}")]
 pub struct RegExpError {
     pub message: String,
 }

libs/crosstarget-utils/src/wasm/regex.rs

@@ -24,17 +24,14 @@ impl RegExpCompat for RegExp {
     fn captures(&self, message: &str) -> Option<Vec<String>> {
         let matches = self.inner.exec(message);
         matches.map(|matches| {
-            let mut captures = Vec::new();
+            let mut captures: Vec<String> = Vec::new();
             for i in 0..matches.length() {
                 let match_value = matches.get(i);
 
                 // We keep the same number of captures as the number of groups in the regex pattern,
                 // but we guarantee that the captures are always strings.
-                if match_value.is_string() {
-                    captures.push(match_value.as_string().unwrap());
-                } else {
-                    captures.push(String::new());
-                }
+                let capture: String = match_value.try_into().ok().unwrap_or_default();
+                captures.push(capture);
             }
             captures
         })

query-engine/connectors/mongodb-query-connector/Cargo.toml

@@ -22,7 +22,7 @@ uuid.workspace = true
 indexmap.workspace = true
 query-engine-metrics = { path = "../../metrics" }
 cuid = { git = "https://github.com/prisma/cuid-rust", branch = "wasm32-support" }
-derive_more = "0.99.17"
+derive_more.workspace = true
 
 [dependencies.query-structure]
 path = "../../query-structure"