@strapi/plugin-graphql 4.7.2-exp.175f7ac70ee76d6c825e4429e15fc85ee78d23bb → 4.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "4.7.2-exp.175f7ac70ee76d6c825e4429e15fc85ee78d23bb",
+  "version": "4.8.0",
   "description": "Adds GraphQL endpoint with default API methods.",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
   "dependencies": {
     "@graphql-tools/schema": "8.5.1",
     "@graphql-tools/utils": "^8.12.0",
-    "@strapi/design-system": "1.6.3",
-    "@strapi/helper-plugin": "4.7.2-exp.175f7ac70ee76d6c825e4429e15fc85ee78d23bb",
-    "@strapi/icons": "1.6.3",
-    "@strapi/utils": "4.7.2-exp.175f7ac70ee76d6c825e4429e15fc85ee78d23bb",
+    "@strapi/design-system": "1.6.5",
+    "@strapi/helper-plugin": "4.8.0",
+    "@strapi/icons": "1.6.5",
+    "@strapi/utils": "4.8.0",
     "apollo-server-core": "3.11.1",
     "apollo-server-koa": "3.10.0",
     "glob": "^7.1.7",
@@ -72,5 +72,5 @@
     "description": "Adds GraphQL endpoint with default API methods.",
     "kind": "plugin"
   },
-  "gitHead": "175f7ac70ee76d6c825e4429e15fc85ee78d23bb"
+  "gitHead": "e239e408f99c9e61e6d02b38f01632ce67412f2a"
 }

package/server/services/builders/mutations/single-type.js

@@ -53,7 +53,7 @@ module.exports = ({ strapi }) => {
           .get('content-api')
           .buildMutationsResolvers({ contentType });
 
-        const sanitizedParams = await sanitize.contentAPI.params(
+        const sanitizedQuery = await sanitize.contentAPI.query(
           omit(['data', 'files'], transformedArgs),
           contentType,
           {
@@ -61,7 +61,7 @@ module.exports = ({ strapi }) => {
           }
         );
 
-        const entity = await strapi.entityService.findMany(uid, sanitizedParams);
+        const entity = await strapi.entityService.findMany(uid, sanitizedQuery);
 
         // Create or update
         const value = isNil(entity)
@@ -91,11 +91,11 @@ module.exports = ({ strapi }) => {
           .get('content-api')
           .buildMutationsResolvers({ contentType });
 
-        const sanitizedParams = await sanitize.contentAPI.params(transformedArgs, contentType, {
+        const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, contentType, {
           auth: ctx?.state?.auth,
         });
 
-        const entity = await strapi.entityService.findMany(uid, sanitizedParams);
+        const entity = await strapi.entityService.findMany(uid, sanitizedQuery);
 
         if (!entity) {
           throw new NotFoundError('Entity not found');

package/server/services/builders/resolvers/association.js

@@ -41,23 +41,19 @@ module.exports = ({ strapi }) => {
           usePagination: true,
         });
 
-        const sanitizedParams = await sanitize.contentAPI.params(
-          transformedArgs,
-          targetContentType,
-          {
-            auth,
-          }
-        );
+        const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, targetContentType, {
+          auth,
+        });
 
         const data = await strapi.entityService.load(
           contentTypeUID,
           parent,
           attributeName,
-          sanitizedParams
+          sanitizedQuery
         );
 
         const info = {
-          args: sanitizedParams,
+          args: sanitizedQuery,
           resourceUID: targetUID,
         };
 

package/server/services/builders/resolvers/component.js

@@ -13,10 +13,10 @@ module.exports = ({ strapi }) => ({
       const component = strapi.getModel(componentName);
 
       const transformedArgs = transformArgs(args, { contentType: component, usePagination: true });
-      const sanitizedParams = await sanitize.contentAPI.params(transformedArgs, contentType, {
+      const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, contentType, {
         auth: ctx?.state?.auth,
       });
-      return strapi.entityService.load(contentTypeUID, parent, attributeName, sanitizedParams);
+      return strapi.entityService.load(contentTypeUID, parent, attributeName, sanitizedQuery);
     };
   },
 });

package/server/services/builders/resolvers/mutation.js

@@ -25,10 +25,10 @@ module.exports = ({ strapi }) => ({
 
       async delete(parent, args, ctx) {
         const { id, ...rest } = args;
-        const sanitizedParams = sanitize.contentAPI.params(rest, contentType, {
+        const sanitizedQuery = sanitize.contentAPI.query(rest, contentType, {
           auth: ctx?.state?.auth,
         });
-        return strapi.entityService.delete(uid, id, sanitizedParams);
+        return strapi.entityService.delete(uid, id, sanitizedQuery);
       },
     };
   },

package/server/services/builders/resolvers/query.js

@@ -9,19 +9,19 @@ module.exports = ({ strapi }) => ({
 
     return {
       async find(parent, args, ctx) {
-        const sanitizedParams = await sanitize.contentAPI.params(args, contentType, {
+        const sanitizedQuery = await sanitize.contentAPI.query(args, contentType, {
           auth: ctx?.state?.auth,
         });
 
-        return strapi.entityService.findMany(uid, sanitizedParams);
+        return strapi.entityService.findMany(uid, sanitizedQuery);
       },
 
       async findOne(parent, args, ctx) {
-        const sanitizedParams = await sanitize.contentAPI.params(args, contentType, {
+        const sanitizedQuery = await sanitize.contentAPI.query(args, contentType, {
           auth: ctx?.state?.auth,
         });
 
-        return strapi.entityService.findOne(uid, args.id, omit('id', sanitizedParams));
+        return strapi.entityService.findOne(uid, args.id, omit('id', sanitizedQuery));
       },
     };
   },

package/server/services/builders/utils.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const { entries, mapValues, omit } = require('lodash/fp');
+const { idArg, nonNull } = require('nexus');
 const {
   pagination: { withDefaultPagination },
   contentTypes: { hasDraftAndPublish },
@@ -37,7 +38,7 @@ module.exports = ({ strapi }) => {
       // Collection Types
       if (kind === 'collectionType') {
         if (!multiple) {
-          return { id: 'ID' };
+          return { id: nonNull(idArg()) };
         }
 
         const params = {

package/server/services/internals/types/response-collection-meta.js

@@ -26,10 +26,10 @@ module.exports = ({ strapi }) => {
             const { start, limit } = args;
             const safeLimit = Math.max(limit, 1);
 
-            const filteredArgs = await sanitize.contentAPI.params(args, parent.contentType, {
+            const sanitizedQuery = await sanitize.contentAPI.query(args, parent.contentType, {
               auth: ctx?.state?.auth,
             });
-            const total = await strapi.entityService.count(resourceUID, filteredArgs);
+            const total = await strapi.entityService.count(resourceUID, sanitizedQuery);
             const pageSize = limit === -1 ? total - start : safeLimit;
             const pageCount = limit === -1 ? safeLimit : Math.ceil(total / safeLimit);
             const page = limit === -1 ? safeLimit : Math.floor(start / safeLimit) + 1;