@webiny/api-headless-cms-ddb-es 0.0.0-mt-3 → 0.0.0-unstable.06b2ede40f

package/operations/entry/dataLoaders.js

@@ -1,347 +1,116 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataLoadersHandler = void 0;
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _dataloader = _interopRequireDefault(require("dataloader"));
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
-var _query = require("@webiny/db-dynamodb/utils/query");
-
-var _keys = require("./keys");
-
-var _cleanup = require("@webiny/db-dynamodb/utils/cleanup");
-
+var _DataLoaderCache = require("./dataLoader/DataLoaderCache");
+var _dataLoader = require("./dataLoader");
 var _utils = require("@webiny/utils");
-
-var _batchRead = require("@webiny/db-dynamodb/utils/batchRead");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-const getAllEntryRevisions = params => {
-  const {
-    entity,
-    model
-  } = params;
-  const {
-    tenant,
-    locale
-  } = model;
-  return new _dataloader.default(async ids => {
-    const results = [];
-
-    for (const id of ids) {
-      const queryAllParams = {
-        entity,
-        partitionKey: (0, _keys.createPartitionKey)({
-          tenant,
-          locale,
-          id
-        }),
-        options: {
-          beginsWith: "REV#"
-        }
-      };
-      const items = await (0, _query.queryAll)(queryAllParams);
-      const entries = (0, _cleanup.cleanupItems)(entity, items);
-      results.push(entries);
-    }
-
-    return results;
-  });
-};
-
-const getRevisionById = params => {
-  const {
-    entity,
-    model
-  } = params;
-  const {
-    locale,
-    tenant
-  } = model;
-  return new _dataloader.default(async ids => {
-    const queries = ids.reduce((collection, id) => {
-      const partitionKey = (0, _keys.createPartitionKey)({
-        tenant,
-        locale,
-        id
-      });
-      const {
-        version
-      } = (0, _utils.parseIdentifier)(id);
-      const sortKey = (0, _keys.createRevisionSortKey)({
-        version
-      });
-      const keys = `${partitionKey}__${sortKey}`;
-
-      if (collection[keys]) {
-        return collection;
-      }
-
-      collection[keys] = entity.getBatch({
-        PK: partitionKey,
-        SK: sortKey
-      });
-      return collection;
-    }, {});
-    const records = await (0, _batchRead.batchReadAll)({
-      table: entity.table,
-      items: Object.values(queries)
-    });
-    const items = (0, _cleanup.cleanupItems)(entity, records);
-    return ids.map(id => {
-      return items.filter(item => {
-        return id === item.id;
-      });
-    });
-  });
-};
-
-const getPublishedRevisionByEntryId = params => {
-  const {
-    entity,
-    model
-  } = params;
-  const {
-    locale,
-    tenant
-  } = model;
-  const publishedKey = (0, _keys.createPublishedSortKey)();
-  return new _dataloader.default(async ids => {
-    const queries = ids.reduce((collection, id) => {
-      const partitionKey = (0, _keys.createPartitionKey)({
-        tenant,
-        locale,
-        id
-      });
-
-      if (collection[partitionKey]) {
-        return collection;
-      }
-
-      collection[partitionKey] = entity.getBatch({
-        PK: partitionKey,
-        SK: publishedKey
-      });
-      return collection;
-    }, {});
-    const records = await (0, _batchRead.batchReadAll)({
-      table: entity.table,
-      items: Object.values(queries)
-    });
-    const items = (0, _cleanup.cleanupItems)(entity, records);
-    return ids.map(id => {
-      const {
-        id: entryId
-      } = (0, _utils.parseIdentifier)(id);
-      return items.filter(item => {
-        return entryId === item.entryId;
-      });
-    });
-  });
-};
-
-const getLatestRevisionByEntryId = params => {
-  const {
-    entity,
-    model
-  } = params;
-  const {
-    locale,
-    tenant
-  } = model;
-  const latestKey = (0, _keys.createLatestSortKey)();
-  return new _dataloader.default(async ids => {
-    const queries = ids.reduce((collection, id) => {
-      const partitionKey = (0, _keys.createPartitionKey)({
-        tenant,
-        locale,
-        id
-      });
-
-      if (collection[partitionKey]) {
-        return collection;
-      }
-
-      collection[partitionKey] = entity.getBatch({
-        PK: partitionKey,
-        SK: latestKey
-      });
-      return collection;
-    }, {});
-    const records = await (0, _batchRead.batchReadAll)({
-      table: entity.table,
-      items: Object.values(queries)
-    });
-    const items = (0, _cleanup.cleanupItems)(entity, records);
-    return ids.map(id => {
-      const {
-        id: entryId
-      } = (0, _utils.parseIdentifier)(id);
-      return items.filter(item => {
-        return entryId === item.entryId;
-      });
-    });
-  });
-};
-
-const dataLoaders = {
-  getAllEntryRevisions,
-  getRevisionById,
-  getPublishedRevisionByEntryId,
-  getLatestRevisionByEntryId
-};
-const loaderNames = Object.keys(dataLoaders);
-
 class DataLoadersHandler {
+  cache = new _DataLoaderCache.DataLoaderCache();
   constructor(params) {
-    (0, _defineProperty2.default)(this, "loaders", new Map());
-    (0, _defineProperty2.default)(this, "entity", void 0);
     this.entity = params.entity;
   }
-
   async getAllEntryRevisions(params) {
-    return await this.loadMany("getAllEntryRevisions", params, params.ids);
-  }
-
-  clearAllEntryRevisions(params) {
-    this.clear("getAllEntryRevisions", params);
+    const ids = params.ids.map(id => {
+      const {
+        id: entryId
+      } = (0, _utils.parseIdentifier)(id);
+      return entryId;
+    });
+    return await this.loadMany("getAllEntryRevisions", params, ids);
   }
-
   async getRevisionById(params) {
     return await this.loadMany("getRevisionById", params, params.ids);
   }
-
-  clearRevisionById(params) {
-    this.clear("getRevisionById", params);
-  }
-
   async getPublishedRevisionByEntryId(params) {
-    return await this.loadMany("getPublishedRevisionByEntryId", params, params.ids);
-  }
-
-  clearPublishedRevisionByEntryId(params) {
-    this.clear("getPublishedRevisionByEntryId", params);
+    const ids = params.ids.map(id => {
+      const {
+        id: entryId
+      } = (0, _utils.parseIdentifier)(id);
+      return entryId;
+    });
+    return await this.loadMany("getPublishedRevisionByEntryId", params, ids);
   }
-
   async getLatestRevisionByEntryId(params) {
-    return await this.loadMany("getLatestRevisionByEntryId", params, params.ids);
-  }
-
-  clearLatestRevisionByEntryId(params) {
-    this.clear("getLatestRevisionByEntryId", params);
+    const ids = params.ids.map(id => {
+      const {
+        id: entryId
+      } = (0, _utils.parseIdentifier)(id);
+      return entryId;
+    });
+    return await this.loadMany("getLatestRevisionByEntryId", params, ids);
   }
 
+  /**
+   * TODO @ts-refactor
+   * Maybe pass on the generics to DataLoader definition?
+   */
   getLoader(name, params) {
-    if (!dataLoaders[name]) {
-      throw new _error.default("Unknown data loader.", "UNKNOWN_DATA_LOADER", {
-        name
-      });
-    }
-
     const {
       model
     } = params;
-    const {
-      tenant,
-      locale
-    } = model;
-    const loaderKey = `${name}-${tenant}-${locale}-${model.modelId}`;
-
-    if (!this.loaders.has(loaderKey)) {
-      this.loaders.set(loaderKey, dataLoaders[name](_objectSpread(_objectSpread({}, params), {}, {
-        entity: this.entity
-      })));
+    const cacheParams = {
+      tenant: model.tenant,
+      locale: model.locale,
+      name
+    };
+    let loader = this.cache.getDataLoader(cacheParams);
+    if (loader) {
+      return loader;
     }
-
-    return this.loaders.get(loaderKey);
+    const factory = (0, _dataLoader.getDataLoaderFactory)(name);
+    loader = factory({
+      entity: this.entity,
+      tenant: model.tenant,
+      locale: model.locale
+    });
+    this.cache.setDataLoader(cacheParams, loader);
+    return loader;
   }
-
   async loadMany(loader, params, ids) {
-    let results;
-
+    let results = [];
     try {
       results = await this.getLoader(loader, params).loadMany(ids);
-
       if (Array.isArray(results) === true) {
         return results.reduce((acc, res) => {
           if (Array.isArray(res) === false) {
             if (res && res.message) {
-              throw new _error.default(res.message, res.code, _objectSpread(_objectSpread({}, res), {}, {
+              throw new _error.default(res.message, res.code, {
+                ...res,
                 data: JSON.stringify(res.data || {})
-              }));
+              });
             }
-
-            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", _objectSpread(_objectSpread({}, params), {}, {
+            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", {
+              ...params,
               loader
-            }));
+            });
           }
-
           acc.push(...res);
           return acc;
         }, []);
       }
     } catch (ex) {
-      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", _objectSpread(_objectSpread({
-        error: ex
-      }, params), {}, {
+      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", {
+        error: ex,
+        ...params,
         loader,
         ids
-      }));
+      });
     }
-
     throw new _error.default(`Data loader did not return array of items or empty array.`, "INVALID_DATA_LOADER_RESULT", {
       loader,
       ids,
       results
     });
   }
-
   clearAll(params) {
-    for (const name of loaderNames) {
-      const loader = this.getLoader(name, params);
-      loader.clearAll();
-    }
+    this.cache.clearAll(params?.model);
   }
-  /**
-   * Helper to clear the cache for certain data loader.
-   * If entry is passed then clear target key only.
-   */
-
-
-  clear(name, params) {
-    const {
-      entry
-    } = params;
-    const loader = this.getLoader(name, params);
-
-    if (!entry) {
-      loader.clearAll();
-      return;
-    }
-
-    loader.clear(entry.id);
-    const {
-      tenant,
-      locale
-    } = params.model;
-    loader.clear((0, _keys.createPartitionKey)({
-      tenant,
-      locale,
-      id: entry.id
-    }));
-  }
-
 }
+exports.DataLoadersHandler = DataLoadersHandler;
 
-exports.DataLoadersHandler = DataLoadersHandler;
+//# sourceMappingURL=dataLoaders.js.map

package/operations/entry/dataLoaders.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_error","_interopRequireDefault","require","_DataLoaderCache","_dataLoader","_utils","DataLoadersHandler","cache","DataLoaderCache","constructor","params","entity","getAllEntryRevisions","ids","map","id","entryId","parseIdentifier","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","locale","loader","getDataLoader","factory","getDataLoaderFactory","setDataLoader","results","Array","isArray","reduce","acc","res","message","WebinyError","code","data","JSON","stringify","push","ex","error","clearAll","exports"],"sources":["dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsModel, CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache\";\nimport type { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type {\n    DataLoadersHandlerInterface,\n    DataLoadersHandlerInterfaceClearAllParams\n} from \"~/types\";\n\ninterface DataLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"locale\" | \"modelId\">;\n    ids: readonly string[];\n}\n\ninterface GetLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"locale\" | \"modelId\">;\n}\n\ninterface DataLoadersHandlerParams {\n    entity: Entity<any>;\n}\n\nexport interface ClearAllParams {\n    model: Pick<CmsModel, \"tenant\" | \"locale\" | \"modelId\">;\n}\n\nexport class DataLoadersHandler implements DataLoadersHandlerInterface {\n    private readonly entity: Entity<any>;\n    private readonly cache: DataLoaderCache = new DataLoaderCache();\n\n    public constructor(params: DataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions(params: DataLoaderParams): Promise<CmsStorageEntry[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany(\"getAllEntryRevisions\", params, ids);\n    }\n\n    public async getRevisionById(params: DataLoaderParams): Promise<CmsStorageEntry[]> {\n        return await this.loadMany(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany(\"getPublishedRevisionByEntryId\", params, ids);\n    }\n\n    public async getLatestRevisionByEntryId(params: DataLoaderParams): Promise<CmsStorageEntry[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany(\"getLatestRevisionByEntryId\", params, ids);\n    }\n\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: DataLoaders, params: GetLoaderParams): DataLoader<any, any> {\n        const { model } = params;\n        const cacheParams: CacheKeyParams = {\n            tenant: model.tenant,\n            locale: model.locale,\n            name\n        };\n        let loader = this.cache.getDataLoader(cacheParams);\n        if (loader) {\n            return loader;\n        }\n        const factory = getDataLoaderFactory(name);\n        loader = factory({\n            entity: this.entity,\n            tenant: model.tenant,\n            locale: model.locale\n        });\n        this.cache.setDataLoader(cacheParams, loader);\n        return loader;\n    }\n\n    private async loadMany(\n        loader: DataLoaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry[]> {\n        let results: any[] = [];\n        try {\n            results = await this.getLoader(loader, params).loadMany(ids);\n            if (Array.isArray(results) === true) {\n                return results.reduce((acc, res) => {\n                    if (Array.isArray(res) === false) {\n                        if (res && res.message) {\n                            throw new WebinyError(res.message, res.code, {\n                                ...res,\n                                data: JSON.stringify(res.data || {})\n                            });\n                        }\n                        throw new WebinyError(\n                            \"Result from the data loader must be an array of arrays which contain requested items.\",\n                            \"DATA_LOADER_RESULTS_ERROR\",\n                            {\n                                ...params,\n                                loader\n                            }\n                        );\n                    }\n                    acc.push(...res);\n                    return acc;\n                }, []);\n            }\n        } catch (ex) {\n            throw new WebinyError(\n                ex.message || \"Data loader error.\",\n                ex.code || \"DATA_LOADER_ERROR\",\n                {\n                    error: ex,\n                    ...params,\n                    loader,\n                    ids\n                }\n            );\n        }\n        throw new WebinyError(\n            `Data loader did not return array of items or empty array.`,\n            \"INVALID_DATA_LOADER_RESULT\",\n            {\n                loader,\n                ids,\n                results\n            }\n        );\n    }\n\n    public clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void {\n        this.cache.clearAll(params?.model);\n    }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,18 @@
+import type { BoolQueryConfig } from "@webiny/api-elasticsearch/types";
+/**
+ * This function will assign a minimum_should_match for the query if conditions are met:
+ * * should is an array
+ * * it is not empty
+ * * minimum_should_match is not already set
+ *
+ *
+ * By the default we set it to 1 as we want at least one OR condition to produce results.
+ *
+ * Users can modify minimum_should_match value via the body or query modification plugins.
+ */
+interface Params {
+    query: BoolQueryConfig;
+    value?: number;
+}
+export declare const assignMinimumShouldMatchToQuery: ({ query, value }: Params) => void;
+export {};

