@webiny/api-headless-cms 6.4.12-beta.4 → 6.5.0-beta.0

package/features/storage/fields/ObjectStorageTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/storage/fields/ObjectStorageTransform.js","sources":["../../../../src/features/storage/fields/ObjectStorageTransform.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport pMap from \"p-map\";\nimport type { CmsModel, CmsModelField } from \"~/types/index.js\";\nimport { StorageTransform } from \"../abstractions/StorageTransform.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ninterface ProcessValueParams {\n    fields: CmsModelField[];\n    sourceValue: GenericRecord;\n    getStorageTransform: (fieldType: string) => StorageTransform.Interface;\n    model: CmsModel;\n    operation: \"toStorage\" | \"fromStorage\";\n}\ninterface ProcessValue {\n    (params: ProcessValueParams): Promise<GenericRecord>;\n}\n\nconst processValue: ProcessValue = async params => {\n    const { fields, sourceValue, getStorageTransform, model, operation } = params;\n    return await pReduce(\n        fields,\n        async (values, field) => {\n            const baseType = getBaseFieldType(field);\n            const storageTransform = getStorageTransform(baseType);\n            if (!storageTransform) {\n                throw new Error(`Missing storage transform for field type \"${baseType}\".`);\n            }\n            const input = sourceValue[field.fieldId];\n            const value = await storageTransform[operation]({\n                model,\n                field,\n                value: input,\n                getStorageTransform\n            });\n            return { ...values, [field.fieldId]: value };\n        },\n        {}\n    );\n};\n\nclass StorageTransformImpl implements StorageTransform.Interface {\n    public readonly fieldType = \"object\";\n\n    public async toStorage(\n        params: StorageTransform.ToStorageParams\n    ): StorageTransform.ToStorageResponse {\n        const { value, field, getStorageTransform, model } = params;\n        if (!value) {\n            return null;\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        if (field.list) {\n            return await pMap(value as GenericRecord[], value =>\n                processValue({\n                    sourceValue: value,\n                    getStorageTransform,\n                    model,\n                    operation: \"toStorage\",\n                    fields\n                })\n            );\n        }\n\n        return await processValue({\n            sourceValue: value,\n            getStorageTransform,\n            model,\n            operation: \"toStorage\",\n            fields\n        });\n    }\n\n    public async fromStorage(\n        params: StorageTransform.FromStorageParams\n    ): StorageTransform.FromStorageResponse {\n        const { field, value: input, getStorageTransform, model } = params;\n        if (!input) {\n            return null;\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        if (field.list) {\n            const values = input as GenericRecord[];\n\n            return await Promise.all(\n                values.map(async value => {\n                    return await processValue({\n                        sourceValue: value,\n                        getStorageTransform,\n                        model,\n                        operation: \"fromStorage\",\n                        fields\n                    });\n                })\n            );\n        }\n\n        return await processValue({\n            sourceValue: input,\n            getStorageTransform,\n            model,\n            operation: \"fromStorage\",\n            fields\n        });\n    }\n}\n\nexport const ObjectStorageTransform = StorageTransform.createImplementation({\n    implementation: StorageTransformImpl,\n    dependencies: []\n});\n"],"names":["processValue","params","fields","sourceValue","getStorageTransform","model","operation","pReduce","values","field","baseType","getBaseFieldType","storageTransform","Error","input","value","StorageTransformImpl","pMap","Promise","ObjectStorageTransform","StorageTransform"],"mappings":";;;;AAkBA,MAAMA,eAA6B,OAAMC;IACrC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,mBAAmB,EAAEC,KAAK,EAAEC,SAAS,EAAE,GAAGL;IACvE,OAAO,MAAMM,SACTL,QACA,OAAOM,QAAQC;QACX,MAAMC,WAAWC,iBAAiBF;QAClC,MAAMG,mBAAmBR,oBAAoBM;QAC7C,IAAI,CAACE,kBACD,MAAM,IAAIC,MAAM,CAAC,0CAA0C,EAAEH,SAAS,EAAE,CAAC;QAE7E,MAAMI,QAAQX,WAAW,CAACM,MAAM,OAAO,CAAC;QACxC,MAAMM,QAAQ,MAAMH,gBAAgB,CAACN,UAAU,CAAC;YAC5CD;YACAI;YACA,OAAOK;YACPV;QACJ;QACA,OAAO;YAAE,GAAGI,MAAM;YAAE,CAACC,MAAM,OAAO,CAAC,EAAEM;QAAM;IAC/C,GACA,CAAC;AAET;AAEA,MAAMC;IAGF,MAAa,UACTf,MAAwC,EACN;QAClC,MAAM,EAAEc,KAAK,EAAEN,KAAK,EAAEL,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QACrD,IAAI,CAACc,OACD,OAAO;QAGX,MAAMb,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EACV,OAAO,MAAMQ,MAAKF,OAA0BA,CAAAA,QACxCf,aAAa;gBACT,aAAae;gBACbX;gBACAC;gBACA,WAAW;gBACXH;YACJ;QAIR,OAAO,MAAMF,aAAa;YACtB,aAAae;YACbX;YACAC;YACA,WAAW;YACXH;QACJ;IACJ;IAEA,MAAa,YACTD,MAA0C,EACN;QACpC,MAAM,EAAEQ,KAAK,EAAE,OAAOK,KAAK,EAAEV,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QAC5D,IAAI,CAACa,OACD,OAAO;QAGX,MAAMZ,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EAAE;YACZ,MAAMD,SAASM;YAEf,OAAO,MAAMI,QAAQ,GAAG,CACpBV,OAAO,GAAG,CAAC,OAAMO,QACN,MAAMf,aAAa;oBACtB,aAAae;oBACbX;oBACAC;oBACA,WAAW;oBACXH;gBACJ;QAGZ;QAEA,OAAO,MAAMF,aAAa;YACtB,aAAac;YACbV;YACAC;YACA,WAAW;YACXH;QACJ;IACJ;;aAlEgB,SAAS,GAAG;;AAmEhC;AAEO,MAAMiB,yBAAyBC,iBAAiB,oBAAoB,CAAC;IACxE,gBAAgBJ;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/storage/fields/ObjectStorageTransform.js","sources":["../../../../src/features/storage/fields/ObjectStorageTransform.ts"],"sourcesContent":["import pReduce from \"p-reduce\";\nimport pMap from \"p-map\";\nimport type { CmsModel, CmsModelField } from \"~/types/index.js\";\nimport { StorageTransform } from \"../abstractions/StorageTransform.js\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ninterface ProcessValueParams {\n    fields: CmsModelField[];\n    sourceValue: GenericRecord;\n    getStorageTransform: (fieldType: string) => StorageTransform.Interface;\n    model: CmsModel;\n    operation: \"toStorage\" | \"fromStorage\";\n}\ninterface ProcessValue {\n    (params: ProcessValueParams): Promise<GenericRecord>;\n}\n\nconst processValue: ProcessValue = async params => {\n    const { fields, sourceValue, getStorageTransform, model, operation } = params;\n    return await pReduce(\n        fields,\n        async (values, field) => {\n            const baseType = getBaseFieldType(field);\n            const storageTransform = getStorageTransform(baseType);\n            if (!storageTransform) {\n                throw new Error(`Missing storage transform for field type \"${baseType}\".`);\n            }\n            const input = sourceValue[field.fieldId];\n            const value = await storageTransform[operation]({\n                model,\n                field,\n                value: input,\n                getStorageTransform\n            });\n            return { ...values, [field.fieldId]: value };\n        },\n        {}\n    );\n};\n\nclass StorageTransformImpl implements StorageTransform.Interface {\n    public readonly fieldType = \"object\";\n\n    public async toStorage(\n        params: StorageTransform.ToStorageParams\n    ): StorageTransform.ToStorageResponse {\n        const { value, field, getStorageTransform, model } = params;\n        if (!value) {\n            return null;\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        if (field.list) {\n            return await pMap(value as GenericRecord[], async itemValue => {\n                const processed = await processValue({\n                    sourceValue: itemValue,\n                    getStorageTransform,\n                    model,\n                    operation: \"toStorage\",\n                    fields\n                });\n                return itemValue._id ? { _id: itemValue._id, ...processed } : processed;\n            });\n        }\n\n        const processed = await processValue({\n            sourceValue: value,\n            getStorageTransform,\n            model,\n            operation: \"toStorage\",\n            fields\n        });\n        return value._id ? { _id: value._id, ...processed } : processed;\n    }\n\n    public async fromStorage(\n        params: StorageTransform.FromStorageParams\n    ): StorageTransform.FromStorageResponse {\n        const { field, value: input, getStorageTransform, model } = params;\n        if (!input) {\n            return null;\n        }\n\n        const fields = (field.settings?.fields || []) as CmsModelField[];\n\n        if (field.list) {\n            const values = input as GenericRecord[];\n\n            return await Promise.all(\n                values.map(async value => {\n                    const processed = await processValue({\n                        sourceValue: value,\n                        getStorageTransform,\n                        model,\n                        operation: \"fromStorage\",\n                        fields\n                    });\n                    return value._id ? { _id: value._id, ...processed } : processed;\n                })\n            );\n        }\n\n        const processed = await processValue({\n            sourceValue: input,\n            getStorageTransform,\n            model,\n            operation: \"fromStorage\",\n            fields\n        });\n        return input._id ? { _id: input._id, ...processed } : processed;\n    }\n}\n\nexport const ObjectStorageTransform = StorageTransform.createImplementation({\n    implementation: StorageTransformImpl,\n    dependencies: []\n});\n"],"names":["processValue","params","fields","sourceValue","getStorageTransform","model","operation","pReduce","values","field","baseType","getBaseFieldType","storageTransform","Error","input","value","StorageTransformImpl","pMap","itemValue","processed","Promise","ObjectStorageTransform","StorageTransform"],"mappings":";;;;AAkBA,MAAMA,eAA6B,OAAMC;IACrC,MAAM,EAAEC,MAAM,EAAEC,WAAW,EAAEC,mBAAmB,EAAEC,KAAK,EAAEC,SAAS,EAAE,GAAGL;IACvE,OAAO,MAAMM,SACTL,QACA,OAAOM,QAAQC;QACX,MAAMC,WAAWC,iBAAiBF;QAClC,MAAMG,mBAAmBR,oBAAoBM;QAC7C,IAAI,CAACE,kBACD,MAAM,IAAIC,MAAM,CAAC,0CAA0C,EAAEH,SAAS,EAAE,CAAC;QAE7E,MAAMI,QAAQX,WAAW,CAACM,MAAM,OAAO,CAAC;QACxC,MAAMM,QAAQ,MAAMH,gBAAgB,CAACN,UAAU,CAAC;YAC5CD;YACAI;YACA,OAAOK;YACPV;QACJ;QACA,OAAO;YAAE,GAAGI,MAAM;YAAE,CAACC,MAAM,OAAO,CAAC,EAAEM;QAAM;IAC/C,GACA,CAAC;AAET;AAEA,MAAMC;IAGF,MAAa,UACTf,MAAwC,EACN;QAClC,MAAM,EAAEc,KAAK,EAAEN,KAAK,EAAEL,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QACrD,IAAI,CAACc,OACD,OAAO;QAGX,MAAMb,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EACV,OAAO,MAAMQ,MAAKF,OAA0B,OAAMG;YAC9C,MAAMC,YAAY,MAAMnB,aAAa;gBACjC,aAAakB;gBACbd;gBACAC;gBACA,WAAW;gBACXH;YACJ;YACA,OAAOgB,UAAU,GAAG,GAAG;gBAAE,KAAKA,UAAU,GAAG;gBAAE,GAAGC,SAAS;YAAC,IAAIA;QAClE;QAGJ,MAAMA,YAAY,MAAMnB,aAAa;YACjC,aAAae;YACbX;YACAC;YACA,WAAW;YACXH;QACJ;QACA,OAAOa,MAAM,GAAG,GAAG;YAAE,KAAKA,MAAM,GAAG;YAAE,GAAGI,SAAS;QAAC,IAAIA;IAC1D;IAEA,MAAa,YACTlB,MAA0C,EACN;QACpC,MAAM,EAAEQ,KAAK,EAAE,OAAOK,KAAK,EAAEV,mBAAmB,EAAEC,KAAK,EAAE,GAAGJ;QAC5D,IAAI,CAACa,OACD,OAAO;QAGX,MAAMZ,SAAUO,MAAM,QAAQ,EAAE,UAAU,EAAE;QAE5C,IAAIA,MAAM,IAAI,EAAE;YACZ,MAAMD,SAASM;YAEf,OAAO,MAAMM,QAAQ,GAAG,CACpBZ,OAAO,GAAG,CAAC,OAAMO;gBACb,MAAMI,YAAY,MAAMnB,aAAa;oBACjC,aAAae;oBACbX;oBACAC;oBACA,WAAW;oBACXH;gBACJ;gBACA,OAAOa,MAAM,GAAG,GAAG;oBAAE,KAAKA,MAAM,GAAG;oBAAE,GAAGI,SAAS;gBAAC,IAAIA;YAC1D;QAER;QAEA,MAAMA,YAAY,MAAMnB,aAAa;YACjC,aAAac;YACbV;YACAC;YACA,WAAW;YACXH;QACJ;QACA,OAAOY,MAAM,GAAG,GAAG;YAAE,KAAKA,MAAM,GAAG;YAAE,GAAGK,SAAS;QAAC,IAAIA;IAC1D;;aAtEgB,SAAS,GAAG;;AAuEhC;AAEO,MAAME,yBAAyBC,iBAAiB,oBAAoB,CAAC;IACxE,gBAAgBN;IAChB,cAAc,EAAE;AACpB"}

package/features/storage/fields/RichTextStorageTransform.js

@@ -8,7 +8,7 @@ class RichTextStorageTransformImpl {
     }
     async fromStorage({ field, value: storageValue }) {
         if (!storageValue) return storageValue;
-        else if ("object" != typeof storageValue) throw new WebinyError(`RichText value received in "fromStorage" function is not an object in field "${field.storageId}" - ${field.fieldId}.`);
+        if ("object" != typeof storageValue) throw new WebinyError(`RichText value received in "fromStorage" function is not an object in field "${field.storageId}" - ${field.fieldId}.`);
         try {
             return await this.compressionHandler.decompress(storageValue);
         } catch  {

package/features/storage/fields/RichTextStorageTransform.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/storage/fields/RichTextStorageTransform.js","sources":["../../../../src/features/storage/fields/RichTextStorageTransform.ts"],"sourcesContent":["import { StorageTransform } from \"../abstractions/StorageTransform.js\";\nimport { WebinyError } from \"@webiny/error\";\nimport { CompressionHandler } from \"@webiny/utils/exports/api.js\";\n\nclass RichTextStorageTransformImpl implements StorageTransform.Interface {\n    public readonly fieldType = \"rich-text\";\n\n    public constructor(private readonly compressionHandler: CompressionHandler.Interface) {}\n\n    public async fromStorage({\n        field,\n        value: storageValue\n    }: StorageTransform.FromStorageParams): StorageTransform.FromStorageResponse {\n        if (!storageValue) {\n            return storageValue;\n        } else if (typeof storageValue !== \"object\") {\n            throw new WebinyError(\n                `RichText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n            );\n        }\n\n        try {\n            return await this.compressionHandler.decompress(storageValue);\n        } catch {\n            return storageValue;\n        }\n    }\n\n    public async toStorage({\n        value\n    }: StorageTransform.ToStorageParams): StorageTransform.ToStorageResponse {\n        try {\n            return await this.compressionHandler.compress(value);\n        } catch {\n            return value;\n        }\n    }\n}\n\nexport const RichTextStorageTransform = StorageTransform.createImplementation({\n    implementation: RichTextStorageTransformImpl,\n    dependencies: [CompressionHandler]\n});\n"],"names":["RichTextStorageTransformImpl","compressionHandler","field","storageValue","WebinyError","value","RichTextStorageTransform","StorageTransform","CompressionHandler"],"mappings":";;;AAIA,MAAMA;IAGF,YAAoCC,kBAAgD,CAAE;aAAlDA,kBAAkB,GAAlBA;aAFpB,SAAS,GAAG;IAE2D;IAEvF,MAAa,YAAY,EACrBC,KAAK,EACL,OAAOC,YAAY,EACc,EAAwC;QACzE,IAAI,CAACA,cACD,OAAOA;aACJ,IAAI,AAAwB,YAAxB,OAAOA,cACd,MAAM,IAAIC,YACN,CAAC,6EAA6E,EAAEF,MAAM,SAAS,CAAC,IAAI,EAAEA,MAAM,OAAO,CAAC,CAAC,CAAC;QAI9H,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAACC;QACpD,EAAE,OAAM;YACJ,OAAOA;QACX;IACJ;IAEA,MAAa,UAAU,EACnBE,KAAK,EAC0B,EAAsC;QACrE,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAACA;QAClD,EAAE,OAAM;YACJ,OAAOA;QACX;IACJ;AACJ;AAEO,MAAMC,2BAA2BC,iBAAiB,oBAAoB,CAAC;IAC1E,gBAAgBP;IAChB,cAAc;QAACQ;KAAmB;AACtC"}
+{"version":3,"file":"features/storage/fields/RichTextStorageTransform.js","sources":["../../../../src/features/storage/fields/RichTextStorageTransform.ts"],"sourcesContent":["import { StorageTransform } from \"../abstractions/StorageTransform.js\";\nimport { WebinyError } from \"@webiny/error\";\nimport { CompressionHandler } from \"@webiny/utils/exports/api.js\";\n\nclass RichTextStorageTransformImpl implements StorageTransform.Interface {\n    public readonly fieldType = \"rich-text\";\n\n    public constructor(private readonly compressionHandler: CompressionHandler.Interface) {}\n\n    public async fromStorage({\n        field,\n        value: storageValue\n    }: StorageTransform.FromStorageParams): StorageTransform.FromStorageResponse {\n        if (!storageValue) {\n            return storageValue;\n        } else if (typeof storageValue !== \"object\") {\n            throw new WebinyError(\n                `RichText value received in \"fromStorage\" function is not an object in field \"${field.storageId}\" - ${field.fieldId}.`\n            );\n        }\n\n        try {\n            return await this.compressionHandler.decompress(storageValue);\n        } catch {\n            return storageValue;\n        }\n    }\n\n    public async toStorage({\n        value\n    }: StorageTransform.ToStorageParams): StorageTransform.ToStorageResponse {\n        try {\n            return await this.compressionHandler.compress(value);\n        } catch {\n            return value;\n        }\n    }\n}\n\nexport const RichTextStorageTransform = StorageTransform.createImplementation({\n    implementation: RichTextStorageTransformImpl,\n    dependencies: [CompressionHandler]\n});\n"],"names":["RichTextStorageTransformImpl","compressionHandler","field","storageValue","WebinyError","value","RichTextStorageTransform","StorageTransform","CompressionHandler"],"mappings":";;;AAIA,MAAMA;IAGF,YAAoCC,kBAAgD,CAAE;aAAlDA,kBAAkB,GAAlBA;aAFpB,SAAS,GAAG;IAE2D;IAEvF,MAAa,YAAY,EACrBC,KAAK,EACL,OAAOC,YAAY,EACc,EAAwC;QACzE,IAAI,CAACA,cACD,OAAOA;QACJ,IAAI,AAAwB,YAAxB,OAAOA,cACd,MAAM,IAAIC,YACN,CAAC,6EAA6E,EAAEF,MAAM,SAAS,CAAC,IAAI,EAAEA,MAAM,OAAO,CAAC,CAAC,CAAC;QAI9H,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAACC;QACpD,EAAE,OAAM;YACJ,OAAOA;QACX;IACJ;IAEA,MAAa,UAAU,EACnBE,KAAK,EAC0B,EAAsC;QACrE,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAACA;QAClD,EAAE,OAAM;YACJ,OAAOA;QACX;IACJ;AACJ;AAEO,MAAMC,2BAA2BC,iBAAiB,oBAAoB,CAAC;IAC1E,gBAAgBP;IAChB,cAAc;QAACQ;KAAmB;AACtC"}

package/features/validation/validators/DateGteValidator.js

@@ -4,7 +4,7 @@ class DateGteValidatorImpl {
     async validate({ value, validator }) {
         const { value: gteValue, type } = validator.settings || {};
         if (void 0 === gteValue) return true;
-        else if ("time" === type) return validation.validate(value, `timeGte:${gteValue}`).then((v)=>true === v).catch(()=>false);
+        if ("time" === type) return validation.validate(value, `timeGte:${gteValue}`).then((v)=>true === v).catch(()=>false);
         return validation.validate(value, `dateGte:${gteValue}`).then((v)=>true === v).catch(()=>false);
     }
     constructor(){

package/features/validation/validators/DateGteValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/validation/validators/DateGteValidator.js","sources":["../../../../src/features/validation/validators/DateGteValidator.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass DateGteValidatorImpl implements CmsModelFieldValidator.Interface {\n    public readonly name = \"dateGte\";\n\n    public async validate({\n        value,\n        validator\n    }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n        const { value: gteValue, type } = validator.settings || {};\n        if (typeof gteValue === \"undefined\") {\n            return true;\n        } else if (type === \"time\") {\n            return validation\n                .validate(value, `timeGte:${gteValue}`)\n                .then(v => v === true)\n                .catch(() => false);\n        }\n        return validation\n            .validate(value, `dateGte:${gteValue}`)\n            .then(v => v === true)\n            .catch(() => false);\n    }\n}\n\nexport const DateGteValidator = CmsModelFieldValidator.createImplementation({\n    implementation: DateGteValidatorImpl,\n    dependencies: []\n});\n"],"names":["DateGteValidatorImpl","value","validator","gteValue","type","validation","v","DateGteValidator","CmsModelFieldValidator"],"mappings":";;AAIA,MAAMA;IAGF,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,MAAM,EAAE,OAAOC,QAAQ,EAAEC,IAAI,EAAE,GAAGF,UAAU,QAAQ,IAAI,CAAC;QACzD,IAAI,AAAoB,WAAbC,UACP,OAAO;aACJ,IAAIC,AAAS,WAATA,MACP,OAAOC,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;QAErB,OAAOD,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;IACrB;;aAnBgB,IAAI,GAAG;;AAoB3B;AAEO,MAAMC,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBR;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/validation/validators/DateGteValidator.js","sources":["../../../../src/features/validation/validators/DateGteValidator.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass DateGteValidatorImpl implements CmsModelFieldValidator.Interface {\n    public readonly name = \"dateGte\";\n\n    public async validate({\n        value,\n        validator\n    }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n        const { value: gteValue, type } = validator.settings || {};\n        if (typeof gteValue === \"undefined\") {\n            return true;\n        } else if (type === \"time\") {\n            return validation\n                .validate(value, `timeGte:${gteValue}`)\n                .then(v => v === true)\n                .catch(() => false);\n        }\n        return validation\n            .validate(value, `dateGte:${gteValue}`)\n            .then(v => v === true)\n            .catch(() => false);\n    }\n}\n\nexport const DateGteValidator = CmsModelFieldValidator.createImplementation({\n    implementation: DateGteValidatorImpl,\n    dependencies: []\n});\n"],"names":["DateGteValidatorImpl","value","validator","gteValue","type","validation","v","DateGteValidator","CmsModelFieldValidator"],"mappings":";;AAIA,MAAMA;IAGF,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,MAAM,EAAE,OAAOC,QAAQ,EAAEC,IAAI,EAAE,GAAGF,UAAU,QAAQ,IAAI,CAAC;QACzD,IAAI,AAAoB,WAAbC,UACP,OAAO;QACJ,IAAIC,AAAS,WAATA,MACP,OAAOC,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;QAErB,OAAOD,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;IACrB;;aAnBgB,IAAI,GAAG;;AAoB3B;AAEO,MAAMC,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBR;IAChB,cAAc,EAAE;AACpB"}

package/features/validation/validators/DateLteValidator.js

@@ -4,7 +4,7 @@ class DateLteValidatorImpl {
     async validate({ value, validator }) {
         const { value: lteValue, type } = validator.settings || {};
         if (void 0 === lteValue) return true;
-        else if ("time" === type) return validation.validate(value, `timeLte:${lteValue}`).then((v)=>true === v).catch(()=>false);
+        if ("time" === type) return validation.validate(value, `timeLte:${lteValue}`).then((v)=>true === v).catch(()=>false);
         return validation.validate(value, `dateLte:${lteValue}`).then((v)=>true === v).catch(()=>false);
     }
     constructor(){

package/features/validation/validators/DateLteValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/validation/validators/DateLteValidator.js","sources":["../../../../src/features/validation/validators/DateLteValidator.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass DateLteValidatorImpl implements CmsModelFieldValidator.Interface {\n    public readonly name = \"dateLte\";\n\n    public async validate({\n        value,\n        validator\n    }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n        const { value: lteValue, type } = validator.settings || {};\n        if (typeof lteValue === \"undefined\") {\n            return true;\n        } else if (type === \"time\") {\n            return validation\n                .validate(value, `timeLte:${lteValue}`)\n                .then(v => v === true)\n                .catch(() => false);\n        }\n        return validation\n            .validate(value, `dateLte:${lteValue}`)\n            .then(v => v === true)\n            .catch(() => false);\n    }\n}\n\nexport const DateLteValidator = CmsModelFieldValidator.createImplementation({\n    implementation: DateLteValidatorImpl,\n    dependencies: []\n});\n"],"names":["DateLteValidatorImpl","value","validator","lteValue","type","validation","v","DateLteValidator","CmsModelFieldValidator"],"mappings":";;AAIA,MAAMA;IAGF,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,MAAM,EAAE,OAAOC,QAAQ,EAAEC,IAAI,EAAE,GAAGF,UAAU,QAAQ,IAAI,CAAC;QACzD,IAAI,AAAoB,WAAbC,UACP,OAAO;aACJ,IAAIC,AAAS,WAATA,MACP,OAAOC,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;QAErB,OAAOD,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;IACrB;;aAnBgB,IAAI,GAAG;;AAoB3B;AAEO,MAAMC,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBR;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/validation/validators/DateLteValidator.js","sources":["../../../../src/features/validation/validators/DateLteValidator.ts"],"sourcesContent":["import { validation } from \"@webiny/validation\";\nimport { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass DateLteValidatorImpl implements CmsModelFieldValidator.Interface {\n    public readonly name = \"dateLte\";\n\n    public async validate({\n        value,\n        validator\n    }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n        const { value: lteValue, type } = validator.settings || {};\n        if (typeof lteValue === \"undefined\") {\n            return true;\n        } else if (type === \"time\") {\n            return validation\n                .validate(value, `timeLte:${lteValue}`)\n                .then(v => v === true)\n                .catch(() => false);\n        }\n        return validation\n            .validate(value, `dateLte:${lteValue}`)\n            .then(v => v === true)\n            .catch(() => false);\n    }\n}\n\nexport const DateLteValidator = CmsModelFieldValidator.createImplementation({\n    implementation: DateLteValidatorImpl,\n    dependencies: []\n});\n"],"names":["DateLteValidatorImpl","value","validator","lteValue","type","validation","v","DateLteValidator","CmsModelFieldValidator"],"mappings":";;AAIA,MAAMA;IAGF,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,MAAM,EAAE,OAAOC,QAAQ,EAAEC,IAAI,EAAE,GAAGF,UAAU,QAAQ,IAAI,CAAC;QACzD,IAAI,AAAoB,WAAbC,UACP,OAAO;QACJ,IAAIC,AAAS,WAATA,MACP,OAAOC,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;QAErB,OAAOD,WAAAA,QACM,CAACJ,OAAO,CAAC,QAAQ,EAAEE,UAAU,EACrC,IAAI,CAACG,CAAAA,IAAKA,AAAM,SAANA,GACV,KAAK,CAAC,IAAM;IACrB;;aAnBgB,IAAI,GAAG;;AAoB3B;AAEO,MAAMC,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBR;IAChB,cAAc,EAAE;AACpB"}

package/features/validation/validators/PatternValidator.js

@@ -15,7 +15,7 @@ class PatternValidatorImpl {
             if (patternValidator) pattern = patternValidator.pattern;
         }
         if (!pattern) return true;
-        return new RegExp(pattern.regex, pattern.flags).test(value);
+        return new RegExp(pattern.regex, pattern.flags || void 0).test(value);
     }
 }
 const PatternValidator = CmsModelFieldValidator.createImplementation({

package/features/validation/validators/PatternValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/validation/validators/PatternValidator.js","sources":["../../../../src/features/validation/validators/PatternValidator.ts"],"sourcesContent":["import { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport { CmsModelFieldPatternValidatorRegistry } from \"../abstractions/CmsModelFieldPatternValidatorRegistry.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass PatternValidatorImpl implements CmsModelFieldValidator.Interface {\n    public readonly name = \"pattern\";\n\n    public constructor(\n        private readonly patternRegistry: CmsModelFieldPatternValidatorRegistry.Interface\n    ) {}\n\n    public async validate({\n        value,\n        validator\n    }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n        if (typeof value !== \"string\" || !value) {\n            return true;\n        }\n\n        const { settings } = validator;\n\n        let pattern;\n        if (settings?.preset === \"custom\") {\n            pattern = settings;\n        } else if (settings?.preset) {\n            const patternValidator = this.patternRegistry.get(settings.preset);\n            if (patternValidator) {\n                pattern = patternValidator.pattern;\n            }\n        }\n\n        if (!pattern) {\n            return true;\n        }\n\n        return new RegExp(pattern.regex, pattern.flags).test(value);\n    }\n}\n\nexport const PatternValidator = CmsModelFieldValidator.createImplementation({\n    implementation: PatternValidatorImpl,\n    dependencies: [CmsModelFieldPatternValidatorRegistry]\n});\n"],"names":["PatternValidatorImpl","patternRegistry","value","validator","settings","pattern","patternValidator","RegExp","PatternValidator","CmsModelFieldValidator","CmsModelFieldPatternValidatorRegistry"],"mappings":";;AAIA,MAAMA;IAGF,YACqBC,eAAgE,CACnF;aADmBA,eAAe,GAAfA;aAHL,IAAI,GAAG;IAIpB;IAEH,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,IAAI,AAAiB,YAAjB,OAAOD,SAAsB,CAACA,OAC9B,OAAO;QAGX,MAAM,EAAEE,QAAQ,EAAE,GAAGD;QAErB,IAAIE;QACJ,IAAID,UAAU,WAAW,UACrBC,UAAUD;aACP,IAAIA,UAAU,QAAQ;YACzB,MAAME,mBAAmB,IAAI,CAAC,eAAe,CAAC,GAAG,CAACF,SAAS,MAAM;YACjE,IAAIE,kBACAD,UAAUC,iBAAiB,OAAO;QAE1C;QAEA,IAAI,CAACD,SACD,OAAO;QAGX,OAAO,IAAIE,OAAOF,QAAQ,KAAK,EAAEA,QAAQ,KAAK,EAAE,IAAI,CAACH;IACzD;AACJ;AAEO,MAAMM,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBT;IAChB,cAAc;QAACU;KAAsC;AACzD"}
+{"version":3,"file":"features/validation/validators/PatternValidator.js","sources":["../../../../src/features/validation/validators/PatternValidator.ts"],"sourcesContent":["import { CmsModelFieldValidator } from \"../abstractions/CmsModelFieldValidator.js\";\nimport { CmsModelFieldPatternValidatorRegistry } from \"../abstractions/CmsModelFieldPatternValidatorRegistry.js\";\nimport type { CmsModelFieldValidatorValidateParams } from \"~/types/types.js\";\n\nclass PatternValidatorImpl implements CmsModelFieldValidator.Interface {\n    public readonly name = \"pattern\";\n\n    public constructor(\n        private readonly patternRegistry: CmsModelFieldPatternValidatorRegistry.Interface\n    ) {}\n\n    public async validate({\n        value,\n        validator\n    }: CmsModelFieldValidatorValidateParams): Promise<boolean> {\n        if (typeof value !== \"string\" || !value) {\n            return true;\n        }\n\n        const { settings } = validator;\n\n        let pattern;\n        if (settings?.preset === \"custom\") {\n            pattern = settings;\n        } else if (settings?.preset) {\n            const patternValidator = this.patternRegistry.get(settings.preset);\n            if (patternValidator) {\n                pattern = patternValidator.pattern;\n            }\n        }\n\n        if (!pattern) {\n            return true;\n        }\n\n        return new RegExp(pattern.regex, pattern.flags || undefined).test(value);\n    }\n}\n\nexport const PatternValidator = CmsModelFieldValidator.createImplementation({\n    implementation: PatternValidatorImpl,\n    dependencies: [CmsModelFieldPatternValidatorRegistry]\n});\n"],"names":["PatternValidatorImpl","patternRegistry","value","validator","settings","pattern","patternValidator","RegExp","undefined","PatternValidator","CmsModelFieldValidator","CmsModelFieldPatternValidatorRegistry"],"mappings":";;AAIA,MAAMA;IAGF,YACqBC,eAAgE,CACnF;aADmBA,eAAe,GAAfA;aAHL,IAAI,GAAG;IAIpB;IAEH,MAAa,SAAS,EAClBC,KAAK,EACLC,SAAS,EAC0B,EAAoB;QACvD,IAAI,AAAiB,YAAjB,OAAOD,SAAsB,CAACA,OAC9B,OAAO;QAGX,MAAM,EAAEE,QAAQ,EAAE,GAAGD;QAErB,IAAIE;QACJ,IAAID,UAAU,WAAW,UACrBC,UAAUD;aACP,IAAIA,UAAU,QAAQ;YACzB,MAAME,mBAAmB,IAAI,CAAC,eAAe,CAAC,GAAG,CAACF,SAAS,MAAM;YACjE,IAAIE,kBACAD,UAAUC,iBAAiB,OAAO;QAE1C;QAEA,IAAI,CAACD,SACD,OAAO;QAGX,OAAO,IAAIE,OAAOF,QAAQ,KAAK,EAAEA,QAAQ,KAAK,IAAIG,QAAW,IAAI,CAACN;IACtE;AACJ;AAEO,MAAMO,mBAAmBC,uBAAuB,oBAAoB,CAAC;IACxE,gBAAgBV;IAChB,cAAc;QAACW;KAAsC;AACzD"}

package/features/whereMapper/WhereMapper.js

@@ -1,7 +1,7 @@
 import { CmsWhereMapper } from "./abstractions.js";
 const isPlainObject = (value)=>{
     if (!value || "object" != typeof value) return false;
-    else if (Array.isArray(value)) return false;
+    if (Array.isArray(value)) return false;
     return true;
 };
 const isLogicalKey = (key)=>"AND" === key || "OR" === key;
@@ -9,11 +9,8 @@ class WhereMapperImpl {
     map(params) {
         const { fields: modelFields, input } = params;
         if (!input) return;
-        const fields = modelFields.map((field)=>field.fieldId);
-        const isField = (key)=>{
-            const field = key.split("_")[0];
-            return fields.includes(field);
-        };
+        const fields = modelFields.map((field)=>field.fieldId).sort((a, b)=>b.length - a.length);
+        const isField = (key)=>fields.some((fieldId)=>key === fieldId || key.startsWith(`${fieldId}_`));
         return this.mapWhere({
             input,
             isField
@@ -32,7 +29,13 @@ class WhereMapperImpl {
                         isField
                     }));
                 continue;
-            } else if (isField(key)) {
+            }
+            if ("values" === key && isPlainObject(value)) {
+                if (!out.values) out.values = {};
+                Object.assign(out.values, value);
+                continue;
+            }
+            if (isField(key)) {
                 if (!out.values) out.values = {};
                 out.values[key] = value;
                 continue;

package/features/whereMapper/WhereMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"features/whereMapper/WhereMapper.js","sources":["../../../src/features/whereMapper/WhereMapper.ts"],"sourcesContent":["/**\n * Used to map a model with custom schema with fields in a root to values object.\n * eg. File Manager File model has \"title\" and \"tags\" fields in the root, but they should be\n * mapped to \"values.title\" and \"values.tags\" when creating the entry.\n */\nimport { GenericRecord } from \"@webiny/api/types.js\";\nimport { CmsEntryListWhere } from \"~/types/types.js\";\nimport { CmsWhereMapper, ICmsWhereMapperParams } from \"./abstractions.js\";\n\nconst isPlainObject = (value: unknown): value is Record<string, unknown> => {\n    if (!value || typeof value !== \"object\") {\n        return false;\n    } else if (Array.isArray(value)) {\n        return false;\n    }\n    return true;\n};\n\nconst isLogicalKey = (key: string): key is \"AND\" | \"OR\" => {\n    return key === \"AND\" || key === \"OR\";\n};\n\ninterface IMapNodeWhereParams {\n    input: GenericRecord;\n    isField: (key: string) => boolean;\n}\n\nclass WhereMapperImpl implements CmsWhereMapper.Interface {\n    map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere | undefined {\n        const { fields: modelFields, input } = params;\n        if (!input) {\n            return undefined;\n        }\n\n        const fields = modelFields.map(field => {\n            return field.fieldId;\n        });\n\n        const isField = (key: string): boolean => {\n            const field = key.split(\"_\")[0];\n            return fields.includes(field);\n        };\n\n        return this.mapWhere({\n            input,\n            isField\n        });\n    }\n\n    private mapWhere(params: IMapNodeWhereParams) {\n        const { input, isField } = params;\n        const out: CmsEntryListWhere = {};\n\n        const keys = Object.keys(input) as (keyof typeof out)[];\n        if (keys.length === 0) {\n            return out;\n        }\n\n        for (const key of keys) {\n            const value = input[key];\n\n            if (isLogicalKey(key)) {\n                if (Array.isArray(value)) {\n                    out[key] = value.filter(isPlainObject).map(child => {\n                        return this.mapWhere({\n                            input: child,\n                            isField\n                        });\n                    });\n                }\n                continue;\n            } else if (isField(key)) {\n                if (!out.values) {\n                    out.values = {};\n                }\n                out.values[key] = value;\n                continue;\n            }\n\n            out[key] = value;\n        }\n\n        return out;\n    }\n}\n\nexport const WhereMapper = CmsWhereMapper.createImplementation({\n    implementation: WhereMapperImpl,\n    dependencies: []\n});\n"],"names":["isPlainObject","value","Array","isLogicalKey","key","WhereMapperImpl","params","modelFields","input","fields","field","isField","out","keys","Object","child","WhereMapper","CmsWhereMapper"],"mappings":";AASA,MAAMA,gBAAgB,CAACC;IACnB,IAAI,CAACA,SAAS,AAAiB,YAAjB,OAAOA,OACjB,OAAO;SACJ,IAAIC,MAAM,OAAO,CAACD,QACrB,OAAO;IAEX,OAAO;AACX;AAEA,MAAME,eAAe,CAACC,MACXA,AAAQ,UAARA,OAAiBA,AAAQ,SAARA;AAQ5B,MAAMC;IACF,IAA6BC,MAAgC,EAAiC;QAC1F,MAAM,EAAE,QAAQC,WAAW,EAAEC,KAAK,EAAE,GAAGF;QACvC,IAAI,CAACE,OACD;QAGJ,MAAMC,SAASF,YAAY,GAAG,CAACG,CAAAA,QACpBA,MAAM,OAAO;QAGxB,MAAMC,UAAU,CAACP;YACb,MAAMM,QAAQN,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;YAC/B,OAAOK,OAAO,QAAQ,CAACC;QAC3B;QAEA,OAAO,IAAI,CAAC,QAAQ,CAAC;YACjBF;YACAG;QACJ;IACJ;IAEQ,SAASL,MAA2B,EAAE;QAC1C,MAAM,EAAEE,KAAK,EAAEG,OAAO,EAAE,GAAGL;QAC3B,MAAMM,MAAyB,CAAC;QAEhC,MAAMC,OAAOC,OAAO,IAAI,CAACN;QACzB,IAAIK,AAAgB,MAAhBA,KAAK,MAAM,EACX,OAAOD;QAGX,KAAK,MAAMR,OAAOS,KAAM;YACpB,MAAMZ,QAAQO,KAAK,CAACJ,IAAI;YAExB,IAAID,aAAaC,MAAM;gBACnB,IAAIF,MAAM,OAAO,CAACD,QACdW,GAAG,CAACR,IAAI,GAAGH,MAAM,MAAM,CAACD,eAAe,GAAG,CAACe,CAAAA,QAChC,IAAI,CAAC,QAAQ,CAAC;wBACjB,OAAOA;wBACPJ;oBACJ;gBAGR;YACJ,OAAO,IAAIA,QAAQP,MAAM;gBACrB,IAAI,CAACQ,IAAI,MAAM,EACXA,IAAI,MAAM,GAAG,CAAC;gBAElBA,IAAI,MAAM,CAACR,IAAI,GAAGH;gBAClB;YACJ;YAEAW,GAAG,CAACR,IAAI,GAAGH;QACf;QAEA,OAAOW;IACX;AACJ;AAEO,MAAMI,cAAcC,eAAe,oBAAoB,CAAC;IAC3D,gBAAgBZ;IAChB,cAAc,EAAE;AACpB"}
+{"version":3,"file":"features/whereMapper/WhereMapper.js","sources":["../../../src/features/whereMapper/WhereMapper.ts"],"sourcesContent":["/**\n * Used to map a model with custom schema with fields in a root to values object.\n * eg. File Manager File model has \"title\" and \"tags\" fields in the root, but they should be\n * mapped to \"values.title\" and \"values.tags\" when creating the entry.\n */\nimport { GenericRecord } from \"@webiny/api/types.js\";\nimport { CmsEntryListWhere } from \"~/types/types.js\";\nimport { CmsWhereMapper, ICmsWhereMapperParams } from \"./abstractions.js\";\n\nconst isPlainObject = (value: unknown): value is Record<string, unknown> => {\n    if (!value || typeof value !== \"object\") {\n        return false;\n    } else if (Array.isArray(value)) {\n        return false;\n    }\n    return true;\n};\n\nconst isLogicalKey = (key: string): key is \"AND\" | \"OR\" => {\n    return key === \"AND\" || key === \"OR\";\n};\n\ninterface IMapNodeWhereParams {\n    input: GenericRecord;\n    isField: (key: string) => boolean;\n}\n\nclass WhereMapperImpl implements CmsWhereMapper.Interface {\n    map<T extends GenericRecord>(params: ICmsWhereMapperParams<T>): CmsEntryListWhere | undefined {\n        const { fields: modelFields, input } = params;\n        if (!input) {\n            return undefined;\n        }\n\n        /*\n         * Longest fieldId first, so a key is attributed to the longest field it could belong to.\n         * Taking the segment before the first `_` misreads any fieldId that contains one:\n         * `on_sale_contains` resolves to a field named `on`, which does not exist, so the filter\n         * silently stays at the top level and the CMS rejects it. Longest-first also keeps a model\n         * with both `price` and `price_range` from being mis-routed.\n         */\n        const fields = modelFields.map(field => field.fieldId).sort((a, b) => b.length - a.length);\n\n        const isField = (key: string): boolean => {\n            return fields.some(fieldId => key === fieldId || key.startsWith(`${fieldId}_`));\n        };\n\n        return this.mapWhere({\n            input,\n            isField\n        });\n    }\n\n    private mapWhere(params: IMapNodeWhereParams) {\n        const { input, isField } = params;\n        const out: CmsEntryListWhere = {};\n\n        const keys = Object.keys(input) as (keyof typeof out)[];\n        if (keys.length === 0) {\n            return out;\n        }\n\n        for (const key of keys) {\n            const value = input[key];\n\n            if (isLogicalKey(key)) {\n                if (Array.isArray(value)) {\n                    out[key] = value.filter(isPlainObject).map(child => {\n                        return this.mapWhere({\n                            input: child,\n                            isField\n                        });\n                    });\n                }\n                continue;\n            } else if (key === \"values\" && isPlainObject(value)) {\n                /*\n                 * A caller that already nested its model fields is taken at its word. Merged rather\n                 * than assigned, so an explicit `values` object and flat field keys can coexist:\n                 * assigning would drop whichever of the two arrived first.\n                 */\n                if (!out.values) {\n                    out.values = {};\n                }\n                Object.assign(out.values, value);\n                continue;\n            } else if (isField(key)) {\n                if (!out.values) {\n                    out.values = {};\n                }\n                out.values[key] = value;\n                continue;\n            }\n\n            out[key] = value;\n        }\n\n        return out;\n    }\n}\n\nexport const WhereMapper = CmsWhereMapper.createImplementation({\n    implementation: WhereMapperImpl,\n    dependencies: []\n});\n"],"names":["isPlainObject","value","Array","isLogicalKey","key","WhereMapperImpl","params","modelFields","input","fields","field","a","b","isField","fieldId","out","keys","Object","child","WhereMapper","CmsWhereMapper"],"mappings":";AASA,MAAMA,gBAAgB,CAACC;IACnB,IAAI,CAACA,SAAS,AAAiB,YAAjB,OAAOA,OACjB,OAAO;IACJ,IAAIC,MAAM,OAAO,CAACD,QACrB,OAAO;IAEX,OAAO;AACX;AAEA,MAAME,eAAe,CAACC,MACXA,AAAQ,UAARA,OAAiBA,AAAQ,SAARA;AAQ5B,MAAMC;IACF,IAA6BC,MAAgC,EAAiC;QAC1F,MAAM,EAAE,QAAQC,WAAW,EAAEC,KAAK,EAAE,GAAGF;QACvC,IAAI,CAACE,OACD;QAUJ,MAAMC,SAASF,YAAY,GAAG,CAACG,CAAAA,QAASA,MAAM,OAAO,EAAE,IAAI,CAAC,CAACC,GAAGC,IAAMA,EAAE,MAAM,GAAGD,EAAE,MAAM;QAEzF,MAAME,UAAU,CAACT,MACNK,OAAO,IAAI,CAACK,CAAAA,UAAWV,QAAQU,WAAWV,IAAI,UAAU,CAAC,GAAGU,QAAQ,CAAC,CAAC;QAGjF,OAAO,IAAI,CAAC,QAAQ,CAAC;YACjBN;YACAK;QACJ;IACJ;IAEQ,SAASP,MAA2B,EAAE;QAC1C,MAAM,EAAEE,KAAK,EAAEK,OAAO,EAAE,GAAGP;QAC3B,MAAMS,MAAyB,CAAC;QAEhC,MAAMC,OAAOC,OAAO,IAAI,CAACT;QACzB,IAAIQ,AAAgB,MAAhBA,KAAK,MAAM,EACX,OAAOD;QAGX,KAAK,MAAMX,OAAOY,KAAM;YACpB,MAAMf,QAAQO,KAAK,CAACJ,IAAI;YAExB,IAAID,aAAaC,MAAM;gBACnB,IAAIF,MAAM,OAAO,CAACD,QACdc,GAAG,CAACX,IAAI,GAAGH,MAAM,MAAM,CAACD,eAAe,GAAG,CAACkB,CAAAA,QAChC,IAAI,CAAC,QAAQ,CAAC;wBACjB,OAAOA;wBACPL;oBACJ;gBAGR;YACJ;YAAO,IAAIT,AAAQ,aAARA,OAAoBJ,cAAcC,QAAQ;gBAMjD,IAAI,CAACc,IAAI,MAAM,EACXA,IAAI,MAAM,GAAG,CAAC;gBAElBE,OAAO,MAAM,CAACF,IAAI,MAAM,EAAEd;gBAC1B;YACJ;YAAO,IAAIY,QAAQT,MAAM;gBACrB,IAAI,CAACW,IAAI,MAAM,EACXA,IAAI,MAAM,GAAG,CAAC;gBAElBA,IAAI,MAAM,CAACX,IAAI,GAAGH;gBAClB;YACJ;YAEAc,GAAG,CAACX,IAAI,GAAGH;QACf;QAEA,OAAOc;IACX;AACJ;AAEO,MAAMI,cAAcC,eAAe,oBAAoB,CAAC;IAC3D,gBAAgBf;IAChB,cAAc,EAAE;AACpB"}

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js

@@ -47,7 +47,10 @@ class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlug
             Object.assign(values, converted);
             return values;
         }, {
-            _templateId: template.id
+            _templateId: template.id,
+            ...value._id ? {
+                _id: value._id
+            } : {}
         });
     }
     convertFromStorage(params) {
@@ -98,7 +101,10 @@ class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlug
             Object.assign(values, converted);
             return values;
         }, {
-            _templateId: template.id
+            _templateId: template.id,
+            ...value._id ? {
+                _id: value._id
+            } : {}
         });
     }
     constructor(...args){

package/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js","sources":["../../src/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ConvertParams } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport type {\n    CmsDynamicZoneTemplate,\n    CmsEntryValues,\n    CmsModelDynamicZoneField\n} from \"~/types/index.js\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ntype DynamicZoneValue = GenericRecord<string>;\n\ninterface ProcessValue {\n    templates: CmsDynamicZoneTemplate[];\n    value: DynamicZoneValue | null;\n    converterCollection: ConverterCollection;\n}\n\nexport class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.dynamicZone\";\n\n    public override getFieldType(): string {\n        return \"dynamicZone\";\n    }\n\n    private getTemplates(field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] {\n        return field.settings?.templates || [];\n    }\n\n    public override convertToStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value)) {\n                return {\n                    [field.storageId]: value.map(item => {\n                        return this.processToStorage({\n                            templates,\n                            converterCollection,\n                            value: item\n                        });\n                    })\n                };\n            }\n\n            // If a multi-value dynamic zone receives anything other than an array, ignore the value.\n            return {};\n        }\n\n        // If a single-value dynamic zone receives an array, ignore the value.\n        if (Array.isArray(value)) {\n            return {};\n        }\n\n        const processedValue = this.processToStorage({\n            templates,\n            converterCollection,\n            value\n        });\n\n        return {\n            [field.storageId]: processedValue\n        };\n    }\n\n    private processToStorage(params: ProcessValue) {\n        const { templates, converterCollection } = params;\n        const { value } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const templateId = value._templateId;\n        const template = templates.find(t => {\n            return templateId === t.id;\n        });\n\n        if (!template) {\n            return undefined;\n        }\n\n        return template.fields.reduce<GenericRecord<string>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertToStorage({\n                    field,\n                    value: value ? value[field.fieldId] : undefined\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n\n    public override convertFromStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            const arrayValue = Array.isArray(value) ? value : [];\n\n            return {\n                [field.fieldId]: arrayValue\n                    .map(item => {\n                        return this.processFromStorage({\n                            templates,\n                            converterCollection,\n                            value: item\n                        });\n                    })\n                    .filter(Boolean)\n            };\n        }\n\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processFromStorage({\n            templates,\n            converterCollection,\n            value\n        });\n\n        return {\n            [field.fieldId]: processedValue\n        };\n    }\n\n    private processFromStorage(params: ProcessValue) {\n        const { templates, value, converterCollection } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const { _templateId } = value;\n\n        const template = templates.find(t => t.id === _templateId);\n        if (!template) {\n            // TODO Should we just return undefined?\n            console.warn({\n                message: \"Unknown template - converting from storage.\",\n                code: \"UNKNOWN_TEMPLATE\",\n                data: {\n                    templateId: _templateId\n                }\n            });\n            return undefined;\n        }\n\n        return template.fields.reduce<GenericRecord<string>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertFromStorage({\n                    field,\n                    value: value[field.storageId]\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id\n            }\n        );\n    }\n}\n"],"names":["CmsModelDynamicZoneFieldConverterPlugin","CmsModelFieldConverterPlugin","field","params","value","converterCollection","templates","Array","item","processedValue","templateId","template","t","values","converter","converted","undefined","Object","arrayValue","Boolean","WebinyError","_templateId","console"],"mappings":"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"}
+{"version":3,"file":"fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js","sources":["../../src/fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.ts"],"sourcesContent":["import WebinyError from \"@webiny/error\";\nimport type { ConvertParams } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport type {\n    CmsDynamicZoneTemplate,\n    CmsEntryValues,\n    CmsModelDynamicZoneField\n} from \"~/types/index.js\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ntype DynamicZoneValue = GenericRecord<string>;\n\ninterface ProcessValue {\n    templates: CmsDynamicZoneTemplate[];\n    value: DynamicZoneValue | null;\n    converterCollection: ConverterCollection;\n}\n\nexport class CmsModelDynamicZoneFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.dynamicZone\";\n\n    public override getFieldType(): string {\n        return \"dynamicZone\";\n    }\n\n    private getTemplates(field: CmsModelDynamicZoneField): CmsDynamicZoneTemplate[] {\n        return field.settings?.templates || [];\n    }\n\n    public override convertToStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value)) {\n                return {\n                    [field.storageId]: value.map(item => {\n                        return this.processToStorage({\n                            templates,\n                            converterCollection,\n                            value: item\n                        });\n                    })\n                };\n            }\n\n            // If a multi-value dynamic zone receives anything other than an array, ignore the value.\n            return {};\n        }\n\n        // If a single-value dynamic zone receives an array, ignore the value.\n        if (Array.isArray(value)) {\n            return {};\n        }\n\n        const processedValue = this.processToStorage({\n            templates,\n            converterCollection,\n            value\n        });\n\n        return {\n            [field.storageId]: processedValue\n        };\n    }\n\n    private processToStorage(params: ProcessValue) {\n        const { templates, converterCollection } = params;\n        const { value } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const templateId = value._templateId;\n        const template = templates.find(t => {\n            return templateId === t.id;\n        });\n\n        if (!template) {\n            return undefined;\n        }\n\n        return template.fields.reduce<GenericRecord<string>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertToStorage({\n                    field,\n                    value: value ? value[field.fieldId] : undefined\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id,\n                ...(value._id ? { _id: value._id } : {})\n            }\n        );\n    }\n\n    public override convertFromStorage(\n        params: ConvertParams<CmsModelDynamicZoneField>\n    ): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const templates = this.getTemplates(field);\n\n        if (templates.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            const arrayValue = Array.isArray(value) ? value : [];\n\n            return {\n                [field.fieldId]: arrayValue\n                    .map(item => {\n                        return this.processFromStorage({\n                            templates,\n                            converterCollection,\n                            value: item\n                        });\n                    })\n                    .filter(Boolean)\n            };\n        }\n\n        if (Array.isArray(value)) {\n            throw new WebinyError(\n                `Dynamic zone field \"${field.fieldId}\" is expecting a non-array value.`,\n                \"DYNAMIC_ZONE_EXPECTING_NON_ARRAY_VALUE\",\n                {\n                    field,\n                    value\n                }\n            );\n        }\n\n        const processedValue = this.processFromStorage({\n            templates,\n            converterCollection,\n            value\n        });\n\n        return {\n            [field.fieldId]: processedValue\n        };\n    }\n\n    private processFromStorage(params: ProcessValue) {\n        const { templates, value, converterCollection } = params;\n        if (value === null || value === undefined) {\n            return undefined;\n        }\n\n        const { _templateId } = value;\n\n        const template = templates.find(t => t.id === _templateId);\n        if (!template) {\n            // TODO Should we just return undefined?\n            console.warn({\n                message: \"Unknown template - converting from storage.\",\n                code: \"UNKNOWN_TEMPLATE\",\n                data: {\n                    templateId: _templateId\n                }\n            });\n            return undefined;\n        }\n\n        return template.fields.reduce<GenericRecord<string>>(\n            (values, field) => {\n                const converter = converterCollection.getConverter(field.type);\n                const converted = converter.convertFromStorage({\n                    field,\n                    value: value[field.storageId]\n                });\n                Object.assign(values, converted);\n                return values;\n            },\n            {\n                _templateId: template.id,\n                ...(value._id ? { _id: value._id } : {})\n            }\n        );\n    }\n}\n"],"names":["CmsModelDynamicZoneFieldConverterPlugin","CmsModelFieldConverterPlugin","field","params","value","converterCollection","templates","Array","item","processedValue","templateId","template","t","values","converter","converted","undefined","Object","arrayValue","Boolean","WebinyError","_templateId","console"],"mappings":"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"}

package/fieldConverters/CmsModelObjectFieldConverterPlugin.js

@@ -43,6 +43,9 @@ class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {
     processChildFieldsToStorage(params) {
         const { fields, value, converterCollection } = params;
         if (null == value) return;
+        const initial = value._id ? {
+            _id: value._id
+        } : {};
         return fields.reduce((output, field)=>{
             if (void 0 === value[field.fieldId]) return output;
             const converter = converterCollection.getConverter(field.type);
@@ -55,7 +58,7 @@ class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {
                 ...output,
                 ...newValue
             };
-        }, {});
+        }, initial);
     }
     convertFromStorage(params) {
         const { field, value, converterCollection } = params;
@@ -94,6 +97,9 @@ class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {
     processChildFieldsFromStorage(params) {
         const { fields, value, converterCollection } = params;
         if (null == value) return;
+        const initial = value._id ? {
+            _id: value._id
+        } : {};
         return fields.reduce((output, field)=>{
             if (void 0 === value[field.storageId]) return output;
             const converter = converterCollection.getConverter(field.type);
@@ -107,7 +113,7 @@ class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {
                 ...output,
                 ...newValue
             };
-        }, {});
+        }, initial);
     }
     constructor(...args){
         super(...args), this.name = "cms.field.converter.object";

package/fieldConverters/CmsModelObjectFieldConverterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"fieldConverters/CmsModelObjectFieldConverterPlugin.js","sources":["../../src/fieldConverters/CmsModelObjectFieldConverterPlugin.ts"],"sourcesContent":["import type { ConvertParams } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport type { CmsEntryValues, CmsModelFieldWithParent } from \"~/types/index.js\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ninterface ProcessChildFieldsParams {\n    fields: CmsModelFieldWithParent[];\n    value?: GenericRecord<string> | null;\n    converterCollection: ConverterCollection;\n}\n\ninterface GetChildFieldsParams {\n    field?: CmsModelFieldWithParent | null;\n}\n\nexport class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.object\";\n\n    public override getFieldType(): string {\n        return \"object\";\n    }\n\n    private getChildFields({ field }: GetChildFieldsParams): CmsModelFieldWithParent[] {\n        return field?.settings?.fields || [];\n    }\n\n    public override convertToStorage(params: ConvertParams): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const childFields = this.getChildFields({\n            field\n        });\n        if (childFields.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.storageId]: null\n                };\n            }\n            return {\n                [field.storageId]: value.map((itemValue: GenericRecord) => {\n                    return this.processChildFieldsToStorage({\n                        fields: childFields.map(child => {\n                            return {\n                                ...child,\n                                parent: field\n                            };\n                        }),\n                        value: itemValue,\n                        converterCollection\n                    });\n                })\n            };\n        }\n\n        const values = this.processChildFieldsToStorage({\n            fields: childFields.map(child => {\n                return {\n                    ...child,\n                    parent: field\n                };\n            }),\n            value,\n            converterCollection\n        });\n        if (values === undefined) {\n            return {};\n        }\n\n        return {\n            [field.storageId]: values\n        };\n    }\n\n    private processChildFieldsToStorage(\n        params: ProcessChildFieldsParams\n    ): CmsEntryValues | undefined {\n        const { fields, value, converterCollection } = params;\n\n        if (value === undefined || value === null) {\n            return undefined;\n        }\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            if (value[field.fieldId] === undefined) {\n                return output;\n            }\n            const converter = converterCollection.getConverter(field.type);\n\n            const newValue = converter.convertToStorage({\n                field,\n                value: value[field.fieldId],\n                parent: field.parent\n            });\n\n            return {\n                ...output,\n                ...newValue\n            };\n        }, {});\n    }\n\n    public override convertFromStorage(params: ConvertParams): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const childFields = this.getChildFields({\n            field\n        });\n        if (childFields.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.fieldId]: null\n                };\n            }\n            return {\n                [field.fieldId]: value.map((itemValue: GenericRecord) => {\n                    return this.processChildFieldsFromStorage({\n                        fields: childFields.map(child => {\n                            return {\n                                ...child,\n                                parent: field\n                            };\n                        }),\n                        value: itemValue,\n                        converterCollection\n                    });\n                })\n            };\n        }\n\n        const values = this.processChildFieldsFromStorage({\n            fields: childFields.map(child => {\n                return {\n                    ...child,\n                    parent: field\n                };\n            }),\n            value,\n            converterCollection\n        });\n\n        if (values === undefined) {\n            return {};\n        }\n\n        return {\n            [field.fieldId]: values\n        };\n    }\n\n    private processChildFieldsFromStorage(\n        params: ProcessChildFieldsParams\n    ): CmsEntryValues | undefined {\n        const { fields, value, converterCollection } = params;\n\n        if (value === undefined || value === null) {\n            return undefined;\n        }\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            if (value[field.storageId] === undefined) {\n                return output;\n            }\n\n            const converter = converterCollection.getConverter(field.type);\n\n            const newValue = converter.convertFromStorage({\n                field,\n                value: value[field.storageId],\n                parent: field.parent\n            });\n            if (!newValue) {\n                return output;\n            }\n\n            return {\n                ...output,\n                ...newValue\n            };\n        }, {});\n    }\n}\n"],"names":["CmsModelObjectFieldConverterPlugin","CmsModelFieldConverterPlugin","field","params","value","converterCollection","childFields","Array","itemValue","child","values","undefined","fields","output","converter","newValue"],"mappings":"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"}
+{"version":3,"file":"fieldConverters/CmsModelObjectFieldConverterPlugin.js","sources":["../../src/fieldConverters/CmsModelObjectFieldConverterPlugin.ts"],"sourcesContent":["import type { ConvertParams } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport { CmsModelFieldConverterPlugin } from \"~/plugins/CmsModelFieldConverterPlugin.js\";\nimport type { CmsEntryValues, CmsModelFieldWithParent } from \"~/types/index.js\";\nimport type { ConverterCollection } from \"~/utils/converters/ConverterCollection.js\";\nimport type { GenericRecord } from \"@webiny/api/types.js\";\n\ninterface ProcessChildFieldsParams {\n    fields: CmsModelFieldWithParent[];\n    value?: GenericRecord<string> | null;\n    converterCollection: ConverterCollection;\n}\n\ninterface GetChildFieldsParams {\n    field?: CmsModelFieldWithParent | null;\n}\n\nexport class CmsModelObjectFieldConverterPlugin extends CmsModelFieldConverterPlugin {\n    public override name = \"cms.field.converter.object\";\n\n    public override getFieldType(): string {\n        return \"object\";\n    }\n\n    private getChildFields({ field }: GetChildFieldsParams): CmsModelFieldWithParent[] {\n        return field?.settings?.fields || [];\n    }\n\n    public override convertToStorage(params: ConvertParams): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const childFields = this.getChildFields({\n            field\n        });\n        if (childFields.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.storageId]: null\n                };\n            }\n            return {\n                [field.storageId]: value.map((itemValue: GenericRecord) => {\n                    return this.processChildFieldsToStorage({\n                        fields: childFields.map(child => {\n                            return {\n                                ...child,\n                                parent: field\n                            };\n                        }),\n                        value: itemValue,\n                        converterCollection\n                    });\n                })\n            };\n        }\n\n        const values = this.processChildFieldsToStorage({\n            fields: childFields.map(child => {\n                return {\n                    ...child,\n                    parent: field\n                };\n            }),\n            value,\n            converterCollection\n        });\n        if (values === undefined) {\n            return {};\n        }\n\n        return {\n            [field.storageId]: values\n        };\n    }\n\n    private processChildFieldsToStorage(\n        params: ProcessChildFieldsParams\n    ): CmsEntryValues | undefined {\n        const { fields, value, converterCollection } = params;\n\n        if (value === undefined || value === null) {\n            return undefined;\n        }\n\n        const initial: CmsEntryValues = value._id ? { _id: value._id } : {};\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            if (value[field.fieldId] === undefined) {\n                return output;\n            }\n            const converter = converterCollection.getConverter(field.type);\n\n            const newValue = converter.convertToStorage({\n                field,\n                value: value[field.fieldId],\n                parent: field.parent\n            });\n\n            return {\n                ...output,\n                ...newValue\n            };\n        }, initial);\n    }\n\n    public override convertFromStorage(params: ConvertParams): CmsEntryValues {\n        const { field, value, converterCollection } = params;\n\n        const childFields = this.getChildFields({\n            field\n        });\n        if (childFields.length === 0) {\n            return {};\n        }\n\n        if (field.list) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.fieldId]: null\n                };\n            }\n            return {\n                [field.fieldId]: value.map((itemValue: GenericRecord) => {\n                    return this.processChildFieldsFromStorage({\n                        fields: childFields.map(child => {\n                            return {\n                                ...child,\n                                parent: field\n                            };\n                        }),\n                        value: itemValue,\n                        converterCollection\n                    });\n                })\n            };\n        }\n\n        const values = this.processChildFieldsFromStorage({\n            fields: childFields.map(child => {\n                return {\n                    ...child,\n                    parent: field\n                };\n            }),\n            value,\n            converterCollection\n        });\n\n        if (values === undefined) {\n            return {};\n        }\n\n        return {\n            [field.fieldId]: values\n        };\n    }\n\n    private processChildFieldsFromStorage(\n        params: ProcessChildFieldsParams\n    ): CmsEntryValues | undefined {\n        const { fields, value, converterCollection } = params;\n\n        if (value === undefined || value === null) {\n            return undefined;\n        }\n\n        const initial: CmsEntryValues = value._id ? { _id: value._id } : {};\n\n        return fields.reduce<CmsEntryValues>((output, field) => {\n            if (value[field.storageId] === undefined) {\n                return output;\n            }\n\n            const converter = converterCollection.getConverter(field.type);\n\n            const newValue = converter.convertFromStorage({\n                field,\n                value: value[field.storageId],\n                parent: field.parent\n            });\n            if (!newValue) {\n                return output;\n            }\n\n            return {\n                ...output,\n                ...newValue\n            };\n        }, initial);\n    }\n}\n"],"names":["CmsModelObjectFieldConverterPlugin","CmsModelFieldConverterPlugin","field","params","value","converterCollection","childFields","Array","itemValue","child","values","undefined","fields","initial","output","converter","newValue"],"mappings":"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"}

package/fieldConverters/index.d.ts

@@ -4,4 +4,4 @@
 import { CmsModelObjectFieldConverterPlugin } from "../fieldConverters/CmsModelObjectFieldConverterPlugin.js";
 import { CmsModelDefaultFieldConverterPlugin } from "../fieldConverters/CmsModelDefaultFieldConverterPlugin.js";
 import { CmsModelDynamicZoneFieldConverterPlugin } from "../fieldConverters/CmsModelDynamicZoneFieldConverterPlugin.js";
-export declare const createFieldConverters: () => (CmsModelObjectFieldConverterPlugin | CmsModelDefaultFieldConverterPlugin | CmsModelDynamicZoneFieldConverterPlugin)[];
+export declare const createFieldConverters: () => (CmsModelDefaultFieldConverterPlugin | CmsModelDynamicZoneFieldConverterPlugin | CmsModelObjectFieldConverterPlugin)[];

package/graphql/getSchema/generateCacheKey.js

@@ -1,7 +1,7 @@
 import crypto_0 from "crypto";
 const getSavedOn = (input)=>{
     if (!input) return "unknown";
-    else if (input instanceof Date) return input.toISOString();
+    if (input instanceof Date) return input.toISOString();
     try {
         const savedOn = new Date(input);
         return savedOn.toISOString();

package/graphql/getSchema/generateCacheKey.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/getSchema/generateCacheKey.js","sources":["../../../src/graphql/getSchema/generateCacheKey.ts"],"sourcesContent":["import type { CmsModel } from \"~/types/index.js\";\nimport crypto from \"crypto\";\n\ninterface GenerateCacheKeyParams {\n    models: Pick<CmsModel, \"modelId\" | \"singularApiName\" | \"pluralApiName\" | \"savedOn\">[];\n}\n\nconst getSavedOn = (input: Date | string | undefined | null): string => {\n    if (!input) {\n        return \"unknown\";\n    } else if (input instanceof Date) {\n        return input.toISOString();\n    }\n    try {\n        const savedOn = new Date(input);\n        return savedOn.toISOString();\n    } catch {\n        return \"unknown\";\n    }\n};\n/**\n * Method generates cache key based on last model change time.\n * Or sets \"unknown\" - possible when no models in database.\n */\nexport const generateCacheKey = async (params: GenerateCacheKeyParams): Promise<string> => {\n    const { models } = params;\n\n    const keys: string[] = [];\n    for (const model of models) {\n        const value = getSavedOn(model.savedOn);\n\n        keys.push(model.modelId, model.singularApiName, model.pluralApiName, value);\n    }\n    const key = keys.join(\"#\");\n\n    const hash = crypto.createHash(\"sha512\");\n    hash.update(key);\n    return hash.digest(\"hex\");\n};\n"],"names":["getSavedOn","input","Date","savedOn","generateCacheKey","params","models","keys","model","value","key","hash","crypto"],"mappings":";AAOA,MAAMA,aAAa,CAACC;IAChB,IAAI,CAACA,OACD,OAAO;SACJ,IAAIA,iBAAiBC,MACxB,OAAOD,MAAM,WAAW;IAE5B,IAAI;QACA,MAAME,UAAU,IAAID,KAAKD;QACzB,OAAOE,QAAQ,WAAW;IAC9B,EAAE,OAAM;QACJ,OAAO;IACX;AACJ;AAKO,MAAMC,mBAAmB,OAAOC;IACnC,MAAM,EAAEC,MAAM,EAAE,GAAGD;IAEnB,MAAME,OAAiB,EAAE;IACzB,KAAK,MAAMC,SAASF,OAAQ;QACxB,MAAMG,QAAQT,WAAWQ,MAAM,OAAO;QAEtCD,KAAK,IAAI,CAACC,MAAM,OAAO,EAAEA,MAAM,eAAe,EAAEA,MAAM,aAAa,EAAEC;IACzE;IACA,MAAMC,MAAMH,KAAK,IAAI,CAAC;IAEtB,MAAMI,OAAOC,SAAAA,UAAiB,CAAC;IAC/BD,KAAK,MAAM,CAACD;IACZ,OAAOC,KAAK,MAAM,CAAC;AACvB"}
+{"version":3,"file":"graphql/getSchema/generateCacheKey.js","sources":["../../../src/graphql/getSchema/generateCacheKey.ts"],"sourcesContent":["import type { CmsModel } from \"~/types/index.js\";\nimport crypto from \"crypto\";\n\ninterface GenerateCacheKeyParams {\n    models: Pick<CmsModel, \"modelId\" | \"singularApiName\" | \"pluralApiName\" | \"savedOn\">[];\n}\n\nconst getSavedOn = (input: Date | string | undefined | null): string => {\n    if (!input) {\n        return \"unknown\";\n    } else if (input instanceof Date) {\n        return input.toISOString();\n    }\n    try {\n        const savedOn = new Date(input);\n        return savedOn.toISOString();\n    } catch {\n        return \"unknown\";\n    }\n};\n/**\n * Method generates cache key based on last model change time.\n * Or sets \"unknown\" - possible when no models in database.\n */\nexport const generateCacheKey = async (params: GenerateCacheKeyParams): Promise<string> => {\n    const { models } = params;\n\n    const keys: string[] = [];\n    for (const model of models) {\n        const value = getSavedOn(model.savedOn);\n\n        keys.push(model.modelId, model.singularApiName, model.pluralApiName, value);\n    }\n    const key = keys.join(\"#\");\n\n    const hash = crypto.createHash(\"sha512\");\n    hash.update(key);\n    return hash.digest(\"hex\");\n};\n"],"names":["getSavedOn","input","Date","savedOn","generateCacheKey","params","models","keys","model","value","key","hash","crypto"],"mappings":";AAOA,MAAMA,aAAa,CAACC;IAChB,IAAI,CAACA,OACD,OAAO;IACJ,IAAIA,iBAAiBC,MACxB,OAAOD,MAAM,WAAW;IAE5B,IAAI;QACA,MAAME,UAAU,IAAID,KAAKD;QACzB,OAAOE,QAAQ,WAAW;IAC9B,EAAE,OAAM;QACJ,OAAO;IACX;AACJ;AAKO,MAAMC,mBAAmB,OAAOC;IACnC,MAAM,EAAEC,MAAM,EAAE,GAAGD;IAEnB,MAAME,OAAiB,EAAE;IACzB,KAAK,MAAMC,SAASF,OAAQ;QACxB,MAAMG,QAAQT,WAAWQ,MAAM,OAAO;QAEtCD,KAAK,IAAI,CAACC,MAAM,OAAO,EAAEA,MAAM,eAAe,EAAEA,MAAM,aAAa,EAAEC;IACzE;IACA,MAAMC,MAAMH,KAAK,IAAI,CAAC;IAEtB,MAAMI,OAAOC,SAAAA,UAAiB,CAAC;IAC/BD,KAAK,MAAM,CAACD;IACZ,OAAOC,KAAK,MAAM,CAAC;AACvB"}

package/graphql/scalars/RevisionId.js

@@ -5,7 +5,7 @@ const RevisionIdScalar = new GraphQLScalarType({
     description: "A Headless CMS Reference field input type.",
     parseValue: (value)=>{
         if (!value) return null;
-        else if ("string" != typeof value) throw new Error("RevisionId value must be a string!");
+        if ("string" != typeof value) throw new Error("RevisionId value must be a string!");
         const result = parseIdentifier(value);
         if (!result.version) throw new Error('RevisionId value must be a valid Revision ID property! Example: "abcdef#0001"');
         return value;

package/graphql/scalars/RevisionId.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/scalars/RevisionId.js","sources":["../../../src/graphql/scalars/RevisionId.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\nexport const RevisionIdScalar = new GraphQLScalarType({\n    name: \"RevisionId\",\n    description: \"A Headless CMS Reference field input type.\",\n    parseValue: value => {\n        if (!value) {\n            return null;\n        } else if (typeof value !== \"string\") {\n            throw new Error(\"RevisionId value must be a string!\");\n        }\n\n        const result = parseIdentifier(value);\n        if (!result.version) {\n            throw new Error(\n                `RevisionId value must be a valid Revision ID property! Example: \"abcdef#0001\"`\n            );\n        }\n        return value;\n    }\n});\n"],"names":["RevisionIdScalar","GraphQLScalarType","value","Error","result","parseIdentifier"],"mappings":";;AAGO,MAAMA,mBAAmB,IAAIC,kBAAkB;IAClD,MAAM;IACN,aAAa;IACb,YAAYC,CAAAA;QACR,IAAI,CAACA,OACD,OAAO;aACJ,IAAI,AAAiB,YAAjB,OAAOA,OACd,MAAM,IAAIC,MAAM;QAGpB,MAAMC,SAASC,gBAAgBH;QAC/B,IAAI,CAACE,OAAO,OAAO,EACf,MAAM,IAAID,MACN;QAGR,OAAOD;IACX;AACJ"}
+{"version":3,"file":"graphql/scalars/RevisionId.js","sources":["../../../src/graphql/scalars/RevisionId.ts"],"sourcesContent":["import { GraphQLScalarType } from \"graphql\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\nexport const RevisionIdScalar = new GraphQLScalarType({\n    name: \"RevisionId\",\n    description: \"A Headless CMS Reference field input type.\",\n    parseValue: value => {\n        if (!value) {\n            return null;\n        } else if (typeof value !== \"string\") {\n            throw new Error(\"RevisionId value must be a string!\");\n        }\n\n        const result = parseIdentifier(value);\n        if (!result.version) {\n            throw new Error(\n                `RevisionId value must be a valid Revision ID property! Example: \"abcdef#0001\"`\n            );\n        }\n        return value;\n    }\n});\n"],"names":["RevisionIdScalar","GraphQLScalarType","value","Error","result","parseIdentifier"],"mappings":";;AAGO,MAAMA,mBAAmB,IAAIC,kBAAkB;IAClD,MAAM;IACN,aAAa;IACb,YAAYC,CAAAA;QACR,IAAI,CAACA,OACD,OAAO;QACJ,IAAI,AAAiB,YAAjB,OAAOA,OACd,MAAM,IAAIC,MAAM;QAGpB,MAAMC,SAASC,gBAAgBH;QAC/B,IAAI,CAACE,OAAO,OAAO,EACf,MAAM,IAAID,MACN;QAGR,OAAOD;IACX;AACJ"}

package/graphql/schema/baseSchema.js

@@ -1,25 +1,7 @@
 import { createCmsGraphQLSchemaPlugin } from "../../plugins/index.js";
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql";
 import { ContextPlugin } from "@webiny/api";
-import camelCase from "lodash/camelCase.js";
-import { CmsModelFieldValidatorRegistry } from "../../features/validation/index.js";
-const createSkipValidatorEnum = (container)=>{
-    const registry = container.resolve(CmsModelFieldValidatorRegistry);
-    const names = registry.getAll().reduce((collection, validator)=>{
-        const name = camelCase(validator.name);
-        if (collection.includes(name)) return collection;
-        collection.push(name);
-        return collection;
-    }, []);
-    if (0 === names.length) names.push("_empty");
-    return `
-        enum SkipValidatorEnum {
-           ${names.join("\n")}
-        }
-    `;
-};
-const createSchema = (context)=>{
-    const skipValidatorEnum = createSkipValidatorEnum(context.container);
+const createSchema = ()=>{
     const cmsPlugin = createCmsGraphQLSchemaPlugin({
         typeDefs: `
             type CmsIdentity {
@@ -89,18 +71,16 @@ const createSchema = (context)=>{
                 folderId_not_in: [ID!]
             }
 
-            ${skipValidatorEnum}
-
             input CreateCmsEntryOptionsInput {
-                skipValidators: [SkipValidatorEnum!]
+                skipValidation: Boolean
             }
 
             input CreateRevisionCmsEntryOptionsInput {
-                skipValidators: [SkipValidatorEnum!]
+                skipValidation: Boolean
             }
 
             input UpdateCmsEntryOptionsInput {
-                skipValidators: [SkipValidatorEnum!]
+                skipValidation: Boolean
             }
 
             input CmsIdentityInput {
@@ -159,7 +139,7 @@ const createSchema = (context)=>{
 };
 const createBaseSchema = ()=>{
     const plugin = new ContextPlugin(async (context)=>{
-        context.plugins.register(...createSchema(context));
+        context.plugins.register(...createSchema());
     });
     plugin.name = "headless-cms.graphql.createBaseSchema";
     return plugin;

package/graphql/schema/baseSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/baseSchema.js","sources":["../../../src/graphql/schema/baseSchema.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport type { IGraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport camelCase from \"lodash/camelCase.js\";\nimport { CmsModelFieldValidatorRegistry } from \"~/features/validation/index.js\";\nimport type { Container } from \"@webiny/di\";\n\nconst createSkipValidatorEnum = (container: Container) => {\n    const registry = container.resolve(CmsModelFieldValidatorRegistry);\n    const names = registry.getAll().reduce<string[]>((collection, validator) => {\n        const name = camelCase(validator.name);\n        if (collection.includes(name)) {\n            return collection;\n        }\n        collection.push(name);\n        return collection;\n    }, []);\n\n    if (names.length === 0) {\n        names.push(\"_empty\");\n    }\n    return /* GraphQL */ `\n        enum SkipValidatorEnum {\n           ${names.join(\"\\n\")}\n        }\n    `;\n};\n\nconst createSchema = (context: CmsContext): IGraphQLSchemaPlugin<CmsContext>[] => {\n    const skipValidatorEnum = createSkipValidatorEnum(context.container);\n\n    const cmsPlugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            input CmsDeleteEntryOptions {\n                # force delete an entry that might have some records left behind in the database\n                # see CmsDeleteEntryOptions in types.ts\n                force: Boolean\n                # permanently delete an entry without moving it to the bin\n                permanently: Boolean\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsDeleteMultipleDataResponse {\n                id: ID!\n            }\n\n            type CmsDeleteMultipleResponse {\n                data: [CmsDeleteMultipleDataResponse!]\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            # Advanced Content Organization\n            type WbyAcoLocation {\n                folderId: ID\n            }\n\n            input WbyAcoLocationInput {\n                folderId: ID!\n            }\n\n            input WbyAcoLocationWhereInput {\n                folderId: ID\n                folderId_in: [ID!]\n                folderId_not: ID\n                folderId_not_in: [ID!]\n            }\n\n            ${skipValidatorEnum}\n\n            input CreateCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input CreateRevisionCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input UpdateCmsEntryOptionsInput {\n                skipValidators: [SkipValidatorEnum!]\n            }\n\n            input CmsIdentityInput {\n                id: String!\n                displayName: String!\n                type: String!\n            }\n\n            type CmsEntryValidationResponseData {\n                error: String!\n                id: String!\n                fieldId: String!\n                parents: [String!]!\n            }\n\n            type CmsEntryValidationResponse {\n                data: [CmsEntryValidationResponseData!]\n                error: CmsError\n            }\n\n            type CmsEntrySystem {\n                _empty: String\n            }\n\n            type CmsEntryLive {\n                version: Int!\n            }\n\n            input CmsEntryLiveWhereInput {\n                version: Int\n                version_gt: Int\n                version_gte: Int\n                version_lt: Int\n                version_lte: Int\n                version_not: Int\n                version_in: [Int!]\n                version_not_in: [Int!]\n            }\n\n            input ListWhereInputCmsEntrySystem {\n                _empty: String\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"headless-cms.graphql.core.schema.base\";\n    /**\n     * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.\n     */\n    return [cmsPlugin, corePlugin];\n};\n\nexport const createBaseSchema = () => {\n    const plugin = new ContextPlugin<CmsContext>(async context => {\n        context.plugins.register(...createSchema(context));\n    });\n\n    plugin.name = \"headless-cms.graphql.createBaseSchema\";\n\n    return plugin;\n};\n"],"names":["createSkipValidatorEnum","container","registry","CmsModelFieldValidatorRegistry","names","collection","validator","name","camelCase","createSchema","context","skipValidatorEnum","cmsPlugin","createCmsGraphQLSchemaPlugin","corePlugin","GraphQLSchemaPlugin","createBaseSchema","plugin","ContextPlugin"],"mappings":";;;;;AASA,MAAMA,0BAA0B,CAACC;IAC7B,MAAMC,WAAWD,UAAU,OAAO,CAACE;IACnC,MAAMC,QAAQF,SAAS,MAAM,GAAG,MAAM,CAAW,CAACG,YAAYC;QAC1D,MAAMC,OAAOC,UAAUF,UAAU,IAAI;QACrC,IAAID,WAAW,QAAQ,CAACE,OACpB,OAAOF;QAEXA,WAAW,IAAI,CAACE;QAChB,OAAOF;IACX,GAAG,EAAE;IAEL,IAAID,AAAiB,MAAjBA,MAAM,MAAM,EACZA,MAAM,IAAI,CAAC;IAEf,OAAqB,CAAC;;WAEf,EAAEA,MAAM,IAAI,CAAC,MAAM;;IAE1B,CAAC;AACL;AAEA,MAAMK,eAAe,CAACC;IAClB,MAAMC,oBAAoBX,wBAAwBU,QAAQ,SAAS;IAEnE,MAAME,YAAYC,6BAA6B;QAC3C,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoErB,EAAEF,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAsDxB,CAAC;QACD,WAAW,CAAC;IAChB;IACAC,UAAU,IAAI,GAAG;IACjB,MAAME,aAAa,IAAIC,oBAAgC;QACnD,UAAUH,UAAU,MAAM,CAAC,QAAQ;QACnC,WAAWA,UAAU,MAAM,CAAC,SAAS;IACzC;IACAE,WAAW,IAAI,GAAG;IAIlB,OAAO;QAACF;QAAWE;KAAW;AAClC;AAEO,MAAME,mBAAmB;IAC5B,MAAMC,SAAS,IAAIC,cAA0B,OAAMR;QAC/CA,QAAQ,OAAO,CAAC,QAAQ,IAAID,aAAaC;IAC7C;IAEAO,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}
+{"version":3,"file":"graphql/schema/baseSchema.js","sources":["../../../src/graphql/schema/baseSchema.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport { createCmsGraphQLSchemaPlugin } from \"~/plugins/index.js\";\nimport type { IGraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { ContextPlugin } from \"@webiny/api\";\n\nconst createSchema = (): IGraphQLSchemaPlugin<CmsContext>[] => {\n    const cmsPlugin = createCmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            input CmsDeleteEntryOptions {\n                # force delete an entry that might have some records left behind in the database\n                # see CmsDeleteEntryOptions in types.ts\n                force: Boolean\n                # permanently delete an entry without moving it to the bin\n                permanently: Boolean\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsDeleteMultipleDataResponse {\n                id: ID!\n            }\n\n            type CmsDeleteMultipleResponse {\n                data: [CmsDeleteMultipleDataResponse!]\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            # Advanced Content Organization\n            type WbyAcoLocation {\n                folderId: ID\n            }\n\n            input WbyAcoLocationInput {\n                folderId: ID!\n            }\n\n            input WbyAcoLocationWhereInput {\n                folderId: ID\n                folderId_in: [ID!]\n                folderId_not: ID\n                folderId_not_in: [ID!]\n            }\n\n            input CreateCmsEntryOptionsInput {\n                skipValidation: Boolean\n            }\n\n            input CreateRevisionCmsEntryOptionsInput {\n                skipValidation: Boolean\n            }\n\n            input UpdateCmsEntryOptionsInput {\n                skipValidation: Boolean\n            }\n\n            input CmsIdentityInput {\n                id: String!\n                displayName: String!\n                type: String!\n            }\n\n            type CmsEntryValidationResponseData {\n                error: String!\n                id: String!\n                fieldId: String!\n                parents: [String!]!\n            }\n\n            type CmsEntryValidationResponse {\n                data: [CmsEntryValidationResponseData!]\n                error: CmsError\n            }\n\n            type CmsEntrySystem {\n                _empty: String\n            }\n\n            type CmsEntryLive {\n                version: Int!\n            }\n\n            input CmsEntryLiveWhereInput {\n                version: Int\n                version_gt: Int\n                version_gte: Int\n                version_lt: Int\n                version_lte: Int\n                version_not: Int\n                version_in: [Int!]\n                version_not_in: [Int!]\n            }\n\n            input ListWhereInputCmsEntrySystem {\n                _empty: String\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"headless-cms.graphql.core.schema.base\";\n    /**\n     * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.\n     */\n    return [cmsPlugin, corePlugin];\n};\n\nexport const createBaseSchema = () => {\n    const plugin = new ContextPlugin<CmsContext>(async context => {\n        context.plugins.register(...createSchema());\n    });\n\n    plugin.name = \"headless-cms.graphql.createBaseSchema\";\n\n    return plugin;\n};\n"],"names":["createSchema","cmsPlugin","createCmsGraphQLSchemaPlugin","corePlugin","GraphQLSchemaPlugin","createBaseSchema","plugin","ContextPlugin","context"],"mappings":";;;AAMA,MAAMA,eAAe;IACjB,MAAMC,YAAYC,6BAA6B;QAC3C,UAAwB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAwHzB,CAAC;QACD,WAAW,CAAC;IAChB;IACAD,UAAU,IAAI,GAAG;IACjB,MAAME,aAAa,IAAIC,oBAAgC;QACnD,UAAUH,UAAU,MAAM,CAAC,QAAQ;QACnC,WAAWA,UAAU,MAAM,CAAC,SAAS;IACzC;IACAE,WAAW,IAAI,GAAG;IAIlB,OAAO;QAACF;QAAWE;KAAW;AAClC;AAEO,MAAME,mBAAmB;IAC5B,MAAMC,SAAS,IAAIC,cAA0B,OAAMC;QAC/CA,QAAQ,OAAO,CAAC,QAAQ,IAAIR;IAChC;IAEAM,OAAO,IAAI,GAAG;IAEd,OAAOA;AACX"}

package/graphql/schema/cms/getEntryResolver.js

@@ -1,11 +1,12 @@
-import { buildFieldsSelection, getErrorMessage, getModel } from "./helpers.js";
+import { buildFieldsSelection, expandFieldWildcards, getErrorMessage, getModel } from "./helpers.js";
 const createGetEntryResolver = ()=>async ({ args, context })=>{
         const { modelId, where, fields, preview = false } = args;
         try {
             const model = await getModel(context, modelId);
             const apiType = preview ? "preview" : "read";
             const executeSchema = await context.cms.getExecutableSchema(apiType);
-            const fieldsSelection = buildFieldsSelection(fields);
+            const expandedFields = expandFieldWildcards(fields, model, context);
+            const fieldsSelection = buildFieldsSelection(expandedFields);
             const query = `
                 query Get${model.singularApiName}($where: ${model.singularApiName}GetWhereInput!) {
                     get${model.singularApiName}(where: $where) {

package/graphql/schema/cms/getEntryResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql/schema/cms/getEntryResolver.js","sources":["../../../../src/graphql/schema/cms/getEntryResolver.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport { getModel, getErrorMessage, buildFieldsSelection } from \"./helpers.js\";\n\nexport interface GetEntryArgs {\n    modelId: string;\n    where: Record<string, unknown>;\n    fields: string[];\n    preview?: boolean;\n}\n\nexport const createGetEntryResolver = () => {\n    return async ({ args, context }: { args: GetEntryArgs; context: CmsContext }) => {\n        const { modelId, where, fields, preview = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Determine which API to use based on the preview flag.\n            // preview=true -> preview API, preview=false -> read API\n            const apiType: ApiEndpoint = preview ? \"preview\" : \"read\";\n            const executeSchema = await context.cms.getExecutableSchema(apiType);\n\n            const fieldsSelection = buildFieldsSelection(fields);\n\n            const query = /* GraphQL */ `\n                query Get${model.singularApiName}($where: ${model.singularApiName}GetWhereInput!) {\n                    get${model.singularApiName}(where: $where) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await executeSchema({\n                query,\n                variables: { where }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: null,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"GET_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `get${model.singularApiName}`;\n            return result.data?.[operationName] || { data: null, error: null };\n        } catch (error) {\n            return {\n                data: null,\n                error: {\n                    message: getErrorMessage(error, \"Failed to get entry\"),\n                    code: \"GET_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createGetEntryResolver","args","context","modelId","where","fields","preview","model","getModel","apiType","executeSchema","fieldsSelection","buildFieldsSelection","query","result","e","operationName","error","getErrorMessage"],"mappings":";AAYO,MAAMA,yBAAyB,IAC3B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAA+C;QACxE,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,UAAU,KAAK,EAAE,GAAGL;QAEpD,IAAI;YACA,MAAMM,QAAQ,MAAMC,SAASN,SAASC;YAItC,MAAMM,UAAuBH,UAAU,YAAY;YACnD,MAAMI,gBAAgB,MAAMR,QAAQ,GAAG,CAAC,mBAAmB,CAACO;YAE5D,MAAME,kBAAkBC,qBAAqBP;YAE7C,MAAMQ,QAAsB,CAAC;yBAChB,EAAEN,MAAM,eAAe,CAAC,SAAS,EAAEA,MAAM,eAAe,CAAC;uBAC3D,EAAEA,MAAM,eAAe,CAAC;;4BAEnB,EAAEI,gBAAgB;;;;;;;;;YASlC,CAAC;YAED,MAAMG,SAAU,MAAMJ,cAAc;gBAChCG;gBACA,WAAW;oBAAET;gBAAM;YACvB;YAEA,IAAIU,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,GAAG,EAAET,MAAM,eAAe,EAAE;YACnD,OAAOO,OAAO,IAAI,EAAE,CAACE,cAAc,IAAI;gBAAE,MAAM;gBAAM,OAAO;YAAK;QACrE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}
+{"version":3,"file":"graphql/schema/cms/getEntryResolver.js","sources":["../../../../src/graphql/schema/cms/getEntryResolver.ts"],"sourcesContent":["import type { CmsContext } from \"~/types/index.js\";\nimport type { ApiEndpoint } from \"~/types/index.js\";\nimport type { ExecutionResult } from \"graphql\";\nimport {\n    getModel,\n    getErrorMessage,\n    buildFieldsSelection,\n    expandFieldWildcards\n} from \"./helpers.js\";\n\nexport interface GetEntryArgs {\n    modelId: string;\n    where: Record<string, unknown>;\n    fields: string[];\n    preview?: boolean;\n}\n\nexport const createGetEntryResolver = () => {\n    return async ({ args, context }: { args: GetEntryArgs; context: CmsContext }) => {\n        const { modelId, where, fields, preview = false } = args;\n\n        try {\n            const model = await getModel(context, modelId);\n\n            // Determine which API to use based on the preview flag.\n            // preview=true -> preview API, preview=false -> read API\n            const apiType: ApiEndpoint = preview ? \"preview\" : \"read\";\n            const executeSchema = await context.cms.getExecutableSchema(apiType);\n\n            const expandedFields = expandFieldWildcards(fields, model, context);\n            const fieldsSelection = buildFieldsSelection(expandedFields);\n\n            const query = /* GraphQL */ `\n                query Get${model.singularApiName}($where: ${model.singularApiName}GetWhereInput!) {\n                    get${model.singularApiName}(where: $where) {\n                        data {\n                            ${fieldsSelection}\n                        }\n                        error {\n                            message\n                            code\n                            data\n                        }\n                    }\n                }\n            `;\n\n            const result = (await executeSchema({\n                query,\n                variables: { where }\n            })) as ExecutionResult;\n\n            if (result.errors && result.errors.length > 0) {\n                return {\n                    data: null,\n                    error: {\n                        message: result.errors.map(e => e.message).join(\"; \"),\n                        code: \"GET_ENTRY_ERROR\"\n                    }\n                };\n            }\n\n            const operationName = `get${model.singularApiName}`;\n            return result.data?.[operationName] || { data: null, error: null };\n        } catch (error) {\n            return {\n                data: null,\n                error: {\n                    message: getErrorMessage(error, \"Failed to get entry\"),\n                    code: \"GET_ENTRY_ERROR\"\n                }\n            };\n        }\n    };\n};\n"],"names":["createGetEntryResolver","args","context","modelId","where","fields","preview","model","getModel","apiType","executeSchema","expandedFields","expandFieldWildcards","fieldsSelection","buildFieldsSelection","query","result","e","operationName","error","getErrorMessage"],"mappings":";AAiBO,MAAMA,yBAAyB,IAC3B,OAAO,EAAEC,IAAI,EAAEC,OAAO,EAA+C;QACxE,MAAM,EAAEC,OAAO,EAAEC,KAAK,EAAEC,MAAM,EAAEC,UAAU,KAAK,EAAE,GAAGL;QAEpD,IAAI;YACA,MAAMM,QAAQ,MAAMC,SAASN,SAASC;YAItC,MAAMM,UAAuBH,UAAU,YAAY;YACnD,MAAMI,gBAAgB,MAAMR,QAAQ,GAAG,CAAC,mBAAmB,CAACO;YAE5D,MAAME,iBAAiBC,qBAAqBP,QAAQE,OAAOL;YAC3D,MAAMW,kBAAkBC,qBAAqBH;YAE7C,MAAMI,QAAsB,CAAC;yBAChB,EAAER,MAAM,eAAe,CAAC,SAAS,EAAEA,MAAM,eAAe,CAAC;uBAC3D,EAAEA,MAAM,eAAe,CAAC;;4BAEnB,EAAEM,gBAAgB;;;;;;;;;YASlC,CAAC;YAED,MAAMG,SAAU,MAAMN,cAAc;gBAChCK;gBACA,WAAW;oBAAEX;gBAAM;YACvB;YAEA,IAAIY,OAAO,MAAM,IAAIA,OAAO,MAAM,CAAC,MAAM,GAAG,GACxC,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASA,OAAO,MAAM,CAAC,GAAG,CAACC,CAAAA,IAAKA,EAAE,OAAO,EAAE,IAAI,CAAC;oBAChD,MAAM;gBACV;YACJ;YAGJ,MAAMC,gBAAgB,CAAC,GAAG,EAAEX,MAAM,eAAe,EAAE;YACnD,OAAOS,OAAO,IAAI,EAAE,CAACE,cAAc,IAAI;gBAAE,MAAM;gBAAM,OAAO;YAAK;QACrE,EAAE,OAAOC,OAAO;YACZ,OAAO;gBACH,MAAM;gBACN,OAAO;oBACH,SAASC,gBAAgBD,OAAO;oBAChC,MAAM;gBACV;YACJ;QACJ;IACJ"}

package/graphql/schema/cms/getModelResolver.d.ts

@@ -0,0 +1,35 @@
+import type { CmsContext } from "../../../types/index.js";
+export interface GetModelArgs {
+    modelId: string;
+}
+export declare const createGetModelResolver: () => ({ args, context }: {
+    args: GetModelArgs;
+    context: CmsContext;
+}) => Promise<{
+    data: {
+        name: string;
+        modelId: string;
+        singularApiName: string;
+        pluralApiName: string;
+        description: string | null;
+        titleFieldId: string;
+        descriptionFieldId: string | null | undefined;
+        imageFieldId: string | null | undefined;
+        fields: import("~/types/index.js").CmsModelField[];
+        layout: import("~/types/index.js").CmsModelLayout;
+        tags: string[] | undefined;
+        settings: import("../../../features/modelBuilder/abstractions.js").IModelSettings | null | undefined;
+        metadata: {
+            valuesSelection: string;
+            componentMap: Record<string, string>;
+            refModels: Record<string, import("~/features/contentModel/RefModelsGenerator/abstractions.js").RefModelMetadata>;
+        };
+    };
+    error: null;
+} | {
+    data: null;
+    error: {
+        message: string;
+        code: string;
+    };
+}>;