Add match_phrase support #43

ppadovani · Feb 22, 2018 · 7c4ba9f · 7c4ba9f
1 parent f61c04c
commit 7c4ba9f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nested-fields-support",
-  "version": "6.1.3-1.0.1",
+  "version": "6.1.3-1.0.2",
   "description": "Nested Support Plugin",
   "license": "Apache-2.0",
   "authors": [

diff --git a/public/nested_support/parse_query/lib/knql_adapter.js b/public/nested_support/parse_query/lib/knql_adapter.js
@@ -252,7 +252,12 @@ scope.Term.prototype = {
             + ',"include_lower":true,"include_upper":true}}}';
         break;
       case '~=':
-        jsonString += '{"wildcard":{"' + this.field + '":' + this.value + '}}';
+        if (/[\*?]/.test(this.value)) {
+          jsonString += '{"wildcard":{"';
+        } else {
+          jsonString += '{"match_phrase":{"';
+        }
+        jsonString += this.field + '":' + this.value + '}}';
         break;
       default:
         break;

diff --git a/public/nested_support/parse_query/lib/knql_formatter.js b/public/nested_support/parse_query/lib/knql_formatter.js
@@ -36,11 +36,27 @@ define(function () {
       return fromMultiMatch(query.multi_match);
     } else if (query.exists) {
       return fromExists(query.exists);
+    } else if (query.wildcard) {
+      return fromWildcard(query.wildcard);
+    } else if (query.match_phrase) {
+      return fromMatchPhrase(query.match_phrase);
     }
 
     throw 'Unable to reverse parse';
   }
 
+  function fromWildcard(wildcard) {
+    const keyNames = Object.keys(wildcard);
+    const value = valueToString(keyNames[0], wildcard[keyNames[0]]);
+    return keyNames[0] + '~=' + value;
+  }
+
+  function fromMatchPhrase(match_phrase) {
+    const keyNames = Object.keys(match_phrase);
+    const value = valueToString(keyNames[0], match_phrase[keyNames[0]]);
+    return keyNames[0] + '~=' + value;
+  }
+
   function fromExists(exists) {
     return 'EXISTS ' + exists.field;
   }