@webiny/api-headless-cms-ddb 0.0.0-unstable.99666aeb00 → 0.0.0-unstable.9bd236cf5e

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

@@ -1 +1 @@
-{"version":3,"names":["createGetRevisionById","params","entity","locale","tenant","DataLoader","ids","queries","reduce","collection","id","partitionKey","createPartitionKey","version","parseIdentifier","sortKey","createRevisionSortKey","keys","getBatch","PK","SK","records","batchReadAll","table","items","Object","values","cleanupItems","map","filter","item","batchScheduleFn","createBatchScheduleFn"],"sources":["getRevisionById.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb/utils/batchRead\";\nimport { CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { createPartitionKey, createRevisionSortKey } from \"~/operations/entry/keys\";\nimport { DataLoaderParams } from \"./types\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn\";\n\nexport const createGetRevisionById = (params: DataLoaderParams) => {\n    const { entity, locale, tenant } = params;\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        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            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":";;;;;;;AAAA;AACA;AAEA;AACA;AAEA;AACA;AAEO,MAAMA,qBAAqB,GAAIC,MAAwB,IAAK;EAC/D,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGH,MAAM;EAEzC,OAAO,IAAII,mBAAU,CACjB,MAAOC,GAAsB,IAAK;IAC9B,MAAMC,OAAO,GAAGD,GAAG,CAACE,MAAM,CAAC,CAACC,UAAU,EAAEC,EAAE,KAAK;MAC3C,MAAMC,YAAY,GAAG,IAAAC,wBAAkB,EAAC;QACpCR,MAAM;QACND,MAAM;QACNO;MACJ,CAAC,CAAC;MACF,MAAM;QAAEG;MAAQ,CAAC,GAAG,IAAAC,sBAAe,EAACJ,EAAE,CAAC;MACvC,IAAIG,OAAO,KAAK,IAAI,EAAE;QAClB,OAAOJ,UAAU;MACrB;MACA,MAAMM,OAAO,GAAG,IAAAC,2BAAqB,EAAC;QAClCH;MACJ,CAAC,CAAC;MACF,MAAMI,IAAI,GAAI,GAAEN,YAAa,KAAII,OAAQ,EAAC;MAC1C,IAAIN,UAAU,CAACQ,IAAI,CAAC,EAAE;QAClB,OAAOR,UAAU;MACrB;MAEAA,UAAU,CAACQ,IAAI,CAAC,GAAGf,MAAM,CAACgB,QAAQ,CAAC;QAC/BC,EAAE,EAAER,YAAY;QAChBS,EAAE,EAAEL;MACR,CAAC,CAAC;MAEF,OAAON,UAAU;MACjB;AAChB;AACA;IACY,CAAC,EAAE,CAAC,CAAC,CAAwB;IAE7B,MAAMY,OAAO,GAAG,MAAM,IAAAC,uBAAY,EAAkB;MAChDC,KAAK,EAAErB,MAAM,CAACqB,KAAK;MACnBC,KAAK,EAAEC,MAAM,CAACC,MAAM,CAACnB,OAAO;IAChC,CAAC,CAAC;IACF,MAAMiB,KAAK,GAAG,IAAAG,qBAAY,EAACzB,MAAM,EAAEmB,OAAO,CAAC;IAE3C,OAAOf,GAAG,CAACsB,GAAG,CAAClB,EAAE,IAAI;MACjB,OAAOc,KAAK,CAACK,MAAM,CAACC,IAAI,IAAI;QACxB,OAAOpB,EAAE,KAAKoB,IAAI,CAACpB,EAAE;MACzB,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIqB,eAAe,EAAE,IAAAC,4CAAqB;EAC1C,CAAC,CACJ;AACL,CAAC;AAAC"}
+{"version":3,"names":["_dataloader","_interopRequireDefault","require","_dbDynamodb","_cleanup","_keys","_utils","_createBatchScheduleFn","createGetRevisionById","params","entity","locale","tenant","DataLoader","ids","queries","reduce","collection","id","partitionKey","createPartitionKey","version","parseIdentifier","sortKey","createRevisionSortKey","keys","getBatch","PK","SK","records","batchReadAll","table","items","Object","values","cleanupItems","map","filter","item","batchScheduleFn","createBatchScheduleFn","exports"],"sources":["getRevisionById.ts"],"sourcesContent":["import DataLoader from \"dataloader\";\nimport { batchReadAll } from \"@webiny/db-dynamodb\";\nimport type { CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport { cleanupItems } from \"@webiny/db-dynamodb/utils/cleanup\";\nimport { createPartitionKey, createRevisionSortKey } from \"~/operations/entry/keys\";\nimport type { DataLoaderParams } from \"./types\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport { createBatchScheduleFn } from \"./createBatchScheduleFn\";\n\nexport const createGetRevisionById = (params: DataLoaderParams) => {\n    const { entity, locale, tenant } = params;\n\n    return new DataLoader<string, CmsStorageEntry[]>(\n        async (ids: readonly string[]) => {\n            const queries = ids.reduce<Record<string, ReturnType<typeof entity.getBatch>>>(\n                (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                {}\n            );\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            batchScheduleFn: createBatchScheduleFn()\n        }\n    );\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,WAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,QAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAH,OAAA;AAEA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,sBAAA,GAAAL,OAAA;AAEO,MAAMM,qBAAqB,GAAIC,MAAwB,IAAK;EAC/D,MAAM;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAO,CAAC,GAAGH,MAAM;EAEzC,OAAO,IAAII,mBAAU,CACjB,MAAOC,GAAsB,IAAK;IAC9B,MAAMC,OAAO,GAAGD,GAAG,CAACE,MAAM,CACtB,CAACC,UAAU,EAAEC,EAAE,KAAK;MAChB,MAAMC,YAAY,GAAG,IAAAC,wBAAkB,EAAC;QACpCR,MAAM;QACND,MAAM;QACNO;MACJ,CAAC,CAAC;MACF,MAAM;QAAEG;MAAQ,CAAC,GAAG,IAAAC,sBAAe,EAACJ,EAAE,CAAC;MACvC,IAAIG,OAAO,KAAK,IAAI,EAAE;QAClB,OAAOJ,UAAU;MACrB;MACA,MAAMM,OAAO,GAAG,IAAAC,2BAAqB,EAAC;QAClCH;MACJ,CAAC,CAAC;MACF,MAAMI,IAAI,GAAG,GAAGN,YAAY,KAAKI,OAAO,EAAE;MAC1C,IAAIN,UAAU,CAACQ,IAAI,CAAC,EAAE;QAClB,OAAOR,UAAU;MACrB;MAEAA,UAAU,CAACQ,IAAI,CAAC,GAAGf,MAAM,CAACgB,QAAQ,CAAC;QAC/BC,EAAE,EAAER,YAAY;QAChBS,EAAE,EAAEL;MACR,CAAC,CAAC;MAEF,OAAON,UAAU;IACrB,CAAC,EACD,CAAC,CACL,CAAC;IAED,MAAMY,OAAO,GAAG,MAAM,IAAAC,wBAAY,EAAkB;MAChDC,KAAK,EAAErB,MAAM,CAACqB,KAAK;MACnBC,KAAK,EAAEC,MAAM,CAACC,MAAM,CAACnB,OAAO;IAChC,CAAC,CAAC;IACF,MAAMiB,KAAK,GAAG,IAAAG,qBAAY,EAACzB,MAAM,EAAEmB,OAAO,CAAC;IAE3C,OAAOf,GAAG,CAACsB,GAAG,CAAClB,EAAE,IAAI;MACjB,OAAOc,KAAK,CAACK,MAAM,CAACC,IAAI,IAAI;QACxB,OAAOpB,EAAE,KAAKoB,IAAI,CAACpB,EAAE;MACzB,CAAC,CAAC;IACN,CAAC,CAAC;EACN,CAAC,EACD;IACIqB,eAAe,EAAE,IAAAC,4CAAqB,EAAC;EAC3C,CACJ,CAAC;AACL,CAAC;AAACC,OAAA,CAAAjC,qBAAA,GAAAA,qBAAA","ignoreList":[]}

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

@@ -1,8 +1,8 @@
-import DataLoader from "dataloader";
-import { DataLoaderParams } from "./types";
+import type DataLoader from "dataloader";
+import type { DataLoaderParams } from "./types";
 export * from "./DataLoaderCache";
 interface Callable {
     (params: DataLoaderParams): DataLoader<any, any>;
 }
-export declare type DataLoaders = "getAllEntryRevisions" | "getRevisionById" | "getPublishedRevisionByEntryId" | "getLatestRevisionByEntryId";
+export type DataLoaders = "getAllEntryRevisions" | "getRevisionById" | "getPublishedRevisionByEntryId" | "getLatestRevisionByEntryId";
 export declare const getDataLoaderFactory: (name: string) => Callable;

package/operations/entry/dataLoader/index.js

@@ -35,4 +35,6 @@ const getDataLoaderFactory = name => {
   }
   return dataLoaders[name];
 };
-exports.getDataLoaderFactory = getDataLoaderFactory;
+exports.getDataLoaderFactory = getDataLoaderFactory;
+
+//# sourceMappingURL=index.js.map

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

@@ -1 +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"}
+{"version":3,"names":["_getAllEntryRevisions","require","_getLatestRevisionByEntryId","_getPublishedRevisionByEntryId","_getRevisionById","_DataLoaderCache","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","dataLoaders","getAllEntryRevisions","createGetAllEntryRevisions","getLatestRevisionByEntryId","createGetLatestRevisionByEntryId","getPublishedRevisionByEntryId","createGetPublishedRevisionByEntryId","getRevisionById","createGetRevisionById","getDataLoaderFactory","name","Error"],"sources":["index.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport type { 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,IAAAA,qBAAA,GAAAC,OAAA;AACA,IAAAC,2BAAA,GAAAD,OAAA;AACA,IAAAE,8BAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAEA,IAAAI,gBAAA,GAAAJ,OAAA;AAAAK,MAAA,CAAAC,IAAA,CAAAF,gBAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,gBAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,gBAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAMA,MAAMS,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,CAAC,wBAAwBD,IAAI,IAAI,CAAC;EACrD;EACA,OAAOV,WAAW,CAACU,IAAI,CAAC;AAC5B,CAAC;AAACd,OAAA,CAAAa,oBAAA,GAAAA,oBAAA","ignoreList":[]}

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

@@ -1,4 +1,4 @@
-import { Entity } from "dynamodb-toolbox";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
 export interface DataLoaderParams {
     entity: Entity<any>;
     tenant: string;

package/operations/entry/dataLoader/types.js

@@ -2,4 +2,6 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+
+//# sourceMappingURL=types.js.map

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

@@ -1 +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":""}
+{"version":3,"names":[],"sources":["types.ts"],"sourcesContent":["import type { Entity } from \"@webiny/db-dynamodb/toolbox\";\n\nexport interface DataLoaderParams {\n    entity: Entity<any>;\n    tenant: string;\n    locale: string;\n}\n"],"mappings":"","ignoreList":[]}

package/operations/entry/dataLoaders.d.ts

@@ -1,6 +1,6 @@
-import { CmsModel, CmsStorageEntry } from "@webiny/api-headless-cms/types";
-import { Entity } from "dynamodb-toolbox";
-import { DataLoadersHandlerInterface, DataLoadersHandlerInterfaceClearAllParams } from "../../types";
+import type { CmsModel, CmsStorageEntry } from "@webiny/api-headless-cms/types";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
+import type { DataLoadersHandlerInterface, DataLoadersHandlerInterfaceClearAllParams } from "../../types";
 interface DataLoaderParams {
     model: Pick<CmsModel, "tenant" | "locale" | "modelId">;
     ids: readonly string[];

package/operations/entry/dataLoaders.js

@@ -5,16 +5,13 @@ 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 _error = _interopRequireDefault(require("@webiny/error"));
 var _DataLoaderCache = require("./dataLoader/DataLoaderCache");
 var _dataLoader = require("./dataLoader");
 var _utils = require("@webiny/utils");
 class DataLoadersHandler {
+  cache = new _DataLoaderCache.DataLoaderCache();
   constructor(params) {
-    (0, _defineProperty2.default)(this, "entity", void 0);
-    (0, _defineProperty2.default)(this, "cache", new _DataLoaderCache.DataLoaderCache());
     this.entity = params.entity;
   }
   async getAllEntryRevisions(params) {
@@ -82,25 +79,27 @@ class DataLoadersHandler {
         return results.reduce((acc, res) => {
           if (Array.isArray(res) === false) {
             if (res && res.message) {
-              throw new _error.default(res.message, res.code, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, res), {}, {
+              throw new _error.default(res.message, res.code, {
+                ...res,
                 data: JSON.stringify(res.data || {})
-              }));
+              });
             }
-            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+            throw new _error.default("Result from the data loader must be an array of arrays which contain requested items.", "DATA_LOADER_RESULTS_ERROR", {
+              ...params,
               loader
-            }));
+            });
           }
           acc.push(...res);
           return acc;
         }, []);
       }
     } catch (ex) {
-      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        error: ex
-      }, params), {}, {
+      throw new _error.default(ex.message || "Data loader error.", ex.code || "DATA_LOADER_ERROR", {
+        error: ex,
+        ...params,
         loader,
         ids
-      }));
+      });
     }
     throw new _error.default(`Data loader did not return array of items or empty array.`, "INVALID_DATA_LOADER_RESULT", {
       loader,
@@ -109,7 +108,9 @@ class DataLoadersHandler {
     });
   }
   clearAll(params) {
-    this.cache.clearAll(params === null || params === void 0 ? void 0 : params.model);
+    this.cache.clearAll(params?.model);
   }
 }
-exports.DataLoadersHandler = DataLoadersHandler;
+exports.DataLoadersHandler = DataLoadersHandler;
+
+//# sourceMappingURL=dataLoaders.js.map

package/operations/entry/dataLoaders.js.map

@@ -1 +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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"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_DataLoaderCache","_dataLoader","_utils","DataLoadersHandler","cache","DataLoaderCache","constructor","params","entity","getAllEntryRevisions","ids","map","id","entryId","parseIdentifier","loadMany","getRevisionById","getPublishedRevisionByEntryId","getLatestRevisionByEntryId","getLoader","name","model","cacheParams","tenant","locale","loader","getDataLoader","factory","getDataLoaderFactory","setDataLoader","results","Array","isArray","reduce","acc","res","message","WebinyError","code","data","JSON","stringify","push","ex","error","clearAll","exports"],"sources":["dataLoaders.ts"],"sourcesContent":["import type DataLoader from \"dataloader\";\nimport WebinyError from \"@webiny/error\";\nimport type { CmsModel, CmsStorageEntry } from \"@webiny/api-headless-cms/types\";\nimport type { CacheKeyParams } from \"~/operations/entry/dataLoader/DataLoaderCache\";\nimport { DataLoaderCache } from \"~/operations/entry/dataLoader/DataLoaderCache\";\nimport type { Entity } from \"@webiny/db-dynamodb/toolbox\";\nimport type { DataLoaders } from \"~/operations/entry/dataLoader\";\nimport { getDataLoaderFactory } from \"~/operations/entry/dataLoader\";\nimport { parseIdentifier } from \"@webiny/utils\";\nimport type {\n    DataLoadersHandlerInterface,\n    DataLoadersHandlerInterfaceClearAllParams\n} 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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","ignoreList":[]}

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

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

package/operations/entry/filtering/createExpressions.js

@@ -173,4 +173,6 @@ const createExpressions = params => {
   }
   return expression.expressions[0];
 };
-exports.createExpressions = createExpressions;
+exports.createExpressions = createExpressions;
+
+//# sourceMappingURL=createExpressions.js.map

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

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

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

@@ -1,6 +1,6 @@
-import { CmsModelField } from "@webiny/api-headless-cms/types";
-import { Field } from "./types";
-import { PluginsContainer } from "@webiny/plugins";
+import type { CmsModelField } from "@webiny/api-headless-cms/types";
+import type { Field } from "./types";
+import type { PluginsContainer } from "@webiny/plugins";
 interface Params {
     fields: CmsModelField[];
     plugins: PluginsContainer;

package/operations/entry/filtering/createFields.js

@@ -1,11 +1,9 @@
 "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");
@@ -18,7 +16,6 @@ const createFieldCollection = params => {
     system
   } = params;
   return fields.reduce((collection, field) => {
-    var _field$settings;
     const transformPlugin = transformValuePlugins[field.type];
     const valuePathPlugin = valuePathPlugins[field.type];
     const basePath = system ? [] : ["values"];
@@ -29,7 +26,8 @@ const createFieldCollection = params => {
       fieldId: field.fieldId,
       multipleValues: field.multipleValues
     }].map(f => f.fieldId).join(".");
-    collection[fieldId] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, field), {}, {
+    collection[fieldId] = {
+      ...field,
       parents,
       system,
       createPath: params => {
@@ -47,9 +45,9 @@ const createFieldCollection = params => {
           value
         });
       }
-    });
-    const childFields = (_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.fields;
-    if (!(childFields !== null && childFields !== void 0 && childFields.length)) {
+    };
+    const childFields = field.settings?.fields;
+    if (!childFields?.length) {
       return collection;
     }
     const result = createFieldCollection({
@@ -100,6 +98,11 @@ const createFields = params => {
     parents: [],
     system: false
   });
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, collection), result);
+  return {
+    ...collection,
+    ...result
+  };
 };
