@graphql-codegen/visitor-plugin-common 7.1.1 → 7.1.2

package/cjs/selection-set-to-object.js

@@ -373,7 +373,31 @@ class SelectionSetToObject {
                             }
                             return prev;
                         }, []);
-                        collectGrouped(flattenedSelectionNodes);
+                        // Top-level INLINE_FRAGMENT / FRAGMENT_SPREAD nodes among the
+                        // inlined selections cannot be consumed directly by
+                        // `buildSelectionSet`, which only handles FIELD and DIRECTIVE
+                        // kinds for AST nodes and throws "Unexpected type." otherwise.
+                        // Route them through `flattenSelectionSet` — which already
+                        // expands inline fragments and fragment spreads per type — and
+                        // merge the FIELD-only result with the already-FIELD selections
+                        // before handing off.
+                        const directNodes = [];
+                        const nestedSelections = [];
+                        for (const n of flattenedSelectionNodes) {
+                            if ('kind' in n &&
+                                (n.kind === graphql_1.Kind.INLINE_FRAGMENT || n.kind === graphql_1.Kind.FRAGMENT_SPREAD)) {
+                                nestedSelections.push(n);
+                            }
+                            else {
+                                directNodes.push(n);
+                            }
+                        }
+                        if (nestedSelections.length) {
+                            const { selectionNodesByTypeName: nestedByType } = this.flattenSelectionSet(nestedSelections, schemaType);
+                            const nestedForThisType = nestedByType.get(typeName) ?? [];
+                            directNodes.push(...nestedForThisType);
+                        }
+                        collectGrouped(directNodes);
                     }
                     if (incrementalDirectivesFound) {
                         for (const incrementalNode of selectionNodes) {

package/esm/selection-set-to-object.js

@@ -369,7 +369,31 @@ export class SelectionSetToObject {
                             }
                             return prev;
                         }, []);
-                        collectGrouped(flattenedSelectionNodes);
+                        // Top-level INLINE_FRAGMENT / FRAGMENT_SPREAD nodes among the
+                        // inlined selections cannot be consumed directly by
+                        // `buildSelectionSet`, which only handles FIELD and DIRECTIVE
+                        // kinds for AST nodes and throws "Unexpected type." otherwise.
+                        // Route them through `flattenSelectionSet` — which already
+                        // expands inline fragments and fragment spreads per type — and
+                        // merge the FIELD-only result with the already-FIELD selections
+                        // before handing off.
+                        const directNodes = [];
+                        const nestedSelections = [];
+                        for (const n of flattenedSelectionNodes) {
+                            if ('kind' in n &&
+                                (n.kind === Kind.INLINE_FRAGMENT || n.kind === Kind.FRAGMENT_SPREAD)) {
+                                nestedSelections.push(n);
+                            }
+                            else {
+                                directNodes.push(n);
+                            }
+                        }
+                        if (nestedSelections.length) {
+                            const { selectionNodesByTypeName: nestedByType } = this.flattenSelectionSet(nestedSelections, schemaType);
+                            const nestedForThisType = nestedByType.get(typeName) ?? [];
+                            directNodes.push(...nestedForThisType);
+                        }
+                        collectGrouped(directNodes);
                     }
                     if (incrementalDirectivesFound) {
                         for (const incrementalNode of selectionNodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "7.1.1",
+  "version": "7.1.2",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },