@webiny/api-headless-cms-ddb 6.3.0 → 6.4.0-beta.1

package/operations/entry/dataLoaders.js

@@ -1,108 +1,90 @@
-import WebinyError from "@webiny/error";
+import error 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) {
-    this.entity = params.entity;
-  }
-  async getAllEntryRevisions(params) {
-    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) {
-    const ids = params.ids.map(id => {
-      const {
-        id: entryId
-      } = parseIdentifier(id);
-      return entryId;
-    });
-    return await this.loadMany("getPublishedRevisionByEntryId", params, ids);
-  }
-  async getLatestRevisionByEntryId(params) {
-    const ids = params.ids.map(id => {
-      const {
-        id: entryId
-      } = 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) {
-    const {
-      model
-    } = params;
-    const cacheParams = {
-      tenant: model.tenant,
-      modelId: model.modelId,
-      name
-    };
-    let loader = this.cache.getDataLoader(cacheParams);
-    if (loader) {
-      return loader;
+class DataLoadersHandler {
+    constructor(params){
+        this.cache = new DataLoaderCache();
+        this.entity = params.entity;
+    }
+    async getAllEntryRevisions(params) {
+        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) {
+        const ids = params.ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return entryId;
+        });
+        return await this.loadMany("getPublishedRevisionByEntryId", params, ids);
     }
-    const factory = getDataLoaderFactory(name);
-    loader = factory({
-      entity: this.entity,
-      tenant: model.tenant,
-      modelId: model.modelId
-    });
-    this.cache.setDataLoader(cacheParams, loader);
-    return loader;
-  }
-  async loadMany(loader, params, ids) {
-    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 WebinyError(res.message, res.code, {
-                ...res,
-                data: JSON.stringify(res.data || {})
-              });
-            }
-            throw new WebinyError("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", {
-              ...params,
-              loader
+    async getLatestRevisionByEntryId(params) {
+        const ids = params.ids.map((id)=>{
+            const { id: entryId } = parseIdentifier(id);
+            return entryId;
+        });
+        return await this.loadMany("getLatestRevisionByEntryId", params, ids);
+    }
+    getLoader(name, params) {
+        const { model } = params;
+        const cacheParams = {
+            tenant: model.tenant,
+            modelId: model.modelId,
+            name
+        };
+        let loader = this.cache.getDataLoader(cacheParams);
+        if (loader) return loader;
+        const factory = getDataLoaderFactory(name);
+        loader = factory({
+            entity: this.entity,
+            tenant: model.tenant,
+            modelId: model.modelId
+        });
+        this.cache.setDataLoader(cacheParams, loader);
+        return loader;
+    }
+    async loadMany(loader, params, ids) {
+        let results = [];
+        try {
+            results = await this.getLoader(loader, params).loadMany(ids);
+            if (true === Array.isArray(results)) return results.reduce((acc, res)=>{
+                if (false === Array.isArray(res)) {
+                    if (res && res.message) throw new error(res.message, res.code, {
+                        ...res,
+                        data: JSON.stringify(res.data || {})
+                    });
+                    throw new error("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(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", {
+                error: ex,
+                ...params,
+                loader,
+                ids
             });
-          }
-          acc.push(...res);
-          return acc;
-        }, []);
-      }
-    } catch (ex) {
-      throw new WebinyError(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", {
-        error: ex,
-        ...params,
-        loader,
-        ids
-      });
+        }
+        throw new error("Data loader did not return array of items or empty array.", "INVALID_DATA_LOADER_RESULT", {
+            loader,
+            ids,
+            results
+        });
+    }
+    clearAll(params) {
+        this.cache.clearAll(params?.model);
     }
-    throw new WebinyError(`Data loader did not return array of items or empty array.`, "INVALID_DATA_LOADER_RESULT", {
-      loader,
-      ids,
-      results
-    });
-  }
-  clearAll(params) {
-    this.cache.clearAll(params?.model);
-  }
 }
+export { DataLoadersHandler };
 
 //# sourceMappingURL=dataLoaders.js.map

package/operations/entry/dataLoaders.js.map

@@ -1 +1 @@
-{"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","modelId","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            modelId: model.modelId,\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            modelId: model.modelId\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":[]}
+{"version":3,"file":"operations/entry/dataLoaders.js","sources":["../../../src/operations/entry/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            modelId: model.modelId,\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            modelId: model.modelId\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"],"names":["DataLoadersHandler","params","DataLoaderCache","ids","id","entryId","parseIdentifier","name","model","cacheParams","loader","factory","getDataLoaderFactory","results","Array","acc","res","WebinyError","JSON","ex"],"mappings":"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"}

package/operations/entry/filtering/createExpressions.js

@@ -1,4 +1,4 @@
-import WebinyError from "@webiny/error";
+import error from "@webiny/error";
 import { getMappedPlugins } from "./mapPlugins.js";
 import { extractWhereParams } from "./where.js";
 import { transformValue } from "./transform.js";
@@ -6,167 +6,119 @@ import { CmsEntryFieldFilterPlugin } from "../../../plugins/CmsEntryFieldFilterP
 import { getWhereValues } from "./values.js";
 import { getBaseFieldType } from "@webiny/api-headless-cms/utils/getBaseFieldType.js";
 import { ValueFilterRegistry } from "@webiny/db-dynamodb/exports/api/db.js";
-export const createExpressions = params => {
-  const {
-    where,
-    plugins,
-    fields,
-    container
-  } = params;
-  const valueFilterRegistry = container.resolve(ValueFilterRegistry);
-  const transformValuePlugins = getMappedPlugins({
-    plugins,
-    type: "cms-field-filter-value-transform",
-    property: "fieldType"
-  });
-  const fieldFilterCreatePlugins = getMappedPlugins({
-    plugins,
-    type: CmsEntryFieldFilterPlugin.type,
-    property: "fieldType"
-  });
-  const defaultFilterCreatePlugin = fieldFilterCreatePlugins["*"];
-  const getFilterCreatePlugin = type => {
-    const fieldType = getBaseFieldType({
-      type
+const createExpressions = (params)=>{
+    const { where, plugins, fields, container } = params;
+    const valueFilterRegistry = container.resolve(ValueFilterRegistry);
+    const transformValuePlugins = getMappedPlugins({
+        plugins,
+        type: "cms-field-filter-value-transform",
+        property: "fieldType"
     });
-    const filterCreatePlugin = fieldFilterCreatePlugins[fieldType] || defaultFilterCreatePlugin;
-    if (filterCreatePlugin) {
-      return filterCreatePlugin;
-    }
-    throw new WebinyError(`There is no filter create plugin for the field type "${fieldType}".`, "MISSING_FILTER_CREATE_PLUGIN", {
-      fieldType
+    const fieldFilterCreatePlugins = getMappedPlugins({
+        plugins,
+        type: CmsEntryFieldFilterPlugin.type,
+        property: "fieldType"
     });
-  };
-  const createExpression = ({
-    where,
-    condition
-  }) => {
-    const expression = {
-      filters: [],
-      expressions: [],
-      condition
+    const defaultFilterCreatePlugin = fieldFilterCreatePlugins["*"];
+    const getFilterCreatePlugin = (type)=>{
+        const fieldType = getBaseFieldType({
+            type
+        });
+        const filterCreatePlugin = fieldFilterCreatePlugins[fieldType] || defaultFilterCreatePlugin;
+        if (filterCreatePlugin) return filterCreatePlugin;
+        throw new error(`There is no filter create plugin for the field type "${fieldType}".`, "MISSING_FILTER_CREATE_PLUGIN", {
+            fieldType
+        });
     };
-    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 = getWhereValues(value, key);
-        const childExpression = {
-          condition: "AND",
-          filters: [],
-          expressions: []
+    const createExpression = ({ where, condition })=>{
+        const expression = {
+            filters: [],
+            expressions: [],
+            condition
         };
-        for (const childWhere of childWhereList) {
-          const result = createExpression({
-            where: childWhere,
-            condition: "AND"
-          });
-          childExpression.expressions.push(result);
+        for(const key in where){
+            const value = where[key];
+            if (void 0 === value) continue;
+            if ("AND" === key) {
+                const childWhereList = 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;
+            }
+            if ("OR" === key) {
+                const childWhereList = 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 = extractWhereParams(key);
+            if (!whereParams) continue;
+            const { fieldId, operation, negate } = whereParams;
+            const field = fields[fieldId];
+            if (!field) throw new error(`There is no field with the fieldId "${fieldId}".`, "FIELD_ERROR", {
+                fieldId
+            });
+            const filterCreatePlugin = getFilterCreatePlugin(field.type);
+            const fieldType = getBaseFieldType(field);
+            const transformValuePlugin = transformValuePlugins[fieldType];
+            const transformValueCallable = (value)=>{
+                if (!transformValuePlugin) return value;
+                return transformValuePlugin.transform({
+                    field,
+                    value
+                });
+            };
+            const result = filterCreatePlugin.create({
+                key,
+                value,
+                valueFilterRegistry,
+                transformValuePlugins,
+                getFilterCreatePlugin,
+                operation,
+                negate,
+                field,
+                fields,
+                compareValue: transformValue({
+                    value,
+                    transform: transformValueCallable
+                }),
+                transformValue: transformValueCallable
+            });
+            if (!(!result || Array.isArray(result) && 0 === result.length)) expression.filters.push(...Array.isArray(result) ? result : [
+                result
+            ]);
         }
-        expression.expressions.push(childExpression);
-        continue;
-      }
-      /**
-       * OR conditional
-       */
-      if (key === "OR") {
-        const childWhereList = 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 = extractWhereParams(key);
-      if (!whereParams) {
-        continue;
-      }
-      const {
-        fieldId,
-        operation,
-        negate
-      } = whereParams;
-      const field = fields[fieldId];
-      if (!field) {
-        throw new WebinyError(`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 fieldType = getBaseFieldType(field);
-      const transformValuePlugin = transformValuePlugins[fieldType];
-      const transformValueCallable = value => {
-        if (!transformValuePlugin) {
-          return value;
-        }
-        return transformValuePlugin.transform({
-          field,
-          value
-        });
-      };
-      const result = filterCreatePlugin.create({
-        key,
-        value,
-        valueFilterRegistry,
-        transformValuePlugins,
-        getFilterCreatePlugin,
-        operation,
-        negate,
-        field,
-        fields,
-        compareValue: 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];
+        return expression;
+    };
+    const expression = createExpression({
+        where,
+        condition: "AND"
+    });
+    if (expression.filters.length > 0 || 1 !== expression.expressions.length) return expression;
+    return expression.expressions[0];
 };
+export { createExpressions };
 
 //# sourceMappingURL=createExpressions.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["WebinyError","getMappedPlugins","extractWhereParams","transformValue","CmsEntryFieldFilterPlugin","getWhereValues","getBaseFieldType","ValueFilterRegistry","createExpressions","params","where","plugins","fields","container","valueFilterRegistry","resolve","transformValuePlugins","type","property","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","compareValue","Array","isArray","length"],"sources":["createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsContext, CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.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\";\nimport { ValueFilter } from \"@webiny/db-dynamodb/feature/ValueFilter/index.js\";\nimport { ValueFilterRegistry } from \"@webiny/db-dynamodb/exports/api/db.js\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface ICreateExpressionsParams {\n    plugins: PluginsContainer;\n    container: CmsContext[\"container\"];\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    filter: ValueFilter.Interface;\n    negate: boolean;\n    compareValue: any;\n    transformValue: <I = any, O = any>(value: I) => O;\n}\n\nexport const createExpressions = (params: ICreateExpressionsParams): Expression => {\n    const { where, plugins, fields, container } = params;\n    const valueFilterRegistry = container.resolve(ValueFilterRegistry);\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                valueFilterRegistry,\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":[]}
+{"version":3,"file":"operations/entry/filtering/createExpressions.js","sources":["../../../../src/operations/entry/filtering/createExpressions.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { CmsContext, CmsEntryListWhere } from \"@webiny/api-headless-cms/types/index.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\";\nimport { ValueFilter } from \"@webiny/db-dynamodb/feature/ValueFilter/index.js\";\nimport { ValueFilterRegistry } from \"@webiny/db-dynamodb/exports/api/db.js\";\n\ninterface CreateExpressionParams {\n    where: Partial<CmsEntryListWhere>;\n    condition: ExpressionCondition;\n}\n\ninterface ICreateExpressionsParams {\n    plugins: PluginsContainer;\n    container: CmsContext[\"container\"];\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    filter: ValueFilter.Interface;\n    negate: boolean;\n    compareValue: any;\n    transformValue: <I = any, O = any>(value: I) => O;\n}\n\nexport const createExpressions = (params: ICreateExpressionsParams): Expression => {\n    const { where, plugins, fields, container } = params;\n    const valueFilterRegistry = container.resolve(ValueFilterRegistry);\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                valueFilterRegistry,\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"],"names":["createExpressions","params","where","plugins","fields","container","valueFilterRegistry","ValueFilterRegistry","transformValuePlugins","getMappedPlugins","fieldFilterCreatePlugins","CmsEntryFieldFilterPlugin","defaultFilterCreatePlugin","getFilterCreatePlugin","type","fieldType","getBaseFieldType","filterCreatePlugin","WebinyError","createExpression","condition","expression","key","value","undefined","childWhereList","getWhereValues","childExpression","childWhere","result","whereParams","extractWhereParams","fieldId","operation","negate","field","transformValuePlugin","transformValueCallable","transformValue","Array"],"mappings":"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"}