@webiny/api-headless-cms-ddb-es 0.0.0-unstable.c2780f51fe → 0.0.0-unstable.c7dec08bb0

package/definitions/entry.js

@@ -76,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","modifiedBy","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            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            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,MAAM,EAAE;QACJrB,IAAI,EAAE;MACV,CAAC;MACDsB,IAAI,EAAE;QACFtB,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/dynamoDb/storage/date.js

@@ -68,16 +68,7 @@ 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`;

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","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            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    plugin.name = `headless-cms.dynamodb.storageTransform.date`;\n\n    return plugin;\n};\n"],"mappings":"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"}
+{"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/richText.js

@@ -68,11 +68,6 @@ const createRichTextStorageTransformPlugin = () => {
       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;
       }
     },

package/dynamoDb/storage/richText.js.map

@@ -1 +1 @@
-{"version":3,"names":["transformArray","value","isArray","Array","shouldBeArray","from","k","createRichTextStorageTransformPlugin","plugin","StorageTransformPlugin","fieldType","fromStorage","field","storageValue","WebinyError","storageId","compression","jsonpack","unpack","ex","process","env","DEBUG","console","log","message","toStorage","jsonValue","pack","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                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    plugin.name = `headless-cms.dynamodb.storageTransform.rich-text`;\n\n    return plugin;\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":"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"}
+{"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":"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"}

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;
   };

package/elasticsearch/indexing/objectIndexing.js.map

@@ -1 +1 @@
-{"version":3,"names":["processToIndex","fields","value","sourceValue","rawValue","sourceRawValue","getFieldIndexPlugin","getFieldTypePlugin","plugins","model","reducer","values","field","plugin","type","toIndex","storageId","undefined","reduce","processFromIndex","fromIndex","name","fieldType","initialValue","initialRawValue","settings","multipleValues","result","key","Object","keys","length","push","source","map","_","index"],"sources":["objectIndexing.ts"],"sourcesContent":["/**\n * TODO remove rawValue when field aliases and field types targeting will be active.\n *\n * Currently we use rawValue for the values that we do not want to be indexed.\n * When field aliases and types in the value path will be active, we can target the keys directly.\n *\n * This change will be incompatible with the current systems so we will need to release a major version.\n *\n */\n\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\ninterface ProcessToIndex {\n    (params: {\n        fields: CmsModelField[];\n        value: Record<string, any>;\n        rawValue: Record<string, any>;\n        getFieldIndexPlugin: (fieldType: string) => CmsModelFieldToElasticsearchPlugin;\n        getFieldTypePlugin: (fieldType: string) => CmsModelFieldToGraphQLPlugin;\n        plugins: PluginsContainer;\n        model: CmsModel;\n    }): Record<\"value\" | \"rawValue\", Record<string, any>>;\n}\n\ninterface ProcessFromIndex {\n    (params: {\n        fields: CmsModelField[];\n        value: Record<string, any>;\n        rawValue: Record<string, any>;\n        getFieldIndexPlugin: (fieldType: string) => CmsModelFieldToElasticsearchPlugin;\n        getFieldTypePlugin: (fieldType: string) => CmsModelFieldToGraphQLPlugin;\n        plugins: PluginsContainer;\n        model: CmsModel;\n    }): Record<string, any>;\n}\n\ninterface ReducerValue {\n    value: {\n        [key: string]: string;\n    };\n    rawValue: {\n        [key: string]: string;\n    };\n}\n\nconst processToIndex: ProcessToIndex = ({\n    fields,\n    value: sourceValue,\n    rawValue: sourceRawValue,\n    getFieldIndexPlugin,\n    getFieldTypePlugin,\n    plugins,\n    model\n}) => {\n    const reducer = (values: ReducerValue, field: CmsModelField) => {\n        const plugin = getFieldIndexPlugin(field.type);\n        if (!plugin || !plugin.toIndex) {\n            return values;\n        }\n        const { value, rawValue } = plugin.toIndex({\n            model,\n            field,\n            value: sourceValue[field.storageId],\n            rawValue: sourceRawValue[field.storageId],\n            getFieldIndexPlugin,\n            getFieldTypePlugin,\n            plugins\n        });\n\n        if (value !== undefined) {\n            values.value[field.storageId] = value;\n        }\n        if (rawValue !== undefined) {\n            values.rawValue[field.storageId] = rawValue;\n        }\n\n        return values;\n    };\n\n    return fields.reduce(reducer, { value: {}, rawValue: {} });\n};\nconst processFromIndex: ProcessFromIndex = ({\n    fields,\n    value: sourceValue,\n    rawValue: sourceRawValue,\n    getFieldIndexPlugin,\n    getFieldTypePlugin,\n    plugins,\n    model\n}) => {\n    const reducer = (values: Record<string, string>, field: CmsModelField) => {\n        const plugin = getFieldIndexPlugin(field.type);\n        if (!plugin || !plugin.fromIndex) {\n            return values;\n        }\n        const value = plugin.fromIndex({\n            plugins,\n            model,\n            field,\n            value: sourceValue[field.storageId],\n            rawValue: sourceRawValue[field.storageId],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (value !== undefined) {\n            values[field.storageId] = value;\n        }\n\n        return values;\n    };\n\n    return fields.reduce(reducer, {});\n};\n\ninterface ToIndexMultipleFieldValue {\n    value: Record<string, string>[];\n    rawValue: Record<string, string>[];\n}\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-object\",\n    fieldType: \"object\",\n    toIndex({\n        plugins,\n        model,\n        field,\n        value: initialValue,\n        rawValue: initialRawValue,\n        getFieldIndexPlugin,\n        getFieldTypePlugin\n    }) {\n        if (!initialValue) {\n            return { value: null };\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        /**\n         * In \"object\" field, value is either an object or an array of objects.\n         */\n        if (field.multipleValues) {\n            const result: ToIndexMultipleFieldValue = {\n                value: [],\n                rawValue: []\n            };\n            for (const key in initialValue) {\n                const { value, rawValue } = processToIndex({\n                    value: initialValue[key],\n                    rawValue: initialRawValue[key],\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    model,\n                    plugins,\n                    fields\n                });\n                if (Object.keys(value).length > 0) {\n                    result.value.push(value);\n                }\n\n                if (Object.keys(rawValue).length > 0) {\n                    result.rawValue.push(rawValue);\n                }\n            }\n\n            return {\n                value: result.value.length > 0 ? result.value : undefined,\n                rawValue: result.rawValue.length > 0 ? result.rawValue : undefined\n            };\n        }\n\n        return processToIndex({\n            value: initialValue,\n            rawValue: initialRawValue,\n            getFieldIndexPlugin,\n            getFieldTypePlugin,\n            model,\n            plugins,\n            fields\n        });\n    },\n    fromIndex({ field, value, rawValue, model, plugins, getFieldIndexPlugin, getFieldTypePlugin }) {\n        if (!value) {\n            return null;\n        }\n\n        const fields = field.settings?.fields || [];\n\n        /**\n         * In \"object\" field, value is either an object or an array of objects.\n         */\n        if (field.multipleValues) {\n            /**\n             * Why this `value || rawValue || []`?\n             * It's possible that an object contains all non-indexable fields, or vice-versa, and so\n             * we can never be sure which array we can reliably use as a source of values.\n             */\n            const source = value || rawValue || [];\n\n            return source.map((_: any, index: number) =>\n                processFromIndex({\n                    value: value ? value[index] || {} : {},\n                    rawValue: rawValue ? rawValue[index] || {} : {},\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    model,\n                    plugins,\n                    fields\n                })\n            );\n        }\n\n        return processFromIndex({\n            value,\n            rawValue,\n            getFieldIndexPlugin,\n            getFieldTypePlugin,\n            model,\n            plugins,\n            fields\n        });\n    }\n});\n"],"mappings":"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"}
+{"version":3,"names":["processToIndex","fields","value","sourceValue","rawValue","sourceRawValue","getFieldIndexPlugin","getFieldTypePlugin","plugins","model","reducer","values","field","plugin","type","toIndex","identifiers","getFieldIdentifiers","valueIdentifier","rawValueIdentifier","undefined","reduce","processFromIndex","fromIndex","name","fieldType","initialValue","initialRawValue","settings","multipleValues","result","key","Object","keys","length","push","source","map","_","index"],"sources":["objectIndexing.ts"],"sourcesContent":["/**\n * TODO remove rawValue when field aliases and field types targeting will be active.\n *\n * Currently we use rawValue for the values that we do not want to be indexed.\n * When field aliases and types in the value path will be active, we can target the keys directly.\n *\n * This change will be incompatible with the current systems so we will need to release a major version.\n *\n */\n\nimport { CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport {\n    CmsModel,\n    CmsModelField,\n    CmsModelFieldToGraphQLPlugin\n} from \"@webiny/api-headless-cms/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { getFieldIdentifiers } from \"~/helpers\";\n\ninterface ProcessToIndex {\n    (params: {\n        fields: CmsModelField[];\n        value: Record<string, any>;\n        rawValue: Record<string, any>;\n        getFieldIndexPlugin: (fieldType: string) => CmsModelFieldToElasticsearchPlugin;\n        getFieldTypePlugin: (fieldType: string) => CmsModelFieldToGraphQLPlugin;\n        plugins: PluginsContainer;\n        model: CmsModel;\n    }): Record<\"value\" | \"rawValue\", Record<string, any>>;\n}\n\ninterface ProcessFromIndex {\n    (params: {\n        fields: CmsModelField[];\n        value: Record<string, any>;\n        rawValue: Record<string, any>;\n        getFieldIndexPlugin: (fieldType: string) => CmsModelFieldToElasticsearchPlugin;\n        getFieldTypePlugin: (fieldType: string) => CmsModelFieldToGraphQLPlugin;\n        plugins: PluginsContainer;\n        model: CmsModel;\n    }): Record<string, any>;\n}\n\ninterface ReducerValue {\n    value: {\n        [key: string]: string;\n    };\n    rawValue: {\n        [key: string]: string;\n    };\n}\n\nconst processToIndex: ProcessToIndex = ({\n    fields,\n    value: sourceValue,\n    rawValue: sourceRawValue,\n    getFieldIndexPlugin,\n    getFieldTypePlugin,\n    plugins,\n    model\n}) => {\n    const reducer = (values: ReducerValue, field: CmsModelField) => {\n        const plugin = getFieldIndexPlugin(field.type);\n        if (!plugin || !plugin.toIndex) {\n            return values;\n        }\n\n        const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);\n        if (!identifiers) {\n            return values;\n        }\n\n        const { value, rawValue } = plugin.toIndex({\n            model,\n            field,\n            value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],\n            rawValue: sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],\n            getFieldIndexPlugin,\n            getFieldTypePlugin,\n            plugins\n        });\n\n        if (value !== undefined) {\n            values.value[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;\n        }\n        if (rawValue !== undefined) {\n            values.rawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier] =\n                rawValue;\n        }\n\n        return values;\n    };\n\n    return fields.reduce(reducer, { value: {}, rawValue: {} });\n};\nconst processFromIndex: ProcessFromIndex = ({\n    fields,\n    value: sourceValue,\n    rawValue: sourceRawValue,\n    getFieldIndexPlugin,\n    getFieldTypePlugin,\n    plugins,\n    model\n}) => {\n    const reducer = (values: Record<string, string>, field: CmsModelField) => {\n        const plugin = getFieldIndexPlugin(field.type);\n        if (!plugin || !plugin.fromIndex) {\n            return values;\n        }\n        const identifiers = getFieldIdentifiers(sourceValue, sourceRawValue, field);\n        if (!identifiers) {\n            return values;\n        }\n\n        const value = plugin.fromIndex({\n            plugins,\n            model,\n            field,\n            value: sourceValue[identifiers.valueIdentifier || identifiers.rawValueIdentifier],\n            rawValue: sourceRawValue[identifiers.rawValueIdentifier || identifiers.valueIdentifier],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (value !== undefined) {\n            values[identifiers.valueIdentifier || identifiers.rawValueIdentifier] = value;\n        }\n\n        return values;\n    };\n\n    return fields.reduce(reducer, {});\n};\n\ninterface ToIndexMultipleFieldValue {\n    value: Record<string, string>[];\n    rawValue: Record<string, string>[];\n}\n\nexport default (): CmsModelFieldToElasticsearchPlugin => ({\n    type: \"cms-model-field-to-elastic-search\",\n    name: \"cms-model-field-to-elastic-search-object\",\n    fieldType: \"object\",\n    toIndex({\n        plugins,\n        model,\n        field,\n        value: initialValue,\n        rawValue: initialRawValue,\n        getFieldIndexPlugin,\n        getFieldTypePlugin\n    }) {\n        if (!initialValue) {\n            return {\n                value: null\n            };\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        /**\n         * In \"object\" field, value is either an object or an array of objects.\n         */\n        if (field.multipleValues) {\n            const result: ToIndexMultipleFieldValue = {\n                value: [],\n                rawValue: []\n            };\n            for (const key in initialValue) {\n                const { value, rawValue } = processToIndex({\n                    value: initialValue[key],\n                    rawValue: initialRawValue[key],\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    model,\n                    plugins,\n                    fields\n                });\n                if (Object.keys(value).length > 0) {\n                    result.value.push(value);\n                }\n\n                if (Object.keys(rawValue).length > 0) {\n                    result.rawValue.push(rawValue);\n                }\n            }\n\n            return {\n                value: result.value.length > 0 ? result.value : undefined,\n                rawValue: result.rawValue.length > 0 ? result.rawValue : undefined\n            };\n        }\n\n        return processToIndex({\n            value: initialValue,\n            rawValue: initialRawValue,\n            getFieldIndexPlugin,\n            getFieldTypePlugin,\n            model,\n            plugins,\n            fields\n        });\n    },\n    fromIndex({ field, value, rawValue, model, plugins, getFieldIndexPlugin, getFieldTypePlugin }) {\n        if (!value) {\n            return null;\n        }\n\n        const fields = field.settings?.fields || [];\n\n        /**\n         * In \"object\" field, value is either an object or an array of objects.\n         */\n        if (field.multipleValues) {\n            /**\n             * Why this `value || rawValue || []`?\n             * It's possible that an object contains all non-indexable fields, or vice-versa, and so\n             * we can never be sure which array we can reliably use as a source of values.\n             */\n            const source = value || rawValue || [];\n\n            return source.map((_: any, index: number) =>\n                processFromIndex({\n                    value: value ? value[index] || {} : {},\n                    rawValue: rawValue ? rawValue[index] || {} : {},\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    model,\n                    plugins,\n                    fields\n                })\n            );\n        }\n\n        return processFromIndex({\n            value,\n            rawValue,\n            getFieldIndexPlugin,\n            getFieldTypePlugin,\n            model,\n            plugins,\n            fields\n        });\n    }\n});\n"],"mappings":"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"}

package/helpers/entryIndexHelpers.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.prepareEntryToIndex = exports.extractEntriesFromIndex = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _error = _interopRequireDefault(require("@webiny/error"));
+var _fieldIdentifier = require("./fieldIdentifier");
 const prepareEntryToIndex = params => {
   const {
     plugins,
@@ -38,7 +39,8 @@ const prepareEntryToIndex = params => {
 
   // We're only interested in current model fields.
   for (const field of model.fields) {
-    if (storageEntry.values.hasOwnProperty(field.storageId) === false) {
+    const identifier = (0, _fieldIdentifier.getFieldIdentifier)(storageEntry.values, field);
+    if (!identifier) {
       continue;
     }
     const targetFieldPlugin = getFieldIndexPlugin(field.type);
@@ -54,16 +56,16 @@ const prepareEntryToIndex = params => {
       plugins,
       model,
       field,
-      rawValue: entry.values[field.storageId],
-      value: storageEntry.values[field.storageId],
+      rawValue: entry.values[identifier],
+      value: storageEntry.values[identifier],
       getFieldIndexPlugin,
       getFieldTypePlugin
     });
     if (typeof value !== "undefined") {
-      values[field.storageId] = value;
+      values[identifier] = value;
     }
     if (typeof rawValue !== "undefined") {
-      rawValues[field.storageId] = rawValue;
+      rawValues[identifier] = rawValue;
     }
   }
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, storageEntry), {}, {
@@ -129,18 +131,25 @@ const extractEntriesFromIndex = ({
       if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {
         continue;
       }
+      /**
+       * We can safely cast as the code will not continue in case of no identifiers.
+       */
+      const identifiers = (0, _fieldIdentifier.getFieldIdentifiers)(entry.values, entry.rawValues, field);
+      if (!identifiers) {
+        continue;
+      }
       try {
-        indexValues[field.storageId] = targetFieldPlugin.fromIndex({
+        indexValues[identifiers.valueIdentifier] = targetFieldPlugin.fromIndex({
           plugins,
           model,
           field,
           getFieldIndexPlugin,
           getFieldTypePlugin,
-          value: entry.values[field.storageId],
+          value: entry.values[identifiers.valueIdentifier || identifiers.rawValueIdentifier],
           /**
            * Possibly no rawValues so we must check for the existence of the field.
            */
-          rawValue: entry.rawValues ? entry.rawValues[field.storageId] : null
+          rawValue: entry.rawValues ? entry.rawValues[identifiers.rawValueIdentifier || identifiers.valueIdentifier] : null
         });
       } catch (ex) {
         throw new _error.default(ex.message || "Could not transform entry field from index.", ex.code || "FIELD_FROM_INDEX_ERROR", {

package/helpers/entryIndexHelpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["prepareEntryToIndex","params","plugins","storageEntry","entry","model","fieldIndexPlugins","defaultIndexFieldPlugin","fieldTypePlugins","setupEntriesIndexHelpers","getFieldIndexPlugin","fieldType","getFieldTypePlugin","pl","WebinyError","values","rawValues","field","fields","hasOwnProperty","storageId","targetFieldPlugin","type","toIndex","value","rawValue","pluginsContainer","byType","plugin","reverse","find","reduce","extractEntriesFromIndex","entries","list","indexValues","fieldTypePlugin","fromIndex","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport { CmsIndexEntry, CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\n\ninterface SetupEntriesIndexHelpersParams {\n    plugins: PluginsContainer;\n}\n\ninterface ExtractEntriesFromIndexParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry[];\n}\n\ninterface PrepareElasticsearchDataParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entry: CmsEntry;\n    storageEntry: CmsEntry;\n}\n\nexport const prepareEntryToIndex = (params: PrepareElasticsearchDataParams): CmsIndexEntry => {\n    const { plugins, storageEntry, entry, model } = params;\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        const pl = fieldTypePlugins[fieldType];\n        if (pl) {\n            return pl;\n        }\n        throw new WebinyError(`Missing field type plugin \"${fieldType}\". Prepare entry for index.`);\n    }\n\n    // These objects will contain values processed by field index plugins\n    const values: Record<string, string> = {};\n    const rawValues: Record<string, string> = {};\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        if (storageEntry.values.hasOwnProperty(field.storageId) === false) {\n            continue;\n        }\n\n        const targetFieldPlugin = getFieldIndexPlugin(field.type);\n\n        // TODO: remove this `if` once we convert this plugin to proper plugin class\n        if (!targetFieldPlugin || !targetFieldPlugin.toIndex) {\n            continue;\n        }\n\n        const { value, rawValue } = targetFieldPlugin.toIndex({\n            plugins,\n            model,\n            field,\n            rawValue: entry.values[field.storageId],\n            value: storageEntry.values[field.storageId],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[field.storageId] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[field.storageId] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    } as CmsIndexEntry;\n};\n\nconst setupEntriesIndexHelpers = ({\n    plugins: pluginsContainer\n}: SetupEntriesIndexHelpersParams) => {\n    const plugins = pluginsContainer.byType<CmsModelFieldToElasticsearchPlugin>(\n        \"cms-model-field-to-elastic-search\"\n    );\n\n    const fieldIndexPlugins: Record<string, CmsModelFieldToElasticsearchPlugin> = {};\n    for (const plugin of plugins.reverse()) {\n        if (fieldIndexPlugins[plugin.fieldType]) {\n            continue;\n        }\n        fieldIndexPlugins[plugin.fieldType] = plugin;\n    }\n    // we will use this plugin if no targeted plugin found\n    const defaultIndexFieldPlugin = plugins.find(plugin => plugin.fieldType === \"*\");\n\n    // CmsModelFieldToGraphQLPlugin plugins\n    const fieldTypePlugins: Record<string, CmsModelFieldToGraphQLPlugin> = pluginsContainer\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce((plugins, plugin) => ({ ...plugins, [plugin.fieldType]: plugin }), {});\n\n    return {\n        fieldIndexPlugins,\n        defaultIndexFieldPlugin,\n        fieldTypePlugins\n    };\n};\n\nexport const extractEntriesFromIndex = ({\n    plugins,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams): CmsEntry[] => {\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        return fieldTypePlugins[fieldType];\n    }\n\n    const list: CmsEntry[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: Record<string, string> = {};\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldTypePlugin = fieldTypePlugins[field.type];\n            if (!fieldTypePlugin) {\n                throw new WebinyError(\n                    `Missing field type plugin \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const targetFieldPlugin = getFieldIndexPlugin(field.type);\n            if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {\n                continue;\n            }\n            try {\n                indexValues[field.storageId] = targetFieldPlugin.fromIndex({\n                    plugins,\n                    model,\n                    field,\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    value: entry.values[field.storageId],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues ? entry.rawValues[field.storageId] : null\n                });\n            } catch (ex) {\n                throw new WebinyError(\n                    ex.message || \"Could not transform entry field from index.\",\n                    ex.code || \"FIELD_FROM_INDEX_ERROR\",\n                    {\n                        field,\n                        entry\n                    }\n                );\n            }\n        }\n        /**\n         * Let's have a new entry so we do not modify the original one.\n         */\n        const newEntry: CmsEntry = {\n            ...entry,\n            values: indexValues\n        };\n        /**\n         * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.\n         */\n        // @ts-ignore\n        delete newEntry[\"rawValues\"];\n        // @ts-ignore\n        delete newEntry[\"TYPE\"];\n        // @ts-ignore\n        delete newEntry[\"__type\"];\n        // @ts-ignore\n        delete newEntry[\"latest\"];\n        // @ts-ignore\n        delete newEntry[\"published\"];\n        list.push({ ...newEntry });\n    }\n\n    return list;\n};\n"],"mappings":"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"}
+{"version":3,"names":["prepareEntryToIndex","params","plugins","storageEntry","entry","model","fieldIndexPlugins","defaultIndexFieldPlugin","fieldTypePlugins","setupEntriesIndexHelpers","getFieldIndexPlugin","fieldType","getFieldTypePlugin","pl","WebinyError","values","rawValues","field","fields","identifier","getFieldIdentifier","targetFieldPlugin","type","toIndex","value","rawValue","pluginsContainer","byType","plugin","reverse","find","reduce","extractEntriesFromIndex","entries","list","indexValues","fieldTypePlugin","fromIndex","identifiers","getFieldIdentifiers","valueIdentifier","rawValueIdentifier","ex","message","code","newEntry","push"],"sources":["entryIndexHelpers.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { CmsEntry, CmsModel, CmsModelFieldToGraphQLPlugin } from \"@webiny/api-headless-cms/types\";\nimport { CmsIndexEntry, CmsModelFieldToElasticsearchPlugin } from \"~/types\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { getFieldIdentifier, getFieldIdentifiers } from \"~/helpers/fieldIdentifier\";\n\ninterface SetupEntriesIndexHelpersParams {\n    plugins: PluginsContainer;\n}\n\ninterface ExtractEntriesFromIndexParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entries: CmsIndexEntry[];\n}\n\ninterface PrepareElasticsearchDataParams extends SetupEntriesIndexHelpersParams {\n    model: CmsModel;\n    entry: CmsEntry;\n    storageEntry: CmsEntry;\n}\n\nexport const prepareEntryToIndex = (params: PrepareElasticsearchDataParams): CmsIndexEntry => {\n    const { plugins, storageEntry, entry, model } = params;\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        const pl = fieldTypePlugins[fieldType];\n        if (pl) {\n            return pl;\n        }\n        throw new WebinyError(`Missing field type plugin \"${fieldType}\". Prepare entry for index.`);\n    }\n\n    // These objects will contain values processed by field index plugins\n    const values: Record<string, string> = {};\n    const rawValues: Record<string, string> = {};\n\n    // We're only interested in current model fields.\n    for (const field of model.fields) {\n        const identifier = getFieldIdentifier(storageEntry.values, field);\n        if (!identifier) {\n            continue;\n        }\n\n        const targetFieldPlugin = getFieldIndexPlugin(field.type);\n\n        // TODO: remove this `if` once we convert this plugin to proper plugin class\n        if (!targetFieldPlugin || !targetFieldPlugin.toIndex) {\n            continue;\n        }\n\n        const { value, rawValue } = targetFieldPlugin.toIndex({\n            plugins,\n            model,\n            field,\n            rawValue: entry.values[identifier],\n            value: storageEntry.values[identifier],\n            getFieldIndexPlugin,\n            getFieldTypePlugin\n        });\n\n        if (typeof value !== \"undefined\") {\n            values[identifier] = value;\n        }\n\n        if (typeof rawValue !== \"undefined\") {\n            rawValues[identifier] = rawValue;\n        }\n    }\n    return {\n        ...storageEntry,\n        values,\n        rawValues\n    } as CmsIndexEntry;\n};\n\nconst setupEntriesIndexHelpers = ({\n    plugins: pluginsContainer\n}: SetupEntriesIndexHelpersParams) => {\n    const plugins = pluginsContainer.byType<CmsModelFieldToElasticsearchPlugin>(\n        \"cms-model-field-to-elastic-search\"\n    );\n\n    const fieldIndexPlugins: Record<string, CmsModelFieldToElasticsearchPlugin> = {};\n    for (const plugin of plugins.reverse()) {\n        if (fieldIndexPlugins[plugin.fieldType]) {\n            continue;\n        }\n        fieldIndexPlugins[plugin.fieldType] = plugin;\n    }\n    // we will use this plugin if no targeted plugin found\n    const defaultIndexFieldPlugin = plugins.find(plugin => plugin.fieldType === \"*\");\n\n    // CmsModelFieldToGraphQLPlugin plugins\n    const fieldTypePlugins: Record<string, CmsModelFieldToGraphQLPlugin> = pluginsContainer\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce((plugins, plugin) => ({ ...plugins, [plugin.fieldType]: plugin }), {});\n\n    return {\n        fieldIndexPlugins,\n        defaultIndexFieldPlugin,\n        fieldTypePlugins\n    };\n};\n\nexport const extractEntriesFromIndex = ({\n    plugins,\n    entries,\n    model\n}: ExtractEntriesFromIndexParams): CmsEntry[] => {\n    const { fieldIndexPlugins, defaultIndexFieldPlugin, fieldTypePlugins } =\n        setupEntriesIndexHelpers({ plugins });\n\n    function getFieldIndexPlugin(fieldType: string) {\n        return fieldIndexPlugins[fieldType] || defaultIndexFieldPlugin;\n    }\n\n    function getFieldTypePlugin(fieldType: string) {\n        return fieldTypePlugins[fieldType];\n    }\n\n    const list: CmsEntry[] = [];\n\n    for (const entry of entries) {\n        // This object will contain values processed by field index plugins\n        const indexValues: Record<string, string> = {};\n\n        // We only consider fields that are present in the model\n        for (const field of model.fields) {\n            const fieldTypePlugin = fieldTypePlugins[field.type];\n            if (!fieldTypePlugin) {\n                throw new WebinyError(\n                    `Missing field type plugin \"${field.type}\". Extract entries from index.`\n                );\n            }\n\n            const targetFieldPlugin = getFieldIndexPlugin(field.type);\n            if (!targetFieldPlugin || !targetFieldPlugin.fromIndex) {\n                continue;\n            }\n            /**\n             * We can safely cast as the code will not continue in case of no identifiers.\n             */\n            const identifiers = getFieldIdentifiers(entry.values, entry.rawValues, field);\n            if (!identifiers) {\n                continue;\n            }\n\n            try {\n                indexValues[identifiers.valueIdentifier] = targetFieldPlugin.fromIndex({\n                    plugins,\n                    model,\n                    field,\n                    getFieldIndexPlugin,\n                    getFieldTypePlugin,\n                    value: entry.values[\n                        identifiers.valueIdentifier || identifiers.rawValueIdentifier\n                    ],\n                    /**\n                     * Possibly no rawValues so we must check for the existence of the field.\n                     */\n                    rawValue: entry.rawValues\n                        ? entry.rawValues[\n                              identifiers.rawValueIdentifier || identifiers.valueIdentifier\n                          ]\n                        : null\n                });\n            } catch (ex) {\n                throw new WebinyError(\n                    ex.message || \"Could not transform entry field from index.\",\n                    ex.code || \"FIELD_FROM_INDEX_ERROR\",\n                    {\n                        field,\n                        entry\n                    }\n                );\n            }\n        }\n        /**\n         * Let's have a new entry so we do not modify the original one.\n         */\n        const newEntry: CmsEntry = {\n            ...entry,\n            values: indexValues\n        };\n        /**\n         * If we want to remove the rawValues, TYPE, latest, published and __type, we must make them optional or ignore them.\n         */\n        // @ts-ignore\n        delete newEntry[\"rawValues\"];\n        // @ts-ignore\n        delete newEntry[\"TYPE\"];\n        // @ts-ignore\n        delete newEntry[\"__type\"];\n        // @ts-ignore\n        delete newEntry[\"latest\"];\n        // @ts-ignore\n        delete newEntry[\"published\"];\n        list.push({ ...newEntry });\n    }\n\n    return list;\n};\n"],"mappings":"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"}

package/helpers/fieldIdentifier.d.ts

@@ -0,0 +1,6 @@
+import { CmsEntryValues, CmsModelField } from "@webiny/api-headless-cms/types";
+export declare const getFieldIdentifier: (values: CmsEntryValues, field: CmsModelField) => string | undefined;
+export declare const getFieldIdentifiers: (values: CmsEntryValues, rawValues: CmsEntryValues, field: CmsModelField) => {
+    valueIdentifier: string;
+    rawValueIdentifier: string;
+} | null;

package/helpers/fieldIdentifier.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFieldIdentifiers = exports.getFieldIdentifier = void 0;
+const hasOwnProperty = (values = {}, property) => {
+  if (values.hasOwnProperty) {
+    return values.hasOwnProperty(property);
+  }
+  return values[property] !== undefined;
+};
+const getFieldIdentifier = (values, field) => {
+  if (field.storageId && hasOwnProperty(values, field.storageId)) {
+    return field.storageId;
+  } else if (hasOwnProperty(values, field.fieldId)) {
+    return field.fieldId;
+  }
+  return undefined;
+};
+exports.getFieldIdentifier = getFieldIdentifier;
+const getFieldIdentifiers = (values, rawValues, field) => {
+  let valueIdentifier = getFieldIdentifier(values, field);
+  let rawValueIdentifier = getFieldIdentifier(rawValues, field);
+  if (!valueIdentifier && !rawValueIdentifier) {
+    return null;
+  }
+  if (!valueIdentifier) {
+    valueIdentifier = rawValueIdentifier;
+  }
+  if (!rawValueIdentifier) {
+    rawValueIdentifier = valueIdentifier;
+  }
+  return {
+    valueIdentifier,
+    rawValueIdentifier
+  };
+};
+exports.getFieldIdentifiers = getFieldIdentifiers;

package/helpers/fieldIdentifier.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["hasOwnProperty","values","property","undefined","getFieldIdentifier","field","storageId","fieldId","getFieldIdentifiers","rawValues","valueIdentifier","rawValueIdentifier"],"sources":["fieldIdentifier.ts"],"sourcesContent":["import { CmsEntryValues, CmsModelField } from \"@webiny/api-headless-cms/types\";\n\nconst hasOwnProperty = (values: CmsEntryValues = {}, property: string): boolean => {\n    if (values.hasOwnProperty) {\n        return values.hasOwnProperty(property);\n    }\n    return values[property] !== undefined;\n};\n\nexport const getFieldIdentifier = (\n    values: CmsEntryValues,\n    field: CmsModelField\n): string | undefined => {\n    if (field.storageId && hasOwnProperty(values, field.storageId)) {\n        return field.storageId;\n    } else if (hasOwnProperty(values, field.fieldId)) {\n        return field.fieldId;\n    }\n    return undefined;\n};\n\nexport const getFieldIdentifiers = (\n    values: CmsEntryValues,\n    rawValues: CmsEntryValues,\n    field: CmsModelField\n) => {\n    let valueIdentifier = getFieldIdentifier(values, field);\n    let rawValueIdentifier = getFieldIdentifier(rawValues, field);\n    if (!valueIdentifier && !rawValueIdentifier) {\n        return null;\n    }\n    if (!valueIdentifier) {\n        valueIdentifier = rawValueIdentifier as string;\n    }\n    if (!rawValueIdentifier) {\n        rawValueIdentifier = valueIdentifier as string;\n    }\n    return {\n        valueIdentifier,\n        rawValueIdentifier\n    };\n};\n"],"mappings":";;;;;;AAEA,MAAMA,cAAc,GAAG,CAACC,MAAsB,GAAG,CAAC,CAAC,EAAEC,QAAgB,KAAc;EAC/E,IAAID,MAAM,CAACD,cAAc,EAAE;IACvB,OAAOC,MAAM,CAACD,cAAc,CAACE,QAAQ,CAAC;EAC1C;EACA,OAAOD,MAAM,CAACC,QAAQ,CAAC,KAAKC,SAAS;AACzC,CAAC;AAEM,MAAMC,kBAAkB,GAAG,CAC9BH,MAAsB,EACtBI,KAAoB,KACC;EACrB,IAAIA,KAAK,CAACC,SAAS,IAAIN,cAAc,CAACC,MAAM,EAAEI,KAAK,CAACC,SAAS,CAAC,EAAE;IAC5D,OAAOD,KAAK,CAACC,SAAS;EAC1B,CAAC,MAAM,IAAIN,cAAc,CAACC,MAAM,EAAEI,KAAK,CAACE,OAAO,CAAC,EAAE;IAC9C,OAAOF,KAAK,CAACE,OAAO;EACxB;EACA,OAAOJ,SAAS;AACpB,CAAC;AAAC;AAEK,MAAMK,mBAAmB,GAAG,CAC/BP,MAAsB,EACtBQ,SAAyB,EACzBJ,KAAoB,KACnB;EACD,IAAIK,eAAe,GAAGN,kBAAkB,CAACH,MAAM,EAAEI,KAAK,CAAC;EACvD,IAAIM,kBAAkB,GAAGP,kBAAkB,CAACK,SAAS,EAAEJ,KAAK,CAAC;EAC7D,IAAI,CAACK,eAAe,IAAI,CAACC,kBAAkB,EAAE;IACzC,OAAO,IAAI;EACf;EACA,IAAI,CAACD,eAAe,EAAE;IAClBA,eAAe,GAAGC,kBAA4B;EAClD;EACA,IAAI,CAACA,kBAAkB,EAAE;IACrBA,kBAAkB,GAAGD,eAAyB;EAClD;EACA,OAAO;IACHA,eAAe;IACfC;EACJ,CAAC;AACL,CAAC;AAAC"}

