@xuda.io/xuda-dbs-plugin-xuda 1.0.196 → 1.0.198

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.196",
+  "version": "1.0.198",
   "description": "Xuda Database Socket for Xuda's proprietary structure powered by CouchDB",
   "scripts": {
     "pub": "npm version patch --force && npm publish --access public"

package/server.js

@@ -525,6 +525,40 @@ const get_opt = function (e, table_obj) {
     return recursiveReplace(query);
   }
 
+  function replaceRegexOptions(query) {
+    // Helper function to recursively process the query object
+    function recursiveReplace(obj) {
+      if (typeof obj === "object" && obj !== null) {
+        // Create a new object to store the modified query
+        let newObj = Array.isArray(obj) ? [] : {};
+
+        // Traverse through the object
+        for (let key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            if (key === "$regex") {
+              newObj[key] = obj.$options
+                ? `(?${obj.$options})${obj[key]}`
+                : obj[key];
+              return newObj;
+            }
+
+            // Recursively process nested objects
+
+            newObj[key] = recursiveReplace(obj[key]);
+          }
+        }
+
+        return newObj;
+      } else {
+        // If it's not an object or array, return the value as is
+        return obj;
+      }
+    }
+
+    // Start the recursive replacement
+    return recursiveReplace(query);
+  }
+
   if (e.filterModelMongo) {
     selector_new["$and"] = [replaceKeysInQuery(JSON.parse(e.filterModelMongo))];
   }

package/studio.mjs

@@ -570,21 +570,58 @@ const get_opt = function (e, table_obj) {
     return recursiveReplace(query);
   }
 
+  function replaceRegexOptions(query) {
+    // Helper function to recursively process the query object
+    function recursiveReplace(obj) {
+      if (typeof obj === "object" && obj !== null) {
+        // Create a new object to store the modified query
+        let newObj = Array.isArray(obj) ? [] : {};
+
+        // Traverse through the object
+        for (let key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            // If the key is in the keys_to_replace array, replace it
+            // let newKey = keys_to_replace.includes(key)
+            //   ? `udfData.data.${key}`
+            //   : key;
+
+            if (key === "$regex") {
+              newObj[key] = RegExp(obj[key], obj.$options);
+              return newObj;
+            }
+
+            // Recursively process nested objects
+            // if (key !== "$options") {
+            newObj[key] = recursiveReplace(obj[key]);
+            // }
+          }
+        }
+
+        return newObj;
+      } else {
+        // If it's not an object or array, return the value as is
+        return obj;
+      }
+    }
+
+    // Start the recursive replacement
+    return recursiveReplace(query);
+  }
+
   if (e.filterModelMongo) {
-    selector_new["$and"] = [replaceKeysInQuery(JSON.parse(e.filterModelMongo))];
+    selector_new["$and"] = [
+      replaceRegexOptions(replaceKeysInQuery(JSON.parse(e.filterModelMongo))),
+    ];
   }
   if (e.filterModelUserMongo) {
     if (!selector_new["$and"]) {
       selector_new["$and"] = [];
     }
     selector_new["$and"].push(
-      replaceKeysInQuery(JSON.parse(e.filterModelUserMongo))
+      replaceRegexOptions(
+        replaceKeysInQuery(JSON.parse(e.filterModelUserMongo))
+      )
     );
-
-    // selector_new["$and"] = {
-    //   ...selector_new["$and"],
-    //   ...replaceKeysInQuery(e.filterModelUserMongo),
-    // };
   }
 
   opt.selector = selector_new;