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

package/graphql/schema/createFieldResolvers.js

@@ -1,39 +1,28 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createFieldResolversFactory = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 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) => {
   const baseType = (0, _getBaseFieldType.getBaseFieldType)(field);
-
   if (!plugins[baseType]) {
     return null;
   } else if (!plugins[baseType][endpointType]) {
     return null;
   }
-
   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".
  */
-
-
 const createFieldResolversFactory = factoryParams => {
   const {
     endpointType,
@@ -50,7 +39,6 @@ const createFieldResolversFactory = factoryParams => {
     } = params;
     const fieldResolvers = (0, _objectSpread2.default)({}, extraResolvers);
     const typeResolvers = {};
-
     for (const field of fields) {
       if (!fieldTypePlugins[(0, _getBaseFieldType.getBaseFieldType)(field)]) {
         continue;
@@ -58,14 +46,11 @@ const createFieldResolversFactory = factoryParams => {
       /**
        * Field that is passed into this factory MUST have fieldId, so filter it before the method call.
        */
-
-
       if (!field.fieldId) {
         throw new _error.default("Field is missing an `fieldId`. Cannot process field without the `fieldId` in the resolvers.", "FIELD_ID_ERROR", {
           field
         });
       }
-
       const createResolver = getCreateResolver(fieldTypePlugins, field, endpointType);
       let resolver;
       const fieldResolver = createResolver ? createResolver({
@@ -75,11 +60,11 @@ const createFieldResolversFactory = factoryParams => {
         field,
         createFieldResolvers
       }) : null;
+
       /**
        * When fieldResolver is false it will completely skip adding field fieldId into the resolvers.
        * This is to fix the breaking of GraphQL schema.
        */
-
       if (fieldResolver === false) {
         continue;
       } else if (typeof fieldResolver === "function") {
@@ -88,34 +73,38 @@ const createFieldResolversFactory = factoryParams => {
         resolver = fieldResolver.resolver;
         Object.assign(typeResolvers, fieldResolver.typeResolvers);
       }
-
       const {
         fieldId
-      } = field; // TODO @ts-refactor figure out types for parameters
+      } = field;
+      // 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) {
           return isRoot ? parent.values[fieldId] : parent[fieldId];
         }
-
         return await resolver(isRoot ? parent.values : parent, args, context, info);
       };
     }
-
     return (0, _objectSpread2.default)({
       [graphQLType]: fieldResolvers
     }, typeResolvers);
   };
 };
-
 exports.createFieldResolversFactory = createFieldResolversFactory;

package/graphql/schema/createFieldResolvers.js.map

@@ -1 +1 @@
-{"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","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\";\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                // 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/createManageResolvers.d.ts

@@ -1,4 +1,4 @@
-import { CmsModel, CmsFieldTypePlugins, CmsContext } from "../../types";
+import { CmsFieldTypePlugins, CmsContext, CmsModel } from "../../types";
 interface CreateManageResolversParams {
     models: CmsModel[];
     model: CmsModel;

package/graphql/schema/createManageResolvers.js

@@ -1,46 +1,27 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createManageResolvers = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _commonFieldResolvers = require("./resolvers/commonFieldResolvers");
-
 var _resolveGet = require("./resolvers/manage/resolveGet");
-
 var _resolveList = require("./resolvers/manage/resolveList");
-
 var _resolveGetRevisions = require("./resolvers/manage/resolveGetRevisions");
-
 var _resolveGetByIds = require("./resolvers/manage/resolveGetByIds");
-
 var _resolveCreate = require("./resolvers/manage/resolveCreate");
-
 var _resolveUpdate = require("./resolvers/manage/resolveUpdate");
-
 var _resolveDelete = require("./resolvers/manage/resolveDelete");
-
 var _resolvePublish = require("./resolvers/manage/resolvePublish");
-
 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,
@@ -52,9 +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,
@@ -62,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"
@@ -70,68 +48,80 @@ const createManageResolvers = ({
       meta(entry) {
         return entry;
       }
-
     })
   });
   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;
       },
-
       data: entry => {
         return entry.meta || {};
       },
-
       async revisions(entry, _, context) {
         const revisions = await context.cms.getEntryRevisions(model, entry.entryId);
         return revisions.sort((a, b) => b.version - a.version);
       }
-
     }
   });
 };
-
 exports.createManageResolvers = createManageResolvers;

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,7 +1,10 @@
 import { CmsFieldTypePlugins, CmsModel } from "../../types";
+import { CmsGraphQLSchemaSorterPlugin } from "../../plugins";
 interface CreateManageSDLParams {
+    models: CmsModel[];
     model: CmsModel;
     fieldTypePlugins: CmsFieldTypePlugins;
+    sorterPlugins: CmsGraphQLSchemaSorterPlugin[];
 }
 interface CreateManageSDL {
     (params: CreateManageSDLParams): string;

package/graphql/schema/createManageSDL.js

@@ -4,27 +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
+  fieldTypePlugins,
+  sorterPlugins
 }) => {
-  const typeName = (0, _createTypeName.createTypeName)(model.modelId);
-  const mTypeName = (0, _createTypeName.createManageTypeName)(typeName);
   const listFilterFieldsRender = (0, _renderListFilterFields.renderListFilterFields)({
     model,
     type: "manage",
@@ -32,42 +22,46 @@ const createManageSDL = ({
   });
   const sortEnumRender = (0, _renderSortEnum.renderSortEnum)({
     model,
-    fieldTypePlugins
+    fieldTypePlugins,
+    sorterPlugins
   });
   const getFilterFieldsRender = (0, _renderGetFilterFields.renderGetFilterFields)({
     model,
     fieldTypePlugins
   });
   const inputFields = (0, _renderInputFields.renderInputFields)({
+    models,
     model,
     fieldTypePlugins
   });
   const fields = (0, _renderFields.renderFields)({
+    models,
     model,
     type: "manage",
     fieldTypePlugins
   });
-
   if (inputFields.length === 0) {
     return "";
   }
-
-  return (
-    /* GraphQL */
-    `
-        """${model.description || model.modelId}"""
-        type ${mTypeName} {
+  const {
+    singularApiName: singularName,
+    pluralApiName: pluralName
+  } = model;
+  return (/* GraphQL */`
+        """${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
@@ -77,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.
             """
@@ -86,76 +82,76 @@ 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
         }
     `
   );
 };
-
 exports.createManageSDL = createManageSDL;