Pass easier-to-understand options instead of arguments to Mutation.composeMutationResolver() and Query.composeQueryResolver()

packages/strapi-plugin-graphql/services/Mutation.js

@@ -19,7 +19,7 @@ module.exports = {
    * @return Promise or Error.
    */
 
-  composeMutationResolver: function(_schema, plugin, name, action) {
+  composeMutationResolver: function({ _schema, plugin, name, action }) {
     // Extract custom resolver or type description.
     const { resolver: handler = {} } = _schema;
 

packages/strapi-plugin-graphql/services/Query.js

@@ -69,7 +69,7 @@ module.exports = {
    * @return Promise or Error.
    */
 
-  composeQueryResolver: function(_schema, plugin, name, isSingular) {
+  composeQueryResolver: function({ _schema, plugin, name, isSingular }) {
     const params = {
       model: name,
     };

packages/strapi-plugin-graphql/services/Resolvers.js

@@ -326,11 +326,21 @@ const buildShadowCRUD = (models, plugin) => {
     const queries = {
       singular:
         _.get(resolver, `Query.${singularName}`) !== false
-          ? Query.composeQueryResolver(_schema, plugin, name, true)
+          ? Query.composeQueryResolver({
+              _schema,
+              plugin,
+              name,
+              isSingular: true,
+            })
           : null,
       plural:
         _.get(resolver, `Query.${pluralName}`) !== false
-          ? Query.composeQueryResolver(_schema, plugin, name, false)
+          ? Query.composeQueryResolver({
+              _schema,
+              plugin,
+              name,
+              isSingular: false,
+            })
           : null,
     };
 
@@ -376,15 +386,30 @@ const buildShadowCRUD = (models, plugin) => {
     const mutations = {
       create:
         _.get(resolver, `Mutation.create${capitalizedName}`) !== false
-          ? Mutation.composeMutationResolver(_schema, plugin, name, 'create')
+          ? Mutation.composeMutationResolver({
+              _schema,
+              plugin,
+              name,
+              action: 'create',
+            })
           : null,
       update:
         _.get(resolver, `Mutation.update${capitalizedName}`) !== false
-          ? Mutation.composeMutationResolver(_schema, plugin, name, 'update')
+          ? Mutation.composeMutationResolver({
+              _schema,
+              plugin,
+              name,
+              action: 'update',
+            })
           : null,
       delete:
         _.get(resolver, `Mutation.delete${capitalizedName}`) !== false
-          ? Mutation.composeMutationResolver(_schema, plugin, name, 'delete')
+          ? Mutation.composeMutationResolver({
+              _schema,
+              plugin,
+              name,
+              action: 'delete',
+            })
           : null,
     };
 

packages/strapi-plugin-graphql/services/Schema.js

@@ -228,22 +228,22 @@ const schemaBuilder = {
               const [name, action] = acc[type][resolver].split('.');
               const normalizedName = _.toLower(name);
 
-              acc[type][resolver] = Mutation.composeMutationResolver(
+              acc[type][resolver] = Mutation.composeMutationResolver({
-                strapi.plugins.graphql.config._schema.graphql,
+                _schema: strapi.plugins.graphql.config._schema.graphql,
                 plugin,
-                normalizedName,
+                name: normalizedName,
-                action
+                action,
-              );
+              });
               break;
             }
             case 'Query':
             default:
-              acc[type][resolver] = Query.composeQueryResolver(
+              acc[type][resolver] = Query.composeQueryResolver({
-                strapi.plugins.graphql.config._schema.graphql,
+                _schema: strapi.plugins.graphql.config._schema.graphql,
                 plugin,
-                resolver,
+                name: resolver,
-                'force' // Avoid singular/pluralize and force query name.
+                isSingular: 'force', // Avoid singular/pluralize and force query name.
-              );
+              });
               break;
           }
         }