@webiny/api-headless-cms-ddb-es 0.0.0-unstable.990c3ab1b6 → 0.0.0-unstable.bca7b3e350

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\nexport interface CreateModelEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createModelEntity = (params: CreateModelEntityParams): 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,MAA+B,IAAkB;EAC/E,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\nexport interface CreateModelEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\n\nexport const createModelEntity = (params: CreateModelEntityParams): 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,MAA+B,IAAkB;EAC/E,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>[];
+declare const _default: () => import("@webiny/api-headless-cms").StorageTransformPlugin<any, any, import("@webiny/api-headless-cms/types").CmsModelField>[];
 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.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","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\ntype PartialCmsModelField = Pick<CmsModelField, \"fieldId\" | \"storageId\" | \"multipleValues\">;\n\nconst excludeTypes = [\"time\", \"dateTimeWithTimezone\"];\n\nconst convertFromStorage = (field: PartialCmsModelField, 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: PartialCmsModelField, 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;;AAOA,MAAMA,YAAY,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC;AAErD,MAAMC,kBAAkB,GAAG,CAACC,KAA2B,EAAEC,KAAwB,KAAK;EAClF,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,KAA2B,EAAEC,KAAU,KAAU;EAC5E,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"}

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

@@ -4,4 +4,4 @@ export interface StorageValue {
     compression: string;
     value: any;
 }
-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

