@webiny/api-headless-cms-ddb-es 6.0.0-alpha.5 → 6.0.0-rc.0

package/operations/entry/elasticsearch/fullTextSearchFields.js.map

@@ -1 +1 @@
-{"version":3,"names":["createFullTextSearchFields","params","term","model","fields","length","trim","reduce","collection","fieldId","field","find","f","push","exports"],"sources":["fullTextSearchFields.ts"],"sourcesContent":["import type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    model: CmsModel;\n    term?: string;\n    fields?: string[];\n}\nexport const createFullTextSearchFields = (params: Params): CmsModelField[] => {\n    const { term, model, fields } = params;\n    if (!fields || fields.length === 0 || !term || term.trim().length === 0) {\n        return [];\n    }\n    return fields.reduce<CmsModelField[]>((collection, fieldId) => {\n        const field = model.fields.find(f => f.fieldId === fieldId);\n        if (!field) {\n            return collection;\n        }\n        collection.push(field);\n        return collection;\n    }, []);\n};\n"],"mappings":";;;;;;AAOO,MAAMA,0BAA0B,GAAIC,MAAc,IAAsB;EAC3E,MAAM;IAAEC,IAAI;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGH,MAAM;EACtC,IAAI,CAACG,MAAM,IAAIA,MAAM,CAACC,MAAM,KAAK,CAAC,IAAI,CAACH,IAAI,IAAIA,IAAI,CAACI,IAAI,CAAC,CAAC,CAACD,MAAM,KAAK,CAAC,EAAE;IACrE,OAAO,EAAE;EACb;EACA,OAAOD,MAAM,CAACG,MAAM,CAAkB,CAACC,UAAU,EAAEC,OAAO,KAAK;IAC3D,MAAMC,KAAK,GAAGP,KAAK,CAACC,MAAM,CAACO,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACH,OAAO,KAAKA,OAAO,CAAC;IAC3D,IAAI,CAACC,KAAK,EAAE;MACR,OAAOF,UAAU;IACrB;IACAA,UAAU,CAACK,IAAI,CAACH,KAAK,CAAC;IACtB,OAAOF,UAAU;EACrB,CAAC,EAAE,EAAE,CAAC;AACV,CAAC;AAACM,OAAA,CAAAd,0BAAA,GAAAA,0BAAA","ignoreList":[]}
+{"version":3,"names":["createFullTextSearchFields","params","term","model","fields","length","trim","reduce","collection","fieldId","field","find","f","push"],"sources":["fullTextSearchFields.ts"],"sourcesContent":["import type { CmsModel, CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\n\ninterface Params {\n    model: CmsModel;\n    term?: string;\n    fields?: string[];\n}\nexport const createFullTextSearchFields = (params: Params): CmsModelField[] => {\n    const { term, model, fields } = params;\n    if (!fields || fields.length === 0 || !term || term.trim().length === 0) {\n        return [];\n    }\n    return fields.reduce<CmsModelField[]>((collection, fieldId) => {\n        const field = model.fields.find(f => f.fieldId === fieldId);\n        if (!field) {\n            return collection;\n        }\n        collection.push(field);\n        return collection;\n    }, []);\n};\n"],"mappings":"AAOA,OAAO,MAAMA,0BAA0B,GAAIC,MAAc,IAAsB;EAC3E,MAAM;IAAEC,IAAI;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAAGH,MAAM;EACtC,IAAI,CAACG,MAAM,IAAIA,MAAM,CAACC,MAAM,KAAK,CAAC,IAAI,CAACH,IAAI,IAAIA,IAAI,CAACI,IAAI,CAAC,CAAC,CAACD,MAAM,KAAK,CAAC,EAAE;IACrE,OAAO,EAAE;EACb;EACA,OAAOD,MAAM,CAACG,MAAM,CAAkB,CAACC,UAAU,EAAEC,OAAO,KAAK;IAC3D,MAAMC,KAAK,GAAGP,KAAK,CAACC,MAAM,CAACO,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACH,OAAO,KAAKA,OAAO,CAAC;IAC3D,IAAI,CAACC,KAAK,EAAE;MACR,OAAOF,UAAU;IACrB;IACAA,UAAU,CAACK,IAAI,CAACH,KAAK,CAAC;IACtB,OAAOF,UAAU;EACrB,CAAC,EAAE,EAAE,CAAC;AACV,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/initialQuery.d.ts

@@ -1,5 +1,5 @@
-import type { ElasticsearchBoolQueryConfig } from "@webiny/api-elasticsearch/types";
-import type { CmsEntryListWhere, CmsModel } from "@webiny/api-headless-cms/types";
+import type { ElasticsearchBoolQueryConfig } from "@webiny/api-elasticsearch/types.js";
+import type { CmsEntryListWhere, CmsModel } from "@webiny/api-headless-cms/types/index.js";
 export declare const createBaseQuery: () => ElasticsearchBoolQueryConfig;
 interface Params {
     model: CmsModel;

package/operations/entry/elasticsearch/initialQuery.js

@@ -1,14 +1,7 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createInitialQuery = exports.createBaseQuery = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _recordType = require("../recordType");
-var _apiElasticsearch = require("@webiny/api-elasticsearch");
-const createBaseQuery = () => {
+import WebinyError from "@webiny/error";
+import { createLatestRecordType, createPublishedRecordType } from "../recordType.js";
+import { isSharedElasticsearchIndex } from "@webiny/api-elasticsearch";
+export const createBaseQuery = () => {
   return {
     must: [],
     must_not: [],
@@ -16,7 +9,6 @@ const createBaseQuery = () => {
     filter: []
   };
 };
-exports.createBaseQuery = createBaseQuery;
 /**
  * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.
  * We allow either published or either latest.
@@ -25,7 +17,7 @@ exports.createBaseQuery = createBaseQuery;
  *
  * We add the query.filter terms because we do not need scored search here and it is a bit faster.
  */
-const createInitialQuery = params => {
+export const createInitialQuery = params => {
   const {
     model,
     where
@@ -37,7 +29,7 @@ const createInitialQuery = params => {
    *
    * TODO determine if we want to search across tenants in shared index?
    */
-  const sharedIndex = (0, _apiElasticsearch.isSharedElasticsearchIndex)();
+  const sharedIndex = isSharedElasticsearchIndex();
   if (sharedIndex) {
     /**
      * Tenant for the filtering is taken from the model.
@@ -57,15 +49,6 @@ const createInitialQuery = params => {
         "modelId.keyword": model.modelId
       }
     });
-    /**
-     * TODO determine if we want to search across locales?
-     * This search would anyway work for a single model and when sharing index.
-     */
-    query.filter.push({
-      term: {
-        "locale.keyword": model.locale
-      }
-    });
   }
 
   /**
@@ -74,13 +57,13 @@ const createInitialQuery = params => {
   if (where.published === true) {
     query.filter.push({
       term: {
-        "__type.keyword": (0, _recordType.createPublishedRecordType)()
+        "__type.keyword": createPublishedRecordType()
       }
     });
   } else if (where.latest === true) {
     query.filter.push({
       term: {
-        "__type.keyword": (0, _recordType.createLatestRecordType)()
+        "__type.keyword": createLatestRecordType()
       }
     });
   }
@@ -89,7 +72,7 @@ const createInitialQuery = params => {
    * We do not allow filtering without the published or latest parameter.
    * Also, we do not want to set the default one, as there is a large possibility for user error when filtering.
    */else {
-    throw new _error.default(`Cannot call Elasticsearch query when not setting "published" or "latest".`, "ELASTICSEARCH_UNSUPPORTED_QUERY", {
+    throw new WebinyError(`Cannot call Elasticsearch query when not setting "published" or "latest".`, "OPENSEARCH_UNSUPPORTED_QUERY", {
       where
     });
   }
@@ -101,6 +84,5 @@ const createInitialQuery = params => {
   delete where.latest;
   return query;
 };
-exports.createInitialQuery = createInitialQuery;
 
 //# sourceMappingURL=initialQuery.js.map

package/operations/entry/elasticsearch/initialQuery.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_recordType","_apiElasticsearch","createBaseQuery","must","must_not","should","filter","exports","createInitialQuery","params","model","where","query","sharedIndex","isSharedElasticsearchIndex","push","term","tenant","modelId","locale","published","createPublishedRecordType","latest","createLatestRecordType","WebinyError"],"sources":["initialQuery.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { createLatestRecordType, createPublishedRecordType } from \"../recordType\";\nimport { isSharedElasticsearchIndex } from \"@webiny/api-elasticsearch\";\n\nexport const createBaseQuery = (): ElasticsearchBoolQueryConfig => {\n    return {\n        must: [],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface Params {\n    model: CmsModel;\n    where: CmsEntryListWhere;\n}\n/**\n * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.\n * We allow either published or either latest.\n * Latest is used in the manage API and published in the read API.\n *\n *\n * We add the query.filter terms because we do not need scored search here and it is a bit faster.\n */\nexport const createInitialQuery = (params: Params): ElasticsearchBoolQueryConfig => {\n    const { model, where } = params;\n\n    const query = createBaseQuery();\n\n    /**\n     * When ES index is shared between tenants, we need to filter records by tenant ID\n     *\n     * TODO determine if we want to search across tenants in shared index?\n     */\n    const sharedIndex = isSharedElasticsearchIndex();\n    if (sharedIndex) {\n        /**\n         * Tenant for the filtering is taken from the model.\n         *\n         * TODO determine if we want to send it in the \"where\" parameter?\n         */\n        query.filter.push({\n            term: {\n                \"tenant.keyword\": model.tenant\n            }\n        });\n        /**\n         * Also, we must search only in selected model.\n         */\n        query.filter.push({\n            term: {\n                \"modelId.keyword\": model.modelId\n            }\n        });\n        /**\n         * TODO determine if we want to search across locales?\n         * This search would anyway work for a single model and when sharing index.\n         */\n        query.filter.push({\n            term: {\n                \"locale.keyword\": model.locale\n            }\n        });\n    }\n\n    /**\n     * We must transform published and latest where args into something that is understandable by our Elasticsearch\n     */\n    if (where.published === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createPublishedRecordType()\n            }\n        });\n    } else if (where.latest === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createLatestRecordType()\n            }\n        });\n    }\n    //\n    /**\n     * We do not allow filtering without the published or latest parameter.\n     * Also, we do not want to set the default one, as there is a large possibility for user error when filtering.\n     */\n    else {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query when not setting \"published\" or \"latest\".`,\n            \"ELASTICSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    }\n    /**\n     * We need to remove fields that actually do not exist on the record - it will break otherwise.\n     * This will modify the original object, which is what we want.\n     */\n    delete where.published;\n    delete where.latest;\n\n    return query;\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,iBAAA,GAAAF,OAAA;AAEO,MAAMG,eAAe,GAAGA,CAAA,KAAoC;EAC/D,OAAO;IACHC,IAAI,EAAE,EAAE;IACRC,QAAQ,EAAE,EAAE;IACZC,MAAM,EAAE,EAAE;IACVC,MAAM,EAAE;EACZ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAL,eAAA,GAAAA,eAAA;AAMF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMM,kBAAkB,GAAIC,MAAc,IAAmC;EAChF,MAAM;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAE/B,MAAMG,KAAK,GAAGV,eAAe,CAAC,CAAC;;EAE/B;AACJ;AACA;AACA;AACA;EACI,MAAMW,WAAW,GAAG,IAAAC,4CAA0B,EAAC,CAAC;EAChD,IAAID,WAAW,EAAE;IACb;AACR;AACA;AACA;AACA;IACQD,KAAK,CAACN,MAAM,CAACS,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAEN,KAAK,CAACO;MAC5B;IACJ,CAAC,CAAC;IACF;AACR;AACA;IACQL,KAAK,CAACN,MAAM,CAACS,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,iBAAiB,EAAEN,KAAK,CAACQ;MAC7B;IACJ,CAAC,CAAC;IACF;AACR;AACA;AACA;IACQN,KAAK,CAACN,MAAM,CAACS,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAEN,KAAK,CAACS;MAC5B;IACJ,CAAC,CAAC;EACN;;EAEA;AACJ;AACA;EACI,IAAIR,KAAK,CAACS,SAAS,KAAK,IAAI,EAAE;IAC1BR,KAAK,CAACN,MAAM,CAACS,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAE,IAAAK,qCAAyB,EAAC;MAChD;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAIV,KAAK,CAACW,MAAM,KAAK,IAAI,EAAE;IAC9BV,KAAK,CAACN,MAAM,CAACS,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAE,IAAAO,kCAAsB,EAAC;MAC7C;IACJ,CAAC,CAAC;EACN;EACA;EACA;AACJ;AACA;AACA,KAHI,KAIK;IACD,MAAM,IAAIC,cAAW,CACjB,2EAA2E,EAC3E,iCAAiC,EACjC;MACIb;IACJ,CACJ,CAAC;EACL;EACA;AACJ;AACA;AACA;EACI,OAAOA,KAAK,CAACS,SAAS;EACtB,OAAOT,KAAK,CAACW,MAAM;EAEnB,OAAOV,KAAK;AAChB,CAAC;AAACL,OAAA,CAAAC,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"names":["WebinyError","createLatestRecordType","createPublishedRecordType","isSharedElasticsearchIndex","createBaseQuery","must","must_not","should","filter","createInitialQuery","params","model","where","query","sharedIndex","push","term","tenant","modelId","published","latest"],"sources":["initialQuery.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ElasticsearchBoolQueryConfig } from \"@webiny/api-elasticsearch/types.js\";\nimport type { CmsEntryListWhere, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport { createLatestRecordType, createPublishedRecordType } from \"../recordType.js\";\nimport { isSharedElasticsearchIndex } from \"@webiny/api-elasticsearch\";\n\nexport const createBaseQuery = (): ElasticsearchBoolQueryConfig => {\n    return {\n        must: [],\n        must_not: [],\n        should: [],\n        filter: []\n    };\n};\n\ninterface Params {\n    model: CmsModel;\n    where: CmsEntryListWhere;\n}\n/**\n * Latest and published are specific in Elasticsearch to that extend that they are tagged in the __type property.\n * We allow either published or either latest.\n * Latest is used in the manage API and published in the read API.\n *\n *\n * We add the query.filter terms because we do not need scored search here and it is a bit faster.\n */\nexport const createInitialQuery = (params: Params): ElasticsearchBoolQueryConfig => {\n    const { model, where } = params;\n\n    const query = createBaseQuery();\n\n    /**\n     * When ES index is shared between tenants, we need to filter records by tenant ID\n     *\n     * TODO determine if we want to search across tenants in shared index?\n     */\n    const sharedIndex = isSharedElasticsearchIndex();\n    if (sharedIndex) {\n        /**\n         * Tenant for the filtering is taken from the model.\n         *\n         * TODO determine if we want to send it in the \"where\" parameter?\n         */\n        query.filter.push({\n            term: {\n                \"tenant.keyword\": model.tenant\n            }\n        });\n        /**\n         * Also, we must search only in selected model.\n         */\n        query.filter.push({\n            term: {\n                \"modelId.keyword\": model.modelId\n            }\n        });\n    }\n\n    /**\n     * We must transform published and latest where args into something that is understandable by our Elasticsearch\n     */\n    if (where.published === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createPublishedRecordType()\n            }\n        });\n    } else if (where.latest === true) {\n        query.filter.push({\n            term: {\n                \"__type.keyword\": createLatestRecordType()\n            }\n        });\n    }\n    //\n    /**\n     * We do not allow filtering without the published or latest parameter.\n     * Also, we do not want to set the default one, as there is a large possibility for user error when filtering.\n     */\n    else {\n        throw new WebinyError(\n            `Cannot call Elasticsearch query when not setting \"published\" or \"latest\".`,\n            \"OPENSEARCH_UNSUPPORTED_QUERY\",\n            {\n                where\n            }\n        );\n    }\n    /**\n     * We need to remove fields that actually do not exist on the record - it will break otherwise.\n     * This will modify the original object, which is what we want.\n     */\n    delete where.published;\n    delete where.latest;\n\n    return query;\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AAGvC,SAASC,sBAAsB,EAAEC,yBAAyB;AAC1D,SAASC,0BAA0B,QAAQ,2BAA2B;AAEtE,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAoC;EAC/D,OAAO;IACHC,IAAI,EAAE,EAAE;IACRC,QAAQ,EAAE,EAAE;IACZC,MAAM,EAAE,EAAE;IACVC,MAAM,EAAE;EACZ,CAAC;AACL,CAAC;AAMD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAIC,MAAc,IAAmC;EAChF,MAAM;IAAEC,KAAK;IAAEC;EAAM,CAAC,GAAGF,MAAM;EAE/B,MAAMG,KAAK,GAAGT,eAAe,CAAC,CAAC;;EAE/B;AACJ;AACA;AACA;AACA;EACI,MAAMU,WAAW,GAAGX,0BAA0B,CAAC,CAAC;EAChD,IAAIW,WAAW,EAAE;IACb;AACR;AACA;AACA;AACA;IACQD,KAAK,CAACL,MAAM,CAACO,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAEL,KAAK,CAACM;MAC5B;IACJ,CAAC,CAAC;IACF;AACR;AACA;IACQJ,KAAK,CAACL,MAAM,CAACO,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,iBAAiB,EAAEL,KAAK,CAACO;MAC7B;IACJ,CAAC,CAAC;EACN;;EAEA;AACJ;AACA;EACI,IAAIN,KAAK,CAACO,SAAS,KAAK,IAAI,EAAE;IAC1BN,KAAK,CAACL,MAAM,CAACO,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAEd,yBAAyB,CAAC;MAChD;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAIU,KAAK,CAACQ,MAAM,KAAK,IAAI,EAAE;IAC9BP,KAAK,CAACL,MAAM,CAACO,IAAI,CAAC;MACdC,IAAI,EAAE;QACF,gBAAgB,EAAEf,sBAAsB,CAAC;MAC7C;IACJ,CAAC,CAAC;EACN;EACA;EACA;AACJ;AACA;AACA,KAHI,KAIK;IACD,MAAM,IAAID,WAAW,CACjB,2EAA2E,EAC3E,8BAA8B,EAC9B;MACIY;IACJ,CACJ,CAAC;EACL;EACA;AACJ;AACA;AACA;EACI,OAAOA,KAAK,CAACO,SAAS;EACtB,OAAOP,KAAK,CAACQ,MAAM;EAEnB,OAAOP,KAAK;AAChB,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/keyword.d.ts

@@ -1,2 +1,2 @@
-import type { ModelField } from "./types";
+import type { ModelField } from "./types.js";
 export declare const hasKeyword: (field: ModelField) => boolean;

package/operations/entry/elasticsearch/keyword.js

@@ -1,15 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.hasKeyword = void 0;
+import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 const noKeywordFields = ["date", "datetime", "number", "boolean"];
-const hasKeyword = field => {
+export const hasKeyword = field => {
+  const fieldType = getBaseFieldType(field);
   /**
    * We defined some field types that MUST have no keyword added to the field path
    */
-  if (noKeywordFields.includes(field.type)) {
+  if (noKeywordFields.includes(fieldType)) {
     return false;
   }
   /**
@@ -31,6 +27,5 @@ const hasKeyword = field => {
    */
   return true;
 };
-exports.hasKeyword = hasKeyword;
 
 //# sourceMappingURL=keyword.js.map

package/operations/entry/elasticsearch/keyword.js.map

@@ -1 +1 @@
-{"version":3,"names":["noKeywordFields","hasKeyword","field","includes","type","unmappedType","keyword","exports"],"sources":["keyword.ts"],"sourcesContent":["import type { ModelField } from \"./types\";\n\nconst noKeywordFields: string[] = [\"date\", \"datetime\", \"number\", \"boolean\"];\nexport const hasKeyword = (field: ModelField): boolean => {\n    /**\n     * We defined some field types that MUST have no keyword added to the field path\n     */\n    if (noKeywordFields.includes(field.type)) {\n        return false;\n    }\n    /**\n     * If field has unmapped type defined, do not add keyword.\n     */\n    //\n    else if (field.unmappedType) {\n        return false;\n    }\n    /**\n     * And if specifically defined that field has no keyword, do not add it.\n     */\n    //\n    else if (field.keyword === false) {\n        return false;\n    }\n    /**\n     * All other fields have keyword added.\n     */\n    return true;\n};\n"],"mappings":";;;;;;AAEA,MAAMA,eAAyB,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,CAAC;AACpE,MAAMC,UAAU,GAAIC,KAAiB,IAAc;EACtD;AACJ;AACA;EACI,IAAIF,eAAe,CAACG,QAAQ,CAACD,KAAK,CAACE,IAAI,CAAC,EAAE;IACtC,OAAO,KAAK;EAChB;EACA;AACJ;AACA;EACI;EAAA,KACK,IAAIF,KAAK,CAACG,YAAY,EAAE;IACzB,OAAO,KAAK;EAChB;EACA;AACJ;AACA;EACI;EAAA,KACK,IAAIH,KAAK,CAACI,OAAO,KAAK,KAAK,EAAE;IAC9B,OAAO,KAAK;EAChB;EACA;AACJ;AACA;EACI,OAAO,IAAI;AACf,CAAC;AAACC,OAAA,CAAAN,UAAA,GAAAA,UAAA","ignoreList":[]}
+{"version":3,"names":["getBaseFieldType","noKeywordFields","hasKeyword","field","fieldType","includes","unmappedType","keyword"],"sources":["keyword.ts"],"sourcesContent":["import type { ModelField } from \"./types.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\nconst noKeywordFields: string[] = [\"date\", \"datetime\", \"number\", \"boolean\"];\nexport const hasKeyword = (field: ModelField): boolean => {\n    const fieldType = getBaseFieldType(field);\n    /**\n     * We defined some field types that MUST have no keyword added to the field path\n     */\n    if (noKeywordFields.includes(fieldType)) {\n        return false;\n    }\n    /**\n     * If field has unmapped type defined, do not add keyword.\n     */\n    //\n    else if (field.unmappedType) {\n        return false;\n    }\n    /**\n     * And if specifically defined that field has no keyword, do not add it.\n     */\n    //\n    else if (field.keyword === false) {\n        return false;\n    }\n    /**\n     * All other fields have keyword added.\n     */\n    return true;\n};\n"],"mappings":"AACA,SAASA,gBAAgB,QAAQ,oDAAoD;AAErF,MAAMC,eAAyB,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,CAAC;AAC3E,OAAO,MAAMC,UAAU,GAAIC,KAAiB,IAAc;EACtD,MAAMC,SAAS,GAAGJ,gBAAgB,CAACG,KAAK,CAAC;EACzC;AACJ;AACA;EACI,IAAIF,eAAe,CAACI,QAAQ,CAACD,SAAS,CAAC,EAAE;IACrC,OAAO,KAAK;EAChB;EACA;AACJ;AACA;EACI;EAAA,KACK,IAAID,KAAK,CAACG,YAAY,EAAE;IACzB,OAAO,KAAK;EAChB;EACA;AACJ;AACA;EACI;EAAA,KACK,IAAIH,KAAK,CAACI,OAAO,KAAK,KAAK,EAAE;IAC9B,OAAO,KAAK;EAChB;EACA;AACJ;AACA;EACI,OAAO,IAAI;AACf,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/plugins/bodyModifier.d.ts

@@ -1,6 +1,6 @@
-import { CmsEntryElasticsearchBodyModifierPlugin } from "../../../../plugins";
+import { CmsEntryElasticsearchBodyModifierPlugin } from "../../../../plugins/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
-import type { CmsModel } from "@webiny/api-headless-cms/types";
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 interface Params {
     plugins: PluginsContainer;
     model: CmsModel;

package/operations/entry/elasticsearch/plugins/bodyModifier.js

@@ -1,18 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createBodyModifierPluginList = void 0;
-var _plugins = require("../../../../plugins");
-const createBodyModifierPluginList = ({
+import { CmsEntryElasticsearchBodyModifierPlugin } from "../../../../plugins/index.js";
+export const createBodyModifierPluginList = ({
   plugins,
   model
 }) => {
-  return plugins.byType(_plugins.CmsEntryElasticsearchBodyModifierPlugin.type).filter(pl => {
+  return plugins.byType(CmsEntryElasticsearchBodyModifierPlugin.type).filter(pl => {
     return !pl.modelId || pl.modelId === model.modelId;
   });
 };
-exports.createBodyModifierPluginList = createBodyModifierPluginList;
 
 //# sourceMappingURL=bodyModifier.js.map

package/operations/entry/elasticsearch/plugins/bodyModifier.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","createBodyModifierPluginList","plugins","model","byType","CmsEntryElasticsearchBodyModifierPlugin","type","filter","pl","modelId","exports"],"sources":["bodyModifier.ts"],"sourcesContent":["import { CmsEntryElasticsearchBodyModifierPlugin } from \"~/plugins\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const createBodyModifierPluginList = ({ plugins, model }: Params) => {\n    return plugins\n        .byType<CmsEntryElasticsearchBodyModifierPlugin>(\n            CmsEntryElasticsearchBodyModifierPlugin.type\n        )\n        .filter(pl => {\n            return !pl.modelId || pl.modelId === model.modelId;\n        });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,4BAA4B,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAc,CAAC,KAAK;EACxE,OAAOD,OAAO,CACTE,MAAM,CACHC,gDAAuC,CAACC,IAC5C,CAAC,CACAC,MAAM,CAACC,EAAE,IAAI;IACV,OAAO,CAACA,EAAE,CAACC,OAAO,IAAID,EAAE,CAACC,OAAO,KAAKN,KAAK,CAACM,OAAO;EACtD,CAAC,CAAC;AACV,CAAC;AAACC,OAAA,CAAAT,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["CmsEntryElasticsearchBodyModifierPlugin","createBodyModifierPluginList","plugins","model","byType","type","filter","pl","modelId"],"sources":["bodyModifier.ts"],"sourcesContent":["import { CmsEntryElasticsearchBodyModifierPlugin } from \"~/plugins/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const createBodyModifierPluginList = ({ plugins, model }: Params) => {\n    return plugins\n        .byType<CmsEntryElasticsearchBodyModifierPlugin>(\n            CmsEntryElasticsearchBodyModifierPlugin.type\n        )\n        .filter(pl => {\n            return !pl.modelId || pl.modelId === model.modelId;\n        });\n};\n"],"mappings":"AAAA,SAASA,uCAAuC;AAQhD,OAAO,MAAMC,4BAA4B,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAc,CAAC,KAAK;EACxE,OAAOD,OAAO,CACTE,MAAM,CACHJ,uCAAuC,CAACK,IAC5C,CAAC,CACAC,MAAM,CAACC,EAAE,IAAI;IACV,OAAO,CAACA,EAAE,CAACC,OAAO,IAAID,EAAE,CAACC,OAAO,KAAKL,KAAK,CAACK,OAAO;EACtD,CAAC,CAAC;AACV,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/plugins/operator.d.ts

@@ -1,8 +1,7 @@
 import type { PluginsContainer } from "@webiny/plugins";
-import type { ElasticsearchQueryBuilderOperatorPlugins } from "../types";
+import type { ElasticsearchQueryBuilderOperatorPlugins } from "../types.js";
 interface Params {
     plugins: PluginsContainer;
-    locale: string;
 }
 export declare const createOperatorPluginList: (params: Params) => ElasticsearchQueryBuilderOperatorPlugins;
 export {};

package/operations/entry/elasticsearch/plugins/operator.js

@@ -1,28 +1,14 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createOperatorPluginList = void 0;
-var _apiElasticsearch = require("@webiny/api-elasticsearch");
-const createOperatorPluginList = params => {
+import { ElasticsearchQueryBuilderOperatorPlugin } from "@webiny/api-elasticsearch";
+export const createOperatorPluginList = params => {
   const {
-    plugins,
-    locale
+    plugins
   } = params;
   /**
    * We always set the last one operator plugin added.
    * This way user can override the plugins.
    */
-  return plugins.byType(_apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type).reduce((acc, plugin) => {
+  return plugins.byType(ElasticsearchQueryBuilderOperatorPlugin.type).reduce((acc, plugin) => {
     const operator = plugin.getOperator();
-    /**
-     * We only allow the plugins which can pass the locale test.
-     * The default plugins always return true.
-     */
-    if (plugin.isLocaleSupported(locale) === false) {
-      return acc;
-    }
     /**
      * We also only allow the override of the plugins if the new plugin is NOT a default one.
      * If a user sets the plugin name ending with .default, we cannot do anything about it.
@@ -34,6 +20,5 @@ const createOperatorPluginList = params => {
     return acc;
   }, {});
 };
-exports.createOperatorPluginList = createOperatorPluginList;
 
 //# sourceMappingURL=operator.js.map

package/operations/entry/elasticsearch/plugins/operator.js.map

@@ -1 +1 @@
-{"version":3,"names":["_apiElasticsearch","require","createOperatorPluginList","params","plugins","locale","byType","ElasticsearchQueryBuilderOperatorPlugin","type","reduce","acc","plugin","operator","getOperator","isLocaleSupported","name","match","exports"],"sources":["operator.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport { ElasticsearchQueryBuilderOperatorPlugin } from \"@webiny/api-elasticsearch\";\nimport type { ElasticsearchQueryBuilderOperatorPlugins } from \"../types\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    locale: string;\n}\nexport const createOperatorPluginList = (\n    params: Params\n): ElasticsearchQueryBuilderOperatorPlugins => {\n    const { plugins, locale } = params;\n    /**\n     * We always set the last one operator plugin added.\n     * This way user can override the plugins.\n     */\n    return plugins\n        .byType<ElasticsearchQueryBuilderOperatorPlugin>(\n            ElasticsearchQueryBuilderOperatorPlugin.type\n        )\n        .reduce<ElasticsearchQueryBuilderOperatorPlugins>((acc, plugin) => {\n            const operator = plugin.getOperator();\n            /**\n             * We only allow the plugins which can pass the locale test.\n             * The default plugins always return true.\n             */\n            if (plugin.isLocaleSupported(locale) === false) {\n                return acc;\n            }\n            /**\n             * We also only allow the override of the plugins if the new plugin is NOT a default one.\n             * If a user sets the plugin name ending with .default, we cannot do anything about it.\n             */\n            if (!!acc[operator] && (plugin.name || \"\").match(/\\.default$/)) {\n                return acc;\n            }\n            acc[operator] = plugin;\n            return acc;\n        }, {});\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAOO,MAAMC,wBAAwB,GACjCC,MAAc,IAC6B;EAC3C,MAAM;IAAEC,OAAO;IAAEC;EAAO,CAAC,GAAGF,MAAM;EAClC;AACJ;AACA;AACA;EACI,OAAOC,OAAO,CACTE,MAAM,CACHC,yDAAuC,CAACC,IAC5C,CAAC,CACAC,MAAM,CAA2C,CAACC,GAAG,EAAEC,MAAM,KAAK;IAC/D,MAAMC,QAAQ,GAAGD,MAAM,CAACE,WAAW,CAAC,CAAC;IACrC;AACZ;AACA;AACA;IACY,IAAIF,MAAM,CAACG,iBAAiB,CAACT,MAAM,CAAC,KAAK,KAAK,EAAE;MAC5C,OAAOK,GAAG;IACd;IACA;AACZ;AACA;AACA;IACY,IAAI,CAAC,CAACA,GAAG,CAACE,QAAQ,CAAC,IAAI,CAACD,MAAM,CAACI,IAAI,IAAI,EAAE,EAAEC,KAAK,CAAC,YAAY,CAAC,EAAE;MAC5D,OAAON,GAAG;IACd;IACAA,GAAG,CAACE,QAAQ,CAAC,GAAGD,MAAM;IACtB,OAAOD,GAAG;EACd,CAAC,EAAE,CAAC,CAAC,CAAC;AACd,CAAC;AAACO,OAAA,CAAAf,wBAAA,GAAAA,wBAAA","ignoreList":[]}
+{"version":3,"names":["ElasticsearchQueryBuilderOperatorPlugin","createOperatorPluginList","params","plugins","byType","type","reduce","acc","plugin","operator","getOperator","name","match"],"sources":["operator.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport { ElasticsearchQueryBuilderOperatorPlugin } from \"@webiny/api-elasticsearch\";\nimport type { ElasticsearchQueryBuilderOperatorPlugins } from \"../types.js\";\n\ninterface Params {\n    plugins: PluginsContainer;\n}\nexport const createOperatorPluginList = (\n    params: Params\n): ElasticsearchQueryBuilderOperatorPlugins => {\n    const { plugins } = params;\n    /**\n     * We always set the last one operator plugin added.\n     * This way user can override the plugins.\n     */\n    return plugins\n        .byType<ElasticsearchQueryBuilderOperatorPlugin>(\n            ElasticsearchQueryBuilderOperatorPlugin.type\n        )\n        .reduce<ElasticsearchQueryBuilderOperatorPlugins>((acc, plugin) => {\n            const operator = plugin.getOperator();\n            /**\n             * We also only allow the override of the plugins if the new plugin is NOT a default one.\n             * If a user sets the plugin name ending with .default, we cannot do anything about it.\n             */\n            if (!!acc[operator] && (plugin.name || \"\").match(/\\.default$/)) {\n                return acc;\n            }\n            acc[operator] = plugin;\n            return acc;\n        }, {});\n};\n"],"mappings":"AACA,SAASA,uCAAuC,QAAQ,2BAA2B;AAMnF,OAAO,MAAMC,wBAAwB,GACjCC,MAAc,IAC6B;EAC3C,MAAM;IAAEC;EAAQ,CAAC,GAAGD,MAAM;EAC1B;AACJ;AACA;AACA;EACI,OAAOC,OAAO,CACTC,MAAM,CACHJ,uCAAuC,CAACK,IAC5C,CAAC,CACAC,MAAM,CAA2C,CAACC,GAAG,EAAEC,MAAM,KAAK;IAC/D,MAAMC,QAAQ,GAAGD,MAAM,CAACE,WAAW,CAAC,CAAC;IACrC;AACZ;AACA;AACA;IACY,IAAI,CAAC,CAACH,GAAG,CAACE,QAAQ,CAAC,IAAI,CAACD,MAAM,CAACG,IAAI,IAAI,EAAE,EAAEC,KAAK,CAAC,YAAY,CAAC,EAAE;MAC5D,OAAOL,GAAG;IACd;IACAA,GAAG,CAACE,QAAQ,CAAC,GAAGD,MAAM;IACtB,OAAOD,GAAG;EACd,CAAC,EAAE,CAAC,CAAC,CAAC;AACd,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/plugins/queryModifier.d.ts

@@ -1,6 +1,6 @@
-import { CmsEntryElasticsearchQueryModifierPlugin } from "../../../../plugins";
+import { CmsEntryElasticsearchQueryModifierPlugin } from "../../../../plugins/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
-import type { CmsModel } from "@webiny/api-headless-cms/types";
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 interface Params {
     plugins: PluginsContainer;
     model: CmsModel;

package/operations/entry/elasticsearch/plugins/queryModifier.js

@@ -1,18 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createQueryModifierPluginList = void 0;
-var _plugins = require("../../../../plugins");
-const createQueryModifierPluginList = ({
+import { CmsEntryElasticsearchQueryModifierPlugin } from "../../../../plugins/index.js";
+export const createQueryModifierPluginList = ({
   plugins,
   model
 }) => {
-  return plugins.byType(_plugins.CmsEntryElasticsearchQueryModifierPlugin.type).filter(pl => {
+  return plugins.byType(CmsEntryElasticsearchQueryModifierPlugin.type).filter(pl => {
     return !pl.modelId || pl.modelId === model.modelId;
   });
 };
-exports.createQueryModifierPluginList = createQueryModifierPluginList;
 
 //# sourceMappingURL=queryModifier.js.map

package/operations/entry/elasticsearch/plugins/queryModifier.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","createQueryModifierPluginList","plugins","model","byType","CmsEntryElasticsearchQueryModifierPlugin","type","filter","pl","modelId","exports"],"sources":["queryModifier.ts"],"sourcesContent":["import { CmsEntryElasticsearchQueryModifierPlugin } from \"~/plugins\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const createQueryModifierPluginList = ({ plugins, model }: Params) => {\n    return plugins\n        .byType<CmsEntryElasticsearchQueryModifierPlugin>(\n            CmsEntryElasticsearchQueryModifierPlugin.type\n        )\n        .filter(pl => {\n            return !pl.modelId || pl.modelId === model.modelId;\n        });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,6BAA6B,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAc,CAAC,KAAK;EACzE,OAAOD,OAAO,CACTE,MAAM,CACHC,iDAAwC,CAACC,IAC7C,CAAC,CACAC,MAAM,CAACC,EAAE,IAAI;IACV,OAAO,CAACA,EAAE,CAACC,OAAO,IAAID,EAAE,CAACC,OAAO,KAAKN,KAAK,CAACM,OAAO;EACtD,CAAC,CAAC;AACV,CAAC;AAACC,OAAA,CAAAT,6BAAA,GAAAA,6BAAA","ignoreList":[]}
+{"version":3,"names":["CmsEntryElasticsearchQueryModifierPlugin","createQueryModifierPluginList","plugins","model","byType","type","filter","pl","modelId"],"sources":["queryModifier.ts"],"sourcesContent":["import { CmsEntryElasticsearchQueryModifierPlugin } from \"~/plugins/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const createQueryModifierPluginList = ({ plugins, model }: Params) => {\n    return plugins\n        .byType<CmsEntryElasticsearchQueryModifierPlugin>(\n            CmsEntryElasticsearchQueryModifierPlugin.type\n        )\n        .filter(pl => {\n            return !pl.modelId || pl.modelId === model.modelId;\n        });\n};\n"],"mappings":"AAAA,SAASA,wCAAwC;AAQjD,OAAO,MAAMC,6BAA6B,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAc,CAAC,KAAK;EACzE,OAAOD,OAAO,CACTE,MAAM,CACHJ,wCAAwC,CAACK,IAC7C,CAAC,CACAC,MAAM,CAACC,EAAE,IAAI;IACV,OAAO,CAACA,EAAE,CAACC,OAAO,IAAID,EAAE,CAACC,OAAO,KAAKL,KAAK,CAACK,OAAO;EACtD,CAAC,CAAC;AACV,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/plugins/search.d.ts

@@ -1,5 +1,5 @@
 import type { PluginsContainer } from "@webiny/plugins";
-import type { ElasticsearchQuerySearchValuePlugins } from "../types";
+import type { ElasticsearchQuerySearchValuePlugins } from "../types.js";
 interface Params {
     plugins: PluginsContainer;
 }

package/operations/entry/elasticsearch/plugins/search.js

@@ -1,18 +1,11 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createSearchPluginList = void 0;
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _plugins = require("../../../../plugins");
-const createSearchPluginList = ({
+import WebinyError from "@webiny/error";
+import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../../../plugins/index.js";
+export const createSearchPluginList = ({
   plugins
 }) => {
-  return plugins.byType(_plugins.CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type).reduce((plugins, plugin) => {
+  return plugins.byType(CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type).reduce((plugins, plugin) => {
     if (plugins[plugin.fieldType]) {
-      throw new _error.default("There is a ElasticsearchQueryBuilderValueSearchPlugin defined for the field type.", "PLUGIN_ALREADY_EXISTS", {
+      throw new WebinyError("There is a ElasticsearchQueryBuilderValueSearchPlugin defined for the field type.", "PLUGIN_ALREADY_EXISTS", {
         fieldType: plugin.fieldType,
         name: plugin.name || "unknown"
       });
@@ -21,6 +14,5 @@ const createSearchPluginList = ({
     return plugins;
   }, {});
 };
-exports.createSearchPluginList = createSearchPluginList;
 
 //# sourceMappingURL=search.js.map

package/operations/entry/elasticsearch/plugins/search.js.map

@@ -1 +1 @@
-{"version":3,"names":["_error","_interopRequireDefault","require","_plugins","createSearchPluginList","plugins","byType","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","type","reduce","plugin","fieldType","WebinyError","name","exports"],"sources":["search.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { ElasticsearchQuerySearchValuePlugins } from \"../types\";\n\ninterface Params {\n    plugins: PluginsContainer;\n}\nexport const createSearchPluginList = ({\n    plugins\n}: Params): ElasticsearchQuerySearchValuePlugins => {\n    return plugins\n        .byType<CmsEntryElasticsearchQueryBuilderValueSearchPlugin>(\n            CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type\n        )\n        .reduce<ElasticsearchQuerySearchValuePlugins>((plugins, plugin) => {\n            if (plugins[plugin.fieldType]) {\n                throw new WebinyError(\n                    \"There is a ElasticsearchQueryBuilderValueSearchPlugin defined for the field type.\",\n                    \"PLUGIN_ALREADY_EXISTS\",\n                    {\n                        fieldType: plugin.fieldType,\n                        name: plugin.name || \"unknown\"\n                    }\n                );\n            }\n            plugins[plugin.fieldType] = plugin;\n\n            return plugins;\n        }, {});\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAOO,MAAME,sBAAsB,GAAGA,CAAC;EACnCC;AACI,CAAC,KAA2C;EAChD,OAAOA,OAAO,CACTC,MAAM,CACHC,2DAAkD,CAACC,IACvD,CAAC,CACAC,MAAM,CAAuC,CAACJ,OAAO,EAAEK,MAAM,KAAK;IAC/D,IAAIL,OAAO,CAACK,MAAM,CAACC,SAAS,CAAC,EAAE;MAC3B,MAAM,IAAIC,cAAW,CACjB,mFAAmF,EACnF,uBAAuB,EACvB;QACID,SAAS,EAAED,MAAM,CAACC,SAAS;QAC3BE,IAAI,EAAEH,MAAM,CAACG,IAAI,IAAI;MACzB,CACJ,CAAC;IACL;IACAR,OAAO,CAACK,MAAM,CAACC,SAAS,CAAC,GAAGD,MAAM;IAElC,OAAOL,OAAO;EAClB,CAAC,EAAE,CAAC,CAAC,CAAC;AACd,CAAC;AAACS,OAAA,CAAAV,sBAAA,GAAAA,sBAAA","ignoreList":[]}
+{"version":3,"names":["WebinyError","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","createSearchPluginList","plugins","byType","type","reduce","plugin","fieldType","name"],"sources":["search.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { ElasticsearchQuerySearchValuePlugins } from \"../types.js\";\n\ninterface Params {\n    plugins: PluginsContainer;\n}\nexport const createSearchPluginList = ({\n    plugins\n}: Params): ElasticsearchQuerySearchValuePlugins => {\n    return plugins\n        .byType<CmsEntryElasticsearchQueryBuilderValueSearchPlugin>(\n            CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type\n        )\n        .reduce<ElasticsearchQuerySearchValuePlugins>((plugins, plugin) => {\n            if (plugins[plugin.fieldType]) {\n                throw new WebinyError(\n                    \"There is a ElasticsearchQueryBuilderValueSearchPlugin defined for the field type.\",\n                    \"PLUGIN_ALREADY_EXISTS\",\n                    {\n                        fieldType: plugin.fieldType,\n                        name: plugin.name || \"unknown\"\n                    }\n                );\n            }\n            plugins[plugin.fieldType] = plugin;\n\n            return plugins;\n        }, {});\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,eAAe;AACvC,SAASC,kDAAkD;AAO3D,OAAO,MAAMC,sBAAsB,GAAGA,CAAC;EACnCC;AACI,CAAC,KAA2C;EAChD,OAAOA,OAAO,CACTC,MAAM,CACHH,kDAAkD,CAACI,IACvD,CAAC,CACAC,MAAM,CAAuC,CAACH,OAAO,EAAEI,MAAM,KAAK;IAC/D,IAAIJ,OAAO,CAACI,MAAM,CAACC,SAAS,CAAC,EAAE;MAC3B,MAAM,IAAIR,WAAW,CACjB,mFAAmF,EACnF,uBAAuB,EACvB;QACIQ,SAAS,EAAED,MAAM,CAACC,SAAS;QAC3BC,IAAI,EAAEF,MAAM,CAACE,IAAI,IAAI;MACzB,CACJ,CAAC;IACL;IACAN,OAAO,CAACI,MAAM,CAACC,SAAS,CAAC,GAAGD,MAAM;IAElC,OAAOJ,OAAO;EAClB,CAAC,EAAE,CAAC,CAAC,CAAC;AACd,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/plugins/sortModifier.d.ts

@@ -1,6 +1,6 @@
-import { CmsEntryElasticsearchSortModifierPlugin } from "../../../../plugins";
+import { CmsEntryElasticsearchSortModifierPlugin } from "../../../../plugins/index.js";
 import type { PluginsContainer } from "@webiny/plugins";
-import type { CmsModel } from "@webiny/api-headless-cms/types";
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 interface Params {
     plugins: PluginsContainer;
     model: CmsModel;

package/operations/entry/elasticsearch/plugins/sortModifier.js

@@ -1,18 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createSortModifierPluginList = void 0;
-var _plugins = require("../../../../plugins");
-const createSortModifierPluginList = ({
+import { CmsEntryElasticsearchSortModifierPlugin } from "../../../../plugins/index.js";
+export const createSortModifierPluginList = ({
   plugins,
   model
 }) => {
-  return plugins.byType(_plugins.CmsEntryElasticsearchSortModifierPlugin.type).filter(pl => {
+  return plugins.byType(CmsEntryElasticsearchSortModifierPlugin.type).filter(pl => {
     return !pl.modelId || pl.modelId === model.modelId;
   });
 };
-exports.createSortModifierPluginList = createSortModifierPluginList;
 
 //# sourceMappingURL=sortModifier.js.map

package/operations/entry/elasticsearch/plugins/sortModifier.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","createSortModifierPluginList","plugins","model","byType","CmsEntryElasticsearchSortModifierPlugin","type","filter","pl","modelId","exports"],"sources":["sortModifier.ts"],"sourcesContent":["import { CmsEntryElasticsearchSortModifierPlugin } from \"~/plugins\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const createSortModifierPluginList = ({ plugins, model }: Params) => {\n    return plugins\n        .byType<CmsEntryElasticsearchSortModifierPlugin>(\n            CmsEntryElasticsearchSortModifierPlugin.type\n        )\n        .filter(pl => {\n            return !pl.modelId || pl.modelId === model.modelId;\n        });\n};\n"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AAQO,MAAMC,4BAA4B,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAc,CAAC,KAAK;EACxE,OAAOD,OAAO,CACTE,MAAM,CACHC,gDAAuC,CAACC,IAC5C,CAAC,CACAC,MAAM,CAACC,EAAE,IAAI;IACV,OAAO,CAACA,EAAE,CAACC,OAAO,IAAID,EAAE,CAACC,OAAO,KAAKN,KAAK,CAACM,OAAO;EACtD,CAAC,CAAC;AACV,CAAC;AAACC,OAAA,CAAAT,4BAAA,GAAAA,4BAAA","ignoreList":[]}
+{"version":3,"names":["CmsEntryElasticsearchSortModifierPlugin","createSortModifierPluginList","plugins","model","byType","type","filter","pl","modelId"],"sources":["sortModifier.ts"],"sourcesContent":["import { CmsEntryElasticsearchSortModifierPlugin } from \"~/plugins/index.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n}\nexport const createSortModifierPluginList = ({ plugins, model }: Params) => {\n    return plugins\n        .byType<CmsEntryElasticsearchSortModifierPlugin>(\n            CmsEntryElasticsearchSortModifierPlugin.type\n        )\n        .filter(pl => {\n            return !pl.modelId || pl.modelId === model.modelId;\n        });\n};\n"],"mappings":"AAAA,SAASA,uCAAuC;AAQhD,OAAO,MAAMC,4BAA4B,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAc,CAAC,KAAK;EACxE,OAAOD,OAAO,CACTE,MAAM,CACHJ,uCAAuC,CAACK,IAC5C,CAAC,CACAC,MAAM,CAACC,EAAE,IAAI;IACV,OAAO,CAACA,EAAE,CAACC,OAAO,IAAID,EAAE,CAACC,OAAO,KAAKL,KAAK,CAACK,OAAO;EACtD,CAAC,CAAC;AACV,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/shouldIgnoreEsResponseError.js

@@ -1,13 +1,6 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.shouldIgnoreEsResponseError = void 0;
 const IGNORED_ES_SEARCH_EXCEPTIONS = ["index_not_found_exception", "search_phase_execution_exception"];
-const shouldIgnoreEsResponseError = error => {
+export const shouldIgnoreEsResponseError = error => {
   return IGNORED_ES_SEARCH_EXCEPTIONS.includes(error.message);
 };
-exports.shouldIgnoreEsResponseError = shouldIgnoreEsResponseError;
 
 //# sourceMappingURL=shouldIgnoreEsResponseError.js.map

package/operations/entry/elasticsearch/shouldIgnoreEsResponseError.js.map

@@ -1 +1 @@
-{"version":3,"names":["IGNORED_ES_SEARCH_EXCEPTIONS","shouldIgnoreEsResponseError","error","includes","message","exports"],"sources":["shouldIgnoreEsResponseError.ts"],"sourcesContent":["import type WebinyError from \"@webiny/error\";\n\nconst IGNORED_ES_SEARCH_EXCEPTIONS = [\n    \"index_not_found_exception\",\n    \"search_phase_execution_exception\"\n];\n\nexport const shouldIgnoreEsResponseError = (error: WebinyError) => {\n    return IGNORED_ES_SEARCH_EXCEPTIONS.includes(error.message);\n};\n"],"mappings":";;;;;;AAEA,MAAMA,4BAA4B,GAAG,CACjC,2BAA2B,EAC3B,kCAAkC,CACrC;AAEM,MAAMC,2BAA2B,GAAIC,KAAkB,IAAK;EAC/D,OAAOF,4BAA4B,CAACG,QAAQ,CAACD,KAAK,CAACE,OAAO,CAAC;AAC/D,CAAC;AAACC,OAAA,CAAAJ,2BAAA,GAAAA,2BAAA","ignoreList":[]}
+{"version":3,"names":["IGNORED_ES_SEARCH_EXCEPTIONS","shouldIgnoreEsResponseError","error","includes","message"],"sources":["shouldIgnoreEsResponseError.ts"],"sourcesContent":["import type WebinyError from \"@webiny/error\";\n\nconst IGNORED_ES_SEARCH_EXCEPTIONS = [\n    \"index_not_found_exception\",\n    \"search_phase_execution_exception\"\n];\n\nexport const shouldIgnoreEsResponseError = (error: WebinyError) => {\n    return IGNORED_ES_SEARCH_EXCEPTIONS.includes(error.message);\n};\n"],"mappings":"AAEA,MAAMA,4BAA4B,GAAG,CACjC,2BAA2B,EAC3B,kCAAkC,CACrC;AAED,OAAO,MAAMC,2BAA2B,GAAIC,KAAkB,IAAK;EAC/D,OAAOF,4BAA4B,CAACG,QAAQ,CAACD,KAAK,CAACE,OAAO,CAAC;AAC/D,CAAC","ignoreList":[]}

package/operations/entry/elasticsearch/sort.d.ts

@@ -1,7 +1,7 @@
-import type { Sort as esSort } from "@webiny/api-elasticsearch/types";
+import type { Sort as esSort } from "@webiny/api-elasticsearch/types.js";
 import type { PluginsContainer } from "@webiny/plugins";
-import type { CmsEntryListSort, CmsModel } from "@webiny/api-headless-cms/types";
-import type { ModelFields } from "./types";
+import type { CmsEntryListSort, CmsModel } from "@webiny/api-headless-cms/types/index.js";
+import type { ModelFields } from "./types.js";
 interface Params {
     plugins: PluginsContainer;
     sort?: CmsEntryListSort;

package/operations/entry/elasticsearch/sort.js

@@ -1,15 +1,30 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.createElasticsearchSort = void 0;
-var _apiElasticsearch = require("@webiny/api-elasticsearch");
-var _keyword = require("./keyword");
-var _search = require("./plugins/search");
-var _path = require("./filtering/path");
-var _NoValueContainer = require("../../../values/NoValueContainer.js");
-const createElasticsearchSort = params => {
+import { createSort, ElasticsearchFieldPlugin } from "@webiny/api-elasticsearch";
+import { hasKeyword } from "./keyword.js";
+import { createSearchPluginList } from "./plugins/search.js";
+import { createFieldPathFactory } from "./filtering/path.js";
+import { NoValueContainer } from "../../../values/NoValueContainer.js";
+const matchField = input => {
+  const valuesMatch = input.match(/^values_([a-zA-Z-0-9_]+)_(ASC|DESC)$/);
+  if (valuesMatch) {
+    const [, fieldId, order] = valuesMatch;
+    return {
+      fieldId,
+      isValues: true,
+      order: order
+    };
+  }
+  const nonValues = input.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);
+  if (!nonValues) {
+    return null;
+  }
+  const [, fieldId, order] = nonValues;
+  return {
+    fieldId,
+    isValues: false,
+    order: order
+  };
+};
+export const createElasticsearchSort = params => {
   const {
     sort,
     modelFields,
@@ -22,10 +37,10 @@ const createElasticsearchSort = params => {
       }
     }];
   }
-  const searchPlugins = (0, _search.createSearchPluginList)({
+  const searchPlugins = createSearchPluginList({
     plugins
   });
-  const createFieldPath = (0, _path.createFieldPathFactory)({
+  const createFieldPath = createFieldPathFactory({
     plugins: searchPlugins
   });
   const fieldIdToStorageIdIdMap = {};
@@ -33,29 +48,28 @@ const createElasticsearchSort = params => {
     /**
      * We do not support sorting by nested fields.
      */
-    if (field.parents.length > 0) {
+    const isValues = field.parents.length === 1 && field.parents[0].fieldId === "values";
+    if (field.parents.length > 0 && !isValues) {
       return plugins;
     }
-    const {
-      fieldId,
-      storageId
-    } = field.field;
-    fieldIdToStorageIdIdMap[fieldId] = fieldId;
+    const fieldId = field.field.fieldId;
+    const fieldIdPath = isValues ? `values.${fieldId}` : fieldId;
+    fieldIdToStorageIdIdMap[fieldIdPath] = fieldIdPath;
     const {
       path
     } = createFieldPath({
-      key: storageId,
+      key: field.field.storageId,
       field,
-      value: _NoValueContainer.NoValueContainer.create(),
+      value: NoValueContainer.create(),
       keyword: false,
-      originalValue: _NoValueContainer.NoValueContainer.create()
+      originalValue: NoValueContainer.create()
     });
     /**
      * Plugins must be stored with fieldId as key because it is later used to find the sorting plugin.
      */
-    plugins[fieldId] = new _apiElasticsearch.ElasticsearchFieldPlugin({
+    plugins[fieldIdPath] = new ElasticsearchFieldPlugin({
       unmappedType: field.unmappedType,
-      keyword: (0, _keyword.hasKeyword)(field),
+      keyword: hasKeyword(field),
       sortable: field.sortable,
       searchable: field.searchable,
       field: fieldId,
@@ -63,27 +77,31 @@ const createElasticsearchSort = params => {
     });
     return plugins;
   }, {
-    ["*"]: new _apiElasticsearch.ElasticsearchFieldPlugin({
-      field: _apiElasticsearch.ElasticsearchFieldPlugin.ALL,
+    ["*"]: new ElasticsearchFieldPlugin({
+      field: ElasticsearchFieldPlugin.ALL,
       keyword: false
     })
   });
   const transformedSort = sort.map(value => {
-    const matched = value.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);
+    const matched = matchField(value);
     if (!matched) {
       return null;
     }
-    const [, fieldId, order] = matched;
-    if (fieldIdToStorageIdIdMap[fieldId]) {
-      return `${fieldIdToStorageIdIdMap[fieldId]}_${order}`;
+    const {
+      fieldId,
+      order,
+      isValues
+    } = matched;
+    const key = isValues ? `values.${fieldId}` : fieldId;
+    if (fieldIdToStorageIdIdMap[key]) {
+      return `${fieldIdToStorageIdIdMap[key]}_${order}`;
     }
     return value;
   }).filter(Boolean);
-  return (0, _apiElasticsearch.createSort)({
+  return createSort({
     fieldPlugins: sortPlugins,
     sort: transformedSort
   });
 };
-exports.createElasticsearchSort = createElasticsearchSort;
 
 //# sourceMappingURL=sort.js.map