@webiny/api-headless-cms-ddb 0.0.0-unstable.b14eaecf38 → 0.0.0-unstable.b9b64acb6d

package/operations/entry/dataLoaders.js

@@ -1,212 +1,41 @@
-"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 _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 {
+import WebinyError from "@webiny/error";
+import { DataLoaderCache } from "./dataLoader/DataLoaderCache.js";
+import { getDataLoaderFactory } from "./dataLoader/index.js";
+import { parseIdentifier } from "@webiny/utils";
+export class DataLoadersHandler {
+  cache = new 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);
+    const ids = params.ids.map(id => {
+      const {
+        id: entryId
+      } = 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
+      } = 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
+      } = parseIdentifier(id);
+      return entryId;
+    });
+    return await this.loadMany("getLatestRevisionByEntryId", params, ids);
   }
 
   /**
@@ -214,65 +43,64 @@ class DataLoadersHandler {
    * 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,
+      name
+    };
+    let loader = this.cache.getDataLoader(cacheParams);
+    if (loader) {
+      return loader;
     }
-    return this.loaders.get(loaderKey);
+    const factory = getDataLoaderFactory(name);
+    loader = factory({
+      entity: this.entity,
+      tenant: model.tenant
+    });
+    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, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
+              throw new WebinyError(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", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+            throw new WebinyError("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", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        error: ex
-      }, params), {}, {
+      throw new WebinyError(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", {
+    throw new WebinyError(`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);
   }
 }
-exports.DataLoadersHandler = DataLoadersHandler;
+
+//# sourceMappingURL=dataLoaders.js.map

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":["WebinyError","DataLoaderCache","getDataLoaderFactory","parseIdentifier","DataLoadersHandler","cache","constructor","params","entity","getAllEntryRevisions","ids","map","id","entryId","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","loader","getDataLoader","factory","setDataLoader","results","Array","isArray","reduce","acc","res","message","code","data","JSON","stringify","push","ex","error","clearAll"],"sources":["dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type {\n    CmsEntryValues,\n    CmsModel,\n    CmsStorageEntry\n} from \"@webiny/api-headless-cms/types/index.js\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache.js\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader/index.js\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader/index.js\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type {\n    DataLoadersHandlerInterfaceClearAllParams,\n    IDataLoadersHandler,\n    IEntryEntity\n} from \"~/types.js\";\n\ninterface DataLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n    ids: readonly string[];\n}\n\ninterface GetLoaderParams {\n    model: Pick<CmsModel, \"tenant\" | \"modelId\">;\n}\n\ninterface IDataLoadersHandlerParams {\n    entity: IEntryEntity;\n}\n\nexport class DataLoadersHandler implements IDataLoadersHandler {\n    private readonly entity;\n    private readonly cache = new DataLoaderCache();\n\n    public constructor(params: IDataLoadersHandlerParams) {\n        this.entity = params.entity;\n    }\n\n    public async getAllEntryRevisions<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getAllEntryRevisions\", params, ids);\n    }\n\n    public async getRevisionById<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        return await this.loadMany<T>(\"getRevisionById\", params, params.ids);\n    }\n\n    public async getPublishedRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"getPublishedRevisionByEntryId\", params, ids);\n    }\n\n    public async getLatestRevisionByEntryId<T extends CmsEntryValues = CmsEntryValues>(\n        params: DataLoaderParams\n    ): Promise<CmsStorageEntry<T>[]> {\n        const ids = params.ids.map(id => {\n            const { id: entryId } = parseIdentifier(id);\n            return entryId;\n        });\n        return await this.loadMany<T>(\"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            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        });\n        this.cache.setDataLoader(cacheParams, loader);\n        return loader;\n    }\n\n    private async loadMany<T extends CmsEntryValues = CmsEntryValues>(\n        loader: DataLoaders,\n        params: GetLoaderParams,\n        ids: readonly string[]\n    ): Promise<CmsStorageEntry<T>[]> {\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/filtering/createExpressions.d.ts

@@ -1,13 +1,13 @@
-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";
+import type { CmsEntryListWhere } from "@webiny/api-headless-cms/types/index.js";
+import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { Field } from "./types.js";
 interface Params {
     plugins: PluginsContainer;
     where: Partial<CmsEntryListWhere>;
     fields: Record<string, Field>;
 }
-export declare type ExpressionCondition = "AND" | "OR";
+export type ExpressionCondition = "AND" | "OR";
 export interface Expression {
     expressions: Expression[];
     filters: Filter[];

package/operations/entry/filtering/createExpressions.js

@@ -1,46 +1,43 @@
-"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 => {
+import WebinyError from "@webiny/error";
+import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js";
+import { getMappedPlugins } from "./mapPlugins.js";
+import { extractWhereParams } from "./where.js";
+import { transformValue } from "./transform.js";
+import { CmsEntryFieldFilterPlugin } from "../../../plugins/CmsEntryFieldFilterPlugin.js";
+import { getWhereValues } from "./values.js";
+import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
+export const createExpressions = params => {
   const {
     where,
     plugins,
     fields
   } = params;
-  const filterPlugins = (0, _mapPlugins.getMappedPlugins)({
+  const filterPlugins = getMappedPlugins({
     plugins,
-    type: _ValueFilterPlugin.ValueFilterPlugin.type,
+    type: ValueFilterPlugin.type,
     property: "operation"
   });
-  const transformValuePlugins = (0, _mapPlugins.getMappedPlugins)({
+  const transformValuePlugins = getMappedPlugins({
     plugins,
     type: "cms-field-filter-value-transform",
     property: "fieldType"
   });
-  const fieldFilterCreatePlugins = (0, _mapPlugins.getMappedPlugins)({
+  const fieldFilterCreatePlugins = getMappedPlugins({
     plugins,
-    type: _CmsEntryFieldFilterPlugin.CmsEntryFieldFilterPlugin.type,
+    type: CmsEntryFieldFilterPlugin.type,
     property: "fieldType"
   });
   const defaultFilterCreatePlugin = fieldFilterCreatePlugins["*"];
   const getFilterCreatePlugin = type => {
-    const filterCreatePlugin = fieldFilterCreatePlugins[type] || defaultFilterCreatePlugin;
+    const fieldType = getBaseFieldType({
+      type
+    });
+    const filterCreatePlugin = fieldFilterCreatePlugins[fieldType] || 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
+    throw new WebinyError(`There is no filter create plugin for the field type "${fieldType}".`, "MISSING_FILTER_CREATE_PLUGIN", {
+      fieldType
     });
   };
   const createExpression = ({
@@ -65,7 +62,7 @@ const createExpressions = params => {
        * AND conditional
        */
       if (key === "AND") {
-        const childWhereList = (0, _values.getWhereValues)(value, key);
+        const childWhereList = getWhereValues(value, key);
         const childExpression = {
           condition: "AND",
           filters: [],
@@ -85,7 +82,7 @@ const createExpressions = params => {
        * OR conditional
        */
       if (key === "OR") {
-        const childWhereList = (0, _values.getWhereValues)(value, key);
+        const childWhereList = getWhereValues(value, key);
         const childExpression = {
           condition: "OR",
           filters: [],
@@ -101,7 +98,7 @@ const createExpressions = params => {
         expression.expressions.push(childExpression);
         continue;
       }
-      const whereParams = (0, _where.extractWhereParams)(key);
+      const whereParams = extractWhereParams(key);
       if (!whereParams) {
         continue;
       }
@@ -112,7 +109,7 @@ const createExpressions = params => {
       } = whereParams;
       const field = fields[fieldId];
       if (!field) {
-        throw new _error.default(`There is no field with the fieldId "${fieldId}".`, "FIELD_ERROR", {
+        throw new WebinyError(`There is no field with the fieldId "${fieldId}".`, "FIELD_ERROR", {
           fieldId
         });
       }
@@ -121,7 +118,8 @@ const createExpressions = params => {
        * We need a filter create plugin for this type.
        */
       const filterCreatePlugin = getFilterCreatePlugin(field.type);
-      const transformValuePlugin = transformValuePlugins[field.type];
+      const fieldType = getBaseFieldType(field);
+      const transformValuePlugin = transformValuePlugins[fieldType];
       const transformValueCallable = value => {
         if (!transformValuePlugin) {
           return value;
@@ -141,7 +139,7 @@ const createExpressions = params => {
         negate,
         field,
         fields,
-        compareValue: (0, _transform.transformValue)({
+        compareValue: transformValue({
           value,
           transform: transformValueCallable
         }),
@@ -173,4 +171,5 @@ const createExpressions = params => {
   }
   return expression.expressions[0];
 };
-exports.createExpressions = createExpressions;
+
+//# sourceMappingURL=createExpressions.js.map

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

@@ -1 +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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"}
+{"version":3,"names":["WebinyError","ValueFilterPlugin","getMappedPlugins","extractWhereParams","transformValue","CmsEntryFieldFilterPlugin","getWhereValues","getBaseFieldType","createExpressions","params","where","plugins","fields","filterPlugins","type","property","transformValuePlugins","fieldFilterCreatePlugins","defaultFilterCreatePlugin","getFilterCreatePlugin","fieldType","filterCreatePlugin","createExpression","condition","expression","filters","expressions","key","value","undefined","childWhereList","childExpression","childWhere","result","push","whereParams","fieldId","operation","negate","field","transformValuePlugin","transformValueCallable","transform","create","valueFilterPlugins","compareValue","Array","isArray","length"],"sources":["createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.js\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin.js\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types.js\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"./types.js\";\nimport { getMappedPlugins } from \"./mapPlugins.js\";\nimport { extractWhereParams } from \"./where.js\";\nimport { transformValue } from \"./transform.js\";\nimport { CmsEntryFieldFilterPlugin } from \"~/plugins/CmsEntryFieldFilterPlugin.js\";\nimport { getWhereValues } from \"~/operations/entry/filtering/values.js\";\nimport { getBaseFieldType } from \"@webiny/api-headless-cms/utils/getBaseFieldType.js\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\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 fieldType = getBaseFieldType({\n            type\n        });\n        const filterCreatePlugin = fieldFilterCreatePlugins[fieldType] || defaultFilterCreatePlugin;\n        if (filterCreatePlugin) {\n            return filterCreatePlugin;\n        }\n        throw new WebinyError(\n            `There is no filter create plugin for the field type \"${fieldType}\".`,\n            \"MISSING_FILTER_CREATE_PLUGIN\",\n            {\n                fieldType\n            }\n        );\n    };\n\n    const createExpression = ({ where, condition }: CreateExpressionParams): Expression => {\n        const expression: Expression = {\n            filters: [],\n            expressions: [],\n            condition\n        };\n\n        for (const key in where) {\n            const value = where[key as keyof typeof where];\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 fieldType = getBaseFieldType(field);\n\n            const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\n                transformValuePlugins[fieldType];\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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","ignoreList":[]}

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

@@ -1,6 +1,6 @@
-import { CmsModelField } from "@webiny/api-headless-cms/types";
-import { Field } from "./types";
-import { PluginsContainer } from "@webiny/plugins";
+import type { CmsModelField } from "@webiny/api-headless-cms/types/index.js";
+import type { Field } from "./types.js";
+import type { PluginsContainer } from "@webiny/plugins";
 interface Params {
     fields: CmsModelField[];
     plugins: PluginsContainer;
@@ -10,5 +10,7 @@ interface Params {
  *
  * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).
  */
-export declare const createFields: (params: Params) => Record<string, Field>;
+export declare const createFields: (params: Params) => {
+    [x: string]: Field;
+};
 export {};