rename fieldPath to itemPath

graphql · Sep 28, 2022 · 71a8db4 · 71a8db4
1 parent 2991c79
commit 71a8db4
Showing 1 changed file with 18 additions and 26 deletions.
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -996,7 +996,7 @@ async function completeAsyncIteratorValue(
       break;
     }
 
-    const fieldPath = addPath(path, index, undefined);
+    const itemPath = addPath(path, index, undefined);
     try {
       // eslint-disable-next-line no-await-in-loop
       const { value, done } = await iterator.next();
@@ -1011,7 +1011,7 @@ async function completeAsyncIteratorValue(
           itemType,
           fieldNodes,
           info,
-          fieldPath,
+          itemPath,
           value,
           asyncPayloadRecord,
         );
@@ -1024,10 +1024,10 @@ async function completeAsyncIteratorValue(
               const error = locatedError(
                 rawError,
                 fieldNodes,
-                pathToArray(fieldPath),
+                pathToArray(itemPath),
               );
               const handledError = handleFieldError(error, itemType, errors);
-              filterSubsequentPayloads(exeContext, fieldPath);
+              filterSubsequentPayloads(exeContext, itemPath);
               return handledError;
             }),
           );
@@ -1036,16 +1036,12 @@ async function completeAsyncIteratorValue(
         }
       } catch (rawError) {
         completedResults.push(null);
-        const error = locatedError(
-          rawError,
-          fieldNodes,
-          pathToArray(fieldPath),
-        );
-        filterSubsequentPayloads(exeContext, fieldPath);
+        const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
+        filterSubsequentPayloads(exeContext, itemPath);
         handleFieldError(error, itemType, errors);
       }
     } catch (rawError) {
-      const error = locatedError(rawError, fieldNodes, pathToArray(fieldPath));
+      const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
       completedResults.push(handleFieldError(error, itemType, errors));
       break;
     }
@@ -1939,7 +1935,7 @@ async function executeStreamIteratorItem(
   info: GraphQLResolveInfo,
   itemType: GraphQLOutputType,
   asyncPayloadRecord: StreamRecord,
-  fieldPath: Path,
+  itemPath: Path,
 ): Promise<IteratorResult<unknown>> {
   let item;
   try {
@@ -1950,9 +1946,9 @@ async function executeStreamIteratorItem(
     }
     item = value;
   } catch (rawError) {
-    const error = locatedError(rawError, fieldNodes, pathToArray(fieldPath));
+    const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
     const value = handleFieldError(error, itemType, asyncPayloadRecord.errors);
-    filterSubsequentPayloads(exeContext, fieldPath, asyncPayloadRecord);
+    filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
     // don't continue if iterator throws
     return { done: true, value };
   }
@@ -1963,32 +1959,28 @@ async function executeStreamIteratorItem(
       itemType,
       fieldNodes,
       info,
-      fieldPath,
+      itemPath,
       item,
       asyncPayloadRecord,
     );
 
     if (isPromise(completedItem)) {
       completedItem = completedItem.then(undefined, (rawError) => {
-        const error = locatedError(
-          rawError,
-          fieldNodes,
-          pathToArray(fieldPath),
-        );
+        const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
         const handledError = handleFieldError(
           error,
           itemType,
           asyncPayloadRecord.errors,
         );
-        filterSubsequentPayloads(exeContext, fieldPath, asyncPayloadRecord);
+        filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
         return handledError;
       });
     }
     return { done: false, value: completedItem };
   } catch (rawError) {
-    const error = locatedError(rawError, fieldNodes, pathToArray(fieldPath));
+    const error = locatedError(rawError, fieldNodes, pathToArray(itemPath));
     const value = handleFieldError(error, itemType, asyncPayloadRecord.errors);
-    filterSubsequentPayloads(exeContext, fieldPath, asyncPayloadRecord);
+    filterSubsequentPayloads(exeContext, itemPath, asyncPayloadRecord);
     return { done: false, value };
   }
 }
@@ -2008,10 +2000,10 @@ async function executeStreamIterator(
   let previousAsyncPayloadRecord = parentContext ?? undefined;
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    const fieldPath = addPath(path, index, undefined);
+    const itemPath = addPath(path, index, undefined);
     const asyncPayloadRecord = new StreamRecord({
       label,
-      path: fieldPath,
+      path: itemPath,
       parentContext: previousAsyncPayloadRecord,
       iterator,
       exeContext,
@@ -2024,7 +2016,7 @@ async function executeStreamIterator(
       info,
       itemType,
       asyncPayloadRecord,
-      fieldPath,
+      itemPath,
     );
 
     asyncPayloadRecord.addItems(