Address latest review comment

mercurius-js · Mar 19, 2024 · 8b88031 · 8b88031
1 parent 8b4208b
commit 8b88031
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -35,7 +35,13 @@ function validateOpts (opts) {
   return opts
 }
 
-function inferJSONSchemaType (type, isNonNull, inferCustomType) {
+function inferJSONSchemaType (type, isNonNull, customTypeInferenceFn) {
+  if (customTypeInferenceFn) {
+    const customResponse = customTypeInferenceFn(type, isNonNull)
+    if (customResponse) {
+      return customResponse
+    }
+  }
   if (type === GraphQLString) {
     return isNonNull ? { type: 'string' } : { type: ['string', 'null'] }
   }
@@ -45,9 +51,6 @@ function inferJSONSchemaType (type, isNonNull, inferCustomType) {
   if (type === GraphQLFloat) {
     return isNonNull ? { type: 'number' } : { type: ['number', 'null'] }
   }
-  if (inferCustomType) {
-    return inferCustomType(type, isNonNull)
-  }
   return {}
 }
 

diff --git a/lib/validators/json-schema-validator.js b/lib/validators/json-schema-validator.js
@@ -12,7 +12,7 @@ const { getTypeInfo, inferJSONSchemaType } = require('../utils')
 class JSONSchemaValidator extends Validator {
   [kValidationSchema] (type, namedType, isNonNull, typeValidation, id) {
     let builtValidationSchema = {
-      ...inferJSONSchemaType(namedType, isNonNull, this[kOpts].inferCustomType),
+      ...inferJSONSchemaType(namedType, isNonNull, this[kOpts].customTypeInferenceFn),
       $id: id
     }
 
@@ -26,7 +26,7 @@ class JSONSchemaValidator extends Validator {
       }
     // If we have an array of scalars, set the array type and infer the items
     } else if (isListType(type)) {
-      let items = { ...inferJSONSchemaType(namedType, isNonNull, this[kOpts].inferCustomType), ...builtValidationSchema.items }
+      let items = { ...inferJSONSchemaType(namedType, isNonNull, this[kOpts].customTypeInferenceFn), ...builtValidationSchema.items }
       if (typeValidation !== null) {
         items = { ...items, ...typeValidation.items }
       }

diff --git a/test/json-schema-validation.js b/test/json-schema-validation.js
@@ -2091,7 +2091,7 @@ t.test('JSON Schema validators', t => {
     })
   })
 
-  t.test('should invoke inferCustomType option and not affect operations when everything is okay', async (t) => {
+  t.test('should invoke customTypeInferenceFn option and not affect operations when everything is okay', async (t) => {
     const productSchema = `
       type Product {
         id: ID!
@@ -2161,11 +2161,10 @@ t.test('JSON Schema validators', t => {
           }
         }
       },
-      inferCustomType: (type, isNonNull) => {
+      customTypeInferenceFn: (type, isNonNull) => {
         if (type === GraphQLBoolean) {
           return isNonNull ? { type: 'boolean' } : { type: ['boolean', 'null'] }
         }
-        return {}
       }
     })