@webiny/api-headless-cms 0.0.0-unstable.d65ec29d44 → 0.0.0-unstable.df6d94b531

package/graphql/schema/createManageResolvers.js

@@ -19,9 +19,9 @@ var _resolveRepublish = require("./resolvers/manage/resolveRepublish");
 var _resolveUnpublish = require("./resolvers/manage/resolveUnpublish");
 var _resolveCreateFrom = require("./resolvers/manage/resolveCreateFrom");
 var _createFieldResolvers = require("./createFieldResolvers");
-var _createTypeName = require("../../utils/createTypeName");
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 var _getEntryTitle = require("../../utils/getEntryTitle");
+var _getEntryImage = require("../../utils/getEntryImage");
+var _entryStorage = require("../../utils/entryStorage");
 const createManageResolvers = ({
   models,
   model,
@@ -33,8 +33,6 @@ const createManageResolvers = ({
       Mutation: {}
     };
   }
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
   const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
     endpointType: "manage",
     models,
@@ -42,7 +40,7 @@ const createManageResolvers = ({
     fieldTypePlugins
   });
   const fieldResolvers = createFieldResolvers({
-    graphQLType: mTypeName,
+    graphQLType: model.singularApiName,
     fields: model.fields,
     isRoot: true,
     // These are extra fields we want to apply to field resolvers of "gqlType"
@@ -54,47 +52,65 @@ const createManageResolvers = ({
   });
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({
     Query: {
-      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+      [`get${model.singularApiName}`]: (0, _resolveGet.resolveGet)({
         model
       }),
-      [`get${typeName}Revisions`]: (0, _resolveGetRevisions.resolveGetRevisions)({
+      [`get${model.singularApiName}Revisions`]: (0, _resolveGetRevisions.resolveGetRevisions)({
         model
       }),
-      [`get${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}ByIds`]: (0, _resolveGetByIds.resolveGetByIds)({
+      [`get${model.pluralApiName}ByIds`]: (0, _resolveGetByIds.resolveGetByIds)({
         model
       }),
-      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+      [`list${model.pluralApiName}`]: (0, _resolveList.resolveList)({
         model
       })
     },
     Mutation: {
-      [`create${typeName}`]: (0, _resolveCreate.resolveCreate)({
+      [`create${model.singularApiName}`]: (0, _resolveCreate.resolveCreate)({
         model
       }),
-      [`update${typeName}`]: (0, _resolveUpdate.resolveUpdate)({
+      [`update${model.singularApiName}`]: (0, _resolveUpdate.resolveUpdate)({
         model
       }),
-      [`delete${typeName}`]: (0, _resolveDelete.resolveDelete)({
+      [`delete${model.singularApiName}`]: (0, _resolveDelete.resolveDelete)({
         model
       }),
-      [`publish${typeName}`]: (0, _resolvePublish.resolvePublish)({
+      [`publish${model.singularApiName}`]: (0, _resolvePublish.resolvePublish)({
         model
       }),
-      [`republish${typeName}`]: (0, _resolveRepublish.resolveRepublish)({
+      [`republish${model.singularApiName}`]: (0, _resolveRepublish.resolveRepublish)({
         model
       }),
-      [`unpublish${typeName}`]: (0, _resolveUnpublish.resolveUnpublish)({
+      [`unpublish${model.singularApiName}`]: (0, _resolveUnpublish.resolveUnpublish)({
         model
       }),
-      [`create${typeName}From`]: (0, _resolveCreateFrom.resolveCreateFrom)({
+      [`create${model.singularApiName}From`]: (0, _resolveCreateFrom.resolveCreateFrom)({
         model
       })
     }
   }, fieldResolvers), {}, {
-    [`${mTypeName}Meta`]: {
+    [`${model.singularApiName}Meta`]: {
       title(entry) {
         return (0, _getEntryTitle.getEntryTitle)(model, entry);
       },
+      description: (entry, _, context) => {
+        if (!model.descriptionFieldId) {
+          return "";
+        }
+        const field = model.fields.find(f => f.fieldId === model.descriptionFieldId);
+        if (!field) {
+          return "";
+        }
+        return (0, _entryStorage.entryFieldFromStorageTransform)({
+          context,
+          model,
+          field,
+          value: entry.values[field.fieldId]
+        });
+      },
+      image: entry => {
+        return (0, _getEntryImage.getEntryImage)(model, entry);
+      },
       status(entry) {
         return entry.status;
       },

package/graphql/schema/createManageResolvers.js.map

@@ -1 +1 @@
-{"version":3,"names":["createManageResolvers","models","model","fieldTypePlugins","fields","length","Query","Mutation","typeName","createTypeName","modelId","mTypeName","createManageTypeName","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","isRoot","extraResolvers","commonFieldResolvers","meta","entry","resolveGet","resolveGetRevisions","pluralizedTypeName","resolveGetByIds","resolveList","resolveCreate","resolveUpdate","resolveDelete","resolvePublish","resolveRepublish","resolveUnpublish","resolveCreateFrom","title","getEntryTitle","status","data","revisions","_","context","cms","getEntryRevisions","entryId","sort","a","b","version"],"sources":["createManageResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext, CmsEntry } from \"~/types\";\nimport { commonFieldResolvers } from \"./resolvers/commonFieldResolvers\";\nimport { resolveGet } from \"./resolvers/manage/resolveGet\";\nimport { resolveList } from \"./resolvers/manage/resolveList\";\nimport { resolveGetRevisions } from \"./resolvers/manage/resolveGetRevisions\";\nimport { resolveGetByIds } from \"./resolvers/manage/resolveGetByIds\";\nimport { resolveCreate } from \"./resolvers/manage/resolveCreate\";\nimport { resolveUpdate } from \"./resolvers/manage/resolveUpdate\";\nimport { resolveDelete } from \"./resolvers/manage/resolveDelete\";\nimport { resolvePublish } from \"./resolvers/manage/resolvePublish\";\nimport { resolveRepublish } from \"./resolvers/manage/resolveRepublish\";\nimport { resolveUnpublish } from \"./resolvers/manage/resolveUnpublish\";\nimport { resolveCreateFrom } from \"./resolvers/manage/resolveCreateFrom\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\nimport { createManageTypeName, createTypeName } from \"~/utils/createTypeName\";\nimport { pluralizedTypeName } from \"~/utils/pluralizedTypeName\";\nimport { getEntryTitle } from \"~/utils/getEntryTitle\";\n\ninterface CreateManageResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\ninterface CreateManageResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateManageResolversParams): any;\n}\n\nexport const createManageResolvers: CreateManageResolvers = ({\n    models,\n    model,\n    fieldTypePlugins\n}) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {},\n            Mutation: {}\n        };\n    }\n    const typeName = createTypeName(model.modelId);\n    const mTypeName = createManageTypeName(typeName);\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"manage\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: mTypeName,\n        fields: model.fields,\n        isRoot: true,\n        // These are extra fields we want to apply to field resolvers of \"gqlType\"\n        extraResolvers: {\n            ...commonFieldResolvers(),\n            meta(entry) {\n                return entry;\n            }\n        }\n    });\n\n    return {\n        Query: {\n            [`get${typeName}`]: resolveGet({ model }),\n            [`get${typeName}Revisions`]: resolveGetRevisions({ model }),\n            [`get${pluralizedTypeName(typeName)}ByIds`]: resolveGetByIds({ model }),\n            [`list${pluralizedTypeName(typeName)}`]: resolveList({ model })\n        },\n        Mutation: {\n            [`create${typeName}`]: resolveCreate({ model }),\n            [`update${typeName}`]: resolveUpdate({ model }),\n            [`delete${typeName}`]: resolveDelete({ model }),\n            [`publish${typeName}`]: resolvePublish({ model }),\n            [`republish${typeName}`]: resolveRepublish({ model }),\n            [`unpublish${typeName}`]: resolveUnpublish({ model }),\n            [`create${typeName}From`]: resolveCreateFrom({ model })\n        },\n        ...fieldResolvers,\n        [`${mTypeName}Meta`]: {\n            title(entry: CmsEntry) {\n                return getEntryTitle(model, entry);\n            },\n            status(entry: CmsEntry) {\n                return entry.status;\n            },\n            data: (entry: CmsEntry) => {\n                return entry.meta || {};\n            },\n            async revisions(entry: CmsEntry, _: any, context: CmsContext) {\n                const revisions = await context.cms.getEntryRevisions(model, entry.entryId);\n                return revisions.sort((a, b) => b.version - a.version);\n            }\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["createManageResolvers","models","model","fieldTypePlugins","fields","length","Query","Mutation","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","singularApiName","isRoot","extraResolvers","commonFieldResolvers","meta","entry","resolveGet","resolveGetRevisions","pluralApiName","resolveGetByIds","resolveList","resolveCreate","resolveUpdate","resolveDelete","resolvePublish","resolveRepublish","resolveUnpublish","resolveCreateFrom","title","getEntryTitle","description","_","context","descriptionFieldId","field","find","f","fieldId","entryFieldFromStorageTransform","value","values","image","getEntryImage","status","data","revisions","cms","getEntryRevisions","entryId","sort","a","b","version"],"sources":["createManageResolvers.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsContext, CmsEntry, CmsModel } from \"~/types\";\nimport { commonFieldResolvers } from \"./resolvers/commonFieldResolvers\";\nimport { resolveGet } from \"./resolvers/manage/resolveGet\";\nimport { resolveList } from \"./resolvers/manage/resolveList\";\nimport { resolveGetRevisions } from \"./resolvers/manage/resolveGetRevisions\";\nimport { resolveGetByIds } from \"./resolvers/manage/resolveGetByIds\";\nimport { resolveCreate } from \"./resolvers/manage/resolveCreate\";\nimport { resolveUpdate } from \"./resolvers/manage/resolveUpdate\";\nimport { resolveDelete } from \"./resolvers/manage/resolveDelete\";\nimport { resolvePublish } from \"./resolvers/manage/resolvePublish\";\nimport { resolveRepublish } from \"./resolvers/manage/resolveRepublish\";\nimport { resolveUnpublish } from \"./resolvers/manage/resolveUnpublish\";\nimport { resolveCreateFrom } from \"./resolvers/manage/resolveCreateFrom\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\nimport { getEntryTitle } from \"~/utils/getEntryTitle\";\nimport { getEntryImage } from \"~/utils/getEntryImage\";\nimport { entryFieldFromStorageTransform } from \"~/utils/entryStorage\";\n\ninterface CreateManageResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\ninterface CreateManageResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateManageResolversParams): any;\n}\n\nexport const createManageResolvers: CreateManageResolvers = ({\n    models,\n    model,\n    fieldTypePlugins\n}) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {},\n            Mutation: {}\n        };\n    }\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"manage\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: model.singularApiName,\n        fields: model.fields,\n        isRoot: true,\n        // These are extra fields we want to apply to field resolvers of \"gqlType\"\n        extraResolvers: {\n            ...commonFieldResolvers(),\n            meta(entry) {\n                return entry;\n            }\n        }\n    });\n\n    return {\n        Query: {\n            [`get${model.singularApiName}`]: resolveGet({ model }),\n            [`get${model.singularApiName}Revisions`]: resolveGetRevisions({ model }),\n            [`get${model.pluralApiName}ByIds`]: resolveGetByIds({ model }),\n            [`list${model.pluralApiName}`]: resolveList({ model })\n        },\n        Mutation: {\n            [`create${model.singularApiName}`]: resolveCreate({ model }),\n            [`update${model.singularApiName}`]: resolveUpdate({ model }),\n            [`delete${model.singularApiName}`]: resolveDelete({ model }),\n            [`publish${model.singularApiName}`]: resolvePublish({ model }),\n            [`republish${model.singularApiName}`]: resolveRepublish({ model }),\n            [`unpublish${model.singularApiName}`]: resolveUnpublish({ model }),\n            [`create${model.singularApiName}From`]: resolveCreateFrom({ model })\n        },\n        ...fieldResolvers,\n        [`${model.singularApiName}Meta`]: {\n            title(entry: CmsEntry) {\n                return getEntryTitle(model, entry);\n            },\n            description: (entry: CmsEntry, _: any, context: CmsContext) => {\n                if (!model.descriptionFieldId) {\n                    return \"\";\n                }\n                const field = model.fields.find(f => f.fieldId === model.descriptionFieldId);\n                if (!field) {\n                    return \"\";\n                }\n\n                return entryFieldFromStorageTransform({\n                    context,\n                    model,\n                    field,\n                    value: entry.values[field.fieldId]\n                });\n            },\n            image: (entry: CmsEntry) => {\n                return getEntryImage(model, entry);\n            },\n            status(entry: CmsEntry) {\n                return entry.status;\n            },\n            data: (entry: CmsEntry) => {\n                return entry.meta || {};\n            },\n            async revisions(entry: CmsEntry, _: any, context: CmsContext) {\n                const revisions = await context.cms.getEntryRevisions(model, entry.entryId);\n                return revisions.sort((a, b) => b.version - a.version);\n            }\n        }\n    };\n};\n"],"mappings":"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"}

package/graphql/schema/createManageSDL.d.ts

@@ -1,6 +1,7 @@
 import { CmsFieldTypePlugins, CmsModel } from "../../types";
 import { CmsGraphQLSchemaSorterPlugin } from "../../plugins";
 interface CreateManageSDLParams {
+    models: CmsModel[];
     model: CmsModel;
     fieldTypePlugins: CmsFieldTypePlugins;
     sorterPlugins: CmsGraphQLSchemaSorterPlugin[];

package/graphql/schema/createManageSDL.js

@@ -4,20 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createManageSDL = void 0;
-var _createTypeName = require("../../utils/createTypeName");
 var _renderListFilterFields = require("../../utils/renderListFilterFields");
 var _renderSortEnum = require("../../utils/renderSortEnum");
 var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
 var _renderInputFields = require("../../utils/renderInputFields");
 var _renderFields = require("../../utils/renderFields");
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 const createManageSDL = ({
+  models,
   model,
   fieldTypePlugins,
   sorterPlugins
 }) => {
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
   const listFilterFieldsRender = (0, _renderListFilterFields.renderListFilterFields)({
     model,
     type: "manage",
@@ -33,10 +30,12 @@ const createManageSDL = ({
     fieldTypePlugins
   });
   const inputFields = (0, _renderInputFields.renderInputFields)({
+    models,
     model,
     fieldTypePlugins
   });
   const fields = (0, _renderFields.renderFields)({
+    models,
     model,
     type: "manage",
     fieldTypePlugins
@@ -44,20 +43,25 @@ const createManageSDL = ({
   if (inputFields.length === 0) {
     return "";
   }
+  const {
+    singularApiName: singularName,
+    pluralApiName: pluralName
+  } = model;
   return (/* GraphQL */`
-        """${model.description || model.modelId}"""
-        type ${mTypeName} {
+        """${model.description || singularName}"""
+        type ${singularName} {
             id: ID!
             entryId: String!
             createdOn: DateTime!
             savedOn: DateTime!
-            createdBy: CmsCreatedBy!
-            ownedBy: CmsOwnedBy!
-            meta: ${mTypeName}Meta
+            createdBy: CmsIdentity!
+            ownedBy: CmsIdentity!
+            modifiedBy: CmsIdentity
+            meta: ${singularName}Meta
             ${fields.map(f => f.fields).join("\n")}
         }
 
-        type ${mTypeName}Meta {
+        type ${singularName}Meta {
             modelId: String
             version: Int
             locked: Boolean
@@ -67,8 +71,10 @@ const createManageSDL = ({
             CAUTION: this field is resolved by making an extra query to DB.
             RECOMMENDATION: Use it only with "get" queries (avoid in "list")
             """
-            revisions: [${mTypeName}]
+            revisions: [${singularName}!]
             title: String
+            description: String
+            image: String
             """
             Custom meta data stored in the root of the entry object.
             """
@@ -76,74 +82,74 @@ const createManageSDL = ({
         }
 
         ${fields.map(f => f.typeDefs).filter(Boolean).join("\n")}
-        
+
         ${inputFields.map(f => f.typeDefs).filter(Boolean).join("\n")}
 
-        ${inputFields && `input ${mTypeName}Input {
+        ${inputFields && `input ${singularName}Input {
                 id: ID
             ${inputFields.map(f => f.fields).join("\n")}
         }`}
 
-        ${getFilterFieldsRender && `input ${mTypeName}GetWhereInput {
+        ${getFilterFieldsRender && `input ${singularName}GetWhereInput {
             ${getFilterFieldsRender}
         }`}
 
 
-        ${listFilterFieldsRender && `input ${mTypeName}ListWhereInput {
+        ${listFilterFieldsRender && `input ${singularName}ListWhereInput {
                 ${listFilterFieldsRender}
-                AND: [${mTypeName}ListWhereInput!]
-                OR: [${mTypeName}ListWhereInput!]
+                AND: [${singularName}ListWhereInput!]
+                OR: [${singularName}ListWhereInput!]
         }`}
 
-        type ${mTypeName}Response {
-            data: ${mTypeName}
+        type ${singularName}Response {
+            data: ${singularName}
             error: CmsError
         }
-        
-        type ${mTypeName}ArrayResponse {
-            data: [${mTypeName}]
+
+        type ${singularName}ArrayResponse {
+            data: [${singularName}]
             error: CmsError
         }
 
-        type ${mTypeName}ListResponse {
-            data: [${mTypeName}]
+        type ${singularName}ListResponse {
+            data: [${singularName}]
             meta: CmsListMeta
             error: CmsError
         }
 
-        ${sortEnumRender && `enum ${mTypeName}ListSorter {
+        ${sortEnumRender && `enum ${singularName}ListSorter {
             ${sortEnumRender}
         }`}
 
         extend type Query {
-            get${typeName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${mTypeName}Response
-            
-            get${typeName}Revisions(id: ID!): ${mTypeName}ArrayResponse
-            
-            get${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}ByIds(revisions: [ID!]!): ${mTypeName}ArrayResponse
-
-            list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}(
-                where: ${mTypeName}ListWhereInput
-                sort: [${mTypeName}ListSorter]
+            get${singularName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${singularName}Response
+    
+            get${singularName}Revisions(id: ID!): ${singularName}ArrayResponse
+    
+            get${pluralName}ByIds(revisions: [ID!]!): ${singularName}ArrayResponse
+    
+            list${pluralName} (
+                where: ${singularName}ListWhereInput
+                sort: [${singularName}ListSorter]
                 limit: Int
                 after: String
-            ): ${mTypeName}ListResponse
+            ): ${singularName}ListResponse
         }
 
-        extend type Mutation{
-            create${typeName}(data: ${mTypeName}Input!): ${mTypeName}Response
-
-            create${typeName}From(revision: ID!, data: ${mTypeName}Input): ${mTypeName}Response
-
-            update${typeName}(revision: ID!, data: ${mTypeName}Input!): ${mTypeName}Response
-
-            delete${typeName}(revision: ID!): CmsDeleteResponse
-
-            publish${typeName}(revision: ID!): ${mTypeName}Response
-        
-            republish${typeName}(revision: ID!): ${mTypeName}Response
-
-            unpublish${typeName}(revision: ID!): ${mTypeName}Response
+        extend type Mutation {
+            create${singularName}(data: ${singularName}Input!): ${singularName}Response
+    
+            create${singularName}From(revision: ID!, data: ${singularName}Input): ${singularName}Response
+    
+            update${singularName}(revision: ID!, data: ${singularName}Input!): ${singularName}Response
+    
+            delete${singularName}(revision: ID!): CmsDeleteResponse
+    
+            publish${singularName}(revision: ID!): ${singularName}Response
+    
+            republish${singularName}(revision: ID!): ${singularName}Response
+    
+            unpublish${singularName}(revision: ID!): ${singularName}Response
         }
     `
   );

package/graphql/schema/createManageSDL.js.map

@@ -1 +1 @@
-{"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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"}
+{"version":3,"names":["createManageSDL","models","model","fieldTypePlugins","sorterPlugins","listFilterFieldsRender","renderListFilterFields","type","sortEnumRender","renderSortEnum","getFilterFieldsRender","renderGetFilterFields","inputFields","renderInputFields","fields","renderFields","length","singularApiName","singularName","pluralApiName","pluralName","description","map","f","join","typeDefs","filter","Boolean"],"sources":["createManageSDL.ts"],"sourcesContent":["import { CmsFieldTypePlugins, CmsModel } from \"~/types\";\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 { CmsGraphQLSchemaSorterPlugin } from \"~/plugins\";\n\ninterface CreateManageSDLParams {\n    models: CmsModel[];\n    model: CmsModel;\n    fieldTypePlugins: CmsFieldTypePlugins;\n    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];\n}\n\ninterface CreateManageSDL {\n    (params: CreateManageSDLParams): string;\n}\n\nexport const createManageSDL: CreateManageSDL = ({\n    models,\n    model,\n    fieldTypePlugins,\n    sorterPlugins\n}): string => {\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({ models, model, fieldTypePlugins });\n    const fields = renderFields({ models, model, type: \"manage\", fieldTypePlugins });\n\n    if (inputFields.length === 0) {\n        return \"\";\n    }\n\n    const { singularApiName: singularName, pluralApiName: pluralName } = model;\n\n    return /* GraphQL */ `\n        \"\"\"${model.description || singularName}\"\"\"\n        type ${singularName} {\n            id: ID!\n            entryId: String!\n            createdOn: DateTime!\n            savedOn: DateTime!\n            createdBy: CmsIdentity!\n            ownedBy: CmsIdentity!\n            modifiedBy: CmsIdentity\n            meta: ${singularName}Meta\n            ${fields.map(f => f.fields).join(\"\\n\")}\n        }\n\n        type ${singularName}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: [${singularName}!]\n            title: String\n            description: String\n            image: 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 ${singularName}Input {\n                id: ID\n            ${inputFields.map(f => f.fields).join(\"\\n\")}\n        }`\n        }\n\n        ${\n            getFilterFieldsRender &&\n            `input ${singularName}GetWhereInput {\n            ${getFilterFieldsRender}\n        }`\n        }\n\n\n        ${\n            listFilterFieldsRender &&\n            `input ${singularName}ListWhereInput {\n                ${listFilterFieldsRender}\n                AND: [${singularName}ListWhereInput!]\n                OR: [${singularName}ListWhereInput!]\n        }`\n        }\n\n        type ${singularName}Response {\n            data: ${singularName}\n            error: CmsError\n        }\n\n        type ${singularName}ArrayResponse {\n            data: [${singularName}]\n            error: CmsError\n        }\n\n        type ${singularName}ListResponse {\n            data: [${singularName}]\n            meta: CmsListMeta\n            error: CmsError\n        }\n\n        ${\n            sortEnumRender &&\n            `enum ${singularName}ListSorter {\n            ${sortEnumRender}\n        }`\n        }\n\n        extend type Query {\n            get${singularName}(revision: ID, entryId: ID, status: CmsEntryStatusType): ${singularName}Response\n    \n            get${singularName}Revisions(id: ID!): ${singularName}ArrayResponse\n    \n            get${pluralName}ByIds(revisions: [ID!]!): ${singularName}ArrayResponse\n    \n            list${pluralName} (\n                where: ${singularName}ListWhereInput\n                sort: [${singularName}ListSorter]\n                limit: Int\n                after: String\n            ): ${singularName}ListResponse\n        }\n\n        extend type Mutation {\n            create${singularName}(data: ${singularName}Input!): ${singularName}Response\n    \n            create${singularName}From(revision: ID!, data: ${singularName}Input): ${singularName}Response\n    \n            update${singularName}(revision: ID!, data: ${singularName}Input!): ${singularName}Response\n    \n            delete${singularName}(revision: ID!): CmsDeleteResponse\n    \n            publish${singularName}(revision: ID!): ${singularName}Response\n    \n            republish${singularName}(revision: ID!): ${singularName}Response\n    \n            unpublish${singularName}(revision: ID!): ${singularName}Response\n        }\n    `;\n};\n"],"mappings":"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"}

package/graphql/schema/createPreviewResolvers.js

@@ -9,8 +9,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _resolveGet = require("./resolvers/preview/resolveGet");
 var _resolveList = require("./resolvers/preview/resolveList");
 var _createFieldResolvers = require("./createFieldResolvers");
-var _createTypeName = require("../../utils/createTypeName");
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 const createPreviewResolvers = ({
   models,
   model,
@@ -21,8 +19,6 @@ const createPreviewResolvers = ({
       Query: {}
     };
   }
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
   const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
     endpointType: "read",
     models,
@@ -30,16 +26,16 @@ const createPreviewResolvers = ({
     fieldTypePlugins
   });
   const fieldResolvers = createFieldResolvers({
-    graphQLType: rTypeName,
+    graphQLType: model.singularApiName,
     fields: model.fields,
     isRoot: true
   });
   return (0, _objectSpread2.default)({
     Query: {
-      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+      [`get${model.singularApiName}`]: (0, _resolveGet.resolveGet)({
         model
       }),
-      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+      [`list${model.pluralApiName}`]: (0, _resolveList.resolveList)({
         model
       })
     }

package/graphql/schema/createPreviewResolvers.js.map

@@ -1 +1 @@
-{"version":3,"names":["createPreviewResolvers","models","model","fieldTypePlugins","fields","length","Query","typeName","createTypeName","modelId","rTypeName","createReadTypeName","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","isRoot","resolveGet","pluralizedTypeName","resolveList"],"sources":["createPreviewResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/preview/resolveGet\";\nimport { resolveList } from \"./resolvers/preview/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 createPreviewResolvers: CreateReadResolvers = ({\n    models,\n    model,\n    fieldTypePlugins\n}) => {\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,sBAA2C,GAAG,CAAC;EACxDC,MAAM;EACNC,KAAK;EACLC;AACJ,CAAC,KAAK;EACF,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":["createPreviewResolvers","models","model","fieldTypePlugins","fields","length","Query","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","singularApiName","isRoot","resolveGet","pluralApiName","resolveList"],"sources":["createPreviewResolvers.ts"],"sourcesContent":["import { CmsModel, CmsFieldTypePlugins, CmsContext } from \"~/types\";\nimport { resolveGet } from \"./resolvers/preview/resolveGet\";\nimport { resolveList } from \"./resolvers/preview/resolveList\";\nimport { createFieldResolversFactory } from \"./createFieldResolvers\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\n\nexport interface CreateReadResolvers {\n    // TODO @ts-refactor determine correct type.\n    (params: CreateReadResolversParams): any;\n}\n\nexport const createPreviewResolvers: CreateReadResolvers = ({\n    models,\n    model,\n    fieldTypePlugins\n}) => {\n    if (model.fields.length === 0) {\n        return {\n            Query: {}\n        };\n    }\n\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: model.singularApiName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${model.singularApiName}`]: resolveGet({ model }),\n            [`list${model.pluralApiName}`]: resolveList({ model })\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;AACA;AACA;AACA;AAcO,MAAMA,sBAA2C,GAAG,CAAC;EACxDC,MAAM;EACNC,KAAK;EACLC;AACJ,CAAC,KAAK;EACF,IAAID,KAAK,CAACE,MAAM,CAACC,MAAM,KAAK,CAAC,EAAE;IAC3B,OAAO;MACHC,KAAK,EAAE,CAAC;IACZ,CAAC;EACL;EAEA,MAAMC,oBAAoB,GAAG,IAAAC,iDAA2B,EAAC;IACrDC,YAAY,EAAE,MAAM;IACpBR,MAAM;IACNC,KAAK;IACLC;EACJ,CAAC,CAAC;EAEF,MAAMO,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAET,KAAK,CAACU,eAAe;IAClCR,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBS,MAAM,EAAE;EACZ,CAAC,CAAC;EAEF;IACIP,KAAK,EAAE;MACH,CAAE,MAAKJ,KAAK,CAACU,eAAgB,EAAC,GAAG,IAAAE,sBAAU,EAAC;QAAEZ;MAAM,CAAC,CAAC;MACtD,CAAE,OAAMA,KAAK,CAACa,aAAc,EAAC,GAAG,IAAAC,wBAAW,EAAC;QAAEd;MAAM,CAAC;IACzD;EAAC,GACEQ,cAAc;AAEzB,CAAC;AAAC"}

package/graphql/schema/createReadResolvers.js

@@ -9,8 +9,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _resolveGet = require("./resolvers/read/resolveGet");
 var _resolveList = require("./resolvers/read/resolveList");
 var _createFieldResolvers = require("./createFieldResolvers");
-var _createTypeName = require("../../utils/createTypeName");
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 const createReadResolvers = ({
   models,
   model,
@@ -21,8 +19,6 @@ const createReadResolvers = ({
       Query: {}
     };
   }
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
   const createFieldResolvers = (0, _createFieldResolvers.createFieldResolversFactory)({
     endpointType: "read",
     models,
@@ -30,20 +26,20 @@ const createReadResolvers = ({
     fieldTypePlugins
   });
   const fieldResolvers = createFieldResolvers({
-    graphQLType: rTypeName,
+    graphQLType: model.singularApiName,
     fields: model.fields,
     isRoot: true
   });
   return (0, _objectSpread2.default)({
     Query: {
-      [`get${typeName}`]: (0, _resolveGet.resolveGet)({
+      [`get${model.singularApiName}`]: (0, _resolveGet.resolveGet)({
         model
       }),
-      [`list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}`]: (0, _resolveList.resolveList)({
+      [`list${model.pluralApiName}`]: (0, _resolveList.resolveList)({
         model
       })
     },
-    [rTypeName]: {
+    [model.singularApiName]: {
       modelId: () => {
         return model.modelId;
       }

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        [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"}
+{"version":3,"names":["createReadResolvers","models","model","fieldTypePlugins","fields","length","Query","createFieldResolvers","createFieldResolversFactory","endpointType","fieldResolvers","graphQLType","singularApiName","isRoot","resolveGet","pluralApiName","resolveList","modelId"],"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\";\n\ninterface CreateReadResolversParams {\n    models: CmsModel[];\n    model: CmsModel;\n    context: CmsContext;\n    fieldTypePlugins: CmsFieldTypePlugins;\n}\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\n    const createFieldResolvers = createFieldResolversFactory({\n        endpointType: \"read\",\n        models,\n        model,\n        fieldTypePlugins\n    });\n\n    const fieldResolvers = createFieldResolvers({\n        graphQLType: model.singularApiName,\n        fields: model.fields,\n        isRoot: true\n    });\n\n    return {\n        Query: {\n            [`get${model.singularApiName}`]: resolveGet({ model }),\n            [`list${model.pluralApiName}`]: resolveList({ model })\n        },\n        [model.singularApiName]: {\n            modelId: () => {\n                return model.modelId;\n            }\n        },\n        ...fieldResolvers\n    };\n};\n"],"mappings":";;;;;;;;AACA;AACA;AACA;AAcO,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;EAEA,MAAMC,oBAAoB,GAAG,IAAAC,iDAA2B,EAAC;IACrDC,YAAY,EAAE,MAAM;IACpBR,MAAM;IACNC,KAAK;IACLC;EACJ,CAAC,CAAC;EAEF,MAAMO,cAAc,GAAGH,oBAAoB,CAAC;IACxCI,WAAW,EAAET,KAAK,CAACU,eAAe;IAClCR,MAAM,EAAEF,KAAK,CAACE,MAAM;IACpBS,MAAM,EAAE;EACZ,CAAC,CAAC;EAEF;IACIP,KAAK,EAAE;MACH,CAAE,MAAKJ,KAAK,CAACU,eAAgB,EAAC,GAAG,IAAAE,sBAAU,EAAC;QAAEZ;MAAM,CAAC,CAAC;MACtD,CAAE,OAAMA,KAAK,CAACa,aAAc,EAAC,GAAG,IAAAC,wBAAW,EAAC;QAAEd;MAAM,CAAC;IACzD,CAAC;IACD,CAACA,KAAK,CAACU,eAAe,GAAG;MACrBK,OAAO,EAAE,MAAM;QACX,OAAOf,KAAK,CAACe,OAAO;MACxB;IACJ;EAAC,GACEP,cAAc;AAEzB,CAAC;AAAC"}

package/graphql/schema/createReadSDL.d.ts

@@ -1,6 +1,7 @@
 import { CmsModel, CmsFieldTypePlugins } from "../../types";
 import { CmsGraphQLSchemaSorterPlugin } from "../../plugins";
 interface CreateReadSDLParams {
+    models: CmsModel[];
     model: CmsModel;
     fieldTypePlugins: CmsFieldTypePlugins;
     sorterPlugins: CmsGraphQLSchemaSorterPlugin[];

package/graphql/schema/createReadSDL.js

@@ -4,19 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createReadSDL = void 0;
-var _createTypeName = require("../../utils/createTypeName");
 var _renderListFilterFields = require("../../utils/renderListFilterFields");
 var _renderSortEnum = require("../../utils/renderSortEnum");
 var _renderFields = require("../../utils/renderFields");
 var _renderGetFilterFields = require("../../utils/renderGetFilterFields");
-var _pluralizedTypeName = require("../../utils/pluralizedTypeName");
 const createReadSDL = ({
+  models,
   model,
   fieldTypePlugins,
   sorterPlugins
 }) => {
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const rTypeName = (0, _createTypeName.createReadTypeName)(typeName);
   const type = "read";
   const listFilterFieldsRender = (0, _renderListFilterFields.renderListFilterFields)({
     model,
@@ -33,6 +30,7 @@ const createReadSDL = ({
     fieldTypePlugins
   });
   const fieldsRender = (0, _renderFields.renderFields)({
+    models,
     model,
     type,
     fieldTypePlugins
@@ -41,57 +39,61 @@ const createReadSDL = ({
     return "";
   }
   const hasModelIdField = model.fields.some(f => f.fieldId === "modelId");
+  const {
+    singularApiName: singularName,
+    pluralApiName: pluralName
+  } = model;
   return `
-        """${model.description || ""}"""
-        type ${rTypeName} {
+        """${model.description || singularName}"""
+        type ${singularName} {
             id: ID!
             entryId: String!
             ${hasModelIdField ? "" : "modelId: String!"}
             createdOn: DateTime!
             savedOn: DateTime!
-            createdBy: CmsCreatedBy!
-            ownedBy: CmsOwnedBy!
+            createdBy: CmsIdentity!
+            ownedBy: CmsIdentity!
             ${fieldsRender.map(f => f.fields).join("\n")}
         }
         
         ${fieldsRender.map(f => f.typeDefs).filter(Boolean).join("\n")}
         
-        ${getFilterFieldsRender && `input ${rTypeName}GetWhereInput {
+        ${getFilterFieldsRender && `input ${singularName}GetWhereInput {
             ${getFilterFieldsRender}
         }`}
         
         
-        ${listFilterFieldsRender && `input ${rTypeName}ListWhereInput {
+        ${listFilterFieldsRender && `input ${singularName}ListWhereInput {
                 ${listFilterFieldsRender}
-                AND: [${rTypeName}ListWhereInput!]
-                OR: [${rTypeName}ListWhereInput!]
+                AND: [${singularName}ListWhereInput!]
+                OR: [${singularName}ListWhereInput!]
         }`}
         
         
-        ${sortEnumRender && `enum ${rTypeName}ListSorter {
+        ${sortEnumRender && `enum ${singularName}ListSorter {
             ${sortEnumRender}
         }`}
         
-        type ${rTypeName}Response {
-            data: ${rTypeName}
+        type ${singularName}Response {
+            data: ${singularName}
             error: CmsError
         }
         
-        type ${rTypeName}ListResponse {
-            data: [${rTypeName}]
+        type ${singularName}ListResponse {
+            data: [${singularName}]
             meta: CmsListMeta
             error: CmsError
         }
         
         extend type Query {
-            get${typeName}(where: ${rTypeName}GetWhereInput!): ${rTypeName}Response
+            get${singularName}(where: ${singularName}GetWhereInput!): ${singularName}Response
 
-            list${(0, _pluralizedTypeName.pluralizedTypeName)(typeName)}(
-                where: ${rTypeName}ListWhereInput
-                sort: [${rTypeName}ListSorter]
+            list${pluralName}(
+                where: ${singularName}ListWhereInput
+                sort: [${singularName}ListSorter]
                 limit: Int
                 after: String
-            ): ${rTypeName}ListResponse
+            ): ${singularName}ListResponse
         }
     `;
 };