fix(transforms): don't add __typename to subscriptions

see: #2282 graphql/graphql-js#2861 graphql/graphql-spec#776
ardatan · Nov 29, 2020 · bd33173 · bd33173
1 parent 29ead57
commit bd33173
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 15 deletions.
diff --git a/.changeset/fuzzy-bugs-sparkle.md b/.changeset/fuzzy-bugs-sparkle.md
@@ -0,0 +1,10 @@
+---
+'@graphql-tools/wrap': patch
+---
+
+fix(transforms): don't add \_\_typename to subscriptions
+
+see:
+https://github.com/ardatan/graphql-tools/issues/2282
+https://github.com/graphql/graphql-js/pull/2861
+https://github.com/graphql/graphql-spec/pull/776
diff --git a/packages/wrap/src/transforms/MapFields.ts b/packages/wrap/src/transforms/MapFields.ts
@@ -9,17 +9,31 @@ import { ObjectValueTransformerMap, ErrorsTransformer } from '../types';
 import TransformCompositeFields from './TransformCompositeFields';
 
 export default class MapFields implements Transform {
-  private readonly transformer: TransformCompositeFields;
+  private fieldNodeTransformerMap: FieldNodeMappers;
+  private objectValueTransformerMap?: ObjectValueTransformerMap;
+  private errorsTransformer?: ErrorsTransformer;
+  private transformer: TransformCompositeFields;
 
   constructor(
     fieldNodeTransformerMap: FieldNodeMappers,
     objectValueTransformerMap?: ObjectValueTransformerMap,
     errorsTransformer?: ErrorsTransformer
   ) {
+    this.fieldNodeTransformerMap = fieldNodeTransformerMap;
+    this.objectValueTransformerMap = objectValueTransformerMap;
+    this.errorsTransformer = errorsTransformer;
+  }
+
+  public transformSchema(
+    originalWrappingSchema: GraphQLSchema,
+    subschemaConfig: SubschemaConfig,
+    transformedSchema?: GraphQLSchema
+  ): GraphQLSchema {
+    const subscriptionTypeName = originalWrappingSchema.getSubscriptionType()?.name;
     this.transformer = new TransformCompositeFields(
       () => undefined,
       (typeName, fieldName, fieldNode, fragments, transformationContext) => {
-        const typeTransformers = fieldNodeTransformerMap[typeName];
+        const typeTransformers = this.fieldNodeTransformerMap[typeName];
         if (typeTransformers == null) {
           return undefined;
         }
@@ -31,34 +45,31 @@ export default class MapFields implements Transform {
 
         return fieldNodeTransformer(fieldNode, fragments, transformationContext);
       },
-      objectValueTransformerMap != null
+      this.objectValueTransformerMap != null
         ? (data, transformationContext) => {
             if (data == null) {
               return data;
             }
 
-            const typeName = data.__typename;
+            let typeName = data.__typename;
             if (typeName == null) {
-              return data;
+              // see https://github.com/ardatan/graphql-tools/issues/2282
+              typeName = subscriptionTypeName;
+              if (typeName == null) {
+                return data;
+              }
             }
 
-            const transformer = objectValueTransformerMap[typeName];
+            const transformer = this.objectValueTransformerMap[typeName];
             if (transformer == null) {
               return data;
             }
 
             return transformer(data, transformationContext);
           }
         : undefined,
-      errorsTransformer != null ? errorsTransformer : undefined
+      this.errorsTransformer != null ? this.errorsTransformer : undefined
     );
-  }
-
-  public transformSchema(
-    originalWrappingSchema: GraphQLSchema,
-    subschemaConfig: SubschemaConfig,
-    transformedSchema?: GraphQLSchema
-  ): GraphQLSchema {
     return this.transformer.transformSchema(originalWrappingSchema, subschemaConfig, transformedSchema);
   }
 

diff --git a/packages/wrap/src/transforms/TransformCompositeFields.ts b/packages/wrap/src/transforms/TransformCompositeFields.ts
@@ -25,6 +25,7 @@ export default class TransformCompositeFields implements Transform {
   private transformedSchema: GraphQLSchema;
   private typeInfo: TypeInfo;
   private mapping: Record<string, Record<string, string>>;
+  private subscriptionTypeName: string;
 
   constructor(
     fieldTransformer: FieldTransformer,
@@ -61,6 +62,7 @@ export default class TransformCompositeFields implements Transform {
       },
     });
     this.typeInfo = new TypeInfo(this.transformedSchema);
+    this.subscriptionTypeName = originalWrappingSchema.getSubscriptionType()?.name;
 
     return this.transformedSchema;
   }
@@ -135,7 +137,11 @@ export default class TransformCompositeFields implements Transform {
 
       const newName = selection.name.value;
 
-      if (this.dataTransformer != null || this.errorsTransformer != null) {
+      // See https://github.com/ardatan/graphql-tools/issues/2282
+      if (
+        (this.subscriptionTypeName && parentTypeName !== this.subscriptionTypeName && this.dataTransformer != null) ||
+        this.errorsTransformer != null
+      ) {
         newSelections.push({
           kind: Kind.FIELD,
           name: {