@webiny/api-headless-cms 0.0.0-unstable.40876133bb → 0.0.0-unstable.60e968001a

package/graphql/schema/createManageSDL.js

@@ -21,7 +21,8 @@ var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 
 const createManageSDL = ({
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
   const typeName = (0, _createTypeName.createTypeName)(model.modelId);
   const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
@@ -32,7 +33,8 @@ const createManageSDL = ({
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
@@ -56,8 +58,6 @@ const createManageSDL = ({
     /* GraphQL */
     `
         """${model.description || model.modelId}"""
-        ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
-
         type ${mTypeName} {
             id: ID!
             entryId: String!
@@ -86,7 +86,8 @@ const createManageSDL = ({
             """
             data: JSON
         }
-        
+
+        ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
         
         ${inputFields.map(f => f.typeDefs).filter(Boolean).join("\n")}
 
@@ -100,7 +101,9 @@ const createManageSDL = ({
 
 
         ${listFilterFieldsRender && `input ${mTypeName}ListWhereInput {
-            ${listFilterFieldsRender}
+                ${listFilterFieldsRender}
+                AND: [${mTypeName}ListWhereInput!]
+                OR: [${mTypeName}ListWhereInput!]
         }`}
 
         type ${mTypeName}Response {

package/graphql/schema/createManageSDL.js.map

@@ -1 +1 @@
-{"version":3,"names":["createManageSDL","model","fieldTypePlugins","typeName","createTypeName","modelId","mTypeName","createManageTypeName","listFilterFieldsRender","renderListFilterFields","type","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","inputFields","renderInputFields","fields","renderFields","length","description","map","f","typeDefs","filter","Boolean","join","pluralizedTypeName"],"sources":["createManageSDL.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel } from \"~/types\";\nimport { createManageTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { renderInputFields } from \"~/utils/renderInputFields\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateManageSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface CreateManageSDL {\n    (params: CreateManageSDLParams): string;\n}\n\nexport const createManageSDL: CreateManageSDL = ({ model, fieldTypePlugins }): string => {\n    const typeName = createTypeName(model.modelId);\n    const mTypeName = createManageTypeName(typeName);\n\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        type: \"manage\",\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({ model, fieldTypePlugins });\n    const getFilterFieldsRender = renderGetFilterFields({ model, fieldTypePlugins });\n    const inputFields = renderInputFields({ model, fieldTypePlugins });\n    const fields = renderFields({ model, type: \"manage\", fieldTypePlugins });\n\n    if (inputFields.length === 0) {\n        return \"\";\n    }\n\n    return /* GraphQL */ `\n        \"\"\"${model.description || model.modelId}\"\"\"\n        ${fields\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n\n        type ${mTypeName} {\n            id: ID!\n            entryId: String!\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsCreatedBy!\n            ownedBy: CmsOwnedBy!\n            meta: ${mTypeName}Meta\n            ${fields.map(f => f.fields).join(\"\\n\")}\n        }\n\n        type ${mTypeName}Meta {\n            modelId: String\n            version: Int\n            locked: Boolean\n            publishedOn: DateTime\n            status: String\n            \"\"\"\n            CAUTION: this field is resolved by making an extra query to DB.\n            RECOMMENDATION: Use it only with \"get\" queries (avoid in \"list\")\n            \"\"\"\n            revisions: [${mTypeName}]\n            title: String\n            \"\"\"\n            Custom meta data stored in the root of the entry object.\n            \"\"\"\n            data: JSON\n        }\n        \n        \n        ${inputFields\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n\n        ${\n            inputFields &&\n            `input ${mTypeName}Input {\n            ${inputFields.map(f => f.fields).join(\"\\n\")}\n        }`\n        }\n\n        ${\n            getFilterFieldsRender &&\n            `input ${mTypeName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n\n\n        ${\n            listFilterFieldsRender &&\n            `input ${mTypeName}ListWhereInput {\n            ${listFilterFieldsRender}\n        }`\n        }\n\n        type ${mTypeName}Response {\n            data: ${mTypeName}\n            error: CmsError\n        }\n        \n        type ${mTypeName}ArrayResponse {\n            data: [${mTypeName}]\n            error: CmsError\n        }\n\n        type ${mTypeName}ListResponse {\n            data: [${mTypeName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n\n        ${\n            sortEnumRender &&\n            `enum ${mTypeName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n\n        extend type Query {\n            get${typeName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${mTypeName}Response\n            \n            get${typeName}Revisions(id: ID!): ${mTypeName}ArrayResponse\n            \n            get${pluralizedTypeName(typeName)}ByIds(revisions: [ID!]!): ${mTypeName}ArrayResponse\n\n            list${pluralizedTypeName(typeName)}(\n                where: ${mTypeName}ListWhereInput\n                sort: [${mTypeName}ListSorter]\n                limit: Int\n                after: String\n            ): ${mTypeName}ListResponse\n        }\n\n        extend type Mutation{\n            create${typeName}(data: ${mTypeName}Input!): ${mTypeName}Response\n\n            create${typeName}From(revision: ID!, data: ${mTypeName}Input): ${mTypeName}Response\n\n            update${typeName}(revision: ID!, data: ${mTypeName}Input!): ${mTypeName}Response\n\n            delete${typeName}(revision: ID!): CmsDeleteResponse\n\n            publish${typeName}(revision: ID!): ${mTypeName}Response\n        \n            republish${typeName}(revision: ID!): ${mTypeName}Response\n\n            unpublish${typeName}(revision: ID!): ${mTypeName}Response\n        }\n    `;\n};\n"],"mappings":"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"}
+{"version":3,"names":["createManageSDL","model","fieldTypePlugins","sorterPlugins","typeName","createTypeName","modelId","mTypeName","createManageTypeName","listFilterFieldsRender","renderListFilterFields","type","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","inputFields","renderInputFields","fields","renderFields","length","description","map","f","join","typeDefs","filter","Boolean","pluralizedTypeName"],"sources":["createManageSDL.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel } from \"~/types\";\nimport { createManageTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { renderInputFields } from \"~/utils/renderInputFields\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\ninterface CreateManageSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];\n}\ninterface CreateManageSDL {\n    (params: CreateManageSDLParams): string;\n}\n\nexport const createManageSDL: CreateManageSDL = ({\n    model,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\n    const typeName = createTypeName(model.modelId);\n    const mTypeName = createManageTypeName(typeName);\n\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        type: \"manage\",\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({ model, fieldTypePlugins, sorterPlugins });\n    const getFilterFieldsRender = renderGetFilterFields({ model, fieldTypePlugins });\n    const inputFields = renderInputFields({ model, fieldTypePlugins });\n    const fields = renderFields({ model, type: \"manage\", fieldTypePlugins });\n\n    if (inputFields.length === 0) {\n        return \"\";\n    }\n\n    return /* GraphQL */ `\n        \"\"\"${model.description || model.modelId}\"\"\"\n        type ${mTypeName} {\n            id: ID!\n            entryId: String!\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsCreatedBy!\n            ownedBy: CmsOwnedBy!\n            meta: ${mTypeName}Meta\n            ${fields.map(f => f.fields).join(\"\\n\")}\n        }\n\n        type ${mTypeName}Meta {\n            modelId: String\n            version: Int\n            locked: Boolean\n            publishedOn: DateTime\n            status: String\n            \"\"\"\n            CAUTION: this field is resolved by making an extra query to DB.\n            RECOMMENDATION: Use it only with \"get\" queries (avoid in \"list\")\n            \"\"\"\n            revisions: [${mTypeName}]\n            title: String\n            \"\"\"\n            Custom meta data stored in the root of the entry object.\n            \"\"\"\n            data: JSON\n        }\n\n        ${fields\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n        \n        ${inputFields\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n\n        ${\n            inputFields &&\n            `input ${mTypeName}Input {\n            ${inputFields.map(f => f.fields).join(\"\\n\")}\n        }`\n        }\n\n        ${\n            getFilterFieldsRender &&\n            `input ${mTypeName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n\n\n        ${\n            listFilterFieldsRender &&\n            `input ${mTypeName}ListWhereInput {\n                ${listFilterFieldsRender}\n                AND: [${mTypeName}ListWhereInput!]\n                OR: [${mTypeName}ListWhereInput!]\n        }`\n        }\n\n        type ${mTypeName}Response {\n            data: ${mTypeName}\n            error: CmsError\n        }\n        \n        type ${mTypeName}ArrayResponse {\n            data: [${mTypeName}]\n            error: CmsError\n        }\n\n        type ${mTypeName}ListResponse {\n            data: [${mTypeName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n\n        ${\n            sortEnumRender &&\n            `enum ${mTypeName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n\n        extend type Query {\n            get${typeName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${mTypeName}Response\n            \n            get${typeName}Revisions(id: ID!): ${mTypeName}ArrayResponse\n            \n            get${pluralizedTypeName(typeName)}ByIds(revisions: [ID!]!): ${mTypeName}ArrayResponse\n\n            list${pluralizedTypeName(typeName)}(\n                where: ${mTypeName}ListWhereInput\n                sort: [${mTypeName}ListSorter]\n                limit: Int\n                after: String\n            ): ${mTypeName}ListResponse\n        }\n\n        extend type Mutation{\n            create${typeName}(data: ${mTypeName}Input!): ${mTypeName}Response\n\n            create${typeName}From(revision: ID!, data: ${mTypeName}Input): ${mTypeName}Response\n\n            update${typeName}(revision: ID!, data: ${mTypeName}Input!): ${mTypeName}Response\n\n            delete${typeName}(revision: ID!): CmsDeleteResponse\n\n            publish${typeName}(revision: ID!): ${mTypeName}Response\n        \n            republish${typeName}(revision: ID!): ${mTypeName}Response\n\n            unpublish${typeName}(revision: ID!): ${mTypeName}Response\n        }\n    `;\n};\n"],"mappings":"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"}

package/graphql/schema/createReadResolvers.js

@@ -51,6 +51,11 @@ const createReadResolvers = ({
       [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
         model
       })
+    },
+    [rTypeName]: {
+      modelId: () => {
+        return model.modelId;
+      }
     }
   }, fieldResolvers);
 };

package/graphql/schema/createReadResolvers.js.map

@@ -1 +1 @@
-{"version":3,"names":["createReadResolvers","models","model","fieldTypePlugins","fields","length","Query","typeName","createTypeName","modelId","rTypeName","createReadTypeName","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","isRoot","resolveGet","pluralizedTypeName","resolveList"],"sources":["createReadResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/read/resolveGet\";\nimport { resolveList } from \"./resolvers/read/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createReadResolvers: CreateReadResolvers = ({ models, model, fieldTypePlugins }) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: rTypeName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${typeName}`]: resolveGet({ model }),\n            [`list${pluralizedTypeName(typeName)}`]: resolveList({ model })\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAaO,MAAMA,mBAAwC,GAAG,CAAC;EAAEC,MAAF;EAAUC,KAAV;EAAiBC;AAAjB,CAAD,KAAyC;EAC7F,IAAID,KAAK,CAACE,MAAN,CAAaC,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO;MACHC,KAAK,EAAE;IADJ,CAAP;EAGH;;EACD,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeN,KAAK,CAACO,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,oBAAoB,GAAG,IAAAC,iDAAA,EAA4B;IACrDC,YAAY,EAAE,MADuC;IAErDb,MAFqD;IAGrDC,KAHqD;IAIrDC;EAJqD,CAA5B,CAA7B;EAOA,MAAMY,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAEN,SAD2B;IAExCN,MAAM,EAAEF,KAAK,CAACE,MAF0B;IAGxCa,MAAM,EAAE;EAHgC,CAAD,CAA3C;EAMA;IACIX,KAAK,EAAE;MACH,CAAE,MAAKC,QAAS,EAAhB,GAAoB,IAAAW,sBAAA,EAAW;QAAEhB;MAAF,CAAX,CADjB;MAEH,CAAE,OAAM,IAAAiB,sCAAA,EAAmBZ,QAAnB,CAA6B,EAArC,GAAyC,IAAAa,wBAAA,EAAY;QAAElB;MAAF,CAAZ;IAFtC;EADX,GAKOa,cALP;AAOH,CA7BM"}
+{"version":3,"names":["createReadResolvers","models","model","fieldTypePlugins","fields","length","Query","typeName","createTypeName","modelId","rTypeName","createReadTypeName","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","isRoot","resolveGet","pluralizedTypeName","resolveList"],"sources":["createReadResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/read/resolveGet\";\nimport { resolveList } from \"./resolvers/read/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createReadResolvers: CreateReadResolvers = ({ models, model, fieldTypePlugins }) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: rTypeName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${typeName}`]: resolveGet({ model }),\n            [`list${pluralizedTypeName(typeName)}`]: resolveList({ model })\n        },\n        [rTypeName]: {\n            modelId: () => {\n                return model.modelId;\n            }\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AAaO,MAAMA,mBAAwC,GAAG,CAAC;EAAEC,MAAF;EAAUC,KAAV;EAAiBC;AAAjB,CAAD,KAAyC;EAC7F,IAAID,KAAK,CAACE,MAAN,CAAaC,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO;MACHC,KAAK,EAAE;IADJ,CAAP;EAGH;;EACD,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeN,KAAK,CAACO,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,oBAAoB,GAAG,IAAAC,iDAAA,EAA4B;IACrDC,YAAY,EAAE,MADuC;IAErDb,MAFqD;IAGrDC,KAHqD;IAIrDC;EAJqD,CAA5B,CAA7B;EAOA,MAAMY,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAEN,SAD2B;IAExCN,MAAM,EAAEF,KAAK,CAACE,MAF0B;IAGxCa,MAAM,EAAE;EAHgC,CAAD,CAA3C;EAMA;IACIX,KAAK,EAAE;MACH,CAAE,MAAKC,QAAS,EAAhB,GAAoB,IAAAW,sBAAA,EAAW;QAAEhB;MAAF,CAAX,CADjB;MAEH,CAAE,OAAM,IAAAiB,sCAAA,EAAmBZ,QAAnB,CAA6B,EAArC,GAAyC,IAAAa,wBAAA,EAAY;QAAElB;MAAF,CAAZ;IAFtC,CADX;IAKI,CAACQ,SAAD,GAAa;MACTD,OAAO,EAAE,MAAM;QACX,OAAOP,KAAK,CAACO,OAAb;MACH;IAHQ;EALjB,GAUOM,cAVP;AAYH,CAlCM"}

package/graphql/schema/createReadSDL.d.ts

@@ -1,7 +1,9 @@
 import { CmsModel, CmsFieldTypePlugins } from "../../types";
+import { CmsGraphQLSchemaSorterPlugin } from "../../plugins";
 interface CreateReadSDLParams {
     model: CmsModel;
     fieldTypePlugins: CmsFieldTypePlugins;
+    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];
 }
 interface CreateReadSDL {
     (params: CreateReadSDLParams): string;

package/graphql/schema/createReadSDL.js

@@ -19,7 +19,8 @@ var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 
 const createReadSDL = ({
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
   const typeName = (0, _createTypeName.createTypeName)(model.modelId);
   const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
@@ -31,7 +32,8 @@ const createReadSDL = ({
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
@@ -47,13 +49,13 @@ const createReadSDL = ({
     return "";
   }
 
+  const hasModelIdField = model.fields.some(f => f.fieldId === "modelId");
   return `
         """${model.description || ""}"""
-        ${fieldsRender.map(f => f.typeDefs).filter(Boolean).join("\n")}
-        
         type ${rTypeName} {
             id: ID!
             entryId: String!
+            ${hasModelIdField ? "" : "modelId: String!"}
             createdOn: DateTime!
             savedOn: DateTime!
             createdBy: CmsCreatedBy!
@@ -61,13 +63,17 @@ const createReadSDL = ({
             ${fieldsRender.map(f => f.fields).join("\n")}
         }
         
+        ${fieldsRender.map(f => f.typeDefs).filter(Boolean).join("\n")}
+        
         ${getFilterFieldsRender && `input ${rTypeName}GetWhereInput {
             ${getFilterFieldsRender}
         }`}
         
         
         ${listFilterFieldsRender && `input ${rTypeName}ListWhereInput {
-            ${listFilterFieldsRender}
+                ${listFilterFieldsRender}
+                AND: [${rTypeName}ListWhereInput!]
+                OR: [${rTypeName}ListWhereInput!]
         }`}
         
         

package/graphql/schema/createReadSDL.js.map

@@ -1 +1 @@
-{"version":3,"names":["createReadSDL","model","fieldTypePlugins","typeName","createTypeName","modelId","rTypeName","createReadTypeName","type","listFilterFieldsRender","renderListFilterFields","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","fieldsRender","renderFields","length","description","map","f","typeDefs","filter","Boolean","join","fields","pluralizedTypeName"],"sources":["createReadSDL.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, ApiEndpoint } from \"~/types\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\n\ninterface CreateReadSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface CreateReadSDL {\n    (params: CreateReadSDLParams): string;\n}\n\nexport const createReadSDL: CreateReadSDL = ({ model, fieldTypePlugins }): string => {\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const type: ApiEndpoint = \"read\";\n\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        type,\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({\n        model,\n        fieldTypePlugins\n    });\n    const getFilterFieldsRender = renderGetFilterFields({\n        model,\n        fieldTypePlugins\n    });\n    const fieldsRender = renderFields({\n        model,\n        type,\n        fieldTypePlugins\n    });\n\n    if (fieldsRender.length === 0) {\n        return \"\";\n    }\n\n    return `\n        \"\"\"${model.description || \"\"}\"\"\"\n        ${fieldsRender\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n        \n        type ${rTypeName} {\n            id: ID!\n            entryId: String!\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsCreatedBy!\n            ownedBy: CmsOwnedBy!\n            ${fieldsRender.map(f => f.fields).join(\"\\n\")}\n        }\n        \n        ${\n            getFilterFieldsRender &&\n            `input ${rTypeName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n        \n        \n        ${\n            listFilterFieldsRender &&\n            `input ${rTypeName}ListWhereInput {\n            ${listFilterFieldsRender}\n        }`\n        }\n        \n        \n        ${\n            sortEnumRender &&\n            `enum ${rTypeName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n        \n        type ${rTypeName}Response {\n            data: ${rTypeName}\n            error: CmsError\n        }\n        \n        type ${rTypeName}ListResponse {\n            data: [${rTypeName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n        \n        extend type Query {\n            get${typeName}(where: ${rTypeName}GetWhereInput!): ${rTypeName}Response\n\n            list${pluralizedTypeName(typeName)}(\n                where: ${rTypeName}ListWhereInput\n                sort: [${rTypeName}ListSorter]\n                limit: Int\n                after: String\n            ): ${rTypeName}ListResponse\n        }\n    `;\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAUO,MAAMA,aAA4B,GAAG,CAAC;EAAEC,KAAF;EAASC;AAAT,CAAD,KAAyC;EACjF,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeH,KAAK,CAACI,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,IAAiB,GAAG,MAA1B;EAEA,MAAMC,sBAAsB,GAAG,IAAAC,8CAAA,EAAuB;IAClDT,KADkD;IAElDO,IAFkD;IAGlDN;EAHkD,CAAvB,CAA/B;EAMA,MAAMS,cAAc,GAAG,IAAAC,8BAAA,EAAe;IAClCX,KADkC;IAElCC;EAFkC,CAAf,CAAvB;EAIA,MAAMW,qBAAqB,GAAG,IAAAC,4CAAA,EAAsB;IAChDb,KADgD;IAEhDC;EAFgD,CAAtB,CAA9B;EAIA,MAAMa,YAAY,GAAG,IAAAC,0BAAA,EAAa;IAC9Bf,KAD8B;IAE9BO,IAF8B;IAG9BN;EAH8B,CAAb,CAArB;;EAMA,IAAIa,YAAY,CAACE,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO,EAAP;EACH;;EAED,OAAQ;AACZ,aAAahB,KAAK,CAACiB,WAAN,IAAqB,EAAG;AACrC,UAAUH,YAAY,CACTI,GADH,CACOC,CAAC,IAAIA,CAAC,CAACC,QADd,EAEGC,MAFH,CAEUC,OAFV,EAGGC,IAHH,CAGQ,IAHR,CAGc;AACxB;AACA,eAAelB,SAAU;AACzB;AACA;AACA;AACA;AACA;AACA;AACA,cAAcS,YAAY,CAACI,GAAb,CAAiBC,CAAC,IAAIA,CAAC,CAACK,MAAxB,EAAgCD,IAAhC,CAAqC,IAArC,CAA2C;AACzD;AACA;AACA,UACYX,qBAAqB,IACpB,SAAQP,SAAU;AAC/B,cAAcO,qBAAsB;AACpC,UACS;AACT;AACA;AACA,UACYJ,sBAAsB,IACrB,SAAQH,SAAU;AAC/B,cAAcG,sBAAuB;AACrC,UACS;AACT;AACA;AACA,UACYE,cAAc,IACb,QAAOL,SAAU;AAC9B,cAAcK,cAAe;AAC7B,UACS;AACT;AACA,eAAeL,SAAU;AACzB,oBAAoBA,SAAU;AAC9B;AACA;AACA;AACA,eAAeA,SAAU;AACzB,qBAAqBA,SAAU;AAC/B;AACA;AACA;AACA;AACA;AACA,iBAAiBH,QAAS,WAAUG,SAAU,oBAAmBA,SAAU;AAC3E;AACA,kBAAkB,IAAAoB,sCAAA,EAAmBvB,QAAnB,CAA6B;AAC/C,yBAAyBG,SAAU;AACnC,yBAAyBA,SAAU;AACnC;AACA;AACA,iBAAiBA,SAAU;AAC3B;AACA,KA7DI;AA8DH,CA5FM"}
+{"version":3,"names":["createReadSDL","model","fieldTypePlugins","sorterPlugins","typeName","createTypeName","modelId","rTypeName","createReadTypeName","type","listFilterFieldsRender","renderListFilterFields","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","fieldsRender","renderFields","length","hasModelIdField","fields","some","f","fieldId","description","map","join","typeDefs","filter","Boolean","pluralizedTypeName"],"sources":["createReadSDL.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, ApiEndpoint } from \"~/types\";\nimport { createReadTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { renderListFilterFields } from \"~/utils/renderListFilterFields\";\nimport { renderSortEnum } from \"~/utils/renderSortEnum\";\nimport { renderFields } from \"~/utils/renderFields\";\nimport { renderGetFilterFields } from \"~/utils/renderGetFilterFields\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\ninterface CreateReadSDLParams {\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];\n}\ninterface CreateReadSDL {\n    (params: CreateReadSDLParams): string;\n}\n\nexport const createReadSDL: CreateReadSDL = ({\n    model,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\n    const typeName = createTypeName(model.modelId);\n    const rTypeName = createReadTypeName(typeName);\n\n    const type: ApiEndpoint = \"read\";\n\n    const listFilterFieldsRender = renderListFilterFields({\n        model,\n        type,\n        fieldTypePlugins\n    });\n\n    const sortEnumRender = renderSortEnum({\n        model,\n        fieldTypePlugins,\n        sorterPlugins\n    });\n    const getFilterFieldsRender = renderGetFilterFields({\n        model,\n        fieldTypePlugins\n    });\n    const fieldsRender = renderFields({\n        model,\n        type,\n        fieldTypePlugins\n    });\n\n    if (fieldsRender.length === 0) {\n        return \"\";\n    }\n\n    const hasModelIdField = model.fields.some(f => f.fieldId === \"modelId\");\n\n    return `\n        \"\"\"${model.description || \"\"}\"\"\"\n        type ${rTypeName} {\n            id: ID!\n            entryId: String!\n            ${hasModelIdField ? \"\" : \"modelId: String!\"}\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsCreatedBy!\n            ownedBy: CmsOwnedBy!\n            ${fieldsRender.map(f => f.fields).join(\"\\n\")}\n        }\n        \n        ${fieldsRender\n            .map(f => f.typeDefs)\n            .filter(Boolean)\n            .join(\"\\n\")}\n        \n        ${\n            getFilterFieldsRender &&\n            `input ${rTypeName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n        \n        \n        ${\n            listFilterFieldsRender &&\n            `input ${rTypeName}ListWhereInput {\n                ${listFilterFieldsRender}\n                AND: [${rTypeName}ListWhereInput!]\n                OR: [${rTypeName}ListWhereInput!]\n        }`\n        }\n        \n        \n        ${\n            sortEnumRender &&\n            `enum ${rTypeName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n        \n        type ${rTypeName}Response {\n            data: ${rTypeName}\n            error: CmsError\n        }\n        \n        type ${rTypeName}ListResponse {\n            data: [${rTypeName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n        \n        extend type Query {\n            get${typeName}(where: ${rTypeName}GetWhereInput!): ${rTypeName}Response\n\n            list${pluralizedTypeName(typeName)}(\n                where: ${rTypeName}ListWhereInput\n                sort: [${rTypeName}ListSorter]\n                limit: Int\n                after: String\n            ): ${rTypeName}ListResponse\n        }\n    `;\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAYO,MAAMA,aAA4B,GAAG,CAAC;EACzCC,KADyC;EAEzCC,gBAFyC;EAGzCC;AAHyC,CAAD,KAI9B;EACV,MAAMC,QAAQ,GAAG,IAAAC,8BAAA,EAAeJ,KAAK,CAACK,OAArB,CAAjB;EACA,MAAMC,SAAS,GAAG,IAAAC,kCAAA,EAAmBJ,QAAnB,CAAlB;EAEA,MAAMK,IAAiB,GAAG,MAA1B;EAEA,MAAMC,sBAAsB,GAAG,IAAAC,8CAAA,EAAuB;IAClDV,KADkD;IAElDQ,IAFkD;IAGlDP;EAHkD,CAAvB,CAA/B;EAMA,MAAMU,cAAc,GAAG,IAAAC,8BAAA,EAAe;IAClCZ,KADkC;IAElCC,gBAFkC;IAGlCC;EAHkC,CAAf,CAAvB;EAKA,MAAMW,qBAAqB,GAAG,IAAAC,4CAAA,EAAsB;IAChDd,KADgD;IAEhDC;EAFgD,CAAtB,CAA9B;EAIA,MAAMc,YAAY,GAAG,IAAAC,0BAAA,EAAa;IAC9BhB,KAD8B;IAE9BQ,IAF8B;IAG9BP;EAH8B,CAAb,CAArB;;EAMA,IAAIc,YAAY,CAACE,MAAb,KAAwB,CAA5B,EAA+B;IAC3B,OAAO,EAAP;EACH;;EAED,MAAMC,eAAe,GAAGlB,KAAK,CAACmB,MAAN,CAAaC,IAAb,CAAkBC,CAAC,IAAIA,CAAC,CAACC,OAAF,KAAc,SAArC,CAAxB;EAEA,OAAQ;AACZ,aAAatB,KAAK,CAACuB,WAAN,IAAqB,EAAG;AACrC,eAAejB,SAAU;AACzB;AACA;AACA,cAAcY,eAAe,GAAG,EAAH,GAAQ,kBAAmB;AACxD;AACA;AACA;AACA;AACA,cAAcH,YAAY,CAACS,GAAb,CAAiBH,CAAC,IAAIA,CAAC,CAACF,MAAxB,EAAgCM,IAAhC,CAAqC,IAArC,CAA2C;AACzD;AACA;AACA,UAAUV,YAAY,CACTS,GADH,CACOH,CAAC,IAAIA,CAAC,CAACK,QADd,EAEGC,MAFH,CAEUC,OAFV,EAGGH,IAHH,CAGQ,IAHR,CAGc;AACxB;AACA,UACYZ,qBAAqB,IACpB,SAAQP,SAAU;AAC/B,cAAcO,qBAAsB;AACpC,UACS;AACT;AACA;AACA,UACYJ,sBAAsB,IACrB,SAAQH,SAAU;AAC/B,kBAAkBG,sBAAuB;AACzC,wBAAwBH,SAAU;AAClC,uBAAuBA,SAAU;AACjC,UACS;AACT;AACA;AACA,UACYK,cAAc,IACb,QAAOL,SAAU;AAC9B,cAAcK,cAAe;AAC7B,UACS;AACT;AACA,eAAeL,SAAU;AACzB,oBAAoBA,SAAU;AAC9B;AACA;AACA;AACA,eAAeA,SAAU;AACzB,qBAAqBA,SAAU;AAC/B;AACA;AACA;AACA;AACA;AACA,iBAAiBH,QAAS,WAAUG,SAAU,oBAAmBA,SAAU;AAC3E;AACA,kBAAkB,IAAAuB,sCAAA,EAAmB1B,QAAnB,CAA6B;AAC/C,yBAAyBG,SAAU;AACnC,yBAAyBA,SAAU;AACnC;AACA;AACA,iBAAiBA,SAAU;AAC3B;AACA,KAhEI;AAiEH,CAtGM"}

package/graphql/schema/schemaPlugins.d.ts

@@ -1,3 +1,3 @@
-import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
 import { CmsContext } from "../../types";
-export declare const generateSchemaPlugins: (context: CmsContext) => Promise<GraphQLSchemaPlugin<CmsContext>[]>;
+import { CmsGraphQLSchemaPlugin } from "../../plugins";
+export declare const generateSchemaPlugins: (context: CmsContext) => Promise<CmsGraphQLSchemaPlugin[]>;

package/graphql/schema/schemaPlugins.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.generateSchemaPlugins = void 0;
 
-var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
-
 var _createManageSDL = require("./createManageSDL");
 
 var _createReadSDL = require("./createReadSDL");
@@ -21,6 +19,8 @@ var _getSchemaFromFieldPlugins = require("../../utils/getSchemaFromFieldPlugins"
 
 var _filterModelFields = require("../../utils/filterModelFields");
 
+var _plugins = require("../../plugins");
+
 const generateSchemaPlugins = async context => {
   const {
     plugins,
@@ -43,7 +43,8 @@ const generateSchemaPlugins = async context => {
   const fieldTypePlugins = plugins.byType("cms-model-field-to-graphql").reduce((acc, pl) => {
     acc[pl.fieldType] = pl;
     return acc;
-  }, {}); // Load model data
+  }, {});
+  const sorterPlugins = plugins.byType(_plugins.CmsGraphQLSchemaSorterPlugin.type); // Load model data
 
   context.security.disableAuthorization();
   const initialModels = (await cms.listModels()).filter(model => model.isPrivate !== true);
@@ -60,16 +61,17 @@ const generateSchemaPlugins = async context => {
   const newPlugins = [];
 
   for (const schema of schemas) {
-    newPlugins.push(new _GraphQLSchemaPlugin.GraphQLSchemaPlugin(schema));
+    newPlugins.push(new _plugins.CmsGraphQLSchemaPlugin(schema));
   }
 
   models.filter(model => model.fields.length > 0).forEach(model => {
     switch (type) {
       case "manage":
-        newPlugins.push(new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
+        newPlugins.push(new _plugins.CmsGraphQLSchemaPlugin({
           typeDefs: (0, _createManageSDL.createManageSDL)({
             model,
-            fieldTypePlugins
+            fieldTypePlugins,
+            sorterPlugins
           }),
           resolvers: (0, _createManageResolvers.createManageResolvers)({
             models,
@@ -82,10 +84,11 @@ const generateSchemaPlugins = async context => {
 
       case "preview":
       case "read":
-        newPlugins.push(new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
+        newPlugins.push(new _plugins.CmsGraphQLSchemaPlugin({
           typeDefs: (0, _createReadSDL.createReadSDL)({
             model,
-            fieldTypePlugins
+            fieldTypePlugins,
+            sorterPlugins
           }),
           resolvers: cms.READ ? (0, _createReadResolvers.createReadResolvers)({
             models,

package/graphql/schema/schemaPlugins.js.map

@@ -1 +1 @@
-{"version":3,"names":["generateSchemaPlugins","context","plugins","cms","type","fieldTypePlugins","byType","reduce","acc","pl","fieldType","security","disableAuthorization","initialModels","listModels","filter","model","isPrivate","enableAuthorization","models","filterModelsDeletedFields","schemas","getSchemaFromFieldPlugins","newPlugins","schema","push","GraphQLSchemaPlugin","fields","length","forEach","typeDefs","createManageSDL","resolvers","createManageResolvers","createReadSDL","READ","createReadResolvers","createPreviewResolvers"],"sources":["schemaPlugins.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { CmsModelFieldToGraphQLPlugin, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { createManageSDL } from \"./createManageSDL\";\nimport { createReadSDL } from \"./createReadSDL\";\nimport { createManageResolvers } from \"./createManageResolvers\";\nimport { createReadResolvers } from \"./createReadResolvers\";\nimport { createPreviewResolvers } from \"./createPreviewResolvers\";\nimport { getSchemaFromFieldPlugins } from \"~/utils/getSchemaFromFieldPlugins\";\nimport { filterModelsDeletedFields } from \"~/utils/filterModelFields\";\n\nexport const generateSchemaPlugins = async (\n    context: CmsContext\n): Promise<GraphQLSchemaPlugin<CmsContext>[]> => {\n    const { plugins, cms } = context;\n\n    /**\n     * If type does not exist, we are not generating schema plugins for models.\n     * It should not come to this point, but we check it anyways.\n     */\n    const { type } = cms;\n    if (!type) {\n        return [];\n    }\n\n    // Structure plugins for faster access\n    const fieldTypePlugins: CmsFieldTypePlugins = plugins\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce((acc, pl) => {\n            acc[pl.fieldType] = pl;\n            return acc;\n        }, {} as Record<string, CmsModelFieldToGraphQLPlugin>);\n\n    // Load model data\n    context.security.disableAuthorization();\n    const initialModels = (await cms.listModels()).filter(model => model.isPrivate !== true);\n    context.security.enableAuthorization();\n\n    const models = filterModelsDeletedFields({\n        models: initialModels,\n        type\n    });\n\n    const schemas = getSchemaFromFieldPlugins({\n        models,\n        fieldTypePlugins,\n        type\n    });\n\n    const newPlugins: GraphQLSchemaPlugin<CmsContext>[] = [];\n    for (const schema of schemas) {\n        newPlugins.push(new GraphQLSchemaPlugin(schema));\n    }\n\n    models\n        .filter(model => model.fields.length > 0)\n        .forEach(model => {\n            switch (type) {\n                case \"manage\":\n                    newPlugins.push(\n                        new GraphQLSchemaPlugin({\n                            typeDefs: createManageSDL({ model, fieldTypePlugins }),\n                            resolvers: createManageResolvers({\n                                models,\n                                model,\n                                fieldTypePlugins,\n                                context\n                            })\n                        })\n                    );\n\n                    break;\n                case \"preview\":\n                case \"read\":\n                    newPlugins.push(\n                        new GraphQLSchemaPlugin({\n                            typeDefs: createReadSDL({ model, fieldTypePlugins }),\n                            resolvers: cms.READ\n                                ? createReadResolvers({\n                                      models,\n                                      model,\n                                      fieldTypePlugins,\n                                      context\n                                  })\n                                : createPreviewResolvers({\n                                      models,\n                                      model,\n                                      fieldTypePlugins,\n                                      context\n                                  })\n                        })\n                    );\n                    break;\n                default:\n                    return;\n            }\n        });\n\n    return newPlugins.filter(pl => !!pl.schema.typeDefs);\n};\n"],"mappings":";;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEO,MAAMA,qBAAqB,GAAG,MACjCC,OADiC,IAEY;EAC7C,MAAM;IAAEC,OAAF;IAAWC;EAAX,IAAmBF,OAAzB;EAEA;AACJ;AACA;AACA;;EACI,MAAM;IAAEG;EAAF,IAAWD,GAAjB;;EACA,IAAI,CAACC,IAAL,EAAW;IACP,OAAO,EAAP;EACH,CAV4C,CAY7C;;;EACA,MAAMC,gBAAqC,GAAGH,OAAO,CAChDI,MADyC,CACJ,4BADI,EAEzCC,MAFyC,CAElC,CAACC,GAAD,EAAMC,EAAN,KAAa;IACjBD,GAAG,CAACC,EAAE,CAACC,SAAJ,CAAH,GAAoBD,EAApB;IACA,OAAOD,GAAP;EACH,CALyC,EAKvC,EALuC,CAA9C,CAb6C,CAoB7C;;EACAP,OAAO,CAACU,QAAR,CAAiBC,oBAAjB;EACA,MAAMC,aAAa,GAAG,CAAC,MAAMV,GAAG,CAACW,UAAJ,EAAP,EAAyBC,MAAzB,CAAgCC,KAAK,IAAIA,KAAK,CAACC,SAAN,KAAoB,IAA7D,CAAtB;EACAhB,OAAO,CAACU,QAAR,CAAiBO,mBAAjB;EAEA,MAAMC,MAAM,GAAG,IAAAC,4CAAA,EAA0B;IACrCD,MAAM,EAAEN,aAD6B;IAErCT;EAFqC,CAA1B,CAAf;EAKA,MAAMiB,OAAO,GAAG,IAAAC,oDAAA,EAA0B;IACtCH,MADsC;IAEtCd,gBAFsC;IAGtCD;EAHsC,CAA1B,CAAhB;EAMA,MAAMmB,UAA6C,GAAG,EAAtD;;EACA,KAAK,MAAMC,MAAX,IAAqBH,OAArB,EAA8B;IAC1BE,UAAU,CAACE,IAAX,CAAgB,IAAIC,wCAAJ,CAAwBF,MAAxB,CAAhB;EACH;;EAEDL,MAAM,CACDJ,MADL,CACYC,KAAK,IAAIA,KAAK,CAACW,MAAN,CAAaC,MAAb,GAAsB,CAD3C,EAEKC,OAFL,CAEab,KAAK,IAAI;IACd,QAAQZ,IAAR;MACI,KAAK,QAAL;QACImB,UAAU,CAACE,IAAX,CACI,IAAIC,wCAAJ,CAAwB;UACpBI,QAAQ,EAAE,IAAAC,gCAAA,EAAgB;YAAEf,KAAF;YAASX;UAAT,CAAhB,CADU;UAEpB2B,SAAS,EAAE,IAAAC,4CAAA,EAAsB;YAC7Bd,MAD6B;YAE7BH,KAF6B;YAG7BX,gBAH6B;YAI7BJ;UAJ6B,CAAtB;QAFS,CAAxB,CADJ;QAYA;;MACJ,KAAK,SAAL;MACA,KAAK,MAAL;QACIsB,UAAU,CAACE,IAAX,CACI,IAAIC,wCAAJ,CAAwB;UACpBI,QAAQ,EAAE,IAAAI,4BAAA,EAAc;YAAElB,KAAF;YAASX;UAAT,CAAd,CADU;UAEpB2B,SAAS,EAAE7B,GAAG,CAACgC,IAAJ,GACL,IAAAC,wCAAA,EAAoB;YAChBjB,MADgB;YAEhBH,KAFgB;YAGhBX,gBAHgB;YAIhBJ;UAJgB,CAApB,CADK,GAOL,IAAAoC,8CAAA,EAAuB;YACnBlB,MADmB;YAEnBH,KAFmB;YAGnBX,gBAHmB;YAInBJ;UAJmB,CAAvB;QATc,CAAxB,CADJ;QAkBA;;MACJ;QACI;IArCR;EAuCH,CA1CL;EA4CA,OAAOsB,UAAU,CAACR,MAAX,CAAkBN,EAAE,IAAI,CAAC,CAACA,EAAE,CAACe,MAAH,CAAUM,QAApC,CAAP;AACH,CAxFM"}
+{"version":3,"names":["generateSchemaPlugins","context","plugins","cms","type","fieldTypePlugins","byType","reduce","acc","pl","fieldType","sorterPlugins","CmsGraphQLSchemaSorterPlugin","security","disableAuthorization","initialModels","listModels","filter","model","isPrivate","enableAuthorization","models","filterModelsDeletedFields","schemas","getSchemaFromFieldPlugins","newPlugins","schema","push","CmsGraphQLSchemaPlugin","fields","length","forEach","typeDefs","createManageSDL","resolvers","createManageResolvers","createReadSDL","READ","createReadResolvers","createPreviewResolvers"],"sources":["schemaPlugins.ts"],"sourcesContent":["import { CmsModelFieldToGraphQLPlugin, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { createManageSDL } from \"./createManageSDL\";\nimport { createReadSDL } from \"./createReadSDL\";\nimport { createManageResolvers } from \"./createManageResolvers\";\nimport { createReadResolvers } from \"./createReadResolvers\";\nimport { createPreviewResolvers } from \"./createPreviewResolvers\";\nimport { getSchemaFromFieldPlugins } from \"~/utils/getSchemaFromFieldPlugins\";\nimport { filterModelsDeletedFields } from \"~/utils/filterModelFields\";\nimport { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\nexport const generateSchemaPlugins = async (\n    context: CmsContext\n): Promise<CmsGraphQLSchemaPlugin[]> => {\n    const { plugins, cms } = context;\n\n    /**\n     * If type does not exist, we are not generating schema plugins for models.\n     * It should not come to this point, but we check it anyways.\n     */\n    const { type } = cms;\n    if (!type) {\n        return [];\n    }\n\n    // Structure plugins for faster access\n    const fieldTypePlugins = plugins\n        .byType<CmsModelFieldToGraphQLPlugin>(\"cms-model-field-to-graphql\")\n        .reduce<CmsFieldTypePlugins>((acc, pl) => {\n            acc[pl.fieldType] = pl;\n            return acc;\n        }, {});\n\n    const sorterPlugins = plugins.byType<CmsGraphQLSchemaSorterPlugin>(\n        CmsGraphQLSchemaSorterPlugin.type\n    );\n\n    // Load model data\n    context.security.disableAuthorization();\n    const initialModels = (await cms.listModels()).filter(model => model.isPrivate !== true);\n    context.security.enableAuthorization();\n\n    const models = filterModelsDeletedFields({\n        models: initialModels,\n        type\n    });\n\n    const schemas = getSchemaFromFieldPlugins({\n        models,\n        fieldTypePlugins,\n        type\n    });\n\n    const newPlugins: CmsGraphQLSchemaPlugin[] = [];\n    for (const schema of schemas) {\n        newPlugins.push(new CmsGraphQLSchemaPlugin(schema));\n    }\n\n    models\n        .filter(model => model.fields.length > 0)\n        .forEach(model => {\n            switch (type) {\n                case \"manage\":\n                    newPlugins.push(\n                        new CmsGraphQLSchemaPlugin({\n                            typeDefs: createManageSDL({ model, fieldTypePlugins, sorterPlugins }),\n                            resolvers: createManageResolvers({\n                                models,\n                                model,\n                                fieldTypePlugins,\n                                context\n                            })\n                        })\n                    );\n\n                    break;\n                case \"preview\":\n                case \"read\":\n                    newPlugins.push(\n                        new CmsGraphQLSchemaPlugin({\n                            typeDefs: createReadSDL({ model, fieldTypePlugins, sorterPlugins }),\n                            resolvers: cms.READ\n                                ? createReadResolvers({\n                                      models,\n                                      model,\n                                      fieldTypePlugins,\n                                      context\n                                  })\n                                : createPreviewResolvers({\n                                      models,\n                                      model,\n                                      fieldTypePlugins,\n                                      context\n                                  })\n                        })\n                    );\n                    break;\n                default:\n                    return;\n            }\n        });\n\n    return newPlugins.filter(pl => !!pl.schema.typeDefs);\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAGO,MAAMA,qBAAqB,GAAG,MACjCC,OADiC,IAEG;EACpC,MAAM;IAAEC,OAAF;IAAWC;EAAX,IAAmBF,OAAzB;EAEA;AACJ;AACA;AACA;;EACI,MAAM;IAAEG;EAAF,IAAWD,GAAjB;;EACA,IAAI,CAACC,IAAL,EAAW;IACP,OAAO,EAAP;EACH,CAVmC,CAYpC;;;EACA,MAAMC,gBAAgB,GAAGH,OAAO,CAC3BI,MADoB,CACiB,4BADjB,EAEpBC,MAFoB,CAEQ,CAACC,GAAD,EAAMC,EAAN,KAAa;IACtCD,GAAG,CAACC,EAAE,CAACC,SAAJ,CAAH,GAAoBD,EAApB;IACA,OAAOD,GAAP;EACH,CALoB,EAKlB,EALkB,CAAzB;EAOA,MAAMG,aAAa,GAAGT,OAAO,CAACI,MAAR,CAClBM,qCAAA,CAA6BR,IADX,CAAtB,CApBoC,CAwBpC;;EACAH,OAAO,CAACY,QAAR,CAAiBC,oBAAjB;EACA,MAAMC,aAAa,GAAG,CAAC,MAAMZ,GAAG,CAACa,UAAJ,EAAP,EAAyBC,MAAzB,CAAgCC,KAAK,IAAIA,KAAK,CAACC,SAAN,KAAoB,IAA7D,CAAtB;EACAlB,OAAO,CAACY,QAAR,CAAiBO,mBAAjB;EAEA,MAAMC,MAAM,GAAG,IAAAC,4CAAA,EAA0B;IACrCD,MAAM,EAAEN,aAD6B;IAErCX;EAFqC,CAA1B,CAAf;EAKA,MAAMmB,OAAO,GAAG,IAAAC,oDAAA,EAA0B;IACtCH,MADsC;IAEtChB,gBAFsC;IAGtCD;EAHsC,CAA1B,CAAhB;EAMA,MAAMqB,UAAoC,GAAG,EAA7C;;EACA,KAAK,MAAMC,MAAX,IAAqBH,OAArB,EAA8B;IAC1BE,UAAU,CAACE,IAAX,CAAgB,IAAIC,+BAAJ,CAA2BF,MAA3B,CAAhB;EACH;;EAEDL,MAAM,CACDJ,MADL,CACYC,KAAK,IAAIA,KAAK,CAACW,MAAN,CAAaC,MAAb,GAAsB,CAD3C,EAEKC,OAFL,CAEab,KAAK,IAAI;IACd,QAAQd,IAAR;MACI,KAAK,QAAL;QACIqB,UAAU,CAACE,IAAX,CACI,IAAIC,+BAAJ,CAA2B;UACvBI,QAAQ,EAAE,IAAAC,gCAAA,EAAgB;YAAEf,KAAF;YAASb,gBAAT;YAA2BM;UAA3B,CAAhB,CADa;UAEvBuB,SAAS,EAAE,IAAAC,4CAAA,EAAsB;YAC7Bd,MAD6B;YAE7BH,KAF6B;YAG7Bb,gBAH6B;YAI7BJ;UAJ6B,CAAtB;QAFY,CAA3B,CADJ;QAYA;;MACJ,KAAK,SAAL;MACA,KAAK,MAAL;QACIwB,UAAU,CAACE,IAAX,CACI,IAAIC,+BAAJ,CAA2B;UACvBI,QAAQ,EAAE,IAAAI,4BAAA,EAAc;YAAElB,KAAF;YAASb,gBAAT;YAA2BM;UAA3B,CAAd,CADa;UAEvBuB,SAAS,EAAE/B,GAAG,CAACkC,IAAJ,GACL,IAAAC,wCAAA,EAAoB;YAChBjB,MADgB;YAEhBH,KAFgB;YAGhBb,gBAHgB;YAIhBJ;UAJgB,CAApB,CADK,GAOL,IAAAsC,8CAAA,EAAuB;YACnBlB,MADmB;YAEnBH,KAFmB;YAGnBb,gBAHmB;YAInBJ;UAJmB,CAAvB;QATiB,CAA3B,CADJ;QAkBA;;MACJ;QACI;IArCR;EAuCH,CA1CL;EA4CA,OAAOwB,UAAU,CAACR,MAAX,CAAkBR,EAAE,IAAI,CAAC,CAACA,EAAE,CAACiB,MAAH,CAAUM,QAApC,CAAP;AACH,CA5FM"}

package/graphql/system.js

@@ -11,95 +11,92 @@ var _api = require("@webiny/api");
 
 const emptyResolver = () => ({});
 
-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);
+const plugin = new _handlerGraphql.GraphQLSchemaPlugin({
+  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);
+        }
+      }
+    },
+    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);
         }
       },
-      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);
-          }
-        },
-        upgrade: async (_, args, {
-          cms
-        }) => {
-          const {
-            version
-          } = args;
-
-          try {
-            await cms.upgradeSystem(version);
-            return new _handlerGraphql.Response(true);
-          } catch (e) {
-            return new _handlerGraphql.ErrorResponse(e);
-          }
+      upgrade: async (_, args, {
+        cms
+      }) => {
+        const {
+          version
+        } = args;
+
+        try {
+          await cms.upgradeSystem(version);
+          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.
  */

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","upgrade","args","upgradeSystem","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            # 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});\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,EAAP,CAAtB;;AAEA,MAAMC,MAAM,GAAG,IAAIC,mCAAJ,CAAwB;EACnCC,QAAQ;EAAE;EAAe;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;AACA;AACA;AACA,KA7BuC;EA8BnCC,SAAS,EAAE;IACPC,KAAK,EAAE;MACHC,GAAG,EAAEN;IADF,CADA;IAIPO,QAAQ,EAAE;MACND,GAAG,EAAEN;IADC,CAJH;IAOPQ,QAAQ,EAAE;MACNC,OAAO,EAAE,OAAOC,CAAP,EAAeC,EAAf,EAAwBC,OAAxB,KAAgD;QACrD,IAAI;UACA,OAAOA,OAAO,CAACN,GAAR,CAAYO,gBAAZ,EAAP;QACH,CAFD,CAEE,OAAOC,CAAP,EAAU;UACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;QACH;MACJ;IAPK,CAPH;IAgBPE,WAAW,EAAE;MACTC,OAAO,EAAE,OAAOP,CAAP,EAAeC,EAAf,EAAwB;QAAEL;MAAF,CAAxB,KAAgD;QACrD,IAAI;UACA,MAAMG,OAAO,GAAG,MAAMH,GAAG,CAACO,gBAAJ,EAAtB;;UACA,IAAIJ,OAAJ,EAAa;YACT,OAAO,IAAIM,6BAAJ,CAAkB;cACrBG,IAAI,EAAE,wBADe;cAErBC,OAAO,EAAE;YAFY,CAAlB,CAAP;UAIH;;UAED,MAAMb,GAAG,CAACc,aAAJ,EAAN;UACA,OAAO,IAAIC,wBAAJ,CAAa,IAAb,CAAP;QACH,CAXD,CAWE,OAAOP,CAAP,EAAU;UACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;QACH;MACJ,CAhBQ;MAiBTQ,OAAO,EAAE,OAAOZ,CAAP,EAAea,IAAf,EAA0B;QAAEjB;MAAF,CAA1B,KAAkD;QACvD,MAAM;UAAEG;QAAF,IAAcc,IAApB;;QACA,IAAI;UACA,MAAMjB,GAAG,CAACkB,aAAJ,CAAkBf,OAAlB,CAAN;UACA,OAAO,IAAIY,wBAAJ,CAAa,IAAb,CAAP;QACH,CAHD,CAGE,OAAOP,CAAP,EAAU;UACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;QACH;MACJ;IAzBQ;EAhBN;AA9BwB,CAAxB,CAAf;AA2EAb,MAAM,CAACwB,IAAP,GAAc,2BAAd;AACA;AACA;AACA;;AACO,MAAMC,wBAAwB,GAAG,MAAiC;EACrE,OAAO,IAAIC,kBAAJ,CAA8B,MAAMf,OAAN,IAAiB;IAAA;;IAClD,oBAAIA,OAAO,CAACN,GAAZ,yCAAI,aAAasB,IAAjB,EAAuB;MACnB;IACH;;IACDhB,OAAO,CAACiB,OAAR,CAAgBC,QAAhB,CAAyB7B,MAAzB;EACH,CALM,CAAP;AAMH,CAPM"}

package/graphqlFields/dynamicZone/dynamicZoneField.d.ts

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