mercurius-validation - npm Package Compare versions

Comparing version 2.0.0 to 2.0.1

lib/utils.js

@@ -38,11 +38,11 @@ 'use strict'
 
-function inferJSONSchemaType (type) {
+function inferJSONSchemaType (type, isNonNull) {
   if (type === GraphQLString) {
-    return { type: 'string' }
+    return isNonNull ? { type: 'string' } : { type: ['string', 'null'] }
   }
   if (type === GraphQLInt) {
-    return { type: 'integer' }
+    return isNonNull ? { type: 'integer' } : { type: ['integer', 'null'] }
   }
   if (type === GraphQLFloat) {
-    return { type: 'number' }
+    return isNonNull ? { type: 'number' } : { type: ['number', 'null'] }
   }
@@ -53,4 +53,5 @@ return {}
 function getTypeInfo (graphQLType) {
-  const type = isNonNullType(graphQLType.type) ? graphQLType.type.ofType : graphQLType.type
-  return [type, getNamedType(type)]
+  const isNonNull = isNonNullType(graphQLType.type)
+  const type = isNonNull ? graphQLType.type.ofType : graphQLType.type
+  return [type, getNamedType(type), isNonNull]
 }
@@ -57,0 +58,0 @@

lib/validators/json-schema-validator.js

@@ -13,5 +13,5 @@ 'use strict'
 class JSONSchemaValidator extends Validator {
-  [kValidationSchema] (type, namedType, typeValidation, id) {
+  [kValidationSchema] (type, namedType, isNonNull, typeValidation, id) {
     let builtValidationSchema = {
-      ...inferJSONSchemaType(namedType),
+      ...inferJSONSchemaType(namedType, isNonNull),
       $id: id
@@ -30,3 +30,3 @@ }
     } else if (isListType(type)) {
-      let items = { ...inferJSONSchemaType(namedType), ...builtValidationSchema.items }
+      let items = { ...inferJSONSchemaType(namedType, isNonNull), ...builtValidationSchema.items }
       if (typeValidation !== null) {
@@ -55,7 +55,7 @@ items = { ...items, ...typeValidation.items }
     for (const argument of schemaTypeField.args) {
-      const [argumentType, namedArgumentType] = getTypeInfo(argument)
+      const [argumentType, namedArgumentType, isNonNull] = getTypeInfo(argument)
       const argumentValidation = fieldValidation !== null ? fieldValidation[argument.name] || null : null
       const id = `https://mercurius.dev/validation/${typeName}/${fieldName}/${argument.name}`
 
-      const argumentValidationSchema = this[kValidationSchema](argumentType, namedArgumentType, argumentValidation, id)
+      const argumentValidationSchema = this[kValidationSchema](argumentType, namedArgumentType, isNonNull, argumentValidation, id)
 
@@ -70,6 +70,6 @@ fieldArgumentsValidationSchema.properties[argument.name] = argumentValidationSchema
   [kBuildInputTypeFieldSchema] (typeName, fieldName, schemaTypeField, fieldValidation) {
-    const [fieldType, namedFieldType] = getTypeInfo(schemaTypeField)
+    const [fieldType, namedFieldType, isNonNull] = getTypeInfo(schemaTypeField)
     const id = `https://mercurius.dev/validation/${typeName}/${fieldName}`
 
-    const builtFieldValidationSchema = this[kValidationSchema](fieldType, namedFieldType, fieldValidation, id)
+    const builtFieldValidationSchema = this[kValidationSchema](fieldType, namedFieldType, isNonNull, fieldValidation, id)
 
@@ -83,3 +83,3 @@ // Only consider fields where we have inferred the type to avoid any AJV errors
 
-    if (typeof builtFieldValidationSchema.type === 'string') {
+    if (typeof builtFieldValidationSchema.type === 'string' || Array.isArray(builtFieldValidationSchema.type)) {
       return builtFieldValidationSchema
@@ -86,0 +86,0 @@ }

package.json

 {
   "name": "mercurius-validation",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Mercurius Validation Plugin adds configurable Validation support to Mercurius.",
@@ -37,3 +37,3 @@ "main": "index.js",
   "devDependencies": {
-    "@sinonjs/fake-timers": "^8.0.1",
+    "@sinonjs/fake-timers": "^9.0.0",
     "@types/node": "^17.0.0",
@@ -40,0 +40,0 @@ "@types/ws": "^8.2.0",

test/advanced-validation.js

@@ -170,3 +170,3 @@ 'use strict'
                     minLength: 1,
-                    type: 'string',
+                    type: ['string', 'null'],
                     $id: 'https://mercurius.dev/validation/Filters/text'
@@ -190,3 +190,3 @@ },
                     items: {
-                      type: 'string'
+                      type: ['string', 'null']
                     }
@@ -228,3 +228,3 @@ },
                     items: {
-                      type: 'string'
+                      type: ['string', 'null']
                     }
@@ -558,3 +558,3 @@ },
                     items: {
-                      type: 'string'
+                      type: ['string', 'null']
                     }
@@ -561,0 +561,0 @@ },

test/gateway-validation.js

@@ -102,2 +102,3 @@ 'use strict'
       topPosts(count: Int!): [Post]
+      topPostsFloat(count: Float!): [Post]
     }`
@@ -120,2 +121,5 @@
         return Object.values(posts).filter(p => p.authorId === user.id).slice(0, count)
+      },
+      topPostsFloat: (user, { count }, context, info) => {
+        return Object.values(posts).filter(p => p.authorId === user.id).slice(0, count)
       }
@@ -153,2 +157,5 @@ },
           count: { type: 'integer', minimum: 1 }
+        },
+        topPostsFloat: {
+          count: { type: 'number', minimum: 1 }
         }
@@ -181,2 +188,8 @@ }
           }
+          topPostsFloat(count: 2) {
+            pid
+            author {
+              id
+            }
+          }
         }
@@ -214,2 +227,16 @@ topPosts(count: 2) {
             }
+          ],
+          topPostsFloat: [
+            {
+              pid: 'p1',
+              author: {
+                id: 'u1'
+              }
+            },
+            {
+              pid: 'p3',
+              author: {
+                id: 'u1'
+              }
+            }
           ]
@@ -299,3 +326,3 @@ },
                   $id: 'https://mercurius.dev/validation/Query/me/id',
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   minimum: 1
@@ -335,3 +362,3 @@ },
                   $id: 'https://mercurius.dev/validation/Query/topPosts/count',
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   minimum: 1
@@ -338,0 +365,0 @@ },

test/json-schema-validation.js

@@ -72,3 +72,3 @@ 'use strict'
 t.test('JSON Schema validators', t => {
-  t.plan(17)
+  t.plan(18)
 
@@ -280,3 +280,3 @@ t.test('should protect the schema and not affect operations when everything is okay', async (t) => {
                   $id: 'https://mercurius.dev/validation/Filters/text',
-                  type: 'string',
+                  type: ['string', 'null'],
                   minLength: 1
@@ -354,3 +354,3 @@ },
                   $id: 'https://mercurius.dev/validation/Filters/text',
-                  type: 'string',
+                  type: ['string', 'null'],
                   minLength: 1
@@ -576,3 +576,3 @@ },
                   $id: 'https://mercurius.dev/validation/Filters/text',
-                  type: 'string',
+                  type: ['string', 'null'],
                   minLength: 1
@@ -965,3 +965,3 @@ },
                     text: {
-                      type: 'string',
+                      type: ['string', 'null'],
                       $id: 'https://mercurius.dev/validation/Filters/text'
@@ -1051,3 +1051,3 @@ }
                       minLength: 1,
-                      type: 'string',
+                      type: ['string', 'null'],
                       $id: 'https://mercurius.dev/validation/Filters/text'
@@ -1072,3 +1072,3 @@ }
                   minLength: 1,
-                  type: 'string',
+                  type: ['string', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/text'
@@ -1275,3 +1275,3 @@ },
                 parentSchema: {
-                  type: 'string',
+                  type: ['string', 'null'],
                   $id: 'https://mercurius.dev/validation/Query/message/id',
@@ -1310,3 +1310,3 @@ minLength: 1
                 parentSchema: {
-                  type: 'string',
+                  type: ['string', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/text',
@@ -1327,3 +1327,3 @@ minLength: 1
                 parentSchema: {
-                  type: 'string',
+                  type: ['string', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/text',
@@ -1344,3 +1344,3 @@ minLength: 1
                 parentSchema: {
-                  type: 'string',
+                  type: ['string', 'null'],
                   minLength: 1
@@ -1387,3 +1387,3 @@ },
                 parentSchema: {
-                  type: 'string',
+                  type: ['string', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/text',
@@ -1516,3 +1516,3 @@ minLength: 1
                 parentSchema: {
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   $id: 'https://mercurius.dev/validation/Query/message/id',
@@ -1552,3 +1552,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/value',
@@ -1570,3 +1570,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/value',
@@ -1588,3 +1588,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   minimum: 1
@@ -1632,3 +1632,3 @@ },
                 parentSchema: {
-                  type: 'integer',
+                  type: ['integer', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/value',
@@ -1761,3 +1761,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'number',
+                  type: ['number', 'null'],
                   $id: 'https://mercurius.dev/validation/Query/message/id',
@@ -1797,3 +1797,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'number',
+                  type: ['number', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/value',
@@ -1815,3 +1815,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'number',
+                  type: ['number', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/value',
@@ -1833,3 +1833,3 @@ minimum: 1
                 parentSchema: {
-                  type: 'number',
+                  type: ['number', 'null'],
                   minimum: 1
@@ -1877,3 +1877,3 @@ },
                 parentSchema: {
-                  type: 'number',
+                  type: ['number', 'null'],
                   $id: 'https://mercurius.dev/validation/Filters/value',
@@ -2076,2 +2076,40 @@ minimum: 1
   })
+
+  t.test('should support nullable input type arguments', async (t) => {
+    t.plan(1)
+
+    const app = Fastify()
+    t.teardown(app.close.bind(app))
+
+    app.register(mercurius, {
+      schema: `type Query {
+        nullableInput(input: String): String
+      }`,
+      resolvers: {
+        Query: {
+          nullableInput: async (_, { input }) => {
+            return input
+          }
+        }
+      }
+    })
+    app.register(mercuriusValidation)
+
+    const query = `query {
+      nullableInput(input: null)
+    }`
+
+    const response = await app.inject({
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      url: '/graphql',
+      body: JSON.stringify({ query })
+    })
+
+    t.same(response.json(), {
+      data: {
+        nullableInput: null
+      }
+    })
+  })
 })

test/refresh.js

@@ -279,3 +279,3 @@ 'use strict'
                     $id: 'https://mercurius.dev/validation/Filters/text',
-                    type: 'string',
+                    type: ['string', 'null'],
                     minLength: 1
@@ -282,0 +282,0 @@ },

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

303465

increased by0.71%

Lines of code

8960

increased by0.67%

Worsened metrics

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes