@graphql-box/connection-resolver 5.4.8 → 5.4.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graphql-box/connection-resolver",
   "description": "The GraphQL Box connection resolver module.",
-  "version": "5.4.8",
+  "version": "5.4.10",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/graphql-box",

package/src/main/index.test.ts

@@ -7,7 +7,7 @@ import { encode } from 'js-base64';
 import { generateCursorCache } from '../__testUtils__/generateCursorCache.ts';
 import { generatePageResponse } from '../__testUtils__/generatePageResponse.ts';
 import { removeConnectionInputOptions } from '../helpers/removeConnectionInputOptions.ts';
-import { type Getters, type Node, type ResourceResponse } from '../types.ts';
+import { type Context, type Getters, type Node, type ResourceResponse } from '../types.ts';
 import { makeConnectionResolver } from './index.ts';
 
 const createMakeCursors = (_source: PlainObject, args: PlainObject) => ({
@@ -49,7 +49,7 @@ describe('connectionResolver', () => {
 
         const args = { before: 'abcdefg', first: 5, query: 'Hello world!' };
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -104,7 +104,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -151,7 +151,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -202,7 +202,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -248,7 +248,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -298,7 +298,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -349,7 +349,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -395,7 +395,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {
@@ -445,7 +445,7 @@ describe('connectionResolver', () => {
         };
 
         const info = {};
-        result = await connectionResolver({}, args, {}, info as GraphQLResolveInfo);
+        result = await connectionResolver({}, args, {} as Context, info as GraphQLResolveInfo);
       });
 
       it('should return the correct result', () => {

package/src/main/index.ts

@@ -34,19 +34,22 @@ export const makeConnectionResolver =
     info: GraphQLResolveInfo,
   ): Promise<Connection> => {
     const { makeGroupCursor, makeIDCursor } = createMakeCursors(source, args, context, info);
-    const resourceResolver = createResourceResolver(source, args, context, info);
     const groupCursor = makeGroupCursor();
-    const { logger, operationName, requestID, setCacheMetadata } = context;
+    const { logger, setCacheMetadata } = context;
     const { fieldName: fieldPath } = info;
 
-    const childLogger = logger?.child({
-      args,
-      fieldPath,
-      groupCursor,
-      operationName,
-      requestID,
-    });
+    const newCtx = {
+      ...context,
+      data: {
+        ...context.data,
+        args,
+        fieldPath,
+        groupCursor,
+      },
+    };
 
+    const resourceResolver = createResourceResolver(source, args, newCtx, info);
+    const childLogger = logger?.child(newCtx.data);
     childLogger?.info(`Resolving ${fieldPath}`);
 
     if (isCursorSupplied(args)) {

package/src/types.ts

@@ -1,5 +1,5 @@
 import { type Core } from '@cachemap/core';
-import { type PlainObject } from '@graphql-box/core';
+import { type ExecutionContextValue, type PlainObject } from '@graphql-box/core';
 import { type GraphQLResolveInfo, type OperationTypeNode } from 'graphql';
 import { type SetOptional } from 'type-fest';
 import { type Logger } from 'winston';
@@ -64,9 +64,8 @@ export type ResourceResolver<Resource extends PlainObject> = (args: {
 
 export type SetCacheMetadata = (key: string, headers: Headers, operation?: OperationTypeNode) => void;
 
-export type Context = PlainObject & {
+export type Context = ExecutionContextValue & {
   logger?: Logger;
-  setCacheMetadata?: SetCacheMetadata;
 };
 
 export type CreateResourceResolver<