🐛 corrected typename field

Author: aexol

package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-js-tree",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "private": false,
   "license": "MIT",
   "description": "GraphQL Parser providing simplier structure",

src/GqlParser/index.ts

@@ -3,7 +3,7 @@ import { OperationType, ParserField, TypeDefinition } from '@/Models';
 import { GqlParserTree, VariableDefinitionWithoutLoc } from '@/Models/GqlParserTree';
 import { Parser } from '@/Parser';
 import { TypeResolver } from '@/Parser/typeResolver';
-import { compileType, createPlainField, getTypeName } from '@/shared';
+import { compileType, createTypeNameField, getTypeName } from '@/shared';
 import {
   DefinitionNode,
   parse,
@@ -124,12 +124,7 @@ export const parseGql = (gql: string, schema: string) => {
 
   const composeFieldNode = (s: FieldNode, parentNode: ParserField): GqlParserTree => {
     const fieldNode =
-      s.name.value === '__typename'
-        ? createPlainField({
-            name: '__typename',
-            type: 'String!',
-          })
-        : parentNode.args.find((a) => a.name === s.name.value);
+      s.name.value === '__typename' ? createTypeNameField() : parentNode.args.find((a) => a.name === s.name.value);
     if (!fieldNode) {
       throw new Error(`Field "${s.name.value}" does not exist in "${parentNode.name}" node`);
     }

src/__tests__/GqlParser/GqlParserTreeToGql.spec.ts

@@ -7,7 +7,7 @@ import {
 } from '@/GqlParser/GqlParserTreeToGql';
 import { OperationType, TypeDefinition } from '@/Models';
 import { GqlParserTree } from '@/Models/GqlParserTree';
-import { createPlainField, createPlainInputValue, createRootField } from '@/shared';
+import { createPlainField, createPlainInputValue, createRootField, createTypeNameField } from '@/shared';
 import { expectTrimmedEqual } from '@/__tests__/TestUtils';
 
 const mockSchema = `
@@ -244,7 +244,7 @@ describe('Test generation of gql strings from the GqlParserTree', () => {
             children: [
               {
                 name: '__typename',
-                node: createPlainField({ name: '__typename', type: 'String!' }),
+                node: createTypeNameField(),
               },
             ],
           },

src/__tests__/GqlParser/index.spec.ts

@@ -1,7 +1,7 @@
 import { parseGql } from '@/GqlParser';
 import { OperationType, TypeDefinition } from '@/Models';
 import { GqlParserTree } from '@/Models/GqlParserTree';
-import { createPlainField, createPlainInputValue, createRootField } from '@/shared';
+import { createPlainField, createPlainInputValue, createRootField, createTypeNameField } from '@/shared';
 
 const mockSchema = `
 type Query { 
@@ -213,7 +213,7 @@ describe('Test generation of GqlParserTrees from gql', () => {
             children: [
               {
                 name: '__typename',
-                node: createPlainField({ name: '__typename', type: 'String!' }),
+                node: createTypeNameField(),
               },
             ],
           },

src/shared/index.ts

@@ -5,6 +5,7 @@ import {
   Instances,
   Options,
   ParserField,
+  ScalarTypes,
   TypeDefinition,
   TypeDefinitionDisplayMap,
   TypeExtension,
@@ -158,6 +159,24 @@ export const createPlainField = ({ name, type, ...props }: FieldCreation) => {
     },
   });
 };
+export const createTypeNameField = () => {
+  return createParserField({
+    name: '__typename',
+    description: 'The name of the current Object type at runtime.',
+    data: {
+      type: TypeSystemDefinition.FieldDefinition,
+    },
+    type: {
+      fieldType: {
+        type: Options.required,
+        nest: {
+          type: Options.name,
+          name: ScalarTypes.String,
+        },
+      },
+    },
+  });
+};
 
 type InputValueCreation = Pick<ParserField, 'name'> &
   Partial<Omit<ParserField, 'data' | 'name' | 'type'>> & { type: string };