@strapi/plugin-graphql 4.0.0 → 4.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "4.0.0",
+  "version": "4.0.4",
   "description": "Adds GraphQL endpoint with default API methods.",
   "repository": {
     "type": "git",
@@ -21,13 +21,16 @@
     }
   ],
   "scripts": {
-    "test": "echo \"no tests yet\""
+    "test:front": "cross-env IS_EE=true jest --config ./jest.config.front.js",
+    "test:front:watch": "cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
+    "test:front:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js",
+    "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
   },
   "dependencies": {
     "@apollo/federation": "^0.28.0",
     "@graphql-tools/schema": "8.1.2",
     "@graphql-tools/utils": "^8.0.2",
-    "@strapi/utils": "4.0.0",
+    "@strapi/utils": "4.0.4",
     "apollo-server-core": "3.1.2",
     "apollo-server-koa": "3.1.2",
     "glob": "^7.1.7",
@@ -37,7 +40,7 @@
     "graphql-playground-middleware-koa": "^1.6.21",
     "graphql-type-json": "^0.3.2",
     "graphql-type-long": "^0.1.1",
-    "graphql-upload": "12.0.0",
+    "graphql-upload": "^13.0.0",
     "koa-compose": "^4.1.0",
     "lodash": "4.17.21",
     "nexus": "1.1.0",
@@ -49,7 +52,7 @@
     "koa": "^2.13.1"
   },
   "engines": {
-    "node": ">=12.x.x <=16.x.x",
+    "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
   "strapi": {
@@ -58,5 +61,5 @@
     "description": "Adds GraphQL endpoint with default API methods.",
     "kind": "plugin"
   },
-  "gitHead": "b181702f0202b2c6d645d42b195a831f25cd0b03"
+  "gitHead": "d81919ac2272948b3f5d3b25a4cf8cc7b6994460"
 }

package/server/bootstrap.js

@@ -57,7 +57,7 @@ module.exports = async ({ strapi }) => {
     bodyParserConfig: true,
 
     plugins: [
-      process.env.NODE_ENV === 'production'
+      process.env.NODE_ENV === 'production' && !config('playgroundAlways')
         ? ApolloServerPluginLandingPageDisabled()
         : ApolloServerPluginLandingPageGraphQLPlayground(),
     ],

package/server/services/builders/input.js

@@ -58,8 +58,15 @@ module.exports = context => {
           }
 
           validAttributes.forEach(([attributeName, attribute]) => {
+            // Enums
+            if (isEnumeration(attribute)) {
+              const enumTypeName = getEnumName(contentType, attributeName);
+
+              t.field(attributeName, { type: enumTypeName });
+            }
+
             // Scalars
-            if (isStrapiScalar(attribute)) {
+            else if (isStrapiScalar(attribute)) {
               const gqlScalar = mappers.strapiScalarToGraphQLScalar(attribute.type);
 
               t.field(attributeName, { type: gqlScalar });
@@ -87,13 +94,6 @@ module.exports = context => {
               isToManyRelation ? t.list.id(attributeName) : t.id(attributeName);
             }
 
-            // Enums
-            else if (isEnumeration(attribute)) {
-              const enumTypeName = getEnumName(contentType, attributeName);
-
-              t.field(attributeName, { type: enumTypeName });
-            }
-
             // Components
             else if (isComponent(attribute)) {
               const isRepeatable = attribute.repeatable === true;

package/server/services/builders/type.js

@@ -322,8 +322,13 @@ module.exports = context => {
                */
               const options = { builder, attributeName, attribute, contentType, context };
 
+              // Enums
+              if (isEnumeration(attribute)) {
+                addEnumAttribute(options);
+              }
+
               // Scalars
-              if (isStrapiScalar(attribute)) {
+              else if (isStrapiScalar(attribute)) {
                 addScalarAttribute(options);
               }
 
@@ -337,11 +342,6 @@ module.exports = context => {
                 addDynamicZoneAttribute(options);
               }
 
-              // Enums
-              else if (isEnumeration(attribute)) {
-                addEnumAttribute(options);
-              }
-
               // Media
               else if (isMedia(attribute)) {
                 addMediaAttribute(options);

package/server/services/constants.js

@@ -24,6 +24,7 @@ const STRAPI_SCALARS = [
   'integer',
   'string',
   'richtext',
+  'enumeration',
   'biginteger',
   'float',
   'decimal',
@@ -46,6 +47,7 @@ const SCALARS_ASSOCIATIONS = {
   boolean: 'Boolean',
   integer: 'Int',
   string: 'String',
+  enumeration: 'String',
   richtext: 'String',
   biginteger: 'Long',
   float: 'Float',

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

@@ -23,11 +23,12 @@ module.exports = ({ strapi }) => {
           async resolve(parent) {
             const { args, resourceUID } = parent;
             const { start, limit } = args;
+            const safeLimit = Math.max(limit, 1);
 
             const total = await strapi.entityService.count(resourceUID, args);
-            const pageSize = limit;
-            const pageCount = limit === 0 ? 0 : Math.ceil(total / limit);
-            const page = limit === 0 ? 1 : Math.floor(start / limit) + 1;
+            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;
 
             return { total, page, pageSize, pageCount };
           },