Fix type issues

Author: kitten

src/ast.ts

@@ -27,53 +27,54 @@ import type {
   InputObjectTypeExtensionNode,
 } from './schemaAst';
 
-export type ASTNode = Or<
-  GraphQL.ASTNode,
-  | NameNode
-  | DocumentNode
-  | OperationDefinitionNode
-  | VariableDefinitionNode
-  | VariableNode
-  | SelectionSetNode
-  | FieldNode
-  | ArgumentNode
-  | FragmentSpreadNode
-  | FragmentArgumentNode
-  | InlineFragmentNode
-  | FragmentDefinitionNode
-  | IntValueNode
-  | FloatValueNode
-  | StringValueNode
-  | BooleanValueNode
-  | NullValueNode
-  | EnumValueNode
-  | ListValueNode
-  | ObjectValueNode
-  | ObjectFieldNode
-  | DirectiveNode
-  | NamedTypeNode
-  | ListTypeNode
-  | NonNullTypeNode
-  | SchemaDefinitionNode
-  | OperationTypeDefinitionNode
-  | ScalarTypeDefinitionNode
-  | ObjectTypeDefinitionNode
-  | FieldDefinitionNode
-  | InputValueDefinitionNode
-  | InterfaceTypeDefinitionNode
-  | UnionTypeDefinitionNode
-  | EnumTypeDefinitionNode
-  | EnumValueDefinitionNode
-  | InputObjectTypeDefinitionNode
-  | DirectiveDefinitionNode
-  | SchemaExtensionNode
-  | ScalarTypeExtensionNode
-  | ObjectTypeExtensionNode
-  | InterfaceTypeExtensionNode
-  | UnionTypeExtensionNode
-  | EnumTypeExtensionNode
-  | InputObjectTypeExtensionNode
->;
+export type ASTNode =
+  | Or<
+      GraphQL.ASTNode,
+      | NameNode
+      | DocumentNode
+      | OperationDefinitionNode
+      | VariableDefinitionNode
+      | VariableNode
+      | SelectionSetNode
+      | FieldNode
+      | ArgumentNode
+      | FragmentSpreadNode
+      | InlineFragmentNode
+      | FragmentDefinitionNode
+      | IntValueNode
+      | FloatValueNode
+      | StringValueNode
+      | BooleanValueNode
+      | NullValueNode
+      | EnumValueNode
+      | ListValueNode
+      | ObjectValueNode
+      | ObjectFieldNode
+      | DirectiveNode
+      | NamedTypeNode
+      | ListTypeNode
+      | NonNullTypeNode
+      | SchemaDefinitionNode
+      | OperationTypeDefinitionNode
+      | ScalarTypeDefinitionNode
+      | ObjectTypeDefinitionNode
+      | FieldDefinitionNode
+      | InputValueDefinitionNode
+      | InterfaceTypeDefinitionNode
+      | UnionTypeDefinitionNode
+      | EnumTypeDefinitionNode
+      | EnumValueDefinitionNode
+      | InputObjectTypeDefinitionNode
+      | DirectiveDefinitionNode
+      | SchemaExtensionNode
+      | ScalarTypeExtensionNode
+      | ObjectTypeExtensionNode
+      | InterfaceTypeExtensionNode
+      | UnionTypeExtensionNode
+      | EnumTypeExtensionNode
+      | InputObjectTypeExtensionNode
+    >
+  | FragmentArgumentNode;
 
 export type NameNode = Or<
   GraphQL.NameNode,
@@ -148,10 +149,7 @@ export type SelectionSetNode = Or<
   }
 >;
 
-export declare type SelectionNode = Or<
-  GraphQL.SelectionNode,
-  FieldNode | FragmentSpreadNode | InlineFragmentNode
->;
+export declare type SelectionNode = FieldNode | FragmentSpreadNode | InlineFragmentNode;
 
 export type FieldNode = Or<
   GraphQL.FieldNode,
@@ -187,7 +185,7 @@ export type ConstArgumentNode = Or<
 >;
 
 export type FragmentArgumentNode = {
-  readonly kind: Kind.FRAGMENT_ARGUMENT;
+  readonly kind: 'FragmentArgument';
   readonly name: NameNode;
   readonly value: ValueNode;
   readonly loc?: Location;
@@ -222,13 +220,14 @@ export type FragmentDefinitionNode = Or<
     readonly kind: Kind.FRAGMENT_DEFINITION;
     readonly name: NameNode;
     readonly description?: StringValueNode;
-    readonly variableDefinitions?: ReadonlyArray<VariableDefinitionNode>;
     readonly typeCondition: NamedTypeNode;
     readonly directives?: ReadonlyArray<DirectiveNode>;
     readonly selectionSet: SelectionSetNode;
     readonly loc?: Location;
   }
->;
+> & {
+  readonly variableDefinitions?: ReadonlyArray<VariableDefinitionNode>;
+};
 
 export type ValueNode = Or<
   GraphQL.ValueNode,

src/kind.d.ts

@@ -8,7 +8,6 @@ export declare enum Kind {
   SELECTION_SET = 'SelectionSet',
   FIELD = 'Field',
   ARGUMENT = 'Argument',
-  FRAGMENT_ARGUMENT = 'FragmentArgument',
   /** Fragments */
   FRAGMENT_SPREAD = 'FragmentSpread',
   INLINE_FRAGMENT = 'InlineFragment',

src/parser.ts

@@ -246,29 +246,32 @@ function value(constant: boolean): ast.ValueNode {
   };
 }
 
+function arguments_(constant: boolean, fragmentArgument: false): ast.ArgumentNode[] | undefined;
 function arguments_(
   constant: boolean,
-  fragmentArgument?: boolean
+  fragmentArgument: true
+): ast.FragmentArgumentNode[] | undefined;
+function arguments_(
+  constant: boolean,
+  fragmentArgument: boolean
 ): ast.ArgumentNode[] | ast.FragmentArgumentNode[] | undefined {
   if (input.charCodeAt(idx) === 40 /*'('*/) {
-    const args: ast.ArgumentNode[] | ast.FragmentArgumentNode[] = [];
+    const args: (ast.ArgumentNode | ast.FragmentArgumentNode)[] = [];
     idx++;
     ignored();
     do {
       const name = nameNode();
       if (input.charCodeAt(idx++) !== 58 /*':'*/) throw error('Argument');
       ignored();
       args.push({
-        kind: fragmentArgument
-          ? ('FragmentArgument' as Kind.FRAGMENT_ARGUMENT)
-          : ('Argument' as Kind.ARGUMENT),
+        kind: fragmentArgument ? 'FragmentArgument' : ('Argument' as Kind.ARGUMENT),
         name,
         value: value(constant),
       });
     } while (input.charCodeAt(idx) !== 41 /*')'*/);
     idx++;
     ignored();
-    return args;
+    return args as ast.ArgumentNode[] | ast.FragmentArgumentNode[];
   }
 }
 
@@ -283,7 +286,7 @@ function directives(constant: boolean): ast.DirectiveNode[] | undefined {
       directives.push({
         kind: 'Directive' as Kind.DIRECTIVE,
         name: nameNode(),
-        arguments: arguments_(constant),
+        arguments: arguments_(constant, false),
       });
     } while (input.charCodeAt(idx) === 64 /*'@'*/);
     return directives;
@@ -363,7 +366,6 @@ function selectionSet(): ast.SelectionSetNode {
             selections.push({
               kind: 'FragmentSpread' as Kind.FRAGMENT_SPREAD,
               name: nameNode(),
-              // @ts-expect-error
               arguments: arguments_(false, true) as readonly ast.FragmentArgumentNode[],
               directives: directives(false),
             });
@@ -385,8 +387,7 @@ function selectionSet(): ast.SelectionSetNode {
           selections.push({
             kind: 'FragmentSpread' as Kind.FRAGMENT_SPREAD,
             name: nameNode(),
-            // @ts-expect-error
-            arguments: arguments_(false, true) as readonly ast.FragmentArgumentNode[],
+            arguments: arguments_(false, true),
             directives: directives(false),
           });
       }
@@ -399,7 +400,7 @@ function selectionSet(): ast.SelectionSetNode {
         alias = name;
         name = nameNode();
       }
-      const _arguments = arguments_(false);
+      const _arguments = arguments_(false, false);
       const _directives = directives(false);
       let _selectionSet: ast.SelectionSetNode | undefined;
       if (input.charCodeAt(idx) === 123 /*'{'*/) {