refactor: move executeStreamField out of try

this function should catches errors and should never throw
graphql · Sep 28, 2022 · 419fd37 · 419fd37
1 parent bd5aae7
commit 419fd37
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/src/execution/execute.ts b/src/execution/execute.ts
@@ -1103,28 +1103,29 @@ function completeListValue(
     // No need to modify the info object containing the path,
     // since from here on it is not ever accessed by resolver functions.
     const itemPath = addPath(path, index, undefined);
+
+    if (
+      stream &&
+      typeof stream.initialCount === 'number' &&
+      index >= stream.initialCount
+    ) {
+      previousAsyncPayloadRecord = executeStreamField(
+        path,
+        itemPath,
+        item,
+        exeContext,
+        fieldNodes,
+        info,
+        itemType,
+        stream.label,
+        previousAsyncPayloadRecord,
+      );
+      index++;
+      continue;
+    }
+
     try {
       let completedItem;
-
-      if (
-        stream &&
-        typeof stream.initialCount === 'number' &&
-        index >= stream.initialCount
-      ) {
-        previousAsyncPayloadRecord = executeStreamField(
-          path,
-          itemPath,
-          item,
-          exeContext,
-          fieldNodes,
-          info,
-          itemType,
-          stream.label,
-          previousAsyncPayloadRecord,
-        );
-        index++;
-        continue;
-      }
       if (isPromise(item)) {
         completedItem = item.then((resolved) =>
           completeValue(