fix: handle legacy decomposed regex struct

Author: rutefig

.gitignore

@@ -9,4 +9,4 @@ tests/fixtures/confidential*
 
 
 .claude
-.thoughts
+thoughts/

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "relayer-utils"
-version = "0.4.62-13"
+version = "0.4.62-14"
 authors = ["Sora Suegami", "Aditya Bisht"]
 license = "MIT"
 edition = "2018"

Cargo.toml

@@ -10,7 +10,7 @@
     "wasm:postbuild": "node build.js",
     "build": "npm run wasm:build && npm run wasm:postbuild"
   },
-  "version": "0.4.66-5",
+  "version": "0.4.66-6",
   "devDependencies": {
     "@types/bun": "latest",
     "prettier": "^3.3.3"

package.json

@@ -17,9 +17,16 @@ pub fn extractSubstrIdxes(
     regexConfigJson: JsValue,
     revealPrivate: bool,
 ) -> Result<Array, JsValue> {
-    // Parse config from JSON
-    let config: DecomposedRegexConfig = from_value(regexConfigJson)
-        .map_err(|e| JsValue::from_str(&format!("Invalid config: {}", e)))?;
+    // Try parsing as new format first, fall back to legacy format
+    let config: DecomposedRegexConfig = match from_value::<DecomposedRegexConfig>(regexConfigJson.clone()) {
+        Ok(cfg) => cfg,
+        Err(_) => {
+            // Try parsing as legacy format
+            let legacy: crate::regex::types::LegacyDecomposedRegexConfig = from_value(regexConfigJson)
+                .map_err(|e| JsValue::from_str(&format!("Invalid config: {}", e)))?;
+            legacy.to_new_config(None)
+        }
+    };
 
     // Extract indices (standalone mode - no NFAGraph)
     let indices = extract_substr_idxes(inputStr, &config, None, revealPrivate)
@@ -44,9 +51,16 @@ pub fn extractSubstr(
     regexConfigJson: JsValue,
     revealPrivate: bool,
 ) -> Result<Array, JsValue> {
-    // Parse config from JSON
-    let config: DecomposedRegexConfig = from_value(regexConfigJson)
-        .map_err(|e| JsValue::from_str(&format!("Invalid config: {}", e)))?;
+    // Try parsing as new format first, fall back to legacy format
+    let config: DecomposedRegexConfig = match from_value::<DecomposedRegexConfig>(regexConfigJson.clone()) {
+        Ok(cfg) => cfg,
+        Err(_) => {
+            // Try parsing as legacy format
+            let legacy: crate::regex::types::LegacyDecomposedRegexConfig = from_value(regexConfigJson)
+                .map_err(|e| JsValue::from_str(&format!("Invalid config: {}", e)))?;
+            legacy.to_new_config(None)
+        }
+    };
 
     // Extract substrings (standalone mode - no NFAGraph)
     let substrings = extract_substr(inputStr, &config, None, revealPrivate)
@@ -194,4 +208,13 @@ mod tests {
         assert_eq!(&result[0..5], b"hello");
         assert_eq!(&result[5..10], &[0u8; 5]);
     }
+
+    #[test]
+    fn test_wasm_extract_substr() {
+        let input = "from:[email protected]";
+        let regex_config_json = JsValue::from_str(r#"{"parts":[{"is_public":true,"regex_def":"[a-z]+@[a-z]+\\.com"}]}"#);
+        let result = extractSubstr(input, regex_config_json, false);
+        println!("result: {:?}", result);
+        assert_eq!(result.unwrap(), vec!["[email protected]"]);
+    }
 }