@webiny/api-headless-cms-ddb 0.0.0-mt-2 → 0.0.0-unstable.085ff6572f

package/operations/entry/dataLoader/index.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  getDataLoaderFactory: true
+};
+exports.getDataLoaderFactory = void 0;
+var _getAllEntryRevisions = require("./getAllEntryRevisions");
+var _getLatestRevisionByEntryId = require("./getLatestRevisionByEntryId");
+var _getPublishedRevisionByEntryId = require("./getPublishedRevisionByEntryId");
+var _getRevisionById = require("./getRevisionById");
+var _DataLoaderCache = require("./DataLoaderCache");
+Object.keys(_DataLoaderCache).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _DataLoaderCache[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _DataLoaderCache[key];
+    }
+  });
+});
+const dataLoaders = {
+  getAllEntryRevisions: _getAllEntryRevisions.createGetAllEntryRevisions,
+  getLatestRevisionByEntryId: _getLatestRevisionByEntryId.createGetLatestRevisionByEntryId,
+  getPublishedRevisionByEntryId: _getPublishedRevisionByEntryId.createGetPublishedRevisionByEntryId,
+  getRevisionById: _getRevisionById.createGetRevisionById
+};
+const getDataLoaderFactory = name => {
+  if (!dataLoaders[name]) {
+    throw new Error(`Missing data loader "${name}".`);
+  }
+  return dataLoaders[name];
+};
+exports.getDataLoaderFactory = getDataLoaderFactory;

package/operations/entry/dataLoader/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["dataLoaders","getAllEntryRevisions","createGetAllEntryRevisions","getLatestRevisionByEntryId","createGetLatestRevisionByEntryId","getPublishedRevisionByEntryId","createGetPublishedRevisionByEntryId","getRevisionById","createGetRevisionById","getDataLoaderFactory","name","Error"],"sources":["index.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { DataLoaderParams } from \"./types\";\nimport { createGetAllEntryRevisions } from \"./getAllEntryRevisions\";\nimport { createGetLatestRevisionByEntryId } from \"./getLatestRevisionByEntryId\";\nimport { createGetPublishedRevisionByEntryId } from \"./getPublishedRevisionByEntryId\";\nimport { createGetRevisionById } from \"./getRevisionById\";\n\nexport * from \"./DataLoaderCache\";\n\ninterface Callable {\n    (params: DataLoaderParams): DataLoader<any, any>;\n}\n\nconst dataLoaders: Record<string, Callable> = {\n    getAllEntryRevisions: createGetAllEntryRevisions,\n    getLatestRevisionByEntryId: createGetLatestRevisionByEntryId,\n    getPublishedRevisionByEntryId: createGetPublishedRevisionByEntryId,\n    getRevisionById: createGetRevisionById\n};\n\nexport type DataLoaders =\n    | \"getAllEntryRevisions\"\n    | \"getRevisionById\"\n    | \"getPublishedRevisionByEntryId\"\n    | \"getLatestRevisionByEntryId\";\n\nexport const getDataLoaderFactory = (name: string) => {\n    if (!dataLoaders[name]) {\n        throw new Error(`Missing data loader \"${name}\".`);\n    }\n    return dataLoaders[name];\n};\n"],"mappings":";;;;;;;;;AAEA;AACA;AACA;AACA;AAEA;AAAA;EAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AAMA,MAAMA,WAAqC,GAAG;EAC1CC,oBAAoB,EAAEC,gDAA0B;EAChDC,0BAA0B,EAAEC,4DAAgC;EAC5DC,6BAA6B,EAAEC,kEAAmC;EAClEC,eAAe,EAAEC;AACrB,CAAC;AAQM,MAAMC,oBAAoB,GAAIC,IAAY,IAAK;EAClD,IAAI,CAACV,WAAW,CAACU,IAAI,CAAC,EAAE;IACpB,MAAM,IAAIC,KAAK,CAAE,wBAAuBD,IAAK,IAAG,CAAC;EACrD;EACA,OAAOV,WAAW,CAACU,IAAI,CAAC;AAC5B,CAAC;AAAC"}

package/operations/entry/dataLoader/types.d.ts

@@ -0,0 +1,6 @@
+import { Entity } from "dynamodb-toolbox";
+export interface DataLoaderParams {
+    entity: Entity<any>;
+    tenant: string;
+    locale: string;
+}

package/operations/entry/dataLoader/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/operations/entry/dataLoader/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import { Entity } from \"dynamodb-toolbox\";\n\nexport interface DataLoaderParams {\n    entity: Entity<any>;\n    tenant: string;\n    locale: string;\n}\n"],"mappings":""}

package/operations/entry/dataLoaders.d.ts

@@ -1,38 +1,27 @@
-import { CmsEntry, CmsModel } from "@webiny/api-headless-cms/types";
+import { CmsModel, CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { Entity } from "dynamodb-toolbox";
-export interface GetAllEntryRevisionsParams {
+import { DataLoadersHandlerInterface, DataLoadersHandlerInterfaceClearAllParams } from "../../types";
+interface DataLoaderParams {
+    model: Pick<CmsModel, "tenant" | "locale" | "modelId">;
     ids: readonly string[];
-    model: CmsModel;
 }
-export interface GetRevisionByIdParams {
-    ids: readonly string[];
-    model: CmsModel;
-}
-export interface GetPublishedRevisionByEntryIdParams {
-    ids: readonly string[];
-    model: CmsModel;
-}
-export interface GetLatestRevisionByEntryIdParams {
-    ids: readonly string[];
-    model: CmsModel;
-}
-interface ClearLoaderParams {
-    model: CmsModel;
-    entry?: CmsEntry;
-}
-export interface Params {
+interface DataLoadersHandlerParams {
     entity: Entity<any>;
 }
-export declare class DataLoadersHandler {
-    private readonly loaders;
+export declare class DataLoadersHandler implements DataLoadersHandlerInterface {
     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[]>;
+    private readonly cache;
+    constructor(params: DataLoadersHandlerParams);
+    getAllEntryRevisions(params: DataLoaderParams): Promise<CmsStorageEntry[]>;
+    getRevisionById(params: DataLoaderParams): Promise<CmsStorageEntry[]>;
+    getPublishedRevisionByEntryId(params: DataLoaderParams): Promise<CmsStorageEntry[]>;
+    getLatestRevisionByEntryId(params: DataLoaderParams): Promise<CmsStorageEntry[]>;
+    /**
+     * TODO @ts-refactor
+     * Maybe pass on the generics to DataLoader definition?
+     */
     private getLoader;
     private loadMany;
-    clearAll(params: Omit<ClearLoaderParams, "entry">): void;
+    clearAll(params?: DataLoadersHandlerInterfaceClearAllParams): void;
 }
 export {};

package/operations/entry/dataLoaders.js

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

package/operations/entry/dataLoaders.js.map

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

package/operations/entry/filtering/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 {};