@webiny/api-headless-cms-ddb 0.0.0-unstable.6e5425ee89 → 0.0.0-unstable.7f63ea0744

package/definitions/model.js

@@ -70,6 +70,11 @@ const createModelEntity = params => {
         type: "list",
         required: true
       },
+      tags: {
+        type: "list",
+        required: false,
+        default: []
+      },
       lockedFields: {
         type: "list",
         required: true

package/definitions/model.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelEntity","params","table","attributes","entityName","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","required","webinyVersion","modelId","locale","group","description","createdOn","savedOn","createdBy","fields","layout","lockedFields","titleFieldId","tenant"],"sources":["model.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\ninterface Params {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createModelEntity = (params: Params): Entity<any> => {\n    const { table, attributes, entityName } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\",\n                required: true\n            },\n            webinyVersion: {\n                type: \"string\",\n                required: true\n            },\n            name: {\n                type: \"string\",\n                required: true\n            },\n            modelId: {\n                type: \"string\",\n                required: true\n            },\n            locale: {\n                type: \"string\",\n                required: true\n            },\n            group: {\n                type: \"map\",\n                required: true\n            },\n            description: {\n                type: \"string\"\n            },\n            createdOn: {\n                type: \"string\",\n                required: true\n            },\n            savedOn: {\n                type: \"string\",\n                required: true\n            },\n            createdBy: {\n                type: \"map\",\n                required: true\n            },\n            fields: {\n                type: \"list\",\n                required: true\n            },\n            layout: {\n                type: \"list\",\n                required: true\n            },\n            lockedFields: {\n                type: \"list\",\n                required: true\n            },\n            titleFieldId: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\",\n                required: true\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AASO,MAAMA,iBAAiB,GAAIC,MAAc,IAAkB;EAC9D,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBF,KAAK;IACLC,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFC,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDC,aAAa,EAAE;QACXF,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDP,IAAI,EAAE;QACFM,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDE,OAAO,EAAE;QACLH,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDG,MAAM,EAAE;QACJJ,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDI,KAAK,EAAE;QACHL,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDK,WAAW,EAAE;QACTN,IAAI,EAAE;MACV,CAAC;MACDO,SAAS,EAAE;QACPP,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDO,OAAO,EAAE;QACLR,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDQ,SAAS,EAAE;QACPT,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDS,MAAM,EAAE;QACJV,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDU,MAAM,EAAE;QACJX,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDW,YAAY,EAAE;QACVZ,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDY,YAAY,EAAE;QACVb,IAAI,EAAE;MACV,CAAC;MACDc,MAAM,EAAE;QACJd,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd;IAAC,GACGV,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["createModelEntity","params","table","attributes","entityName","Entity","name","PK","partitionKey","SK","sortKey","TYPE","type","required","webinyVersion","modelId","locale","group","description","createdOn","savedOn","createdBy","fields","layout","tags","default","lockedFields","titleFieldId","tenant"],"sources":["model.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\ninterface Params {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createModelEntity = (params: Params): Entity<any> => {\n    const { table, attributes, entityName } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                partitionKey: true\n            },\n            SK: {\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\",\n                required: true\n            },\n            webinyVersion: {\n                type: \"string\",\n                required: true\n            },\n            name: {\n                type: \"string\",\n                required: true\n            },\n            modelId: {\n                type: \"string\",\n                required: true\n            },\n            locale: {\n                type: \"string\",\n                required: true\n            },\n            group: {\n                type: \"map\",\n                required: true\n            },\n            description: {\n                type: \"string\"\n            },\n            createdOn: {\n                type: \"string\",\n                required: true\n            },\n            savedOn: {\n                type: \"string\",\n                required: true\n            },\n            createdBy: {\n                type: \"map\",\n                required: true\n            },\n            fields: {\n                type: \"list\",\n                required: true\n            },\n            layout: {\n                type: \"list\",\n                required: true\n            },\n            tags: {\n                type: \"list\",\n                required: false,\n                default: []\n            },\n            lockedFields: {\n                type: \"list\",\n                required: true\n            },\n            titleFieldId: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\",\n                required: true\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AASO,MAAMA,iBAAiB,GAAIC,MAAc,IAAkB;EAC9D,MAAM;IAAEC,KAAK;IAAEC,UAAU;IAAEC;EAAW,CAAC,GAAGH,MAAM;EAChD,OAAO,IAAII,uBAAM,CAAC;IACdC,IAAI,EAAEF,UAAU;IAChBF,KAAK;IACLC,UAAU;MACNI,EAAE,EAAE;QACAC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAC,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFC,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDC,aAAa,EAAE;QACXF,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDP,IAAI,EAAE;QACFM,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDE,OAAO,EAAE;QACLH,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDG,MAAM,EAAE;QACJJ,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDI,KAAK,EAAE;QACHL,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDK,WAAW,EAAE;QACTN,IAAI,EAAE;MACV,CAAC;MACDO,SAAS,EAAE;QACPP,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDO,OAAO,EAAE;QACLR,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDQ,SAAS,EAAE;QACPT,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDS,MAAM,EAAE;QACJV,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDU,MAAM,EAAE;QACJX,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDW,IAAI,EAAE;QACFZ,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE,KAAK;QACfY,OAAO,EAAE;MACb,CAAC;MACDC,YAAY,EAAE;QACVd,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDc,YAAY,EAAE;QACVf,IAAI,EAAE;MACV,CAAC;MACDgB,MAAM,EAAE;QACJhB,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd;IAAC,GACGV,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}

package/dynamoDb/index.d.ts

@@ -1,2 +1,2 @@
-declare const _default: () => (import("@webiny/api-headless-cms").StorageTransformPlugin<any, any> | import("..").CmsEntryFieldFilterPathPlugin | import("../types").CmsFieldFilterValueTransformPlugin)[];
+declare const _default: () => (import("@webiny/api-headless-cms").StorageTransformPlugin<any, any, import("@webiny/api-headless-cms/types").CmsModelField> | import("..").CmsEntryFieldFilterPathPlugin | import("../types").CmsFieldFilterValueTransformPlugin)[];
 export default _default;

package/dynamoDb/storage/date.d.ts

@@ -1,2 +1,3 @@
 import { StorageTransformPlugin } from "@webiny/api-headless-cms";
-export declare const createDateStorageTransformPlugin: () => StorageTransformPlugin<any, any>;
+import { CmsModelField } from "@webiny/api-headless-cms/types";
+export declare const createDateStorageTransformPlugin: () => StorageTransformPlugin<any, any, CmsModelField>;

package/dynamoDb/storage/date.js

@@ -15,9 +15,16 @@ const excludeTypes = ["time", "dateTimeWithTimezone"];
 const convertFromStorage = (field, value) => {
   try {
     if (field.multipleValues) {
-      return (value || []).filter(v => !!v).map(v => {
-        return new Date(v);
-      });
+      const result = [];
+      for (const v of value) {
+        if (!v) {
+          continue;
+        }
+        try {
+          result.push(new Date(v));
+        } catch {}
+      }
+      return result;
     }
     return new Date(value);
   } catch {

package/dynamoDb/storage/date.js.map

@@ -1 +1 @@
-{"version":3,"names":["excludeTypes","convertFromStorage","field","value","multipleValues","filter","v","map","Date","console","log","convertValueToStorage","toISOString","WebinyError","fieldId","storageId","createDateStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","type","settings","includes","toStorage"],"sources":["date.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nconst excludeTypes = [\"time\", \"dateTimeWithTimezone\"];\n\nconst convertFromStorage = (field: CmsModelField, value: string | string[]) => {\n    try {\n        if (field.multipleValues) {\n            return ((value as string[]) || [])\n                .filter(v => !!v)\n                .map((v: string) => {\n                    return new Date(v);\n                });\n        }\n        return new Date(value as string);\n    } catch {\n        console.log(`Could not transform from storage for field type`);\n        return value;\n    }\n};\n\nconst convertValueToStorage = (field: CmsModelField, value: any): any => {\n    if ((value as any).toISOString) {\n        return (value as Date).toISOString();\n    } else if (typeof value === \"string\") {\n        return value as string;\n    }\n    throw new WebinyError(\"Error converting value to a storage type.\", \"TO_STORAGE_ERROR\", {\n        value: value,\n        fieldId: field.fieldId,\n        storageId: field.storageId\n    });\n};\n\nexport const createDateStorageTransformPlugin = () => {\n    return new StorageTransformPlugin({\n        fieldType: \"datetime\",\n        fromStorage: async ({ value, field }) => {\n            const { type } = field.settings || {};\n            if (!value || !type || excludeTypes.includes(type)) {\n                return value;\n            }\n            return convertFromStorage(field, value);\n        },\n        toStorage: async ({ value, field }) => {\n            const { type } = field.settings || {};\n            if (!value || !type || excludeTypes.includes(type)) {\n                return value;\n            }\n            if (field.multipleValues) {\n                const multipleValues = value as (string | Date | null | undefined)[];\n                return (multipleValues || [])\n                    .filter(v => !!v)\n                    .map(v => {\n                        return convertValueToStorage(field, v);\n                    });\n            }\n            if ((value as any).toISOString) {\n                return (value as Date).toISOString();\n            } else if (typeof value === \"string\") {\n                return value as string;\n            }\n            throw new WebinyError(\"Error converting value to a storage type.\", \"TO_STORAGE_ERROR\", {\n                value,\n                fieldId: field.fieldId,\n                storageId: field.storageId\n            });\n        }\n    });\n};\n"],"mappings":";;;;;;;AAGA;AACA;AAJA;AACA;AACA;;AAKA,MAAMA,YAAY,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC;AAErD,MAAMC,kBAAkB,GAAG,CAACC,KAAoB,EAAEC,KAAwB,KAAK;EAC3E,IAAI;IACA,IAAID,KAAK,CAACE,cAAc,EAAE;MACtB,OAAO,CAAED,KAAK,IAAiB,EAAE,EAC5BE,MAAM,CAACC,CAAC,IAAI,CAAC,CAACA,CAAC,CAAC,CAChBC,GAAG,CAAED,CAAS,IAAK;QAChB,OAAO,IAAIE,IAAI,CAACF,CAAC,CAAC;MACtB,CAAC,CAAC;IACV;IACA,OAAO,IAAIE,IAAI,CAACL,KAAK,CAAW;EACpC,CAAC,CAAC,MAAM;IACJM,OAAO,CAACC,GAAG,CAAE,iDAAgD,CAAC;IAC9D,OAAOP,KAAK;EAChB;AACJ,CAAC;AAED,MAAMQ,qBAAqB,GAAG,CAACT,KAAoB,EAAEC,KAAU,KAAU;EACrE,IAAKA,KAAK,CAASS,WAAW,EAAE;IAC5B,OAAQT,KAAK,CAAUS,WAAW,EAAE;EACxC,CAAC,MAAM,IAAI,OAAOT,KAAK,KAAK,QAAQ,EAAE;IAClC,OAAOA,KAAK;EAChB;EACA,MAAM,IAAIU,cAAW,CAAC,2CAA2C,EAAE,kBAAkB,EAAE;IACnFV,KAAK,EAAEA,KAAK;IACZW,OAAO,EAAEZ,KAAK,CAACY,OAAO;IACtBC,SAAS,EAAEb,KAAK,CAACa;EACrB,CAAC,CAAC;AACN,CAAC;AAEM,MAAMC,gCAAgC,GAAG,MAAM;EAClD,OAAO,IAAIC,sCAAsB,CAAC;IAC9BC,SAAS,EAAE,UAAU;IACrBC,WAAW,EAAE,OAAO;MAAEhB,KAAK;MAAED;IAAM,CAAC,KAAK;MACrC,MAAM;QAAEkB;MAAK,CAAC,GAAGlB,KAAK,CAACmB,QAAQ,IAAI,CAAC,CAAC;MACrC,IAAI,CAAClB,KAAK,IAAI,CAACiB,IAAI,IAAIpB,YAAY,CAACsB,QAAQ,CAACF,IAAI,CAAC,EAAE;QAChD,OAAOjB,KAAK;MAChB;MACA,OAAOF,kBAAkB,CAACC,KAAK,EAAEC,KAAK,CAAC;IAC3C,CAAC;IACDoB,SAAS,EAAE,OAAO;MAAEpB,KAAK;MAAED;IAAM,CAAC,KAAK;MACnC,MAAM;QAAEkB;MAAK,CAAC,GAAGlB,KAAK,CAACmB,QAAQ,IAAI,CAAC,CAAC;MACrC,IAAI,CAAClB,KAAK,IAAI,CAACiB,IAAI,IAAIpB,YAAY,CAACsB,QAAQ,CAACF,IAAI,CAAC,EAAE;QAChD,OAAOjB,KAAK;MAChB;MACA,IAAID,KAAK,CAACE,cAAc,EAAE;QACtB,MAAMA,cAAc,GAAGD,KAA6C;QACpE,OAAO,CAACC,cAAc,IAAI,EAAE,EACvBC,MAAM,CAACC,CAAC,IAAI,CAAC,CAACA,CAAC,CAAC,CAChBC,GAAG,CAACD,CAAC,IAAI;UACN,OAAOK,qBAAqB,CAACT,KAAK,EAAEI,CAAC,CAAC;QAC1C,CAAC,CAAC;MACV;MACA,IAAKH,KAAK,CAASS,WAAW,EAAE;QAC5B,OAAQT,KAAK,CAAUS,WAAW,EAAE;MACxC,CAAC,MAAM,IAAI,OAAOT,KAAK,KAAK,QAAQ,EAAE;QAClC,OAAOA,KAAK;MAChB;MACA,MAAM,IAAIU,cAAW,CAAC,2CAA2C,EAAE,kBAAkB,EAAE;QACnFV,KAAK;QACLW,OAAO,EAAEZ,KAAK,CAACY,OAAO;QACtBC,SAAS,EAAEb,KAAK,CAACa;MACrB,CAAC,CAAC;IACN;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["excludeTypes","convertFromStorage","field","value","multipleValues","result","v","push","Date","console","log","convertValueToStorage","toISOString","WebinyError","fieldId","storageId","createDateStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","type","settings","includes","toStorage","filter","map"],"sources":["date.ts"],"sourcesContent":["/**\n * File is @internal\n */\nimport WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\nimport { CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nconst excludeTypes = [\"time\", \"dateTimeWithTimezone\"];\n\nconst convertFromStorage = (\n    field: Pick<CmsModelField, \"multipleValues\">,\n    value: string | string[]\n) => {\n    try {\n        if (field.multipleValues) {\n            const result: Date[] = [];\n            for (const v of value) {\n                if (!v) {\n                    continue;\n                }\n                try {\n                    result.push(new Date(v));\n                } catch {}\n            }\n            return result;\n        }\n        return new Date(value as string);\n    } catch {\n        console.log(`Could not transform from storage for field type`);\n        return value;\n    }\n};\n\nconst convertValueToStorage = (field: CmsModelField, value: any): any => {\n    if ((value as any).toISOString) {\n        return (value as Date).toISOString();\n    } else if (typeof value === \"string\") {\n        return value as string;\n    }\n    throw new WebinyError(\"Error converting value to a storage type.\", \"TO_STORAGE_ERROR\", {\n        value: value,\n        fieldId: field.fieldId,\n        storageId: field.storageId\n    });\n};\n\nexport const createDateStorageTransformPlugin = () => {\n    return new StorageTransformPlugin({\n        fieldType: \"datetime\",\n        fromStorage: async ({ value, field }) => {\n            const { type } = field.settings || {};\n            if (!value || !type || excludeTypes.includes(type)) {\n                return value;\n            }\n            return convertFromStorage(field, value);\n        },\n        toStorage: async ({ value, field }) => {\n            const { type } = field.settings || {};\n            if (!value || !type || excludeTypes.includes(type)) {\n                return value;\n            }\n            if (field.multipleValues) {\n                const multipleValues = value as (string | Date | null | undefined)[];\n                return (multipleValues || [])\n                    .filter(v => !!v)\n                    .map(v => {\n                        return convertValueToStorage(field, v);\n                    });\n            }\n            if ((value as any).toISOString) {\n                return (value as Date).toISOString();\n            } else if (typeof value === \"string\") {\n                return value as string;\n            }\n            throw new WebinyError(\"Error converting value to a storage type.\", \"TO_STORAGE_ERROR\", {\n                value,\n                fieldId: field.fieldId,\n                storageId: field.storageId\n            });\n        }\n    });\n};\n"],"mappings":"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"}

package/dynamoDb/storage/longText.d.ts

@@ -7,4 +7,4 @@ export interface StorageValue {
     value: string;
     isArray?: boolean;
 }
-export declare const createLongTextStorageTransformPlugin: () => StorageTransformPlugin<string | string[], StorageValue>;
+export declare const createLongTextStorageTransformPlugin: () => StorageTransformPlugin<string | string[], StorageValue, import("@webiny/api-headless-cms/types").CmsModelField>;

package/dynamoDb/storage/longText.js

@@ -67,6 +67,12 @@ 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,MAAM;AACnB,MAAMC,mBAAmB,GAAG,QAAQ;AACpC,MAAMC,qBAAqB,GAAG,MAAM;AAEpC,MAAMC,eAAe,GAAIC,KAAsB,IAAa;EACxD,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE;IAC3B,OAAOC,MAAM,CAACC,IAAI,CAACF,KAAK,EAAEH,mBAAmB,CAAC;EAClD;EACA,OAAOG,KAAK;AAChB,CAAC;AAQM,MAAMG,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAsB,CAAkC;IAC/DC,SAAS,EAAE,WAAW;IACtBC,WAAW,EAAE,OAAO;MAAEC,KAAK;MAAEP,KAAK,EAAEQ;IAAa,CAAC,KAAK;MACnD,MAAMC,MAAM,GAAG,OAAOD,YAAY;MAClC,IACI,CAACA,YAAY,IACbC,MAAM,KAAK,QAAQ,IACnBA,MAAM,KAAK,QAAQ,IACnBC,KAAK,CAACC,OAAO,CAACH,YAAY,CAAC,KAAK,IAAI,EACtC;QACE,OAAOA,YAAY;MACvB,CAAC,MAAM,IAAIC,MAAM,KAAK,QAAQ,EAAE;QAC5B,MAAM,IAAIG,cAAW,CAChB,gFAA+EL,KAAK,CAACM,SAAU,OAAMN,KAAK,CAACO,OAAQ,GAAE,CACzH;MACL;MACA,MAAM;QAAEC,WAAW;QAAEf,KAAK;QAAEW;MAAQ,CAAC,GAAGH,YAAY;MACpD;AACZ;AACA;MACY,IAAI,CAACO,WAAW,EAAE;QACd,MAAM,IAAIH,cAAW,CAChB,2DACGL,KAAK,CAACM,SACT,OAAMN,KAAK,CAACO,OAAQ,OAAME,IAAI,CAACC,SAAS,CAACT,YAAY,CAAE,GAAE,EAC1D,qBAAqB,EACrB;UACIR,KAAK,EAAEQ;QACX,CAAC,CACJ;MACL,CAAC,MAAM,IAAIO,WAAW,KAAKnB,IAAI,EAAE;QAC7B,MAAM,IAAIgB,cAAW,CAChB,oEAAmE,EACpE,mBAAmB,EACnB;UACIG;QACJ,CAAC,CACJ;MACL;MACA,IAAI;QACA,MAAMG,GAAG,GAAG,MAAM,IAAAC,gBAAM,EAACpB,eAAe,CAACC,KAAK,CAAC,CAAC;QAChD,MAAMoB,MAAM,GAAGF,GAAG,CAACG,QAAQ,CAACvB,qBAAqB,CAAC;QAClD,IAAI,CAACa,OAAO,EAAE;UACV,OAAOS,MAAM;QACjB;QACA,OAAOJ,IAAI,CAACM,KAAK,CAACF,MAAM,CAAC;MAC7B,CAAC,CAAC,OAAOG,EAAE,EAAE;QACTC,OAAO,CAACC,GAAG,CAAC,qCAAqC,CAAC;QAClDD,OAAO,CAACC,GAAG,CAACF,EAAE,CAACG,OAAO,CAAC;QACvB,OAAO,EAAE;MACb;IACJ,CAAC;IACDC,SAAS,EAAE,OAAO;MAAE3B,KAAK,EAAE4B;IAAa,CAAC,KAAK;MAC1C,MAAMjB,OAAO,GAAGD,KAAK,CAACC,OAAO,CAACiB,YAAY,CAAC;MAC3C,MAAM5B,KAAK,GAAGW,OAAO,GAAGK,IAAI,CAACC,SAAS,CAACW,YAAY,CAAC,GAAGA,YAAY;MACnE,MAAMC,eAAe,GAAG,MAAM,IAAAC,cAAI,EAAC9B,KAAK,CAAC;MAEzC,MAAMoB,MAAoB,GAAG;QACzBL,WAAW,EAAEnB,IAAI;QACjBI,KAAK,EAAE6B,eAAe,CAACR,QAAQ,CAACxB,mBAAmB;MACvD,CAAC;MACD,IAAI,CAACc,OAAO,EAAE;QACV,OAAOS,MAAM;MACjB;MACAA,MAAM,CAACT,OAAO,GAAGA,OAAO;MACxB,OAAOS,MAAM;IACjB;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"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.d.ts

@@ -1,2 +1,2 @@
 import { StorageTransformPlugin } from "@webiny/api-headless-cms";
-export declare const createRichTextStorageTransformPlugin: () => StorageTransformPlugin<any, any>;
+export declare const createRichTextStorageTransformPlugin: () => StorageTransformPlugin<any, any, import("@webiny/api-headless-cms/types").CmsModelField>;

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,KAAU,IAAK;EACnC,IAAI,CAACA,KAAK,EAAE;IACR,OAAOA,KAAK;EAChB;EACA,IAAIC,OAAO,GAAGC,KAAK,CAACD,OAAO,CAACD,KAAK,CAAC;EAClC,MAAMG,aAAa,GAAGH,KAAK,YAAYE,KAAK,KAAK,KAAK,IAAID,OAAO;EACjE,IAAIE,aAAa,EAAE;IACfH,KAAK,GAAGE,KAAK,CAACE,IAAI,CAACJ,KAAK,CAAQ;IAChCC,OAAO,GAAG,IAAI;EAClB;EACA,IAAI,OAAOD,KAAK,KAAK,QAAQ,IAAIC,OAAO,EAAE;IACtC,KAAK,MAAMI,CAAC,IAAIL,KAAK,EAAE;MACnBA,KAAK,CAACK,CAAC,CAAC,GAAGN,cAAc,CAACC,KAAK,CAACK,CAAC,CAAC,CAAC;IACvC;EACJ;EACA,OAAOL,KAAK;AAChB,CAAC;AAEM,MAAMM,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAsB,CAAC;IAC9BC,SAAS,EAAE,WAAW;IACtBC,WAAW,EAAE,OAAO;MAAEC,KAAK;MAAEV,KAAK,EAAEW;IAAa,CAAC,KAAK;MACnD,IAAI,CAACA,YAAY,EAAE;QACf,OAAOA,YAAY;MACvB,CAAC,MAAM,IAAI,OAAOA,YAAY,KAAK,QAAQ,EAAE;QACzC,MAAM,IAAIC,cAAW,CAChB,gFAA+EF,KAAK,CAACG,SAAU,OAAMH,KAAK,CAACI,OAAQ,GAAE,CACzH;MACL;MACA;AACZ;AACA;AACA;MACY,IAAIH,YAAY,CAACI,cAAc,CAAC,aAAa,CAAC,KAAK,KAAK,EAAE;QACtD,OAAOJ,YAAY;MACvB;MACA,MAAM;QAAEK,WAAW;QAAEhB;MAAM,CAAC,GAAGW,YAAY;MAC3C,IAAI,CAACK,WAAW,EAAE;QACd,MAAM,IAAIJ,cAAW,CAChB,2DACGF,KAAK,CAACI,OACT,MAAKG,IAAI,CAACC,SAAS,CAACP,YAAY,CAAE,GAAE,EACrC,qBAAqB,EACrB;UACIX,KAAK,EAAEW;QACX,CAAC,CACJ;MACL;MACA,IAAIK,WAAW,KAAK,UAAU,EAAE;QAC5B,MAAM,IAAIJ,cAAW,CAChB,oEAAmE,EACpE,mBAAmB,EACnB;UACII;QACJ,CAAC,CACJ;MACL;MACA,IAAI;QACA,OAAOG,iBAAQ,CAACC,MAAM,CAACpB,KAAK,CAAC;MACjC,CAAC,CAAC,MAAM;QACJ,OAAO,IAAI;MACf;IACJ,CAAC;IACDqB,SAAS,EAAE,OAAO;MAAErB;IAAM,CAAC,KAAK;MAC5B;AACZ;AACA;AACA;MACY,IAAIA,KAAK,IAAIA,KAAK,CAACe,cAAc,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;QACvD,OAAOf,KAAK;MAChB;MACAA,KAAK,GAAGD,cAAc,CAACC,KAAK,CAAC;MAC7B,OAAO;QACHgB,WAAW,EAAE,UAAU;QACvBhB,KAAK,EAAEA,KAAK,GAAGmB,iBAAQ,CAACG,IAAI,CAACtB,KAAK,CAAC,GAAGA;MAC1C,CAAC;IACL;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"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,KAAU,IAAK;EACnC,IAAI,CAACA,KAAK,EAAE;IACR,OAAOA,KAAK;EAChB;EACA,IAAIC,OAAO,GAAGC,KAAK,CAACD,OAAO,CAACD,KAAK,CAAC;EAClC,MAAMG,aAAa,GAAGH,KAAK,YAAYE,KAAK,KAAK,KAAK,IAAID,OAAO;EACjE,IAAIE,aAAa,EAAE;IACfH,KAAK,GAAGE,KAAK,CAACE,IAAI,CAACJ,KAAK,CAAC;IACzBC,OAAO,GAAG,IAAI;EAClB;EACA,IAAI,OAAOD,KAAK,KAAK,QAAQ,IAAIC,OAAO,EAAE;IACtC,KAAK,MAAMI,CAAC,IAAIL,KAAK,EAAE;MACnBA,KAAK,CAACK,CAAC,CAAC,GAAGN,cAAc,CAACC,KAAK,CAACK,CAAC,CAAC,CAAC;IACvC;EACJ;EACA,OAAOL,KAAK;AAChB,CAAC;AAEM,MAAMM,oCAAoC,GAAG,MAAM;EACtD,OAAO,IAAIC,sCAAsB,CAAC;IAC9BC,SAAS,EAAE,WAAW;IACtBC,WAAW,EAAE,OAAO;MAAEC,KAAK;MAAEV,KAAK,EAAEW;IAAa,CAAC,KAAK;MACnD,IAAI,CAACA,YAAY,EAAE;QACf,OAAOA,YAAY;MACvB,CAAC,MAAM,IAAI,OAAOA,YAAY,KAAK,QAAQ,EAAE;QACzC,MAAM,IAAIC,cAAW,CAChB,gFAA+EF,KAAK,CAACG,SAAU,OAAMH,KAAK,CAACI,OAAQ,GAAE,CACzH;MACL;MACA;AACZ;AACA;AACA;MACY,IAAIH,YAAY,CAACI,cAAc,CAAC,aAAa,CAAC,KAAK,KAAK,EAAE;QACtD,OAAOJ,YAAY;MACvB;MACA,MAAM;QAAEK,WAAW;QAAEhB;MAAM,CAAC,GAAGW,YAAY;MAC3C,IAAI,CAACK,WAAW,EAAE;QACd,MAAM,IAAIJ,cAAW,CAChB,2DACGF,KAAK,CAACI,OACT,MAAKG,IAAI,CAACC,SAAS,CAACP,YAAY,CAAE,GAAE,EACrC,qBAAqB,EACrB;UACIX,KAAK,EAAEW;QACX,CAAC,CACJ;MACL;MACA,IAAIK,WAAW,KAAK,UAAU,EAAE;QAC5B,MAAM,IAAIJ,cAAW,CAChB,oEAAmE,EACpE,mBAAmB,EACnB;UACII;QACJ,CAAC,CACJ;MACL;MACA,IAAI;QACA,OAAOG,iBAAQ,CAACC,MAAM,CAACpB,KAAK,CAAC;MACjC,CAAC,CAAC,MAAM;QACJ,OAAO,IAAI;MACf;IACJ,CAAC;IACDqB,SAAS,EAAE,OAAO;MAAErB;IAAM,CAAC,KAAK;MAC5B;AACZ;AACA;AACA;MACY,IAAIA,KAAK,IAAIA,KAAK,CAACe,cAAc,CAAC,aAAa,CAAC,KAAK,IAAI,EAAE;QACvD,OAAOf,KAAK;MAChB;MACAA,KAAK,GAAGD,cAAc,CAACC,KAAK,CAAC;MAC7B,OAAO;QACHgB,WAAW,EAAE,UAAU;QACvBhB,KAAK,EAAEA,KAAK,GAAGmB,iBAAQ,CAACG,IAAI,CAACtB,KAAK,CAAC,GAAGA;MAC1C,CAAC;IACL;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/index.js

@@ -23,15 +23,16 @@ var _settings2 = require("./operations/settings");
 var _group2 = require("./operations/group");
 var _model2 = require("./operations/model");
 var _entry2 = require("./operations/entry");
-var _plugins2 = require("./plugins");
-Object.keys(_plugins2).forEach(function (key) {
+var _plugins2 = require("./operations/entry/filtering/plugins");
+var _plugins3 = require("./plugins");
+Object.keys(_plugins3).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _plugins2[key]) return;
+  if (key in exports && exports[key] === _plugins3[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function () {
-      return _plugins2[key];
+      return _plugins3[key];
     }
   });
 });
@@ -82,18 +83,28 @@ const createStorageOperations = params => {
    * Field plugins for DynamoDB.
    */
   (0, _dynamoDb.default)(),
+  /**
+   * Filter create plugins.
+   */
+  (0, _plugins2.createFilterCreatePlugins)(),
   /**
    * User defined custom plugins.
    */
   ...(userPlugins || [])]);
   return {
+    name: "dynamodb",
     beforeInit: async context => {
       /**
        * Collect all required plugins from parent context.
        */
       const fieldPlugins = context.plugins.byType("cms-model-field-to-graphql");
       plugins.register(fieldPlugins);
-
+      const filterPathPlugins = context.plugins.byType(_plugins3.CmsEntryFieldFilterPathPlugin.type);
+      plugins.register(filterPathPlugins);
+      const filterPlugins = context.plugins.byType(_plugins3.CmsEntryFieldFilterPlugin.type);
+      plugins.register(filterPlugins);
+      const sortingPlugins = context.plugins.byType(_plugins3.CmsEntryFieldSortingPlugin.type);
+      plugins.register(sortingPlugins);
       /**
        * Pass the plugins to the parent context.
        */

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createStorageOperations","params","attributes","table","documentClient","plugins","userPlugins","tableInstance","createTable","entities","settings","createSettingsEntity","entityName","ENTITIES","SETTINGS","system","createSystemEntity","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","PluginsContainer","dynamoDbValueFilters","dynamoDbPlugins","beforeInit","context","fieldPlugins","byType","register","getEntities","getTable","createSystemStorageOperations","entity","createSettingsStorageOperations","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport { ENTITIES, StorageOperationsFactory } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createSystemStorageOperations } from \"~/operations/system\";\nimport { createSettingsStorageOperations } from \"~/operations/settings\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport { createModelsStorageOperations } from \"~/operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\nimport { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\n\nexport * from \"./plugins\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { attributes, table, documentClient, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n\n    const entities = {\n        settings: createSettingsEntity({\n            entityName: ENTITIES.SETTINGS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}\n        }),\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.GROUPS] : {}\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.MODELS] : {}\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES] : {}\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * User defined custom plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        beforeInit: async context => {\n            /**\n             * Collect all required plugins from parent context.\n             */\n            const fieldPlugins = context.plugins.byType<CmsModelFieldToGraphQLPlugin>(\n                \"cms-model-field-to-graphql\"\n            );\n            plugins.register(fieldPlugins);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        system: createSystemStorageOperations({\n            entity: entities.system\n        }),\n        settings: createSettingsStorageOperations({\n            entity: entities.settings\n        }),\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models\n        }),\n        entries: createEntriesStorageOperations({\n            entity: entities.entries,\n            plugins\n        })\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createStorageOperations","params","attributes","table","documentClient","plugins","userPlugins","tableInstance","createTable","entities","settings","createSettingsEntity","entityName","ENTITIES","SETTINGS","system","createSystemEntity","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","PluginsContainer","dynamoDbValueFilters","dynamoDbPlugins","createFilterCreatePlugins","name","beforeInit","context","fieldPlugins","byType","register","filterPathPlugins","CmsEntryFieldFilterPathPlugin","type","filterPlugins","CmsEntryFieldFilterPlugin","sortingPlugins","CmsEntryFieldSortingPlugin","getEntities","getTable","createSystemStorageOperations","entity","createSettingsStorageOperations","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport { ENTITIES, StorageOperationsFactory } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createSystemStorageOperations } from \"~/operations/system\";\nimport { createSettingsStorageOperations } from \"~/operations/settings\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport { createModelsStorageOperations } from \"~/operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\nimport { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\n\nimport { createFilterCreatePlugins } from \"~/operations/entry/filtering/plugins\";\nimport {\n    CmsEntryFieldFilterPathPlugin,\n    CmsEntryFieldFilterPlugin,\n    CmsEntryFieldSortingPlugin\n} from \"~/plugins\";\n\nexport * from \"./plugins\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const { attributes, table, documentClient, plugins: userPlugins } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n\n    const entities = {\n        settings: createSettingsEntity({\n            entityName: ENTITIES.SETTINGS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SETTINGS] : {}\n        }),\n        system: createSystemEntity({\n            entityName: ENTITIES.SYSTEM,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.SYSTEM] : {}\n        }),\n        groups: createGroupEntity({\n            entityName: ENTITIES.GROUPS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.GROUPS] : {}\n        }),\n        models: createModelEntity({\n            entityName: ENTITIES.MODELS,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.MODELS] : {}\n        }),\n        entries: createEntryEntity({\n            entityName: ENTITIES.ENTRIES,\n            table: tableInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES] : {}\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Filter create plugins.\n         */\n        createFilterCreatePlugins(),\n        /**\n         * User defined custom plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        name: \"dynamodb\",\n        beforeInit: async context => {\n            /**\n             * Collect all required plugins from parent context.\n             */\n            const fieldPlugins = context.plugins.byType<CmsModelFieldToGraphQLPlugin>(\n                \"cms-model-field-to-graphql\"\n            );\n            plugins.register(fieldPlugins);\n\n            const filterPathPlugins = context.plugins.byType<CmsEntryFieldFilterPathPlugin>(\n                CmsEntryFieldFilterPathPlugin.type\n            );\n            plugins.register(filterPathPlugins);\n\n            const filterPlugins = context.plugins.byType<CmsEntryFieldFilterPlugin>(\n                CmsEntryFieldFilterPlugin.type\n            );\n            plugins.register(filterPlugins);\n\n            const sortingPlugins = context.plugins.byType<CmsEntryFieldSortingPlugin>(\n                CmsEntryFieldSortingPlugin.type\n            );\n            plugins.register(sortingPlugins);\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        system: createSystemStorageOperations({\n            entity: entities.system\n        }),\n        settings: createSettingsStorageOperations({\n            entity: entities.settings\n        }),\n        groups: createGroupsStorageOperations({\n            entity: entities.groups,\n            plugins\n        }),\n        models: createModelsStorageOperations({\n            entity: entities.models\n        }),\n        entries: createEntriesStorageOperations({\n            entity: entities.entries,\n            plugins\n        })\n    };\n};\n"],"mappings":"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"}

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

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

package/operations/entry/filtering/createExpressions.js

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

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

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

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

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

package/operations/entry/filtering/createFields.js

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