package/operations/entry/elasticsearch/assignMinimumShouldMatchToQuery.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.assignMinimumShouldMatchToQuery = void 0;
+/**
+ * This function will assign a minimum_should_match for the query if conditions are met:
+ * * should is an array
+ * * it is not empty
+ * * minimum_should_match is not already set
+ *
+ *
+ * By the default we set it to 1 as we want at least one OR condition to produce results.
+ *
+ * Users can modify minimum_should_match value via the body or query modification plugins.
+ */
+
+const assignMinimumShouldMatchToQuery = ({
+  query,
+  value = 1
+}) => {
+  if (!Array.isArray(query.should)) {
+    return;
+  } else if (query.should.length === 0) {
+    return;
+  } else if (query.minimum_should_match) {
+    return;
+  }
+  query.minimum_should_match = value > 0 ? value : 1;
+};
+exports.assignMinimumShouldMatchToQuery = assignMinimumShouldMatchToQuery;
+
+//# sourceMappingURL=assignMinimumShouldMatchToQuery.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["assignMinimumShouldMatchToQuery","query","value","Array","isArray","should","length","minimum_should_match","exports"],"sources":["assignMinimumShouldMatchToQuery.ts"],"sourcesContent":["import type { BoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\n\n/**\n * This function will assign a minimum_should_match for the query if conditions are met:\n * * should is an array\n * * it is not empty\n * * minimum_should_match is not already set\n *\n *\n * By the default we set it to 1 as we want at least one OR condition to produce results.\n *\n * Users can modify minimum_should_match value via the body or query modification plugins.\n */\ninterface Params {\n    query: BoolQueryConfig;\n    value?: number;\n}\nexport const assignMinimumShouldMatchToQuery = ({ query, value = 1 }: Params): void => {\n    if (!Array.isArray(query.should)) {\n        return;\n    } else if (query.should.length === 0) {\n        return;\n    } else if (query.minimum_should_match) {\n        return;\n    }\n    query.minimum_should_match = value > 0 ? value : 1;\n};\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAKO,MAAMA,+BAA+B,GAAGA,CAAC;EAAEC,KAAK;EAAEC,KAAK,GAAG;AAAU,CAAC,KAAW;EACnF,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,KAAK,CAACI,MAAM,CAAC,EAAE;IAC9B;EACJ,CAAC,MAAM,IAAIJ,KAAK,CAACI,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAClC;EACJ,CAAC,MAAM,IAAIL,KAAK,CAACM,oBAAoB,EAAE;IACnC;EACJ;EACAN,KAAK,CAACM,oBAAoB,GAAGL,KAAK,GAAG,CAAC,GAAGA,KAAK,GAAG,CAAC;AACtD,CAAC;AAACM,OAAA,CAAAR,+BAAA,GAAAA,+BAAA","ignoreList":[]}

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

