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

package/configurations.d.ts

@@ -3,7 +3,7 @@ interface ElasticsearchConfig {
     index: string;
 }
 interface CmsElasticsearchParams {
-    model: CmsModel;
+    model: Pick<CmsModel, "tenant" | "locale" | "modelId">;
 }
 interface Configurations {
     es: (params: CmsElasticsearchParams) => ElasticsearchConfig;

package/configurations.js.map

@@ -1 +1 @@
-{"version":3,"names":["configurations","es","model","tenant","locale","WebinyError","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"sources":["configurations.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface CmsElasticsearchParams {\n    model: CmsModel;\n}\ninterface Configurations {\n    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant, locale } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        } else if (!locale) {\n            throw new WebinyError(\n                `Missing \"locale\" parameter when trying to create Elasticsearch index name.`,\n                \"LOCALE_ERROR\"\n            );\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || \"\";\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    }\n};\n"],"mappings":";;;;;;;AACA;AAaO,MAAMA,cAA8B,GAAG;EAC1CC,EAAE,CAAC;IAAEC;EAAM,CAAC,EAAE;IACV,MAAM;MAAEC,MAAM;MAAEC;IAAO,CAAC,GAAGF,KAAK;IAEhC,IAAI,CAACC,MAAM,EAAE;MACT,MAAM,IAAIE,cAAW,CAChB,4EAA2E,EAC5E,cAAc,CACjB;IACL,CAAC,MAAM,IAAI,CAACD,MAAM,EAAE;MAChB,MAAM,IAAIC,cAAW,CAChB,4EAA2E,EAC5E,cAAc,CACjB;IACL;IAEA,MAAMC,WAAW,GAAGC,OAAO,CAACC,GAAG,CAACC,4BAA4B,KAAK,MAAM;IACvE,MAAMC,KAAK,GAAG,CAACJ,WAAW,GAAG,MAAM,GAAGH,MAAM,EAAE,cAAc,EAAEC,MAAM,EAAEF,KAAK,CAACS,OAAO,CAAC,CAC/EC,IAAI,CAAC,GAAG,CAAC,CACTC,WAAW,EAAE;IAElB,MAAMC,MAAM,GAAGP,OAAO,CAACC,GAAG,CAACO,2BAA2B,IAAI,EAAE;IAC5D,IAAI,CAACD,MAAM,EAAE;MACT,OAAO;QACHJ;MACJ,CAAC;IACL;IACA,OAAO;MACHA,KAAK,EAAEI,MAAM,GAAGJ;IACpB,CAAC;EACL;AACJ,CAAC;AAAC"}
+{"version":3,"names":["configurations","es","model","tenant","locale","WebinyError","sharedIndex","process","env","ELASTICSEARCH_SHARED_INDEXES","index","modelId","join","toLowerCase","prefix","ELASTIC_SEARCH_INDEX_PREFIX"],"sources":["configurations.ts"],"sourcesContent":["import { CmsModel } from \"@webiny/api-headless-cms/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface ElasticsearchConfig {\n    index: string;\n}\n\ninterface CmsElasticsearchParams {\n    model: Pick<CmsModel, \"tenant\" | \"locale\" | \"modelId\">;\n}\n\ninterface Configurations {\n    es: (params: CmsElasticsearchParams) => ElasticsearchConfig;\n}\n\nexport const configurations: Configurations = {\n    es({ model }) {\n        const { tenant, locale } = model;\n\n        if (!tenant) {\n            throw new WebinyError(\n                `Missing \"tenant\" parameter when trying to create Elasticsearch index name.`,\n                \"TENANT_ERROR\"\n            );\n        } else if (!locale) {\n            throw new WebinyError(\n                `Missing \"locale\" parameter when trying to create Elasticsearch index name.`,\n                \"LOCALE_ERROR\"\n            );\n        }\n\n        const sharedIndex = process.env.ELASTICSEARCH_SHARED_INDEXES === \"true\";\n        const index = [sharedIndex ? \"root\" : tenant, \"headless-cms\", locale, model.modelId]\n            .join(\"-\")\n            .toLowerCase();\n\n        const prefix = process.env.ELASTIC_SEARCH_INDEX_PREFIX || \"\";\n        if (!prefix) {\n            return {\n                index\n            };\n        }\n        return {\n            index: prefix + index\n        };\n    }\n};\n"],"mappings":";;;;;;;AACA;AAcO,MAAMA,cAA8B,GAAG;EAC1CC,EAAE,CAAC;IAAEC;EAAM,CAAC,EAAE;IACV,MAAM;MAAEC,MAAM;MAAEC;IAAO,CAAC,GAAGF,KAAK;IAEhC,IAAI,CAACC,MAAM,EAAE;MACT,MAAM,IAAIE,cAAW,CAChB,4EAA2E,EAC5E,cAAc,CACjB;IACL,CAAC,MAAM,IAAI,CAACD,MAAM,EAAE;MAChB,MAAM,IAAIC,cAAW,CAChB,4EAA2E,EAC5E,cAAc,CACjB;IACL;IAEA,MAAMC,WAAW,GAAGC,OAAO,CAACC,GAAG,CAACC,4BAA4B,KAAK,MAAM;IACvE,MAAMC,KAAK,GAAG,CAACJ,WAAW,GAAG,MAAM,GAAGH,MAAM,EAAE,cAAc,EAAEC,MAAM,EAAEF,KAAK,CAACS,OAAO,CAAC,CAC/EC,IAAI,CAAC,GAAG,CAAC,CACTC,WAAW,EAAE;IAElB,MAAMC,MAAM,GAAGP,OAAO,CAACC,GAAG,CAACO,2BAA2B,IAAI,EAAE;IAC5D,IAAI,CAACD,MAAM,EAAE;MACT,OAAO;QACHJ;MACJ,CAAC;IACL;IACA,OAAO;MACHA,KAAK,EAAEI,MAAM,GAAGJ;IACpB,CAAC;EACL;AACJ,CAAC;AAAC"}

package/definitions/entry.js

@@ -49,6 +49,9 @@ const createEntryEntity = params => {
       ownedBy: {
         type: "map"
       },
+      modifiedBy: {
+        type: "map"
+      },
       createdOn: {
         type: "string"
       },
@@ -73,6 +76,9 @@ const createEntryEntity = params => {
       status: {
         type: "string"
       },
+      location: {
+        type: "map"
+      },
       values: {
         type: "map"
       },

package/definitions/entry.js.map

@@ -1 +1 @@
-{"version":3,"names":["createEntryEntity","params","table","entityName","attributes","Entity","name","PK","type","partitionKey","SK","sortKey","TYPE","__type","webinyVersion","tenant","entryId","id","createdBy","ownedBy","createdOn","savedOn","modelId","locale","publishedOn","version","locked","status","values","meta"],"sources":["entry.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateEntryEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createEntryEntity = (params: CreateEntryEntityParams): Entity<any> => {\n    const { table, entityName, attributes } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                type: \"string\",\n                partitionKey: true\n            },\n            SK: {\n                type: \"string\",\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            __type: {\n                type: \"string\"\n            },\n            webinyVersion: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            entryId: {\n                type: \"string\"\n            },\n            id: {\n                type: \"string\"\n            },\n            createdBy: {\n                type: \"map\"\n            },\n            ownedBy: {\n                type: \"map\"\n            },\n            createdOn: {\n                type: \"string\"\n            },\n            savedOn: {\n                type: \"string\"\n            },\n            modelId: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            publishedOn: {\n                type: \"string\"\n            },\n            version: {\n                type: \"number\"\n            },\n            locked: {\n                type: \"boolean\"\n            },\n            status: {\n                type: \"string\"\n            },\n            values: {\n                type: \"map\"\n            },\n            meta: {\n                type: \"map\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAQO,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,EAAEH,UAAU;IAChBD,KAAK;IACLE,UAAU;MACNG,EAAE,EAAE;QACAC,IAAI,EAAE,QAAQ;QACdC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAF,IAAI,EAAE,QAAQ;QACdG,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFJ,IAAI,EAAE;MACV,CAAC;MACDK,MAAM,EAAE;QACJL,IAAI,EAAE;MACV,CAAC;MACDM,aAAa,EAAE;QACXN,IAAI,EAAE;MACV,CAAC;MACDO,MAAM,EAAE;QACJP,IAAI,EAAE;MACV,CAAC;MACDQ,OAAO,EAAE;QACLR,IAAI,EAAE;MACV,CAAC;MACDS,EAAE,EAAE;QACAT,IAAI,EAAE;MACV,CAAC;MACDU,SAAS,EAAE;QACPV,IAAI,EAAE;MACV,CAAC;MACDW,OAAO,EAAE;QACLX,IAAI,EAAE;MACV,CAAC;MACDY,SAAS,EAAE;QACPZ,IAAI,EAAE;MACV,CAAC;MACDa,OAAO,EAAE;QACLb,IAAI,EAAE;MACV,CAAC;MACDc,OAAO,EAAE;QACLd,IAAI,EAAE;MACV,CAAC;MACDe,MAAM,EAAE;QACJf,IAAI,EAAE;MACV,CAAC;MACDgB,WAAW,EAAE;QACThB,IAAI,EAAE;MACV,CAAC;MACDiB,OAAO,EAAE;QACLjB,IAAI,EAAE;MACV,CAAC;MACDkB,MAAM,EAAE;QACJlB,IAAI,EAAE;MACV,CAAC;MACDmB,MAAM,EAAE;QACJnB,IAAI,EAAE;MACV,CAAC;MACDoB,MAAM,EAAE;QACJpB,IAAI,EAAE;MACV,CAAC;MACDqB,IAAI,EAAE;QACFrB,IAAI,EAAE;MACV;IAAC,GACGJ,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["createEntryEntity","params","table","entityName","attributes","Entity","name","PK","type","partitionKey","SK","sortKey","TYPE","__type","webinyVersion","tenant","entryId","id","createdBy","ownedBy","modifiedBy","createdOn","savedOn","modelId","locale","publishedOn","version","locked","status","location","values","meta"],"sources":["entry.ts"],"sourcesContent":["import { Entity, Table } from \"dynamodb-toolbox\";\nimport { Attributes } from \"~/types\";\n\nexport interface CreateEntryEntityParams {\n    table: Table;\n    entityName: string;\n    attributes: Attributes;\n}\nexport const createEntryEntity = (params: CreateEntryEntityParams): Entity<any> => {\n    const { table, entityName, attributes } = params;\n    return new Entity({\n        name: entityName,\n        table,\n        attributes: {\n            PK: {\n                type: \"string\",\n                partitionKey: true\n            },\n            SK: {\n                type: \"string\",\n                sortKey: true\n            },\n            TYPE: {\n                type: \"string\"\n            },\n            __type: {\n                type: \"string\"\n            },\n            webinyVersion: {\n                type: \"string\"\n            },\n            tenant: {\n                type: \"string\"\n            },\n            entryId: {\n                type: \"string\"\n            },\n            id: {\n                type: \"string\"\n            },\n            createdBy: {\n                type: \"map\"\n            },\n            ownedBy: {\n                type: \"map\"\n            },\n            modifiedBy: {\n                type: \"map\"\n            },\n            createdOn: {\n                type: \"string\"\n            },\n            savedOn: {\n                type: \"string\"\n            },\n            modelId: {\n                type: \"string\"\n            },\n            locale: {\n                type: \"string\"\n            },\n            publishedOn: {\n                type: \"string\"\n            },\n            version: {\n                type: \"number\"\n            },\n            locked: {\n                type: \"boolean\"\n            },\n            status: {\n                type: \"string\"\n            },\n            location: {\n                type: \"map\"\n            },\n            values: {\n                type: \"map\"\n            },\n            meta: {\n                type: \"map\"\n            },\n            ...(attributes || {})\n        }\n    });\n};\n"],"mappings":";;;;;;;;AAAA;AAQO,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,EAAEH,UAAU;IAChBD,KAAK;IACLE,UAAU;MACNG,EAAE,EAAE;QACAC,IAAI,EAAE,QAAQ;QACdC,YAAY,EAAE;MAClB,CAAC;MACDC,EAAE,EAAE;QACAF,IAAI,EAAE,QAAQ;QACdG,OAAO,EAAE;MACb,CAAC;MACDC,IAAI,EAAE;QACFJ,IAAI,EAAE;MACV,CAAC;MACDK,MAAM,EAAE;QACJL,IAAI,EAAE;MACV,CAAC;MACDM,aAAa,EAAE;QACXN,IAAI,EAAE;MACV,CAAC;MACDO,MAAM,EAAE;QACJP,IAAI,EAAE;MACV,CAAC;MACDQ,OAAO,EAAE;QACLR,IAAI,EAAE;MACV,CAAC;MACDS,EAAE,EAAE;QACAT,IAAI,EAAE;MACV,CAAC;MACDU,SAAS,EAAE;QACPV,IAAI,EAAE;MACV,CAAC;MACDW,OAAO,EAAE;QACLX,IAAI,EAAE;MACV,CAAC;MACDY,UAAU,EAAE;QACRZ,IAAI,EAAE;MACV,CAAC;MACDa,SAAS,EAAE;QACPb,IAAI,EAAE;MACV,CAAC;MACDc,OAAO,EAAE;QACLd,IAAI,EAAE;MACV,CAAC;MACDe,OAAO,EAAE;QACLf,IAAI,EAAE;MACV,CAAC;MACDgB,MAAM,EAAE;QACJhB,IAAI,EAAE;MACV,CAAC;MACDiB,WAAW,EAAE;QACTjB,IAAI,EAAE;MACV,CAAC;MACDkB,OAAO,EAAE;QACLlB,IAAI,EAAE;MACV,CAAC;MACDmB,MAAM,EAAE;QACJnB,IAAI,EAAE;MACV,CAAC;MACDoB,MAAM,EAAE;QACJpB,IAAI,EAAE;MACV,CAAC;MACDqB,QAAQ,EAAE;QACNrB,IAAI,EAAE;MACV,CAAC;MACDsB,MAAM,EAAE;QACJtB,IAAI,EAAE;MACV,CAAC;MACDuB,IAAI,EAAE;QACFvB,IAAI,EAAE;MACV;IAAC,GACGJ,UAAU,IAAI,CAAC,CAAC;EAE5B,CAAC,CAAC;AACN,CAAC;AAAC"}

package/definitions/model.js

@@ -39,6 +39,14 @@ const createModelEntity = params => {
         type: "string",
         required: true
       },
+      singularApiName: {
+        type: "string",
+        required: true
+      },
+      pluralApiName: {
+        type: "string",
+        required: true
+      },
       locale: {
         type: "string",
         required: true
@@ -47,6 +55,9 @@ const createModelEntity = params => {
         type: "map",
         required: true
       },
+      icon: {
+        type: "string"
+      },
       description: {
         type: "string"
       },
@@ -70,6 +81,11 @@ const createModelEntity = params => {
         type: "list",
         required: true
       },
+      tags: {
+        type: "list",
+        required: false,
+        default: []
+      },
       lockedFields: {
         type: "list",
         required: true
@@ -77,6 +93,12 @@ const createModelEntity = params => {
       titleFieldId: {
         type: "string"
       },
+      descriptionFieldId: {
+        type: "string"
+      },
+      imageFieldId: {
+        type: "string"
+      },
       tenant: {
         type: "string",
         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","singularApiName","pluralApiName","locale","group","icon","description","createdOn","savedOn","createdBy","fields","layout","tags","default","lockedFields","titleFieldId","descriptionFieldId","imageFieldId","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            singularApiName: {\n                type: \"string\",\n                required: true\n            },\n            pluralApiName: {\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            icon: {\n                type: \"string\"\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            descriptionFieldId: {\n                type: \"string\"\n            },\n            imageFieldId: {\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,eAAe,EAAE;QACbJ,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDI,aAAa,EAAE;QACXL,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDK,MAAM,EAAE;QACJN,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDM,KAAK,EAAE;QACHP,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDO,IAAI,EAAE;QACFR,IAAI,EAAE;MACV,CAAC;MACDS,WAAW,EAAE;QACTT,IAAI,EAAE;MACV,CAAC;MACDU,SAAS,EAAE;QACPV,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDU,OAAO,EAAE;QACLX,IAAI,EAAE,QAAQ;QACdC,QAAQ,EAAE;MACd,CAAC;MACDW,SAAS,EAAE;QACPZ,IAAI,EAAE,KAAK;QACXC,QAAQ,EAAE;MACd,CAAC;MACDY,MAAM,EAAE;QACJb,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDa,MAAM,EAAE;QACJd,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDc,IAAI,EAAE;QACFf,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE,KAAK;QACfe,OAAO,EAAE;MACb,CAAC;MACDC,YAAY,EAAE;QACVjB,IAAI,EAAE,MAAM;QACZC,QAAQ,EAAE;MACd,CAAC;MACDiB,YAAY,EAAE;QACVlB,IAAI,EAAE;MACV,CAAC;MACDmB,kBAAkB,EAAE;QAChBnB,IAAI,EAAE;MACV,CAAC;MACDoB,YAAY,EAAE;QACVpB,IAAI,EAAE;MACV,CAAC;MACDqB,MAAM,EAAE;QACJrB,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

@@ -38,7 +38,7 @@ const convertValueToStorage = (field, value) => {
   });
 };
 const createDateStorageTransformPlugin = () => {
-  return new _apiHeadlessCms.StorageTransformPlugin({
+  const plugin = new _apiHeadlessCms.StorageTransformPlugin({
     fieldType: "datetime",
     fromStorage: async ({
       value,
@@ -68,17 +68,10 @@ const createDateStorageTransformPlugin = () => {
           return convertValueToStorage(field, v);
         });
       }
-      if (value.toISOString) {
-        return value.toISOString();
-      } else if (typeof value === "string") {
-        return value;
-      }
-      throw new _error.default("Error converting value to a storage type.", "TO_STORAGE_ERROR", {
-        value,
-        fieldId: field.fieldId,
-        storageId: field.storageId
-      });
+      return convertValueToStorage(field, value);
     }
   });
+  plugin.name = `headless-cms.dynamodb.storageTransform.date`;
+  return plugin;
 };
 exports.createDateStorageTransformPlugin = createDateStorageTransformPlugin;

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","plugin","StorageTransformPlugin","fieldType","fromStorage","type","settings","includes","toStorage","name"],"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    const plugin = 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            return convertValueToStorage(field, value);\n        }\n    });\n    plugin.name = `headless-cms.dynamodb.storageTransform.date`;\n\n    return plugin;\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,MAAMC,MAAM,GAAG,IAAIC,sCAAsB,CAAC;IACtCC,SAAS,EAAE,UAAU;IACrBC,WAAW,EAAE,OAAO;MAAEjB,KAAK;MAAED;IAAM,CAAC,KAAK;MACrC,MAAM;QAAEmB;MAAK,CAAC,GAAGnB,KAAK,CAACoB,QAAQ,IAAI,CAAC,CAAC;MACrC,IAAI,CAACnB,KAAK,IAAI,CAACkB,IAAI,IAAIrB,YAAY,CAACuB,QAAQ,CAACF,IAAI,CAAC,EAAE;QAChD,OAAOlB,KAAK;MAChB;MACA,OAAOF,kBAAkB,CAACC,KAAK,EAAEC,KAAK,CAAC;IAC3C,CAAC;IACDqB,SAAS,EAAE,OAAO;MAAErB,KAAK;MAAED;IAAM,CAAC,KAAK;MACnC,MAAM;QAAEmB;MAAK,CAAC,GAAGnB,KAAK,CAACoB,QAAQ,IAAI,CAAC,CAAC;MACrC,IAAI,CAACnB,KAAK,IAAI,CAACkB,IAAI,IAAIrB,YAAY,CAACuB,QAAQ,CAACF,IAAI,CAAC,EAAE;QAChD,OAAOlB,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,OAAOK,qBAAqB,CAACT,KAAK,EAAEC,KAAK,CAAC;IAC9C;EACJ,CAAC,CAAC;EACFc,MAAM,CAACQ,IAAI,GAAI,6CAA4C;EAE3D,OAAOR,MAAM;AACjB,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

@@ -22,7 +22,7 @@ const convertToBuffer = value => {
   return value;
 };
 const createLongTextStorageTransformPlugin = () => {
-  return new _apiHeadlessCms.StorageTransformPlugin({
+  const plugin = new _apiHeadlessCms.StorageTransformPlugin({
     fieldType: "long-text",
     fromStorage: async ({
       field,
@@ -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);
@@ -81,5 +87,7 @@ const createLongTextStorageTransformPlugin = () => {
       return result;
     }
   });
+  plugin.name = plugin.name = `headless-cms.dynamodb.storageTransform.long-text`;
+  return plugin;
 };
 exports.createLongTextStorageTransformPlugin = createLongTextStorageTransformPlugin;

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","plugin","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","name"],"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    const plugin = 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    plugin.name = plugin.name = `headless-cms.dynamodb.storageTransform.long-text`;\n\n    return plugin;\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

@@ -32,7 +32,7 @@ const transformArray = value => {
   return value;
 };
 const createRichTextStorageTransformPlugin = () => {
-  return new _apiHeadlessCms.StorageTransformPlugin({
+  const plugin = new _apiHeadlessCms.StorageTransformPlugin({
     fieldType: "rich-text",
     fromStorage: async ({
       field,
@@ -47,42 +47,39 @@ 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) {
-        if (process.env.DEBUG !== "true") {
-          return null;
-        }
-        console.log("Error while decompressing rich-text.");
-        console.log(ex.message);
         return null;
       }
     },
     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);
@@ -102,5 +99,7 @@ const createRichTextStorageTransformPlugin = () => {
       };
     }
   });
+  plugin.name = `headless-cms.dynamodb.storageTransform.rich-text`;
+  return plugin;
 };
 exports.createRichTextStorageTransformPlugin = createRichTextStorageTransformPlugin;

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","plugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","WebinyError","storageId","compression","jsonpack","unpack","ex","toStorage","jsonValue","pack","process","env","DEBUG","console","log","message","name"],"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    const plugin = 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                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    plugin.name = `headless-cms.dynamodb.storageTransform.rich-text`;\n\n    return plugin;\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,MAAMC,MAAM,GAAG,IAAIC,sCAAsB,CAAC;IACtCC,SAAS,EAAE,WAAW;IACtBC,WAAW,EAAE,OAAO;MAAEC,KAAK;MAAEX,KAAK,EAAEY;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;QAAEf;MAAM,CAAC,GAAGY,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,CAACf,KAAK,EAAE;QACR,OAAO,IAAI;MACf;MACA,IAAI;QACA,OAAOgB,iBAAQ,CAACC,MAAM,CAACjB,KAAK,CAAC;MACjC,CAAC,CAAC,OAAOkB,EAAE,EAAE;QACT,OAAO,IAAI;MACf;IACJ,CAAC;IACDC,SAAS,EAAE,OAAO;MAAEnB;IAAM,CAAC,KAAK;MAAA;MAC5B;AACZ;AACA;AACA;MACY,IAAI,CAAC,YAACA,KAAK,mCAAL,OAAOe,WAAW,GAAE;QACtB,OAAOf,KAAK;MAChB;MACAA,KAAK,GAAGD,cAAc,CAACC,KAAK,CAAC;MAE7B,IAAIoB,SAAwB,GAAG,IAAI;MACnC,IAAI;QACAA,SAAS,GAAGJ,iBAAQ,CAACK,IAAI,CAACrB,KAAK,CAAC;MACpC,CAAC,CAAC,OAAOkB,EAAE,EAAE;QACT,IAAII,OAAO,CAACC,GAAG,CAACC,KAAK,KAAK,MAAM,EAAE;UAC9B,OAAO,IAAI;QACf;QACAC,OAAO,CAACC,GAAG,CAAC,oCAAoC,CAAC;QACjDD,OAAO,CAACC,GAAG,CAACR,EAAE,CAACS,OAAO,CAAC;MAC3B;MACA,OAAO;QACHZ,WAAW,EAAE,UAAU;QACvBf,KAAK,EAAEoB;MACX,CAAC;IACL;EACJ,CAAC,CAAC;EACFb,MAAM,CAACqB,IAAI,GAAI,kDAAiD;EAEhE,OAAOrB,MAAM;AACjB,CAAC;AAAC"}

package/elasticsearch/indexing/dateTimeIndexing.js

@@ -27,7 +27,8 @@ const convertNumberToTime = value => {
   return [hours, minutes, seconds].map(v => String(v).padStart(2, "0")).join(":");
 };
 const convertValueFromIndex = (value, field) => {
-  const type = field.settings.type;
+  var _field$settings;
+  const type = (_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.type;
   if (type === "time") {
     return convertNumberToTime(value);
   } else if (!value) {
@@ -41,9 +42,10 @@ const convertValueFromIndex = (value, field) => {
   return new Date(value).toISOString();
 };
 const convertValueToIndex = (value, field) => {
+  var _field$settings2;
   if (!value) {
     return null;
-  } else if (field.settings.type === "time") {
+  } else if (((_field$settings2 = field.settings) === null || _field$settings2 === void 0 ? void 0 : _field$settings2.type) === "time") {
     return convertTimeToNumber(value);
   }
   return value;

package/elasticsearch/indexing/dateTimeIndexing.js.map

@@ -1 +1 @@
-{"version":3,"names":["convertTimeToNumber","time","hours","minutes","seconds","split","map","Number","convertNumberToTime","value","undefined","String","match","Math","floor","v","padStart","join","convertValueFromIndex","field","type","settings","dateValue","Date","toISOString","slice","convertValueToIndex","name","fieldType","unmappedType","toIndex","Array","isArray","fromIndex"],"sources":["dateTimeIndexing.ts"],"sourcesContent":["import { CmsModelDateTimeField } from \"@webiny/api-headless-cms/types\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nconst convertTimeToNumber = (time?: string): number | null => {\n    if (!time) {\n        return null;\n    }\n    const [hours, minutes, seconds = 0] = time.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nconst convertNumberToTime = (value?: number): string | null => {\n    if (value === undefined || value === null) {\n        return null;\n    }\n    // TODO remove when v5 goes out\n    // this is a fix for pre beta.5\n    if (String(value).match(/^([0-9]{2}):([0-9]{2})/) !== null) {\n        return String(value);\n    }\n    //\n    const hours = Math.floor(value / 60 / 60);\n\n    const minutes = Math.floor((value - hours * 60 * 60) / 60);\n\n    const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);\n\n    return [hours, minutes, seconds].map(v => String(v).padStart(2, \"0\")).join(\":\");\n};\n\nconst convertValueFromIndex = (\n    value: string | number,\n    field: CmsModelDateTimeField\n): string | null => {\n    const type = field.settings.type;\n    if (type === \"time\") {\n        return convertNumberToTime(value as number);\n    } else if (!value) {\n        return null;\n    } else if (type === \"dateTimeWithTimezone\") {\n        return value as string;\n    } else if (type === \"date\") {\n        const dateValue = new Date(value);\n        return dateValue.toISOString().slice(0, 10);\n    }\n    return new Date(value).toISOString();\n};\n\nconst convertValueToIndex = (value: string, field: CmsModelDateTimeField) => {\n    if (!value) {\n        return null;\n    } else if (field.settings.type === \"time\") {\n        return convertTimeToNumber(value);\n    }\n    return value;\n};\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-datetime\",\n    fieldType: \"datetime\",\n    unmappedType: () => {\n        return \"date\";\n    },\n    toIndex({ field, value }) {\n        if (Array.isArray(value) === true) {\n            return {\n                value: value.map((v: string) => {\n                    return convertValueToIndex(v, field as CmsModelDateTimeField);\n                })\n            };\n        }\n        const dateValue = convertValueToIndex(value, field as CmsModelDateTimeField);\n        return {\n            value: dateValue\n        };\n    },\n    fromIndex({ field, value }) {\n        if (Array.isArray(value)) {\n            return value.map((v: string) => {\n                return convertValueFromIndex(v, field as CmsModelDateTimeField);\n            });\n        }\n        return convertValueFromIndex(value, field as CmsModelDateTimeField);\n    }\n});\n"],"mappings":";;;;;;AAGA,MAAMA,mBAAmB,GAAIC,IAAa,IAAoB;EAC1D,IAAI,CAACA,IAAI,EAAE;IACP,OAAO,IAAI;EACf;EACA,MAAM,CAACC,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,CAAC,CAAC,GAAGH,IAAI,CAACI,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EACjE,OAAOL,KAAK,GAAG,EAAE,GAAG,EAAE,GAAGC,OAAO,GAAG,EAAE,GAAGC,OAAO;AACnD,CAAC;AAED,MAAMI,mBAAmB,GAAIC,KAAc,IAAoB;EAC3D,IAAIA,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,EAAE;IACvC,OAAO,IAAI;EACf;EACA;EACA;EACA,IAAIE,MAAM,CAACF,KAAK,CAAC,CAACG,KAAK,CAAC,wBAAwB,CAAC,KAAK,IAAI,EAAE;IACxD,OAAOD,MAAM,CAACF,KAAK,CAAC;EACxB;EACA;EACA,MAAMP,KAAK,GAAGW,IAAI,CAACC,KAAK,CAACL,KAAK,GAAG,EAAE,GAAG,EAAE,CAAC;EAEzC,MAAMN,OAAO,GAAGU,IAAI,CAACC,KAAK,CAAC,CAACL,KAAK,GAAGP,KAAK,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;EAE1D,MAAME,OAAO,GAAGS,IAAI,CAACC,KAAK,CAACL,KAAK,GAAGP,KAAK,GAAG,EAAE,GAAG,EAAE,GAAGC,OAAO,GAAG,EAAE,CAAC;EAElE,OAAO,CAACD,KAAK,EAAEC,OAAO,EAAEC,OAAO,CAAC,CAACE,GAAG,CAACS,CAAC,IAAIJ,MAAM,CAACI,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;AACnF,CAAC;AAED,MAAMC,qBAAqB,GAAG,CAC1BT,KAAsB,EACtBU,KAA4B,KACZ;EAChB,MAAMC,IAAI,GAAGD,KAAK,CAACE,QAAQ,CAACD,IAAI;EAChC,IAAIA,IAAI,KAAK,MAAM,EAAE;IACjB,OAAOZ,mBAAmB,CAACC,KAAK,CAAW;EAC/C,CAAC,MAAM,IAAI,CAACA,KAAK,EAAE;IACf,OAAO,IAAI;EACf,CAAC,MAAM,IAAIW,IAAI,KAAK,sBAAsB,EAAE;IACxC,OAAOX,KAAK;EAChB,CAAC,MAAM,IAAIW,IAAI,KAAK,MAAM,EAAE;IACxB,MAAME,SAAS,GAAG,IAAIC,IAAI,CAACd,KAAK,CAAC;IACjC,OAAOa,SAAS,CAACE,WAAW,EAAE,CAACC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;EAC/C;EACA,OAAO,IAAIF,IAAI,CAACd,KAAK,CAAC,CAACe,WAAW,EAAE;AACxC,CAAC;AAED,MAAME,mBAAmB,GAAG,CAACjB,KAAa,EAAEU,KAA4B,KAAK;EACzE,IAAI,CAACV,KAAK,EAAE;IACR,OAAO,IAAI;EACf,CAAC,MAAM,IAAIU,KAAK,CAACE,QAAQ,CAACD,IAAI,KAAK,MAAM,EAAE;IACvC,OAAOpB,mBAAmB,CAACS,KAAK,CAAC;EACrC;EACA,OAAOA,KAAK;AAChB,CAAC;AAAC,eAEa,OAA2C;EACtDW,IAAI,EAAE,mCAAmC;EACzCO,IAAI,EAAE,4CAA4C;EAClDC,SAAS,EAAE,UAAU;EACrBC,YAAY,EAAE,MAAM;IAChB,OAAO,MAAM;EACjB,CAAC;EACDC,OAAO,CAAC;IAAEX,KAAK;IAAEV;EAAM,CAAC,EAAE;IACtB,IAAIsB,KAAK,CAACC,OAAO,CAACvB,KAAK,CAAC,KAAK,IAAI,EAAE;MAC/B,OAAO;QACHA,KAAK,EAAEA,KAAK,CAACH,GAAG,CAAES,CAAS,IAAK;UAC5B,OAAOW,mBAAmB,CAACX,CAAC,EAAEI,KAAK,CAA0B;QACjE,CAAC;MACL,CAAC;IACL;IACA,MAAMG,SAAS,GAAGI,mBAAmB,CAACjB,KAAK,EAAEU,KAAK,CAA0B;IAC5E,OAAO;MACHV,KAAK,EAAEa;IACX,CAAC;EACL,CAAC;EACDW,SAAS,CAAC;IAAEd,KAAK;IAAEV;EAAM,CAAC,EAAE;IACxB,IAAIsB,KAAK,CAACC,OAAO,CAACvB,KAAK,CAAC,EAAE;MACtB,OAAOA,KAAK,CAACH,GAAG,CAAES,CAAS,IAAK;QAC5B,OAAOG,qBAAqB,CAACH,CAAC,EAAEI,KAAK,CAA0B;MACnE,CAAC,CAAC;IACN;IACA,OAAOD,qBAAqB,CAACT,KAAK,EAAEU,KAAK,CAA0B;EACvE;AACJ,CAAC,CAAC;AAAA"}
+{"version":3,"names":["convertTimeToNumber","time","hours","minutes","seconds","split","map","Number","convertNumberToTime","value","undefined","String","match","Math","floor","v","padStart","join","convertValueFromIndex","field","type","settings","dateValue","Date","toISOString","slice","convertValueToIndex","name","fieldType","unmappedType","toIndex","Array","isArray","fromIndex"],"sources":["dateTimeIndexing.ts"],"sourcesContent":["import { CmsModelDateTimeField } from \"@webiny/api-headless-cms/types\";\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\n\nconst convertTimeToNumber = (time?: string): number | null => {\n    if (!time) {\n        return null;\n    }\n    const [hours, minutes, seconds = 0] = time.split(\":\").map(Number);\n    return hours * 60 * 60 + minutes * 60 + seconds;\n};\n\nconst convertNumberToTime = (value?: number): string | null => {\n    if (value === undefined || value === null) {\n        return null;\n    }\n    // TODO remove when v5 goes out\n    // this is a fix for pre beta.5\n    if (String(value).match(/^([0-9]{2}):([0-9]{2})/) !== null) {\n        return String(value);\n    }\n    //\n    const hours = Math.floor(value / 60 / 60);\n\n    const minutes = Math.floor((value - hours * 60 * 60) / 60);\n\n    const seconds = Math.floor(value - hours * 60 * 60 - minutes * 60);\n\n    return [hours, minutes, seconds].map(v => String(v).padStart(2, \"0\")).join(\":\");\n};\n\nconst convertValueFromIndex = (\n    value: string | number,\n    field: CmsModelDateTimeField\n): string | null => {\n    const type = field.settings?.type;\n    if (type === \"time\") {\n        return convertNumberToTime(value as number);\n    } else if (!value) {\n        return null;\n    } else if (type === \"dateTimeWithTimezone\") {\n        return value as string;\n    } else if (type === \"date\") {\n        const dateValue = new Date(value);\n        return dateValue.toISOString().slice(0, 10);\n    }\n    return new Date(value).toISOString();\n};\n\nconst convertValueToIndex = (value: string, field: CmsModelDateTimeField) => {\n    if (!value) {\n        return null;\n    } else if (field.settings?.type === \"time\") {\n        return convertTimeToNumber(value);\n    }\n    return value;\n};\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-datetime\",\n    fieldType: \"datetime\",\n    unmappedType: () => {\n        return \"date\";\n    },\n    toIndex({ field, value }) {\n        if (Array.isArray(value) === true) {\n            return {\n                value: value.map((v: string) => {\n                    return convertValueToIndex(v, field as CmsModelDateTimeField);\n                })\n            };\n        }\n        const dateValue = convertValueToIndex(value, field as CmsModelDateTimeField);\n        return {\n            value: dateValue\n        };\n    },\n    fromIndex({ field, value }) {\n        if (Array.isArray(value)) {\n            return value.map((v: string) => {\n                return convertValueFromIndex(v, field as CmsModelDateTimeField);\n            });\n        }\n        return convertValueFromIndex(value, field as CmsModelDateTimeField);\n    }\n});\n"],"mappings":";;;;;;AAGA,MAAMA,mBAAmB,GAAIC,IAAa,IAAoB;EAC1D,IAAI,CAACA,IAAI,EAAE;IACP,OAAO,IAAI;EACf;EACA,MAAM,CAACC,KAAK,EAAEC,OAAO,EAAEC,OAAO,GAAG,CAAC,CAAC,GAAGH,IAAI,CAACI,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EACjE,OAAOL,KAAK,GAAG,EAAE,GAAG,EAAE,GAAGC,OAAO,GAAG,EAAE,GAAGC,OAAO;AACnD,CAAC;AAED,MAAMI,mBAAmB,GAAIC,KAAc,IAAoB;EAC3D,IAAIA,KAAK,KAAKC,SAAS,IAAID,KAAK,KAAK,IAAI,EAAE;IACvC,OAAO,IAAI;EACf;EACA;EACA;EACA,IAAIE,MAAM,CAACF,KAAK,CAAC,CAACG,KAAK,CAAC,wBAAwB,CAAC,KAAK,IAAI,EAAE;IACxD,OAAOD,MAAM,CAACF,KAAK,CAAC;EACxB;EACA;EACA,MAAMP,KAAK,GAAGW,IAAI,CAACC,KAAK,CAACL,KAAK,GAAG,EAAE,GAAG,EAAE,CAAC;EAEzC,MAAMN,OAAO,GAAGU,IAAI,CAACC,KAAK,CAAC,CAACL,KAAK,GAAGP,KAAK,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;EAE1D,MAAME,OAAO,GAAGS,IAAI,CAACC,KAAK,CAACL,KAAK,GAAGP,KAAK,GAAG,EAAE,GAAG,EAAE,GAAGC,OAAO,GAAG,EAAE,CAAC;EAElE,OAAO,CAACD,KAAK,EAAEC,OAAO,EAAEC,OAAO,CAAC,CAACE,GAAG,CAACS,CAAC,IAAIJ,MAAM,CAACI,CAAC,CAAC,CAACC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;AACnF,CAAC;AAED,MAAMC,qBAAqB,GAAG,CAC1BT,KAAsB,EACtBU,KAA4B,KACZ;EAAA;EAChB,MAAMC,IAAI,sBAAGD,KAAK,CAACE,QAAQ,oDAAd,gBAAgBD,IAAI;EACjC,IAAIA,IAAI,KAAK,MAAM,EAAE;IACjB,OAAOZ,mBAAmB,CAACC,KAAK,CAAW;EAC/C,CAAC,MAAM,IAAI,CAACA,KAAK,EAAE;IACf,OAAO,IAAI;EACf,CAAC,MAAM,IAAIW,IAAI,KAAK,sBAAsB,EAAE;IACxC,OAAOX,KAAK;EAChB,CAAC,MAAM,IAAIW,IAAI,KAAK,MAAM,EAAE;IACxB,MAAME,SAAS,GAAG,IAAIC,IAAI,CAACd,KAAK,CAAC;IACjC,OAAOa,SAAS,CAACE,WAAW,EAAE,CAACC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;EAC/C;EACA,OAAO,IAAIF,IAAI,CAACd,KAAK,CAAC,CAACe,WAAW,EAAE;AACxC,CAAC;AAED,MAAME,mBAAmB,GAAG,CAACjB,KAAa,EAAEU,KAA4B,KAAK;EAAA;EACzE,IAAI,CAACV,KAAK,EAAE;IACR,OAAO,IAAI;EACf,CAAC,MAAM,IAAI,qBAAAU,KAAK,CAACE,QAAQ,qDAAd,iBAAgBD,IAAI,MAAK,MAAM,EAAE;IACxC,OAAOpB,mBAAmB,CAACS,KAAK,CAAC;EACrC;EACA,OAAOA,KAAK;AAChB,CAAC;AAAC,eAEa,OAA2C;EACtDW,IAAI,EAAE,mCAAmC;EACzCO,IAAI,EAAE,4CAA4C;EAClDC,SAAS,EAAE,UAAU;EACrBC,YAAY,EAAE,MAAM;IAChB,OAAO,MAAM;EACjB,CAAC;EACDC,OAAO,CAAC;IAAEX,KAAK;IAAEV;EAAM,CAAC,EAAE;IACtB,IAAIsB,KAAK,CAACC,OAAO,CAACvB,KAAK,CAAC,KAAK,IAAI,EAAE;MAC/B,OAAO;QACHA,KAAK,EAAEA,KAAK,CAACH,GAAG,CAAES,CAAS,IAAK;UAC5B,OAAOW,mBAAmB,CAACX,CAAC,EAAEI,KAAK,CAA0B;QACjE,CAAC;MACL,CAAC;IACL;IACA,MAAMG,SAAS,GAAGI,mBAAmB,CAACjB,KAAK,EAAEU,KAAK,CAA0B;IAC5E,OAAO;MACHV,KAAK,EAAEa;IACX,CAAC;EACL,CAAC;EACDW,SAAS,CAAC;IAAEd,KAAK;IAAEV;EAAM,CAAC,EAAE;IACxB,IAAIsB,KAAK,CAACC,OAAO,CAACvB,KAAK,CAAC,EAAE;MACtB,OAAOA,KAAK,CAACH,GAAG,CAAES,CAAS,IAAK;QAC5B,OAAOG,qBAAqB,CAACH,CAAC,EAAEI,KAAK,CAA0B;MACnE,CAAC,CAAC;IACN;IACA,OAAOD,qBAAqB,CAACT,KAAK,EAAEU,KAAK,CAA0B;EACvE;AACJ,CAAC,CAAC;AAAA"}

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,20 +16,25 @@ 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) : ""
+      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
   }) {
-    return value ? decodeURIComponent(value) : "";
+    if (Array.isArray(value)) {
+      return value;
+    }
+    return value || "";
   }
 });
 exports.default = _default;

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"],"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            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;\n        }\n        return 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;MACHC,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;IAChB;IACA,OAAOA,KAAK,IAAI,EAAE;EACtB;AACJ,CAAC,CAAC;AAAA"}

package/elasticsearch/indexing/objectIndexing.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _helpers = require("../../helpers");
 /**
  * TODO remove rawValue when field aliases and field types targeting will be active.
  *
@@ -28,23 +29,27 @@ const processToIndex = ({
     if (!plugin || !plugin.toIndex) {
       return values;
     }
+    const identifiers = (0, _helpers.getFieldIdentifiers)(sourceValue, sourceRawValue, field);
+    if (!identifiers) {
+      return values;
+    }
     const {
       value,
       rawValue
     } = plugin.toIndex({
       model,
       field,
-      value: sourceValue[field.storageId],
-      rawValue: sourceRawValue[field.storageId],
+      value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
+      rawValue: sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],
       getFieldIndexPlugin,
       getFieldTypePlugin,
       plugins
     });
     if (value !== undefined) {
-      values.value[field.storageId] = value;
+      values.value[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;
     }
     if (rawValue !== undefined) {
-      values.rawValue[field.storageId] = rawValue;
+      values.rawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] = rawValue;
     }
     return values;
   };
@@ -67,17 +72,21 @@ const processFromIndex = ({
     if (!plugin || !plugin.fromIndex) {
       return values;
     }
+    const identifiers = (0, _helpers.getFieldIdentifiers)(sourceValue, sourceRawValue, field);
+    if (!identifiers) {
+      return values;
+    }
     const value = plugin.fromIndex({
       plugins,
       model,
       field,
-      value: sourceValue[field.storageId],
-      rawValue: sourceRawValue[field.storageId],
+      value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
+      rawValue: sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],
       getFieldIndexPlugin,
       getFieldTypePlugin
     });
     if (value !== undefined) {
-      values[field.storageId] = value;
+      values[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;
     }
     return values;
   };