@webiny/api-headless-cms-ddb 0.0.0-unstable.97a151f74d → 0.0.0-unstable.aad28a72ae

package/dynamoDb/storage/longText.js

@@ -80,6 +80,13 @@ const createLongTextStorageTransformPlugin = () => {
     toStorage: async ({
       value: initialValue
     }) => {
+      /**
+       * There is a possibility that we are trying to compress already compressed value.
+       */
+      if (initialValue && initialValue.hasOwnProperty("compression") === true) {
+        return initialValue;
+      }
+
       const isArray = Array.isArray(initialValue);
       const value = isArray ? JSON.stringify(initialValue) : initialValue;
       const compressedValue = await (0, _gzip.compress)(value);

package/dynamoDb/storage/longText.js.map

@@ -1 +1 @@
-{"version":3,"names":["GZIP","TO_STORAGE_ENCODING","FROM_STORAGE_ENCODING","convertToBuffer","value","Buffer","from","createLongTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","typeOf","Array","isArray","WebinyError","storageId","fieldId","compression","JSON","stringify","buf","ungzip","result","toString","parse","ex","console","log","message","toStorage","initialValue","compressedValue","gzip"],"sources":["longText.ts"],"sourcesContent":["/**\n * File is @internal\n */\n\nimport WebinyError from \"@webiny/error\";\nimport { compress as gzip, decompress as ungzip } from \"@webiny/utils/compression/gzip\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\nconst GZIP = \"gzip\";\nconst TO_STORAGE_ENCODING = \"base64\";\nconst FROM_STORAGE_ENCODING = \"utf8\";\n\nconst convertToBuffer = (value: string | Buffer): Buffer => {\n    if (typeof value === \"string\") {\n        return Buffer.from(value, TO_STORAGE_ENCODING);\n    }\n    return value;\n};\n\nexport interface StorageValue {\n    compression: string;\n    value: string;\n    isArray?: boolean;\n}\n\nexport const createLongTextStorageTransformPlugin = () => {\n    return new StorageTransformPlugin<string | string[], StorageValue>({\n        fieldType: \"long-text\",\n        fromStorage: async ({ field, value: storageValue }) => {\n            const typeOf = typeof storageValue;\n            if (\n                !storageValue ||\n                typeOf === \"string\" ||\n                typeOf === \"number\" ||\n                Array.isArray(storageValue) === true\n            ) {\n                return storageValue as unknown as string | string[];\n            } else if (typeOf !== \"object\") {\n                throw new WebinyError(\n                    `LongText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n                );\n            }\n            const { compression, value, isArray } = storageValue;\n            /**\n             * Check if possibly undefined, null, empty...\n             */\n            if (!compression) {\n                throw new WebinyError(\n                    `Missing compression in \"fromStorage\" function in field \"${\n                        field.storageId\n                    }\" - ${field.fieldId}.\": ${JSON.stringify(storageValue)}.`,\n                    \"MISSING_COMPRESSION\",\n                    {\n                        value: storageValue\n                    }\n                );\n            } else if (compression !== GZIP) {\n                throw new WebinyError(\n                    `This plugin cannot transform something not compressed with \"GZIP\".`,\n                    \"WRONG_COMPRESSION\",\n                    {\n                        compression\n                    }\n                );\n            }\n            try {\n                const buf = await ungzip(convertToBuffer(value));\n                const result = buf.toString(FROM_STORAGE_ENCODING);\n                if (!isArray) {\n                    return result;\n                }\n                return JSON.parse(result);\n            } catch (ex) {\n                console.log(\"Error while transforming long-text.\");\n                console.log(ex.message);\n                return \"\";\n            }\n        },\n        toStorage: async ({ value: initialValue }) => {\n            const isArray = Array.isArray(initialValue);\n            const value = isArray ? JSON.stringify(initialValue) : initialValue;\n            const compressedValue = await gzip(value);\n\n            const result: StorageValue = {\n                compression: GZIP,\n                value: compressedValue.toString(TO_STORAGE_ENCODING)\n            };\n            if (!isArray) {\n                return result;\n            }\n            result.isArray = isArray;\n            return result;\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAIA;;AACA;;AACA;;AANA;AACA;AACA;AAMA,MAAMA,IAAI,GAAG,MAAb;AACA,MAAMC,mBAAmB,GAAG,QAA5B;AACA,MAAMC,qBAAqB,GAAG,MAA9B;;AAEA,MAAMC,eAAe,GAAIC,KAAD,IAAoC;EACxD,IAAI,OAAOA,KAAP,KAAiB,QAArB,EAA+B;IAC3B,OAAOC,MAAM,CAACC,IAAP,CAAYF,KAAZ,EAAmBH,mBAAnB,CAAP;EACH;;EACD,OAAOG,KAAP;AACH,CALD;;AAaO,MAAMG,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAJ,CAA4D;IAC/DC,SAAS,EAAE,WADoD;IAE/DC,WAAW,EAAE,OAAO;MAAEC,KAAF;MAASP,KAAK,EAAEQ;IAAhB,CAAP,KAA0C;MACnD,MAAMC,MAAM,GAAG,OAAOD,YAAtB;;MACA,IACI,CAACA,YAAD,IACAC,MAAM,KAAK,QADX,IAEAA,MAAM,KAAK,QAFX,IAGAC,KAAK,CAACC,OAAN,CAAcH,YAAd,MAAgC,IAJpC,EAKE;QACE,OAAOA,YAAP;MACH,CAPD,MAOO,IAAIC,MAAM,KAAK,QAAf,EAAyB;QAC5B,MAAM,IAAIG,cAAJ,CACD,gFAA+EL,KAAK,CAACM,SAAU,OAAMN,KAAK,CAACO,OAAQ,GADlH,CAAN;MAGH;;MACD,MAAM;QAAEC,WAAF;QAAef,KAAf;QAAsBW;MAAtB,IAAkCH,YAAxC;MACA;AACZ;AACA;;MACY,IAAI,CAACO,WAAL,EAAkB;QACd,MAAM,IAAIH,cAAJ,CACD,2DACGL,KAAK,CAACM,SACT,OAAMN,KAAK,CAACO,OAAQ,OAAME,IAAI,CAACC,SAAL,CAAeT,YAAf,CAA6B,GAHtD,EAIF,qBAJE,EAKF;UACIR,KAAK,EAAEQ;QADX,CALE,CAAN;MASH,CAVD,MAUO,IAAIO,WAAW,KAAKnB,IAApB,EAA0B;QAC7B,MAAM,IAAIgB,cAAJ,CACD,oEADC,EAEF,mBAFE,EAGF;UACIG;QADJ,CAHE,CAAN;MAOH;;MACD,IAAI;QACA,MAAMG,GAAG,GAAG,MAAM,IAAAC,gBAAA,EAAOpB,eAAe,CAACC,KAAD,CAAtB,CAAlB;QACA,MAAMoB,MAAM,GAAGF,GAAG,CAACG,QAAJ,CAAavB,qBAAb,CAAf;;QACA,IAAI,CAACa,OAAL,EAAc;UACV,OAAOS,MAAP;QACH;;QACD,OAAOJ,IAAI,CAACM,KAAL,CAAWF,MAAX,CAAP;MACH,CAPD,CAOE,OAAOG,EAAP,EAAW;QACTC,OAAO,CAACC,GAAR,CAAY,qCAAZ;QACAD,OAAO,CAACC,GAAR,CAAYF,EAAE,CAACG,OAAf;QACA,OAAO,EAAP;MACH;IACJ,CAnD8D;IAoD/DC,SAAS,EAAE,OAAO;MAAE3B,KAAK,EAAE4B;IAAT,CAAP,KAAmC;MAC1C,MAAMjB,OAAO,GAAGD,KAAK,CAACC,OAAN,CAAciB,YAAd,CAAhB;MACA,MAAM5B,KAAK,GAAGW,OAAO,GAAGK,IAAI,CAACC,SAAL,CAAeW,YAAf,CAAH,GAAkCA,YAAvD;MACA,MAAMC,eAAe,GAAG,MAAM,IAAAC,cAAA,EAAK9B,KAAL,CAA9B;MAEA,MAAMoB,MAAoB,GAAG;QACzBL,WAAW,EAAEnB,IADY;QAEzBI,KAAK,EAAE6B,eAAe,CAACR,QAAhB,CAAyBxB,mBAAzB;MAFkB,CAA7B;;MAIA,IAAI,CAACc,OAAL,EAAc;QACV,OAAOS,MAAP;MACH;;MACDA,MAAM,CAACT,OAAP,GAAiBA,OAAjB;MACA,OAAOS,MAAP;IACH;EAlE8D,CAA5D,CAAP;AAoEH,CArEM"}
+{"version":3,"names":["GZIP","TO_STORAGE_ENCODING","FROM_STORAGE_ENCODING","convertToBuffer","value","Buffer","from","createLongTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","typeOf","Array","isArray","WebinyError","storageId","fieldId","compression","JSON","stringify","buf","ungzip","result","toString","parse","ex","console","log","message","toStorage","initialValue","hasOwnProperty","compressedValue","gzip"],"sources":["longText.ts"],"sourcesContent":["/**\n * File is @internal\n */\n\nimport WebinyError from \"@webiny/error\";\nimport { compress as gzip, decompress as ungzip } from \"@webiny/utils/compression/gzip\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\nconst GZIP = \"gzip\";\nconst TO_STORAGE_ENCODING = \"base64\";\nconst FROM_STORAGE_ENCODING = \"utf8\";\n\nconst convertToBuffer = (value: string | Buffer): Buffer => {\n    if (typeof value === \"string\") {\n        return Buffer.from(value, TO_STORAGE_ENCODING);\n    }\n    return value;\n};\n\nexport interface StorageValue {\n    compression: string;\n    value: string;\n    isArray?: boolean;\n}\n\nexport const createLongTextStorageTransformPlugin = () => {\n    return new StorageTransformPlugin<string | string[], StorageValue>({\n        fieldType: \"long-text\",\n        fromStorage: async ({ field, value: storageValue }) => {\n            const typeOf = typeof storageValue;\n            if (\n                !storageValue ||\n                typeOf === \"string\" ||\n                typeOf === \"number\" ||\n                Array.isArray(storageValue) === true\n            ) {\n                return storageValue as unknown as string | string[];\n            } else if (typeOf !== \"object\") {\n                throw new WebinyError(\n                    `LongText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n                );\n            }\n            const { compression, value, isArray } = storageValue;\n            /**\n             * Check if possibly undefined, null, empty...\n             */\n            if (!compression) {\n                throw new WebinyError(\n                    `Missing compression in \"fromStorage\" function in field \"${\n                        field.storageId\n                    }\" - ${field.fieldId}.\": ${JSON.stringify(storageValue)}.`,\n                    \"MISSING_COMPRESSION\",\n                    {\n                        value: storageValue\n                    }\n                );\n            } else if (compression !== GZIP) {\n                throw new WebinyError(\n                    `This plugin cannot transform something not compressed with \"GZIP\".`,\n                    \"WRONG_COMPRESSION\",\n                    {\n                        compression\n                    }\n                );\n            }\n            try {\n                const buf = await ungzip(convertToBuffer(value));\n                const result = buf.toString(FROM_STORAGE_ENCODING);\n                if (!isArray) {\n                    return result;\n                }\n                return JSON.parse(result);\n            } catch (ex) {\n                console.log(\"Error while transforming long-text.\");\n                console.log(ex.message);\n                return \"\";\n            }\n        },\n        toStorage: async ({ value: initialValue }) => {\n            /**\n             * There is a possibility that we are trying to compress already compressed value.\n             */\n            if (initialValue && initialValue.hasOwnProperty(\"compression\") === true) {\n                return initialValue as any;\n            }\n            const isArray = Array.isArray(initialValue);\n            const value = isArray ? JSON.stringify(initialValue) : initialValue;\n            const compressedValue = await gzip(value);\n\n            const result: StorageValue = {\n                compression: GZIP,\n                value: compressedValue.toString(TO_STORAGE_ENCODING)\n            };\n            if (!isArray) {\n                return result;\n            }\n            result.isArray = isArray;\n            return result;\n        }\n    });\n};\n"],"mappings":"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"}

package/dynamoDb/storage/richText.js.map

@@ -1 +1 @@
-{"version":3,"names":["transformArray","value","isArray","Array","shouldBeArray","from","k","createRichTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","WebinyError","storageId","fieldId","hasOwnProperty","compression","JSON","stringify","jsonpack","unpack","toStorage","pack"],"sources":["richText.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport jsonpack from \"jsonpack\";\nimport WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\n/**\n * Remove when jsonpack gets PR with a fix merged\n * https://github.com/rgcl/jsonpack/pull/25/files\n * NOTE 2021-07-28: it seems PR is not going to be merged so keep this.\n */\n// TODO @ts-refactor figure better type\nconst transformArray = (value: any) => {\n    if (!value) {\n        return value;\n    }\n    let isArray = Array.isArray(value);\n    const shouldBeArray = value instanceof Array === false && isArray;\n    if (shouldBeArray) {\n        value = Array.from(value as any);\n        isArray = true;\n    }\n    if (typeof value === \"object\" || isArray) {\n        for (const k in value) {\n            value[k] = transformArray(value[k]);\n        }\n    }\n    return value;\n};\n\nexport const createRichTextStorageTransformPlugin = () => {\n    return new StorageTransformPlugin({\n        fieldType: \"rich-text\",\n        fromStorage: async ({ field, value: storageValue }) => {\n            if (!storageValue) {\n                return storageValue;\n            } else if (typeof storageValue !== \"object\") {\n                throw new WebinyError(\n                    `RichText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n                );\n            }\n            /**\n             * This is to circumvent a bug introduced with 5.8.0 storage operations.\n             * Do not remove.\n             */\n            if (storageValue.hasOwnProperty(\"compression\") === false) {\n                return storageValue;\n            }\n            const { compression, value } = storageValue;\n            if (!compression) {\n                throw new WebinyError(\n                    `Missing compression in \"fromStorage\" function in field \"${\n                        field.fieldId\n                    }\": ${JSON.stringify(storageValue)}.`,\n                    \"MISSING_COMPRESSION\",\n                    {\n                        value: storageValue\n                    }\n                );\n            }\n            if (compression !== \"jsonpack\") {\n                throw new WebinyError(\n                    `This plugin cannot transform something not packed with \"jsonpack\".`,\n                    \"WRONG_COMPRESSION\",\n                    {\n                        compression\n                    }\n                );\n            }\n            try {\n                return jsonpack.unpack(value);\n            } catch {\n                return null;\n            }\n        },\n        toStorage: async ({ value }) => {\n            /**\n             * There is a possibility that we are trying to compress already compressed value.\n             * Introduced a bug with 5.8.0 storage operations, so just return the value to correct it.\n             */\n            if (value && value.hasOwnProperty(\"compression\") === true) {\n                return value as any;\n            }\n            value = transformArray(value);\n            return {\n                compression: \"jsonpack\",\n                value: value ? jsonpack.pack(value) : value\n            };\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAGA;;AACA;;AACA;;AALA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAIC,KAAD,IAAgB;EACnC,IAAI,CAACA,KAAL,EAAY;IACR,OAAOA,KAAP;EACH;;EACD,IAAIC,OAAO,GAAGC,KAAK,CAACD,OAAN,CAAcD,KAAd,CAAd;EACA,MAAMG,aAAa,GAAGH,KAAK,YAAYE,KAAjB,KAA2B,KAA3B,IAAoCD,OAA1D;;EACA,IAAIE,aAAJ,EAAmB;IACfH,KAAK,GAAGE,KAAK,CAACE,IAAN,CAAWJ,KAAX,CAAR;IACAC,OAAO,GAAG,IAAV;EACH;;EACD,IAAI,OAAOD,KAAP,KAAiB,QAAjB,IAA6BC,OAAjC,EAA0C;IACtC,KAAK,MAAMI,CAAX,IAAgBL,KAAhB,EAAuB;MACnBA,KAAK,CAACK,CAAD,CAAL,GAAWN,cAAc,CAACC,KAAK,CAACK,CAAD,CAAN,CAAzB;IACH;EACJ;;EACD,OAAOL,KAAP;AACH,CAhBD;;AAkBO,MAAMM,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAJ,CAA2B;IAC9BC,SAAS,EAAE,WADmB;IAE9BC,WAAW,EAAE,OAAO;MAAEC,KAAF;MAASV,KAAK,EAAEW;IAAhB,CAAP,KAA0C;MACnD,IAAI,CAACA,YAAL,EAAmB;QACf,OAAOA,YAAP;MACH,CAFD,MAEO,IAAI,OAAOA,YAAP,KAAwB,QAA5B,EAAsC;QACzC,MAAM,IAAIC,cAAJ,CACD,gFAA+EF,KAAK,CAACG,SAAU,OAAMH,KAAK,CAACI,OAAQ,GADlH,CAAN;MAGH;MACD;AACZ;AACA;AACA;;;MACY,IAAIH,YAAY,CAACI,cAAb,CAA4B,aAA5B,MAA+C,KAAnD,EAA0D;QACtD,OAAOJ,YAAP;MACH;;MACD,MAAM;QAAEK,WAAF;QAAehB;MAAf,IAAyBW,YAA/B;;MACA,IAAI,CAACK,WAAL,EAAkB;QACd,MAAM,IAAIJ,cAAJ,CACD,2DACGF,KAAK,CAACI,OACT,MAAKG,IAAI,CAACC,SAAL,CAAeP,YAAf,CAA6B,GAHjC,EAIF,qBAJE,EAKF;UACIX,KAAK,EAAEW;QADX,CALE,CAAN;MASH;;MACD,IAAIK,WAAW,KAAK,UAApB,EAAgC;QAC5B,MAAM,IAAIJ,cAAJ,CACD,oEADC,EAEF,mBAFE,EAGF;UACII;QADJ,CAHE,CAAN;MAOH;;MACD,IAAI;QACA,OAAOG,iBAAA,CAASC,MAAT,CAAgBpB,KAAhB,CAAP;MACH,CAFD,CAEE,MAAM;QACJ,OAAO,IAAP;MACH;IACJ,CA3C6B;IA4C9BqB,SAAS,EAAE,OAAO;MAAErB;IAAF,CAAP,KAAqB;MAC5B;AACZ;AACA;AACA;MACY,IAAIA,KAAK,IAAIA,KAAK,CAACe,cAAN,CAAqB,aAArB,MAAwC,IAArD,EAA2D;QACvD,OAAOf,KAAP;MACH;;MACDA,KAAK,GAAGD,cAAc,CAACC,KAAD,CAAtB;MACA,OAAO;QACHgB,WAAW,EAAE,UADV;QAEHhB,KAAK,EAAEA,KAAK,GAAGmB,iBAAA,CAASG,IAAT,CAActB,KAAd,CAAH,GAA0BA;MAFnC,CAAP;IAIH;EAzD6B,CAA3B,CAAP;AA2DH,CA5DM"}
+{"version":3,"names":["transformArray","value","isArray","Array","shouldBeArray","from","k","createRichTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","WebinyError","storageId","fieldId","hasOwnProperty","compression","JSON","stringify","jsonpack","unpack","toStorage","pack"],"sources":["richText.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport jsonpack from \"jsonpack\";\nimport WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\n/**\n * Remove when jsonpack gets PR with a fix merged\n * https://github.com/rgcl/jsonpack/pull/25/files\n * NOTE 2021-07-28: it seems PR is not going to be merged so keep this.\n */\n// TODO @ts-refactor figure better type\nconst transformArray = (value: any) => {\n    if (!value) {\n        return value;\n    }\n    let isArray = Array.isArray(value);\n    const shouldBeArray = value instanceof Array === false && isArray;\n    if (shouldBeArray) {\n        value = Array.from(value);\n        isArray = true;\n    }\n    if (typeof value === \"object\" || isArray) {\n        for (const k in value) {\n            value[k] = transformArray(value[k]);\n        }\n    }\n    return value;\n};\n\nexport const createRichTextStorageTransformPlugin = () => {\n    return new StorageTransformPlugin({\n        fieldType: \"rich-text\",\n        fromStorage: async ({ field, value: storageValue }) => {\n            if (!storageValue) {\n                return storageValue;\n            } else if (typeof storageValue !== \"object\") {\n                throw new WebinyError(\n                    `RichText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n                );\n            }\n            /**\n             * This is to circumvent a bug introduced with 5.8.0 storage operations.\n             * Do not remove.\n             */\n            if (storageValue.hasOwnProperty(\"compression\") === false) {\n                return storageValue;\n            }\n            const { compression, value } = storageValue;\n            if (!compression) {\n                throw new WebinyError(\n                    `Missing compression in \"fromStorage\" function in field \"${\n                        field.fieldId\n                    }\": ${JSON.stringify(storageValue)}.`,\n                    \"MISSING_COMPRESSION\",\n                    {\n                        value: storageValue\n                    }\n                );\n            }\n            if (compression !== \"jsonpack\") {\n                throw new WebinyError(\n                    `This plugin cannot transform something not packed with \"jsonpack\".`,\n                    \"WRONG_COMPRESSION\",\n                    {\n                        compression\n                    }\n                );\n            }\n            try {\n                return jsonpack.unpack(value);\n            } catch {\n                return null;\n            }\n        },\n        toStorage: async ({ value }) => {\n            /**\n             * There is a possibility that we are trying to compress already compressed value.\n             * Introduced a bug with 5.8.0 storage operations, so just return the value to correct it.\n             */\n            if (value && value.hasOwnProperty(\"compression\") === true) {\n                return value;\n            }\n            value = transformArray(value);\n            return {\n                compression: \"jsonpack\",\n                value: value ? jsonpack.pack(value) : value\n            };\n        }\n    });\n};\n"],"mappings":";;;;;;;;;AAGA;;AACA;;AACA;;AALA;AACA;AACA;;AAKA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMA,cAAc,GAAIC,KAAD,IAAgB;EACnC,IAAI,CAACA,KAAL,EAAY;IACR,OAAOA,KAAP;EACH;;EACD,IAAIC,OAAO,GAAGC,KAAK,CAACD,OAAN,CAAcD,KAAd,CAAd;EACA,MAAMG,aAAa,GAAGH,KAAK,YAAYE,KAAjB,KAA2B,KAA3B,IAAoCD,OAA1D;;EACA,IAAIE,aAAJ,EAAmB;IACfH,KAAK,GAAGE,KAAK,CAACE,IAAN,CAAWJ,KAAX,CAAR;IACAC,OAAO,GAAG,IAAV;EACH;;EACD,IAAI,OAAOD,KAAP,KAAiB,QAAjB,IAA6BC,OAAjC,EAA0C;IACtC,KAAK,MAAMI,CAAX,IAAgBL,KAAhB,EAAuB;MACnBA,KAAK,CAACK,CAAD,CAAL,GAAWN,cAAc,CAACC,KAAK,CAACK,CAAD,CAAN,CAAzB;IACH;EACJ;;EACD,OAAOL,KAAP;AACH,CAhBD;;AAkBO,MAAMM,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAJ,CAA2B;IAC9BC,SAAS,EAAE,WADmB;IAE9BC,WAAW,EAAE,OAAO;MAAEC,KAAF;MAASV,KAAK,EAAEW;IAAhB,CAAP,KAA0C;MACnD,IAAI,CAACA,YAAL,EAAmB;QACf,OAAOA,YAAP;MACH,CAFD,MAEO,IAAI,OAAOA,YAAP,KAAwB,QAA5B,EAAsC;QACzC,MAAM,IAAIC,cAAJ,CACD,gFAA+EF,KAAK,CAACG,SAAU,OAAMH,KAAK,CAACI,OAAQ,GADlH,CAAN;MAGH;MACD;AACZ;AACA;AACA;;;MACY,IAAIH,YAAY,CAACI,cAAb,CAA4B,aAA5B,MAA+C,KAAnD,EAA0D;QACtD,OAAOJ,YAAP;MACH;;MACD,MAAM;QAAEK,WAAF;QAAehB;MAAf,IAAyBW,YAA/B;;MACA,IAAI,CAACK,WAAL,EAAkB;QACd,MAAM,IAAIJ,cAAJ,CACD,2DACGF,KAAK,CAACI,OACT,MAAKG,IAAI,CAACC,SAAL,CAAeP,YAAf,CAA6B,GAHjC,EAIF,qBAJE,EAKF;UACIX,KAAK,EAAEW;QADX,CALE,CAAN;MASH;;MACD,IAAIK,WAAW,KAAK,UAApB,EAAgC;QAC5B,MAAM,IAAIJ,cAAJ,CACD,oEADC,EAEF,mBAFE,EAGF;UACII;QADJ,CAHE,CAAN;MAOH;;MACD,IAAI;QACA,OAAOG,iBAAA,CAASC,MAAT,CAAgBpB,KAAhB,CAAP;MACH,CAFD,CAEE,MAAM;QACJ,OAAO,IAAP;MACH;IACJ,CA3C6B;IA4C9BqB,SAAS,EAAE,OAAO;MAAErB;IAAF,CAAP,KAAqB;MAC5B;AACZ;AACA;AACA;MACY,IAAIA,KAAK,IAAIA,KAAK,CAACe,cAAN,CAAqB,aAArB,MAAwC,IAArD,EAA2D;QACvD,OAAOf,KAAP;MACH;;MACDA,KAAK,GAAGD,cAAc,CAACC,KAAD,CAAtB;MACA,OAAO;QACHgB,WAAW,EAAE,UADV;QAEHhB,KAAK,EAAEA,KAAK,GAAGmB,iBAAA,CAASG,IAAT,CAActB,KAAd,CAAH,GAA0BA;MAFnC,CAAP;IAIH;EAzD6B,CAA3B,CAAP;AA2DH,CA5DM"}

package/operations/entry/filtering/{createFilters.d.ts → createExpressions.d.ts}

@@ -2,12 +2,18 @@ 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 CreateFiltersParams {
+interface Params {
     plugins: PluginsContainer;
     where: Partial<CmsEntryListWhere>;
     fields: Record<string, Field>;
 }
-export interface ItemFilter {
+export declare type ExpressionCondition = "AND" | "OR";
+export interface Expression {
+    expressions: Expression[];
+    filters: Filter[];
+    condition: ExpressionCondition;
+}
+export interface Filter {
     field: Field;
     path: string;
     fieldPathId: string;
@@ -16,5 +22,5 @@ export interface ItemFilter {
     compareValue: any;
     transformValue: <I = any, O = any>(value: I) => O;
 }
-export declare const createFilters: (params: CreateFiltersParams) => ItemFilter[];
+export declare const createExpressions: (params: Params) => Expression;
 export {};

package/operations/entry/filtering/createExpressions.js

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

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

@@ -0,0 +1 @@
+{"version":3,"names":["createExpressions","params","where","plugins","fields","filterPlugins","getMappedPlugins","type","ValueFilterPlugin","property","transformValuePlugins","fieldFilterCreatePlugins","CmsEntryFieldFilterPlugin","defaultFilterCreatePlugin","getFilterCreatePlugin","filterCreatePlugin","WebinyError","createExpression","condition","expression","filters","expressions","key","hasOwnProperty","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            if (where.hasOwnProperty(key) === false) {\n                continue;\n            }\n\n            const value = (where as any)[key];\n            if (value === undefined) {\n                continue;\n            }\n\n            /**\n             * If there are \"AND\" or \"OR\" keys, let's sort them out first.\n             *\n             *\n             * AND conditional\n             */\n            if (key === \"AND\") {\n                const childWhereList = getWhereValues(value, key);\n                const childExpression: Expression = {\n                    condition: \"AND\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n            /**\n             * OR conditional\n             */\n            if (key === \"OR\") {\n                const childWhereList = getWhereValues(value, key);\n\n                const childExpression: Expression = {\n                    condition: \"OR\",\n                    filters: [],\n                    expressions: []\n                };\n                for (const childWhere of childWhereList) {\n                    const result = createExpression({\n                        where: childWhere,\n                        condition: \"AND\"\n                    });\n                    childExpression.expressions.push(result);\n                }\n                expression.expressions.push(childExpression);\n                continue;\n            }\n\n            const whereParams = extractWhereParams(key);\n            if (!whereParams) {\n                continue;\n            }\n\n            const { fieldId, operation, negate } = whereParams;\n\n            const field = fields[fieldId];\n            if (!field) {\n                throw new WebinyError(\n                    `There is no field with the fieldId \"${fieldId}\".`,\n                    \"FIELD_ERROR\",\n                    {\n                        fieldId\n                    }\n                );\n            }\n\n            /**\n             * We need a filter create plugin for this type.\n             */\n            const filterCreatePlugin = getFilterCreatePlugin(field.type);\n\n            const transformValuePlugin: CmsFieldFilterValueTransformPlugin =\n                transformValuePlugins[field.type];\n\n            const transformValueCallable = (value: any) => {\n                if (!transformValuePlugin) {\n                    return value;\n                }\n                return transformValuePlugin.transform({\n                    field,\n                    value\n                });\n            };\n\n            const result = filterCreatePlugin.create({\n                key,\n                value,\n                valueFilterPlugins: filterPlugins,\n                transformValuePlugins,\n                getFilterCreatePlugin,\n                operation,\n                negate,\n                field,\n                fields,\n                compareValue: transformValue({\n                    value,\n                    transform: transformValueCallable\n                }),\n                transformValue: transformValueCallable\n            });\n            /**\n             * There is a possibility of\n             * - no result\n             * - result being an array\n             * - result being an object\n             */\n            if (!result || (Array.isArray(result) && result.length === 0)) {\n                continue;\n            }\n\n            expression.filters.push(...(Array.isArray(result) ? result : [result]));\n        }\n\n        return expression;\n    };\n\n    const expression = createExpression({\n        where,\n        condition: \"AND\"\n    });\n    /**\n     * If the first expression has no filters and has only one expression, put that expression as main one.\n     * This will mostly be used when having an OR condition as the single expression in the root level of the where\n     */\n    if (expression.filters.length > 0 || expression.expressions.length !== 1) {\n        return expression;\n    }\n    return expression.expressions[0];\n};\n"],"mappings":"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"}

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

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

package/operations/entry/filtering/createFields.js

@@ -19,11 +19,10 @@ var _mapPlugins = require("./mapPlugins");
  * This method will map the fieldId (fieldId -> field) to the actual field.
  *
  * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).
- * @param params
  */
 const createFields = params => {
   const {
-    model,
+    fields,
     plugins
   } = params;
   const transformValuePlugins = (0, _mapPlugins.getMappedPlugins)({
@@ -117,7 +116,7 @@ const createFields = params => {
     }
   };
 
-  addFieldsToCollection(model.fields);
+  addFieldsToCollection(fields);
   return collection;
 };
 

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

@@ -1 +1 @@
-{"version":3,"names":["createFields","params","model","plugins","transformValuePlugins","getMappedPlugins","type","property","valuePathPlugins","CmsEntryFieldFilterPathPlugin","collection","createSystemFields","reduce","fields","field","transformPlugin","fieldId","parents","system","createPath","settings","path","transform","value","addFieldsToCollection","length","valuePathPlugin","multipleValues","map","f","join","concat","parent","childFields"],"sources":["createFields.ts"],"sourcesContent":["import { CmsModel, 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    model: CmsModel;\n    plugins: PluginsContainer;\n}\n\ninterface Fields {\n    [key: string]: Field;\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 * @param params\n */\nexport const createFields = (params: Params) => {\n    const { model, plugins } = params;\n\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const valuePathPlugins = getMappedPlugins<CmsEntryFieldFilterPathPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPathPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const collection = createSystemFields().reduce<Fields>((fields, field) => {\n        const transformPlugin = transformValuePlugins[field.type];\n\n        fields[field.fieldId] = {\n            ...field,\n            parents: [],\n            system: true,\n            createPath: ({ field }) => {\n                return field.settings?.path || field.fieldId;\n            },\n            transform: value => {\n                if (!transformPlugin) {\n                    return value;\n                }\n                return transformPlugin.transform({\n                    field,\n                    value\n                });\n            }\n        };\n\n        return fields;\n    }, {});\n\n    const addFieldsToCollection = (fields: CmsModelField[], parents: FieldParent[] = []): void => {\n        /**\n         * Exit early if no fields are sent.\n         */\n        if (fields.length === 0) {\n            return;\n        }\n        for (const field of fields) {\n            const transformPlugin = transformValuePlugins[field.type];\n            const valuePathPlugin = valuePathPlugins[field.type];\n            /**\n             * The required fieldId is a product of all of its parents and its own fieldId.\n             */\n            const fieldId = [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ]\n                .map(f => f.fieldId)\n                .join(\".\");\n\n            collection[fieldId] = {\n                ...field,\n                parents,\n                system: false,\n                createPath: params => {\n                    if (valuePathPlugin) {\n                        return valuePathPlugin.createPath(params);\n                    }\n\n                    return [\"values\"]\n                        .concat(parents.map(parent => parent.fieldId))\n                        .concat([params.field.fieldId])\n                        .join(\".\");\n                },\n                transform: value => {\n                    if (!transformPlugin) {\n                        return value;\n                    }\n                    return transformPlugin.transform({\n                        field,\n                        value\n                    });\n                }\n            };\n            const childFields = field.settings?.fields;\n            if (!childFields || childFields.length === 0) {\n                continue;\n            }\n            addFieldsToCollection(childFields, [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ]);\n        }\n    };\n\n    addFieldsToCollection(model.fields);\n\n    return collection;\n};\n"],"mappings":"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"}
+{"version":3,"names":["createFields","params","fields","plugins","transformValuePlugins","getMappedPlugins","type","property","valuePathPlugins","CmsEntryFieldFilterPathPlugin","collection","createSystemFields","reduce","field","transformPlugin","fieldId","parents","system","createPath","settings","path","transform","value","addFieldsToCollection","length","valuePathPlugin","multipleValues","map","f","join","concat","parent","childFields"],"sources":["createFields.ts"],"sourcesContent":["import { CmsModelField } from \"@webiny/api-headless-cms/types\";\nimport { createSystemFields } from \"./systemFields\";\nimport { Field, FieldParent } from \"./types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { CmsFieldFilterValueTransformPlugin } from \"~/types\";\nimport { CmsEntryFieldFilterPathPlugin } from \"~/plugins\";\nimport { getMappedPlugins } from \"./mapPlugins\";\n\ninterface Params {\n    fields: CmsModelField[];\n    plugins: PluginsContainer;\n}\n/**\n * This method will map the fieldId (fieldId -> field) to the actual field.\n *\n * In case of nested fields, fieldId is all the parent fieldIds + current one, joined by the dot (.).\n */\nexport const createFields = (params: Params) => {\n    const { fields, plugins } = params;\n\n    const transformValuePlugins = getMappedPlugins<CmsFieldFilterValueTransformPlugin>({\n        plugins,\n        type: \"cms-field-filter-value-transform\",\n        property: \"fieldType\"\n    });\n    const valuePathPlugins = getMappedPlugins<CmsEntryFieldFilterPathPlugin>({\n        plugins,\n        type: CmsEntryFieldFilterPathPlugin.type,\n        property: \"fieldType\"\n    });\n\n    const collection = createSystemFields().reduce<Record<string, Field>>((fields, field) => {\n        const transformPlugin = transformValuePlugins[field.type];\n\n        fields[field.fieldId] = {\n            ...field,\n            parents: [],\n            system: true,\n            createPath: ({ field }) => {\n                return field.settings?.path || field.fieldId;\n            },\n            transform: value => {\n                if (!transformPlugin) {\n                    return value;\n                }\n                return transformPlugin.transform({\n                    field,\n                    value\n                });\n            }\n        };\n\n        return fields;\n    }, {});\n\n    const addFieldsToCollection = (fields: CmsModelField[], parents: FieldParent[] = []): void => {\n        /**\n         * Exit early if no fields are sent.\n         */\n        if (fields.length === 0) {\n            return;\n        }\n        for (const field of fields) {\n            const transformPlugin = transformValuePlugins[field.type];\n            const valuePathPlugin = valuePathPlugins[field.type];\n            /**\n             * The required fieldId is a product of all of its parents and its own fieldId.\n             */\n            const fieldId = [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ]\n                .map(f => f.fieldId)\n                .join(\".\");\n\n            collection[fieldId] = {\n                ...field,\n                parents,\n                system: false,\n                createPath: params => {\n                    if (valuePathPlugin) {\n                        return valuePathPlugin.createPath(params);\n                    }\n\n                    return [\"values\"]\n                        .concat(parents.map(parent => parent.fieldId))\n                        .concat([params.field.fieldId])\n                        .join(\".\");\n                },\n                transform: value => {\n                    if (!transformPlugin) {\n                        return value;\n                    }\n                    return transformPlugin.transform({\n                        field,\n                        value\n                    });\n                }\n            };\n            const childFields = field.settings?.fields;\n            if (!childFields || childFields.length === 0) {\n                continue;\n            }\n            addFieldsToCollection(childFields, [\n                ...parents,\n                {\n                    fieldId: field.fieldId,\n                    multipleValues: field.multipleValues\n                }\n            ]);\n        }\n    };\n\n    addFieldsToCollection(fields);\n\n    return collection;\n};\n"],"mappings":"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"}

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

@@ -1,16 +1,15 @@
 import { CmsEntry, CmsEntryListWhere } from "@webiny/api-headless-cms/types";
 import { PluginsContainer } from "@webiny/plugins";
-import { Field, FilterItemFromStorage } from "./types";
+import { Field } from "./types";
 interface Params {
     items: CmsEntry[];
     where: Partial<CmsEntryListWhere>;
     plugins: PluginsContainer;
     fields: Record<string, Field>;
-    fromStorage: FilterItemFromStorage;
     fullTextSearch?: {
         term?: string;
         fields?: string[];
     };
 }
-export declare const filter: (params: Params) => Promise<CmsEntry[]>;
+export declare const filter: (params: Params) => CmsEntry[];
 export {};