More fixes

Author: benjie

src/__tests__/starWarsIntrospection-test.ts

@@ -45,6 +45,7 @@ describe('Star Wars Introspection Tests', () => {
             { name: '__EnumValue' },
             { name: '__Directive' },
             { name: '__DirectiveLocation' },
+            { name: '__TypeNullability' },
           ],
         },
       });

src/index.ts

@@ -75,6 +75,7 @@ export {
   __Schema,
   __Directive,
   __DirectiveLocation,
+  __TypeNullability,
   __Type,
   __Field,
   __InputValue,

src/type/__tests__/introspection-test.ts

@@ -506,7 +506,21 @@ describe('Introspection', () => {
                 },
                 {
                   name: 'type',
-                  args: [],
+                  args: [
+                    {
+                      name: 'nullability',
+                      type: {
+                        kind: 'NON_NULL',
+                        name: null,
+                        ofType: {
+                          kind: 'ENUM',
+                          name: '__TypeNullability',
+                          ofType: null,
+                        },
+                      },
+                      defaultValue: 'AUTO',
+                    },
+                  ],
                   type: {
                     kind: 'NON_NULL',
                     name: null,
@@ -917,6 +931,37 @@ describe('Introspection', () => {
               ],
               possibleTypes: null,
             },
+            {
+              kind: 'ENUM',
+              name: '__TypeNullability',
+              specifiedByURL: null,
+              fields: null,
+              inputFields: null,
+              interfaces: null,
+              enumValues: [
+                {
+                  name: 'AUTO',
+                  isDeprecated: false,
+                  deprecationReason: null,
+                },
+                {
+                  name: 'TRADITIONAL',
+                  isDeprecated: false,
+                  deprecationReason: null,
+                },
+                {
+                  name: 'SEMANTIC',
+                  isDeprecated: false,
+                  deprecationReason: null,
+                },
+                {
+                  name: 'FULL',
+                  isDeprecated: false,
+                  deprecationReason: null,
+                },
+              ],
+              possibleTypes: null,
+            },
           ],
           directives: [
             {

src/type/__tests__/schema-test.ts

@@ -304,6 +304,7 @@ describe('Type System: Schema', () => {
       '__EnumValue',
       '__Directive',
       '__DirectiveLocation',
+      '__TypeNullability',
     ]);
 
     // Also check that this order is stable

src/type/index.ts

@@ -170,6 +170,7 @@ export {
   __Schema,
   __Directive,
   __DirectiveLocation,
+  __TypeNullability,
   __Type,
   __Field,
   __InputValue,

src/type/introspection.ts

@@ -12,7 +12,8 @@ import type {
   GraphQLFieldConfigMap,
   GraphQLInputField,
   GraphQLNamedType,
-  GraphQLType} from './definition';
+  GraphQLType,
+} from './definition';
 import {
   GraphQLEnumType,
   GraphQLList,
@@ -406,22 +407,21 @@ export const __Field: GraphQLObjectType = new GraphQLObjectType({
         type: new GraphQLNonNull(__Type),
         args: {
           nullability: {
-            type: __TypeNullability,
-            defaultValue: 'AUTO',
+            type: new GraphQLNonNull(__TypeNullability),
+            defaultValue: TypeNullability.AUTO,
           },
         },
         resolve: (field, { nullability }, _context, info) => {
           if (nullability === TypeNullability.FULL) {
             return field.type;
-          } 
-            const mode =
-              nullability === TypeNullability.AUTO
-                ? info.errorPropagation
-                  ? TypeNullability.TRADITIONAL
-                  : TypeNullability.SEMANTIC
-                : nullability;
-            return convertOutputTypeToNullabilityMode(field.type, mode);
-          
+          }
+          const mode =
+            nullability === TypeNullability.AUTO
+              ? info.errorPropagation
+                ? TypeNullability.TRADITIONAL
+                : TypeNullability.SEMANTIC
+              : nullability;
+          return convertOutputTypeToNullabilityMode(field.type, mode);
         },
       },
       isDeprecated: {
@@ -451,22 +451,19 @@ function convertOutputTypeToNullabilityMode(
       return new GraphQLList(
         convertOutputTypeToNullabilityMode(type.ofType, mode),
       );
-    } 
-      return type;
-    
-  } 
-    if (isNonNullType(type) || isSemanticNonNullType(type)) {
-      return new GraphQLSemanticNonNull(
-        convertOutputTypeToNullabilityMode(type.ofType, mode),
-      );
-    } else if (isListType(type)) {
-      return new GraphQLList(
-        convertOutputTypeToNullabilityMode(type.ofType, mode),
-      );
-    } 
-      return type;
-    
-  
+    }
+    return type;
+  }
+  if (isNonNullType(type) || isSemanticNonNullType(type)) {
+    return new GraphQLSemanticNonNull(
+      convertOutputTypeToNullabilityMode(type.ofType, mode),
+    );
+  } else if (isListType(type)) {
+    return new GraphQLList(
+      convertOutputTypeToNullabilityMode(type.ofType, mode),
+    );
+  }
+  return type;
 }
 
 export const __InputValue: GraphQLObjectType = new GraphQLObjectType({
@@ -649,6 +646,7 @@ export const introspectionTypes: ReadonlyArray<GraphQLNamedType> =
     __Schema,
     __Directive,
     __DirectiveLocation,
+    __TypeNullability,
     __Type,
     __Field,
     __InputValue,

src/utilities/__tests__/printSchema-test.ts

@@ -782,7 +782,7 @@ describe('Type System Printer', () => {
         name: String!
         description: String
         args(includeDeprecated: Boolean = false): [__InputValue!]!
-        type: __Type!
+        type(nullability: __TypeNullability!): __Type!
         isDeprecated: Boolean!
         deprecationReason: String
       }
@@ -887,6 +887,13 @@ describe('Type System Printer', () => {
         """Location adjacent to an input object field definition."""
         INPUT_FIELD_DEFINITION
       }
+
+      enum __TypeNullability {
+        AUTO
+        TRADITIONAL
+        SEMANTIC
+        FULL
+      }
     `);
   });
 });