@webiny/api-elasticsearch 0.0.0-mt-3 → 0.0.0-unstable.2af142b57e

package/plugins/operator/between.js

@@ -1,42 +1,35 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorBetweenPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 class ElasticsearchQueryBuilderOperatorBetweenPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.between.default");
   }
-
   getOperator() {
     return "between";
   }
-
   apply(query, params) {
     const {
       value,
-      basePath
+      basePath,
+      name
     } = params;
-
     if (Array.isArray(value) === false) {
-      throw new Error(`You cannot filter field path "${basePath}" with between query and not send an array of values.`);
+      throw new Error(`You cannot filter field path "${name}" with between query and not send an array of values.`);
     } else if (value.length !== 2) {
-      throw new Error(`You must pass 2 values in the array for field path "${basePath}" filtering.`);
-    } // we take gte first because it should be a lesser value than lte, eg [5, 10]
+      throw new Error(`You must pass 2 values in the array for field path "${name}" filtering.`);
+    }
+    // we take gte first because it should be a lesser value than lte, eg [5, 10]
     // 6 >= gte && 6 <= lte
-
-
     const [gte, lte] = value;
-    query.must.push({
+    query.filter.push({
       range: {
         [basePath]: {
           lte,
@@ -45,7 +38,5 @@ class ElasticsearchQueryBuilderOperatorBetweenPlugin extends _ElasticsearchQuery
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorBetweenPlugin = ElasticsearchQueryBuilderOperatorBetweenPlugin;

package/plugins/operator/between.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorBetweenPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","basePath","name","Array","isArray","Error","length","gte","lte","filter","push","range"],"sources":["between.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorBetweenPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.between.default\";\n\n    public getOperator(): string {\n        return \"between\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value, basePath, name } = params;\n        if (Array.isArray(value) === false) {\n            throw new Error(\n                `You cannot filter field path \"${name}\" with between query and not send an array of values.`\n            );\n        } else if (value.length !== 2) {\n            throw new Error(\n                `You must pass 2 values in the array for field path \"${name}\" filtering.`\n            );\n        }\n        // we take gte first because it should be a lesser value than lte, eg [5, 10]\n        // 6 >= gte && 6 <= lte\n        const [gte, lte] = value;\n        query.filter.push({\n            range: {\n                [basePath]: {\n                    lte,\n                    gte\n                }\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAGO,MAAMA,8CAA8C,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CACjF,qDAAqD;EAAA;EAErEC,WAAW,GAAW;IACzB,OAAO,SAAS;EACpB;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC,QAAQ;MAAEC;IAAK,CAAC,GAAGH,MAAM;IACxC,IAAII,KAAK,CAACC,OAAO,CAACJ,KAAK,CAAC,KAAK,KAAK,EAAE;MAChC,MAAM,IAAIK,KAAK,CACV,iCAAgCH,IAAK,uDAAsD,CAC/F;IACL,CAAC,MAAM,IAAIF,KAAK,CAACM,MAAM,KAAK,CAAC,EAAE;MAC3B,MAAM,IAAID,KAAK,CACV,uDAAsDH,IAAK,cAAa,CAC5E;IACL;IACA;IACA;IACA,MAAM,CAACK,GAAG,EAAEC,GAAG,CAAC,GAAGR,KAAK;IACxBF,KAAK,CAACW,MAAM,CAACC,IAAI,CAAC;MACdC,KAAK,EAAE;QACH,CAACV,QAAQ,GAAG;UACRO,GAAG;UACHD;QACJ;MACJ;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/contains.js

@@ -1,28 +1,21 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorContainsPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 var _normalize = require("../../normalize");
-
 class ElasticsearchQueryBuilderOperatorContainsPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.contains.default");
   }
-
   getOperator() {
     return "contains";
   }
-
   apply(query, params) {
     const {
       value,
@@ -32,12 +25,10 @@ class ElasticsearchQueryBuilderOperatorContainsPlugin extends _ElasticsearchQuer
       query_string: {
         allow_leading_wildcard: true,
         fields: [basePath],
-        query: (0, _normalize.normalizeValue)(value),
+        query: `*${(0, _normalize.normalizeValue)(value)}*`,
         default_operator: "and"
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorContainsPlugin = ElasticsearchQueryBuilderOperatorContainsPlugin;

package/plugins/operator/contains.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","basePath","must","push","query_string","allow_leading_wildcard","fields","normalizeValue","default_operator"],"sources":["contains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValue } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.contains.default\";\n\n    public getOperator(): string {\n        return \"contains\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value, basePath } = params;\n        query.must.push({\n            query_string: {\n                allow_leading_wildcard: true,\n                fields: [basePath],\n                query: `*${normalizeValue(value)}*`,\n                default_operator: \"and\"\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AACA;AAGO,MAAMA,+CAA+C,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CAClF,sDAAsD;EAAA;EAEtEC,WAAW,GAAW;IACzB,OAAO,UAAU;EACrB;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,IAAI,CAACC,IAAI,CAAC;MACZC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BC,MAAM,EAAE,CAACL,QAAQ,CAAC;QAClBH,KAAK,EAAG,IAAG,IAAAS,yBAAc,EAACP,KAAK,CAAE,GAAE;QACnCQ,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/equal.js

@@ -1,45 +1,60 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorEqualPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 class ElasticsearchQueryBuilderOperatorEqualPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.equal.default");
   }
-
   getOperator() {
     return "eq";
   }
-
   apply(query, params) {
     const {
       value,
       path,
       basePath
     } = params;
+    if (value === null) {
+      query.must_not.push({
+        exists: {
+          field: path
+        }
+      });
+      return;
+    }
+    const typeOf = typeof value;
+    /**
+     * If value is a number or boolean, use filtering instead of must/term
+     */
+    if (typeOf === "number" || typeOf === "boolean") {
+      query.filter.push({
+        term: {
+          [basePath]: value
+        }
+      });
+      return;
+    }
     /**
      * In case we are searching for a string, use regular path.
-     * Otherwise use base path
+     * Otherwise use base path.
      */
-
-    const useBasePath = typeof value !== "string";
-    query.must.push({
+    const useBasePath = typeOf !== "string";
+    const valuePath = useBasePath ? basePath : path;
+    /**
+     * String or something else.
+     */
+    query.filter.push({
       term: {
-        [useBasePath ? basePath : path]: value
+        [valuePath]: value
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorEqualPlugin = ElasticsearchQueryBuilderOperatorEqualPlugin;

package/plugins/operator/equal.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorEqualPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","path","basePath","must_not","push","exists","field","typeOf","filter","term","useBasePath","valuePath"],"sources":["equal.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorEqualPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.equal.default\";\n\n    public getOperator(): string {\n        return \"eq\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value, path, basePath } = params;\n\n        if (value === null) {\n            query.must_not.push({\n                exists: {\n                    field: path\n                }\n            });\n            return;\n        }\n        const typeOf = typeof value;\n        /**\n         * If value is a number or boolean, use filtering instead of must/term\n         */\n        if (typeOf === \"number\" || typeOf === \"boolean\") {\n            query.filter.push({\n                term: {\n                    [basePath]: value\n                }\n            });\n            return;\n        }\n        /**\n         * In case we are searching for a string, use regular path.\n         * Otherwise use base path.\n         */\n        const useBasePath = typeOf !== \"string\";\n        const valuePath = useBasePath ? basePath : path;\n        /**\n         * String or something else.\n         */\n        query.filter.push({\n            term: {\n                [valuePath]: value\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAGO,MAAMA,4CAA4C,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CAC/E,mDAAmD;EAAA;EAEnEC,WAAW,GAAW;IACzB,OAAO,IAAI;EACf;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC,IAAI;MAAEC;IAAS,CAAC,GAAGH,MAAM;IAExC,IAAIC,KAAK,KAAK,IAAI,EAAE;MAChBF,KAAK,CAACK,QAAQ,CAACC,IAAI,CAAC;QAChBC,MAAM,EAAE;UACJC,KAAK,EAAEL;QACX;MACJ,CAAC,CAAC;MACF;IACJ;IACA,MAAMM,MAAM,GAAG,OAAOP,KAAK;IAC3B;AACR;AACA;IACQ,IAAIO,MAAM,KAAK,QAAQ,IAAIA,MAAM,KAAK,SAAS,EAAE;MAC7CT,KAAK,CAACU,MAAM,CAACJ,IAAI,CAAC;QACdK,IAAI,EAAE;UACF,CAACP,QAAQ,GAAGF;QAChB;MACJ,CAAC,CAAC;MACF;IACJ;IACA;AACR;AACA;AACA;IACQ,MAAMU,WAAW,GAAGH,MAAM,KAAK,QAAQ;IACvC,MAAMI,SAAS,GAAGD,WAAW,GAAGR,QAAQ,GAAGD,IAAI;IAC/C;AACR;AACA;IACQH,KAAK,CAACU,MAAM,CAACJ,IAAI,CAAC;MACdK,IAAI,EAAE;QACF,CAACE,SAAS,GAAGX;MACjB;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/gt.js

@@ -1,32 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorGreaterThanPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 class ElasticsearchQueryBuilderOperatorGreaterThanPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.greaterThan.default");
   }
-
   getOperator() {
     return "gt";
   }
-
   apply(query, params) {
     const {
       value,
       basePath
     } = params;
-    query.must.push({
+    query.filter.push({
       range: {
         [basePath]: {
           gt: value
@@ -34,7 +28,5 @@ class ElasticsearchQueryBuilderOperatorGreaterThanPlugin extends _ElasticsearchQ
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorGreaterThanPlugin = ElasticsearchQueryBuilderOperatorGreaterThanPlugin;

package/plugins/operator/gt.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorGreaterThanPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","basePath","filter","push","range","gt"],"sources":["gt.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorGreaterThanPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.greaterThan.default\";\n\n    public getOperator(): string {\n        return \"gt\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value, basePath } = params;\n        query.filter.push({\n            range: {\n                [basePath]: {\n                    gt: value\n                }\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAGO,MAAMA,kDAAkD,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CACrF,yDAAyD;EAAA;EAEzEC,WAAW,GAAW;IACzB,OAAO,IAAI;EACf;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,MAAM,CAACC,IAAI,CAAC;MACdC,KAAK,EAAE;QACH,CAACH,QAAQ,GAAG;UACRI,EAAE,EAAEL;QACR;MACJ;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/gte.js

@@ -1,32 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 class ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.greaterThanOrEqualTo.default");
   }
-
   getOperator() {
     return "gte";
   }
-
   apply(query, params) {
     const {
       value,
       basePath
     } = params;
-    query.must.push({
+    query.filter.push({
       range: {
         [basePath]: {
           gte: value
@@ -34,7 +28,5 @@ class ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin extends _Elast
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin = ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin;

package/plugins/operator/gte.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","basePath","filter","push","range","gte"],"sources":["gte.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorGreaterThanOrEqualToPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.greaterThanOrEqualTo.default\";\n\n    public getOperator(): string {\n        return \"gte\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value, basePath } = params;\n        query.filter.push({\n            range: {\n                [basePath]: {\n                    gte: value\n                }\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAGO,MAAMA,2DAA2D,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CAC9F,kEAAkE;EAAA;EAElFC,WAAW,GAAW;IACzB,OAAO,KAAK;EAChB;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,MAAM,CAACC,IAAI,CAAC;MACdC,KAAK,EAAE;QACH,CAACH,QAAQ,GAAG;UACRI,GAAG,EAAEL;QACT;MACJ;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/in.js

@@ -1,54 +1,39 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorInPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 class ElasticsearchQueryBuilderOperatorInPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.in.default");
   }
-
   getOperator() {
     return "in";
   }
-
   apply(query, params) {
     const {
       value: values,
       path,
-      basePath
+      basePath,
+      name
     } = params;
     const isArray = Array.isArray(values);
-
     if (isArray === false || values.length === 0) {
-      throw new Error(`You cannot filter field "${path}" with "in" operator and not send an array of values.`);
+      throw new Error(`You cannot filter field "${name}" with "in" operator and not send an array of values.`);
     }
 
-    let useBasePath = false; // Only use ".keyword" if all of the provided values are strings.
-
-    for (const value of values) {
-      if (typeof value !== "string") {
-        useBasePath = true;
-        break;
-      }
-    }
-
-    query.must.push({
+    // Only use ".keyword" if all of the provided values are strings.
+    const useBasePath = values.some(value => typeof value !== "string");
+    query.filter.push({
       terms: {
         [useBasePath ? basePath : path]: values
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorInPlugin = ElasticsearchQueryBuilderOperatorInPlugin;

package/plugins/operator/in.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorInPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","values","path","basePath","name","isArray","Array","length","Error","useBasePath","some","filter","push","terms"],"sources":["in.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorInPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.in.default\";\n\n    public getOperator(): string {\n        return \"in\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value: values, path, basePath, name } = params;\n        const isArray = Array.isArray(values);\n        if (isArray === false || values.length === 0) {\n            throw new Error(\n                `You cannot filter field \"${name}\" with \"in\" operator and not send an array of values.`\n            );\n        }\n\n        // Only use \".keyword\" if all of the provided values are strings.\n        const useBasePath = values.some(\n            (value: string | number | boolean | null | undefined) => typeof value !== \"string\"\n        );\n\n        query.filter.push({\n            terms: {\n                [useBasePath ? basePath : path]: values\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAGO,MAAMA,yCAAyC,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CAC5E,gDAAgD;EAAA;EAEhEC,WAAW,GAAW;IACzB,OAAO,IAAI;EACf;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK,EAAEC,MAAM;MAAEC,IAAI;MAAEC,QAAQ;MAAEC;IAAK,CAAC,GAAGL,MAAM;IACtD,MAAMM,OAAO,GAAGC,KAAK,CAACD,OAAO,CAACJ,MAAM,CAAC;IACrC,IAAII,OAAO,KAAK,KAAK,IAAIJ,MAAM,CAACM,MAAM,KAAK,CAAC,EAAE;MAC1C,MAAM,IAAIC,KAAK,CACV,4BAA2BJ,IAAK,uDAAsD,CAC1F;IACL;;IAEA;IACA,MAAMK,WAAW,GAAGR,MAAM,CAACS,IAAI,CAC1BV,KAAmD,IAAK,OAAOA,KAAK,KAAK,QAAQ,CACrF;IAEDF,KAAK,CAACa,MAAM,CAACC,IAAI,CAAC;MACdC,KAAK,EAAE;QACH,CAACJ,WAAW,GAAGN,QAAQ,GAAGD,IAAI,GAAGD;MACrC;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/index.d.ts

@@ -11,3 +11,6 @@ export * from "./not";
 export * from "./notBetween";
 export * from "./notContains";
 export * from "./notIn";
+export * from "./startsWith";
+export * from "./notStartsWith";
+export * from "./japanese/contains";

package/plugins/operator/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _between = require("./between");
-
 Object.keys(_between).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _between[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_between).forEach(function (key) {
     }
   });
 });
-
 var _contains = require("./contains");
-
 Object.keys(_contains).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _contains[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_contains).forEach(function (key) {
     }
   });
 });
-
 var _equal = require("./equal");
-
 Object.keys(_equal).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _equal[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_equal).forEach(function (key) {
     }
   });
 });
-
 var _gt = require("./gt");
-
 Object.keys(_gt).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _gt[key]) return;
@@ -55,9 +47,7 @@ Object.keys(_gt).forEach(function (key) {
     }
   });
 });
-
 var _gte = require("./gte");
-
 Object.keys(_gte).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _gte[key]) return;
@@ -68,9 +58,7 @@ Object.keys(_gte).forEach(function (key) {
     }
   });
 });
-
 var _andIn = require("./andIn");
-
 Object.keys(_andIn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _andIn[key]) return;
@@ -81,9 +69,7 @@ Object.keys(_andIn).forEach(function (key) {
     }
   });
 });
-
 var _in = require("./in");
-
 Object.keys(_in).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _in[key]) return;
@@ -94,9 +80,7 @@ Object.keys(_in).forEach(function (key) {
     }
   });
 });
-
 var _lt = require("./lt");
-
 Object.keys(_lt).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _lt[key]) return;
@@ -107,9 +91,7 @@ Object.keys(_lt).forEach(function (key) {
     }
   });
 });
-
 var _lte = require("./lte");
-
 Object.keys(_lte).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _lte[key]) return;
@@ -120,9 +102,7 @@ Object.keys(_lte).forEach(function (key) {
     }
   });
 });
-
 var _not = require("./not");
-
 Object.keys(_not).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _not[key]) return;
@@ -133,9 +113,7 @@ Object.keys(_not).forEach(function (key) {
     }
   });
 });
-
 var _notBetween = require("./notBetween");
-
 Object.keys(_notBetween).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _notBetween[key]) return;
@@ -146,9 +124,7 @@ Object.keys(_notBetween).forEach(function (key) {
     }
   });
 });
-
 var _notContains = require("./notContains");
-
 Object.keys(_notContains).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _notContains[key]) return;
@@ -159,9 +135,7 @@ Object.keys(_notContains).forEach(function (key) {
     }
   });
 });
-
 var _notIn = require("./notIn");
-
 Object.keys(_notIn).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _notIn[key]) return;
@@ -171,4 +145,37 @@ Object.keys(_notIn).forEach(function (key) {
       return _notIn[key];
     }
   });
+});
+var _startsWith = require("./startsWith");
+Object.keys(_startsWith).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _startsWith[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _startsWith[key];
+    }
+  });
+});
+var _notStartsWith = require("./notStartsWith");
+Object.keys(_notStartsWith).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _notStartsWith[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _notStartsWith[key];
+    }
+  });
+});
+var _contains2 = require("./japanese/contains");
+Object.keys(_contains2).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _contains2[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _contains2[key];
+    }
+  });
 });

package/plugins/operator/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./between\";\nexport * from \"./contains\";\nexport * from \"./equal\";\nexport * from \"./gt\";\nexport * from \"./gte\";\nexport * from \"./andIn\";\nexport * from \"./in\";\nexport * from \"./lt\";\nexport * from \"./lte\";\nexport * from \"./not\";\nexport * from \"./notBetween\";\nexport * from \"./notContains\";\nexport * from \"./notIn\";\nexport * from \"./startsWith\";\nexport * from \"./notStartsWith\";\nexport * from \"./japanese/contains\";\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/plugins/operator/japanese/contains.d.ts

@@ -0,0 +1,8 @@
+import { ElasticsearchQueryBuilderOperatorPlugin } from "../../definition/ElasticsearchQueryBuilderOperatorPlugin";
+import { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from "../../../types";
+export declare class ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {
+    name: string;
+    isLocaleSupported(code: string): boolean;
+    getOperator(): string;
+    apply(query: ElasticsearchBoolQueryConfig, params: ElasticsearchQueryBuilderArgsPlugin): void;
+}

package/plugins/operator/japanese/contains.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _ElasticsearchQueryBuilderOperatorPlugin = require("../../definition/ElasticsearchQueryBuilderOperatorPlugin");
+var _normalize = require("../../../normalize");
+class ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.contains.japanese");
+  }
+  isLocaleSupported(code) {
+    if (!code) {
+      return false;
+    }
+    return ["ja", "ja-jp"].includes(code.toLowerCase());
+  }
+  getOperator() {
+    return "contains";
+  }
+  apply(query, params) {
+    const {
+      value: initialValue,
+      basePath
+    } = params;
+    const value = (0, _normalize.normalizeValue)(initialValue);
+    query.must.push({
+      multi_match: {
+        query: `*${value}*`,
+        type: "phrase",
+        fields: [`${basePath}.ngram`]
+      }
+    });
+    query.should.push({
+      multi_match: {
+        query: `*${value}*`,
+        type: "phrase",
+        fields: [`${basePath}`]
+      }
+    });
+  }
+}
+exports.ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin = ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin;

