@webiny/api-headless-cms 0.0.0-unstable.aad28a72ae → 0.0.0-unstable.b14eaecf38

package/graphql/system.js

@@ -4,116 +4,84 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createSystemSchemaPlugin = void 0;
-
 var _handlerGraphql = require("@webiny/handler-graphql");
-
 var _api = require("@webiny/api");
-
 const emptyResolver = () => ({});
+const plugin = new _handlerGraphql.GraphQLSchemaPlugin({
+  typeDefs: /* GraphQL */`
+        extend type Query {
+            cms: CmsQuery
+        }
 
-const plugin = {
-  name: "cms.graphql.schema.system",
-  type: "graphql-schema",
-  schema: {
-    typeDefs:
-    /* GraphQL */
-    `
-            extend type Query {
-                cms: CmsQuery
-            }
-
-            extend type Mutation {
-                cms: CmsMutation
-            }
-
-            type CmsQuery {
-                _empty: String
-            }
-
-            type CmsMutation {
-                _empty: String
-            }
-            extend type CmsQuery {
-                # Get installed version
-                version: String
-            }
-
-            extend type CmsMutation {
-                # Install CMS
-                install: CmsBooleanResponse
-
-                # Upgrade CMS
-                upgrade(version: String!): CmsBooleanResponse
-            }
-        `,
-    resolvers: {
-      Query: {
-        cms: emptyResolver
-      },
-      Mutation: {
-        cms: emptyResolver
-      },
-      CmsQuery: {
-        version: async (_, __, context) => {
-          try {
-            return context.cms.getSystemVersion();
-          } catch (e) {
-            return new _handlerGraphql.ErrorResponse(e);
-          }
+        extend type Mutation {
+            cms: CmsMutation
         }
-      },
-      CmsMutation: {
-        install: async (_, __, {
-          cms
-        }) => {
-          try {
-            const version = await cms.getSystemVersion();
 
-            if (version) {
-              return new _handlerGraphql.ErrorResponse({
-                code: "CMS_INSTALLATION_ERROR",
-                message: "CMS is already installed."
-              });
-            }
+        type CmsQuery {
+            _empty: String
+        }
 
-            await cms.installSystem();
-            return new _handlerGraphql.Response(true);
-          } catch (e) {
-            return new _handlerGraphql.ErrorResponse(e);
-          }
-        },
-        upgrade: async (_, args, {
-          cms
-        }) => {
-          const {
-            version
-          } = args;
+        type CmsMutation {
+            _empty: String
+        }
+        extend type CmsQuery {
+            # Get installed version
+            version: String
+        }
 
-          try {
-            await cms.upgradeSystem(version);
-            return new _handlerGraphql.Response(true);
-          } catch (e) {
-            return new _handlerGraphql.ErrorResponse(e);
+        extend type CmsMutation {
+            # Install CMS
+            install: CmsBooleanResponse
+        }
+    `,
+  resolvers: {
+    Query: {
+      cms: emptyResolver
+    },
+    Mutation: {
+      cms: emptyResolver
+    },
+    CmsQuery: {
+      version: async (_, __, context) => {
+        try {
+          return context.cms.getSystemVersion();
+        } catch (e) {
+          return new _handlerGraphql.ErrorResponse(e);
+        }
+      }
+    },
+    CmsMutation: {
+      install: async (_, __, {
+        cms
+      }) => {
+        try {
+          const version = await cms.getSystemVersion();
+          if (version) {
+            return new _handlerGraphql.ErrorResponse({
+              code: "CMS_INSTALLATION_ERROR",
+              message: "CMS is already installed."
+            });
           }
+          await cms.installSystem();
+          return new _handlerGraphql.Response(true);
+        } catch (e) {
+          return new _handlerGraphql.ErrorResponse(e);
         }
       }
     }
   }
-};
+});
+plugin.name = "cms.graphql.schema.system";
 /**
  * We only register system schema plugin if the endpoint is not manage/preview/read.
  */
-
 const createSystemSchemaPlugin = () => {
   return new _api.ContextPlugin(async context => {
     var _context$cms;
-
     if ((_context$cms = context.cms) !== null && _context$cms !== void 0 && _context$cms.type) {
       return;
     }
-
     context.plugins.register(plugin);
   });
 };
-
 exports.createSystemSchemaPlugin = createSystemSchemaPlugin;

package/graphql/system.js.map

@@ -1 +1 @@
-{"version":3,"names":["emptyResolver","plugin","name","type","schema","typeDefs","resolvers","Query","cms","Mutation","CmsQuery","version","_","__","context","getSystemVersion","e","ErrorResponse","CmsMutation","install","code","message","installSystem","Response","upgrade","args","upgradeSystem","createSystemSchemaPlugin","ContextPlugin","plugins","register"],"sources":["system.ts"],"sourcesContent":["import { ErrorResponse, Response } from \"@webiny/handler-graphql\";\nimport { CmsContext } from \"~/types\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/types\";\nimport { ContextPlugin } from \"@webiny/api\";\n\nconst emptyResolver = () => ({});\n\nconst plugin: GraphQLSchemaPlugin<CmsContext> = {\n    name: \"cms.graphql.schema.system\",\n    type: \"graphql-schema\",\n    schema: {\n        typeDefs: /* GraphQL */ `\n            extend type Query {\n                cms: CmsQuery\n            }\n\n            extend type Mutation {\n                cms: CmsMutation\n            }\n\n            type CmsQuery {\n                _empty: String\n            }\n\n            type CmsMutation {\n                _empty: String\n            }\n            extend type CmsQuery {\n                # Get installed version\n                version: String\n            }\n\n            extend type CmsMutation {\n                # Install CMS\n                install: CmsBooleanResponse\n\n                # Upgrade CMS\n                upgrade(version: String!): CmsBooleanResponse\n            }\n        `,\n        resolvers: {\n            Query: {\n                cms: emptyResolver\n            },\n            Mutation: {\n                cms: emptyResolver\n            },\n            CmsQuery: {\n                version: async (_: any, __: any, context: CmsContext) => {\n                    try {\n                        return context.cms.getSystemVersion();\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                }\n            },\n            CmsMutation: {\n                install: async (_: any, __: any, { cms }: CmsContext) => {\n                    try {\n                        const version = await cms.getSystemVersion();\n                        if (version) {\n                            return new ErrorResponse({\n                                code: \"CMS_INSTALLATION_ERROR\",\n                                message: \"CMS is already installed.\"\n                            });\n                        }\n\n                        await cms.installSystem();\n                        return new Response(true);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                upgrade: async (_: any, args: any, { cms }: CmsContext) => {\n                    const { version } = args;\n                    try {\n                        await cms.upgradeSystem(version);\n                        return new Response(true);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                }\n            }\n        }\n    }\n};\n/**\n * We only register system schema plugin if the endpoint is not manage/preview/read.\n */\nexport const createSystemSchemaPlugin = (): ContextPlugin<CmsContext> => {\n    return new ContextPlugin<CmsContext>(async context => {\n        if (context.cms?.type) {\n            return;\n        }\n        context.plugins.register(plugin);\n    });\n};\n"],"mappings":";;;;;;;AAAA;;AAGA;;AAEA,MAAMA,aAAa,GAAG,OAAO,EAAP,CAAtB;;AAEA,MAAMC,MAAuC,GAAG;EAC5CC,IAAI,EAAE,2BADsC;EAE5CC,IAAI,EAAE,gBAFsC;EAG5CC,MAAM,EAAE;IACJC,QAAQ;IAAE;IAAe;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,SA7BY;IA8BJC,SAAS,EAAE;MACPC,KAAK,EAAE;QACHC,GAAG,EAAER;MADF,CADA;MAIPS,QAAQ,EAAE;QACND,GAAG,EAAER;MADC,CAJH;MAOPU,QAAQ,EAAE;QACNC,OAAO,EAAE,OAAOC,CAAP,EAAeC,EAAf,EAAwBC,OAAxB,KAAgD;UACrD,IAAI;YACA,OAAOA,OAAO,CAACN,GAAR,CAAYO,gBAAZ,EAAP;UACH,CAFD,CAEE,OAAOC,CAAP,EAAU;YACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;UACH;QACJ;MAPK,CAPH;MAgBPE,WAAW,EAAE;QACTC,OAAO,EAAE,OAAOP,CAAP,EAAeC,EAAf,EAAwB;UAAEL;QAAF,CAAxB,KAAgD;UACrD,IAAI;YACA,MAAMG,OAAO,GAAG,MAAMH,GAAG,CAACO,gBAAJ,EAAtB;;YACA,IAAIJ,OAAJ,EAAa;cACT,OAAO,IAAIM,6BAAJ,CAAkB;gBACrBG,IAAI,EAAE,wBADe;gBAErBC,OAAO,EAAE;cAFY,CAAlB,CAAP;YAIH;;YAED,MAAMb,GAAG,CAACc,aAAJ,EAAN;YACA,OAAO,IAAIC,wBAAJ,CAAa,IAAb,CAAP;UACH,CAXD,CAWE,OAAOP,CAAP,EAAU;YACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;UACH;QACJ,CAhBQ;QAiBTQ,OAAO,EAAE,OAAOZ,CAAP,EAAea,IAAf,EAA0B;UAAEjB;QAAF,CAA1B,KAAkD;UACvD,MAAM;YAAEG;UAAF,IAAcc,IAApB;;UACA,IAAI;YACA,MAAMjB,GAAG,CAACkB,aAAJ,CAAkBf,OAAlB,CAAN;YACA,OAAO,IAAIY,wBAAJ,CAAa,IAAb,CAAP;UACH,CAHD,CAGE,OAAOP,CAAP,EAAU;YACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;UACH;QACJ;MAzBQ;IAhBN;EA9BP;AAHoC,CAAhD;AA+EA;AACA;AACA;;AACO,MAAMW,wBAAwB,GAAG,MAAiC;EACrE,OAAO,IAAIC,kBAAJ,CAA8B,MAAMd,OAAN,IAAiB;IAAA;;IAClD,oBAAIA,OAAO,CAACN,GAAZ,yCAAI,aAAaL,IAAjB,EAAuB;MACnB;IACH;;IACDW,OAAO,CAACe,OAAR,CAAgBC,QAAhB,CAAyB7B,MAAzB;EACH,CALM,CAAP;AAMH,CAPM"}
+{"version":3,"names":["emptyResolver","plugin","GraphQLSchemaPlugin","typeDefs","resolvers","Query","cms","Mutation","CmsQuery","version","_","__","context","getSystemVersion","e","ErrorResponse","CmsMutation","install","code","message","installSystem","Response","name","createSystemSchemaPlugin","ContextPlugin","type","plugins","register"],"sources":["system.ts"],"sourcesContent":["import { ErrorResponse, GraphQLSchemaPlugin, Response } from \"@webiny/handler-graphql\";\nimport { CmsContext } from \"~/types\";\nimport { ContextPlugin } from \"@webiny/api\";\n\nconst emptyResolver = () => ({});\n\nconst plugin = new GraphQLSchemaPlugin({\n    typeDefs: /* GraphQL */ `\n        extend type Query {\n            cms: CmsQuery\n        }\n\n        extend type Mutation {\n            cms: CmsMutation\n        }\n\n        type CmsQuery {\n            _empty: String\n        }\n\n        type CmsMutation {\n            _empty: String\n        }\n        extend type CmsQuery {\n            # Get installed version\n            version: String\n        }\n\n        extend type CmsMutation {\n            # Install CMS\n            install: CmsBooleanResponse\n        }\n    `,\n    resolvers: {\n        Query: {\n            cms: emptyResolver\n        },\n        Mutation: {\n            cms: emptyResolver\n        },\n        CmsQuery: {\n            version: async (_: any, __: any, context: CmsContext) => {\n                try {\n                    return context.cms.getSystemVersion();\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        CmsMutation: {\n            install: async (_: any, __: any, { cms }: CmsContext) => {\n                try {\n                    const version = await cms.getSystemVersion();\n                    if (version) {\n                        return new ErrorResponse({\n                            code: \"CMS_INSTALLATION_ERROR\",\n                            message: \"CMS is already installed.\"\n                        });\n                    }\n\n                    await cms.installSystem();\n                    return new Response(true);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        }\n    }\n});\nplugin.name = \"cms.graphql.schema.system\";\n/**\n * We only register system schema plugin if the endpoint is not manage/preview/read.\n */\nexport const createSystemSchemaPlugin = (): ContextPlugin<CmsContext> => {\n    return new ContextPlugin<CmsContext>(async context => {\n        if (context.cms?.type) {\n            return;\n        }\n        context.plugins.register(plugin);\n    });\n};\n"],"mappings":";;;;;;AAAA;AAEA;AAEA,MAAMA,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC;AAEhC,MAAMC,MAAM,GAAG,IAAIC,mCAAmB,CAAC;EACnCC,QAAQ,EAAE,aAAe;AAC7B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,KAAK;EACDC,SAAS,EAAE;IACPC,KAAK,EAAE;MACHC,GAAG,EAAEN;IACT,CAAC;IACDO,QAAQ,EAAE;MACND,GAAG,EAAEN;IACT,CAAC;IACDQ,QAAQ,EAAE;MACNC,OAAO,EAAE,OAAOC,CAAM,EAAEC,EAAO,EAAEC,OAAmB,KAAK;QACrD,IAAI;UACA,OAAOA,OAAO,CAACN,GAAG,CAACO,gBAAgB,EAAE;QACzC,CAAC,CAAC,OAAOC,CAAC,EAAE;UACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;QAC/B;MACJ;IACJ,CAAC;IACDE,WAAW,EAAE;MACTC,OAAO,EAAE,OAAOP,CAAM,EAAEC,EAAO,EAAE;QAAEL;MAAgB,CAAC,KAAK;QACrD,IAAI;UACA,MAAMG,OAAO,GAAG,MAAMH,GAAG,CAACO,gBAAgB,EAAE;UAC5C,IAAIJ,OAAO,EAAE;YACT,OAAO,IAAIM,6BAAa,CAAC;cACrBG,IAAI,EAAE,wBAAwB;cAC9BC,OAAO,EAAE;YACb,CAAC,CAAC;UACN;UAEA,MAAMb,GAAG,CAACc,aAAa,EAAE;UACzB,OAAO,IAAIC,wBAAQ,CAAC,IAAI,CAAC;QAC7B,CAAC,CAAC,OAAOP,CAAC,EAAE;UACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;QAC/B;MACJ;IACJ;EACJ;AACJ,CAAC,CAAC;AACFb,MAAM,CAACqB,IAAI,GAAG,2BAA2B;AACzC;AACA;AACA;AACO,MAAMC,wBAAwB,GAAG,MAAiC;EACrE,OAAO,IAAIC,kBAAa,CAAa,MAAMZ,OAAO,IAAI;IAAA;IAClD,oBAAIA,OAAO,CAACN,GAAG,yCAAX,aAAamB,IAAI,EAAE;MACnB;IACJ;IACAb,OAAO,CAACc,OAAO,CAACC,QAAQ,CAAC1B,MAAM,CAAC;EACpC,CAAC,CAAC;AACN,CAAC;AAAC"}

package/graphqlFields/boolean.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBooleanField = void 0;
-
 var _helpers = require("./helpers");
-
 const createListFilters = ({
   field
 }) => {
@@ -15,7 +13,6 @@ const createListFilters = ({
         ${field.fieldId}_not: Boolean
     `;
 };
-
 const createBooleanField = () => {
   return {
     name: "cms-model-field-to-graphql-boolean",
@@ -25,45 +22,36 @@ const createBooleanField = () => {
     isSearchable: true,
     read: {
       createListFilters,
-
       createGetFilters({
         field
       }) {
         return `${field.fieldId}: Boolean`;
       },
-
       createTypeField({
         field
       }) {
         if (field.multipleValues) {
           return `${field.fieldId}: [Boolean]`;
         }
-
         return `${field.fieldId}: Boolean`;
       }
-
     },
     manage: {
       createListFilters,
-
       createTypeField({
         field
       }) {
         if (field.multipleValues) {
           return field.fieldId + ": [Boolean]";
         }
-
         return field.fieldId + ": Boolean";
       },
-
       createInputField({
         field
       }) {
         return (0, _helpers.createGraphQLInputField)(field, "Boolean");
       }
-
     }
   };
 };
-
 exports.createBooleanField = createBooleanField;

package/graphqlFields/boolean.js.map

@@ -1 +1 @@
-{"version":3,"names":["createListFilters","field","fieldId","createBooleanField","name","type","fieldType","isSortable","isSearchable","read","createGetFilters","createTypeField","multipleValues","manage","createInputField","createGraphQLInputField"],"sources":["boolean.ts"],"sourcesContent":["import { CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { createGraphQLInputField } from \"./helpers\";\n\ninterface CreateListFiltersParams {\n    field: CmsModelField;\n}\nconst createListFilters = ({ field }: CreateListFiltersParams) => {\n    return `\n        ${field.fieldId}: Boolean\n        ${field.fieldId}_not: Boolean\n    `;\n};\n\nexport const createBooleanField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-boolean\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"boolean\",\n        isSortable: true,\n        isSearchable: true,\n        read: {\n            createListFilters,\n            createGetFilters({ field }) {\n                return `${field.fieldId}: Boolean`;\n            },\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return `${field.fieldId}: [Boolean]`;\n                }\n\n                return `${field.fieldId}: Boolean`;\n            }\n        },\n        manage: {\n            createListFilters,\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return field.fieldId + \": [Boolean]\";\n                }\n\n                return field.fieldId + \": Boolean\";\n            },\n            createInputField({ field }) {\n                return createGraphQLInputField(field, \"Boolean\");\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;;AACA;;AAKA,MAAMA,iBAAiB,GAAG,CAAC;EAAEC;AAAF,CAAD,KAAwC;EAC9D,OAAQ;AACZ,UAAUA,KAAK,CAACC,OAAQ;AACxB,UAAUD,KAAK,CAACC,OAAQ;AACxB,KAHI;AAIH,CALD;;AAOO,MAAMC,kBAAkB,GAAG,MAAoC;EAClE,OAAO;IACHC,IAAI,EAAE,oCADH;IAEHC,IAAI,EAAE,4BAFH;IAGHC,SAAS,EAAE,SAHR;IAIHC,UAAU,EAAE,IAJT;IAKHC,YAAY,EAAE,IALX;IAMHC,IAAI,EAAE;MACFT,iBADE;;MAEFU,gBAAgB,CAAC;QAAET;MAAF,CAAD,EAAY;QACxB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,WAAxB;MACH,CAJC;;MAKFS,eAAe,CAAC;QAAEV;MAAF,CAAD,EAAY;QACvB,IAAIA,KAAK,CAACW,cAAV,EAA0B;UACtB,OAAQ,GAAEX,KAAK,CAACC,OAAQ,aAAxB;QACH;;QAED,OAAQ,GAAED,KAAK,CAACC,OAAQ,WAAxB;MACH;;IAXC,CANH;IAmBHW,MAAM,EAAE;MACJb,iBADI;;MAEJW,eAAe,CAAC;QAAEV;MAAF,CAAD,EAAY;QACvB,IAAIA,KAAK,CAACW,cAAV,EAA0B;UACtB,OAAOX,KAAK,CAACC,OAAN,GAAgB,aAAvB;QACH;;QAED,OAAOD,KAAK,CAACC,OAAN,GAAgB,WAAvB;MACH,CARG;;MASJY,gBAAgB,CAAC;QAAEb;MAAF,CAAD,EAAY;QACxB,OAAO,IAAAc,gCAAA,EAAwBd,KAAxB,EAA+B,SAA/B,CAAP;MACH;;IAXG;EAnBL,CAAP;AAiCH,CAlCM"}
+{"version":3,"names":["createListFilters","field","fieldId","createBooleanField","name","type","fieldType","isSortable","isSearchable","read","createGetFilters","createTypeField","multipleValues","manage","createInputField","createGraphQLInputField"],"sources":["boolean.ts"],"sourcesContent":["import { CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { createGraphQLInputField } from \"./helpers\";\n\ninterface CreateListFiltersParams {\n    field: CmsModelField;\n}\nconst createListFilters = ({ field }: CreateListFiltersParams) => {\n    return `\n        ${field.fieldId}: Boolean\n        ${field.fieldId}_not: Boolean\n    `;\n};\n\nexport const createBooleanField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-boolean\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"boolean\",\n        isSortable: true,\n        isSearchable: true,\n        read: {\n            createListFilters,\n            createGetFilters({ field }) {\n                return `${field.fieldId}: Boolean`;\n            },\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return `${field.fieldId}: [Boolean]`;\n                }\n\n                return `${field.fieldId}: Boolean`;\n            }\n        },\n        manage: {\n            createListFilters,\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return field.fieldId + \": [Boolean]\";\n                }\n\n                return field.fieldId + \": Boolean\";\n            },\n            createInputField({ field }) {\n                return createGraphQLInputField(field, \"Boolean\");\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AACA;AAKA,MAAMA,iBAAiB,GAAG,CAAC;EAAEC;AAA+B,CAAC,KAAK;EAC9D,OAAQ;AACZ,UAAUA,KAAK,CAACC,OAAQ;AACxB,UAAUD,KAAK,CAACC,OAAQ;AACxB,KAAK;AACL,CAAC;AAEM,MAAMC,kBAAkB,GAAG,MAAoC;EAClE,OAAO;IACHC,IAAI,EAAE,oCAAoC;IAC1CC,IAAI,EAAE,4BAA4B;IAClCC,SAAS,EAAE,SAAS;IACpBC,UAAU,EAAE,IAAI;IAChBC,YAAY,EAAE,IAAI;IAClBC,IAAI,EAAE;MACFT,iBAAiB;MACjBU,gBAAgB,CAAC;QAAET;MAAM,CAAC,EAAE;QACxB,OAAQ,GAAEA,KAAK,CAACC,OAAQ,WAAU;MACtC,CAAC;MACDS,eAAe,CAAC;QAAEV;MAAM,CAAC,EAAE;QACvB,IAAIA,KAAK,CAACW,cAAc,EAAE;UACtB,OAAQ,GAAEX,KAAK,CAACC,OAAQ,aAAY;QACxC;QAEA,OAAQ,GAAED,KAAK,CAACC,OAAQ,WAAU;MACtC;IACJ,CAAC;IACDW,MAAM,EAAE;MACJb,iBAAiB;MACjBW,eAAe,CAAC;QAAEV;MAAM,CAAC,EAAE;QACvB,IAAIA,KAAK,CAACW,cAAc,EAAE;UACtB,OAAOX,KAAK,CAACC,OAAO,GAAG,aAAa;QACxC;QAEA,OAAOD,KAAK,CAACC,OAAO,GAAG,WAAW;MACtC,CAAC;MACDY,gBAAgB,CAAC;QAAEb;MAAM,CAAC,EAAE;QACxB,OAAO,IAAAc,gCAAuB,EAACd,KAAK,EAAE,SAAS,CAAC;MACpD;IACJ;EACJ,CAAC;AACL,CAAC;AAAC"}

package/graphqlFields/datetime.js

@@ -4,28 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDateTimeField = void 0;
-
 var _helpers = require("./helpers");
-
 const fieldGraphQLTypes = {
   time: "Time",
   dateTimeWithoutTimezone: "DateTime",
   dateTimeWithTimezone: "DateTimeZ",
   date: "Date"
 };
-
 const getFieldGraphQLType = field => {
   var _field$settings;
-
   const type = (_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.type;
-
   if (!type || !fieldGraphQLTypes[type]) {
     return fieldGraphQLTypes.dateTimeWithoutTimezone;
   }
-
   return fieldGraphQLTypes[type];
 };
-
 const createListFilters = ({
   field
 }) => {
@@ -40,7 +33,6 @@ const createListFilters = ({
         ${field.fieldId}_gte: ${getFieldGraphQLType(field)}
     `;
 };
-
 const createDateTimeField = () => {
   return {
     name: "cms-model-field-to-graphql-datetime",
@@ -50,27 +42,22 @@ const createDateTimeField = () => {
     isSearchable: true,
     read: {
       createListFilters,
-
       createGetFilters({
         field
       }) {
         return `${field.fieldId}: ${getFieldGraphQLType(field)}`;
       },
-
       createTypeField({
         field
       }) {
         if (field.multipleValues) {
           return `${field.fieldId}: [${getFieldGraphQLType(field)}]`;
         }
-
         return `${field.fieldId}: ${getFieldGraphQLType(field)}`;
       }
-
     },
     manage: {
       createListFilters,
-
       createTypeField({
         field
       }) {
@@ -78,18 +65,14 @@ const createDateTimeField = () => {
           const def = (0, _helpers.attachRequiredFieldValue)(getFieldGraphQLType(field), field);
           return `${field.fieldId}: [${def}]`;
         }
-
         return `${field.fieldId}: ${getFieldGraphQLType(field)}`;
       },
-
       createInputField({
         field
       }) {
         return (0, _helpers.createGraphQLInputField)(field, getFieldGraphQLType(field));
       }
-
     }
   };
 };
-
 exports.createDateTimeField = createDateTimeField;

package/graphqlFields/datetime.js.map

@@ -1 +1 @@
-{"version":3,"names":["fieldGraphQLTypes","time","dateTimeWithoutTimezone","dateTimeWithTimezone","date","getFieldGraphQLType","field","type","settings","createListFilters","fieldId","createDateTimeField","name","fieldType","isSortable","isSearchable","read","createGetFilters","createTypeField","multipleValues","manage","def","attachRequiredFieldValue","createInputField","createGraphQLInputField"],"sources":["datetime.ts"],"sourcesContent":["import { CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { attachRequiredFieldValue, createGraphQLInputField } from \"./helpers\";\n\nconst fieldGraphQLTypes = {\n    time: \"Time\",\n    dateTimeWithoutTimezone: \"DateTime\",\n    dateTimeWithTimezone: \"DateTimeZ\",\n    date: \"Date\"\n};\n\ntype FieldGraphQLKeys = keyof typeof fieldGraphQLTypes;\n\nconst getFieldGraphQLType = (field: CmsModelField): string => {\n    const type = field.settings?.type as FieldGraphQLKeys | undefined;\n    if (!type || !fieldGraphQLTypes[type]) {\n        return fieldGraphQLTypes.dateTimeWithoutTimezone;\n    }\n    return fieldGraphQLTypes[type];\n};\n\ninterface CreateListFiltersParams {\n    field: CmsModelField;\n}\nconst createListFilters = ({ field }: CreateListFiltersParams) => {\n    return `\n        ${field.fieldId}: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_not: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_in: [${getFieldGraphQLType(field)}]\n        ${field.fieldId}_not_in: [${getFieldGraphQLType(field)}]\n        ${field.fieldId}_lt: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_lte: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_gt: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_gte: ${getFieldGraphQLType(field)}\n    `;\n};\n\nexport const createDateTimeField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-datetime\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"datetime\",\n        isSortable: true,\n        isSearchable: true,\n        read: {\n            createListFilters,\n            createGetFilters({ field }) {\n                return `${field.fieldId}: ${getFieldGraphQLType(field)}`;\n            },\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return `${field.fieldId}: [${getFieldGraphQLType(field)}]`;\n                }\n\n                return `${field.fieldId}: ${getFieldGraphQLType(field)}`;\n            }\n        },\n        manage: {\n            createListFilters,\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    const def = attachRequiredFieldValue(getFieldGraphQLType(field), field);\n                    return `${field.fieldId}: [${def}]`;\n                }\n                return `${field.fieldId}: ${getFieldGraphQLType(field)}`;\n            },\n            createInputField({ field }) {\n                return createGraphQLInputField(field, getFieldGraphQLType(field));\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;;AACA;;AAEA,MAAMA,iBAAiB,GAAG;EACtBC,IAAI,EAAE,MADgB;EAEtBC,uBAAuB,EAAE,UAFH;EAGtBC,oBAAoB,EAAE,WAHA;EAItBC,IAAI,EAAE;AAJgB,CAA1B;;AASA,MAAMC,mBAAmB,GAAIC,KAAD,IAAkC;EAAA;;EAC1D,MAAMC,IAAI,sBAAGD,KAAK,CAACE,QAAT,oDAAG,gBAAgBD,IAA7B;;EACA,IAAI,CAACA,IAAD,IAAS,CAACP,iBAAiB,CAACO,IAAD,CAA/B,EAAuC;IACnC,OAAOP,iBAAiB,CAACE,uBAAzB;EACH;;EACD,OAAOF,iBAAiB,CAACO,IAAD,CAAxB;AACH,CAND;;AAWA,MAAME,iBAAiB,GAAG,CAAC;EAAEH;AAAF,CAAD,KAAwC;EAC9D,OAAQ;AACZ,UAAUA,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAD,CAAQ;AACvD,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAD,CAAQ;AAC3D,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAD,CAAQ;AAC3D,UAAUA,KAAK,CAACI,OAAQ,aAAYL,mBAAmB,CAACC,KAAD,CAAQ;AAC/D,UAAUA,KAAK,CAACI,OAAQ,QAAOL,mBAAmB,CAACC,KAAD,CAAQ;AAC1D,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAD,CAAQ;AAC3D,UAAUA,KAAK,CAACI,OAAQ,QAAOL,mBAAmB,CAACC,KAAD,CAAQ;AAC1D,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAD,CAAQ;AAC3D,KATI;AAUH,CAXD;;AAaO,MAAMK,mBAAmB,GAAG,MAAoC;EACnE,OAAO;IACHC,IAAI,EAAE,qCADH;IAEHL,IAAI,EAAE,4BAFH;IAGHM,SAAS,EAAE,UAHR;IAIHC,UAAU,EAAE,IAJT;IAKHC,YAAY,EAAE,IALX;IAMHC,IAAI,EAAE;MACFP,iBADE;;MAEFQ,gBAAgB,CAAC;QAAEX;MAAF,CAAD,EAAY;QACxB,OAAQ,GAAEA,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAD,CAAQ,EAAvD;MACH,CAJC;;MAKFY,eAAe,CAAC;QAAEZ;MAAF,CAAD,EAAY;QACvB,IAAIA,KAAK,CAACa,cAAV,EAA0B;UACtB,OAAQ,GAAEb,KAAK,CAACI,OAAQ,MAAKL,mBAAmB,CAACC,KAAD,CAAQ,GAAxD;QACH;;QAED,OAAQ,GAAEA,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAD,CAAQ,EAAvD;MACH;;IAXC,CANH;IAmBHc,MAAM,EAAE;MACJX,iBADI;;MAEJS,eAAe,CAAC;QAAEZ;MAAF,CAAD,EAAY;QACvB,IAAIA,KAAK,CAACa,cAAV,EAA0B;UACtB,MAAME,GAAG,GAAG,IAAAC,iCAAA,EAAyBjB,mBAAmB,CAACC,KAAD,CAA5C,EAAqDA,KAArD,CAAZ;UACA,OAAQ,GAAEA,KAAK,CAACI,OAAQ,MAAKW,GAAI,GAAjC;QACH;;QACD,OAAQ,GAAEf,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAD,CAAQ,EAAvD;MACH,CARG;;MASJiB,gBAAgB,CAAC;QAAEjB;MAAF,CAAD,EAAY;QACxB,OAAO,IAAAkB,gCAAA,EAAwBlB,KAAxB,EAA+BD,mBAAmB,CAACC,KAAD,CAAlD,CAAP;MACH;;IAXG;EAnBL,CAAP;AAiCH,CAlCM"}
+{"version":3,"names":["fieldGraphQLTypes","time","dateTimeWithoutTimezone","dateTimeWithTimezone","date","getFieldGraphQLType","field","type","settings","createListFilters","fieldId","createDateTimeField","name","fieldType","isSortable","isSearchable","read","createGetFilters","createTypeField","multipleValues","manage","def","attachRequiredFieldValue","createInputField","createGraphQLInputField"],"sources":["datetime.ts"],"sourcesContent":["import { CmsModelField, CmsModelFieldToGraphQLPlugin } from \"~/types\";\nimport { attachRequiredFieldValue, createGraphQLInputField } from \"./helpers\";\n\nconst fieldGraphQLTypes = {\n    time: \"Time\",\n    dateTimeWithoutTimezone: \"DateTime\",\n    dateTimeWithTimezone: \"DateTimeZ\",\n    date: \"Date\"\n};\n\ntype FieldGraphQLKeys = keyof typeof fieldGraphQLTypes;\n\nconst getFieldGraphQLType = (field: CmsModelField): string => {\n    const type = field.settings?.type as FieldGraphQLKeys | undefined;\n    if (!type || !fieldGraphQLTypes[type]) {\n        return fieldGraphQLTypes.dateTimeWithoutTimezone;\n    }\n    return fieldGraphQLTypes[type];\n};\n\ninterface CreateListFiltersParams {\n    field: CmsModelField;\n}\nconst createListFilters = ({ field }: CreateListFiltersParams) => {\n    return `\n        ${field.fieldId}: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_not: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_in: [${getFieldGraphQLType(field)}]\n        ${field.fieldId}_not_in: [${getFieldGraphQLType(field)}]\n        ${field.fieldId}_lt: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_lte: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_gt: ${getFieldGraphQLType(field)}\n        ${field.fieldId}_gte: ${getFieldGraphQLType(field)}\n    `;\n};\n\nexport const createDateTimeField = (): CmsModelFieldToGraphQLPlugin => {\n    return {\n        name: \"cms-model-field-to-graphql-datetime\",\n        type: \"cms-model-field-to-graphql\",\n        fieldType: \"datetime\",\n        isSortable: true,\n        isSearchable: true,\n        read: {\n            createListFilters,\n            createGetFilters({ field }) {\n                return `${field.fieldId}: ${getFieldGraphQLType(field)}`;\n            },\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    return `${field.fieldId}: [${getFieldGraphQLType(field)}]`;\n                }\n\n                return `${field.fieldId}: ${getFieldGraphQLType(field)}`;\n            }\n        },\n        manage: {\n            createListFilters,\n            createTypeField({ field }) {\n                if (field.multipleValues) {\n                    const def = attachRequiredFieldValue(getFieldGraphQLType(field), field);\n                    return `${field.fieldId}: [${def}]`;\n                }\n                return `${field.fieldId}: ${getFieldGraphQLType(field)}`;\n            },\n            createInputField({ field }) {\n                return createGraphQLInputField(field, getFieldGraphQLType(field));\n            }\n        }\n    };\n};\n"],"mappings":";;;;;;AACA;AAEA,MAAMA,iBAAiB,GAAG;EACtBC,IAAI,EAAE,MAAM;EACZC,uBAAuB,EAAE,UAAU;EACnCC,oBAAoB,EAAE,WAAW;EACjCC,IAAI,EAAE;AACV,CAAC;AAID,MAAMC,mBAAmB,GAAIC,KAAoB,IAAa;EAAA;EAC1D,MAAMC,IAAI,sBAAGD,KAAK,CAACE,QAAQ,oDAAd,gBAAgBD,IAAoC;EACjE,IAAI,CAACA,IAAI,IAAI,CAACP,iBAAiB,CAACO,IAAI,CAAC,EAAE;IACnC,OAAOP,iBAAiB,CAACE,uBAAuB;EACpD;EACA,OAAOF,iBAAiB,CAACO,IAAI,CAAC;AAClC,CAAC;AAKD,MAAME,iBAAiB,GAAG,CAAC;EAAEH;AAA+B,CAAC,KAAK;EAC9D,OAAQ;AACZ,UAAUA,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAK,CAAE;AACvD,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAK,CAAE;AAC3D,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAK,CAAE;AAC3D,UAAUA,KAAK,CAACI,OAAQ,aAAYL,mBAAmB,CAACC,KAAK,CAAE;AAC/D,UAAUA,KAAK,CAACI,OAAQ,QAAOL,mBAAmB,CAACC,KAAK,CAAE;AAC1D,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAK,CAAE;AAC3D,UAAUA,KAAK,CAACI,OAAQ,QAAOL,mBAAmB,CAACC,KAAK,CAAE;AAC1D,UAAUA,KAAK,CAACI,OAAQ,SAAQL,mBAAmB,CAACC,KAAK,CAAE;AAC3D,KAAK;AACL,CAAC;AAEM,MAAMK,mBAAmB,GAAG,MAAoC;EACnE,OAAO;IACHC,IAAI,EAAE,qCAAqC;IAC3CL,IAAI,EAAE,4BAA4B;IAClCM,SAAS,EAAE,UAAU;IACrBC,UAAU,EAAE,IAAI;IAChBC,YAAY,EAAE,IAAI;IAClBC,IAAI,EAAE;MACFP,iBAAiB;MACjBQ,gBAAgB,CAAC;QAAEX;MAAM,CAAC,EAAE;QACxB,OAAQ,GAAEA,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAK,CAAE,EAAC;MAC5D,CAAC;MACDY,eAAe,CAAC;QAAEZ;MAAM,CAAC,EAAE;QACvB,IAAIA,KAAK,CAACa,cAAc,EAAE;UACtB,OAAQ,GAAEb,KAAK,CAACI,OAAQ,MAAKL,mBAAmB,CAACC,KAAK,CAAE,GAAE;QAC9D;QAEA,OAAQ,GAAEA,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAK,CAAE,EAAC;MAC5D;IACJ,CAAC;IACDc,MAAM,EAAE;MACJX,iBAAiB;MACjBS,eAAe,CAAC;QAAEZ;MAAM,CAAC,EAAE;QACvB,IAAIA,KAAK,CAACa,cAAc,EAAE;UACtB,MAAME,GAAG,GAAG,IAAAC,iCAAwB,EAACjB,mBAAmB,CAACC,KAAK,CAAC,EAAEA,KAAK,CAAC;UACvE,OAAQ,GAAEA,KAAK,CAACI,OAAQ,MAAKW,GAAI,GAAE;QACvC;QACA,OAAQ,GAAEf,KAAK,CAACI,OAAQ,KAAIL,mBAAmB,CAACC,KAAK,CAAE,EAAC;MAC5D,CAAC;MACDiB,gBAAgB,CAAC;QAAEjB;MAAM,CAAC,EAAE;QACxB,OAAO,IAAAkB,gCAAuB,EAAClB,KAAK,EAAED,mBAAmB,CAACC,KAAK,CAAC,CAAC;MACrE;IACJ;EACJ,CAAC;AACL,CAAC;AAAC"}

package/graphqlFields/dynamicZone/dynamicZoneField.d.ts

@@ -1,2 +1,2 @@
-import { CmsModelFieldToGraphQLPlugin, CmsModelDynamicZoneField } from "../../types";
+import { CmsModelDynamicZoneField, CmsModelFieldToGraphQLPlugin } from "../../types";
 export declare const createDynamicZoneField: () => CmsModelFieldToGraphQLPlugin<CmsModelDynamicZoneField>;

package/graphqlFields/dynamicZone/dynamicZoneField.js

@@ -1,35 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createDynamicZoneField = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
+var _error = _interopRequireDefault(require("@webiny/error"));
 var _createTypeName = require("../../utils/createTypeName");
-
 var _createTypeFromFields = require("../../utils/createTypeFromFields");
-
 var _helpers = require("../helpers");
-
 const createUnionTypeName = (model, field) => {
-  return `${(0, _createTypeName.createReadTypeName)(model.modelId)}_${(0, _createTypeName.createReadTypeName)(field.fieldId)}`;
+  return `${model.singularApiName}_${(0, _createTypeName.createTypeName)(field.fieldId)}`;
 };
-
 const getFieldTemplates = field => {
   var _field$settings;
-
   if (!Array.isArray((_field$settings = field.settings) === null || _field$settings === void 0 ? void 0 : _field$settings.templates)) {
     return [];
   }
-
   return field.settings.templates;
 };
-
 const createTypeDefsForTemplates = ({
+  models,
   model,
   field,
   type,
@@ -40,8 +32,9 @@ const createTypeDefsForTemplates = ({
   const typeDefs = [];
   const templateTypes = [];
   templates.forEach(template => {
-    const typeName = [(0, _createTypeName.createTypeName)(model.modelId), (0, _createTypeName.createTypeName)(field.fieldId), template.gqlTypeName].join("_");
+    const typeName = [model.singularApiName, (0, _createTypeName.createTypeName)(field.fieldId), template.gqlTypeName].join("_");
     const result = (0, _createTypeFromFields.createTypeFromFields)({
+      models,
       typeOfType,
       model,
       type,
@@ -49,11 +42,9 @@ const createTypeDefsForTemplates = ({
       fields: template.fields,
       fieldTypePlugins
     });
-
     if (!result) {
       return;
     }
-
     typeDefs.push(result.typeDefs);
     templateTypes.push(result.fieldType);
   });
@@ -62,35 +53,28 @@ const createTypeDefsForTemplates = ({
     templateTypes
   };
 };
-
 const remapTemplateValue = (value, typeName) => {
   const templateType = Object.keys(value)[0];
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, value[templateType]), {}, {
     __typename: `${typeName}_${templateType}`
   });
 };
-
 const createResolver = ({
   model,
   field
 }) => {
   return parent => {
     const value = parent[field.fieldId];
-
     if (!value) {
       return value;
     }
-
-    const typeName = `${(0, _createTypeName.createTypeName)(model.modelId)}_${(0, _createTypeName.createTypeName)(field.fieldId)}`;
-
+    const typeName = `${model.singularApiName}_${(0, _createTypeName.createTypeName)(field.fieldId)}`;
     if (field.multipleValues && Array.isArray(value)) {
       return value.map(v => remapTemplateValue(v, typeName));
     }
-
     return remapTemplateValue(value, typeName);
   };
 };
-
 const createDynamicZoneField = () => {
   return {
     name: "cms-model-field-to-graphql-dynamic-zone",
@@ -99,23 +83,30 @@ const createDynamicZoneField = () => {
     isSortable: false,
     isSearchable: false,
     validateChildFields: params => {
+      var _field$settings2;
       const {
         validate,
         originalField,
         field
       } = params;
-
+      const hasRefField = (((_field$settings2 = field.settings) === null || _field$settings2 === void 0 ? void 0 : _field$settings2.templates) || []).some(template => {
+        return template.fields.some(field => field.type === "ref");
+      });
+      if (hasRefField) {
+        throw new _error.default("Reference field cannot be used inside of an Dynamic Zone field.", "REFERENCE_FIELD_INSIDE_DYNAMIC_ZONE", {
+          id: field.id,
+          fieldId: field.fieldId,
+          fieldLabel: field.label
+        });
+      }
       const getOriginalTemplateFields = templateId => {
         var _originalField$settin;
-
         if (!(originalField !== null && originalField !== void 0 && (_originalField$settin = originalField.settings) !== null && _originalField$settin !== void 0 && _originalField$settin.templates)) {
           return [];
         }
-
         const template = originalField.settings.templates.find(t => t.id === templateId);
         return (template === null || template === void 0 ? void 0 : template.fields) || [];
       };
-
       for (const template of field.settings.templates) {
         validate({
           fields: template.fields,
@@ -125,6 +116,7 @@ const createDynamicZoneField = () => {
     },
     read: {
       createTypeField({
+        models,
         model,
         field,
         fieldTypePlugins
@@ -135,6 +127,7 @@ const createDynamicZoneField = () => {
           typeDefs,
           templateTypes
         } = createTypeDefsForTemplates({
+          models,
           field,
           type: "read",
           typeOfType: "type",
@@ -148,11 +141,11 @@ const createDynamicZoneField = () => {
           typeDefs: typeDefs.join("\n")
         };
       },
-
       createResolver
     },
     manage: {
       createTypeField({
+        models,
         model,
         field,
         fieldTypePlugins
@@ -163,14 +156,16 @@ const createDynamicZoneField = () => {
           typeDefs,
           templateTypes
         } = createTypeDefsForTemplates({
+          models,
           field,
           type: "manage",
           typeOfType: "type",
           model,
           fieldTypePlugins,
           templates
-        }); // Add _templateId
+        });
 
+        // Add _templateId
         const templateIds = templateTypes.map(type => {
           return `extend type ${type} {
                             _templateId: ID!
@@ -183,8 +178,8 @@ const createDynamicZoneField = () => {
           typeDefs: typeDefs.concat(templateIds).join("\n")
         };
       },
-
       createInputField({
+        models,
         model,
         field,
         fieldTypePlugins
@@ -194,6 +189,7 @@ const createDynamicZoneField = () => {
           typeDefs,
           templateTypes
         } = createTypeDefsForTemplates({
+          models,
           field,
           type: "manage",
           typeOfType: "input",
@@ -201,11 +197,12 @@ const createDynamicZoneField = () => {
           fieldTypePlugins,
           templates
         });
-        const typeName = `${(0, _createTypeName.createTypeName)(model.modelId)}_${(0, _createTypeName.createTypeName)(field.fieldId)}`;
+        const typeName = `${model.singularApiName}_${(0, _createTypeName.createTypeName)(field.fieldId)}`;
         const inputProperties = templateTypes.map(inputTypeName => {
           const key = inputTypeName.replace(`${typeName}_`, "").replace("Input", "");
           return [key, inputTypeName];
         });
+
         /**
          * Generate a field input type, similar to this example:
          *
@@ -214,7 +211,6 @@ const createDynamicZoneField = () => {
          *     SimpleText: Article_Content_SimpleTextInput
          * }
          */
-
         typeDefs.push(`input ${typeName}Input {
                         ${inputProperties.map(([key, value]) => `
                             ${key}: ${value}
@@ -225,10 +221,8 @@ const createDynamicZoneField = () => {
           typeDefs: typeDefs.join("\n")
         };
       },
-
       createResolver
     }
   };
 };
-
 exports.createDynamicZoneField = createDynamicZoneField;