Yet more updates

Author: benjie

src/language/__tests__/parser-test.ts

@@ -631,6 +631,23 @@ describe('Parser', () => {
       });
     });
 
+    it('parses semantic-non-null types', () => {
+      const result = parseType('MyType*');
+      expectJSON(result).toDeepEqual({
+        kind: Kind.SEMANTIC_NON_NULL_TYPE,
+        loc: { start: 0, end: 7 },
+        type: {
+          kind: Kind.NAMED_TYPE,
+          loc: { start: 0, end: 6 },
+          name: {
+            kind: Kind.NAME,
+            loc: { start: 0, end: 6 },
+            value: 'MyType',
+          },
+        },
+      });
+    });
+
     it('parses nested types', () => {
       const result = parseType('[MyType!]');
       expectJSON(result).toDeepEqual({

src/language/ast.ts

@@ -161,6 +161,7 @@ export type ASTNode =
   | NamedTypeNode
   | ListTypeNode
   | NonNullTypeNode
+  | SemanticNonNullTypeNode
   | SchemaDefinitionNode
   | OperationTypeDefinitionNode
   | ScalarTypeDefinitionNode
@@ -520,7 +521,11 @@ export interface ConstDirectiveNode {
 
 /** Type Reference */
 
-export type TypeNode = NamedTypeNode | ListTypeNode | NonNullTypeNode;
+export type TypeNode =
+  | NamedTypeNode
+  | ListTypeNode
+  | NonNullTypeNode
+  | SemanticNonNullTypeNode;
 
 export interface NamedTypeNode {
   readonly kind: Kind.NAMED_TYPE;

src/language/parser.ts

@@ -37,6 +37,7 @@ import type {
   NamedTypeNode,
   NameNode,
   NonNullTypeNode,
+  SemanticNonNullTypeNode,
   NullValueNode,
   ObjectFieldNode,
   ObjectTypeDefinitionNode,
@@ -740,6 +741,7 @@ export class Parser {
    *   - NamedType
    *   - ListType
    *   - NonNullType
+   *   - SemanticNonNullType
    */
   parseTypeReference(): TypeNode {
     const start = this._lexer.token;
@@ -761,6 +763,12 @@ export class Parser {
         type,
       });
     }
+    if (this.expectOptionalToken(TokenKind.ASTERISK)) {
+      return this.node<SemanticNonNullTypeNode>(start, {
+        kind: Kind.SEMANTIC_NON_NULL_TYPE,
+        type,
+      });
+    }
 
     return type;
   }

src/language/predicates.ts

@@ -67,7 +67,8 @@ export function isTypeNode(node: ASTNode): node is TypeNode {
   return (
     node.kind === Kind.NAMED_TYPE ||
     node.kind === Kind.LIST_TYPE ||
-    node.kind === Kind.NON_NULL_TYPE
+    node.kind === Kind.NON_NULL_TYPE ||
+    node.kind === Kind.SEMANTIC_NON_NULL_TYPE
   );
 }
 

src/language/tokenKind.ts

@@ -6,6 +6,7 @@ enum TokenKind {
   SOF = '<SOF>',
   EOF = '<EOF>',
   BANG = '!',
+  ASTERISK = '*',
   DOLLAR = '$',
   AMP = '&',
   PAREN_L = '(',

src/type/introspection.ts

@@ -502,6 +502,11 @@ export const __TypeKind: GraphQLEnumType = new GraphQLEnumType({
       description:
         'Indicates this type is a non-null. `ofType` is a valid field.',
     },
+    SEMANTIC_NON_NULL: {
+      value: TypeKind.SEMANTIC_NON_NULL,
+      description:
+        'Indicates this type is a semantic-non-null. `ofType` is a valid field.',
+    },
   },
 });
 

src/utilities/__tests__/printSchema-test.ts

@@ -770,6 +770,9 @@ describe('Type System Printer', () => {
 
         """Indicates this type is a non-null. \`ofType\` is a valid field."""
         NON_NULL
+
+        """Indicates this type is a semantic-non-null. \`ofType\` is a valid field."""
+        SEMANTIC_NON_NULL
       }
 
       """

src/utilities/buildClientSchema.ts

@@ -20,6 +20,7 @@ import {
   GraphQLInterfaceType,
   GraphQLList,
   GraphQLNonNull,
+  GraphQLSemanticNonNull,
   GraphQLObjectType,
   GraphQLScalarType,
   GraphQLUnionType,
@@ -137,6 +138,14 @@ export function buildClientSchema(
       const nullableType = getType(nullableRef);
       return new GraphQLNonNull(assertNullableType(nullableType));
     }
+    if (typeRef.kind === TypeKind.SEMANTIC_NON_NULL) {
+      const nullableRef = typeRef.ofType;
+      if (!nullableRef) {
+        throw new Error('Decorated type deeper than introspection query.');
+      }
+      const nullableType = getType(nullableRef);
+      return new GraphQLSemanticNonNull(assertNullableType(nullableType));
+    }
     return getNamedType(typeRef);
   }
 

src/utilities/extendSchema.ts

@@ -51,6 +51,7 @@ import {
   GraphQLInterfaceType,
   GraphQLList,
   GraphQLNonNull,
+  GraphQLSemanticNonNull,
   GraphQLObjectType,
   GraphQLScalarType,
   GraphQLUnionType,
@@ -437,6 +438,9 @@ export function extendSchemaImpl(
     if (node.kind === Kind.NON_NULL_TYPE) {
       return new GraphQLNonNull(getWrappedType(node.type));
     }
+    if (node.kind === Kind.SEMANTIC_NON_NULL_TYPE) {
+      return new GraphQLSemanticNonNull(getWrappedType(node.type));
+    }
     return getNamedType(node);
   }
 

src/utilities/getIntrospectionQuery.ts

@@ -297,6 +297,9 @@ export type IntrospectionTypeRef =
   | IntrospectionListTypeRef
   | IntrospectionNonNullTypeRef<
       IntrospectionNamedTypeRef | IntrospectionListTypeRef
+    >
+  | IntrospectionSemanticNonNullTypeRef<
+      IntrospectionNamedTypeRef | IntrospectionListTypeRef
     >;
 
 export type IntrospectionOutputTypeRef =