added support for minimum_should_match override param

bodybuilder.d.ts

@@ -117,7 +117,7 @@ declare namespace bodybuilder {
 			options: object,
 			subfilters: QuerySubFilterFn
 		): B;
-		queryMinimumShouldMatch(param: string | number): B;
+		queryMinimumShouldMatch(param: string | number, override?: boolean): B;
 		getQuery(): object;
 		hasQuery(): boolean;
 	}
@@ -241,7 +241,7 @@ declare namespace bodybuilder {
 			options: object,
 			subfilters: FilterSubFilterFn
 		): B;
-		filterMinimumShouldMatch(param: string | number): B;
+		filterMinimumShouldMatch(param: string | number, override?: boolean): B;
 		getFilter(): object;
 		hasFilter(): boolean;
 	}

src/filter-builder.js

@@ -12,8 +12,9 @@ export default function filterBuilder (options) {
     filters
   )
 
-  function addMinimumShouldMatch(str) {
+  function addMinimumShouldMatch(str, override) {
     filters.minimum_should_match = str
+    filters.minimum_should_match_override = override
   }
 
   return {
@@ -90,10 +91,11 @@ export default function filterBuilder (options) {
      *
      * @param  {any} param  minimum_should_match parameter. For possible values
      *                      see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
+     * @param {boolean} override  allows minimum_should_match to be overridden, ignoring internal constraints
      * @return {bodybuilder} Builder.
      */
-    filterMinimumShouldMatch (param) {
-      addMinimumShouldMatch(param)
+    filterMinimumShouldMatch (param, override) {
+      addMinimumShouldMatch(param, !!override)
       return this
     },
 

src/query-builder.js

@@ -9,8 +9,9 @@ export default function queryBuilder (options) {
 
   const makeQuery = pushQuery.bind(options || {}, query)
 
-  function addMinimumShouldMatch(str) {
+  function addMinimumShouldMatch(str, override = false) {
     query.minimum_should_match = str
+    query.minimum_should_match_override = override
   }
 
   return {
@@ -106,10 +107,11 @@ export default function queryBuilder (options) {
      *
      * @param  {any} param  minimum_should_match parameter. For possible values
      *                      see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html
+     * @param {boolean} override  allows minimum_should_match to be overridden, ignoring internal constraints
      * @return {bodybuilder} Builder.
      */
-    queryMinimumShouldMatch (param) {
-      addMinimumShouldMatch(param)
+    queryMinimumShouldMatch (param, override) {
+      addMinimumShouldMatch(param, !!override)
       return this
     },
 

src/utils.js

@@ -89,8 +89,8 @@ export function toBool (filters) {
     cleaned.must_not = filters.not
   }
   if (
-    unwrapped.minimum_should_match &&
-    filters.or.length > 1
+    (unwrapped.minimum_should_match &&
+    filters.or.length > 1) || filters.minimum_should_match_override
   ) {
     cleaned.minimum_should_match = unwrapped.minimum_should_match
   }

test/index.js

@@ -746,6 +746,55 @@ test('bodybuilder | minimum_should_match filter', (t) => {
   })
 })
 
+test('bodybuilder | minimum_should_match with 1 filter', (t) => {
+  t.plan(1)
+
+  const result = bodyBuilder()
+    .orFilter('term', 'user', 'kimchy')
+    .filterMinimumShouldMatch(2)
+    .build()
+
+  t.deepEqual(result,
+    {
+      query: {
+        bool: {
+          filter: {
+            bool: {
+              should: [
+                {term: {user: 'kimchy'}}
+              ]
+            }
+          }
+        }
+      }
+    })
+})
+
+test('bodybuilder | minimum_should_match with 1 filter + override', (t) => {
+  t.plan(1)
+
+  const result = bodyBuilder()
+    .orFilter('term', 'user', 'kimchy')
+    .filterMinimumShouldMatch(1, true)
+    .build()
+
+  t.deepEqual(result,
+    {
+      query: {
+        bool: {
+          filter: {
+            bool: {
+              should: [
+                {term: {user: 'kimchy'}}
+              ],
+              minimum_should_match: 1
+            }
+          }
+        }
+      }
+    })
+})
+
 test('bodybuilder | minimum_should_match query', (t) => {
   t.plan(1)
 

typing-tests/bodybuilder-tests.ts

@@ -140,6 +140,12 @@ bodybuilder()
     .filterMinimumShouldMatch(1)
     .queryMinimumShouldMatch(2)
     .build();
+bodybuilder()
+    .orQuery('term', 'user', 'kimchy')
+    .orFilter('term', 'user', 'kimchy')
+    .filterMinimumShouldMatch(1, true)
+    .queryMinimumShouldMatch(2, true)
+    .build();
 bodybuilder()
     .query('bool', b => b.orQuery('match', 'title', 'Solr').orQuery('match', 'title', 'Elasticsearch'))
     .query('match', 'authors', 'clinton gormely')