@webiny/api-headless-cms-ddb 0.0.0-unstable.97a151f74d → 0.0.0-unstable.99666aeb00

package/operations/entry/dataLoaders.js

@@ -1,280 +1,83 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataLoadersHandler = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 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");
-
-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);
-      results[id] = (0, _cleanup.cleanupItems)(entity, items);
-    }
-
-    return ids.map(id => {
-      return results[id] || [];
-    });
-  });
-};
-
-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);
-
-      if (version === null) {
-        return collection;
-      }
-
-      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;
-      /**
-       * We cast as any because there is no return type defined.
-       */
-    }, {});
-    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;
-      /**
-       * We cast as any because there is no return type defined.
-       */
-    }, {});
-    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;
-      /**
-       * We cast as any because there is no return type defined.
-       */
-    }, {});
-    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 {
   constructor(params) {
-    (0, _defineProperty2.default)(this, "loaders", new Map());
     (0, _defineProperty2.default)(this, "entity", void 0);
+    (0, _defineProperty2.default)(this, "cache", new _DataLoaderCache.DataLoaderCache());
     this.entity = params.entity;
   }
-
   async getAllEntryRevisions(params) {
-    return await this.loadMany("getAllEntryRevisions", params, params.ids);
+    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);
   }
-
   async getPublishedRevisionByEntryId(params) {
-    return await this.loadMany("getPublishedRevisionByEntryId", params, params.ids);
+    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);
+    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]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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) {
@@ -283,12 +86,10 @@ class DataLoadersHandler {
                 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", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
               loader
             }));
           }
-
           acc.push(...res);
           return acc;
         }, []);
@@ -301,21 +102,14 @@ class DataLoadersHandler {
         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 === null || params === void 0 ? void 0 : params.model);
   }
-
 }
-
 exports.DataLoadersHandler = DataLoadersHandler;

package/operations/entry/dataLoaders.js.map