package/plugins/operator/japanese/contains.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","isLocaleSupported","code","includes","toLowerCase","getOperator","apply","query","params","value","initialValue","basePath","normalizeValue","must","push","multi_match","type","fields","should"],"sources":["contains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValue } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.contains.japanese\";\n\n    public override isLocaleSupported(code: string): boolean {\n        if (!code) {\n            return false;\n        }\n        return [\"ja\", \"ja-jp\"].includes(code.toLowerCase());\n    }\n\n    public getOperator(): string {\n        return \"contains\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value: initialValue, basePath } = params;\n\n        const value = normalizeValue(initialValue);\n        query.must.push({\n            multi_match: {\n                query: `*${value}*`,\n                type: \"phrase\",\n                fields: [`${basePath}.ngram`]\n            }\n        });\n        query.should.push({\n            multi_match: {\n                query: `*${value}*`,\n                type: \"phrase\",\n                fields: [`${basePath}`]\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AACA;AAGO,MAAMA,uDAAuD,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CAC1F,uDAAuD;EAAA;EAE9DC,iBAAiB,CAACC,IAAY,EAAW;IACrD,IAAI,CAACA,IAAI,EAAE;MACP,OAAO,KAAK;IAChB;IACA,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAACC,QAAQ,CAACD,IAAI,CAACE,WAAW,EAAE,CAAC;EACvD;EAEOC,WAAW,GAAW;IACzB,OAAO,UAAU;EACrB;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK,EAAEC,YAAY;MAAEC;IAAS,CAAC,GAAGH,MAAM;IAEhD,MAAMC,KAAK,GAAG,IAAAG,yBAAc,EAACF,YAAY,CAAC;IAC1CH,KAAK,CAACM,IAAI,CAACC,IAAI,CAAC;MACZC,WAAW,EAAE;QACTR,KAAK,EAAG,IAAGE,KAAM,GAAE;QACnBO,IAAI,EAAE,QAAQ;QACdC,MAAM,EAAE,CAAE,GAAEN,QAAS,QAAO;MAChC;IACJ,CAAC,CAAC;IACFJ,KAAK,CAACW,MAAM,CAACJ,IAAI,CAAC;MACdC,WAAW,EAAE;QACTR,KAAK,EAAG,IAAGE,KAAM,GAAE;QACnBO,IAAI,EAAE,QAAQ;QACdC,MAAM,EAAE,CAAE,GAAEN,QAAS,EAAC;MAC1B;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}

package/plugins/operator/lt.js

@@ -1,32 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ElasticsearchQueryBuilderOperatorLesserThanPlugin = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _ElasticsearchQueryBuilderOperatorPlugin = require("../definition/ElasticsearchQueryBuilderOperatorPlugin");
-
 class ElasticsearchQueryBuilderOperatorLesserThanPlugin extends _ElasticsearchQueryBuilderOperatorPlugin.ElasticsearchQueryBuilderOperatorPlugin {
   constructor(...args) {
     super(...args);
     (0, _defineProperty2.default)(this, "name", "elasticsearch.queryBuilder.operator.lesserThan.default");
   }
-
   getOperator() {
     return "lt";
   }
-
   apply(query, params) {
     const {
       value,
       basePath
     } = params;
-    query.must.push({
+    query.filter.push({
       range: {
         [basePath]: {
           lt: value
@@ -34,7 +28,5 @@ class ElasticsearchQueryBuilderOperatorLesserThanPlugin extends _ElasticsearchQu
       }
     });
   }
-
 }
-
 exports.ElasticsearchQueryBuilderOperatorLesserThanPlugin = ElasticsearchQueryBuilderOperatorLesserThanPlugin;

package/plugins/operator/lt.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorLesserThanPlugin","ElasticsearchQueryBuilderOperatorPlugin","getOperator","apply","query","params","value","basePath","filter","push","range","lt"],"sources":["lt.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorLesserThanPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n    public override name = \"elasticsearch.queryBuilder.operator.lesserThan.default\";\n\n    public getOperator(): string {\n        return \"lt\";\n    }\n\n    public apply(\n        query: ElasticsearchBoolQueryConfig,\n        params: ElasticsearchQueryBuilderArgsPlugin\n    ): void {\n        const { value, basePath } = params;\n        query.filter.push({\n            range: {\n                [basePath]: {\n                    lt: value\n                }\n            }\n        });\n    }\n}\n"],"mappings":";;;;;;;;AAAA;AAGO,MAAMA,iDAAiD,SAASC,gFAAuC,CAAC;EAAA;IAAA;IAAA,4CACpF,wDAAwD;EAAA;EAExEC,WAAW,GAAW;IACzB,OAAO,IAAI;EACf;EAEOC,KAAK,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,MAAM,CAACC,IAAI,CAAC;MACdC,KAAK,EAAE;QACH,CAACH,QAAQ,GAAG;UACRI,EAAE,EAAEL;QACR;MACJ;IACJ,CAAC,CAAC;EACN;AACJ;AAAC"}