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

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

@@ -1,9 +1,9 @@
-import { CmsEntryElasticsearchQueryModifierPlugin } from "../../../../plugins";
-import { PluginsContainer } from "@webiny/plugins";
-import { CmsModel } from "@webiny/api-headless-cms/types";
+import { CmsEntryElasticsearchQueryModifierPlugin } from "../../../../plugins/index.js";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 interface Params {
     plugins: PluginsContainer;
     model: CmsModel;
 }
-export declare const createQueryModifierPluginList: ({ plugins, model }: Params) => CmsEntryElasticsearchQueryModifierPlugin[];
+export declare const createQueryModifierPluginList: ({ plugins, model }: Params) => import("@webiny/plugins/PluginsContainer").WithName<CmsEntryElasticsearchQueryModifierPlugin>[];
 export {};

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 { PluginsContainer } from \"@webiny/plugins\";\nimport { 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 { PluginsContainer } from "@webiny/plugins";
-import { ElasticsearchQuerySearchValuePlugins } from "../types";
+import type { PluginsContainer } from "@webiny/plugins";
+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 { PluginsContainer } from \"@webiny/plugins\";\nimport { 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,9 +1,9 @@
-import { CmsEntryElasticsearchSortModifierPlugin } from "../../../../plugins";
-import { PluginsContainer } from "@webiny/plugins";
-import { CmsModel } from "@webiny/api-headless-cms/types";
+import { CmsEntryElasticsearchSortModifierPlugin } from "../../../../plugins/index.js";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsModel } from "@webiny/api-headless-cms/types/index.js";
 interface Params {
     plugins: PluginsContainer;
     model: CmsModel;
 }
-export declare const createSortModifierPluginList: ({ plugins, model }: Params) => CmsEntryElasticsearchSortModifierPlugin[];
+export declare const createSortModifierPluginList: ({ plugins, model }: Params) => import("@webiny/plugins/PluginsContainer").WithName<CmsEntryElasticsearchSortModifierPlugin>[];
 export {};

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 { PluginsContainer } from \"@webiny/plugins\";\nimport { 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.d.ts

@@ -0,0 +1,2 @@
+import type WebinyError from "@webiny/error";
+export declare const shouldIgnoreEsResponseError: (error: WebinyError) => boolean;

package/operations/entry/elasticsearch/shouldIgnoreEsResponseError.js

@@ -0,0 +1,6 @@
+const IGNORED_ES_SEARCH_EXCEPTIONS = ["index_not_found_exception", "search_phase_execution_exception"];
+export const shouldIgnoreEsResponseError = error => {
+  return IGNORED_ES_SEARCH_EXCEPTIONS.includes(error.message);
+};
+
+//# sourceMappingURL=shouldIgnoreEsResponseError.js.map

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

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

package/operations/entry/elasticsearch/sort.js

@@ -1,26 +1,46 @@
-"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");
-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,
     plugins
   } = params;
   if (!sort || sort.length === 0) {
-    return [];
+    return [{
+      ["id.keyword"]: {
+        order: "asc"
+      }
+    }];
   }
-  const searchPlugins = (0, _search.createSearchPluginList)({
+  const searchPlugins = createSearchPluginList({
     plugins
   });
-  const createFieldPath = (0, _path.createFieldPathFactory)({
+  const createFieldPath = createFieldPathFactory({
     plugins: searchPlugins
   });
   const fieldIdToStorageIdIdMap = {};
@@ -28,28 +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: "",
-      keyword: false
+      value: NoValueContainer.create(),
+      keyword: false,
+      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,
@@ -57,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

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

@@ -1 +1 @@
-{"version":3,"names":["_apiElasticsearch","require","_keyword","_search","_path","createElasticsearchSort","params","sort","modelFields","plugins","length","searchPlugins","createSearchPluginList","createFieldPath","createFieldPathFactory","fieldIdToStorageIdIdMap","sortPlugins","Object","values","reduce","field","parents","fieldId","storageId","path","key","value","keyword","ElasticsearchFieldPlugin","unmappedType","hasKeyword","sortable","searchable","ALL","transformedSort","map","matched","match","order","filter","Boolean","createSort","fieldPlugins","exports"],"sources":["sort.ts"],"sourcesContent":["import { Sort as esSort } from \"@webiny/api-elasticsearch/types\";\nimport { createSort, ElasticsearchFieldPlugin } from \"@webiny/api-elasticsearch\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryListSort, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport { ModelFields } from \"./types\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword\";\nimport { createSearchPluginList } from \"~/operations/entry/elasticsearch/plugins/search\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    sort?: CmsEntryListSort;\n    modelFields: ModelFields;\n    model: CmsModel;\n}\nexport const createElasticsearchSort = (params: Params): esSort => {\n    const { sort, modelFields, plugins } = params;\n\n    if (!sort || sort.length === 0) {\n        return [];\n    }\n\n    const searchPlugins = createSearchPluginList({\n        plugins\n    });\n\n    const createFieldPath = createFieldPathFactory({\n        plugins: searchPlugins\n    });\n\n    const fieldIdToStorageIdIdMap: Record<string, string> = {};\n\n    const sortPlugins = Object.values(modelFields).reduce<Record<string, ElasticsearchFieldPlugin>>(\n        (plugins, field) => {\n            /**\n             * We do not support sorting by nested fields.\n             */\n            if (field.parents.length > 0) {\n                return plugins;\n            }\n            const { fieldId, storageId } = field.field;\n\n            fieldIdToStorageIdIdMap[fieldId] = fieldId;\n\n            const { path } = createFieldPath({\n                key: storageId,\n                field,\n                value: \"\",\n                keyword: false\n            });\n            /**\n             * Plugins must be stored with fieldId as key because it is later used to find the sorting plugin.\n             */\n            plugins[fieldId] = new ElasticsearchFieldPlugin({\n                unmappedType: field.unmappedType,\n                keyword: hasKeyword(field),\n                sortable: field.sortable,\n                searchable: field.searchable,\n                field: fieldId,\n                path\n            });\n            return plugins;\n        },\n        {\n            [\"*\"]: new ElasticsearchFieldPlugin({\n                field: ElasticsearchFieldPlugin.ALL,\n                keyword: false\n            })\n        }\n    );\n\n    const transformedSort = sort\n        .map(value => {\n            const matched = value.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n            if (!matched) {\n                return null;\n            }\n            const [, fieldId, order] = matched;\n            if (fieldIdToStorageIdIdMap[fieldId]) {\n                return `${fieldIdToStorageIdIdMap[fieldId]}_${order}`;\n            }\n\n            return value;\n        })\n        .filter(Boolean) as string[];\n    return createSort({\n        fieldPlugins: sortPlugins,\n        sort: transformedSort\n    });\n};\n"],"mappings":";;;;;;AACA,IAAAA,iBAAA,GAAAC,OAAA;AAIA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAQO,MAAMI,uBAAuB,GAAIC,MAAc,IAAa;EAC/D,MAAM;IAAEC,IAAI;IAAEC,WAAW;IAAEC;EAAQ,CAAC,GAAGH,MAAM;EAE7C,IAAI,CAACC,IAAI,IAAIA,IAAI,CAACG,MAAM,KAAK,CAAC,EAAE;IAC5B,OAAO,EAAE;EACb;EAEA,MAAMC,aAAa,GAAG,IAAAC,8BAAsB,EAAC;IACzCH;EACJ,CAAC,CAAC;EAEF,MAAMI,eAAe,GAAG,IAAAC,4BAAsB,EAAC;IAC3CL,OAAO,EAAEE;EACb,CAAC,CAAC;EAEF,MAAMI,uBAA+C,GAAG,CAAC,CAAC;EAE1D,MAAMC,WAAW,GAAGC,MAAM,CAACC,MAAM,CAACV,WAAW,CAAC,CAACW,MAAM,CACjD,CAACV,OAAO,EAAEW,KAAK,KAAK;IAChB;AACZ;AACA;IACY,IAAIA,KAAK,CAACC,OAAO,CAACX,MAAM,GAAG,CAAC,EAAE;MAC1B,OAAOD,OAAO;IAClB;IACA,MAAM;MAAEa,OAAO;MAAEC;IAAU,CAAC,GAAGH,KAAK,CAACA,KAAK;IAE1CL,uBAAuB,CAACO,OAAO,CAAC,GAAGA,OAAO;IAE1C,MAAM;MAAEE;IAAK,CAAC,GAAGX,eAAe,CAAC;MAC7BY,GAAG,EAAEF,SAAS;MACdH,KAAK;MACLM,KAAK,EAAE,EAAE;MACTC,OAAO,EAAE;IACb,CAAC,CAAC;IACF;AACZ;AACA;IACYlB,OAAO,CAACa,OAAO,CAAC,GAAG,IAAIM,0CAAwB,CAAC;MAC5CC,YAAY,EAAET,KAAK,CAACS,YAAY;MAChCF,OAAO,EAAE,IAAAG,mBAAU,EAACV,KAAK,CAAC;MAC1BW,QAAQ,EAAEX,KAAK,CAACW,QAAQ;MACxBC,UAAU,EAAEZ,KAAK,CAACY,UAAU;MAC5BZ,KAAK,EAAEE,OAAO;MACdE;IACJ,CAAC,CAAC;IACF,OAAOf,OAAO;EAClB,CAAC,EACD;IACI,CAAC,GAAG,GAAG,IAAImB,0CAAwB,CAAC;MAChCR,KAAK,EAAEQ,0CAAwB,CAACK,GAAG;MACnCN,OAAO,EAAE;IACb,CAAC;EACL,CACJ,CAAC;EAED,MAAMO,eAAe,GAAG3B,IAAI,CACvB4B,GAAG,CAACT,KAAK,IAAI;IACV,MAAMU,OAAO,GAAGV,KAAK,CAACW,KAAK,CAAC,+BAA+B,CAAC;IAC5D,IAAI,CAACD,OAAO,EAAE;MACV,OAAO,IAAI;IACf;IACA,MAAM,GAAGd,OAAO,EAAEgB,KAAK,CAAC,GAAGF,OAAO;IAClC,IAAIrB,uBAAuB,CAACO,OAAO,CAAC,EAAE;MAClC,OAAQ,GAAEP,uBAAuB,CAACO,OAAO,CAAE,IAAGgB,KAAM,EAAC;IACzD;IAEA,OAAOZ,KAAK;EAChB,CAAC,CAAC,CACDa,MAAM,CAACC,OAAO,CAAa;EAChC,OAAO,IAAAC,4BAAU,EAAC;IACdC,YAAY,EAAE1B,WAAW;IACzBT,IAAI,EAAE2B;EACV,CAAC,CAAC;AACN,CAAC;AAACS,OAAA,CAAAtC,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["createSort","ElasticsearchFieldPlugin","hasKeyword","createSearchPluginList","createFieldPathFactory","NoValueContainer","matchField","input","valuesMatch","match","fieldId","order","isValues","nonValues","createElasticsearchSort","params","sort","modelFields","plugins","length","searchPlugins","createFieldPath","fieldIdToStorageIdIdMap","sortPlugins","Object","values","reduce","field","parents","fieldIdPath","path","key","storageId","value","create","keyword","originalValue","unmappedType","sortable","searchable","ALL","transformedSort","map","matched","filter","Boolean","fieldPlugins"],"sources":["sort.ts"],"sourcesContent":["import type { Sort as esSort } from \"@webiny/api-elasticsearch/types.js\";\nimport { createSort, ElasticsearchFieldPlugin } from \"@webiny/api-elasticsearch\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsEntryListSort, CmsModel } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ModelFields } from \"./types.js\";\nimport { hasKeyword } from \"~/operations/entry/elasticsearch/keyword.js\";\nimport { createSearchPluginList } from \"~/operations/entry/elasticsearch/plugins/search.js\";\nimport { createFieldPathFactory } from \"~/operations/entry/elasticsearch/filtering/path.js\";\nimport { NoValueContainer } from \"~/values/NoValueContainer.js\";\n\ninterface IMatchFieldResponse {\n    fieldId: string;\n    isValues: boolean;\n    order: \"ASC\" | \"DESC\";\n}\n\nconst matchField = (input: string): IMatchFieldResponse | null => {\n    const valuesMatch = input.match(/^values_([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (valuesMatch) {\n        const [, fieldId, order] = valuesMatch;\n        return {\n            fieldId,\n            isValues: true,\n            order: order as \"ASC\" | \"DESC\"\n        };\n    }\n    const nonValues = input.match(/^([a-zA-Z-0-9_]+)_(ASC|DESC)$/);\n    if (!nonValues) {\n        return null;\n    }\n    const [, fieldId, order] = nonValues;\n    return {\n        fieldId,\n        isValues: false,\n        order: order as \"ASC\" | \"DESC\"\n    };\n};\n\ninterface Params {\n    plugins: PluginsContainer;\n    sort?: CmsEntryListSort;\n    modelFields: ModelFields;\n    model: CmsModel;\n}\n\nexport const createElasticsearchSort = (params: Params): esSort => {\n    const { sort, modelFields, plugins } = params;\n\n    if (!sort || sort.length === 0) {\n        return [\n            {\n                [\"id.keyword\"]: {\n                    order: \"asc\"\n                }\n            }\n        ];\n    }\n\n    const searchPlugins = createSearchPluginList({\n        plugins\n    });\n\n    const createFieldPath = createFieldPathFactory({\n        plugins: searchPlugins\n    });\n\n    const fieldIdToStorageIdIdMap: Record<string, string> = {};\n\n    const sortPlugins = Object.values(modelFields).reduce<Record<string, ElasticsearchFieldPlugin>>(\n        (plugins, field) => {\n            /**\n             * We do not support sorting by nested fields.\n             */\n            const isValues = field.parents.length === 1 && field.parents[0].fieldId === \"values\";\n            if (field.parents.length > 0 && !isValues) {\n                return plugins;\n            }\n\n            const fieldId = field.field.fieldId;\n            const fieldIdPath = isValues ? `values.${fieldId}` : fieldId;\n\n            fieldIdToStorageIdIdMap[fieldIdPath] = fieldIdPath;\n\n            const { path } = createFieldPath({\n                key: field.field.storageId,\n                field,\n                value: NoValueContainer.create(),\n                keyword: false,\n                originalValue: NoValueContainer.create()\n            });\n            /**\n             * Plugins must be stored with fieldId as key because it is later used to find the sorting plugin.\n             */\n            plugins[fieldIdPath] = new ElasticsearchFieldPlugin({\n                unmappedType: field.unmappedType,\n                keyword: hasKeyword(field),\n                sortable: field.sortable,\n                searchable: field.searchable,\n                field: fieldId,\n                path\n            });\n            return plugins;\n        },\n        {\n            [\"*\"]: new ElasticsearchFieldPlugin({\n                field: ElasticsearchFieldPlugin.ALL,\n                keyword: false\n            })\n        }\n    );\n\n    const transformedSort = sort\n        .map(value => {\n            const matched = matchField(value);\n            if (!matched) {\n                return null;\n            }\n            const { fieldId, order, isValues } = matched;\n            const key = isValues ? `values.${fieldId}` : fieldId;\n            if (fieldIdToStorageIdIdMap[key]) {\n                return `${fieldIdToStorageIdIdMap[key]}_${order}`;\n            }\n\n            return value;\n        })\n        .filter(Boolean) as string[];\n    return createSort({\n        fieldPlugins: sortPlugins,\n        sort: transformedSort\n    });\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -2,8 +2,8 @@
  * We use any for input and output because they really can be anything.
  * Plugin, if exists, makes sure that response value is correct.
  */
-import { CmsModelField } from "@webiny/api-headless-cms/types";
-import { ElasticsearchQuerySearchValuePlugins } from "./types";
+import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
+import type { ElasticsearchQuerySearchValuePlugins } from "./types.js";
 interface Params {
     plugins: ElasticsearchQuerySearchValuePlugins;
     field: CmsModelField;

package/operations/entry/elasticsearch/transformValueForSearch.js

@@ -1,24 +1,20 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.transformValueForSearch = void 0;
 /**
  * We use any for input and output because they really can be anything.
  * Plugin, if exists, makes sure that response value is correct.
  */
 
+import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 /**
  * Transformed value can be anything.
  */
-const transformValueForSearch = params => {
+export const transformValueForSearch = params => {
   const {
     field,
     plugins,
     value
   } = params;
-  const plugin = plugins[field.type];
+  const fieldType = getBaseFieldType(field);
+  const plugin = plugins[fieldType];
   if (!plugin) {
     return value;
   }
@@ -27,6 +23,5 @@ const transformValueForSearch = params => {
     value
   });
 };
-exports.transformValueForSearch = transformValueForSearch;
 
 //# sourceMappingURL=transformValueForSearch.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["transformValueForSearch","params","field","plugins","value","plugin","type","transform","exports"],"sources":["transformValueForSearch.ts"],"sourcesContent":["/**\n * We use any for input and output because they really can be anything.\n * Plugin, if exists, makes sure that response value is correct.\n */\nimport { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport { ElasticsearchQuerySearchValuePlugins } from \"./types\";\n\ninterface Params {\n    plugins: ElasticsearchQuerySearchValuePlugins;\n    field: CmsModelField;\n    value: any;\n}\n\n/**\n * Transformed value can be anything.\n */\nexport const transformValueForSearch = (params: Params): any => {\n    const { field, plugins, value } = params;\n    const plugin = plugins[field.type];\n    if (!plugin) {\n        return value;\n    }\n    return plugin.transform({ field, value });\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAUA;AACA;AACA;AACO,MAAMA,uBAAuB,GAAIC,MAAc,IAAU;EAC5D,MAAM;IAAEC,KAAK;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EACxC,MAAMI,MAAM,GAAGF,OAAO,CAACD,KAAK,CAACI,IAAI,CAAC;EAClC,IAAI,CAACD,MAAM,EAAE;IACT,OAAOD,KAAK;EAChB;EACA,OAAOC,MAAM,CAACE,SAAS,CAAC;IAAEL,KAAK;IAAEE;EAAM,CAAC,CAAC;AAC7C,CAAC;AAACI,OAAA,CAAAR,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["getBaseFieldType","transformValueForSearch","params","field","plugins","value","fieldType","plugin","transform"],"sources":["transformValueForSearch.ts"],"sourcesContent":["/**\n * We use any for input and output because they really can be anything.\n * Plugin, if exists, makes sure that response value is correct.\n */\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\nimport type { ElasticsearchQuerySearchValuePlugins } from \"./types.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface Params {\n    plugins: ElasticsearchQuerySearchValuePlugins;\n    field: CmsModelField;\n    value: any;\n}\n\n/**\n * Transformed value can be anything.\n */\nexport const transformValueForSearch = (params: Params): any => {\n    const { field, plugins, value } = params;\n    const fieldType = getBaseFieldType(field);\n    const plugin = plugins[fieldType];\n    if (!plugin) {\n        return value;\n    }\n    return plugin.transform({ field, value });\n};\n"],"mappings":"AAAA;AACA;AACA;AACA;;AAGA,SAASA,gBAAgB,QAAQ,oDAAoD;AAQrF;AACA;AACA;AACA,OAAO,MAAMC,uBAAuB,GAAIC,MAAc,IAAU;EAC5D,MAAM;IAAEC,KAAK;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EACxC,MAAMI,SAAS,GAAGN,gBAAgB,CAACG,KAAK,CAAC;EACzC,MAAMI,MAAM,GAAGH,OAAO,CAACE,SAAS,CAAC;EACjC,IAAI,CAACC,MAAM,EAAE;IACT,OAAOF,KAAK;EAChB;EACA,OAAOE,MAAM,CAACC,SAAS,CAAC;IAAEL,KAAK;IAAEE;EAAM,CAAC,CAAC;AAC7C,CAAC","ignoreList":[]}

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

@@ -1,11 +1,11 @@
-import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../../plugins";
-import { ElasticsearchQueryBuilderOperatorPlugin } from "@webiny/api-elasticsearch";
-import { CmsModelField } from "@webiny/api-headless-cms/types";
+import type { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from "../../../plugins/index.js";
+import type { ElasticsearchQueryBuilderOperatorPlugin } from "@webiny/api-elasticsearch";
+import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
 /**
  * ./fields
  */
-declare type ModelFieldPath = string | ((value: string) => string);
-export declare type FieldType = "text" | "date" | "datetime" | "time" | "number" | "boolean" | string;
+type ModelFieldPath = string | ((value: string) => string);
+export type FieldType = "text" | "date" | "datetime" | "time" | "number" | "boolean" | string;
 export interface ModelFieldParent {
     fieldId: string;
     storageId: string;

package/operations/entry/elasticsearch/types.js

@@ -1,7 +1,3 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+export {};
 
 //# sourceMappingURL=types.js.map

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins\";\nimport { ElasticsearchQueryBuilderOperatorPlugin } from \"@webiny/api-elasticsearch\";\nimport { CmsModelField } from \"@webiny/api-headless-cms/types\";\n\n/**\n * ./fields\n */\ntype ModelFieldPath = string | ((value: string) => string);\n\nexport type FieldType = \"text\" | \"date\" | \"datetime\" | \"time\" | \"number\" | \"boolean\" | string;\n\nexport interface ModelFieldParent {\n    fieldId: string;\n    storageId: string;\n    type: FieldType;\n}\nexport interface ModelField {\n    unmappedType?: string;\n    keyword?: boolean;\n    searchable: boolean;\n    sortable: boolean;\n    type: FieldType;\n    systemField?: boolean;\n    field: CmsModelField;\n    path?: ModelFieldPath;\n    fullTextSearch?: boolean;\n    parents: ModelFieldParent[];\n}\n\nexport interface ModelFields {\n    [fieldId: string]: ModelField;\n}\n\n/**\n * ./plugins/operator\n */\nexport interface ElasticsearchQueryBuilderOperatorPlugins {\n    [key: string]: ElasticsearchQueryBuilderOperatorPlugin;\n}\n/**\n * ./plugins/search\n */\nexport interface ElasticsearchQuerySearchValuePlugins {\n    [fieldType: string]: CmsEntryElasticsearchQueryBuilderValueSearchPlugin;\n}\n"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { CmsEntryElasticsearchQueryBuilderValueSearchPlugin } from \"~/plugins/index.js\";\nimport type { ElasticsearchQueryBuilderOperatorPlugin } from \"@webiny/api-elasticsearch\";\nimport type { CmsModelField } from \"@webiny/api-headless-cms/types/index.js\";\n\n/**\n * ./fields\n */\ntype ModelFieldPath = string | ((value: string) => string);\n\nexport type FieldType = \"text\" | \"date\" | \"datetime\" | \"time\" | \"number\" | \"boolean\" | string;\n\nexport interface ModelFieldParent {\n    fieldId: string;\n    storageId: string;\n    type: FieldType;\n}\nexport interface ModelField {\n    unmappedType?: string;\n    keyword?: boolean;\n    searchable: boolean;\n    sortable: boolean;\n    type: FieldType;\n    systemField?: boolean;\n    field: CmsModelField;\n    path?: ModelFieldPath;\n    fullTextSearch?: boolean;\n    parents: ModelFieldParent[];\n}\n\nexport interface ModelFields {\n    [fieldId: string]: ModelField;\n}\n\n/**\n * ./plugins/operator\n */\nexport interface ElasticsearchQueryBuilderOperatorPlugins {\n    [key: string]: ElasticsearchQueryBuilderOperatorPlugin;\n}\n/**\n * ./plugins/search\n */\nexport interface ElasticsearchQuerySearchValuePlugins {\n    [fieldType: string]: CmsEntryElasticsearchQueryBuilderValueSearchPlugin;\n}\n"],"mappings":"","ignoreList":[]}

package/operations/entry/index.d.ts

@@ -1,10 +1,11 @@
-import { Entity } from "@webiny/db-dynamodb/toolbox";
-import { Client } from "@elastic/elasticsearch";
-import { PluginsContainer } from "@webiny/plugins";
-import { CmsEntryStorageOperations } from "../../types";
+import type { Client } from "@elastic/elasticsearch";
+import type { PluginsContainer } from "@webiny/plugins";
+import { type IElasticsearchEntity } from "@webiny/api-elasticsearch";
+import type { CmsEntryStorageOperations } from "../../types.js";
+import type { IEntryEntity } from "../../definitions/types.js";
 export interface CreateEntriesStorageOperationsParams {
-    entity: Entity<any>;
-    esEntity: Entity<any>;
+    entity: IEntryEntity;
+    esEntity: IElasticsearchEntity;
     elasticsearch: Client;
     plugins: PluginsContainer;
 }