@@ -0,0 +1,13 @@
+import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsEntryListParams, CmsEntryListWhere, CmsModel } from "@webiny/api-headless-cms/types";
+import type { PrimitiveValue, SearchBody } from "@webiny/api-elasticsearch/types";
+interface Params {
+    plugins: PluginsContainer;
+    model: CmsModel;
+    params: Omit<CmsEntryListParams, "where" | "after"> & {
+        where: CmsEntryListWhere;
+        after?: PrimitiveValue[];
+    };
+}
+export declare const createElasticsearchBody: ({ plugins, model, params }: Params) => SearchBody;
+export {};

package/operations/entry/elasticsearch/body.js

@@ -0,0 +1,142 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createElasticsearchBody = void 0;
+var _fields = require("./fields");
+var _fullTextSearchFields = require("./fullTextSearchFields");
+var _initialQuery = require("./initialQuery");
+var _fullTextSearch = require("./fullTextSearch");
+var _queryModifier = require("./plugins/queryModifier");
+var _sortModifier = require("./plugins/sortModifier");
+var _bodyModifier = require("./plugins/bodyModifier");
+var _sort = require("./sort");
+var _filtering = require("./filtering");
+var _assignMinimumShouldMatchToQuery = require("./assignMinimumShouldMatchToQuery");
+const createElasticsearchBody = ({
+  plugins,
+  model,
+  params
+}) => {
+  const {
+    fields,
+    search: term,
+    where,
+    sort: initialSort,
+    after,
+    limit
+  } = params;
+  /**
+   * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.
+   */
+  const modelFields = (0, _fields.createModelFields)({
+    plugins,
+    model
+  });
+
+  /**
+   * We need the query modifier plugins.
+   */
+  const queryModifierPlugins = (0, _queryModifier.createQueryModifierPluginList)({
+    plugins,
+    model
+  });
+  /**
+   * We need the sort modifier plugins.
+   */
+  const sortModifierPlugins = (0, _sortModifier.createSortModifierPluginList)({
+    plugins,
+    model
+  });
+  /**
+   * We need the body modifier plugins.
+   */
+  const bodyModifierPlugins = (0, _bodyModifier.createBodyModifierPluginList)({
+    plugins,
+    model
+  });
+  /**
+   * We need the fields which we can search through via the full text search.
+   *
+   */
+  const fullTextSearchFields = (0, _fullTextSearchFields.createFullTextSearchFields)({
+    model,
+    term,
+    fields
+  });
+  /**
+   * The initial elasticsearch query where we attach some default conditions we always need.
+   */
+  const query = (0, _initialQuery.createInitialQuery)({
+    where,
+    model
+  });
+  /**
+   * Apply the full text search, if term is set.
+   */
+  (0, _fullTextSearch.applyFullTextSearch)({
+    model,
+    plugins,
+    query,
+    term,
+    fields: fullTextSearchFields
+  });
+  const execFiltering = (0, _filtering.createExecFiltering)({
+    model,
+    fields: modelFields,
+    plugins
+  });
+  execFiltering({
+    where,
+    query
+  });
+  for (const pl of queryModifierPlugins) {
+    pl.modifyQuery({
+      query,
+      model,
+      where
+    });
+  }
+  const sort = (0, _sort.createElasticsearchSort)({
+    plugins,
+    sort: initialSort,
+    modelFields,
+    model
+  });
+  for (const pl of sortModifierPlugins) {
+    pl.modifySort({
+      sort,
+      model
+    });
+  }
+  const boolQuery = {
+    must: query.must.length > 0 ? query.must : undefined,
+    must_not: query.must_not.length > 0 ? query.must_not : undefined,
+    should: query.should.length > 0 ? query.should : undefined,
+    filter: query.filter.length > 0 ? query.filter : undefined
+  };
+  (0, _assignMinimumShouldMatchToQuery.assignMinimumShouldMatchToQuery)({
+    query: boolQuery
+  });
+  const body = {
+    query: {
+      bool: boolQuery
+    },
+    sort,
+    size: (limit || 0) + 1,
+    search_after: after,
+    track_total_hits: true
+  };
+  for (const pl of bodyModifierPlugins) {
+    pl.modifyBody({
+      body,
+      model,
+      where
+    });
+  }
+  return body;
+};
+exports.createElasticsearchBody = createElasticsearchBody;
+
+//# sourceMappingURL=body.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_fields","require","_fullTextSearchFields","_initialQuery","_fullTextSearch","_queryModifier","_sortModifier","_bodyModifier","_sort","_filtering","_assignMinimumShouldMatchToQuery","createElasticsearchBody","plugins","model","params","fields","search","term","where","sort","initialSort","after","limit","modelFields","createModelFields","queryModifierPlugins","createQueryModifierPluginList","sortModifierPlugins","createSortModifierPluginList","bodyModifierPlugins","createBodyModifierPluginList","fullTextSearchFields","createFullTextSearchFields","query","createInitialQuery","applyFullTextSearch","execFiltering","createExecFiltering","pl","modifyQuery","createElasticsearchSort","modifySort","boolQuery","must","length","undefined","must_not","should","filter","assignMinimumShouldMatchToQuery","body","bool","size","search_after","track_total_hits","modifyBody","exports"],"sources":["body.ts"],"sourcesContent":["import type { PluginsContainer } from \"@webiny/plugins\";\nimport type {\n    CmsEntryListParams,\n    CmsEntryListWhere,\n    CmsModel\n} from \"@webiny/api-headless-cms/types\";\nimport { createModelFields } from \"./fields\";\nimport { createFullTextSearchFields } from \"./fullTextSearchFields\";\nimport { createInitialQuery } from \"./initialQuery\";\nimport { applyFullTextSearch } from \"./fullTextSearch\";\nimport { createQueryModifierPluginList } from \"./plugins/queryModifier\";\nimport { createSortModifierPluginList } from \"./plugins/sortModifier\";\nimport { createBodyModifierPluginList } from \"./plugins/bodyModifier\";\nimport { createElasticsearchSort } from \"./sort\";\nimport type { PrimitiveValue, SearchBody, BoolQueryConfig } from \"@webiny/api-elasticsearch/types\";\nimport { createExecFiltering } from \"./filtering\";\nimport { assignMinimumShouldMatchToQuery } from \"./assignMinimumShouldMatchToQuery\";\n\ninterface Params {\n    plugins: PluginsContainer;\n    model: CmsModel;\n    params: Omit<CmsEntryListParams, \"where\" | \"after\"> & {\n        where: CmsEntryListWhere;\n        after?: PrimitiveValue[];\n    };\n}\nexport const createElasticsearchBody = ({ plugins, model, params }: Params): SearchBody => {\n    const { fields, search: term, where, sort: initialSort, after, limit } = params;\n    /**\n     * We need the model fields constructed as a key -> field value, so we do not need to iterate through array when we require some field.\n     */\n    const modelFields = createModelFields({\n        plugins,\n        model\n    });\n\n    /**\n     * We need the query modifier plugins.\n     */\n    const queryModifierPlugins = createQueryModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the sort modifier plugins.\n     */\n    const sortModifierPlugins = createSortModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the body modifier plugins.\n     */\n    const bodyModifierPlugins = createBodyModifierPluginList({\n        plugins,\n        model\n    });\n    /**\n     * We need the fields which we can search through via the full text search.\n     *\n     */\n    const fullTextSearchFields = createFullTextSearchFields({\n        model,\n        term,\n        fields\n    });\n    /**\n     * The initial elasticsearch query where we attach some default conditions we always need.\n     */\n    const query = createInitialQuery({\n        where,\n        model\n    });\n    /**\n     * Apply the full text search, if term is set.\n     */\n    applyFullTextSearch({\n        model,\n        plugins,\n        query,\n        term,\n        fields: fullTextSearchFields\n    });\n\n    const execFiltering = createExecFiltering({\n        model,\n        fields: modelFields,\n        plugins\n    });\n\n    execFiltering({\n        where,\n        query\n    });\n\n    for (const pl of queryModifierPlugins) {\n        pl.modifyQuery({ query, model, where });\n    }\n\n    const sort = createElasticsearchSort({\n        plugins,\n        sort: initialSort,\n        modelFields,\n        model\n    });\n\n    for (const pl of sortModifierPlugins) {\n        pl.modifySort({\n            sort,\n            model\n        });\n    }\n\n    const boolQuery: BoolQueryConfig = {\n        must: query.must.length > 0 ? query.must : undefined,\n        must_not: query.must_not.length > 0 ? query.must_not : undefined,\n        should: query.should.length > 0 ? query.should : undefined,\n        filter: query.filter.length > 0 ? query.filter : undefined\n    };\n\n    assignMinimumShouldMatchToQuery({\n        query: boolQuery\n    });\n\n    const body: SearchBody = {\n        query: {\n            bool: boolQuery\n        },\n        sort,\n        size: (limit || 0) + 1,\n        search_after: after,\n        track_total_hits: true\n    };\n\n    for (const pl of bodyModifierPlugins) {\n        pl.modifyBody({\n            body,\n            model,\n            where\n        });\n    }\n\n    return body;\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,10 @@
+import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsModel } from "@webiny/api-headless-cms/types";
+interface Params {
+    plugins: PluginsContainer;
+    model: CmsModel;
+}
+export declare const createModelFields: ({ plugins, model }: Params) => {
+    [x: string]: import("./types").ModelField;
+};
+export {};