remove __typename from internal fields of GraphQLObjectType and enable it in the executor

Author: joonlabs

src/Execution/Executor.php

@@ -471,7 +471,7 @@ private function getFieldDef(Schema $schema, GraphQLObjectType $parentType, stri
             $TypeMetaFieldDef = null;
             require __DIR__."/../Introspection/Introspection.php";
             return $TypeMetaFieldDef;
-        } else if ($fieldName === "__typename" && $schema->getQueryType() === $parentType) {
+        } else if ($fieldName === "__typename") {
             $TypeNameMetaFieldDef = null;
             require __DIR__."/../Introspection/Introspection.php";
             return $TypeNameMetaFieldDef;

src/Types/GraphQLObjectType.php

@@ -12,7 +12,6 @@ class GraphQLObjectType extends GraphQLType
     protected $description;
 
     private $fields;
-    private $internalFields;
     private $interfaces;
     private $isTypeOfFn;
 
@@ -22,15 +21,6 @@ public function __construct(string $type, string $description, \Closure $fields,
         $this->description = $description;
 
         $this->fields = $fields;
-
-        // create internal fields
-        $this->internalFields = [
-            "__typename" => new GraphQLTypeField("__typename", new GraphQLNonNull(new GraphQLString()), "Name of the type of the object", function () use ($type) {
-                return $type;
-            })
-        ];
-
-
         $this->interfaces = $interfaces ?? [];
         $this->isTypeOfFn = $isTypeOfFn ?? function ($value, $contextValue, $info) {
                 // if $value is array, check if all keys match
@@ -82,8 +72,6 @@ public function getFields(): array
         foreach ($allFields as $field) {
             $fields[$field->getName()] = $field;
         }
-
-        $fields = array_merge($fields, $this->internalFields);
         return $fields;
     }