package/helpers/index.d.ts

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

package/helpers/index.js

@@ -13,4 +13,15 @@ Object.keys(_entryIndexHelpers).forEach(function (key) {
       return _entryIndexHelpers[key];
     }
   });
+});
+var _fieldIdentifier = require("./fieldIdentifier");
+Object.keys(_fieldIdentifier).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _fieldIdentifier[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fieldIdentifier[key];
+    }
+  });
 });

package/helpers/index.js.map

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

package/index.js

@@ -120,6 +120,12 @@ const createStorageOperations = params => {
    * They are at the end because we can then override existing plugins.
    */
   ...(userPlugins || [])]);
+  const entries = (0, _entry.createEntriesStorageOperations)({
+    entity: entities.entries,
+    esEntity: entities.entriesEs,
+    plugins,
+    elasticsearch
+  });
   return {
     name: "dynamodb:elasticsearch",
     beforeInit: async context => {
@@ -141,10 +147,11 @@ const createStorageOperations = params => {
       // Elasticsearch
       _apiElasticsearch.CompressionPlugin.type, _apiElasticsearch.ElasticsearchQueryBuilderOperatorPlugin.type,
       // Headless CMS
-      "cms-model-field-to-graphql", _CmsEntryFilterPlugin.CmsEntryFilterPlugin.type, _plugins2.CmsEntryElasticsearchBodyModifierPlugin.type, _plugins2.CmsEntryElasticsearchFullTextSearchPlugin.type, _plugins2.CmsEntryElasticsearchIndexPlugin.type, _plugins2.CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type, _plugins2.CmsEntryElasticsearchQueryModifierPlugin.type, _plugins2.CmsEntryElasticsearchSortModifierPlugin.type, _plugins2.CmsEntryElasticsearchFieldPlugin.type, _apiHeadlessCms.StorageOperationsCmsModelPlugin.type];
+      "cms-model-field-to-graphql", _CmsEntryFilterPlugin.CmsEntryFilterPlugin.type, _plugins2.CmsEntryElasticsearchBodyModifierPlugin.type, _plugins2.CmsEntryElasticsearchFullTextSearchPlugin.type, _plugins2.CmsEntryElasticsearchIndexPlugin.type, _plugins2.CmsEntryElasticsearchQueryBuilderValueSearchPlugin.type, _plugins2.CmsEntryElasticsearchQueryModifierPlugin.type, _plugins2.CmsEntryElasticsearchSortModifierPlugin.type, _plugins2.CmsElasticsearchModelFieldPlugin.type, _apiHeadlessCms.StorageOperationsCmsModelPlugin.type];
       for (const type of types) {
         plugins.mergeByType(context.plugins, type);
       }
+      entries.dataLoaders.clearAll();
     },
     init: async context => {
       /**
@@ -204,12 +211,7 @@ const createStorageOperations = params => {
       entity: entities.models,
       elasticsearch
     }),
-    entries: (0, _entry.createEntriesStorageOperations)({
-      entity: entities.entries,
-      esEntity: entities.entriesEs,
-      plugins,
-      elasticsearch
-    })
+    entries
   };
 };
 exports.createStorageOperations = createStorageOperations;