@graphql-tools/utils - npm Package Compare versions

Comparing version 10.3.1 to 10.4.0-alpha-20240708191055-6aa94b70be0a68ccac6339230c2f5ff436909dc4

cjs/index.js

@@ -62,1 +62,2 @@ "use strict";
 tslib_1.__exportStar(require("./debugTimer.js"), exports);
+tslib_1.__exportStar(require("./createDeferred.js"), exports);

cjs/mergeIncrementalResult.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeIncrementalResult = void 0;
+const tslib_1 = require("tslib");
+const dlv_1 = tslib_1.__importDefault(require("dlv"));
 const merge_1 = require("dset/merge");
+const pathsMap = new WeakMap();
 function mergeIncrementalResult({ incrementalResult, executionResult, }) {
-    const path = ['data', ...(incrementalResult.path ?? [])];
+    let path = [
+        'data',
+        ...(incrementalResult.path ?? []),
+    ];
+    for (const result of [executionResult, incrementalResult]) {
+        if (result.pending) {
+            let paths = pathsMap.get(executionResult);
+            if (paths === undefined) {
+                paths = new Map();
+                pathsMap.set(executionResult, paths);
+            }
+            for (const { id, path } of result.pending) {
+                paths.set(id, ['data', ...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]++;
+        if (incrementalResult.id) {
+            const id = incrementalResult.id;
+            path = pathsMap.get(executionResult)?.get(id);
+            if (path === undefined) {
+                throw new Error('Invalid incremental delivery format.');
+            }
+            const list = (0, dlv_1.default)(executionResult, path);
+            list.push(...incrementalResult.items);
         }
+        else {
+            const path = ['data', ...(incrementalResult.path ?? [])];
+            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]++;
+            }
+        }
     }
     if (incrementalResult.data) {
+        if (incrementalResult.id) {
+            const id = incrementalResult.id;
+            if (id !== undefined) {
+                path = pathsMap.get(executionResult)?.get(id);
+                if (path === undefined) {
+                    throw new Error('Invalid incremental delivery format.');
+                }
+            }
+        }
         (0, merge_1.dset)(executionResult, path, incrementalResult.data);
@@ -32,3 +71,13 @@ }
     }
+    if (incrementalResult.completed) {
+        // Remove tracking and add additional errors
+        for (const { id, errors } of incrementalResult.completed) {
+            pathsMap.get(executionResult)?.delete(id);
+            if (errors) {
+                executionResult.errors = executionResult.errors || [];
+                executionResult.errors.push(...errors);
+            }
+        }
+    }
 }
 exports.mergeIncrementalResult = mergeIncrementalResult;

esm/index.js

@@ -57,1 +57,2 @@ export * from './loaders.js';
 export * from './debugTimer.js';
+export * from './createDeferred.js';

esm/mergeIncrementalResult.js

@@ -0,12 +1,50 @@
+import dlv from 'dlv';
 import { dset } from 'dset/merge';
+const pathsMap = new WeakMap();
 export function mergeIncrementalResult({ incrementalResult, executionResult, }) {
-    const path = ['data', ...(incrementalResult.path ?? [])];
+    let path = [
+        'data',
+        ...(incrementalResult.path ?? []),
+    ];
+    for (const result of [executionResult, incrementalResult]) {
+        if (result.pending) {
+            let paths = pathsMap.get(executionResult);
+            if (paths === undefined) {
+                paths = new Map();
+                pathsMap.set(executionResult, paths);
+            }
+            for (const { id, path } of result.pending) {
+                paths.set(id, ['data', ...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]++;
+        if (incrementalResult.id) {
+            const id = incrementalResult.id;
+            path = pathsMap.get(executionResult)?.get(id);
+            if (path === undefined) {
+                throw new Error('Invalid incremental delivery format.');
+            }
+            const list = dlv(executionResult, path);
+            list.push(...incrementalResult.items);
         }
+        else {
+            const path = ['data', ...(incrementalResult.path ?? [])];
+            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]++;
+            }
+        }
     }
     if (incrementalResult.data) {
+        if (incrementalResult.id) {
+            const id = incrementalResult.id;
+            if (id !== undefined) {
+                path = pathsMap.get(executionResult)?.get(id);
+                if (path === undefined) {
+                    throw new Error('Invalid incremental delivery format.');
+                }
+            }
+        }
         dset(executionResult, path, incrementalResult.data);
@@ -29,2 +67,12 @@ }
     }
+    if (incrementalResult.completed) {
+        // Remove tracking and add additional errors
+        for (const { id, errors } of incrementalResult.completed) {
+            pathsMap.get(executionResult)?.delete(id);
+            if (errors) {
+                executionResult.errors = executionResult.errors || [];
+                executionResult.errors.push(...errors);
+            }
+        }
+    }
 }

package.json

 {
   "name": "@graphql-tools/utils",
-  "version": "10.3.1",
+  "version": "10.4.0-alpha-20240708191055-6aa94b70be0a68ccac6339230c2f5ff436909dc4",
   "description": "Common package containing utils and types for GraphQL tools",
@@ -12,2 +12,3 @@ "sideEffects": false,
     "cross-inspect": "1.0.0",
+    "dlv": "^1.1.3",
     "dset": "^3.1.2",
@@ -14,0 +15,0 @@ "tslib": "^2.4.0"

typings/index.d.ts

@@ -57,1 +57,2 @@ export * from './loaders.js';
 export * from './debugTimer.js';
+export * from './createDeferred.js';

typings/Interfaces.d.ts

@@ -20,2 +20,11 @@ import { DefinitionNode, DocumentNode, EnumTypeDefinitionNode, EnumTypeExtensionNode, FieldDefinitionNode, FieldNode, FragmentDefinitionNode, GraphQLArgument, GraphQLArgumentConfig, GraphQLDirective, GraphQLEnumType, GraphQLEnumValue, GraphQLEnumValueConfig, GraphQLError, GraphQLField, GraphQLFieldConfig, GraphQLInputField, GraphQLInputFieldConfig, GraphQLInputObjectType, GraphQLInputType, GraphQLInterfaceType, GraphQLIsTypeOfFn, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLResolveInfo, GraphQLScalarLiteralParser, GraphQLScalarSerializer, GraphQLScalarType, GraphQLScalarValueParser, GraphQLSchema, GraphQLType, GraphQLTypeResolver, GraphQLUnionType, InputObjectTypeDefinitionNode, InputObjectTypeExtensionNode, InterfaceTypeDefinitionNode, InterfaceTypeExtensionNode, ObjectTypeDefinitionNode, ObjectTypeExtensionNode, OperationTypeNode, ScalarTypeDefinitionNode, ScalarTypeExtensionNode, SelectionNode, Source, UnionTypeDefinitionNode, UnionTypeExtensionNode } from 'graphql';
     items?: TData | null;
+    id?: string;
+    pending?: ReadonlyArray<{
+        id: string;
+        path: ReadonlyArray<string | number>;
+    }>;
+    completed?: ReadonlyArray<{
+        id: string;
+        errors?: ReadonlyArray<GraphQLError>;
+    }>;
 }
@@ -22,0 +31,0 @@ export interface ExecutionRequest<TVariables extends Record<string, any> = any, TContext = any, TRootValue = any, TExtensions = Record<string, any>, TReturn = any> {

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

510161

increased by1.06%

Number of package files

246

increased by1.65%

Lines of code

11053

increased by1.29%

Worsened metrics

Dependency count

6

increased by20%

Number of low quality alerts

2

increased by100%

Dependency changes

• + Addeddlv@^1.1.3

• + Addeddlv@1.1.3(transitive)