-exports.createFields = createFields;
+exports.createFields = createFields;
+
+//# sourceMappingURL=createFields.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["createFieldCollection","params","fields","parents","transformValuePlugins","valuePathPlugins","system","reduce","collection","field","transformPlugin","type","valuePathPlugin","basePath","fieldId","multipleValues","map","f","join","createPath","canUse","p","concat","parent","transform","value","childFields","settings","length","result","Object","assign","createFields","plugins","getMappedPlugins","property","CmsEntryFieldFilterPathPlugin","createSystemFields"],"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\ninterface FieldCollection {\n    [key: string]: Field;\n}\n\ninterface AddFieldsToCollectionParams {\n    fields: CmsModelField[];\n    parents: FieldParent[];\n    transformValuePlugins: Record<string, CmsFieldFilterValueTransformPlugin>;\n    valuePathPlugins: Record<string, CmsEntryFieldFilterPathPlugin>;\n    system: boolean;\n}\n\nconst createFieldCollection = (params: AddFieldsToCollectionParams): FieldCollection => {\n    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;\n    return fields.reduce<FieldCollection>((collection, field) => {\n        const transformPlugin = transformValuePlugins[field.type];\n        const valuePathPlugin = valuePathPlugins[field.type];\n\n        const basePath = system ? [] : [\"values\"];\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,\n            createPath: params => {\n                if (\n                    valuePathPlugin &&\n                    valuePathPlugin.canUse(\n                        field,\n                        parents.map(p => p.fieldId)\n                    )\n                ) {\n                    return valuePathPlugin.createPath(params);\n                }\n\n                return basePath\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?.length) {\n            return collection;\n        }\n\n        const result = createFieldCollection({\n            fields: childFields,\n            parents: [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ],\n            transformValuePlugins,\n            valuePathPlugins,\n            system\n        });\n        Object.assign(collection, result);\n        return collection;\n    }, {});\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 = createFieldCollection({\n        fields: createSystemFields(),\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [],\n        system: true\n    });\n\n    const result = createFieldCollection({\n        fields,\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [],\n        system: false\n    });\n\n    return {\n        ...collection,\n        ...result\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_systemFields","require","_plugins","_mapPlugins","createFieldCollection","params","fields","parents","transformValuePlugins","valuePathPlugins","system","reduce","collection","field","transformPlugin","type","valuePathPlugin","basePath","fieldId","multipleValues","map","f","join","createPath","canUse","p","concat","parent","transform","value","childFields","settings","length","result","Object","assign","createFields","plugins","getMappedPlugins","property","CmsEntryFieldFilterPathPlugin","createSystemFields","exports"],"sources":["createFields.ts"],"sourcesContent":["import type { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport { createSystemFields } from \"./systemFields\";\nimport type { Field, FieldParent } from \"./types\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { CmsFieldFilterValueTransformPlugin } from \"~/types\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins\";\nimport { getMappedPlugins } from \"./mapPlugins\";\n\ninterface Params {\n    fields: CmsModelField[];\n    plugins: PluginsContainer;\n}\n\ninterface FieldCollection {\n    [key: string]: Field;\n}\n\ninterface AddFieldsToCollectionParams {\n    fields: CmsModelField[];\n    parents: FieldParent[];\n    transformValuePlugins: Record<string, CmsFieldFilterValueTransformPlugin>;\n    valuePathPlugins: Record<string, CmsEntryFieldFilterPathPlugin>;\n    system: boolean;\n}\n\nconst createFieldCollection = (params: AddFieldsToCollectionParams): FieldCollection => {\n    const { fields, parents, transformValuePlugins, valuePathPlugins, system } = params;\n    return fields.reduce<FieldCollection>((collection, field) => {\n        const transformPlugin = transformValuePlugins[field.type];\n        const valuePathPlugin = valuePathPlugins[field.type];\n\n        const basePath = system ? [] : [\"values\"];\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,\n            createPath: params => {\n                if (\n                    valuePathPlugin &&\n                    valuePathPlugin.canUse(\n                        field,\n                        parents.map(p => p.fieldId)\n                    )\n                ) {\n                    return valuePathPlugin.createPath(params);\n                }\n\n                return basePath\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?.length) {\n            return collection;\n        }\n\n        const result = createFieldCollection({\n            fields: childFields,\n            parents: [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ],\n            transformValuePlugins,\n            valuePathPlugins,\n            system\n        });\n        Object.assign(collection, result);\n        return collection;\n    }, {});\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 = createFieldCollection({\n        fields: createSystemFields(),\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [],\n        system: true\n    });\n\n    const result = createFieldCollection({\n        fields,\n        transformValuePlugins,\n        valuePathPlugins,\n        parents: [],\n        system: false\n    });\n\n    return {\n        ...collection,\n        ...result\n    };\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,6 +1,6 @@
-import { Field } from "./types";
-import { PluginsContainer } from "@webiny/plugins";
-import { CmsModel } from "@webiny/api-headless-cms/types";
+import type { Field } from "./types";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { CmsModel } from "@webiny/api-headless-cms/types";
 interface Result {
     valuePath: string;
     reverse: boolean;

package/operations/entry/filtering/extractSort.js

@@ -64,4 +64,6 @@ const extractSort = params => {
     reverse: order === "DESC"
   };
 };
