@webiny/api-headless-cms 0.0.0-unstable.6e5425ee89 → 0.0.0-unstable.7f63ea0744

package/graphql/schema/contentModels.js

@@ -1,13 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createModelsSchema = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _handlerGraphql = require("@webiny/handler-graphql");
-var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
 var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
-const createModelsSchema = context => {
+var _plugins = require("../../plugins");
+var _toSlug = require("../../utils/toSlug");
+const createModelsSchema = ({
+  context
+}) => {
   const resolvers = {
     Query: {
       getContentModel: async (_, args, context) => {
@@ -32,7 +37,27 @@ const createModelsSchema = context => {
         }
       }
     },
+    CmsContentModelField: {
+      tags(field) {
+        // Make sure `tags` are always returned as an array.
+        return Array.isArray(field.tags) ? field.tags : [];
+      }
+    },
     CmsContentModel: {
+      group: async model => {
+        context.security.disableAuthorization();
+        const groups = await context.cms.listGroups();
+        context.security.enableAuthorization();
+        const group = groups.find(group => group.id === model.group.id);
+        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, model.group), {}, {
+          slug: (0, _toSlug.toSlug)(model.group.name)
+        }, group || {});
+      },
+      tags(model) {
+        // Make sure `tags` always contain a `type` tag, to differentiate between models.
+        const hasType = (model.tags || []).find(tag => tag.startsWith("type:"));
+        return hasType ? model.tags : ["type:model", ...(model.tags || [])];
+      },
       plugin: async (model, _, context) => {
         return context.plugins.byType(_CmsModelPlugin.CmsModelPlugin.type).some(item => item.contentModel.modelId === model.modelId);
       }
@@ -82,10 +107,11 @@ const createModelsSchema = context => {
       },
       initializeModel: async (_, args, context) => {
         const {
-          modelId
+          modelId,
+          data
         } = args;
         try {
-          const result = await context.cms.initializeModel(modelId);
+          const result = await context.cms.initializeModel(modelId, data || {});
           return new _handlerGraphql.Response(result);
         } catch (e) {
           return new _handlerGraphql.ErrorResponse(e);
@@ -123,6 +149,7 @@ const createModelsSchema = context => {
                 storageId: String
                 fieldId: String!
                 type: String!
+                tags: [String!]
                 multipleValues: Boolean
                 predefinedValues: CmsPredefinedValuesInput
                 renderer: CmsFieldRendererInput
@@ -139,6 +166,7 @@ const createModelsSchema = context => {
                 layout: [[ID!]!]
                 fields: [CmsContentModelFieldInput!]
                 titleFieldId: String
+                tags: [String!]
             }
 
             input CmsContentModelCreateFromInput {
@@ -156,6 +184,7 @@ const createModelsSchema = context => {
                 layout: [[ID!]!]!
                 fields: [CmsContentModelFieldInput!]!
                 titleFieldId: String
+                tags: [String!]
             }
 
             type InitializeModelResponse {
@@ -178,11 +207,12 @@ const createModelsSchema = context => {
 
                 deleteContentModel(modelId: ID!): CmsDeleteResponse
 
-                initializeModel(modelId: ID!): InitializeModelResponse!
+                # users can send anything into the data variable
+                initializeModel(modelId: ID!, data: JSON): InitializeModelResponse!
             }
         `;
   }
-  return new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
+  const plugin = new _plugins.CmsGraphQLSchemaPlugin({
     typeDefs: /* GraphQL */`
             type CmsFieldValidation {
                 name: String!
@@ -215,6 +245,7 @@ const createModelsSchema = context => {
                 helpText: String
                 placeholderText: String
                 type: String!
+                tags: [String!]!
                 multipleValues: Boolean
                 predefinedValues: CmsPredefinedValues
                 renderer: CmsFieldRenderer
@@ -235,7 +266,7 @@ const createModelsSchema = context => {
                 lockedFields: [JSON]
                 layout: [[String!]!]!
                 titleFieldId: String
-
+                tags: [String!]!
                 # Returns true if the content model is registered via a plugin.
                 plugin: Boolean!
             }
@@ -261,5 +292,7 @@ const createModelsSchema = context => {
         `,
     resolvers
   });
+  plugin.name = `headless-cms.graphql.schema.${context.cms.type}.content-models`;
+  return plugin;
 };
 exports.createModelsSchema = createModelsSchema;

package/graphql/schema/contentModels.js.map

@@ -1 +1 @@
-{"version":3,"names":["createModelsSchema","context","resolvers","Query","getContentModel","_","args","model","cms","getModel","modelId","isPrivate","NotFoundError","Response","e","ErrorResponse","listContentModels","__","models","listModels","filter","CmsContentModel","plugin","plugins","byType","CmsModelPlugin","type","some","item","contentModel","manageSchema","MANAGE","createContentModel","createModel","data","createContentModelFrom","createModelFrom","updateContentModel","updateModel","deleteContentModel","deleteModel","initializeModel","result","GraphQLSchemaPlugin","typeDefs"],"sources":["contentModels.ts"],"sourcesContent":["import { ErrorResponse, NotFoundError, Response } from \"@webiny/handler-graphql\";\nimport { CmsContext } from \"~/types\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { Resolvers } from \"@webiny/handler-graphql/types\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\n\nexport const createModelsSchema = (context: CmsContext): GraphQLSchemaPlugin<CmsContext> => {\n    const resolvers: Resolvers<CmsContext> = {\n        Query: {\n            getContentModel: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.getModel(args.modelId);\n                    if (model?.isPrivate === true) {\n                        if (!model) {\n                            throw new NotFoundError(\n                                `Content model \"${args.modelId}\" was not found!`\n                            );\n                        }\n                    }\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            listContentModels: async (_: unknown, __: unknown, context: CmsContext) => {\n                try {\n                    const models = await context.cms.listModels();\n                    return new Response(models.filter(model => model.isPrivate !== true));\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        CmsContentModel: {\n            plugin: async (model, _, context): Promise<boolean> => {\n                return context.plugins\n                    .byType<CmsModelPlugin>(CmsModelPlugin.type)\n                    .some(item => item.contentModel.modelId === model.modelId);\n            }\n        }\n    };\n\n    let manageSchema = \"\";\n    if (context.cms.MANAGE) {\n        resolvers[\"Mutation\"] = {\n            createContentModel: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.createModel(args.data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            createContentModelFrom: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.createModelFrom(args.modelId, args.data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            updateContentModel: async (_: unknown, args: any, context) => {\n                const { modelId, data } = args;\n                try {\n                    const model = await context.cms.updateModel(modelId, data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            deleteContentModel: async (_: unknown, args: any, context) => {\n                const { modelId } = args;\n                try {\n                    await context.cms.deleteModel(modelId);\n                    return new Response(true);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            initializeModel: async (_, args, context) => {\n                const { modelId } = args;\n\n                try {\n                    const result = await context.cms.initializeModel(modelId);\n                    return new Response(result);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        };\n\n        manageSchema = /* GraphQL */ `\n            input CmsPredefinedValueInput {\n                label: String!\n                value: String!\n                selected: Boolean\n            }\n\n            input CmsPredefinedValuesInput {\n                enabled: Boolean\n                values: [CmsPredefinedValueInput]\n            }\n            input CmsFieldRendererInput {\n                name: String\n            }\n\n            input CmsFieldValidationInput {\n                name: String!\n                message: String\n                settings: JSON\n            }\n\n            input CmsContentModelFieldInput {\n                id: ID!\n                label: String!\n                helpText: String\n                placeholderText: String\n                # we never use user input - this is here to the GraphQL does not break when posting from our UI\n                # used for debugging purposes\n                storageId: String\n                fieldId: String!\n                type: String!\n                multipleValues: Boolean\n                predefinedValues: CmsPredefinedValuesInput\n                renderer: CmsFieldRendererInput\n                validation: [CmsFieldValidationInput]\n                listValidation: [CmsFieldValidationInput]\n                settings: JSON\n            }\n\n            input CmsContentModelCreateInput {\n                name: String!\n                modelId: String\n                group: RefInput!\n                description: String\n                layout: [[ID!]!]\n                fields: [CmsContentModelFieldInput!]\n                titleFieldId: String\n            }\n\n            input CmsContentModelCreateFromInput {\n                name: String!\n                modelId: String\n                group: RefInput!\n                description: String\n                locale: String\n            }\n\n            input CmsContentModelUpdateInput {\n                name: String\n                group: RefInput\n                description: String\n                layout: [[ID!]!]!\n                fields: [CmsContentModelFieldInput!]!\n                titleFieldId: String\n            }\n\n            type InitializeModelResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            extend type Mutation {\n                createContentModel(data: CmsContentModelCreateInput!): CmsContentModelResponse\n\n                createContentModelFrom(\n                    modelId: ID!\n                    data: CmsContentModelCreateFromInput!\n                ): CmsContentModelResponse\n\n                updateContentModel(\n                    modelId: ID!\n                    data: CmsContentModelUpdateInput!\n                ): CmsContentModelResponse\n\n                deleteContentModel(modelId: ID!): CmsDeleteResponse\n\n                initializeModel(modelId: ID!): InitializeModelResponse!\n            }\n        `;\n    }\n\n    return new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: /* GraphQL */ `\n            type CmsFieldValidation {\n                name: String!\n                message: String\n                settings: JSON\n            }\n\n            type CmsFieldRenderer {\n                name: String\n            }\n\n            type CmsPredefinedValue {\n                label: String\n                value: String\n                selected: Boolean\n            }\n\n            type CmsPredefinedValues {\n                enabled: Boolean\n                values: [CmsPredefinedValue]\n            }\n\n            type CmsContentModelField {\n                id: ID!\n                # auto-generated value\n                # used for debugging purposes\n                storageId: String\n                fieldId: String!\n                label: String!\n                helpText: String\n                placeholderText: String\n                type: String!\n                multipleValues: Boolean\n                predefinedValues: CmsPredefinedValues\n                renderer: CmsFieldRenderer\n                validation: [CmsFieldValidation!]\n                listValidation: [CmsFieldValidation!]\n                settings: JSON\n            }\n\n            type CmsContentModel {\n                name: String!\n                modelId: String!\n                description: String\n                group: CmsContentModelGroup!\n                createdOn: DateTime\n                savedOn: DateTime\n                createdBy: CmsCreatedBy\n                fields: [CmsContentModelField!]!\n                lockedFields: [JSON]\n                layout: [[String!]!]!\n                titleFieldId: String\n\n                # Returns true if the content model is registered via a plugin.\n                plugin: Boolean!\n            }\n\n            type CmsContentModelResponse {\n                data: CmsContentModel\n                error: CmsError\n            }\n\n            type CmsContentModelListResponse {\n                data: [CmsContentModel]\n                meta: CmsListMeta\n                error: CmsError\n            }\n\n            extend type Query {\n                getContentModel(modelId: ID!, where: JSON, sort: String): CmsContentModelResponse\n\n                listContentModels: CmsContentModelListResponse\n            }\n\n            ${manageSchema}\n        `,\n        resolvers\n    });\n};\n"],"mappings":"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ACJ,CAAC;MACD2B,eAAe,EAAE,OAAOpC,CAAC,EAAEC,IAAI,EAAEL,OAAO,KAAK;QACzC,MAAM;UAAES;QAAQ,CAAC,GAAGJ,IAAI;QAExB,IAAI;UACA,MAAMoC,MAAM,GAAG,MAAMzC,OAAO,CAACO,GAAG,CAACiC,eAAe,CAAC/B,OAAO,CAAC;UACzD,OAAO,IAAIG,wBAAQ,CAAC6B,MAAM,CAAC;QAC/B,CAAC,CAAC,OAAO5B,CAAC,EAAE;UACR,OAAO,IAAIC,6BAAa,CAACD,CAAC,CAAC;QAC/B;MACJ;IACJ,CAAC;IAEDgB,YAAY,GAAG,aAAe;AACtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;EACL;EAEA,OAAO,IAAIa,wCAAmB,CAAa;IACvCC,QAAQ,EAAE,aAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcd,YAAa;AAC3B,SAAS;IACD5B;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}
+{"version":3,"names":["createModelsSchema","context","resolvers","Query","getContentModel","_","args","model","cms","getModel","modelId","isPrivate","NotFoundError","Response","e","ErrorResponse","listContentModels","__","models","listModels","filter","CmsContentModelField","tags","field","Array","isArray","CmsContentModel","group","security","disableAuthorization","groups","listGroups","enableAuthorization","find","id","slug","toSlug","name","hasType","tag","startsWith","plugin","plugins","byType","CmsModelPlugin","type","some","item","contentModel","manageSchema","MANAGE","createContentModel","createModel","data","createContentModelFrom","createModelFrom","updateContentModel","updateModel","deleteContentModel","deleteModel","initializeModel","result","CmsGraphQLSchemaPlugin","typeDefs"],"sources":["contentModels.ts"],"sourcesContent":["import { ErrorResponse, NotFoundError, Response } from \"@webiny/handler-graphql\";\nimport { CmsContext, CmsModel } from \"~/types\";\nimport { Resolvers } from \"@webiny/handler-graphql/types\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { toSlug } from \"~/utils/toSlug\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createModelsSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const resolvers: Resolvers<CmsContext> = {\n        Query: {\n            getContentModel: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.getModel(args.modelId);\n                    if (model?.isPrivate === true) {\n                        if (!model) {\n                            throw new NotFoundError(\n                                `Content model \"${args.modelId}\" was not found!`\n                            );\n                        }\n                    }\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            listContentModels: async (_: unknown, __: unknown, context: CmsContext) => {\n                try {\n                    const models = await context.cms.listModels();\n                    return new Response(models.filter(model => model.isPrivate !== true));\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        CmsContentModelField: {\n            tags(field) {\n                // Make sure `tags` are always returned as an array.\n                return Array.isArray(field.tags) ? field.tags : [];\n            }\n        },\n        CmsContentModel: {\n            group: async (model: CmsModel) => {\n                context.security.disableAuthorization();\n                const groups = await context.cms.listGroups();\n                context.security.enableAuthorization();\n\n                const group = groups.find(group => group.id === model.group.id);\n                return {\n                    ...model.group,\n                    slug: toSlug(model.group.name),\n                    ...(group || {})\n                };\n            },\n            tags(model: CmsModel) {\n                // Make sure `tags` always contain a `type` tag, to differentiate between models.\n                const hasType = (model.tags || []).find(tag => tag.startsWith(\"type:\"));\n\n                return hasType ? model.tags : [\"type:model\", ...(model.tags || [])];\n            },\n            plugin: async (model, _, context): Promise<boolean> => {\n                return context.plugins\n                    .byType<CmsModelPlugin>(CmsModelPlugin.type)\n                    .some(item => item.contentModel.modelId === model.modelId);\n            }\n        }\n    };\n\n    let manageSchema = \"\";\n    if (context.cms.MANAGE) {\n        resolvers[\"Mutation\"] = {\n            createContentModel: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.createModel(args.data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            createContentModelFrom: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.createModelFrom(args.modelId, args.data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            updateContentModel: async (_: unknown, args: any, context) => {\n                const { modelId, data } = args;\n                try {\n                    const model = await context.cms.updateModel(modelId, data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            deleteContentModel: async (_: unknown, args: any, context) => {\n                const { modelId } = args;\n                try {\n                    await context.cms.deleteModel(modelId);\n                    return new Response(true);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            initializeModel: async (_, args, context) => {\n                const { modelId, data } = args;\n\n                try {\n                    const result = await context.cms.initializeModel(modelId, data || {});\n                    return new Response(result);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        };\n\n        manageSchema = /* GraphQL */ `\n            input CmsPredefinedValueInput {\n                label: String!\n                value: String!\n                selected: Boolean\n            }\n\n            input CmsPredefinedValuesInput {\n                enabled: Boolean\n                values: [CmsPredefinedValueInput]\n            }\n            input CmsFieldRendererInput {\n                name: String\n            }\n\n            input CmsFieldValidationInput {\n                name: String!\n                message: String\n                settings: JSON\n            }\n\n            input CmsContentModelFieldInput {\n                id: ID!\n                label: String!\n                helpText: String\n                placeholderText: String\n                # we never use user input - this is here to the GraphQL does not break when posting from our UI\n                # used for debugging purposes\n                storageId: String\n                fieldId: String!\n                type: String!\n                tags: [String!]\n                multipleValues: Boolean\n                predefinedValues: CmsPredefinedValuesInput\n                renderer: CmsFieldRendererInput\n                validation: [CmsFieldValidationInput]\n                listValidation: [CmsFieldValidationInput]\n                settings: JSON\n            }\n\n            input CmsContentModelCreateInput {\n                name: String!\n                modelId: String\n                group: RefInput!\n                description: String\n                layout: [[ID!]!]\n                fields: [CmsContentModelFieldInput!]\n                titleFieldId: String\n                tags: [String!]\n            }\n\n            input CmsContentModelCreateFromInput {\n                name: String!\n                modelId: String\n                group: RefInput!\n                description: String\n                locale: String\n            }\n\n            input CmsContentModelUpdateInput {\n                name: String\n                group: RefInput\n                description: String\n                layout: [[ID!]!]!\n                fields: [CmsContentModelFieldInput!]!\n                titleFieldId: String\n                tags: [String!]\n            }\n\n            type InitializeModelResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            extend type Mutation {\n                createContentModel(data: CmsContentModelCreateInput!): CmsContentModelResponse\n\n                createContentModelFrom(\n                    modelId: ID!\n                    data: CmsContentModelCreateFromInput!\n                ): CmsContentModelResponse\n\n                updateContentModel(\n                    modelId: ID!\n                    data: CmsContentModelUpdateInput!\n                ): CmsContentModelResponse\n\n                deleteContentModel(modelId: ID!): CmsDeleteResponse\n\n                # users can send anything into the data variable\n                initializeModel(modelId: ID!, data: JSON): InitializeModelResponse!\n            }\n        `;\n    }\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsFieldValidation {\n                name: String!\n                message: String\n                settings: JSON\n            }\n\n            type CmsFieldRenderer {\n                name: String\n            }\n\n            type CmsPredefinedValue {\n                label: String\n                value: String\n                selected: Boolean\n            }\n\n            type CmsPredefinedValues {\n                enabled: Boolean\n                values: [CmsPredefinedValue]\n            }\n\n            type CmsContentModelField {\n                id: ID!\n                # auto-generated value\n                # used for debugging purposes\n                storageId: String\n                fieldId: String!\n                label: String!\n                helpText: String\n                placeholderText: String\n                type: String!\n                tags: [String!]!\n                multipleValues: Boolean\n                predefinedValues: CmsPredefinedValues\n                renderer: CmsFieldRenderer\n                validation: [CmsFieldValidation!]\n                listValidation: [CmsFieldValidation!]\n                settings: JSON\n            }\n\n            type CmsContentModel {\n                name: String!\n                modelId: String!\n                description: String\n                group: CmsContentModelGroup!\n                createdOn: DateTime\n                savedOn: DateTime\n                createdBy: CmsCreatedBy\n                fields: [CmsContentModelField!]!\n                lockedFields: [JSON]\n                layout: [[String!]!]!\n                titleFieldId: String\n                tags: [String!]!\n                # Returns true if the content model is registered via a plugin.\n                plugin: Boolean!\n            }\n\n            type CmsContentModelResponse {\n                data: CmsContentModel\n                error: CmsError\n            }\n\n            type CmsContentModelListResponse {\n                data: [CmsContentModel]\n                meta: CmsListMeta\n                error: CmsError\n            }\n\n            extend type Query {\n                getContentModel(modelId: ID!, where: JSON, sort: String): CmsContentModelResponse\n\n                listContentModels: CmsContentModelListResponse\n            }\n\n            ${manageSchema}\n        `,\n        resolvers\n    });\n\n    plugin.name = `headless-cms.graphql.schema.${context.cms.type}.content-models`;\n\n    return plugin;\n};\n"],"mappings":"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CAAC,CAAC;QAC/B;MACJ;IACJ,CAAC;IAEDmC,YAAY,GAAG,aAAe;AACtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;EACL;EAEA,MAAMR,MAAM,GAAG,IAAIqB,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcd,YAAa;AAC3B,SAAS;IACD/C;EACJ,CAAC,CAAC;EAEFuC,MAAM,CAACJ,IAAI,GAAI,+BAA8BpC,OAAO,CAACO,GAAG,CAACqC,IAAK,iBAAgB;EAE9E,OAAOJ,MAAM;AACjB,CAAC;AAAC"}

package/graphql/schema/createFieldResolvers.d.ts

@@ -14,7 +14,7 @@ interface CreateFieldResolversFactoryParams {
 }
 /**
  * We use a factory to avoid passing the parameters for recursive invocations.
- * This way they will always be in the function scope and we can only pass "fields".
+ * This way they will always be in the function scope, and we can only pass "fields".
  */
 export declare const createFieldResolversFactory: (factoryParams: CreateFieldResolversFactoryParams) => (params: CreateFieldResolvers) => {};
 export {};

package/graphql/schema/createFieldResolvers.js

@@ -9,17 +9,19 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _set = _interopRequireDefault(require("lodash/set"));
 var _entryStorage = require("../../utils/entryStorage");
 var _error = _interopRequireDefault(require("@webiny/error"));
+var _getBaseFieldType = require("../../utils/getBaseFieldType");
 const getCreateResolver = (plugins, field, endpointType) => {
-  if (!plugins[field.type]) {
+  const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
+  if (!plugins[baseType]) {
     return null;
-  } else if (!plugins[field.type][endpointType]) {
+  } else if (!plugins[baseType][endpointType]) {
     return null;
   }
-  return plugins[field.type][endpointType].createResolver;
+  return plugins[baseType][endpointType].createResolver;
 };
 /**
  * We use a factory to avoid passing the parameters for recursive invocations.
- * This way they will always be in the function scope and we can only pass "fields".
+ * This way they will always be in the function scope, and we can only pass "fields".
  */
 const createFieldResolversFactory = factoryParams => {
   const {
@@ -38,7 +40,7 @@ const createFieldResolversFactory = factoryParams => {
     const fieldResolvers = (0, _objectSpread2.default)({}, extraResolvers);
     const typeResolvers = {};
     for (const field of fields) {
-      if (!fieldTypePlugins[field.type]) {
+      if (!fieldTypePlugins[(0, _getBaseFieldType.getBaseFieldType)(field)]) {
         continue;
       }
       /**
@@ -77,12 +79,21 @@ const createFieldResolversFactory = factoryParams => {
       // TODO @ts-refactor figure out types for parameters
       // @ts-ignore
       fieldResolvers[fieldId] = async (parent, args, context, info) => {
+        var _parent$values, _parent$values2, _parent$values3;
+        /**
+         * This is required because due to ref field can be requested without the populated data.
+         * At that point there is no .values  no fieldId property on the parent
+         */
+        const value = (parent === null || parent === void 0 ? void 0 : (_parent$values = parent.values) === null || _parent$values === void 0 ? void 0 : _parent$values[fieldId]) === undefined ? parent === null || parent === void 0 ? void 0 : parent[fieldId] : parent === null || parent === void 0 ? void 0 : (_parent$values2 = parent.values) === null || _parent$values2 === void 0 ? void 0 : _parent$values2[fieldId];
+        if (value === undefined) {
+          return undefined;
+        }
         // Get transformed value (eg. data decompression)
         const transformedValue = await (0, _entryStorage.entryFieldFromStorageTransform)({
           context,
           model,
           field,
-          value: isRoot ? parent.values[fieldId] : parent[fieldId]
+          value: isRoot ? (_parent$values3 = parent.values) === null || _parent$values3 === void 0 ? void 0 : _parent$values3[fieldId] : parent[fieldId]
         });
         (0, _set.default)(isRoot ? parent.values : parent, fieldId, transformedValue);
         if (!resolver) {

package/graphql/schema/createFieldResolvers.js.map

@@ -1 +1 @@
-{"version":3,"names":["getCreateResolver","plugins","field","endpointType","type","createResolver","createFieldResolversFactory","factoryParams","models","model","fieldTypePlugins","createFieldResolvers","params","graphQLType","fields","isRoot","extraResolvers","fieldResolvers","typeResolvers","fieldId","WebinyError","resolver","fieldResolver","Object","assign","parent","args","context","info","transformedValue","entryFieldFromStorageTransform","value","values","set"],"sources":["createFieldResolvers.ts"],"sourcesContent":["import set from \"lodash/set\";\nimport {\n    CmsModelField,\n    CmsContext,\n    CmsModelFieldToGraphQLCreateResolver,\n    ApiEndpoint,\n    CmsModel,\n    CmsFieldTypePlugins\n} from \"~/types\";\nimport { entryFieldFromStorageTransform } from \"~/utils/entryStorage\";\nimport { Resolvers } from \"@webiny/handler-graphql/types\";\nimport WebinyError from \"@webiny/error\";\n\ninterface CreateFieldResolvers {\n    graphQLType: string;\n    fields: CmsModelField[];\n    isRoot: boolean;\n    extraResolvers?: Resolvers<any>;\n}\n\ninterface CreateFieldResolversFactoryParams {\n    endpointType: ApiEndpoint;\n    models: CmsModel[];\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\nconst getCreateResolver = (\n    plugins: CmsFieldTypePlugins,\n    field: CmsModelField,\n    endpointType: ApiEndpoint\n): CmsModelFieldToGraphQLCreateResolver | null => {\n    if (!plugins[field.type]) {\n        return null;\n    } else if (!plugins[field.type][endpointType]) {\n        return null;\n    }\n    return plugins[field.type][endpointType].createResolver;\n};\n/**\n * We use a factory to avoid passing the parameters for recursive invocations.\n * This way they will always be in the function scope and we can only pass \"fields\".\n */\nexport const createFieldResolversFactory = (factoryParams: CreateFieldResolversFactoryParams) => {\n    const { endpointType, models, model, fieldTypePlugins } = factoryParams;\n    return function createFieldResolvers(params: CreateFieldResolvers) {\n        const { graphQLType, fields, isRoot = false, extraResolvers = {} } = params;\n\n        const fieldResolvers = { ...extraResolvers };\n        const typeResolvers = {};\n\n        for (const field of fields) {\n            if (!fieldTypePlugins[field.type]) {\n                continue;\n            }\n            /**\n             * Field that is passed into this factory MUST have fieldId, so filter it before the method call.\n             */\n            if (!field.fieldId) {\n                throw new WebinyError(\n                    \"Field is missing an `fieldId`. Cannot process field without the `fieldId` in the resolvers.\",\n                    \"FIELD_ID_ERROR\",\n                    {\n                        field\n                    }\n                );\n            }\n\n            const createResolver = getCreateResolver(fieldTypePlugins, field, endpointType);\n\n            let resolver: any;\n            const fieldResolver = createResolver\n                ? createResolver({ graphQLType, models, model, field, createFieldResolvers })\n                : null;\n\n            /**\n             * When fieldResolver is false it will completely skip adding field fieldId into the resolvers.\n             * This is to fix the breaking of GraphQL schema.\n             */\n            if (fieldResolver === false) {\n                continue;\n            } else if (typeof fieldResolver === \"function\") {\n                resolver = fieldResolver;\n            } else if (fieldResolver) {\n                resolver = fieldResolver.resolver;\n                Object.assign(typeResolvers, fieldResolver.typeResolvers);\n            }\n\n            const { fieldId } = field;\n            // TODO @ts-refactor figure out types for parameters\n            // @ts-ignore\n            fieldResolvers[fieldId] = async (parent, args, context: CmsContext, info) => {\n                // Get transformed value (eg. data decompression)\n                const transformedValue = await entryFieldFromStorageTransform({\n                    context,\n                    model,\n                    field,\n                    value: isRoot ? parent.values[fieldId] : parent[fieldId]\n                });\n\n                set(isRoot ? parent.values : parent, fieldId, transformedValue);\n\n                if (!resolver) {\n                    return isRoot ? parent.values[fieldId] : parent[fieldId];\n                }\n\n                return await resolver(isRoot ? parent.values : parent, args, context, info);\n            };\n        }\n\n        return { [graphQLType]: fieldResolvers, ...typeResolvers };\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["getCreateResolver","plugins","field","endpointType","baseType","getBaseFieldType","createResolver","createFieldResolversFactory","factoryParams","models","model","fieldTypePlugins","createFieldResolvers","params","graphQLType","fields","isRoot","extraResolvers","fieldResolvers","typeResolvers","fieldId","WebinyError","resolver","fieldResolver","Object","assign","parent","args","context","info","value","values","undefined","transformedValue","entryFieldFromStorageTransform","set"],"sources":["createFieldResolvers.ts"],"sourcesContent":["import set from \"lodash/set\";\nimport {\n    CmsModelField,\n    CmsContext,\n    CmsModelFieldToGraphQLCreateResolver,\n    ApiEndpoint,\n    CmsModel,\n    CmsFieldTypePlugins\n} from \"~/types\";\nimport { entryFieldFromStorageTransform } from \"~/utils/entryStorage\";\nimport { Resolvers } from \"@webiny/handler-graphql/types\";\nimport WebinyError from \"@webiny/error\";\nimport { getBaseFieldType } from \"~/utils/getBaseFieldType\";\n\ninterface CreateFieldResolvers {\n    graphQLType: string;\n    fields: CmsModelField[];\n    isRoot: boolean;\n    extraResolvers?: Resolvers<any>;\n}\n\ninterface CreateFieldResolversFactoryParams {\n    endpointType: ApiEndpoint;\n    models: CmsModel[];\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\nconst getCreateResolver = (\n    plugins: CmsFieldTypePlugins,\n    field: CmsModelField,\n    endpointType: ApiEndpoint\n): CmsModelFieldToGraphQLCreateResolver | null => {\n    const baseType = getBaseFieldType(field);\n    if (!plugins[baseType]) {\n        return null;\n    } else if (!plugins[baseType][endpointType]) {\n        return null;\n    }\n    return plugins[baseType][endpointType].createResolver;\n};\n/**\n * We use a factory to avoid passing the parameters for recursive invocations.\n * This way they will always be in the function scope, and we can only pass \"fields\".\n */\nexport const createFieldResolversFactory = (factoryParams: CreateFieldResolversFactoryParams) => {\n    const { endpointType, models, model, fieldTypePlugins } = factoryParams;\n    return function createFieldResolvers(params: CreateFieldResolvers) {\n        const { graphQLType, fields, isRoot = false, extraResolvers = {} } = params;\n\n        const fieldResolvers = { ...extraResolvers };\n        const typeResolvers = {};\n\n        for (const field of fields) {\n            if (!fieldTypePlugins[getBaseFieldType(field)]) {\n                continue;\n            }\n            /**\n             * Field that is passed into this factory MUST have fieldId, so filter it before the method call.\n             */\n            if (!field.fieldId) {\n                throw new WebinyError(\n                    \"Field is missing an `fieldId`. Cannot process field without the `fieldId` in the resolvers.\",\n                    \"FIELD_ID_ERROR\",\n                    {\n                        field\n                    }\n                );\n            }\n\n            const createResolver = getCreateResolver(fieldTypePlugins, field, endpointType);\n\n            let resolver: any;\n            const fieldResolver = createResolver\n                ? createResolver({ graphQLType, models, model, field, createFieldResolvers })\n                : null;\n\n            /**\n             * When fieldResolver is false it will completely skip adding field fieldId into the resolvers.\n             * This is to fix the breaking of GraphQL schema.\n             */\n            if (fieldResolver === false) {\n                continue;\n            } else if (typeof fieldResolver === \"function\") {\n                resolver = fieldResolver;\n            } else if (fieldResolver) {\n                resolver = fieldResolver.resolver;\n                Object.assign(typeResolvers, fieldResolver.typeResolvers);\n            }\n\n            const { fieldId } = field;\n            // TODO @ts-refactor figure out types for parameters\n            // @ts-ignore\n            fieldResolvers[fieldId] = async (parent, args, context: CmsContext, info) => {\n                /**\n                 * This is required because due to ref field can be requested without the populated data.\n                 * At that point there is no .values  no fieldId property on the parent\n                 */\n                const value =\n                    parent?.values?.[fieldId] === undefined\n                        ? parent?.[fieldId]\n                        : parent?.values?.[fieldId];\n                if (value === undefined) {\n                    return undefined;\n                }\n                // Get transformed value (eg. data decompression)\n                const transformedValue = await entryFieldFromStorageTransform({\n                    context,\n                    model,\n                    field,\n                    value: isRoot ? parent.values?.[fieldId] : parent[fieldId]\n                });\n\n                set(isRoot ? parent.values : parent, fieldId, transformedValue);\n\n                if (!resolver) {\n                    return isRoot ? parent.values[fieldId] : parent[fieldId];\n                }\n\n                return await resolver(isRoot ? parent.values : parent, args, context, info);\n            };\n        }\n\n        return { [graphQLType]: fieldResolvers, ...typeResolvers };\n    };\n};\n"],"mappings":"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"}

package/graphql/schema/createManageSDL.d.ts

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

package/graphql/schema/createManageSDL.js

@@ -13,7 +13,8 @@ var _renderFields = require("../../utils/renderFields");
 var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 const createManageSDL = ({
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
   const typeName = (0, _createTypeName.createTypeName)(model.modelId);
   const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
@@ -24,7 +25,8 @@ const createManageSDL = ({
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
@@ -44,8 +46,6 @@ const createManageSDL = ({
   }
   return (/* GraphQL */`
         """${model.description || model.modelId}"""
-        ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
-
         type ${mTypeName} {
             id: ID!
             entryId: String!
@@ -74,11 +74,13 @@ const createManageSDL = ({
             """
             data: JSON
         }
-        
+
+        ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
         
         ${inputFields.map(f => f.typeDefs).filter(Boolean).join("\n")}
 
         ${inputFields && `input ${mTypeName}Input {
+                id: ID
             ${inputFields.map(f => f.fields).join("\n")}
         }`}
 
@@ -88,7 +90,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                id: ID\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

@@ -42,6 +42,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,MAAM;EAAEC,KAAK;EAAEC;AAAiB,CAAC,KAAK;EAC7F,IAAID,KAAK,CAACE,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO;MACHC,KAAK,EAAE,CAAC;IACZ,CAAC;EACL;EACA,MAAMC,QAAQ,GAAG,IAAAC,8BAAc,EAACN,KAAK,CAACO,OAAO,CAAC;EAC9C,MAAMC,SAAS,GAAG,IAAAC,kCAAkB,EAACJ,QAAQ,CAAC;EAE9C,MAAMK,oBAAoB,GAAG,IAAAC,iDAA2B,EAAC;IACrDC,YAAY,EAAE,MAAM;IACpBb,MAAM;IACNC,KAAK;IACLC;EACJ,CAAC,CAAC;EAEF,MAAMY,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAEN,SAAS;IACtBN,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBa,MAAM,EAAE;EACZ,CAAC,CAAC;EAEF;IACIX,KAAK,EAAE;MACH,CAAE,MAAKC,QAAS,EAAC,GAAG,IAAAW,sBAAU,EAAC;QAAEhB;MAAM,CAAC,CAAC;MACzC,CAAE,OAAM,IAAAiB,sCAAkB,EAACZ,QAAQ,CAAE,EAAC,GAAG,IAAAa,wBAAW,EAAC;QAAElB;MAAM,CAAC;IAClE;EAAC,GACEa,cAAc;AAEzB,CAAC;AAAC"}
+{"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,MAAM;EAAEC,KAAK;EAAEC;AAAiB,CAAC,KAAK;EAC7F,IAAID,KAAK,CAACE,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO;MACHC,KAAK,EAAE,CAAC;IACZ,CAAC;EACL;EACA,MAAMC,QAAQ,GAAG,IAAAC,8BAAc,EAACN,KAAK,CAACO,OAAO,CAAC;EAC9C,MAAMC,SAAS,GAAG,IAAAC,kCAAkB,EAACJ,QAAQ,CAAC;EAE9C,MAAMK,oBAAoB,GAAG,IAAAC,iDAA2B,EAAC;IACrDC,YAAY,EAAE,MAAM;IACpBb,MAAM;IACNC,KAAK;IACLC;EACJ,CAAC,CAAC;EAEF,MAAMY,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAEN,SAAS;IACtBN,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBa,MAAM,EAAE;EACZ,CAAC,CAAC;EAEF;IACIX,KAAK,EAAE;MACH,CAAE,MAAKC,QAAS,EAAC,GAAG,IAAAW,sBAAU,EAAC;QAAEhB;MAAM,CAAC,CAAC;MACzC,CAAE,OAAM,IAAAiB,sCAAkB,EAACZ,QAAQ,CAAE,EAAC,GAAG,IAAAa,wBAAW,EAAC;QAAElB;MAAM,CAAC;IAClE,CAAC;IACD,CAACQ,SAAS,GAAG;MACTD,OAAO,EAAE,MAAM;QACX,OAAOP,KAAK,CAACO,OAAO;MACxB;IACJ;EAAC,GACEM,cAAc;AAEzB,CAAC;AAAC"}

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

@@ -12,7 +12,8 @@ var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
 var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 const createReadSDL = ({
   model,
-  fieldTypePlugins
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
   const typeName = (0, _createTypeName.createTypeName)(model.modelId);
   const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
@@ -24,7 +25,8 @@ const createReadSDL = ({
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
@@ -38,13 +40,13 @@ const createReadSDL = ({
   if (fieldsRender.length === 0) {
     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!
@@ -52,13 +54,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,KAAK;EAAEC;AAAiB,CAAC,KAAa;EACjF,MAAMC,QAAQ,GAAG,IAAAC,8BAAc,EAACH,KAAK,CAACI,OAAO,CAAC;EAC9C,MAAMC,SAAS,GAAG,IAAAC,kCAAkB,EAACJ,QAAQ,CAAC;EAE9C,MAAMK,IAAiB,GAAG,MAAM;EAEhC,MAAMC,sBAAsB,GAAG,IAAAC,8CAAsB,EAAC;IAClDT,KAAK;IACLO,IAAI;IACJN;EACJ,CAAC,CAAC;EAEF,MAAMS,cAAc,GAAG,IAAAC,8BAAc,EAAC;IAClCX,KAAK;IACLC;EACJ,CAAC,CAAC;EACF,MAAMW,qBAAqB,GAAG,IAAAC,4CAAqB,EAAC;IAChDb,KAAK;IACLC;EACJ,CAAC,CAAC;EACF,MAAMa,YAAY,GAAG,IAAAC,0BAAY,EAAC;IAC9Bf,KAAK;IACLO,IAAI;IACJN;EACJ,CAAC,CAAC;EAEF,IAAIa,YAAY,CAACE,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO,EAAE;EACb;EAEA,OAAQ;AACZ,aAAahB,KAAK,CAACiB,WAAW,IAAI,EAAG;AACrC,UAAUH,YAAY,CACTI,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAAC,CACpBC,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,IAAI,CAAE;AACxB;AACA,eAAelB,SAAU;AACzB;AACA;AACA;AACA;AACA;AACA;AACA,cAAcS,YAAY,CAACI,GAAG,CAACC,CAAC,IAAIA,CAAC,CAACK,MAAM,CAAC,CAACD,IAAI,CAAC,IAAI,CAAE;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,sCAAkB,EAACvB,QAAQ,CAAE;AAC/C,yBAAyBG,SAAU;AACnC,yBAAyBA,SAAU;AACnC;AACA;AACA,iBAAiBA,SAAU;AAC3B;AACA,KAAK;AACL,CAAC;AAAC"}
+{"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,KAAK;EACLC,gBAAgB;EAChBC;AACJ,CAAC,KAAa;EACV,MAAMC,QAAQ,GAAG,IAAAC,8BAAc,EAACJ,KAAK,CAACK,OAAO,CAAC;EAC9C,MAAMC,SAAS,GAAG,IAAAC,kCAAkB,EAACJ,QAAQ,CAAC;EAE9C,MAAMK,IAAiB,GAAG,MAAM;EAEhC,MAAMC,sBAAsB,GAAG,IAAAC,8CAAsB,EAAC;IAClDV,KAAK;IACLQ,IAAI;IACJP;EACJ,CAAC,CAAC;EAEF,MAAMU,cAAc,GAAG,IAAAC,8BAAc,EAAC;IAClCZ,KAAK;IACLC,gBAAgB;IAChBC;EACJ,CAAC,CAAC;EACF,MAAMW,qBAAqB,GAAG,IAAAC,4CAAqB,EAAC;IAChDd,KAAK;IACLC;EACJ,CAAC,CAAC;EACF,MAAMc,YAAY,GAAG,IAAAC,0BAAY,EAAC;IAC9BhB,KAAK;IACLQ,IAAI;IACJP;EACJ,CAAC,CAAC;EAEF,IAAIc,YAAY,CAACE,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO,EAAE;EACb;EAEA,MAAMC,eAAe,GAAGlB,KAAK,CAACmB,MAAM,CAACC,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACC,OAAO,KAAK,SAAS,CAAC;EAEvE,OAAQ;AACZ,aAAatB,KAAK,CAACuB,WAAW,IAAI,EAAG;AACrC,eAAejB,SAAU;AACzB;AACA;AACA,cAAcY,eAAe,GAAG,EAAE,GAAG,kBAAmB;AACxD;AACA;AACA;AACA;AACA,cAAcH,YAAY,CAACS,GAAG,CAACH,CAAC,IAAIA,CAAC,CAACF,MAAM,CAAC,CAACM,IAAI,CAAC,IAAI,CAAE;AACzD;AACA;AACA,UAAUV,YAAY,CACTS,GAAG,CAACH,CAAC,IAAIA,CAAC,CAACK,QAAQ,CAAC,CACpBC,MAAM,CAACC,OAAO,CAAC,CACfH,IAAI,CAAC,IAAI,CAAE;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,sCAAkB,EAAC1B,QAAQ,CAAE;AAC/C,yBAAyBG,SAAU;AACnC,yBAAyBA,SAAU;AACnC;AACA;AACA,iBAAiBA,SAAU;AAC3B;AACA,KAAK;AACL,CAAC;AAAC"}

package/graphql/schema/schemaPlugins.d.ts

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