fix type issues

Author: JoviDeCroock

packages/delegate/src/mergeFields.ts

@@ -117,12 +117,16 @@ function handleResolverResult(
     const type = schema.getType(object.__typename) as GraphQLObjectType;
     const { fields } = collectFields(schema, EMPTY_OBJECT, EMPTY_OBJECT, type, selectionSet);
     const nullResult: Record<string, any> = {};
-    for (const [responseKey, fieldNodes] of fields) {
+    for (const [responseKey, fieldGroups] of fields) {
       const combinedPath = [...path, responseKey];
       if (resolverResult instanceof GraphQLError) {
         nullResult[responseKey] = relocatedError(resolverResult, combinedPath);
       } else if (resolverResult instanceof Error) {
-        nullResult[responseKey] = locatedError(resolverResult, fieldNodes, combinedPath);
+        nullResult[responseKey] = locatedError(
+          resolverResult,
+          fieldGroups.map(group => group.fieldNode),
+          combinedPath,
+        );
       } else {
         nullResult[responseKey] = null;
       }

packages/stitch/src/executor.ts

@@ -32,8 +32,8 @@ export function createStitchingExecutor(stitchedSchema: GraphQLSchema) {
       operation.selectionSet,
     );
     const data: Record<string, any> = {};
-    for (const [fieldName, fieldNodes] of fields) {
-      const responseKey = fieldNodes[0].alias?.value ?? fieldName;
+    for (const [fieldName, fieldGroups] of fields) {
+      const responseKey = fieldGroups[0].fieldNode.alias?.value ?? fieldName;
       const subschemaForField = subschemas.find(subschema => {
         const subschemaSchema = isSubschemaConfig(subschema)
           ? subschema.schema
@@ -48,7 +48,7 @@ export function createStitchingExecutor(stitchedSchema: GraphQLSchema) {
         info: {
           schema: stitchedSchema,
           fieldName,
-          fieldNodes,
+          fieldNodes: fieldGroups.map(group => group.fieldNode),
           operation,
           fragments,
           parentType: rootType,

packages/stitch/src/getFieldsNotInSubschema.ts

@@ -25,11 +25,11 @@ export function getFieldsNotInSubschema(
   const fields = subschemaType.getFields();
 
   const fieldsNotInSchema = new Set<FieldNode>();
-  for (const [, subFieldNodes] of subFieldNodesByResponseKey) {
-    const fieldName = subFieldNodes[0].name.value;
+  for (const [, subFieldGroups] of subFieldNodesByResponseKey) {
+    const fieldName = subFieldGroups[0].fieldNode.name.value;
     if (!fields[fieldName]) {
-      for (const subFieldNode of subFieldNodes) {
-        fieldsNotInSchema.add(subFieldNode);
+      for (const subFieldNode of subFieldGroups) {
+        fieldsNotInSchema.add(subFieldNode.fieldNode);
       }
     }
     const fieldNodesForField = fieldNodesByField?.[gatewayType.name]?.[fieldName];

packages/stitch/src/stitchingInfo.ts

@@ -318,7 +318,7 @@ export function completeStitchingInfo<TContext = Record<string, any>>(
         const { fields } = collectFields(schema, fragments, variableValues, type, selectionSet);
 
         for (const [, fieldNodes] of fields) {
-          for (const fieldNode of fieldNodes) {
+          for (const { fieldNode } of fieldNodes) {
             const key = print(fieldNode);
             if (fieldNodeMap[key] == null) {
               fieldNodeMap[key] = fieldNode;

packages/utils/src/visitResult.ts

@@ -1,5 +1,4 @@
 import {
-  FieldNode,
   FragmentDefinitionNode,
   getNullableType,
   GraphQLError,
@@ -15,7 +14,7 @@ import {
   TypeMetaFieldDef,
   TypeNameMetaFieldDef,
 } from 'graphql';
-import { collectFields, collectSubFields } from './collectFields.js';
+import { collectFields, collectSubFields, FieldDetails } from './collectFields.js';
 import { getOperationASTFromRequest } from './getOperationASTFromRequest.js';
 import { ExecutionRequest, ExecutionResult } from './Interfaces.js';
 import { Maybe } from './types.js';
@@ -204,7 +203,7 @@ function visitRoot(
 function visitObjectValue(
   object: Record<string, any>,
   type: GraphQLObjectType,
-  fieldNodeMap: Map<string, FieldNode[]>,
+  fieldNodeMap: Map<string, FieldDetails[]>,
   schema: GraphQLSchema,
   fragments: Record<string, FragmentDefinitionNode>,
   variableValues: Record<string, any>,
@@ -230,7 +229,7 @@ function visitObjectValue(
   }
 
   for (const [responseKey, subFieldNodes] of fieldNodeMap) {
-    const fieldName = subFieldNodes[0].name.value;
+    const fieldName = subFieldNodes[0].fieldNode.name.value;
     let fieldType = fieldMap[fieldName]?.type;
     if (fieldType == null) {
       switch (fieldName) {
@@ -257,6 +256,7 @@ function visitObjectValue(
       addPathSegmentInfo(type, fieldName, newPathIndex, fieldErrors, errorInfo);
     }
 
+    // TODO: for fragment arguments we might need to update the variable-values here.
     const newValue = visitFieldValue(
       object[responseKey],
       fieldType,
@@ -322,7 +322,7 @@ function updateObject(
 function visitListValue(
   list: Array<any>,
   returnType: GraphQLOutputType,
-  fieldNodes: Array<FieldNode>,
+  fieldNodes: Array<FieldDetails>,
   schema: GraphQLSchema,
   fragments: Record<string, FragmentDefinitionNode>,
   variableValues: Record<string, any>,
@@ -350,7 +350,7 @@ function visitListValue(
 function visitFieldValue(
   value: any,
   returnType: GraphQLOutputType,
-  fieldNodes: Array<FieldNode>,
+  fieldGroups: Array<FieldDetails>,
   schema: GraphQLSchema,
   fragments: Record<string, FragmentDefinitionNode>,
   variableValues: Record<string, any>,
@@ -368,7 +368,7 @@ function visitFieldValue(
     return visitListValue(
       value as Array<any>,
       nullableType.ofType,
-      fieldNodes,
+      fieldGroups,
       schema,
       fragments,
       variableValues,
@@ -384,7 +384,7 @@ function visitFieldValue(
       fragments,
       variableValues,
       finalType,
-      fieldNodes,
+      fieldGroups.map(group => group.fieldNode),
     );
     return visitObjectValue(
       value,
@@ -404,7 +404,7 @@ function visitFieldValue(
       fragments,
       variableValues,
       nullableType,
-      fieldNodes,
+      fieldGroups.map(group => group.fieldNode),
     );
     return visitObjectValue(
       value,