@graphql-tools/utils 10.0.2 → 10.0.3-alpha-20230703152134-22d7eebf

package/cjs/mergeIncrementalResult.js

@@ -3,25 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeIncrementalResult = void 0;
 const merge_1 = require("dset/merge");
 function mergeIncrementalResult({ incrementalResult, executionResult, }) {
-    if (incrementalResult.path) {
-        const path = ['data', ...incrementalResult.path];
-        executionResult.data = executionResult.data || {};
-        if (incrementalResult.items) {
-            for (const item of incrementalResult.items) {
-                (0, merge_1.dset)(executionResult, path, item);
-            }
-        }
-        if (incrementalResult.data) {
-            (0, merge_1.dset)(executionResult, ['data', ...incrementalResult.path], incrementalResult.data);
+    const path = ['data', ...(incrementalResult.path ?? [])];
+    if (incrementalResult.items) {
+        for (const item of incrementalResult.items) {
+            (0, merge_1.dset)(executionResult, path, item);
+            // Increment the last path segment (the array index) to merge the next item at the next index
+            path[path.length - 1]++;
         }
     }
-    else if (incrementalResult.data) {
-        executionResult.data = executionResult.data || {};
-        Object.assign(executionResult.data, incrementalResult.data);
+    if (incrementalResult.data) {
+        (0, merge_1.dset)(executionResult, path, incrementalResult.data);
     }
     if (incrementalResult.errors) {
         executionResult.errors = executionResult.errors || [];
-        executionResult.errors.push(...executionResult.errors);
+        executionResult.errors.push(...incrementalResult.errors);
+    }
+    if (incrementalResult.extensions) {
+        (0, merge_1.dset)(executionResult, 'extensions', incrementalResult.extensions);
     }
     if (incrementalResult.incremental) {
         incrementalResult.incremental.forEach(incrementalSubResult => {

package/esm/mergeIncrementalResult.js

@@ -1,24 +1,22 @@
 import { dset } from 'dset/merge';
 export function mergeIncrementalResult({ incrementalResult, executionResult, }) {
-    if (incrementalResult.path) {
-        const path = ['data', ...incrementalResult.path];
-        executionResult.data = executionResult.data || {};
-        if (incrementalResult.items) {
-            for (const item of incrementalResult.items) {
-                dset(executionResult, path, item);
-            }
-        }
-        if (incrementalResult.data) {
-            dset(executionResult, ['data', ...incrementalResult.path], incrementalResult.data);
+    const path = ['data', ...(incrementalResult.path ?? [])];
+    if (incrementalResult.items) {
+        for (const item of incrementalResult.items) {
+            dset(executionResult, path, item);
+            // Increment the last path segment (the array index) to merge the next item at the next index
+            path[path.length - 1]++;
         }
     }
-    else if (incrementalResult.data) {
-        executionResult.data = executionResult.data || {};
-        Object.assign(executionResult.data, incrementalResult.data);
+    if (incrementalResult.data) {
+        dset(executionResult, path, incrementalResult.data);
     }
     if (incrementalResult.errors) {
         executionResult.errors = executionResult.errors || [];
-        executionResult.errors.push(...executionResult.errors);
+        executionResult.errors.push(...incrementalResult.errors);
+    }
+    if (incrementalResult.extensions) {
+        dset(executionResult, 'extensions', incrementalResult.extensions);
     }
     if (incrementalResult.incremental) {
         incrementalResult.incremental.forEach(incrementalSubResult => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/utils",
-  "version": "10.0.2",
+  "version": "10.0.3-alpha-20230703152134-22d7eebf",
   "description": "Common package containing utils and types for GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {