npm - @graphql-tools/wrap - Versions diffs - 9.2.10 → 9.2.11-alpha-20221107152054-d7ee37f7 - Mend

@graphql-tools/wrap 9.2.10 → 9.2.11-alpha-20221107152054-d7ee37f7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/cjs/transforms/TransformCompositeFields.js +5 -2
package/esm/transforms/TransformCompositeFields.js +5 -2
package/package.json +1 -1

package/cjs/transforms/TransformCompositeFields.js CHANGED Viewed

@@ -76,14 +76,16 @@ class TransformCompositeFields {
         }
         const parentTypeName = parentType.name;
         let newSelections = [];
+        let typeNameExists = node.selections.some(selection => selection.kind === graphql_1.Kind.FIELD && selection.name.value === '__typename');
         for (const selection of node.selections) {
-            if (selection.kind !== graphql_1.Kind.FIELD) {
+            if (selection.kind !== graphql_1.Kind.FIELD || selection.name.value === '__typename') {
                 newSelections.push(selection);
                 continue;
             }
             const newName = selection.name.value;
             // See https://github.com/ardatan/graphql-tools/issues/2282
-            if ((this.dataTransformer != null || this.errorsTransformer != null) &&
+            if (!typeNameExists &&
+                (this.dataTransformer != null || this.errorsTransformer != null) &&
                 (this.subscriptionTypeName == null || parentTypeName !== this.subscriptionTypeName)) {
                 newSelections.push({
                     kind: graphql_1.Kind.FIELD,
@@ -92,6 +94,7 @@ class TransformCompositeFields {
                         value: '__typename',
                     },
                 });
+                typeNameExists = true;
             }
             let transformedSelection;
             if (this.fieldNodeTransformer == null) {

package/esm/transforms/TransformCompositeFields.js CHANGED Viewed

@@ -74,14 +74,16 @@ export default class TransformCompositeFields {
         }
         const parentTypeName = parentType.name;
         let newSelections = [];
+        let typeNameExists = node.selections.some(selection => selection.kind === Kind.FIELD && selection.name.value === '__typename');
         for (const selection of node.selections) {
-            if (selection.kind !== Kind.FIELD) {
+            if (selection.kind !== Kind.FIELD || selection.name.value === '__typename') {
                 newSelections.push(selection);
                 continue;
             }
             const newName = selection.name.value;
             // See https://github.com/ardatan/graphql-tools/issues/2282
-            if ((this.dataTransformer != null || this.errorsTransformer != null) &&
+            if (!typeNameExists &&
+                (this.dataTransformer != null || this.errorsTransformer != null) &&
                 (this.subscriptionTypeName == null || parentTypeName !== this.subscriptionTypeName)) {
                 newSelections.push({
                     kind: Kind.FIELD,
@@ -90,6 +92,7 @@ export default class TransformCompositeFields {
                         value: '__typename',
                     },
                 });
+                typeNameExists = true;
             }
             let transformedSelection;
             if (this.fieldNodeTransformer == null) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/wrap",
-  "version": "9.2.10",
+  "version": "9.2.11-alpha-20221107152054-d7ee37f7",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {