@webiny/api-headless-cms-ddb 0.0.0-mt-3 → 0.0.0-unstable.3386f66516

package/operations/entry/dataLoaders.d.ts

@@ -1,4 +1,4 @@
-import { CmsEntry, CmsModel } from "@webiny/api-headless-cms/types";
+import { CmsStorageEntry, CmsModel } from "@webiny/api-headless-cms/types";
 import { Entity } from "dynamodb-toolbox";
 export interface GetAllEntryRevisionsParams {
     ids: readonly string[];
@@ -18,19 +18,23 @@ export interface GetLatestRevisionByEntryIdParams {
 }
 interface ClearLoaderParams {
     model: CmsModel;
-    entry?: CmsEntry;
+    entry?: CmsStorageEntry;
 }
-export interface Params {
+interface DataLoadersHandlerParams {
     entity: Entity<any>;
 }
 export declare class DataLoadersHandler {
     private readonly loaders;
     private readonly entity;
-    constructor(params: any);
-    getAllEntryRevisions(params: GetAllEntryRevisionsParams): Promise<CmsEntry[]>;
-    getRevisionById(params: GetRevisionByIdParams): Promise<CmsEntry[]>;
-    getPublishedRevisionByEntryId(params: GetPublishedRevisionByEntryIdParams): Promise<CmsEntry[]>;
-    getLatestRevisionByEntryId(params: GetLatestRevisionByEntryIdParams): Promise<CmsEntry[]>;
+    constructor(params: DataLoadersHandlerParams);
+    getAllEntryRevisions(params: GetAllEntryRevisionsParams): Promise<CmsStorageEntry[]>;
+    getRevisionById(params: GetRevisionByIdParams): Promise<CmsStorageEntry[]>;
+    getPublishedRevisionByEntryId(params: GetPublishedRevisionByEntryIdParams): Promise<CmsStorageEntry[]>;
+    getLatestRevisionByEntryId(params: GetLatestRevisionByEntryIdParams): Promise<CmsStorageEntry[]>;
+    /**
+     * TODO @ts-refactor
+     * Maybe pass on the generics to DataLoader definition?
+     */
     private getLoader;
     private loadMany;
     clearAll(params: Omit<ClearLoaderParams, "entry">): void;

package/operations/entry/dataLoaders.js

@@ -1,12 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DataLoadersHandler = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _dataloader = _interopRequireDefault(require("dataloader"));
@@ -23,10 +25,6 @@ var _utils = require("@webiny/utils");
 
 var _batchRead = require("@webiny/db-dynamodb/utils/batchRead");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
 const getAllEntryRevisions = params => {
   const {
     entity,
@@ -37,7 +35,7 @@ const getAllEntryRevisions = params => {
     locale
   } = model;
   return new _dataloader.default(async ids => {
-    const results = [];
+    const results = {};
 
     for (const id of ids) {
       const queryAllParams = {
@@ -52,11 +50,12 @@ const getAllEntryRevisions = params => {
         }
       };
       const items = await (0, _query.queryAll)(queryAllParams);
-      const entries = (0, _cleanup.cleanupItems)(entity, items);
-      results.push(entries);
+      results[id] = (0, _cleanup.cleanupItems)(entity, items);
     }
 
-    return results;
+    return ids.map(id => {
+      return results[id] || [];
+    });
   });
 };
 
@@ -79,6 +78,11 @@ const getRevisionById = params => {
       const {
         version
       } = (0, _utils.parseIdentifier)(id);
+
+      if (version === null) {
+        return collection;
+      }
+
       const sortKey = (0, _keys.createRevisionSortKey)({
         version
       });
@@ -93,6 +97,9 @@ const getRevisionById = params => {
         SK: sortKey
       });
       return collection;
+      /**
+       * We cast as any because there is no return type defined.
+       */
     }, {});
     const records = await (0, _batchRead.batchReadAll)({
       table: entity.table,
@@ -134,6 +141,9 @@ const getPublishedRevisionByEntryId = params => {
         SK: publishedKey
       });
       return collection;
+      /**
+       * We cast as any because there is no return type defined.
+       */
     }, {});
     const records = await (0, _batchRead.batchReadAll)({
       table: entity.table,
@@ -178,6 +188,9 @@ const getLatestRevisionByEntryId = params => {
         SK: latestKey
       });
       return collection;
+      /**
+       * We cast as any because there is no return type defined.
+       */
     }, {});
     const records = await (0, _batchRead.batchReadAll)({
       table: entity.table,
@@ -225,6 +238,11 @@ class DataLoadersHandler {
   async getLatestRevisionByEntryId(params) {
     return await this.loadMany("getLatestRevisionByEntryId", params, params.ids);
   }
+  /**
+   * TODO @ts-refactor
+   * Maybe pass on the generics to DataLoader definition?
+   */
+
 
   getLoader(name, params) {
     if (!dataLoaders[name]) {
@@ -243,7 +261,7 @@ class DataLoadersHandler {
     const loaderKey = `${name}-${tenant}-${locale}-${model.modelId}`;
 
     if (!this.loaders.has(loaderKey)) {
-      this.loaders.set(loaderKey, dataLoaders[name](_objectSpread(_objectSpread({}, params), {}, {
+      this.loaders.set(loaderKey, dataLoaders[name]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
         entity: this.entity
       })));
     }
@@ -261,12 +279,12 @@ class DataLoadersHandler {
         return results.reduce((acc, res) => {
           if (Array.isArray(res) === false) {
             if (res && res.message) {
-              throw new _error.default(res.message, res.code, _objectSpread(_objectSpread({}, res), {}, {
+              throw new _error.default(res.message, res.code, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
                 data: JSON.stringify(res.data || {})
               }));
             }
 
-            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", _objectSpread(_objectSpread({}, params), {}, {
+            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
               loader
             }));
           }
@@ -276,7 +294,7 @@ class DataLoadersHandler {
         }, []);
       }
     } catch (ex) {
-      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", _objectSpread(_objectSpread({
+      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({
         error: ex
       }, params), {}, {
         loader,

package/operations/entry/dataLoaders.js.map

@@ -0,0 +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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"}

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

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

package/operations/entry/filtering/createExpressions.js

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

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

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

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

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

package/operations/entry/filtering/createFields.js

@@ -0,0 +1,123 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createFields = void 0;
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _systemFields = require("./systemFields");
+
+var _plugins = require("../../../plugins");
+
+var _mapPlugins = require("./mapPlugins");
+
+/**
+ * This method will map the fieldId (fieldId -> field) to the actual field.
+ *
+ * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).
+ */
+const createFields = params => {
+  const {
+    fields,
+    plugins
+  } = params;
+  const transformValuePlugins = (0, _mapPlugins.getMappedPlugins)({
+    plugins,
+    type: "cms-field-filter-value-transform",
+    property: "fieldType"
+  });
+  const valuePathPlugins = (0, _mapPlugins.getMappedPlugins)({
+    plugins,
+    type: _plugins.CmsEntryFieldFilterPathPlugin.type,
+    property: "fieldType"
+  });
+  const collection = (0, _systemFields.createSystemFields)().reduce((fields, field) => {
+    const transformPlugin = transformValuePlugins[field.type];
+    fields[field.fieldId] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
+      parents: [],
+      system: true,
+      createPath: ({
+        field
+      }) => {
+        var _field$settings;
+
+        return ((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.path) || field.fieldId;
+      },
+      transform: value => {
+        if (!transformPlugin) {
+          return value;
+        }
+
+        return transformPlugin.transform({
+          field,
+          value
+        });
+      }
+    });
+    return fields;
+  }, {});
+
+  const addFieldsToCollection = (fields, parents = []) => {
+    /**
+     * Exit early if no fields are sent.
+     */
+    if (fields.length === 0) {
+      return;
+    }
+
+    for (const field of fields) {
+      var _field$settings2;
+
+      const transformPlugin = transformValuePlugins[field.type];
+      const valuePathPlugin = valuePathPlugins[field.type];
+      /**
+       * The required fieldId is a product of all of its parents and its own fieldId.
+       */
+
+      const fieldId = [...parents, {
+        fieldId: field.fieldId,
+        multipleValues: field.multipleValues
+      }].map(f => f.fieldId).join(".");
+      collection[fieldId] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
+        parents,
+        system: false,
+        createPath: params => {
+          if (valuePathPlugin) {
+            return valuePathPlugin.createPath(params);
+          }
+
+          return ["values"].concat(parents.map(parent => parent.fieldId)).concat([params.field.fieldId]).join(".");
+        },
+        transform: value => {
+          if (!transformPlugin) {
+            return value;
+          }
+
+          return transformPlugin.transform({
+            field,
+            value
+          });
+        }
+      });
+      const childFields = (_field$settings2 = field.settings) === null || _field$settings2 === void 0 ? void 0 : _field$settings2.fields;
+
+      if (!childFields || childFields.length === 0) {
+        continue;
+      }
+
+      addFieldsToCollection(childFields, [...parents, {
+        fieldId: field.fieldId,
+        multipleValues: field.multipleValues
+      }]);
+    }
+  };
+
+  addFieldsToCollection(fields);
+  return collection;
+};
+
+exports.createFields = createFields;

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

@@ -0,0 +1 @@
+{"version":3,"names":["createFields","params","fields","plugins","transformValuePlugins","getMappedPlugins","type","property","valuePathPlugins","CmsEntryFieldFilterPathPlugin","collection","createSystemFields","reduce","field","transformPlugin","fieldId","parents","system","createPath","settings","path","transform","value","addFieldsToCollection","length","valuePathPlugin","multipleValues","map","f","join","concat","parent","childFields"],"sources":["createFields.ts"],"sourcesContent":["import { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport { createSystemFields } from \"./systemFields\";\nimport { Field, FieldParent } from \"./types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsFieldFilterValueTransformPlugin } from \"~/types\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins\";\nimport { getMappedPlugins } from \"./mapPlugins\";\n\ninterface Params {\n    fields: CmsModelField[];\n    plugins: PluginsContainer;\n}\n/**\n * This method will map the fieldId (fieldId -> field) to the actual field.\n *\n * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).\n */\nexport const createFields = (params: Params) => {\n    const { fields, plugins } = params;\n\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const valuePathPlugins = getMappedPlugins<CmsEntryFieldFilterPathPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPathPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const collection = createSystemFields().reduce<Record<string, Field>>((fields, field) => {\n        const transformPlugin = transformValuePlugins[field.type];\n\n        fields[field.fieldId] = {\n            ...field,\n            parents: [],\n            system: true,\n            createPath: ({ field }) => {\n                return field.settings?.path || field.fieldId;\n            },\n            transform: value => {\n                if (!transformPlugin) {\n                    return value;\n                }\n                return transformPlugin.transform({\n                    field,\n                    value\n                });\n            }\n        };\n\n        return fields;\n    }, {});\n\n    const addFieldsToCollection = (fields: CmsModelField[], parents: FieldParent[] = []): void => {\n        /**\n         * Exit early if no fields are sent.\n         */\n        if (fields.length === 0) {\n            return;\n        }\n        for (const field of fields) {\n            const transformPlugin = transformValuePlugins[field.type];\n            const valuePathPlugin = valuePathPlugins[field.type];\n            /**\n             * The required fieldId is a product of all of its parents and its own fieldId.\n             */\n            const fieldId = [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ]\n                .map(f => f.fieldId)\n                .join(\".\");\n\n            collection[fieldId] = {\n                ...field,\n                parents,\n                system: false,\n                createPath: params => {\n                    if (valuePathPlugin) {\n                        return valuePathPlugin.createPath(params);\n                    }\n\n                    return [\"values\"]\n                        .concat(parents.map(parent => parent.fieldId))\n                        .concat([params.field.fieldId])\n                        .join(\".\");\n                },\n                transform: value => {\n                    if (!transformPlugin) {\n                        return value;\n                    }\n                    return transformPlugin.transform({\n                        field,\n                        value\n                    });\n                }\n            };\n            const childFields = field.settings?.fields;\n            if (!childFields || childFields.length === 0) {\n                continue;\n            }\n            addFieldsToCollection(childFields, [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ]);\n        }\n    };\n\n    addFieldsToCollection(fields);\n\n    return collection;\n};\n"],"mappings":";;;;;;;;;;;AACA;;AAIA;;AACA;;AAMA;AACA;AACA;AACA;AACA;AACO,MAAMA,YAAY,GAAIC,MAAD,IAAoB;EAC5C,MAAM;IAAEC,MAAF;IAAUC;EAAV,IAAsBF,MAA5B;EAEA,MAAMG,qBAAqB,GAAG,IAAAC,4BAAA,EAAqD;IAC/EF,OAD+E;IAE/EG,IAAI,EAAE,kCAFyE;IAG/EC,QAAQ,EAAE;EAHqE,CAArD,CAA9B;EAKA,MAAMC,gBAAgB,GAAG,IAAAH,4BAAA,EAAgD;IACrEF,OADqE;IAErEG,IAAI,EAAEG,sCAAA,CAA8BH,IAFiC;IAGrEC,QAAQ,EAAE;EAH2D,CAAhD,CAAzB;EAMA,MAAMG,UAAU,GAAG,IAAAC,gCAAA,IAAqBC,MAArB,CAAmD,CAACV,MAAD,EAASW,KAAT,KAAmB;IACrF,MAAMC,eAAe,GAAGV,qBAAqB,CAACS,KAAK,CAACP,IAAP,CAA7C;IAEAJ,MAAM,CAACW,KAAK,CAACE,OAAP,CAAN,+DACOF,KADP;MAEIG,OAAO,EAAE,EAFb;MAGIC,MAAM,EAAE,IAHZ;MAIIC,UAAU,EAAE,CAAC;QAAEL;MAAF,CAAD,KAAe;QAAA;;QACvB,OAAO,oBAAAA,KAAK,CAACM,QAAN,oEAAgBC,IAAhB,KAAwBP,KAAK,CAACE,OAArC;MACH,CANL;MAOIM,SAAS,EAAEC,KAAK,IAAI;QAChB,IAAI,CAACR,eAAL,EAAsB;UAClB,OAAOQ,KAAP;QACH;;QACD,OAAOR,eAAe,CAACO,SAAhB,CAA0B;UAC7BR,KAD6B;UAE7BS;QAF6B,CAA1B,CAAP;MAIH;IAfL;IAkBA,OAAOpB,MAAP;EACH,CAtBkB,EAsBhB,EAtBgB,CAAnB;;EAwBA,MAAMqB,qBAAqB,GAAG,CAACrB,MAAD,EAA0Bc,OAAsB,GAAG,EAAnD,KAAgE;IAC1F;AACR;AACA;IACQ,IAAId,MAAM,CAACsB,MAAP,KAAkB,CAAtB,EAAyB;MACrB;IACH;;IACD,KAAK,MAAMX,KAAX,IAAoBX,MAApB,EAA4B;MAAA;;MACxB,MAAMY,eAAe,GAAGV,qBAAqB,CAACS,KAAK,CAACP,IAAP,CAA7C;MACA,MAAMmB,eAAe,GAAGjB,gBAAgB,CAACK,KAAK,CAACP,IAAP,CAAxC;MACA;AACZ;AACA;;MACY,MAAMS,OAAO,GAAG,CACZ,GAAGC,OADS,EAEZ;QACID,OAAO,EAAEF,KAAK,CAACE,OADnB;QAEIW,cAAc,EAAEb,KAAK,CAACa;MAF1B,CAFY,EAOXC,GAPW,CAOPC,CAAC,IAAIA,CAAC,CAACb,OAPA,EAQXc,IARW,CAQN,GARM,CAAhB;MAUAnB,UAAU,CAACK,OAAD,CAAV,+DACOF,KADP;QAEIG,OAFJ;QAGIC,MAAM,EAAE,KAHZ;QAIIC,UAAU,EAAEjB,MAAM,IAAI;UAClB,IAAIwB,eAAJ,EAAqB;YACjB,OAAOA,eAAe,CAACP,UAAhB,CAA2BjB,MAA3B,CAAP;UACH;;UAED,OAAO,CAAC,QAAD,EACF6B,MADE,CACKd,OAAO,CAACW,GAAR,CAAYI,MAAM,IAAIA,MAAM,CAAChB,OAA7B,CADL,EAEFe,MAFE,CAEK,CAAC7B,MAAM,CAACY,KAAP,CAAaE,OAAd,CAFL,EAGFc,IAHE,CAGG,GAHH,CAAP;QAIH,CAbL;QAcIR,SAAS,EAAEC,KAAK,IAAI;UAChB,IAAI,CAACR,eAAL,EAAsB;YAClB,OAAOQ,KAAP;UACH;;UACD,OAAOR,eAAe,CAACO,SAAhB,CAA0B;YAC7BR,KAD6B;YAE7BS;UAF6B,CAA1B,CAAP;QAIH;MAtBL;MAwBA,MAAMU,WAAW,uBAAGnB,KAAK,CAACM,QAAT,qDAAG,iBAAgBjB,MAApC;;MACA,IAAI,CAAC8B,WAAD,IAAgBA,WAAW,CAACR,MAAZ,KAAuB,CAA3C,EAA8C;QAC1C;MACH;;MACDD,qBAAqB,CAACS,WAAD,EAAc,CAC/B,GAAGhB,OAD4B,EAE/B;QACID,OAAO,EAAEF,KAAK,CAACE,OADnB;QAEIW,cAAc,EAAEb,KAAK,CAACa;MAF1B,CAF+B,CAAd,CAArB;IAOH;EACJ,CA3DD;;EA6DAH,qBAAqB,CAACrB,MAAD,CAArB;EAEA,OAAOQ,UAAP;AACH,CAtGM"}

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

@@ -0,0 +1,17 @@
+import { Field } from "./types";
+import { PluginsContainer } from "@webiny/plugins";
+import { CmsModel } from "@webiny/api-headless-cms/types";
+interface Result {
+    valuePath: string;
+    reverse: boolean;
+    fieldId: string;
+    field: Field;
+}
+interface Params {
+    model: CmsModel;
+    sortBy: string;
+    fields: Record<string, Field>;
+    plugins: PluginsContainer;
+}
+export declare const extractSort: (params: Params) => Result;
+export {};