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

package/graphql/schema/baseContentSchema.js

@@ -1,24 +1,19 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBaseContentSchema = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _builtInTypes = require("@webiny/handler-graphql/builtInTypes");
-
-var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
-
-const createBaseContentSchema = context => {
+var _plugins = require("../../plugins");
+const createBaseContentSchema = ({
+  context
+}) => {
   const scalars = context.plugins.byType("graphql-scalar").map(item => item.scalar);
-  return new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
-    typeDefs:
-    /* GraphQL */
-    `
+  const plugin = new _plugins.CmsGraphQLSchemaPlugin({
+    typeDefs: /* GraphQL */`
             ${scalars.map(scalar => `scalar ${scalar.name}`).join(" ")}
             scalar JSON
             scalar Long
@@ -36,13 +31,7 @@ const createBaseContentSchema = context => {
                 _empty: String
             }
 
-            type CmsCreatedBy {
-                id: String
-                displayName: String
-                type: String
-            }
-
-            type CmsOwnedBy {
+            type CmsIdentity {
                 id: String
                 displayName: String
                 type: String
@@ -59,7 +48,7 @@ const createBaseContentSchema = context => {
     }, {})), {}, {
       JSON: _builtInTypes.JsonScalar,
       Long: _builtInTypes.LongScalar,
-      RefInput: _builtInTypes.RefInput,
+      RefInput: _builtInTypes.RefInputScalar,
       Number: _builtInTypes.NumberScalar,
       Any: _builtInTypes.AnyScalar,
       DateTime: _builtInTypes.DateTimeScalar,
@@ -71,6 +60,7 @@ const createBaseContentSchema = context => {
       }
     })
   });
+  plugin.name = `headless-cms.graphql.schema.baseContentSchema`;
+  return plugin;
 };
-
 exports.createBaseContentSchema = createBaseContentSchema;

package/graphql/schema/baseContentSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","GraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInput,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { GraphQLScalarType } from \"graphql\";\n\nexport const createBaseContentSchema = (context: CmsContext): GraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    return new GraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsCreatedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsOwnedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {} as Record<string, GraphQLScalarType>),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n};\n"],"mappings":";;;;;;;;;;;AAEA;;AAWA;;AAGO,MAAMA,uBAAuB,GAAIC,OAAD,IAA8C;EACjF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAR,CACXC,MADW,CACiB,gBADjB,EAEXC,GAFW,CAEPC,IAAI,IAAIA,IAAI,CAACC,MAFN,CAAhB;EAIA,OAAO,IAAIC,wCAAJ,CAAwB;IAC3BC,QAAQ;IAAE;IAAe;AACjC,cAAcP,OAAO,CAACG,GAAR,CAAYE,MAAM,IAAK,UAASA,MAAM,CAACG,IAAK,EAA5C,EAA+CC,IAA/C,CAAoD,GAApD,CAAyD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAnCmC;IAoC3BC,SAAS,8DACFV,OAAO,CAACW,MAAR,CAAe,CAACC,GAAD,EAAMC,CAAN,KAAY;MAC1BD,GAAG,CAACC,CAAC,CAACL,IAAH,CAAH,GAAcK,CAAd;MACA,OAAOD,GAAP;IACH,CAHE,EAGA,EAHA,CADE;MAKLE,IAAI,EAAEC,wBALD;MAMLC,IAAI,EAAEC,wBAND;MAOLC,QAAQ,EAARA,sBAPK;MAQLC,MAAM,EAAEC,0BARH;MASLC,GAAG,EAAEC,uBATA;MAULC,QAAQ,EAAEC,4BAVL;MAWLC,SAAS,EAAEC,6BAXN;MAYLC,IAAI,EAAEC,wBAZD;MAaLC,IAAI,EAAEC,wBAbD;MAcLC,QAAQ,EAAE;QACNC,MAAM,EAAE,MAAM;MADR;IAdL;EApCkB,CAAxB,CAAP;AAuDH,CA5DM"}
+{"version":3,"names":["createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","CmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLScalarType } from \"graphql\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createBaseContentSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;;;AAEA;AAYA;AAKO,MAAMA,uBAAuB,GAAG,CAAC;EAAEC;AAAgB,CAAC,KAA6B;EACpF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAIC,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACI,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,8DACFX,OAAO,CAACY,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;MAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;MACf,OAAOD,GAAG;IACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAE,MAAM;MAClB;IAAC;EAET,CAAC,CAAC;EACF5B,MAAM,CAACG,IAAI,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC"}

package/graphql/schema/baseSchema.d.ts

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

package/graphql/schema/baseSchema.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createBaseSchema = void 0;
+var _plugins = require("../../plugins");
+var _handlerGraphql = require("@webiny/handler-graphql");
+const createBaseSchema = () => {
+  const cmsPlugin = new _plugins.CmsGraphQLSchemaPlugin({
+    typeDefs: /* GraphQL */`
+            type CmsError {
+                code: String
+                message: String
+                data: JSON
+                stack: String
+            }
+
+            type CmsCursors {
+                next: String
+                previous: String
+            }
+
+            type CmsListMeta {
+                cursor: String
+                hasMoreItems: Boolean
+                totalCount: Int
+            }
+
+            type CmsDeleteResponse {
+                data: Boolean
+                error: CmsError
+            }
+
+            type CmsBooleanResponse {
+                data: Boolean
+                error: CmsError
+            }
+        `,
+    resolvers: {}
+  });
+  cmsPlugin.name = "headless-cms.graphql.schema.base";
+  const corePlugin = new _handlerGraphql.GraphQLSchemaPlugin({
+    typeDefs: cmsPlugin.schema.typeDefs,
+    resolvers: cmsPlugin.schema.resolvers
+  });
+  corePlugin.name = "headless-cms.graphql.core.schema.base";
+  /**
+   * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.
+   */
+  return [cmsPlugin, corePlugin];
+};
+exports.createBaseSchema = createBaseSchema;

package/graphql/schema/baseSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createBaseSchema","cmsPlugin","CmsGraphQLSchemaPlugin","typeDefs","resolvers","name","corePlugin","GraphQLSchemaPlugin","schema"],"sources":["baseSchema.ts"],"sourcesContent":["import { CmsContext } from \"~/types\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql\";\n\nexport const createBaseSchema = (): GraphQLSchemaPlugin<CmsContext>[] => {\n    const cmsPlugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            type CmsError {\n                code: String\n                message: String\n                data: JSON\n                stack: String\n            }\n\n            type CmsCursors {\n                next: String\n                previous: String\n            }\n\n            type CmsListMeta {\n                cursor: String\n                hasMoreItems: Boolean\n                totalCount: Int\n            }\n\n            type CmsDeleteResponse {\n                data: Boolean\n                error: CmsError\n            }\n\n            type CmsBooleanResponse {\n                data: Boolean\n                error: CmsError\n            }\n        `,\n        resolvers: {}\n    });\n    cmsPlugin.name = \"headless-cms.graphql.schema.base\";\n    const corePlugin = new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: cmsPlugin.schema.typeDefs,\n        resolvers: cmsPlugin.schema.resolvers\n    });\n    corePlugin.name = \"headless-cms.graphql.core.schema.base\";\n    /**\n     * Due to splitting of CMS and Core schema plugins, we must have both defined for CMS to work.\n     */\n    return [cmsPlugin, corePlugin];\n};\n"],"mappings":";;;;;;AACA;AACA;AAEO,MAAMA,gBAAgB,GAAG,MAAyC;EACrE,MAAMC,SAAS,GAAG,IAAIC,+BAAsB,CAAC;IACzCC,QAAQ,EAAE,aAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,EAAE,CAAC;EAChB,CAAC,CAAC;EACFH,SAAS,CAACI,IAAI,GAAG,kCAAkC;EACnD,MAAMC,UAAU,GAAG,IAAIC,mCAAmB,CAAa;IACnDJ,QAAQ,EAAEF,SAAS,CAACO,MAAM,CAACL,QAAQ;IACnCC,SAAS,EAAEH,SAAS,CAACO,MAAM,CAACJ;EAChC,CAAC,CAAC;EACFE,UAAU,CAACD,IAAI,GAAG,uCAAuC;EACzD;AACJ;AACA;EACI,OAAO,CAACJ,SAAS,EAAEK,UAAU,CAAC;AAClC,CAAC;AAAC"}

