feat: support regexp equal query

kelp404 · Jan 2, 2023 · f3ef8c9 · f3ef8c9
1 parent 6afea93
commit f3ef8c9
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 65 deletions.
diff --git a/lib/query.js b/lib/query.js
@@ -610,14 +610,22 @@
       switch (queryCell.operation) {
         case QueryOperation.equal:
           if (queryCell.value != null) {
-            return {
-              match: {
-                [`${queryCell.dbField}`]: {
-                  query: queryCell.value,
-                  operator: 'and'
+            if (queryCell.value.constructor === RegExp) {
+              return {
+                regexp: {
+                  [`${queryCell.dbField}`]: queryCell.value.toString().slice(1, -1)
                 }
-              }
-            };
+              };
+            } else {
+              return {
+                match: {
+                  [`${queryCell.dbField}`]: {
+                    query: queryCell.value,
+                    operator: 'and'
+                  }
+                }
+              };
+            }
           } else {
             return {
               bool: {
@@ -632,18 +640,30 @@
           break;
         case QueryOperation.unequal:
           if (queryCell.value != null) {
-            return {
-              bool: {
-                must_not: {
-                  match: {
-                    [`${queryCell.dbField}`]: {
-                      query: queryCell.value,
-                      operator: 'and'
+            if (queryCell.value.constructor === RegExp) {
+              return {
+                bool: {
+                  must_not: {
+                    regexp: {
+                      [`${queryCell.dbField}`]: queryCell.value.toString().slice(1, -1)
                     }
                   }
                 }
-              }
-            };
+              };
+            } else {
+              return {
+                bool: {
+                  must_not: {
+                    match: {
+                      [`${queryCell.dbField}`]: {
+                        query: queryCell.value,
+                        operator: 'and'
+                      }
+                    }
+                  }
+                }
+              };
+            }
           } else {
             return {
               bool: {
@@ -740,52 +760,19 @@
         case QueryOperation.like:
           value = utils.bleachRegexWords(queryCell.value);
           return {
-            bool: {
-              should: [
-                {
-                  match: {
-                    [`${queryCell.dbField}`]: {
-                      query: queryCell.value,
-                      operator: 'and'
-                    }
-                  }
-                },
-                {
-                  regexp: {
-                    [`${queryCell.dbField}`]: `.*${value}.*`
-                  }
-                }
-              ]
+            regexp: {
+              [`${queryCell.dbField}`]: `.*${value}.*`
             }
           };
         case QueryOperation.unlike:
           value = utils.bleachRegexWords(queryCell.value);
           return {
             bool: {
-              minimum_should_match: 2,
-              should: [
-                {
-                  bool: {
-                    must_not: {
-                      match: {
-                        [`${queryCell.dbField}`]: {
-                          query: queryCell.value,
-                          operator: 'and'
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  bool: {
-                    must_not: {
-                      regexp: {
-                        [`${queryCell.dbField}`]: `.*${value}.*`
-                      }
-                    }
-                  }
+              must_not: {
+                regexp: {
+                  [`${queryCell.dbField}`]: `.*${value}.*`
                 }
-              ]
+              }
             }
           };
       }

diff --git a/src/lib/query.coffee b/src/lib/query.coffee
@@ -444,23 +444,33 @@ module.exports = class Query
         switch queryCell.operation
             when QueryOperation.equal
                 if queryCell.value?
-                    match:
-                        "#{queryCell.dbField}":
-                            query: queryCell.value
-                            operator: 'and'
+                    if queryCell.value.constructor is RegExp
+                        regexp:
+                            "#{queryCell.dbField}": queryCell.value.toString().slice(1, -1)
+                    else
+                        match:
+                            "#{queryCell.dbField}":
+                                query: queryCell.value
+                                operator: 'and'
                 else
                     bool:
                         must_not:
                             exists:
                                 field: queryCell.dbField
             when QueryOperation.unequal
                 if queryCell.value?
-                    bool:
-                        must_not:
-                            match:
-                                "#{queryCell.dbField}":
-                                    query: queryCell.value
-                                    operator: 'and'
+                    if queryCell.value.constructor is RegExp
+                        bool:
+                            must_not:
+                                regexp:
+                                    "#{queryCell.dbField}": queryCell.value.toString().slice(1, -1)
+                    else
+                        bool:
+                            must_not:
+                                match:
+                                    "#{queryCell.dbField}":
+                                        query: queryCell.value
+                                        operator: 'and'
                 else
                     bool:
                         must: