@webiny/api-headless-cms 5.39.0-beta.0 → 5.39.0-beta.2

package/fieldConverters/CmsModelObjectFieldConverterPlugin.js

@@ -1,26 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CmsModelObjectFieldConverterPlugin = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _CmsModelFieldConverterPlugin = require("../plugins/CmsModelFieldConverterPlugin");
 class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.CmsModelFieldConverterPlugin {
-  constructor(...args) {
-    super(...args);
-    (0, _defineProperty2.default)(this, "name", "cms.field.converter.object");
-  }
+  name = "cms.field.converter.object";
   getFieldType() {
     return "object";
   }
   getChildFields({
     field
   }) {
-    var _field$settings;
-    return (field === null || field === void 0 || (_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.fields) || [];
+    return field?.settings?.fields || [];
   }
   convertToStorage(params) {
     const {
@@ -44,9 +37,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
         [field.storageId]: value.map(itemValue => {
           return this.processChildFieldsToStorage({
             fields: childFields.map(child => {
-              return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+              return {
+                ...child,
                 parent: field
-              });
+              };
             }),
             value: itemValue,
             converterCollection
@@ -56,9 +50,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
     }
     const values = this.processChildFieldsToStorage({
       fields: childFields.map(child => {
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        return {
+          ...child,
           parent: field
-        });
+        };
       }),
       value,
       converterCollection
@@ -91,9 +86,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
           const values = value[field.fieldId].map(childValue => {
             return converterCollection.convertToStorage({
               fields: childFields.map(child => {
-                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+                return {
+                  ...child,
                   parent: field
-                });
+                };
               }),
               values: childValue
             });
@@ -101,9 +97,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
           if (values === undefined) {
             return output;
           }
-          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), {}, {
+          return {
+            ...output,
             [field.storageId]: values
-          });
+          };
         }
         /**
          * No need to process child fields if no value is provided.
@@ -113,25 +110,28 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
         }
         const values = converterCollection.convertToStorage({
           fields: childFields.map(child => {
-            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+            return {
+              ...child,
               parent: field
-            });
+            };
           }),
           values: value[field.fieldId]
         });
         if (values === undefined) {
           return output;
         }
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), {}, {
+        return {
+          ...output,
           [field.storageId]: values
-        });
+        };
       }
       if (value[field.fieldId] === undefined) {
         return output;
       }
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), {}, {
+      return {
+        ...output,
         [field.storageId]: value[field.fieldId]
-      });
+      };
     }, {});
   }
   convertFromStorage(params) {
@@ -156,9 +156,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
         [field.fieldId]: value.map(itemValue => {
           return this.processChildFieldsFromStorage({
             fields: childFields.map(child => {
-              return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+              return {
+                ...child,
                 parent: field
-              });
+              };
             }),
             value: itemValue,
             converterCollection
@@ -168,9 +169,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
     }
     const values = this.processChildFieldsFromStorage({
       fields: childFields.map(child => {
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        return {
+          ...child,
           parent: field
-        });
+        };
       }),
       value,
       converterCollection
@@ -204,9 +206,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
           const values = inputValues.map(childValue => {
             return converterCollection.convertFromStorage({
               fields: childFields.map(child => {
-                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+                return {
+                  ...child,
                   parent: field
-                });
+                };
               }),
               values: childValue
             });
@@ -214,9 +217,10 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
           if (values === undefined) {
             return output;
           }
-          return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), {}, {
+          return {
+            ...output,
             [field.fieldId]: values
-          });
+          };
         }
         /**
          * No need to process child fields if no value is provided.
@@ -226,25 +230,28 @@ class CmsModelObjectFieldConverterPlugin extends _CmsModelFieldConverterPlugin.C
         }
         const values = converterCollection.convertFromStorage({
           fields: childFields.map(child => {
-            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+            return {
+              ...child,
               parent: field
-            });
+            };
           }),
           values: value[field.storageId]
         });
         if (values === undefined) {
           return output;
         }
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), {}, {
+        return {
+          ...output,
           [field.fieldId]: values
-        });
+        };
       }
       if (value[field.storageId] === undefined) {
         return output;
       }
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, output), {}, {
+      return {
+        ...output,
         [field.fieldId]: value[field.storageId]
-      });
+      };
     }, {});
   }
 }

package/fieldConverters/CmsModelObjectFieldConverterPlugin.js.map

@@ -1 +1 @@
-{"version":3,"names":["_CmsModelFieldConverterPlugin","require","CmsModelObjectFieldConverterPlugin","CmsModelFieldConverterPlugin","constructor","args","_defineProperty2","default","getFieldType","getChildFields","field","_field$settings","settings","fields","convertToStorage","params","value","converterCollection","childFields","length","multipleValues","Array","isArray","storageId","map","itemValue","processChildFieldsToStorage","child","_objectSpread2","parent","values","undefined","reduce","output","fieldId","childValue","convertFromStorage","processChildFieldsFromStorage","inputValues","exports"],"sources":["CmsModelObjectFieldConverterPlugin.ts"],"sourcesContent":["import {\n    CmsModelFieldConverterPlugin,\n    ConvertParams\n} from \"~/plugins/CmsModelFieldConverterPlugin\";\nimport { CmsEntryValues, CmsModelFieldWithParent } from \"~/types\";\nimport { ConverterCollection } from \"~/utils/converters/ConverterCollection\";\n\ninterface ProcessChildFieldsParams {\n    fields: CmsModelFieldWithParent[];\n    value?: Record<string, any> | 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.multipleValues) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.storageId]: []\n                };\n            }\n            return {\n                [field.storageId]: value.map((itemValue: any) => {\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            const childFields = this.getChildFields({\n                field\n            });\n\n            if (childFields.length > 0) {\n                if (field.multipleValues) {\n                    if (Array.isArray(value[field.fieldId]) === false) {\n                        return output;\n                    }\n                    const values = value[field.fieldId].map((childValue: any) => {\n                        return converterCollection.convertToStorage({\n                            fields: childFields.map(child => {\n                                return {\n                                    ...child,\n                                    parent: field\n                                };\n                            }),\n                            values: childValue\n                        });\n                    });\n                    if (values === undefined) {\n                        return output;\n                    }\n                    return {\n                        ...output,\n                        [field.storageId]: values\n                    };\n                }\n                /**\n                 * No need to process child fields if no value is provided.\n                 */\n                if (!value[field.fieldId]) {\n                    return output;\n                }\n                const values = converterCollection.convertToStorage({\n                    fields: childFields.map(child => {\n                        return {\n                            ...child,\n                            parent: field\n                        };\n                    }),\n                    values: value[field.fieldId]\n                });\n                if (values === undefined) {\n                    return output;\n                }\n                return {\n                    ...output,\n                    [field.storageId]: values\n                };\n            }\n\n            if (value[field.fieldId] === undefined) {\n                return output;\n            }\n\n            return {\n                ...output,\n                [field.storageId]: value[field.fieldId]\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.multipleValues) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.fieldId]: []\n                };\n            }\n            return {\n                [field.fieldId]: value.map((itemValue: any) => {\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            const childFields = this.getChildFields({\n                field\n            });\n\n            if (childFields.length > 0) {\n                if (field.multipleValues) {\n                    const inputValues = value[field.storageId] as any[] | undefined;\n                    if (!inputValues || Array.isArray(inputValues) === false) {\n                        return output;\n                    }\n                    const values = inputValues.map(childValue => {\n                        return converterCollection.convertFromStorage({\n                            fields: childFields.map(child => {\n                                return {\n                                    ...child,\n                                    parent: field\n                                };\n                            }),\n                            values: childValue\n                        });\n                    });\n                    if (values === undefined) {\n                        return output;\n                    }\n                    return {\n                        ...output,\n                        [field.fieldId]: values\n                    };\n                }\n                /**\n                 * No need to process child fields if no value is provided.\n                 */\n                if (!value[field.storageId]) {\n                    return output;\n                }\n                const values = converterCollection.convertFromStorage({\n                    fields: childFields.map(child => {\n                        return {\n                            ...child,\n                            parent: field\n                        };\n                    }),\n                    values: value[field.storageId]\n                });\n                if (values === undefined) {\n                    return output;\n                }\n                return {\n                    ...output,\n                    [field.fieldId]: values\n                };\n            }\n\n            if (value[field.storageId] === undefined) {\n                return output;\n            }\n            return {\n                ...output,\n                [field.fieldId]: value[field.storageId]\n            };\n        }, {});\n    }\n}\n"],"mappings":";;;;;;;;;AAAA,IAAAA,6BAAA,GAAAC,OAAA;AAiBO,MAAMC,kCAAkC,SAASC,0DAA4B,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBAC1D,4BAA4B;EAAA;EAEnCC,YAAYA,CAAA,EAAW;IACnC,OAAO,QAAQ;EACnB;EAEQC,cAAcA,CAAC;IAAEC;EAA4B,CAAC,EAA6B;IAAA,IAAAC,eAAA;IAC/E,OAAO,CAAAD,KAAK,aAALA,KAAK,gBAAAC,eAAA,GAALD,KAAK,CAAEE,QAAQ,cAAAD,eAAA,uBAAfA,eAAA,CAAiBE,MAAM,KAAI,EAAE;EACxC;EAEgBC,gBAAgBA,CAACC,MAAqB,EAAkB;IACpE,MAAM;MAAEL,KAAK;MAAEM,KAAK;MAAEC;IAAoB,CAAC,GAAGF,MAAM;IAEpD,MAAMG,WAAW,GAAG,IAAI,CAACT,cAAc,CAAC;MACpCC;IACJ,CAAC,CAAC;IACF,IAAIQ,WAAW,CAACC,MAAM,KAAK,CAAC,EAAE;MAC1B,OAAO,CAAC,CAAC;IACb;IAEA,IAAIT,KAAK,CAACU,cAAc,EAAE;MACtB,IAAIC,KAAK,CAACC,OAAO,CAACN,KAAK,CAAC,KAAK,KAAK,EAAE;QAChC,OAAO;UACH,CAACN,KAAK,CAACa,SAAS,GAAG;QACvB,CAAC;MACL;MACA,OAAO;QACH,CAACb,KAAK,CAACa,SAAS,GAAGP,KAAK,CAACQ,GAAG,CAAEC,SAAc,IAAK;UAC7C,OAAO,IAAI,CAACC,2BAA2B,CAAC;YACpCb,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;cAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;gBACRE,MAAM,EAAEnB;cAAK;YAErB,CAAC,CAAC;YACFM,KAAK,EAAES,SAAS;YAChBR;UACJ,CAAC,CAAC;QACN,CAAC;MACL,CAAC;IACL;IAEA,MAAMa,MAAM,GAAG,IAAI,CAACJ,2BAA2B,CAAC;MAC5Cb,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;QAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;UACRE,MAAM,EAAEnB;QAAK;MAErB,CAAC,CAAC;MACFM,KAAK;MACLC;IACJ,CAAC,CAAC;IACF,IAAIa,MAAM,KAAKC,SAAS,EAAE;MACtB,OAAO,CAAC,CAAC;IACb;IAEA,OAAO;MACH,CAACrB,KAAK,CAACa,SAAS,GAAGO;IACvB,CAAC;EACL;EAEQJ,2BAA2BA,CAC/BX,MAAgC,EACN;IAC1B,MAAM;MAAEF,MAAM;MAAEG,KAAK;MAAEC;IAAoB,CAAC,GAAGF,MAAM;IAErD,IAAIC,KAAK,KAAKe,SAAS,IAAIf,KAAK,KAAK,IAAI,EAAE;MACvC,OAAOe,SAAS;IACpB;IAEA,OAAOlB,MAAM,CAACmB,MAAM,CAAiB,CAACC,MAAM,EAAEvB,KAAK,KAAK;MACpD,MAAMQ,WAAW,GAAG,IAAI,CAACT,cAAc,CAAC;QACpCC;MACJ,CAAC,CAAC;MAEF,IAAIQ,WAAW,CAACC,MAAM,GAAG,CAAC,EAAE;QACxB,IAAIT,KAAK,CAACU,cAAc,EAAE;UACtB,IAAIC,KAAK,CAACC,OAAO,CAACN,KAAK,CAACN,KAAK,CAACwB,OAAO,CAAC,CAAC,KAAK,KAAK,EAAE;YAC/C,OAAOD,MAAM;UACjB;UACA,MAAMH,MAAM,GAAGd,KAAK,CAACN,KAAK,CAACwB,OAAO,CAAC,CAACV,GAAG,CAAEW,UAAe,IAAK;YACzD,OAAOlB,mBAAmB,CAACH,gBAAgB,CAAC;cACxCD,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;gBAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;kBACRE,MAAM,EAAEnB;gBAAK;cAErB,CAAC,CAAC;cACFoB,MAAM,EAAEK;YACZ,CAAC,CAAC;UACN,CAAC,CAAC;UACF,IAAIL,MAAM,KAAKC,SAAS,EAAE;YACtB,OAAOE,MAAM;UACjB;UACA,WAAAL,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACO0B,MAAM;YACT,CAACvB,KAAK,CAACa,SAAS,GAAGO;UAAM;QAEjC;QACA;AAChB;AACA;QACgB,IAAI,CAACd,KAAK,CAACN,KAAK,CAACwB,OAAO,CAAC,EAAE;UACvB,OAAOD,MAAM;QACjB;QACA,MAAMH,MAAM,GAAGb,mBAAmB,CAACH,gBAAgB,CAAC;UAChDD,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;YAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;cACRE,MAAM,EAAEnB;YAAK;UAErB,CAAC,CAAC;UACFoB,MAAM,EAAEd,KAAK,CAACN,KAAK,CAACwB,OAAO;QAC/B,CAAC,CAAC;QACF,IAAIJ,MAAM,KAAKC,SAAS,EAAE;UACtB,OAAOE,MAAM;QACjB;QACA,WAAAL,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACO0B,MAAM;UACT,CAACvB,KAAK,CAACa,SAAS,GAAGO;QAAM;MAEjC;MAEA,IAAId,KAAK,CAACN,KAAK,CAACwB,OAAO,CAAC,KAAKH,SAAS,EAAE;QACpC,OAAOE,MAAM;MACjB;MAEA,WAAAL,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACO0B,MAAM;QACT,CAACvB,KAAK,CAACa,SAAS,GAAGP,KAAK,CAACN,KAAK,CAACwB,OAAO;MAAC;IAE/C,CAAC,EAAE,CAAC,CAAC,CAAC;EACV;EAEgBE,kBAAkBA,CAACrB,MAAqB,EAAkB;IACtE,MAAM;MAAEL,KAAK;MAAEM,KAAK;MAAEC;IAAoB,CAAC,GAAGF,MAAM;IAEpD,MAAMG,WAAW,GAAG,IAAI,CAACT,cAAc,CAAC;MACpCC;IACJ,CAAC,CAAC;IACF,IAAIQ,WAAW,CAACC,MAAM,KAAK,CAAC,EAAE;MAC1B,OAAO,CAAC,CAAC;IACb;IAEA,IAAIT,KAAK,CAACU,cAAc,EAAE;MACtB,IAAIC,KAAK,CAACC,OAAO,CAACN,KAAK,CAAC,KAAK,KAAK,EAAE;QAChC,OAAO;UACH,CAACN,KAAK,CAACwB,OAAO,GAAG;QACrB,CAAC;MACL;MACA,OAAO;QACH,CAACxB,KAAK,CAACwB,OAAO,GAAGlB,KAAK,CAACQ,GAAG,CAAEC,SAAc,IAAK;UAC3C,OAAO,IAAI,CAACY,6BAA6B,CAAC;YACtCxB,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;cAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;gBACRE,MAAM,EAAEnB;cAAK;YAErB,CAAC,CAAC;YACFM,KAAK,EAAES,SAAS;YAChBR;UACJ,CAAC,CAAC;QACN,CAAC;MACL,CAAC;IACL;IAEA,MAAMa,MAAM,GAAG,IAAI,CAACO,6BAA6B,CAAC;MAC9CxB,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;QAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;UACRE,MAAM,EAAEnB;QAAK;MAErB,CAAC,CAAC;MACFM,KAAK;MACLC;IACJ,CAAC,CAAC;IAEF,IAAIa,MAAM,KAAKC,SAAS,EAAE;MACtB,OAAO,CAAC,CAAC;IACb;IAEA,OAAO;MACH,CAACrB,KAAK,CAACwB,OAAO,GAAGJ;IACrB,CAAC;EACL;EAEQO,6BAA6BA,CACjCtB,MAAgC,EACN;IAC1B,MAAM;MAAEF,MAAM;MAAEG,KAAK;MAAEC;IAAoB,CAAC,GAAGF,MAAM;IAErD,IAAIC,KAAK,KAAKe,SAAS,IAAIf,KAAK,KAAK,IAAI,EAAE;MACvC,OAAOe,SAAS;IACpB;IAEA,OAAOlB,MAAM,CAACmB,MAAM,CAAiB,CAACC,MAAM,EAAEvB,KAAK,KAAK;MACpD,MAAMQ,WAAW,GAAG,IAAI,CAACT,cAAc,CAAC;QACpCC;MACJ,CAAC,CAAC;MAEF,IAAIQ,WAAW,CAACC,MAAM,GAAG,CAAC,EAAE;QACxB,IAAIT,KAAK,CAACU,cAAc,EAAE;UACtB,MAAMkB,WAAW,GAAGtB,KAAK,CAACN,KAAK,CAACa,SAAS,CAAsB;UAC/D,IAAI,CAACe,WAAW,IAAIjB,KAAK,CAACC,OAAO,CAACgB,WAAW,CAAC,KAAK,KAAK,EAAE;YACtD,OAAOL,MAAM;UACjB;UACA,MAAMH,MAAM,GAAGQ,WAAW,CAACd,GAAG,CAACW,UAAU,IAAI;YACzC,OAAOlB,mBAAmB,CAACmB,kBAAkB,CAAC;cAC1CvB,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;gBAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;kBACRE,MAAM,EAAEnB;gBAAK;cAErB,CAAC,CAAC;cACFoB,MAAM,EAAEK;YACZ,CAAC,CAAC;UACN,CAAC,CAAC;UACF,IAAIL,MAAM,KAAKC,SAAS,EAAE;YACtB,OAAOE,MAAM;UACjB;UACA,WAAAL,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACO0B,MAAM;YACT,CAACvB,KAAK,CAACwB,OAAO,GAAGJ;UAAM;QAE/B;QACA;AAChB;AACA;QACgB,IAAI,CAACd,KAAK,CAACN,KAAK,CAACa,SAAS,CAAC,EAAE;UACzB,OAAOU,MAAM;QACjB;QACA,MAAMH,MAAM,GAAGb,mBAAmB,CAACmB,kBAAkB,CAAC;UAClDvB,MAAM,EAAEK,WAAW,CAACM,GAAG,CAACG,KAAK,IAAI;YAC7B,WAAAC,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACOoB,KAAK;cACRE,MAAM,EAAEnB;YAAK;UAErB,CAAC,CAAC;UACFoB,MAAM,EAAEd,KAAK,CAACN,KAAK,CAACa,SAAS;QACjC,CAAC,CAAC;QACF,IAAIO,MAAM,KAAKC,SAAS,EAAE;UACtB,OAAOE,MAAM;QACjB;QACA,WAAAL,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACO0B,MAAM;UACT,CAACvB,KAAK,CAACwB,OAAO,GAAGJ;QAAM;MAE/B;MAEA,IAAId,KAAK,CAACN,KAAK,CAACa,SAAS,CAAC,KAAKQ,SAAS,EAAE;QACtC,OAAOE,MAAM;MACjB;MACA,WAAAL,cAAA,CAAArB,OAAA,MAAAqB,cAAA,CAAArB,OAAA,MACO0B,MAAM;QACT,CAACvB,KAAK,CAACwB,OAAO,GAAGlB,KAAK,CAACN,KAAK,CAACa,SAAS;MAAC;IAE/C,CAAC,EAAE,CAAC,CAAC,CAAC;EACV;AACJ;AAACgB,OAAA,CAAArC,kCAAA,GAAAA,kCAAA"}
+{"version":3,"names":["_CmsModelFieldConverterPlugin","require","CmsModelObjectFieldConverterPlugin","CmsModelFieldConverterPlugin","name","getFieldType","getChildFields","field","settings","fields","convertToStorage","params","value","converterCollection","childFields","length","multipleValues","Array","isArray","storageId","map","itemValue","processChildFieldsToStorage","child","parent","values","undefined","reduce","output","fieldId","childValue","convertFromStorage","processChildFieldsFromStorage","inputValues","exports"],"sources":["CmsModelObjectFieldConverterPlugin.ts"],"sourcesContent":["import {\n    CmsModelFieldConverterPlugin,\n    ConvertParams\n} from \"~/plugins/CmsModelFieldConverterPlugin\";\nimport { CmsEntryValues, CmsModelFieldWithParent } from \"~/types\";\nimport { ConverterCollection } from \"~/utils/converters/ConverterCollection\";\n\ninterface ProcessChildFieldsParams {\n    fields: CmsModelFieldWithParent[];\n    value?: Record<string, any> | 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.multipleValues) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.storageId]: []\n                };\n            }\n            return {\n                [field.storageId]: value.map((itemValue: any) => {\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            const childFields = this.getChildFields({\n                field\n            });\n\n            if (childFields.length > 0) {\n                if (field.multipleValues) {\n                    if (Array.isArray(value[field.fieldId]) === false) {\n                        return output;\n                    }\n                    const values = value[field.fieldId].map((childValue: any) => {\n                        return converterCollection.convertToStorage({\n                            fields: childFields.map(child => {\n                                return {\n                                    ...child,\n                                    parent: field\n                                };\n                            }),\n                            values: childValue\n                        });\n                    });\n                    if (values === undefined) {\n                        return output;\n                    }\n                    return {\n                        ...output,\n                        [field.storageId]: values\n                    };\n                }\n                /**\n                 * No need to process child fields if no value is provided.\n                 */\n                if (!value[field.fieldId]) {\n                    return output;\n                }\n                const values = converterCollection.convertToStorage({\n                    fields: childFields.map(child => {\n                        return {\n                            ...child,\n                            parent: field\n                        };\n                    }),\n                    values: value[field.fieldId]\n                });\n                if (values === undefined) {\n                    return output;\n                }\n                return {\n                    ...output,\n                    [field.storageId]: values\n                };\n            }\n\n            if (value[field.fieldId] === undefined) {\n                return output;\n            }\n\n            return {\n                ...output,\n                [field.storageId]: value[field.fieldId]\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.multipleValues) {\n            if (Array.isArray(value) === false) {\n                return {\n                    [field.fieldId]: []\n                };\n            }\n            return {\n                [field.fieldId]: value.map((itemValue: any) => {\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            const childFields = this.getChildFields({\n                field\n            });\n\n            if (childFields.length > 0) {\n                if (field.multipleValues) {\n                    const inputValues = value[field.storageId] as unknown as Record<string, any>[];\n                    if (!inputValues || Array.isArray(inputValues) === false) {\n                        return output;\n                    }\n                    const values = inputValues.map(childValue => {\n                        return converterCollection.convertFromStorage({\n                            fields: childFields.map(child => {\n                                return {\n                                    ...child,\n                                    parent: field\n                                };\n                            }),\n                            values: childValue\n                        });\n                    });\n                    if (values === undefined) {\n                        return output;\n                    }\n                    return {\n                        ...output,\n                        [field.fieldId]: values\n                    };\n                }\n                /**\n                 * No need to process child fields if no value is provided.\n                 */\n                if (!value[field.storageId]) {\n                    return output;\n                }\n                const values = converterCollection.convertFromStorage({\n                    fields: childFields.map(child => {\n                        return {\n                            ...child,\n                            parent: field\n                        };\n                    }),\n                    values: value[field.storageId]\n                });\n                if (values === undefined) {\n                    return output;\n                }\n                return {\n                    ...output,\n                    [field.fieldId]: values\n                };\n            }\n\n            if (value[field.storageId] === undefined) {\n                return output;\n            }\n            return {\n                ...output,\n                [field.fieldId]: value[field.storageId]\n            };\n        }, {});\n    }\n}\n"],"mappings":"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"}

package/graphql/getSchema.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSchema = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _codeFrame = _interopRequireDefault(require("code-frame"));
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _generateSchema = require("./generateSchema");
@@ -41,7 +40,11 @@ const generateCacheKey = async params => {
   const keys = [];
   for (const model of models) {
     const savedOn = model.savedOn;
-    const value = savedOn instanceof Date || savedOn !== null && savedOn !== void 0 && savedOn.toISOString ? savedOn.toISOString() : savedOn || "unknown";
+    const value =
+    // @ts-expect-error
+    savedOn instanceof Date || savedOn?.toISOString ?
+    // @ts-expect-error
+    savedOn.toISOString() : savedOn || "unknown";
     keys.push(model.modelId, model.singularApiName, model.pluralApiName, value);
   }
   const key = keys.join("#");
@@ -69,17 +72,19 @@ const getSchema = async params => {
     });
   });
   const cacheId = generateCacheId(params);
-  const cacheKey = await generateCacheKey((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+  const cacheKey = await generateCacheKey({
+    ...params,
     models
-  }));
+  });
   const cachedSchema = schemaList.get(cacheId);
-  if ((cachedSchema === null || cachedSchema === void 0 ? void 0 : cachedSchema.key) === cacheKey) {
+  if (cachedSchema?.key === cacheKey) {
     return cachedSchema.schema;
   }
   try {
-    const schema = await (0, _generateSchema.generateSchema)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+    const schema = await (0, _generateSchema.generateSchema)({
+      ...params,
       models
-    }));
+    });
     schemaList.set(cacheId, {
       key: cacheKey,
       schema
@@ -90,9 +95,10 @@ const getSchema = async params => {
       throw new _error.default({
         message: err.message,
         code: err.code || "INVALID_GRAPHQL_SCHEMA_LOCATIONS",
-        data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, err.data || {}), {}, {
+        data: {
+          ...(err.data || {}),
           endpoint: context.cms.type
-        })
+        }
       });
     }
     const [location] = err.locations;

package/graphql/getSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_codeFrame","_interopRequireDefault","require","_error","_generateSchema","_crypto","schemaList","Map","generateCacheId","params","getTenant","type","getLocale","id","code","join","generateCacheKey","models","keys","model","savedOn","value","Date","toISOString","push","modelId","singularApiName","pluralApiName","key","hash","crypto","createHash","update","digest","getSchema","context","security","withoutAuthorization","cms","listModels","filter","isPrivate","cacheId","cacheKey","_objectSpread2","default","cachedSchema","get","schema","generateSchema","set","err","Array","isArray","locations","WebinyError","message","data","endpoint","location","invalidSegment","codeFrame","source","body","line","column","frameSize","exports"],"sources":["getSchema.ts"],"sourcesContent":["// @ts-expect-error `code-frame` has no types\nimport codeFrame from \"code-frame\";\nimport WebinyError from \"@webiny/error\";\nimport { generateSchema } from \"./generateSchema\";\nimport { ApiEndpoint, CmsContext, CmsModel } from \"~/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { GraphQLSchema } from \"graphql\";\nimport crypto from \"crypto\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\n\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    getTenant: () => Tenant;\n    getLocale: () => I18NLocale;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\n/**\n * Method generates cache ID based on:\n * - tenant\n * - endpoint type\n * - locale\n */\ntype GenerateCacheIdParams = Pick<GetSchemaParams, \"getTenant\" | \"getLocale\" | \"type\">;\nconst generateCacheId = (params: GenerateCacheIdParams): string => {\n    const { getTenant, type, getLocale } = params;\n    return [`tenant:${getTenant().id}`, `endpoint:${type}`, `locale:${getLocale().code}`].join(\"#\");\n};\n/**\n * Method generates cache key based on last model change time.\n * Or sets \"unknown\" - possible when no models in database.\n */\ninterface GenerateCacheKeyParams {\n    models: Pick<CmsModel, \"modelId\" | \"singularApiName\" | \"pluralApiName\" | \"savedOn\">[];\n}\nconst generateCacheKey = async (params: GenerateCacheKeyParams): Promise<string> => {\n    const { models } = params;\n\n    const keys: string[] = [];\n    for (const model of models) {\n        const savedOn = model.savedOn as any;\n        const value =\n            savedOn instanceof Date || savedOn?.toISOString\n                ? savedOn.toISOString()\n                : savedOn || \"unknown\";\n        keys.push(model.modelId, model.singularApiName, model.pluralApiName, value);\n    }\n    const key = keys.join(\"#\");\n\n    const hash = crypto.createHash(\"sha1\");\n    hash.update(key);\n    return hash.digest(\"hex\");\n};\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type and locale parameters\n */\nexport const getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = params;\n\n    /**\n     * We need all the API models.\n     * Private models are hidden in the GraphQL, so filter them out.\n     */\n    const models = await context.security.withoutAuthorization(async () => {\n        return (await context.cms.listModels()).filter(model => {\n            return model.isPrivate !== true;\n        });\n    });\n\n    const cacheId = generateCacheId(params);\n\n    const cacheKey = await generateCacheKey({ ...params, models });\n    const cachedSchema = schemaList.get(cacheId);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(cacheId, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    endpoint: context.cms.type\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrame(err.source.body, location.line, location.column, {\n                    frameSize: 15\n                })\n            }\n        });\n    }\n};\n"],"mappings":"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"}
+{"version":3,"names":["_codeFrame","_interopRequireDefault","require","_error","_generateSchema","_crypto","schemaList","Map","generateCacheId","params","getTenant","type","getLocale","id","code","join","generateCacheKey","models","keys","model","savedOn","value","Date","toISOString","push","modelId","singularApiName","pluralApiName","key","hash","crypto","createHash","update","digest","getSchema","context","security","withoutAuthorization","cms","listModels","filter","isPrivate","cacheId","cacheKey","cachedSchema","get","schema","generateSchema","set","err","Array","isArray","locations","WebinyError","message","data","endpoint","location","invalidSegment","codeFrame","source","body","line","column","frameSize","exports"],"sources":["getSchema.ts"],"sourcesContent":["// @ts-expect-error `code-frame` has no types\nimport codeFrame from \"code-frame\";\nimport WebinyError from \"@webiny/error\";\nimport { generateSchema } from \"./generateSchema\";\nimport { ApiEndpoint, CmsContext, CmsModel } from \"~/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { GraphQLSchema } from \"graphql\";\nimport crypto from \"crypto\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\n\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    getTenant: () => Tenant;\n    getLocale: () => I18NLocale;\n}\n\nconst schemaList = new Map<string, SchemaCache>();\n\n/**\n * Method generates cache ID based on:\n * - tenant\n * - endpoint type\n * - locale\n */\ntype GenerateCacheIdParams = Pick<GetSchemaParams, \"getTenant\" | \"getLocale\" | \"type\">;\nconst generateCacheId = (params: GenerateCacheIdParams): string => {\n    const { getTenant, type, getLocale } = params;\n    return [`tenant:${getTenant().id}`, `endpoint:${type}`, `locale:${getLocale().code}`].join(\"#\");\n};\n/**\n * Method generates cache key based on last model change time.\n * Or sets \"unknown\" - possible when no models in database.\n */\ninterface GenerateCacheKeyParams {\n    models: Pick<CmsModel, \"modelId\" | \"singularApiName\" | \"pluralApiName\" | \"savedOn\">[];\n}\nconst generateCacheKey = async (params: GenerateCacheKeyParams): Promise<string> => {\n    const { models } = params;\n\n    const keys: string[] = [];\n    for (const model of models) {\n        const savedOn = model.savedOn;\n        const value =\n            // @ts-expect-error\n            savedOn instanceof Date || savedOn?.toISOString\n                ? // @ts-expect-error\n                  savedOn.toISOString()\n                : savedOn || \"unknown\";\n        keys.push(model.modelId, model.singularApiName, model.pluralApiName, value);\n    }\n    const key = keys.join(\"#\");\n\n    const hash = crypto.createHash(\"sha1\");\n    hash.update(key);\n    return hash.digest(\"hex\");\n};\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type and locale parameters\n */\nexport const getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = params;\n\n    /**\n     * We need all the API models.\n     * Private models are hidden in the GraphQL, so filter them out.\n     */\n    const models = await context.security.withoutAuthorization(async () => {\n        return (await context.cms.listModels()).filter(model => {\n            return model.isPrivate !== true;\n        });\n    });\n\n    const cacheId = generateCacheId(params);\n\n    const cacheKey = await generateCacheKey({ ...params, models });\n    const cachedSchema = schemaList.get(cacheId);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(cacheId, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    endpoint: context.cms.type\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrame(err.source.body, location.line, location.column, {\n                    frameSize: 15\n                })\n            }\n        });\n    }\n};\n"],"mappings":"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"}

package/graphql/index.d.ts

@@ -1,3 +1,3 @@
 import { GraphQLHandlerFactoryParams } from "./graphQLHandlerFactory";
 export declare type CreateGraphQLParams = GraphQLHandlerFactoryParams;
-export declare const createGraphQL: (params: CreateGraphQLParams) => (import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("../types").CmsContext> | import("@webiny/plugins/types").PluginCollection | import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context>)[];
+export declare const createGraphQL: (params: CreateGraphQLParams) => (import("@webiny/plugins/types").PluginCollection | import("@webiny/handler-graphql").GraphQLSchemaPlugin<import("../types").CmsContext> | import("@webiny/api").ContextPlugin<import("@webiny/api/types").Context>)[];

package/graphql/schema/baseContentSchema.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBaseContentSchema = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _builtInTypes = require("@webiny/handler-graphql/builtInTypes");
 var _plugins = require("../../plugins");
 const createBaseContentSchema = ({
@@ -42,10 +40,11 @@ const createBaseContentSchema = ({
                 published
             }
         `,
-    resolvers: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, scalars.reduce((acc, s) => {
-      acc[s.name] = s;
-      return acc;
-    }, {})), {}, {
+    resolvers: {
+      ...scalars.reduce((acc, s) => {
+        acc[s.name] = s;
+        return acc;
+      }, {}),
       JSON: _builtInTypes.JsonScalar,
       Long: _builtInTypes.LongScalar,
       RefInput: _builtInTypes.RefInputScalar,
@@ -58,7 +57,7 @@ const createBaseContentSchema = ({
       Mutation: {
         _empty: () => "_empty"
       }
-    })
+    }
   });
   plugin.name = `headless-cms.graphql.schema.baseContentSchema`;
   return plugin;

package/graphql/schema/baseContentSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_builtInTypes","require","_plugins","createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","CmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","_objectSpread2","default","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty","exports"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLScalarType } from \"graphql\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createBaseContentSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;;;AAEA,IAAAA,aAAA,GAAAC,OAAA;AAYA,IAAAC,QAAA,GAAAD,OAAA;AAKO,MAAME,uBAAuB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAA6B;EACpF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAIC,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACI,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,MAAAC,cAAA,CAAAC,OAAA,MAAAD,cAAA,CAAAC,OAAA,MACFb,OAAO,CAACc,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;MAC7DD,GAAG,CAACC,CAAC,CAACP,IAAI,CAAC,GAAGO,CAAC;MACf,OAAOD,GAAG;IACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAEA,CAAA,KAAM;MAClB;IAAC;EAET,CAAC,CAAC;EACF9B,MAAM,CAACG,IAAI,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC+B,OAAA,CAAAvC,uBAAA,GAAAA,uBAAA"}
+{"version":3,"names":["_builtInTypes","require","_plugins","createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","CmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty","exports"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLScalarType } from \"graphql\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createBaseContentSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;AAEA,IAAAA,aAAA,GAAAC,OAAA;AAYA,IAAAC,QAAA,GAAAD,OAAA;AAKO,MAAME,uBAAuB,GAAGA,CAAC;EAAEC;AAAgB,CAAC,KAA6B;EACpF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAIC,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACI,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE;MACP,GAAGX,OAAO,CAACY,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;QAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;QACf,OAAOD,GAAG;MACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAEA,CAAA,KAAM;MAClB;IACJ;EACJ,CAAC,CAAC;EACF5B,MAAM,CAACG,IAAI,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC6B,OAAA,CAAArC,uBAAA,GAAAA,uBAAA"}

package/graphql/schema/baseSchema.js

@@ -23,7 +23,7 @@ const createSkipValidatorEnum = plugins => {
   }
   return (/* GraphQL */`
         enum SkipValidatorEnum {
-            ${validators.join("\n")}
+        ${validators.join("\n")}
         }
     `
   );
@@ -105,13 +105,6 @@ const createSchema = plugins => {
                 skipValidators: [SkipValidatorEnum!]
             }
 
-            input CmsPublishEntryOptionsInput {
-                # By default, updatePublishedOn is true. User can set it to false to skip the publishedOn field update.
-                updatePublishedOn: Boolean
-                # By default, updateSavedOn is true. User can set it to false to skip the publishedOn field update.
-                updateSavedOn: Boolean
-            }
-
             input CmsIdentityInput {
                 id: String!
                 displayName: String!

package/graphql/schema/baseSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["_plugins","require","_handlerGraphql","_api","_camelCase","_interopRequireDefault","createSkipValidatorEnum","plugins","validators","byType","reduce","collection","validator","name","camelCase","includes","push","length","join","createSchema","skipValidatorEnum","cmsPlugin","CmsGraphQLSchemaPlugin","typeDefs","resolvers","corePlugin","GraphQLSchemaPlugin","schema","createBaseSchema","ContextPlugin","context","register","exports"],"sources":["baseSchema.ts"],"sourcesContent":["import { CmsContext, CmsModelFieldValidatorPlugin } from \"~/types\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport camelCase from \"lodash/camelCase\";\n\nconst createSkipValidatorEnum = (plugins: PluginsContainer) => {\n    const validators = plugins\n        .byType<CmsModelFieldValidatorPlugin>(\"cms-model-field-validator\")\n        .reduce<string[]>((collection, validator) => {\n            const name = camelCase(validator.validator.name);\n            if (collection.includes(name)) {\n                return collection;\n            }\n            collection.push(name);\n            return collection;\n        }, []);\n\n    if (validators.length === 0) {\n        validators.push(\"_empty\");\n    }\n    return /* GraphQL */ `\n        enum SkipValidatorEnum {\n            ${validators.join(\"\\n\")}\n        }\n    `;\n};\n\nconst createSchema = (plugins: PluginsContainer): GraphQLSchemaPlugin<CmsContext>[] => {\n    const skipValidatorEnum = createSkipValidatorEnum(plugins);\n\n    const cmsPlugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\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            }\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 CmsPublishEntryOptionsInput {\n                # By default, updatePublishedOn is true. User can set it to false to skip the publishedOn field update.\n                updatePublishedOn: Boolean\n                # By default, updateSavedOn is true. User can set it to false to skip the publishedOn field update.\n                updateSavedOn: 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        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    return new ContextPlugin(async context => {\n        context.plugins.register(...createSchema(context.plugins));\n    });\n};\n"],"mappings":";;;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAEA,MAAMK,uBAAuB,GAAIC,OAAyB,IAAK;EAC3D,MAAMC,UAAU,GAAGD,OAAO,CACrBE,MAAM,CAA+B,2BAA2B,CAAC,CACjEC,MAAM,CAAW,CAACC,UAAU,EAAEC,SAAS,KAAK;IACzC,MAAMC,IAAI,GAAG,IAAAC,kBAAS,EAACF,SAAS,CAACA,SAAS,CAACC,IAAI,CAAC;IAChD,IAAIF,UAAU,CAACI,QAAQ,CAACF,IAAI,CAAC,EAAE;MAC3B,OAAOF,UAAU;IACrB;IACAA,UAAU,CAACK,IAAI,CAACH,IAAI,CAAC;IACrB,OAAOF,UAAU;EACrB,CAAC,EAAE,EAAE,CAAC;EAEV,IAAIH,UAAU,CAACS,MAAM,KAAK,CAAC,EAAE;IACzBT,UAAU,CAACQ,IAAI,CAAC,QAAQ,CAAC;EAC7B;EACA,OAAO,cAAe;AAC1B;AACA,cAAcR,UAAU,CAACU,IAAI,CAAC,IAAI,CAAE;AACpC;AACA;EAAK;AACL,CAAC;AAED,MAAMC,YAAY,GAAIZ,OAAyB,IAAwC;EACnF,MAAMa,iBAAiB,GAAGd,uBAAuB,CAACC,OAAO,CAAC;EAE1D,MAAMc,SAAS,GAAG,IAAIC,+BAAsB,CAAC;IACzCC,QAAQ,EAAE,aAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcH,iBAAkB;AAChC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDI,SAAS,EAAE,CAAC;EAChB,CAAC,CAAC;EACFH,SAAS,CAACR,IAAI,GAAG,kCAAkC;EACnD,MAAMY,UAAU,GAAG,IAAIC,mCAAmB,CAAa;IACnDH,QAAQ,EAAEF,SAAS,CAACM,MAAM,CAACJ,QAAQ;IACnCC,SAAS,EAAEH,SAAS,CAACM,MAAM,CAACH;EAChC,CAAC,CAAC;EACFC,UAAU,CAACZ,IAAI,GAAG,uCAAuC;EACzD;AACJ;AACA;EACI,OAAO,CAACQ,SAAS,EAAEI,UAAU,CAAC;AAClC,CAAC;AAEM,MAAMG,gBAAgB,GAAGA,CAAA,KAAM;EAClC,OAAO,IAAIC,kBAAa,CAAC,MAAMC,OAAO,IAAI;IACtCA,OAAO,CAACvB,OAAO,CAACwB,QAAQ,CAAC,GAAGZ,YAAY,CAACW,OAAO,CAACvB,OAAO,CAAC,CAAC;EAC9D,CAAC,CAAC;AACN,CAAC;AAACyB,OAAA,CAAAJ,gBAAA,GAAAA,gBAAA"}
+{"version":3,"names":["_plugins","require","_handlerGraphql","_api","_camelCase","_interopRequireDefault","createSkipValidatorEnum","plugins","validators","byType","reduce","collection","validator","name","camelCase","includes","push","length","join","createSchema","skipValidatorEnum","cmsPlugin","CmsGraphQLSchemaPlugin","typeDefs","resolvers","corePlugin","GraphQLSchemaPlugin","schema","createBaseSchema","ContextPlugin","context","register","exports"],"sources":["baseSchema.ts"],"sourcesContent":["import { CmsContext, CmsModelFieldValidatorPlugin } from \"~/types\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { ContextPlugin } from \"@webiny/api\";\nimport camelCase from \"lodash/camelCase\";\n\nconst createSkipValidatorEnum = (plugins: PluginsContainer) => {\n    const validators = plugins\n        .byType<CmsModelFieldValidatorPlugin>(\"cms-model-field-validator\")\n        .reduce<string[]>((collection, validator) => {\n            const name = camelCase(validator.validator.name);\n            if (collection.includes(name)) {\n                return collection;\n            }\n            collection.push(name);\n            return collection;\n        }, []);\n\n    if (validators.length === 0) {\n        validators.push(\"_empty\");\n    }\n    return /* GraphQL */ `\n        enum SkipValidatorEnum {\n        ${validators.join(\"\\n\")}\n        }\n    `;\n};\n\nconst createSchema = (plugins: PluginsContainer): GraphQLSchemaPlugin<CmsContext>[] => {\n    const skipValidatorEnum = createSkipValidatorEnum(plugins);\n\n    const cmsPlugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\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            }\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        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    return new ContextPlugin(async context => {\n        context.plugins.register(...createSchema(context.plugins));\n    });\n};\n"],"mappings":";;;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAEA,IAAAE,IAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAC,sBAAA,CAAAJ,OAAA;AAEA,MAAMK,uBAAuB,GAAIC,OAAyB,IAAK;EAC3D,MAAMC,UAAU,GAAGD,OAAO,CACrBE,MAAM,CAA+B,2BAA2B,CAAC,CACjEC,MAAM,CAAW,CAACC,UAAU,EAAEC,SAAS,KAAK;IACzC,MAAMC,IAAI,GAAG,IAAAC,kBAAS,EAACF,SAAS,CAACA,SAAS,CAACC,IAAI,CAAC;IAChD,IAAIF,UAAU,CAACI,QAAQ,CAACF,IAAI,CAAC,EAAE;MAC3B,OAAOF,UAAU;IACrB;IACAA,UAAU,CAACK,IAAI,CAACH,IAAI,CAAC;IACrB,OAAOF,UAAU;EACrB,CAAC,EAAE,EAAE,CAAC;EAEV,IAAIH,UAAU,CAACS,MAAM,KAAK,CAAC,EAAE;IACzBT,UAAU,CAACQ,IAAI,CAAC,QAAQ,CAAC;EAC7B;EACA,OAAO,cAAe;AAC1B;AACA,UAAUR,UAAU,CAACU,IAAI,CAAC,IAAI,CAAE;AAChC;AACA;EAAK;AACL,CAAC;AAED,MAAMC,YAAY,GAAIZ,OAAyB,IAAwC;EACnF,MAAMa,iBAAiB,GAAGd,uBAAuB,CAACC,OAAO,CAAC;EAE1D,MAAMc,SAAS,GAAG,IAAIC,+BAAsB,CAAC;IACzCC,QAAQ,EAAE,aAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcH,iBAAkB;AAChC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDI,SAAS,EAAE,CAAC;EAChB,CAAC,CAAC;EACFH,SAAS,CAACR,IAAI,GAAG,kCAAkC;EACnD,MAAMY,UAAU,GAAG,IAAIC,mCAAmB,CAAa;IACnDH,QAAQ,EAAEF,SAAS,CAACM,MAAM,CAACJ,QAAQ;IACnCC,SAAS,EAAEH,SAAS,CAACM,MAAM,CAACH;EAChC,CAAC,CAAC;EACFC,UAAU,CAACZ,IAAI,GAAG,uCAAuC;EACzD;AACJ;AACA;EACI,OAAO,CAACQ,SAAS,EAAEI,UAAU,CAAC;AAClC,CAAC;AAEM,MAAMG,gBAAgB,GAAGA,CAAA,KAAM;EAClC,OAAO,IAAIC,kBAAa,CAAC,MAAMC,OAAO,IAAI;IACtCA,OAAO,CAACvB,OAAO,CAACwB,QAAQ,CAAC,GAAGZ,YAAY,CAACW,OAAO,CAACvB,OAAO,CAAC,CAAC;EAC9D,CAAC,CAAC;AACN,CAAC;AAACyB,OAAA,CAAAJ,gBAAA,GAAAA,gBAAA"}

package/graphql/schema/contentEntries.js

@@ -13,14 +13,18 @@ var _plugins = require("../../plugins");
 var _getEntryDescription = require("../../utils/getEntryDescription");
 var _getEntryImage = require("../../utils/getEntryImage");
 var _entryStorage = require("../../utils/entryStorage");
+var _constants = require("../../constants");
 const createDate = date => {
+  if (!date) {
+    return null;
+  }
   try {
     return new Date(date);
-  } catch {}
-  return new Date();
+  } catch {
+    return new Date();
+  }
 };
 const createCmsEntryRecord = (model, entry) => {
-  var _entry$location;
   return {
     id: entry.id,
     entryId: entry.entryId,
@@ -32,12 +36,34 @@ const createCmsEntryRecord = (model, entry) => {
     title: (0, _getEntryTitle.getEntryTitle)(model, entry),
     description: (0, _getEntryDescription.getEntryDescription)(model, entry),
     image: (0, _getEntryImage.getEntryImage)(model, entry),
-    createdBy: entry.createdBy,
-    modifiedBy: entry.modifiedBy,
+    /**
+     * Entry-level meta fields. 👇
+     */
     createdOn: createDate(entry.createdOn),
+    modifiedOn: createDate(entry.modifiedOn),
     savedOn: createDate(entry.savedOn),
+    createdBy: entry.createdBy,
+    savedBy: entry.savedBy,
+    modifiedBy: entry.modifiedBy,
+    firstPublishedOn: createDate(entry.firstPublishedOn),
+    lastPublishedOn: createDate(entry.lastPublishedOn),
+    firstPublishedBy: entry.firstPublishedBy,
+    lastPublishedBy: entry.lastPublishedBy,
+    /**
+     * Revision-level meta fields. 👇
+     */
+    revisionCreatedOn: createDate(entry.revisionCreatedOn),
+    revisionSavedOn: createDate(entry.revisionSavedOn),
+    revisionModifiedOn: createDate(entry.revisionModifiedOn),
+    revisionCreatedBy: entry.revisionCreatedBy,
+    revisionModifiedBy: entry.revisionModifiedBy,
+    revisionSavedBy: entry.revisionSavedBy,
+    revisionFirstPublishedOn: createDate(entry.revisionFirstPublishedOn),
+    revisionLastPublishedOn: createDate(entry.revisionLastPublishedOn),
+    revisionFirstPublishedBy: entry.revisionFirstPublishedBy,
+    revisionLastPublishedBy: entry.revisionLastPublishedBy,
     wbyAco_location: {
-      folderId: ((_entry$location = entry.location) === null || _entry$location === void 0 ? void 0 : _entry$location.folderId) || null
+      folderId: entry.location?.folderId || null
     }
   };
 };
@@ -56,6 +82,7 @@ const getFetchMethod = (type, context) => {
   }
   return context.cms[methodName];
 };
+
 /**
  * Function to get the list of content entries depending on latest, published or exact GraphQL queries.
  */
@@ -190,8 +217,14 @@ const createContentEntriesSchema = ({
     plugin.name = `headless-cms.graphql.schema.${context.cms.type}.empty`;
     return plugin;
   }
+  const onByMetaFields = _constants.ENTRY_META_FIELDS.map(field => {
+    const isNullable = (0, _constants.isNullableEntryMetaField)(field) ? "" : "!";
+    const fieldType = (0, _constants.isDateTimeEntryMetaField)(field) ? "DateTime" : "CmsIdentity";
+    return `${field}: ${fieldType}${isNullable}`;
+  }).join("\n");
   const plugin = new _plugins.CmsGraphQLSchemaPlugin({
-    typeDefs: /* GraphQL */`
+    // Had to remove /* GraphQL */ because prettier would not format the code correctly.
+    typeDefs: `
             type CmsModelMeta {
                 modelId: String!
                 name: String!
@@ -210,15 +243,13 @@ const createContentEntriesSchema = ({
                 entryId: String!
                 model: CmsModelMeta!
                 status: String!
+                published: CmsPublishedContentEntry
                 title: String!
                 description: String
                 image: String
-                createdBy: CmsIdentity!
-                ownedBy: CmsIdentity!
-                modifiedBy: CmsIdentity
-                published: CmsPublishedContentEntry
-                createdOn: DateTime!
-                savedOn: DateTime!
+                
+                ${onByMetaFields}
+            
                 wbyAco_location: WbyAcoLocation
             }