Cleanup

Author: JoviDeCroock

src/parser.ts

@@ -424,6 +424,9 @@ function variableDefinitions(): ast.VariableDefinitionNode[] | undefined {
       let _description: ast.StringValueNode | undefined;
       if (input.charCodeAt(idx) === 34 /*'"'*/) {
         _description = value(true) as ast.StringValueNode;
+        if (_description.kind !== ('StringValue' as Kind.STRING)) {
+          throw error('VariableDefinition');
+        }
       }
       if (input.charCodeAt(idx++) !== 36 /*'$'*/) throw error('Variable');
       const name = nameNode();
@@ -437,7 +440,7 @@ function variableDefinitions(): ast.VariableDefinitionNode[] | undefined {
         _defaultValue = value(true);
       }
       ignored();
-      const varDef: any = {
+      const varDef: ast.VariableDefinitionNode = {
         kind: 'VariableDefinition' as Kind.VARIABLE_DEFINITION,
         variable: {
           kind: 'Variable' as Kind.VARIABLE,
@@ -463,7 +466,7 @@ function fragmentDefinition(description?: ast.StringValueNode): ast.FragmentDefi
   if (input.charCodeAt(idx++) !== 111 /*'o'*/ || input.charCodeAt(idx++) !== 110 /*'n'*/)
     throw error('FragmentDefinition');
   ignored();
-  const fragDef: any = {
+  const fragDef: ast.FragmentDefinitionNode = {
     kind: 'FragmentDefinition' as Kind.FRAGMENT_DEFINITION,
     name,
     typeCondition: {
@@ -503,11 +506,17 @@ function definitions(): ast.DefinitionNode[] {
       const definition = name();
       switch (definition) {
         case 'fragment':
+          if (_description && _description.kind !== ('StringValue' as Kind.STRING)) {
+            throw error('FragmentDefinition');
+          }
           _definitions.push(fragmentDefinition(_description));
           break;
         case 'query':
         case 'mutation':
         case 'subscription':
+          if (_description && _description.kind !== ('StringValue' as Kind.STRING)) {
+            throw error('OperationDefinition');
+          }
           let char: number;
           let name: ast.NameNode | undefined;
           if (

src/printer.ts

@@ -50,8 +50,8 @@ let LF = '\n';
 const nodes = {
   OperationDefinition(node: OperationDefinitionNode): string {
     let out: string = '';
-    if ((node as any).description) {
-      out += nodes.StringValue((node as any).description) + '\n';
+    if (node.description) {
+      out += nodes.StringValue(node.description) + '\n';
     }
     out += node.operation;
     if (node.name) out += ' ' + node.name.value;
@@ -66,8 +66,8 @@ const nodes = {
   },
   VariableDefinition(node: VariableDefinitionNode): string {
     let out = '';
-    if ((node as any).description) {
-      out += nodes.StringValue((node as any).description) + ' ';
+    if (node.description) {
+      out += nodes.StringValue(node.description) + ' ';
     }
     out += nodes.Variable!(node.variable) + ': ' + _print(node.type);
     if (node.defaultValue) out += ' = ' + _print(node.defaultValue);
@@ -160,8 +160,8 @@ const nodes = {
   },
   FragmentDefinition(node: FragmentDefinitionNode): string {
     let out = '';
-    if ((node as any).description) {
-      out += nodes.StringValue((node as any).description) + '\n';
+    if (node.description) {
+      out += nodes.StringValue(node.description) + '\n';
     }
     out += 'fragment ' + node.name.value;
     out += ' on ' + node.typeCondition.name.value;