@xuda.io/xuda-dbs-plugin-xuda 1.0.197 → 1.0.199

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-dbs-plugin-xuda",
-  "version": "1.0.197",
+  "version": "1.0.199",
   "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,15 +525,53 @@ 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))];
+    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))
+      )
     );
   }
   for (const [key, val] of Object.entries(opt.selector)) {

package/studio.mjs

@@ -586,13 +586,14 @@ const get_opt = function (e, table_obj) {
             //   : key;
 
             if (key === "$regex") {
-              obj[key] = RegExp(obj[key], obj.$options);
+              newObj[key] = RegExp(obj[key], obj.$options);
+              return newObj;
             }
 
             // Recursively process nested objects
-            if (key !== "$options") {
-              newObj[key] = recursiveReplace(obj[key]);
-            }
+            // if (key !== "$options") {
+            newObj[key] = recursiveReplace(obj[key]);
+            // }
           }
         }