@@ -1 +1 @@
-{"version":3,"names":["getAllEntryRevisions","params","entity","model","tenant","locale","DataLoader","ids","results","id","queryAllParams","partitionKey","createPartitionKey","options","beginsWith","items","queryAll","cleanupItems","map","getRevisionById","queries","reduce","collection","version","parseIdentifier","sortKey","createRevisionSortKey","keys","getBatch","PK","SK","records","batchReadAll","table","Object","values","filter","item","getPublishedRevisionByEntryId","publishedKey","createPublishedSortKey","entryId","getLatestRevisionByEntryId","latestKey","createLatestSortKey","dataLoaders","loaderNames","DataLoadersHandler","constructor","Map","loadMany","getLoader","name","WebinyError","loaderKey","modelId","loaders","has","set","get","loader","Array","isArray","acc","res","message","code","data","JSON","stringify","push","ex","error","clearAll"],"sources":["dataLoaders.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { CmsStorageEntry, CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { queryAll, QueryAllParams } from \"@webiny/db-dynamodb/utils/query\";\nimport {\n    createLatestSortKey,\n    createPartitionKey,\n    createPublishedSortKey,\n    createRevisionSortKey\n} from \"./keys\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\n\nconst getAllEntryRevisions = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { tenant, locale } = model;\n    return new DataLoader<string, CmsStorageEntry[]>(async (ids: readonly string[]) => {\n        const results: Record<string, CmsStorageEntry[]> = {};\n        for (const id of ids) {\n            const queryAllParams: QueryAllParams = {\n                entity,\n                partitionKey: createPartitionKey({\n                    tenant,\n                    locale,\n                    id\n                }),\n                options: {\n                    beginsWith: \"REV#\"\n                }\n            };\n            const items = await queryAll<CmsStorageEntry>(queryAllParams);\n            results[id] = cleanupItems(entity, items);\n        }\n\n        return ids.map(id => {\n            return results[id] || [];\n        });\n    });\n};\n\nconst getRevisionById = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { locale, tenant } = model;\n\n    return new DataLoader<string, CmsStorageEntry[]>(async (ids: readonly string[]) => {\n        const queries = ids.reduce((collection, id) => {\n            const partitionKey = createPartitionKey({\n                tenant,\n                locale,\n                id\n            });\n            const { version } = parseIdentifier(id);\n            if (version === null) {\n                return collection;\n            }\n            const sortKey = createRevisionSortKey({\n                version\n            });\n            const keys = `${partitionKey}__${sortKey}`;\n            if (collection[keys]) {\n                return collection;\n            }\n\n            collection[keys] = entity.getBatch({\n                PK: partitionKey,\n                SK: sortKey\n            });\n\n            return collection;\n            /**\n             * We cast as any because there is no return type defined.\n             */\n        }, {} as Record<string, any>);\n\n        const records = await batchReadAll<CmsStorageEntry>({\n            table: entity.table,\n            items: Object.values(queries)\n        });\n        const items = cleanupItems(entity, records);\n\n        return ids.map(id => {\n            return items.filter(item => {\n                return id === item.id;\n            });\n        });\n    });\n};\n\nconst getPublishedRevisionByEntryId = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { locale, tenant } = model;\n\n    const publishedKey = createPublishedSortKey();\n\n    return new DataLoader<string, CmsStorageEntry[]>(async (ids: readonly string[]) => {\n        const queries = ids.reduce((collection, id) => {\n            const partitionKey = createPartitionKey({\n                tenant,\n                locale,\n                id\n            });\n            if (collection[partitionKey]) {\n                return collection;\n            }\n            collection[partitionKey] = entity.getBatch({\n                PK: partitionKey,\n                SK: publishedKey\n            });\n            return collection;\n            /**\n             * We cast as any because there is no return type defined.\n             */\n        }, {} as Record<string, any>);\n\n        const records = await batchReadAll<CmsStorageEntry>({\n            table: entity.table,\n            items: Object.values(queries)\n        });\n        const items = cleanupItems(entity, records);\n\n        return ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return items.filter(item => {\n                return entryId === item.entryId;\n            });\n        });\n    });\n};\n\nconst getLatestRevisionByEntryId = (params: LoaderParams) => {\n    const { entity, model } = params;\n    const { locale, tenant } = model;\n\n    const latestKey = createLatestSortKey();\n\n    return new DataLoader<string, CmsStorageEntry[]>(async (ids: readonly string[]) => {\n        const queries = ids.reduce((collection, id) => {\n            const partitionKey = createPartitionKey({\n                tenant,\n                locale,\n                id\n            });\n            if (collection[partitionKey]) {\n                return collection;\n            }\n            collection[partitionKey] = entity.getBatch({\n                PK: partitionKey,\n                SK: latestKey\n            });\n            return collection;\n            /**\n             * We cast as any because there is no return type defined.\n             */\n        }, {} as Record<string, any>);\n\n        const records = await batchReadAll<CmsStorageEntry>({\n            table: entity.table,\n            items: Object.values(queries)\n        });\n        const items = cleanupItems(entity, records);\n\n        return ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return items.filter(item => {\n                return entryId === item.entryId;\n            });\n        });\n    });\n};\n\nconst dataLoaders: Record<Loaders, any> = {\n    getAllEntryRevisions,\n    getRevisionById,\n    getPublishedRevisionByEntryId,\n    getLatestRevisionByEntryId\n};\n\nexport interface GetAllEntryRevisionsParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\nexport interface GetRevisionByIdParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\nexport interface GetPublishedRevisionByEntryIdParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\nexport interface GetLatestRevisionByEntryIdParams {\n    ids: readonly string[];\n    model: CmsModel;\n}\n\ninterface LoaderParams {\n    entity: Entity<any>;\n    model: CmsModel;\n}\n\ninterface GetLoaderParams {\n    model: CmsModel;\n}\n\ninterface ClearLoaderParams {\n    model: CmsModel;\n    entry?: CmsStorageEntry;\n}\n\ntype Loaders =\n    | \"getAllEntryRevisions\"\n    | \"getRevisionById\"\n    | \"getPublishedRevisionByEntryId\"\n    | \"getLatestRevisionByEntryId\";\n\nconst loaderNames = Object.keys(dataLoaders) as Loaders[];\n\ninterface DataLoadersHandlerParams {\n    entity: Entity<any>;\n}\nexport class DataLoadersHandler {\n    private readonly loaders: Map<string, DataLoader<any, any>> = new Map();\n    private readonly entity: Entity<any>;\n\n    public constructor(params: DataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions(\n        params: GetAllEntryRevisionsParams\n    ): Promise<CmsStorageEntry[]> {\n        return await this.loadMany(\"getAllEntryRevisions\", params, params.ids);\n    }\n\n    public async getRevisionById(params: GetRevisionByIdParams): Promise<CmsStorageEntry[]> {\n        return await this.loadMany(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId(\n        params: GetPublishedRevisionByEntryIdParams\n    ): Promise<CmsStorageEntry[]> {\n        return await this.loadMany(\"getPublishedRevisionByEntryId\", params, params.ids);\n    }\n\n    public async getLatestRevisionByEntryId(\n        params: GetLatestRevisionByEntryIdParams\n    ): Promise<CmsStorageEntry[]> {\n        return await this.loadMany(\"getLatestRevisionByEntryId\", params, params.ids);\n    }\n\n    /**\n     * TODO @ts-refactor\n     * Maybe pass on the generics to DataLoader definition?\n     */\n    private getLoader(name: Loaders, params: GetLoaderParams): DataLoader<any, any> {\n        if (!dataLoaders[name]) {\n            throw new WebinyError(\"Unknown data loader.\", \"UNKNOWN_DATA_LOADER\", {\n                name\n            });\n        }\n        const { model } = params;\n        const { tenant, locale } = model;\n        const loaderKey = `${name}-${tenant}-${locale}-${model.modelId}`;\n        if (!this.loaders.has(loaderKey)) {\n            this.loaders.set(\n                loaderKey,\n                dataLoaders[name]({\n                    ...params,\n                    entity: this.entity\n                })\n            );\n        }\n        return this.loaders.get(loaderKey) as DataLoader<any, any>;\n    }\n\n    private async loadMany(\n        loader: Loaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry[]> {\n        let results;\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: Omit<ClearLoaderParams, \"entry\">): void {\n        for (const name of loaderNames) {\n            const loader = this.getLoader(name, params);\n            loader.clearAll();\n        }\n    }\n}\n"],"mappings":"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"}
+{"version":3,"names":["DataLoadersHandler","constructor","params","DataLoaderCache","entity","getAllEntryRevisions","ids","map","id","entryId","parseIdentifier","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","locale","loader","cache","getDataLoader","factory","getDataLoaderFactory","setDataLoader","results","Array","isArray","reduce","acc","res","message","WebinyError","code","data","JSON","stringify","push","ex","error","clearAll"],"sources":["dataLoaders.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport { CmsModel, CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport { CacheKeyParams, DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache\";\nimport { Entity } from \"dynamodb-toolbox\";\nimport { DataLoaders, getDataLoaderFactory } from \"~/operations/entry/dataLoader\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { DataLoadersHandlerInterface, DataLoadersHandlerInterfaceClearAllParams } 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 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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"}

package/operations/entry/filtering/{createFilters.d.ts → createExpressions.d.ts}

@@ -2,12 +2,18 @@ import { CmsEntryListWhere } from "@webiny/api-headless-cms/types";
 import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin";
 import { PluginsContainer } from "@webiny/plugins";
 import { Field } from "./types";
-interface CreateFiltersParams {
+interface Params {
     plugins: PluginsContainer;
     where: Partial<CmsEntryListWhere>;
     fields: Record<string, Field>;
 }
-export interface ItemFilter {
+export declare type ExpressionCondition = "AND" | "OR";
+export interface Expression {
+    expressions: Expression[];
+    filters: Filter[];
+    condition: ExpressionCondition;
+}
+export interface Filter {
     field: Field;
     path: string;
     fieldPathId: string;
@@ -16,5 +22,5 @@ export interface ItemFilter {
     compareValue: any;
     transformValue: <I = any, O = any>(value: I) => O;
 }
-export declare const createFilters: (params: CreateFiltersParams) => ItemFilter[];
+export declare const createExpressions: (params: Params) => Expression;
 export {};

package/operations/entry/filtering/createExpressions.js

@@ -0,0 +1,176 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createExpressions = void 0;
+var _error = _interopRequireDefault(require("@webiny/error"));
+var _ValueFilterPlugin = require("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin");
+var _mapPlugins = require("./mapPlugins");
+var _where = require("./where");
+var _transform = require("./transform");
+var _CmsEntryFieldFilterPlugin = require("../../../plugins/CmsEntryFieldFilterPlugin");
+var _values = require("./values");
+const createExpressions = params => {
+  const {
+    where,
+    plugins,
+    fields
+  } = params;
+  const filterPlugins = (0, _mapPlugins.getMappedPlugins)({
+    plugins,
+    type: _ValueFilterPlugin.ValueFilterPlugin.type,
+    property: "operation"
+  });
+  const transformValuePlugins = (0, _mapPlugins.getMappedPlugins)({
+    plugins,
+    type: "cms-field-filter-value-transform",
+    property: "fieldType"
+  });
+  const fieldFilterCreatePlugins = (0, _mapPlugins.getMappedPlugins)({
+    plugins,
+    type: _CmsEntryFieldFilterPlugin.CmsEntryFieldFilterPlugin.type,
+    property: "fieldType"
+  });
+  const defaultFilterCreatePlugin = fieldFilterCreatePlugins["*"];
+  const getFilterCreatePlugin = type => {
+    const filterCreatePlugin = fieldFilterCreatePlugins[type] || defaultFilterCreatePlugin;
+    if (filterCreatePlugin) {
+      return filterCreatePlugin;
+    }
+    throw new _error.default(`There is no filter create plugin for the field type "${type}".`, "MISSING_FILTER_CREATE_PLUGIN", {
+      type
+    });
+  };
+  const createExpression = ({
+    where,
+    condition
+  }) => {
+    const expression = {
+      filters: [],
+      expressions: [],
+      condition
+    };
+    for (const key in where) {
+      const value = where[key];
+      if (value === undefined) {
+        continue;
+      }
+
+      /**
+       * If there are "AND" or "OR" keys, let's sort them out first.
+       *
+       *
+       * AND conditional
+       */
+      if (key === "AND") {
+        const childWhereList = (0, _values.getWhereValues)(value, key);
+        const childExpression = {
+          condition: "AND",
+          filters: [],
+          expressions: []
+        };
+        for (const childWhere of childWhereList) {
+          const result = createExpression({
+            where: childWhere,
+            condition: "AND"
+          });
+          childExpression.expressions.push(result);
+        }
+        expression.expressions.push(childExpression);
+        continue;
+      }
+      /**
+       * OR conditional
+       */
+      if (key === "OR") {
+        const childWhereList = (0, _values.getWhereValues)(value, key);
+        const childExpression = {
+          condition: "OR",
+          filters: [],
+          expressions: []
+        };
+        for (const childWhere of childWhereList) {
+          const result = createExpression({
+            where: childWhere,
+            condition: "AND"
+          });
+          childExpression.expressions.push(result);
+        }
+        expression.expressions.push(childExpression);
+        continue;
+      }
+      const whereParams = (0, _where.extractWhereParams)(key);
+      if (!whereParams) {
+        continue;
+      }
+      const {
+        fieldId,
+        operation,
+        negate
+      } = whereParams;
+      const field = fields[fieldId];
+      if (!field) {
+        throw new _error.default(`There is no field with the fieldId "${fieldId}".`, "FIELD_ERROR", {
+          fieldId
+        });
+      }
+
+      /**
+       * We need a filter create plugin for this type.
+       */
+      const filterCreatePlugin = getFilterCreatePlugin(field.type);
+      const transformValuePlugin = transformValuePlugins[field.type];
+      const transformValueCallable = value => {
+        if (!transformValuePlugin) {
+          return value;
+        }
+        return transformValuePlugin.transform({
+          field,
+          value
+        });
+      };
+      const result = filterCreatePlugin.create({
+        key,
+        value,
+        valueFilterPlugins: filterPlugins,
+        transformValuePlugins,
+        getFilterCreatePlugin,
+        operation,
+        negate,
+        field,
+        fields,
+        compareValue: (0, _transform.transformValue)({
+          value,
+          transform: transformValueCallable
+        }),
+        transformValue: transformValueCallable
+      });
+      /**
+       * There is a possibility of
+       * - no result
+       * - result being an array
+       * - result being an object
+       */
+      if (!result || Array.isArray(result) && result.length === 0) {
+        continue;
+      }
+      expression.filters.push(...(Array.isArray(result) ? result : [result]));
+    }
+    return expression;
+  };
+  const expression = createExpression({
+    where,
+    condition: "AND"
+  });
+  /**
+   * If the first expression has no filters and has only one expression, put that expression as main one.
+   * This will mostly be used when having an OR condition as the single expression in the root level of the where
+   */
+  if (expression.filters.length > 0 || expression.expressions.length !== 1) {
+    return expression;
+  }
+  return expression.expressions[0];
+};
+exports.createExpressions = createExpressions;

package/operations/entry/filtering/createExpressions.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createExpressions","params","where","plugins","fields","filterPlugins","getMappedPlugins","type","ValueFilterPlugin","property","transformValuePlugins","fieldFilterCreatePlugins","CmsEntryFieldFilterPlugin","defaultFilterCreatePlugin","getFilterCreatePlugin","filterCreatePlugin","WebinyError","createExpression","condition","expression","filters","expressions","key","value","undefined","childWhereList","getWhereValues","childExpression","childWhere","result","push","whereParams","extractWhereParams","fieldId","operation","negate","field","transformValuePlugin","transformValueCallable","transform","create","valueFilterPlugins","compareValue","transformValue","Array","isArray","length"],"sources":["createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport { CmsFieldFilterValueTransformPlugin } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { Field } from \"./types\";\nimport { getMappedPlugins } from \"./mapPlugins\";\nimport { extractWhereParams } from \"./where\";\nimport { transformValue } from \"./transform\";\nimport { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin\";\nimport { getWhereValues } from \"~/operations/entry/filtering/values\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface CreateExpressionCb {\n    (params: CreateExpressionParams): Expression;\n}\n\ninterface Params {\n    plugins: PluginsContainer;\n    where: Partial<CmsEntryListWhere>;\n    fields: Record<string, Field>;\n}\n\nexport type ExpressionCondition = \"AND\" | \"OR\";\n\nexport interface Expression {\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nexport interface Filter {\n    field: Field;\n    path: string;\n    fieldPathId: string;\n    plugin: ValueFilterPlugin;\n    negate: boolean;\n    compareValue: any;\n    transformValue: <I = any, O = any>(value: I) => O;\n}\n\nexport const createExpressions = (params: Params): Expression => {\n    const { where, plugins, fields } = params;\n    const filterPlugins = getMappedPlugins<ValueFilterPlugin>({\n        plugins,\n        type: ValueFilterPlugin.type,\n        property: \"operation\"\n    });\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const fieldFilterCreatePlugins = getMappedPlugins<CmsEntryFieldFilterPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const defaultFilterCreatePlugin = fieldFilterCreatePlugins[\"*\"] as CmsEntryFieldFilterPlugin;\n\n    const getFilterCreatePlugin = (type: string) => {\n        const filterCreatePlugin = fieldFilterCreatePlugins[type] || defaultFilterCreatePlugin;\n        if (filterCreatePlugin) {\n            return filterCreatePlugin;\n        }\n        throw new WebinyError(\n            `There is no filter create plugin for the field type \"${type}\".`,\n            \"MISSING_FILTER_CREATE_PLUGIN\",\n            {\n                type\n            }\n        );\n    };\n\n    const createExpression: CreateExpressionCb = ({ where, condition }) => {\n        const expression: Expression = {\n            filters: [],\n            expressions: [],\n            condition\n        };\n\n        for (const key in where) {\n            const value = (where as any)[key];\n            if (value === undefined) {\n                continue;\n            }\n\n            /**\n             * If there are \"AND\" or \"OR\" keys, let's sort them out first.\n             *\n             *\n             * AND conditional\n             */\n            if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, key);\n                const childExpression: Expression = {\n                    condition: \"AND\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n            /**\n             * OR conditional\n             */\n            if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, key);\n\n                const childExpression: Expression = {\n                    condition: \"OR\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n\n            const whereParams = extractWhereParams(key);\n            if (!whereParams) {\n                continue;\n            }\n\n            const { fieldId, operation, negate } = whereParams;\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(\n                    `There is no field with the fieldId \"${fieldId}\".`,\n                    \"FIELD_ERROR\",\n                    {\n                        fieldId\n                    }\n                );\n            }\n\n            /**\n             * We need a filter create plugin for this type.\n             */\n            const filterCreatePlugin = getFilterCreatePlugin(field.type);\n\n            const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\n                transformValuePlugins[field.type];\n\n            const transformValueCallable = (value: any) => {\n                if (!transformValuePlugin) {\n                    return value;\n                }\n                return transformValuePlugin.transform({\n                    field,\n                    value\n                });\n            };\n\n            const result = filterCreatePlugin.create({\n                key,\n                value,\n                valueFilterPlugins: filterPlugins,\n                transformValuePlugins,\n                getFilterCreatePlugin,\n                operation,\n                negate,\n                field,\n                fields,\n                compareValue: transformValue({\n                    value,\n                    transform: transformValueCallable\n                }),\n                transformValue: transformValueCallable\n            });\n            /**\n             * There is a possibility of\n             * - no result\n             * - result being an array\n             * - result being an object\n             */\n            if (!result || (Array.isArray(result) && result.length === 0)) {\n                continue;\n            }\n\n            expression.filters.push(...(Array.isArray(result) ? result : [result]));\n        }\n\n        return expression;\n    };\n\n    const expression = createExpression({\n        where,\n        condition: \"AND\"\n    });\n    /**\n     * If the first expression has no filters and has only one expression, put that expression as main one.\n     * This will mostly be used when having an OR condition as the single expression in the root level of the where\n     */\n    if (expression.filters.length > 0 || expression.expressions.length !== 1) {\n        return expression;\n    }\n    return expression.expressions[0];\n};\n"],"mappings":"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"}

package/operations/entry/filtering/createFields.d.ts

@@ -1,18 +1,16 @@
-import { CmsModel } from "@webiny/api-headless-cms/types";
+import { CmsModelField } from "@webiny/api-headless-cms/types";
 import { Field } from "./types";
 import { PluginsContainer } from "@webiny/plugins";
 interface Params {
-    model: CmsModel;
+    fields: CmsModelField[];
     plugins: PluginsContainer;
 }
-interface Fields {
-    [key: string]: Field;
-}
 /**
  * This method will map the fieldId (fieldId -> field) to the actual field.
  *
  * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).
- * @param params
  */
-export declare const createFields: (params: Params) => Fields;
+export declare const createFields: (params: Params) => {
+    [x: string]: Field;
+};
 export {};