@@ -47,23 +47,24 @@ const createRichTextStorageTransformPlugin = () => {
        * This is to circumvent a bug introduced with 5.8.0 storage operations.
        * Do not remove.
        */
-      if (storageValue.hasOwnProperty("compression") === false) {
+      if (!storageValue["compression"]) {
         return storageValue;
       }
       const {
         compression,
         value
       } = storageValue;
-      if (!compression) {
-        throw new _error.default(`Missing compression in "fromStorage" function in field "${field.storageId}": ${JSON.stringify(storageValue)}.`, "MISSING_COMPRESSION", {
-          value: storageValue
-        });
-      }
       if (compression !== "jsonpack") {
         throw new _error.default(`This plugin cannot transform something not packed with "jsonpack".`, "WRONG_COMPRESSION", {
           compression
         });
       }
+      /**
+       * No point in going further if no value.
+       */
+      if (!value) {
+        return null;
+      }
       try {
         return _jsonpack.default.unpack(value);
       } catch (ex) {
@@ -78,11 +79,12 @@ const createRichTextStorageTransformPlugin = () => {
     toStorage: async ({
       value
     }) => {
+      var _value;
       /**
        * There is a possibility that we are trying to compress already compressed value.
        * Introduced a bug with 5.8.0 storage operations, so just return the value to correct it.
        */
-      if (value && value.hasOwnProperty("compression") === true) {
+      if (!!((_value = value) !== null && _value !== void 0 && _value.compression)) {
         return value;
       }
       value = transformArray(value);

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","hasOwnProperty","compression","JSON","stringify","jsonpack","unpack","ex","process","env","DEBUG","console","log","message","toStorage","jsonValue","pack"],"sources":["richText.ts"],"sourcesContent":["import jsonpack from \"jsonpack\";\nimport WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\nexport type OriginalValue = Record<string, any> | any[];\n\nexport interface StorageValue {\n    compression: string;\n    value: any;\n}\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}\".`\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.storageId\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 (ex) {\n                if (process.env.DEBUG !== \"true\") {\n                    return null;\n                }\n                console.log(\"Error while decompressing rich-text.\");\n                console.log(ex.message);\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\n            let jsonValue: string | null = null;\n            try {\n                jsonValue = jsonpack.pack(value);\n            } catch (ex) {\n                if (process.env.DEBUG !== \"true\") {\n                    return null;\n                }\n                console.log(\"Error while compressing rich-text.\");\n                console.log(ex.message);\n            }\n            return {\n                compression: \"jsonpack\",\n                value: jsonValue\n            };\n        }\n    });\n};\n"],"mappings":"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"}
+{"version":3,"names":["transformArray","value","isArray","Array","shouldBeArray","from","k","createRichTextStorageTransformPlugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","WebinyError","storageId","compression","jsonpack","unpack","ex","process","env","DEBUG","console","log","message","toStorage","jsonValue","pack"],"sources":["richText.ts"],"sourcesContent":["import jsonpack from \"jsonpack\";\nimport WebinyError from \"@webiny/error\";\nimport { StorageTransformPlugin } from \"@webiny/api-headless-cms\";\n\nexport type OriginalValue = Record<string, any> | any[];\n\nexport interface StorageValue {\n    compression: string;\n    value: any;\n}\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}\".`\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[\"compression\"]) {\n                return storageValue;\n            }\n            const { compression, value } = storageValue;\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            /**\n             * No point in going further if no value.\n             */\n            if (!value) {\n                return null;\n            }\n            try {\n                return jsonpack.unpack(value);\n            } catch (ex) {\n                if (process.env.DEBUG !== \"true\") {\n                    return null;\n                }\n                console.log(\"Error while decompressing rich-text.\");\n                console.log(ex.message);\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?.compression) {\n                return value as any;\n            }\n            value = transformArray(value);\n\n            let jsonValue: string | null = null;\n            try {\n                jsonValue = jsonpack.pack(value);\n            } catch (ex) {\n                if (process.env.DEBUG !== \"true\") {\n                    return null;\n                }\n                console.log(\"Error while compressing rich-text.\");\n                console.log(ex.message);\n            }\n            return {\n                compression: \"jsonpack\",\n                value: jsonValue\n            };\n        }\n    });\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AASA;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,IAAG,CACtG;MACL;MACA;AACZ;AACA;AACA;MACY,IAAI,CAACF,YAAY,CAAC,aAAa,CAAC,EAAE;QAC9B,OAAOA,YAAY;MACvB;MACA,MAAM;QAAEG,WAAW;QAAEd;MAAM,CAAC,GAAGW,YAAY;MAC3C,IAAIG,WAAW,KAAK,UAAU,EAAE;QAC5B,MAAM,IAAIF,cAAW,CAChB,oEAAmE,EACpE,mBAAmB,EACnB;UACIE;QACJ,CAAC,CACJ;MACL;MACA;AACZ;AACA;MACY,IAAI,CAACd,KAAK,EAAE;QACR,OAAO,IAAI;MACf;MACA,IAAI;QACA,OAAOe,iBAAQ,CAACC,MAAM,CAAChB,KAAK,CAAC;MACjC,CAAC,CAAC,OAAOiB,EAAE,EAAE;QACT,IAAIC,OAAO,CAACC,GAAG,CAACC,KAAK,KAAK,MAAM,EAAE;UAC9B,OAAO,IAAI;QACf;QACAC,OAAO,CAACC,GAAG,CAAC,sCAAsC,CAAC;QACnDD,OAAO,CAACC,GAAG,CAACL,EAAE,CAACM,OAAO,CAAC;QACvB,OAAO,IAAI;MACf;IACJ,CAAC;IACDC,SAAS,EAAE,OAAO;MAAExB;IAAM,CAAC,KAAK;MAAA;MAC5B;AACZ;AACA;AACA;MACY,IAAI,CAAC,YAACA,KAAK,mCAAL,OAAOc,WAAW,GAAE;QACtB,OAAOd,KAAK;MAChB;MACAA,KAAK,GAAGD,cAAc,CAACC,KAAK,CAAC;MAE7B,IAAIyB,SAAwB,GAAG,IAAI;MACnC,IAAI;QACAA,SAAS,GAAGV,iBAAQ,CAACW,IAAI,CAAC1B,KAAK,CAAC;MACpC,CAAC,CAAC,OAAOiB,EAAE,EAAE;QACT,IAAIC,OAAO,CAACC,GAAG,CAACC,KAAK,KAAK,MAAM,EAAE;UAC9B,OAAO,IAAI;QACf;QACAC,OAAO,CAACC,GAAG,CAAC,oCAAoC,CAAC;QACjDD,OAAO,CAACC,GAAG,CAACL,EAAE,CAACM,OAAO,CAAC;MAC3B;MACA,OAAO;QACHT,WAAW,EAAE,UAAU;QACvBd,KAAK,EAAEyB;MACX,CAAC;IACL;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/elasticsearch/indexing/defaultFieldIndexing.js

@@ -37,7 +37,16 @@ var _default = () => ({
     const {
       isSearchable
     } = getFieldTypePlugin(field.type);
-    return isSearchable === true ? value : rawValue;
+    /**
+     * We will return the rawValue in case if not searchable and value in case of not searchable field.
+     * This is to make sure that changed isSearchable parameter does not make the data to be null / undefined.
+     *
+     * Users can change isSearchable parameter at any time on the GraphQL field - and that could create a problem for them.
+     */
+    if (isSearchable) {
+      return value === undefined ? rawValue : value;
+    }
+    return rawValue === undefined ? value : rawValue;
   }
 });
 exports.default = _default;

package/elasticsearch/indexing/defaultFieldIndexing.js.map

@@ -1 +1 @@
-{"version":3,"names":["type","name","fieldType","toIndex","field","getFieldTypePlugin","value","fieldTypePlugin","isSearchable","rawValue","fromIndex"],"sources":["defaultFieldIndexing.ts"],"sourcesContent":["import { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-default\",\n    fieldType: \"*\",\n    toIndex({ field, getFieldTypePlugin, value }) {\n        const fieldTypePlugin = getFieldTypePlugin(field.type);\n\n        // when field is searchable, assign it to `values`\n        if (fieldTypePlugin.isSearchable === true) {\n            return { value };\n        }\n\n        // when field is not searchable, move its value to `rawValues`.\n        // `rawValues` is a field in ES index that's not being indexed.\n        return { rawValue: value };\n    },\n    fromIndex({ field, getFieldTypePlugin, value, rawValue }) {\n        const { isSearchable } = getFieldTypePlugin(field.type);\n\n        return isSearchable === true ? value : rawValue;\n    }\n});\n"],"mappings":";;;;;;eAEe,OAA2C;EACtDA,IAAI,EAAE,mCAAmC;EACzCC,IAAI,EAAE,2CAA2C;EACjDC,SAAS,EAAE,GAAG;EACdC,OAAO,CAAC;IAAEC,KAAK;IAAEC,kBAAkB;IAAEC;EAAM,CAAC,EAAE;IAC1C,MAAMC,eAAe,GAAGF,kBAAkB,CAACD,KAAK,CAACJ,IAAI,CAAC;;IAEtD;IACA,IAAIO,eAAe,CAACC,YAAY,KAAK,IAAI,EAAE;MACvC,OAAO;QAAEF;MAAM,CAAC;IACpB;;IAEA;IACA;IACA,OAAO;MAAEG,QAAQ,EAAEH;IAAM,CAAC;EAC9B,CAAC;EACDI,SAAS,CAAC;IAAEN,KAAK;IAAEC,kBAAkB;IAAEC,KAAK;IAAEG;EAAS,CAAC,EAAE;IACtD,MAAM;MAAED;IAAa,CAAC,GAAGH,kBAAkB,CAACD,KAAK,CAACJ,IAAI,CAAC;IAEvD,OAAOQ,YAAY,KAAK,IAAI,GAAGF,KAAK,GAAGG,QAAQ;EACnD;AACJ,CAAC,CAAC;AAAA"}
+{"version":3,"names":["type","name","fieldType","toIndex","field","getFieldTypePlugin","value","fieldTypePlugin","isSearchable","rawValue","fromIndex","undefined"],"sources":["defaultFieldIndexing.ts"],"sourcesContent":["import { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-default\",\n    fieldType: \"*\",\n    toIndex({ field, getFieldTypePlugin, value }) {\n        const fieldTypePlugin = getFieldTypePlugin(field.type);\n\n        // when field is searchable, assign it to `values`\n        if (fieldTypePlugin.isSearchable === true) {\n            return { value };\n        }\n\n        // when field is not searchable, move its value to `rawValues`.\n        // `rawValues` is a field in ES index that's not being indexed.\n        return { rawValue: value };\n    },\n    fromIndex({ field, getFieldTypePlugin, value, rawValue }) {\n        const { isSearchable } = getFieldTypePlugin(field.type);\n        /**\n         * We will return the rawValue in case if not searchable and value in case of not searchable field.\n         * This is to make sure that changed isSearchable parameter does not make the data to be null / undefined.\n         *\n         * Users can change isSearchable parameter at any time on the GraphQL field - and that could create a problem for them.\n         */\n        if (isSearchable) {\n            return value === undefined ? rawValue : value;\n        }\n        return rawValue === undefined ? value : rawValue;\n    }\n});\n"],"mappings":";;;;;;eAEe,OAA2C;EACtDA,IAAI,EAAE,mCAAmC;EACzCC,IAAI,EAAE,2CAA2C;EACjDC,SAAS,EAAE,GAAG;EACdC,OAAO,CAAC;IAAEC,KAAK;IAAEC,kBAAkB;IAAEC;EAAM,CAAC,EAAE;IAC1C,MAAMC,eAAe,GAAGF,kBAAkB,CAACD,KAAK,CAACJ,IAAI,CAAC;;IAEtD;IACA,IAAIO,eAAe,CAACC,YAAY,KAAK,IAAI,EAAE;MACvC,OAAO;QAAEF;MAAM,CAAC;IACpB;;IAEA;IACA;IACA,OAAO;MAAEG,QAAQ,EAAEH;IAAM,CAAC;EAC9B,CAAC;EACDI,SAAS,CAAC;IAAEN,KAAK;IAAEC,kBAAkB;IAAEC,KAAK;IAAEG;EAAS,CAAC,EAAE;IACtD,MAAM;MAAED;IAAa,CAAC,GAAGH,kBAAkB,CAACD,KAAK,CAACJ,IAAI,CAAC;IACvD;AACR;AACA;AACA;AACA;AACA;IACQ,IAAIQ,YAAY,EAAE;MACd,OAAOF,KAAK,KAAKK,SAAS,GAAGF,QAAQ,GAAGH,KAAK;IACjD;IACA,OAAOG,QAAQ,KAAKE,SAAS,GAAGL,KAAK,GAAGG,QAAQ;EACpD;AACJ,CAAC,CAAC;AAAA"}

package/elasticsearch/indexing/longTextIndexing.d.ts

@@ -1,3 +1,7 @@
 import { CmsModelFieldToElasticsearchPlugin } from "../../types";
+/**
+ * The long-text indexing plugin must take in consideration that users might have list of long-text fields.
+ * Also, we used to encode values, and we do not do that anymore - but we need to have backward compatibility.
+ */
 declare const _default: () => CmsModelFieldToElasticsearchPlugin;
 export default _default;

package/elasticsearch/indexing/longTextIndexing.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+/**
+ * The long-text indexing plugin must take in consideration that users might have list of long-text fields.
+ * Also, we used to encode values, and we do not do that anymore - but we need to have backward compatibility.
+ */
 var _default = () => ({
   type: "cms-model-field-to-elastic-search",
   name: "cms-model-field-to-elastic-search-long-text",
@@ -12,19 +16,30 @@ var _default = () => ({
     rawValue
   }) {
     /**
-     * We want to store the value (rawValue) from entry before it was prepared for storage as value to be searched on.
-     * And we want to store prepared value into rawValue so it is not indexed.
+     * We take the raw value, before it was prepared via `transformToStorage` for storage (there might be some transform due to DynamoDB) and store it in the Elasticsearch to be indexed.
      */
     return {
-      value: rawValue ? encodeURIComponent(rawValue) : ""
+      /**
+       * // TODO @Bruno validate and test
+       * I have no idea why we encoded the raw value. We will see in testing and when upgrading our test projects.
+       * // TODO remove comments when tested and verified.
+       */
+      // value: rawValue ? encodeURIComponent(rawValue) : "",
+      value: Array.isArray(rawValue) ? rawValue : rawValue || ""
     };
   },
   /**
-   * When extracting from index, we can return the value that was stored to be searched - and then no decompression will be required.
+   * When taking value from the index, we can return the original value.
+   * At that point the `transformFromStorage` does not need to do anything.
+   *
+   * We need to decode to support older systems.
    */
   fromIndex({
     value
   }) {
+    if (Array.isArray(value)) {
+      return value.map(decodeURIComponent);
+    }
     return value ? decodeURIComponent(value) : "";
   }
 });

package/elasticsearch/indexing/longTextIndexing.js.map

@@ -1 +1 @@
-{"version":3,"names":["type","name","fieldType","toIndex","rawValue","value","encodeURIComponent","fromIndex","decodeURIComponent"],"sources":["longTextIndexing.ts"],"sourcesContent":["import { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-long-text\",\n    fieldType: \"long-text\",\n    toIndex({ rawValue }) {\n        /**\n         * We want to store the value (rawValue) from entry before it was prepared for storage as value to be searched on.\n         * And we want to store prepared value into rawValue so it is not indexed.\n         */\n        return {\n            value: rawValue ? encodeURIComponent(rawValue) : \"\"\n        };\n    },\n    /**\n     * When extracting from index, we can return the value that was stored to be searched - and then no decompression will be required.\n     */\n    fromIndex({ value }) {\n        return value ? decodeURIComponent(value) : \"\";\n    }\n});\n"],"mappings":";;;;;;eAEe,OAA2C;EACtDA,IAAI,EAAE,mCAAmC;EACzCC,IAAI,EAAE,6CAA6C;EACnDC,SAAS,EAAE,WAAW;EACtBC,OAAO,CAAC;IAAEC;EAAS,CAAC,EAAE;IAClB;AACR;AACA;AACA;IACQ,OAAO;MACHC,KAAK,EAAED,QAAQ,GAAGE,kBAAkB,CAACF,QAAQ,CAAC,GAAG;IACrD,CAAC;EACL,CAAC;EACD;AACJ;AACA;EACIG,SAAS,CAAC;IAAEF;EAAM,CAAC,EAAE;IACjB,OAAOA,KAAK,GAAGG,kBAAkB,CAACH,KAAK,CAAC,GAAG,EAAE;EACjD;AACJ,CAAC,CAAC;AAAA"}
+{"version":3,"names":["type","name","fieldType","toIndex","rawValue","value","Array","isArray","fromIndex","map","decodeURIComponent"],"sources":["longTextIndexing.ts"],"sourcesContent":["import { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\n/**\n * The long-text indexing plugin must take in consideration that users might have list of long-text fields.\n * Also, we used to encode values, and we do not do that anymore - but we need to have backward compatibility.\n */\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-long-text\",\n    fieldType: \"long-text\",\n    toIndex({ rawValue }) {\n        /**\n         * We take the raw value, before it was prepared via `transformToStorage` for storage (there might be some transform due to DynamoDB) and store it in the Elasticsearch to be indexed.\n         */\n        return {\n            /**\n             * // TODO @Bruno validate and test\n             * I have no idea why we encoded the raw value. We will see in testing and when upgrading our test projects.\n             * // TODO remove comments when tested and verified.\n             */\n            // value: rawValue ? encodeURIComponent(rawValue) : \"\",\n            value: Array.isArray(rawValue) ? rawValue : rawValue || \"\"\n        };\n    },\n    /**\n     * When taking value from the index, we can return the original value.\n     * At that point the `transformFromStorage` does not need to do anything.\n     *\n     * We need to decode to support older systems.\n     */\n    fromIndex({ value }) {\n        if (Array.isArray(value)) {\n            return value.map(decodeURIComponent);\n        }\n        return value ? decodeURIComponent(value) : \"\";\n    }\n});\n"],"mappings":";;;;;;AAEA;AACA;AACA;AACA;AAHA,eAIe,OAA2C;EACtDA,IAAI,EAAE,mCAAmC;EACzCC,IAAI,EAAE,6CAA6C;EACnDC,SAAS,EAAE,WAAW;EACtBC,OAAO,CAAC;IAAEC;EAAS,CAAC,EAAE;IAClB;AACR;AACA;IACQ,OAAO;MACH;AACZ;AACA;AACA;AACA;MACY;MACAC,KAAK,EAAEC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,GAAGA,QAAQ,GAAGA,QAAQ,IAAI;IAC5D,CAAC;EACL,CAAC;EACD;AACJ;AACA;AACA;AACA;AACA;EACII,SAAS,CAAC;IAAEH;EAAM,CAAC,EAAE;IACjB,IAAIC,KAAK,CAACC,OAAO,CAACF,KAAK,CAAC,EAAE;MACtB,OAAOA,KAAK,CAACI,GAAG,CAACC,kBAAkB,CAAC;IACxC;IACA,OAAOL,KAAK,GAAGK,kBAAkB,CAACL,KAAK,CAAC,GAAG,EAAE;EACjD;AACJ,CAAC,CAAC;AAAA"}

package/elasticsearch/search/refSearch.js

@@ -14,8 +14,10 @@ const createPath = ({
   }
   return `${field.storageId}.entryId`;
 };
-const transform = params => {
-  return params.value;
+const transform = ({
+  value
+}) => {
+  return value;
 };
 const createRefSearchPlugin = () => {
   return new _CmsEntryElasticsearchQueryBuilderValueSearchPlugin.CmsEntryElasticsearchQueryBuilderValueSearchPlugin({

package/elasticsearch/search/refSearch.js.map

@@ -1 +1 @@
-{"version":3,"names":["createPath","field","key","match","storageId","transform","params","value","createRefSearchPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","fieldType","path"],"sources":["refSearch.ts"],"sourcesContent":["import {\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CreatePathCallable,\n    TransformCallable\n} from \"~/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin\";\n\nconst createPath: CreatePathCallable<string> = ({ field, key }) => {\n    if (key && key.match(\"entryId\") === null) {\n        return `${field.storageId}.id`;\n    }\n    return `${field.storageId}.entryId`;\n};\n\nconst transform: TransformCallable<string> = params => {\n    return params.value;\n};\n\nexport const createRefSearchPlugin = (): CmsEntryElasticsearchQueryBuilderValueSearchPlugin => {\n    return new CmsEntryElasticsearchQueryBuilderValueSearchPlugin({\n        fieldType: \"ref\",\n        path: createPath,\n        transform\n    });\n};\n"],"mappings":";;;;;;AAAA;AAMA,MAAMA,UAAsC,GAAG,CAAC;EAAEC,KAAK;EAAEC;AAAI,CAAC,KAAK;EAC/D,IAAIA,GAAG,IAAIA,GAAG,CAACC,KAAK,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;IACtC,OAAQ,GAAEF,KAAK,CAACG,SAAU,KAAI;EAClC;EACA,OAAQ,GAAEH,KAAK,CAACG,SAAU,UAAS;AACvC,CAAC;AAED,MAAMC,SAAoC,GAAGC,MAAM,IAAI;EACnD,OAAOA,MAAM,CAACC,KAAK;AACvB,CAAC;AAEM,MAAMC,qBAAqB,GAAG,MAA0D;EAC3F,OAAO,IAAIC,sGAAkD,CAAC;IAC1DC,SAAS,EAAE,KAAK;IAChBC,IAAI,EAAEX,UAAU;IAChBK;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["createPath","field","key","match","storageId","transform","value","createRefSearchPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","fieldType","path"],"sources":["refSearch.ts"],"sourcesContent":["import {\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CreatePathCallable,\n    TransformCallable\n} from \"~/plugins/CmsEntryElasticsearchQueryBuilderValueSearchPlugin\";\n\nconst createPath: CreatePathCallable<string> = ({ field, key }) => {\n    if (key && key.match(\"entryId\") === null) {\n        return `${field.storageId}.id`;\n    }\n    return `${field.storageId}.entryId`;\n};\n\nconst transform: TransformCallable = ({ value }) => {\n    return value;\n};\n\nexport const createRefSearchPlugin = (): CmsEntryElasticsearchQueryBuilderValueSearchPlugin => {\n    return new CmsEntryElasticsearchQueryBuilderValueSearchPlugin({\n        fieldType: \"ref\",\n        path: createPath,\n        transform\n    });\n};\n"],"mappings":";;;;;;AAAA;AAMA,MAAMA,UAAsC,GAAG,CAAC;EAAEC,KAAK;EAAEC;AAAI,CAAC,KAAK;EAC/D,IAAIA,GAAG,IAAIA,GAAG,CAACC,KAAK,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;IACtC,OAAQ,GAAEF,KAAK,CAACG,SAAU,KAAI;EAClC;EACA,OAAQ,GAAEH,KAAK,CAACG,SAAU,UAAS;AACvC,CAAC;AAED,MAAMC,SAA4B,GAAG,CAAC;EAAEC;AAAM,CAAC,KAAK;EAChD,OAAOA,KAAK;AAChB,CAAC;AAEM,MAAMC,qBAAqB,GAAG,MAA0D;EAC3F,OAAO,IAAIC,sGAAkD,CAAC;IAC1DC,SAAS,EAAE,KAAK;IAChBC,IAAI,EAAEV,UAAU;IAChBK;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/helpers/index.d.ts

@@ -1,2 +1 @@
-export * from "./createElasticsearchQueryBody";
 export * from "./entryIndexHelpers";

package/helpers/index.js

@@ -3,17 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _createElasticsearchQueryBody = require("./createElasticsearchQueryBody");
-Object.keys(_createElasticsearchQueryBody).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _createElasticsearchQueryBody[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _createElasticsearchQueryBody[key];
-    }
-  });
-});
 var _entryIndexHelpers = require("./entryIndexHelpers");
 Object.keys(_entryIndexHelpers).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./createElasticsearchQueryBody\";\nexport * from \"./entryIndexHelpers\";\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA;AACA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}
+{"version":3,"names":[],"sources":["index.ts"],"sourcesContent":["export * from \"./entryIndexHelpers\";\n"],"mappings":";;;;;AAAA;AAAA;EAAA;EAAA;EAAA;IAAA;IAAA;MAAA;IAAA;EAAA;AAAA"}

package/index.js

@@ -28,7 +28,6 @@ var _createElasticsearchIndex = require("./elasticsearch/createElasticsearchInde
 var _plugins = require("@webiny/plugins");
 var _group2 = require("./operations/group");
 var _apiElasticsearch = require("@webiny/api-elasticsearch");
-var _elasticsearchFields = require("./operations/entry/elasticsearchFields");
 var _indices = require("./elasticsearch/indices");
 var _deleteElasticsearchIndex = require("./elasticsearch/deleteElasticsearchIndex");
 var _plugins2 = require("./plugins");
@@ -43,6 +42,8 @@ Object.keys(_plugins2).forEach(function (key) {
     }
   });
 });
+var _plugins3 = require("./operations/entry/elasticsearch/filtering/plugins");
+var _CmsEntryFilterPlugin = require("./plugins/CmsEntryFilterPlugin");
 const createStorageOperations = params => {
   const {
     attributes,
@@ -96,10 +97,6 @@ const createStorageOperations = params => {
   /**
    * Plugins of type CmsModelFieldToGraphQLPlugin.
    */
-  /**
-   * Elasticsearch field definitions for the entry record.
-   */
-  _elasticsearchFields.elasticsearchFields,
   /**
    * DynamoDB filter plugins for the where conditions.
    */
@@ -120,12 +117,17 @@ const createStorageOperations = params => {
    * Built-in Elasticsearch index templates.
    */
   (0, _indices.elasticsearchIndexPlugins)(),
+  /**
+   * Filter plugins used to apply filtering from where conditions to Elasticsearch query.
+   */
+  (0, _plugins3.createFilterPlugins)(),
   /**
    * User defined custom plugins.
    * They are at the end because we can then override existing plugins.
    */
   ...(userPlugins || [])]);
   return {
+    name: "dynamodb:elasticsearch",
     beforeInit: async context => {
       /**
        * Attach the elasticsearch into context if it is not already attached.
@@ -133,36 +135,19 @@ const createStorageOperations = params => {
       if (!context.elasticsearch) {
         context.elasticsearch = elasticsearch;
       }
-      /**
-       * Collect all required plugins from parent context.
-       */
-      const fieldPlugins = context.plugins.byType("cms-model-field-to-graphql");
-      plugins.register(fieldPlugins);
-      /**
-       * We need to get all the operator plugins from the main plugin container.
-       */
-      const elasticsearchOperatorPlugins = context.plugins.byType(_apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type);
-      plugins.register(elasticsearchOperatorPlugins);
-      /**
-       * We need to get all the query modifier plugins
-       */
-      const queryModifierPlugins = context.plugins.byType(_plugins2.CmsEntryElasticsearchQueryModifierPlugin.type);
-      plugins.register(queryModifierPlugins);
-      /**
-       * We need to get all the sort modifier plugins
-       */
-      const sortModifierPlugins = context.plugins.byType(_plugins2.CmsEntryElasticsearchSortModifierPlugin.type);
-      plugins.register(sortModifierPlugins);
-      /**
-       * We need to get all the body modifier plugins
-       */
-      const bodyModifierPlugins = context.plugins.byType(_plugins2.CmsEntryElasticsearchBodyModifierPlugin.type);
-      plugins.register(bodyModifierPlugins);
-
       /**
        * Pass the plugins to the parent context.
        */
       context.plugins.register([(0, _dynamoDb.default)()]);
+      /**
+       * We need to fetch all the plugin types in the list from the main container.
+       * This way we do not need to register plugins in the storage plugins contains.
+       */
+      const types = ["cms-model-field-to-graphql", _CmsEntryFilterPlugin.CmsEntryFilterPlugin.type, _apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type, _plugins2.CmsEntryElasticsearchBodyModifierPlugin.type, _plugins2.CmsEntryElasticsearchFullTextSearchPlugin.type, _plugins2.CmsEntryElasticsearchIndexPlugin.type, _plugins2.CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type, _plugins2.CmsEntryElasticsearchQueryModifierPlugin.type, _plugins2.CmsEntryElasticsearchSortModifierPlugin.type, _plugins2.CmsEntryElasticsearchFieldPlugin.type];
+      for (const type of types) {
+        const contextPlugins = context.plugins.byType(type);
+        plugins.register(contextPlugins);
+      }
     },
     init: async context => {
       /**

package/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createStorageOperations","params","attributes","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","createTable","tableElasticsearchInstance","createElasticsearchTable","entities","settings","createSettingsEntity","entityName","ENTITIES","SETTINGS","system","createSystemEntity","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","entriesEs","createEntryElasticsearchEntity","ENTRIES_ES","PluginsContainer","cmsEntryElasticsearchFields","dynamoDbValueFilters","getElasticsearchOperators","dynamoDbPlugins","elasticsearchPlugins","elasticsearchIndexPlugins","beforeInit","context","fieldPlugins","byType","register","elasticsearchOperatorPlugins","ElasticsearchQueryBuilderOperatorPlugin","type","queryModifierPlugins","CmsEntryElasticsearchQueryModifierPlugin","sortModifierPlugins","CmsEntryElasticsearchSortModifierPlugin","bodyModifierPlugins","CmsEntryElasticsearchBodyModifierPlugin","init","cms","onModelBeforeCreate","subscribe","model","createElasticsearchIndex","onModelBeforeCreateFrom","onModelAfterDelete","deleteElasticsearchIndex","onModelInitialize","getEntities","getTable","getEsTable","createSystemStorageOperations","entity","createSettingsStorageOperations","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","esEntity"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport elasticsearchPlugins from \"./elasticsearch\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport { createSettingsStorageOperations } from \"./operations/settings\";\nimport { createSystemStorageOperations } from \"./operations/system\";\nimport { createModelsStorageOperations } from \"./operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\nimport { ENTITIES, StorageOperationsFactory } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { createEntryElasticsearchEntity } from \"~/definitions/entryElasticsearch\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport {\n    ElasticsearchQueryBuilderOperatorPlugin,\n    getElasticsearchOperators\n} from \"@webiny/api-elasticsearch\";\nimport { elasticsearchFields as cmsEntryElasticsearchFields } from \"~/operations/entry/elasticsearchFields\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex\";\nimport { CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport {\n    CmsEntryElasticsearchBodyModifierPlugin,\n    CmsEntryElasticsearchQueryModifierPlugin,\n    CmsEntryElasticsearchSortModifierPlugin\n} from \"~/plugins\";\n\nexport * from \"./plugins\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const {\n        attributes,\n        table,\n        esTable,\n        documentClient,\n        elasticsearch,\n        plugins: userPlugins\n    } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n    const tableElasticsearchInstance = createElasticsearchTable({\n        table: esTable,\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        entriesEs: createEntryElasticsearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES_ES] : {}\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * Plugins of type CmsModelFieldToGraphQLPlugin.\n         */\n        /**\n         * Elasticsearch field definitions for the entry record.\n         */\n        cmsEntryElasticsearchFields,\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Elasticsearch operators.\n         */\n        getElasticsearchOperators(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Field plugins for Elasticsearch.\n         */\n        elasticsearchPlugins(),\n        /**\n         * Built-in Elasticsearch index templates.\n         */\n        elasticsearchIndexPlugins(),\n        /**\n         * User defined custom plugins.\n         * They are at the end because we can then override existing plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        beforeInit: async context => {\n            /**\n             * Attach the elasticsearch into context if it is not already attached.\n             */\n            if (!context.elasticsearch) {\n                context.elasticsearch = elasticsearch;\n            }\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             * We need to get all the operator plugins from the main plugin container.\n             */\n            const elasticsearchOperatorPlugins =\n                context.plugins.byType<ElasticsearchQueryBuilderOperatorPlugin>(\n                    ElasticsearchQueryBuilderOperatorPlugin.type\n                );\n            plugins.register(elasticsearchOperatorPlugins);\n            /**\n             * We need to get all the query modifier plugins\n             */\n            const queryModifierPlugins =\n                context.plugins.byType<CmsEntryElasticsearchQueryModifierPlugin>(\n                    CmsEntryElasticsearchQueryModifierPlugin.type\n                );\n            plugins.register(queryModifierPlugins);\n            /**\n             * We need to get all the sort modifier plugins\n             */\n            const sortModifierPlugins =\n                context.plugins.byType<CmsEntryElasticsearchSortModifierPlugin>(\n                    CmsEntryElasticsearchSortModifierPlugin.type\n                );\n            plugins.register(sortModifierPlugins);\n            /**\n             * We need to get all the body modifier plugins\n             */\n            const bodyModifierPlugins =\n                context.plugins.byType<CmsEntryElasticsearchBodyModifierPlugin>(\n                    CmsEntryElasticsearchBodyModifierPlugin.type\n                );\n            plugins.register(bodyModifierPlugins);\n\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n        },\n        init: async context => {\n            /**\n             * We need to create indexes on before model create and on clone (create from).\n             * Other apps create indexes on locale creation.\n             */\n            context.cms.onModelBeforeCreate.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onModelBeforeCreateFrom.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onModelAfterDelete.subscribe(async ({ model }) => {\n                await deleteElasticsearchIndex({\n                    elasticsearch,\n                    model\n                });\n            });\n\n            context.cms.onModelInitialize.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\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            elasticsearch\n        }),\n        entries: createEntriesStorageOperations({\n            entity: entities.entries,\n            esEntity: entities.entriesEs,\n            plugins,\n            elasticsearch\n        })\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createStorageOperations","params","attributes","table","esTable","documentClient","elasticsearch","plugins","userPlugins","tableInstance","createTable","tableElasticsearchInstance","createElasticsearchTable","entities","settings","createSettingsEntity","entityName","ENTITIES","SETTINGS","system","createSystemEntity","SYSTEM","groups","createGroupEntity","GROUPS","models","createModelEntity","MODELS","entries","createEntryEntity","ENTRIES","entriesEs","createEntryElasticsearchEntity","ENTRIES_ES","PluginsContainer","dynamoDbValueFilters","getElasticsearchOperators","dynamoDbPlugins","elasticsearchPlugins","elasticsearchIndexPlugins","createFilterPlugins","name","beforeInit","context","register","types","CmsEntryFilterPlugin","type","ElasticsearchQueryBuilderOperatorPlugin","CmsEntryElasticsearchBodyModifierPlugin","CmsEntryElasticsearchFullTextSearchPlugin","CmsEntryElasticsearchIndexPlugin","CmsEntryElasticsearchQueryBuilderValueSearchPlugin","CmsEntryElasticsearchQueryModifierPlugin","CmsEntryElasticsearchSortModifierPlugin","CmsEntryElasticsearchFieldPlugin","contextPlugins","byType","init","cms","onModelBeforeCreate","subscribe","model","createElasticsearchIndex","onModelBeforeCreateFrom","onModelAfterDelete","deleteElasticsearchIndex","onModelInitialize","getEntities","getTable","getEsTable","createSystemStorageOperations","entity","createSettingsStorageOperations","createGroupsStorageOperations","createModelsStorageOperations","createEntriesStorageOperations","esEntity"],"sources":["index.ts"],"sourcesContent":["import dynamoDbValueFilters from \"@webiny/db-dynamodb/plugins/filters\";\nimport elasticsearchPlugins from \"./elasticsearch\";\nimport dynamoDbPlugins from \"./dynamoDb\";\nimport { createSettingsStorageOperations } from \"./operations/settings\";\nimport { createSystemStorageOperations } from \"./operations/system\";\nimport { createModelsStorageOperations } from \"./operations/model\";\nimport { createEntriesStorageOperations } from \"./operations/entry\";\nimport { ENTITIES, StorageOperationsFactory } from \"~/types\";\nimport { createTable } from \"~/definitions/table\";\nimport { createElasticsearchTable } from \"~/definitions/tableElasticsearch\";\nimport { createGroupEntity } from \"~/definitions/group\";\nimport { createModelEntity } from \"~/definitions/model\";\nimport { createEntryEntity } from \"~/definitions/entry\";\nimport { createEntryElasticsearchEntity } from \"~/definitions/entryElasticsearch\";\nimport { createSystemEntity } from \"~/definitions/system\";\nimport { createSettingsEntity } from \"~/definitions/settings\";\nimport { createElasticsearchIndex } from \"~/elasticsearch/createElasticsearchIndex\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { createGroupsStorageOperations } from \"~/operations/group\";\nimport {\n    ElasticsearchQueryBuilderOperatorPlugin,\n    getElasticsearchOperators\n} from \"@webiny/api-elasticsearch\";\nimport { elasticsearchIndexPlugins } from \"./elasticsearch/indices\";\nimport { deleteElasticsearchIndex } from \"./elasticsearch/deleteElasticsearchIndex\";\nimport {\n    CmsEntryElasticsearchBodyModifierPlugin,\n    CmsEntryElasticsearchFullTextSearchPlugin,\n    CmsEntryElasticsearchIndexPlugin,\n    CmsEntryElasticsearchQueryBuilderValueSearchPlugin,\n    CmsEntryElasticsearchQueryModifierPlugin,\n    CmsEntryElasticsearchSortModifierPlugin,\n    CmsEntryElasticsearchFieldPlugin\n} from \"~/plugins\";\nimport { createFilterPlugins } from \"~/operations/entry/elasticsearch/filtering/plugins\";\nimport { CmsEntryFilterPlugin } from \"~/plugins/CmsEntryFilterPlugin\";\n\nexport * from \"./plugins\";\n\nexport const createStorageOperations: StorageOperationsFactory = params => {\n    const {\n        attributes,\n        table,\n        esTable,\n        documentClient,\n        elasticsearch,\n        plugins: userPlugins\n    } = params;\n\n    const tableInstance = createTable({\n        table,\n        documentClient\n    });\n    const tableElasticsearchInstance = createElasticsearchTable({\n        table: esTable,\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        entriesEs: createEntryElasticsearchEntity({\n            entityName: ENTITIES.ENTRIES_ES,\n            table: tableElasticsearchInstance,\n            attributes: attributes ? attributes[ENTITIES.ENTRIES_ES] : {}\n        })\n    };\n\n    const plugins = new PluginsContainer([\n        /**\n         * Plugins of type CmsModelFieldToGraphQLPlugin.\n         */\n        /**\n         * DynamoDB filter plugins for the where conditions.\n         */\n        dynamoDbValueFilters(),\n        /**\n         * Elasticsearch operators.\n         */\n        getElasticsearchOperators(),\n        /**\n         * Field plugins for DynamoDB.\n         */\n        dynamoDbPlugins(),\n        /**\n         * Field plugins for Elasticsearch.\n         */\n        elasticsearchPlugins(),\n        /**\n         * Built-in Elasticsearch index templates.\n         */\n        elasticsearchIndexPlugins(),\n        /**\n         * Filter plugins used to apply filtering from where conditions to Elasticsearch query.\n         */\n        createFilterPlugins(),\n        /**\n         * User defined custom plugins.\n         * They are at the end because we can then override existing plugins.\n         */\n        ...(userPlugins || [])\n    ]);\n\n    return {\n        name: \"dynamodb:elasticsearch\",\n        beforeInit: async context => {\n            /**\n             * Attach the elasticsearch into context if it is not already attached.\n             */\n            if (!context.elasticsearch) {\n                context.elasticsearch = elasticsearch;\n            }\n            /**\n             * Pass the plugins to the parent context.\n             */\n            context.plugins.register([dynamoDbPlugins()]);\n            /**\n             * We need to fetch all the plugin types in the list from the main container.\n             * This way we do not need to register plugins in the storage plugins contains.\n             */\n            const types: string[] = [\n                \"cms-model-field-to-graphql\",\n                CmsEntryFilterPlugin.type,\n                ElasticsearchQueryBuilderOperatorPlugin.type,\n                CmsEntryElasticsearchBodyModifierPlugin.type,\n                CmsEntryElasticsearchFullTextSearchPlugin.type,\n                CmsEntryElasticsearchIndexPlugin.type,\n                CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type,\n                CmsEntryElasticsearchQueryModifierPlugin.type,\n                CmsEntryElasticsearchSortModifierPlugin.type,\n                CmsEntryElasticsearchFieldPlugin.type\n            ];\n            for (const type of types) {\n                const contextPlugins = context.plugins.byType(type);\n                plugins.register(contextPlugins);\n            }\n        },\n        init: async context => {\n            /**\n             * We need to create indexes on before model create and on clone (create from).\n             * Other apps create indexes on locale creation.\n             */\n            context.cms.onModelBeforeCreate.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onModelBeforeCreateFrom.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n            context.cms.onModelAfterDelete.subscribe(async ({ model }) => {\n                await deleteElasticsearchIndex({\n                    elasticsearch,\n                    model\n                });\n            });\n\n            context.cms.onModelInitialize.subscribe(async ({ model }) => {\n                await createElasticsearchIndex({\n                    elasticsearch,\n                    model,\n                    plugins\n                });\n            });\n        },\n        getEntities: () => entities,\n        getTable: () => tableInstance,\n        getEsTable: () => tableElasticsearchInstance,\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            elasticsearch\n        }),\n        entries: createEntriesStorageOperations({\n            entity: entities.entries,\n            esEntity: entities.entriesEs,\n            plugins,\n            elasticsearch\n        })\n    };\n};\n"],"mappings":"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"}