-exports.extractSort = extractSort;
+exports.extractSort = extractSort;
+
+//# sourceMappingURL=extractSort.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["extractSort","params","model","sortBy","fields","plugins","result","split","length","WebinyError","fieldId","order","field","Object","values","find","parents","plugin","byType","CmsEntryFieldSortingPlugin","type","reverse","canUse","createSort","valuePath","createPath"],"sources":["extractSort.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { Field } from \"./types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryFieldSortingPlugin } from \"~/plugins\";\nimport { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface Result {\n    valuePath: string;\n    reverse: boolean;\n    fieldId: string;\n    field: Field;\n}\n\ninterface Params {\n    model: CmsModel;\n    sortBy: string;\n    fields: Record<string, Field>;\n    plugins: PluginsContainer;\n}\n\nexport const extractSort = (params: Params): Result => {\n    const { model, sortBy, fields, plugins } = params;\n    const result = sortBy.split(\"_\");\n    if (result.length !== 2) {\n        throw new WebinyError(\n            \"Problem in determining the sorting for the entry items.\",\n            \"SORT_EXTRACT_ERROR\",\n            {\n                sortBy\n            }\n        );\n    }\n    const [fieldId, order] = result as [string, \"ASC\" | \"DESC\"];\n\n    const field = Object.values(fields).find(field => {\n        /**\n         * We do not support sorting by nested fields.\n         */\n        if (field.parents.length > 0) {\n            return false;\n        }\n        return field.fieldId === fieldId;\n    });\n\n    const plugin = plugins\n        .byType<CmsEntryFieldSortingPlugin>(CmsEntryFieldSortingPlugin.type)\n        .reverse()\n        .find(plugin => {\n            return plugin.canUse({\n                model,\n                field,\n                fieldId,\n                order,\n                sortBy\n            });\n        });\n\n    if (plugin) {\n        return plugin.createSort({\n            model,\n            fieldId,\n            order,\n            sortBy,\n            field,\n            fields\n        });\n    } else if (!field) {\n        throw new WebinyError(\n            \"Sorting field does not exist in the content model.\",\n            \"SORTING_FIELD_ERROR\",\n            {\n                fieldId,\n                fields\n            }\n        );\n    }\n    const valuePath = field.createPath({\n        field\n    });\n    return {\n        field,\n        fieldId,\n        valuePath,\n        reverse: order === \"DESC\"\n    };\n};\n"],"mappings":";;;;;;;AAAA;AAGA;AAiBO,MAAMA,WAAW,GAAIC,MAAc,IAAa;EACnD,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,MAAM;EACjD,MAAMK,MAAM,GAAGH,MAAM,CAACI,KAAK,CAAC,GAAG,CAAC;EAChC,IAAID,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;IACrB,MAAM,IAAIC,cAAW,CACjB,yDAAyD,EACzD,oBAAoB,EACpB;MACIN;IACJ,CAAC,CACJ;EACL;EACA,MAAM,CAACO,OAAO,EAAEC,KAAK,CAAC,GAAGL,MAAkC;EAE3D,MAAMM,KAAK,GAAGC,MAAM,CAACC,MAAM,CAACV,MAAM,CAAC,CAACW,IAAI,CAACH,KAAK,IAAI;IAC9C;AACR;AACA;IACQ,IAAIA,KAAK,CAACI,OAAO,CAACR,MAAM,GAAG,CAAC,EAAE;MAC1B,OAAO,KAAK;IAChB;IACA,OAAOI,KAAK,CAACF,OAAO,KAAKA,OAAO;EACpC,CAAC,CAAC;EAEF,MAAMO,MAAM,GAAGZ,OAAO,CACjBa,MAAM,CAA6BC,mCAA0B,CAACC,IAAI,CAAC,CACnEC,OAAO,EAAE,CACTN,IAAI,CAACE,MAAM,IAAI;IACZ,OAAOA,MAAM,CAACK,MAAM,CAAC;MACjBpB,KAAK;MACLU,KAAK;MACLF,OAAO;MACPC,KAAK;MACLR;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;EAEN,IAAIc,MAAM,EAAE;IACR,OAAOA,MAAM,CAACM,UAAU,CAAC;MACrBrB,KAAK;MACLQ,OAAO;MACPC,KAAK;MACLR,MAAM;MACNS,KAAK;MACLR;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAI,CAACQ,KAAK,EAAE;IACf,MAAM,IAAIH,cAAW,CACjB,oDAAoD,EACpD,qBAAqB,EACrB;MACIC,OAAO;MACPN;IACJ,CAAC,CACJ;EACL;EACA,MAAMoB,SAAS,GAAGZ,KAAK,CAACa,UAAU,CAAC;IAC/Bb;EACJ,CAAC,CAAC;EACF,OAAO;IACHA,KAAK;IACLF,OAAO;IACPc,SAAS;IACTH,OAAO,EAAEV,KAAK,KAAK;EACvB,CAAC;AACL,CAAC;AAAC"}
+{"version":3,"names":["_error","_interopRequireDefault","require","_plugins","extractSort","params","model","sortBy","fields","plugins","result","split","length","WebinyError","fieldId","order","field","Object","values","find","parents","plugin","byType","CmsEntryFieldSortingPlugin","type","reverse","canUse","createSort","valuePath","createPath","exports"],"sources":["extractSort.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { Field } from \"./types\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsEntryFieldSortingPlugin } from \"~/plugins\";\nimport type { CmsModel } from \"@webiny/api-headless-cms/types\";\n\ninterface Result {\n    valuePath: string;\n    reverse: boolean;\n    fieldId: string;\n    field: Field;\n}\n\ninterface Params {\n    model: CmsModel;\n    sortBy: string;\n    fields: Record<string, Field>;\n    plugins: PluginsContainer;\n}\n\nexport const extractSort = (params: Params): Result => {\n    const { model, sortBy, fields, plugins } = params;\n    const result = sortBy.split(\"_\");\n    if (result.length !== 2) {\n        throw new WebinyError(\n            \"Problem in determining the sorting for the entry items.\",\n            \"SORT_EXTRACT_ERROR\",\n            {\n                sortBy\n            }\n        );\n    }\n    const [fieldId, order] = result as [string, \"ASC\" | \"DESC\"];\n\n    const field = Object.values(fields).find(field => {\n        /**\n         * We do not support sorting by nested fields.\n         */\n        if (field.parents.length > 0) {\n            return false;\n        }\n        return field.fieldId === fieldId;\n    });\n\n    const plugin = plugins\n        .byType<CmsEntryFieldSortingPlugin>(CmsEntryFieldSortingPlugin.type)\n        .reverse()\n        .find(plugin => {\n            return plugin.canUse({\n                model,\n                field,\n                fieldId,\n                order,\n                sortBy\n            });\n        });\n\n    if (plugin) {\n        return plugin.createSort({\n            model,\n            fieldId,\n            order,\n            sortBy,\n            field,\n            fields\n        });\n    } else if (!field) {\n        throw new WebinyError(\n            \"Sorting field does not exist in the content model.\",\n            \"SORTING_FIELD_ERROR\",\n            {\n                fieldId,\n                fields\n            }\n        );\n    }\n    const valuePath = field.createPath({\n        field\n    });\n    return {\n        field,\n        fieldId,\n        valuePath,\n        reverse: order === \"DESC\"\n    };\n};\n"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAGA,IAAAC,QAAA,GAAAD,OAAA;AAiBO,MAAME,WAAW,GAAIC,MAAc,IAAa;EACnD,MAAM;IAAEC,KAAK;IAAEC,MAAM;IAAEC,MAAM;IAAEC;EAAQ,CAAC,GAAGJ,MAAM;EACjD,MAAMK,MAAM,GAAGH,MAAM,CAACI,KAAK,CAAC,GAAG,CAAC;EAChC,IAAID,MAAM,CAACE,MAAM,KAAK,CAAC,EAAE;IACrB,MAAM,IAAIC,cAAW,CACjB,yDAAyD,EACzD,oBAAoB,EACpB;MACIN;IACJ,CACJ,CAAC;EACL;EACA,MAAM,CAACO,OAAO,EAAEC,KAAK,CAAC,GAAGL,MAAkC;EAE3D,MAAMM,KAAK,GAAGC,MAAM,CAACC,MAAM,CAACV,MAAM,CAAC,CAACW,IAAI,CAACH,KAAK,IAAI;IAC9C;AACR;AACA;IACQ,IAAIA,KAAK,CAACI,OAAO,CAACR,MAAM,GAAG,CAAC,EAAE;MAC1B,OAAO,KAAK;IAChB;IACA,OAAOI,KAAK,CAACF,OAAO,KAAKA,OAAO;EACpC,CAAC,CAAC;EAEF,MAAMO,MAAM,GAAGZ,OAAO,CACjBa,MAAM,CAA6BC,mCAA0B,CAACC,IAAI,CAAC,CACnEC,OAAO,CAAC,CAAC,CACTN,IAAI,CAACE,MAAM,IAAI;IACZ,OAAOA,MAAM,CAACK,MAAM,CAAC;MACjBpB,KAAK;MACLU,KAAK;MACLF,OAAO;MACPC,KAAK;MACLR;IACJ,CAAC,CAAC;EACN,CAAC,CAAC;EAEN,IAAIc,MAAM,EAAE;IACR,OAAOA,MAAM,CAACM,UAAU,CAAC;MACrBrB,KAAK;MACLQ,OAAO;MACPC,KAAK;MACLR,MAAM;MACNS,KAAK;MACLR;IACJ,CAAC,CAAC;EACN,CAAC,MAAM,IAAI,CAACQ,KAAK,EAAE;IACf,MAAM,IAAIH,cAAW,CACjB,oDAAoD,EACpD,qBAAqB,EACrB;MACIC,OAAO;MACPN;IACJ,CACJ,CAAC;EACL;EACA,MAAMoB,SAAS,GAAGZ,KAAK,CAACa,UAAU,CAAC;IAC/Bb;EACJ,CAAC,CAAC;EACF,OAAO;IACHA,KAAK;IACLF,OAAO;IACPc,SAAS;IACTH,OAAO,EAAEV,KAAK,KAAK;EACvB,CAAC;AACL,CAAC;AAACe,OAAA,CAAA1B,WAAA,GAAAA,WAAA","ignoreList":[]}

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

@@ -1,6 +1,6 @@
-import { CmsEntry, CmsEntryListWhere } from "@webiny/api-headless-cms/types";
-import { PluginsContainer } from "@webiny/plugins";
-import { Field } from "./types";
+import type { CmsEntry, CmsEntryListWhere } from "@webiny/api-headless-cms/types";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { Field } from "./types";
 interface Params {
     items: CmsEntry[];
     where: Partial<CmsEntryListWhere>;

package/operations/entry/filtering/filter.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.filter = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _ValueFilterPlugin = require("@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _fullTextSearch = require("./fullTextSearch");
@@ -17,6 +16,18 @@ const executeFilter = params => {
     value,
     filter
   } = params;
+
+  /**
+   * We need to check if the filter can be used.
+   * If it cannot, we will just return true.
+   */
+  const canUse = filter.plugin.canUse({
+    value,
+    compareValue: filter.compareValue
+  });
+  if (!canUse) {
+    return true;
+  }
   const matched = filter.plugin.matches({
     value,
     compareValue: filter.compareValue
@@ -57,9 +68,10 @@ const executeExpressions = params => {
    * Then we move onto expressions, which are basically nested upon nested filters with different conditions.
    */
   for (const expression of expressions) {
-    const result = executeExpressions((0, _objectSpread2.default)((0, _objectSpread2.default)({}, expression), {}, {
+    const result = executeExpressions({
+      ...expression,
       getCachedValue
-    }));
+    });
     if (result && condition === "OR") {
       return true;
     } else if (!result && condition == "AND") {
@@ -94,7 +106,7 @@ const filter = params => {
   /**
    * No point in going further if there are no expressions to be applied and no full text search to be executed.
    */
-  if (expression.filters.length === 0 && expression.expressions.length === 0 && !(fullTextSearch !== null && fullTextSearch !== void 0 && fullTextSearch.term)) {
+  if (expression.filters.length === 0 && expression.expressions.length === 0 && !fullTextSearch?.term) {
     return records;
   }
   /**
@@ -105,8 +117,8 @@ const filter = params => {
     throw new _error.default(`Missing "contains" plugin to run the full-text search.`, "MISSING_PLUGIN");
   }
   const search = (0, _fullTextSearch.createFullTextSearch)({
-    term: fullTextSearch === null || fullTextSearch === void 0 ? void 0 : fullTextSearch.term,
-    targetFields: fullTextSearch === null || fullTextSearch === void 0 ? void 0 : fullTextSearch.fields,
+    term: fullTextSearch?.term,
+    targetFields: fullTextSearch?.fields,
     fields,
     plugin: fullTextSearchPlugin
   });
@@ -127,9 +139,10 @@ const filter = params => {
       cachedValues[path] = rawValue;
       return rawValue;
     };
-    const exprResult = executeExpressions((0, _objectSpread2.default)((0, _objectSpread2.default)({}, expression), {}, {
+    const exprResult = executeExpressions({
+      ...expression,
       getCachedValue
-    }));
+    });
     /**
      * If expression result is false we do not need to continue further.
      * Also, if there is no full text search defined, just return the expression result.
@@ -140,4 +153,6 @@ const filter = params => {
     return search(record);
   });
 };
-exports.filter = filter;
+exports.filter = filter;
+
+//# sourceMappingURL=filter.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["executeFilter","params","value","filter","matched","plugin","matches","compareValue","negate","executeExpressions","expressions","getCachedValue","filters","condition","length","result","expression","items","records","where","plugins","fields","fullTextSearch","keys","Object","createExpressions","term","fullTextSearchPlugin","byType","ValueFilterPlugin","type","find","getOperation","WebinyError","search","createFullTextSearch","targetFields","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","transform","exprResult"],"sources":["filter.ts"],"sourcesContent":["import { CmsEntry, CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { Field } from \"./types\";\nimport { createFullTextSearch } from \"./fullTextSearch\";\nimport { createExpressions, Expression, ExpressionCondition, Filter } from \"./createExpressions\";\nimport { transformValue } from \"./transform\";\nimport { getValue } from \"~/operations/entry/filtering/getValue\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    const matched = filter.plugin.matches({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (filter.negate) {\n        return matched === false;\n    }\n    return matched;\n};\n\ninterface ExecuteExpressionsParams {\n    getCachedValue: (filter: Filter) => Promise<any>;\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nconst executeExpressions = (params: ExecuteExpressionsParams): boolean => {\n    const { expressions, getCachedValue, filters, condition } = params;\n    if (expressions.length === 0 && filters.length === 0) {\n        return true;\n    }\n    /**\n     * Always run filters first as they might trigger an early return.\n     */\n    for (const filter of filters) {\n        const value = getCachedValue(filter);\n\n        const result = executeFilter({\n            value,\n            filter\n        });\n        /**\n         * Filters are ALWAYS executed as an AND.\n         * So if even one is false, everything false.\n         */\n        if (!result) {\n            return false;\n        }\n    }\n    /**\n     * Then we move onto expressions, which are basically nested upon nested filters with different conditions.\n     */\n    for (const expression of expressions) {\n        const result = executeExpressions({\n            ...expression,\n            getCachedValue\n        });\n        if (result && condition === \"OR\") {\n            return true;\n        } else if (!result && condition == \"AND\") {\n            return false;\n        }\n    }\n    /**\n     * If condition is an OR, we can fail the expressions check because the code would return a lot earlier than this line.\n     *\n     * Also, if condition is not an OR, we can say that the expressions check is ok, because it would fail a lot earlier than this line.\n     */\n    return condition === \"OR\" ? false : true;\n};\n\ninterface Params {\n    items: CmsEntry[];\n    where: Partial<CmsEntryListWhere>;\n    plugins: PluginsContainer;\n    fields: Record<string, Field>;\n    fullTextSearch?: {\n        term?: string;\n        fields?: string[];\n    };\n}\n\nexport const filter = (params: Params): CmsEntry[] => {\n    const { items: records, where, plugins, fields, fullTextSearch } = params;\n\n    const keys = Object.keys(where);\n    if (keys.length === 0 && !fullTextSearch) {\n        return records;\n    }\n    const expression = createExpressions({\n        plugins,\n        where,\n        fields\n    });\n\n    /**\n     * No point in going further if there are no expressions to be applied and no full text search to be executed.\n     */\n    if (\n        expression.filters.length === 0 &&\n        expression.expressions.length === 0 &&\n        !fullTextSearch?.term\n    ) {\n        return records;\n    }\n    /**\n     * We need the contains plugin to run the full text search.\n     */\n    const fullTextSearchPlugin = plugins\n        .byType<ValueFilterPlugin>(ValueFilterPlugin.type)\n        .find(plugin => plugin.getOperation() === \"contains\");\n    if (!fullTextSearchPlugin) {\n        throw new WebinyError(\n            `Missing \"contains\" plugin to run the full-text search.`,\n            \"MISSING_PLUGIN\"\n        );\n    }\n\n    const search = createFullTextSearch({\n        term: fullTextSearch?.term,\n        targetFields: fullTextSearch?.fields,\n        fields,\n        plugin: fullTextSearchPlugin\n    });\n\n    return records.filter(record => {\n        const cachedValues: Record<string, any> = {};\n\n        const getCachedValue = (filter: Filter) => {\n            const { path } = filter;\n            if (cachedValues[path] !== undefined) {\n                return cachedValues[path];\n            }\n            const plainValue = getValue(record, path);\n\n            const rawValue = transformValue({\n                value: plainValue,\n                transform: filter.transformValue\n            });\n\n            cachedValues[path] = rawValue;\n            return rawValue;\n        };\n\n        const exprResult = executeExpressions({ ...expression, getCachedValue });\n        /**\n         * If expression result is false we do not need to continue further.\n         * Also, if there is no full text search defined, just return the expression result.\n         */\n        if (!exprResult || !search) {\n            return exprResult;\n        }\n\n        return search(record);\n    });\n};\n"],"mappings":"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"}
+{"version":3,"names":["_ValueFilterPlugin","require","_error","_interopRequireDefault","_fullTextSearch","_createExpressions","_transform","_getValue","executeFilter","params","value","filter","canUse","plugin","compareValue","matched","matches","negate","executeExpressions","expressions","getCachedValue","filters","condition","length","result","expression","items","records","where","plugins","fields","fullTextSearch","keys","Object","createExpressions","term","fullTextSearchPlugin","byType","ValueFilterPlugin","type","find","getOperation","WebinyError","search","createFullTextSearch","targetFields","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","transform","exprResult","exports"],"sources":["filter.ts"],"sourcesContent":["import type { CmsEntry, CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport WebinyError from \"@webiny/error\";\nimport type { PluginsContainer } from \"@webiny/plugins\";\nimport type { Field } from \"./types\";\nimport { createFullTextSearch } from \"./fullTextSearch\";\nimport type { Expression, ExpressionCondition, Filter } from \"./createExpressions\";\nimport { createExpressions } from \"./createExpressions\";\nimport { transformValue } from \"./transform\";\nimport { getValue } from \"~/operations/entry/filtering/getValue\";\n\ninterface ExecuteFilterParams {\n    value: any;\n    filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n    const { value, filter } = params;\n\n    /**\n     * We need to check if the filter can be used.\n     * If it cannot, we will just return true.\n     */\n    const canUse = filter.plugin.canUse({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (!canUse) {\n        return true;\n    }\n\n    const matched = filter.plugin.matches({\n        value,\n        compareValue: filter.compareValue\n    });\n    if (filter.negate) {\n        return matched === false;\n    }\n    return matched;\n};\n\ninterface ExecuteExpressionsParams {\n    getCachedValue: (filter: Filter) => Promise<any>;\n    expressions: Expression[];\n    filters: Filter[];\n    condition: ExpressionCondition;\n}\n\nconst executeExpressions = (params: ExecuteExpressionsParams): boolean => {\n    const { expressions, getCachedValue, filters, condition } = params;\n    if (expressions.length === 0 && filters.length === 0) {\n        return true;\n    }\n    /**\n     * Always run filters first as they might trigger an early return.\n     */\n    for (const filter of filters) {\n        const value = getCachedValue(filter);\n\n        const result = executeFilter({\n            value,\n            filter\n        });\n        /**\n         * Filters are ALWAYS executed as an AND.\n         * So if even one is false, everything false.\n         */\n        if (!result) {\n            return false;\n        }\n    }\n    /**\n     * Then we move onto expressions, which are basically nested upon nested filters with different conditions.\n     */\n    for (const expression of expressions) {\n        const result = executeExpressions({\n            ...expression,\n            getCachedValue\n        });\n        if (result && condition === \"OR\") {\n            return true;\n        } else if (!result && condition == \"AND\") {\n            return false;\n        }\n    }\n    /**\n     * If condition is an OR, we can fail the expressions check because the code would return a lot earlier than this line.\n     *\n     * Also, if condition is not an OR, we can say that the expressions check is ok, because it would fail a lot earlier than this line.\n     */\n    return condition === \"OR\" ? false : true;\n};\n\ninterface Params {\n    items: CmsEntry[];\n    where: Partial<CmsEntryListWhere>;\n    plugins: PluginsContainer;\n    fields: Record<string, Field>;\n    fullTextSearch?: {\n        term?: string;\n        fields?: string[];\n    };\n}\n\nexport const filter = (params: Params): CmsEntry[] => {\n    const { items: records, where, plugins, fields, fullTextSearch } = params;\n\n    const keys = Object.keys(where);\n    if (keys.length === 0 && !fullTextSearch) {\n        return records;\n    }\n    const expression = createExpressions({\n        plugins,\n        where,\n        fields\n    });\n\n    /**\n     * No point in going further if there are no expressions to be applied and no full text search to be executed.\n     */\n    if (\n        expression.filters.length === 0 &&\n        expression.expressions.length === 0 &&\n        !fullTextSearch?.term\n    ) {\n        return records;\n    }\n    /**\n     * We need the contains plugin to run the full text search.\n     */\n    const fullTextSearchPlugin = plugins\n        .byType<ValueFilterPlugin>(ValueFilterPlugin.type)\n        .find(plugin => plugin.getOperation() === \"contains\");\n    if (!fullTextSearchPlugin) {\n        throw new WebinyError(\n            `Missing \"contains\" plugin to run the full-text search.`,\n            \"MISSING_PLUGIN\"\n        );\n    }\n\n    const search = createFullTextSearch({\n        term: fullTextSearch?.term,\n        targetFields: fullTextSearch?.fields,\n        fields,\n        plugin: fullTextSearchPlugin\n    });\n\n    return records.filter(record => {\n        const cachedValues: Record<string, any> = {};\n\n        const getCachedValue = (filter: Filter) => {\n            const { path } = filter;\n            if (cachedValues[path] !== undefined) {\n                return cachedValues[path];\n            }\n            const plainValue = getValue(record, path);\n\n            const rawValue = transformValue({\n                value: plainValue,\n                transform: filter.transformValue\n            });\n\n            cachedValues[path] = rawValue;\n            return rawValue;\n        };\n\n        const exprResult = executeExpressions({ ...expression, getCachedValue });\n        /**\n         * If expression result is false we do not need to continue further.\n         * Also, if there is no full text search defined, just return the expression result.\n         */\n        if (!exprResult || !search) {\n            return exprResult;\n        }\n\n        return search(record);\n    });\n};\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,6 +1,6 @@
-import { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin";
-import { CmsEntry } from "@webiny/api-headless-cms/types";
-import { Field } from "./types";
+import type { ValueFilterPlugin } from "@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin";
+import type { CmsEntry } from "@webiny/api-headless-cms/types";
+import type { Field } from "./types";
 interface Params {
     term?: string;
     targetFields?: string[];