@graphql-box/connection-resolver 5.4.7 → 5.4.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graphql-box/connection-resolver",
   "description": "The GraphQL Box connection resolver module.",
-  "version": "5.4.7",
+  "version": "5.4.9",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/graphql-box",
@@ -38,7 +38,7 @@
     "js-base64": "^3.7.7",
     "lodash-es": "^4.17.21",
     "type-fest": "^4.30.0",
-    "@graphql-box/core": "5.4.3"
+    "@graphql-box/core": "5.4.4"
   },
   "peerDependencies": {
     "graphql": "<17",

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

@@ -36,15 +36,14 @@ export const makeConnectionResolver =
     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 { data: ctxData, logger, setCacheMetadata } = context;
     const { fieldName: fieldPath } = info;
 
     const childLogger = logger?.child({
+      ...ctxData,
       args,
       fieldPath,
       groupCursor,
-      operationName,
-      requestID,
     });
 
     childLogger?.info(`Resolving ${fieldPath}`);

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<