package/graphql/schema/contentEntries.d.ts

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

package/graphql/schema/contentEntries.js

@@ -1,59 +1,71 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createContentEntriesSchema = void 0;
-
+var _error = _interopRequireDefault(require("@webiny/error"));
 var _handlerGraphql = require("@webiny/handler-graphql");
-
 var _apiSecurity = require("@webiny/api-security");
-
-var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
-
 var _getEntryTitle = require("../../utils/getEntryTitle");
-
-var _error = _interopRequireDefault(require("@webiny/error"));
-
+var _plugins = require("../../plugins");
+var _getEntryDescription = require("../../utils/getEntryDescription");
+var _getEntryImage = require("../../utils/getEntryImage");
+var _entryStorage = require("../../utils/entryStorage");
+const createDate = date => {
+  try {
+    return new Date(date);
+  } catch {}
+  return new Date();
+};
+const createCmsEntryRecord = (model, entry) => {
+  return {
+    id: entry.id,
+    entryId: entry.entryId,
+    model: {
+      modelId: model.modelId,
+      name: model.name
+    },
+    status: entry.status,
+    title: (0, _getEntryTitle.getEntryTitle)(model, entry),
+    description: (0, _getEntryDescription.getEntryDescription)(model, entry),
+    image: (0, _getEntryImage.getEntryImage)(model, entry),
+    createdBy: entry.createdBy,
+    modifiedBy: entry.modifiedBy,
+    createdOn: createDate(entry.createdOn),
+    savedOn: createDate(entry.savedOn)
+  };
+};
 const getFetchMethod = (type, context) => {
   if (!getContentEntriesMethods[type]) {
     throw new _error.default(`Unknown getContentEntries method "${type}". Could not fetch content entries.`, "UNKNOWN_METHOD_ERROR", {
       type
     });
   }
-
   const methodName = getContentEntriesMethods[type];
-
   if (!context.cms[methodName]) {
     throw new _error.default(`Unknown context.cms method "${methodName}". Could not fetch content entries.`, "UNKNOWN_METHOD_ERROR", {
       type,
       methodName
     });
   }
-
   return context.cms[methodName];
 };
 /**
  * Function to get the list of content entries depending on latest, published or exact GraphQL queries.
  */
-
-
 var GetContentEntryMethods;
-
 (function (GetContentEntryMethods) {
   GetContentEntryMethods["getLatestEntriesByIds"] = "getLatestEntriesByIds";
   GetContentEntryMethods["getPublishedEntriesByIds"] = "getPublishedEntriesByIds";
   GetContentEntryMethods["getEntriesByIds"] = "getEntriesByIds";
 })(GetContentEntryMethods || (GetContentEntryMethods = {}));
-
 const getContentEntriesMethods = {
   latest: "getLatestEntriesByIds",
   published: "getPublishedEntriesByIds",
   exact: "getEntriesByIds"
 };
-
 const getContentEntries = async params => {
   const {
     args,
@@ -73,55 +85,45 @@ const getContentEntries = async params => {
     } else if (collection[ref.modelId].includes(ref.id)) {
       return collection;
     }
-
     collection[ref.modelId].push(ref.id);
     return collection;
   }, {});
   const getters = Object.keys(entriesByModel).map(async modelId => {
     return method(modelsMap[modelId], entriesByModel[modelId]);
   });
-
   if (getters.length === 0) {
     return new _handlerGraphql.Response([]);
   }
-
-  const results = await Promise.all(getters);
-  const entries = results.reduce((collection, items) => {
-    return collection.concat(items.map(item => {
-      const model = modelsMap[item.modelId];
-      return {
-        id: item.id,
-        entryId: item.entryId,
-        model: {
-          modelId: model.modelId,
-          name: model.name
-        },
-        status: item.status,
-        title: (0, _getEntryTitle.getEntryTitle)(model, item)
-      };
-    }));
-  }, []).filter(Boolean);
-  return new _handlerGraphql.Response(entries);
+  try {
+    const results = await Promise.all(getters);
+    const entries = results.reduce((collection, items) => {
+      return collection.concat(items.map(item => {
+        const model = modelsMap[item.modelId];
+        return createCmsEntryRecord(model, item);
+      }));
+    }, []).filter(Boolean);
+    return new _handlerGraphql.Response(entries);
+  } catch (ex) {
+    return new _handlerGraphql.ErrorResponse(ex);
+  }
 };
+
 /**
  * Function to fetch a single content entry depending on latest, published or exact GraphQL query.
  */
 
-
 const getContentEntry = async params => {
   const {
     args,
     context,
     type
   } = params;
-
   if (!getContentEntriesMethods[type]) {
     throw new _error.default(`Unknown getContentEntry method "${type}". Could not fetch content entry.`, "UNKNOWN_METHOD_ERROR", {
       args,
       type
     });
   }
-
   const method = getFetchMethod(type, context);
   const {
     modelId,
@@ -129,7 +131,6 @@ const getContentEntry = async params => {
   } = args.entry;
   const models = await context.cms.listModels();
   const model = models.find(m => m.modelId === modelId);
-
   if (!model) {
     return new _apiSecurity.NotAuthorizedResponse({
       data: {
@@ -137,60 +138,87 @@ const getContentEntry = async params => {
       }
     });
   }
-
   const result = await method(model, [id]);
   const entry = result.shift();
-
   if (!entry) {
     return new _handlerGraphql.Response(null);
   }
-
-  return new _handlerGraphql.Response({
-    id: entry.id,
-    entryId: entry.entryId,
-    model: {
-      modelId: model.modelId,
-      name: model.name
-    },
-    status: entry.status,
-    title: (0, _getEntryTitle.getEntryTitle)(model, entry)
-  });
+  return new _handlerGraphql.Response(createCmsEntryRecord(model, entry));
 };
-
-const createContentEntriesSchema = context => {
+/**
+ * As we support description field, we need to transform the value from storage.
+ */
+const createResolveDescription = () => {
+  return async (parent, _, context) => {
+    const models = await context.cms.listModels();
+    const model = models.find(({
+      modelId
+    }) => {
+      return parent.model.modelId === modelId;
+    });
+    if (!model) {
+      return null;
+    }
+    const field = model.fields.find(f => f.fieldId === model.descriptionFieldId);
+    if (!field) {
+      return null;
+    }
+    const value = parent.description || parent[field.fieldId];
+    if (!value) {
+      return null;
+    }
+    return (0, _entryStorage.entryFieldFromStorageTransform)({
+      context,
+      model,
+      field,
+      value
+    });
+  };
+};
+const createContentEntriesSchema = ({
+  context
+}) => {
   if (!context.cms.MANAGE) {
-    return new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
+    const plugin = new _plugins.CmsGraphQLSchemaPlugin({
       typeDefs: "",
       resolvers: {}
     });
+    plugin.name = `headless-cms.graphql.schema.${context.cms.type}.empty`;
+    return plugin;
   }
-
-  return new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
-    typeDefs:
-    /* GraphQL */
-    `
+  const plugin = new _plugins.CmsGraphQLSchemaPlugin({
+    typeDefs: /* GraphQL */`
             type CmsModelMeta {
-                modelId: String
-                name: String
+                modelId: String!
+                name: String!
             }
 
             type CmsPublishedContentEntry {
                 id: ID!
                 entryId: String!
                 title: String
+                description: String
+                image: String
             }
 
             type CmsContentEntry {
                 id: ID!
                 entryId: String!
-                model: CmsModelMeta
-                status: String
-                title: String
+                model: CmsModelMeta!
+                status: String!
+                title: String!
+                description: String
+                image: String
+                createdBy: CmsIdentity!
+                ownedBy: CmsIdentity!
+                modifiedBy: CmsIdentity
                 published: CmsPublishedContentEntry
+                createdOn: DateTime!
+                savedOn: DateTime!
             }
 
             type CmsContentEntriesResponse {
-                data: [CmsContentEntry]
+                data: [CmsContentEntry!]
                 error: CmsError
             }
 
@@ -211,20 +239,20 @@ const createContentEntriesSchema = context => {
                     query: String
                     fields: [String!]
                     limit: Int
-                ): CmsContentEntriesResponse
+                ): CmsContentEntriesResponse!
 
                 # Get content entry meta data
-                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
+                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
 
-                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
-                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
+                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
+                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
 
                 # Get content entries meta data
-                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse
-                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse
+                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse!
+                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse!
                 getPublishedContentEntries(
                     entries: [CmsModelEntryInput!]!
-                ): CmsContentEntriesResponse
+                ): CmsContentEntriesResponse!
             }
         `,
     resolvers: {
@@ -237,26 +265,22 @@ const createContentEntriesSchema = context => {
             }) => {
               return parent.model.modelId === modelId;
             });
-
             if (!model) {
               return null;
             }
-
             const [entry] = await context.cms.getPublishedEntriesByIds(model, [parent.id]);
-
             if (!entry) {
               return null;
             }
-
-            return {
-              id: entry.id,
-              entryId: entry.entryId,
-              title: (0, _getEntryTitle.getEntryTitle)(model, entry)
-            };
+            return createCmsEntryRecord(model, entry);
           } catch (ex) {
             return null;
           }
-        }
+        },
+        description: createResolveDescription()
+      },
+      CmsPublishedContentEntry: {
+        description: createResolveDescription()
       },
       Query: {
         async searchContentEntries(_, args, context) {
@@ -277,24 +301,16 @@ const createContentEntriesSchema = context => {
               fields: fields || []
             });
             return items.map(entry => {
-              return {
-                id: entry.id,
-                entryId: entry.entryId,
-                model: {
-                  modelId: model.modelId,
-                  name: model.name
-                },
-                status: entry.status,
-                title: (0, _getEntryTitle.getEntryTitle)(model, entry),
-                // We need `savedOn` to sort entries from latest to oldest
-                savedOn: entry.savedOn
-              };
+              return createCmsEntryRecord(model, entry);
             });
           });
-          const entries = await Promise.all(getters).then(results => results.reduce((result, item) => result.concat(item), []));
-          return new _handlerGraphql.Response(entries.sort((a, b) => Date.parse(b.savedOn) - Date.parse(a.savedOn)).slice(0, limit));
+          try {
+            const entries = await Promise.all(getters).then(results => results.reduce((result, item) => result.concat(item), []));
+            return new _handlerGraphql.Response(entries.sort((a, b) => b.savedOn.getTime() - a.savedOn.getTime()).slice(0, limit));
+          } catch (ex) {
+            return new _handlerGraphql.ErrorResponse(ex);
+          }
         },
-
         async getContentEntry(_, args, context) {
           return getContentEntry({
             args,
@@ -302,7 +318,6 @@ const createContentEntriesSchema = context => {
             type: "exact"
           });
         },
-
         async getLatestContentEntry(_, args, context) {
           return getContentEntry({
             args,
@@ -310,7 +325,6 @@ const createContentEntriesSchema = context => {
             type: "latest"
           });
         },
-
         async getPublishedContentEntry(_, args, context) {
           return getContentEntry({
             args,
@@ -318,7 +332,6 @@ const createContentEntriesSchema = context => {
             type: "published"
           });
         },
-
         async getContentEntries(_, args, context) {
           return getContentEntries({
             args,
@@ -326,7 +339,6 @@ const createContentEntriesSchema = context => {
             type: "exact"
           });
         },
-
         async getLatestContentEntries(_, args, context) {
           return getContentEntries({
             args,
@@ -334,7 +346,6 @@ const createContentEntriesSchema = context => {
             type: "latest"
           });
         },
-
         async getPublishedContentEntries(_, args, context) {
           return getContentEntries({
             args,
@@ -342,10 +353,10 @@ const createContentEntriesSchema = context => {
             type: "published"
           });
         }
-
       }
     }
   });
+  plugin.name = `headless-cms.graphql.schema.${context.cms.type}.content-entries`;
+  return plugin;
 };
-
 exports.createContentEntriesSchema = createContentEntriesSchema;