@graphql-box/connection-resolver 5.4.23-unstable-12345.4 → 5.4.23-unstable-12345.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@graphql-box/connection-resolver",
   "description": "The GraphQL Box connection resolver module.",
-  "version": "5.4.23-unstable-12345.4",
+  "version": "5.4.23-unstable-12345.5",
   "author": "miami-man",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/graphql-box",
@@ -38,7 +38,7 @@
     "js-base64": "^3.7.7",
     "lodash-es": "^4.17.23",
     "type-fest": "^4.41.0",
-    "@graphql-box/core": "5.4.14-unstable-12345.4"
+    "@graphql-box/core": "5.4.14-unstable-12345.5"
   },
   "peerDependencies": {
     "graphql": "<17",

package/src/helpers/requestAndCachePages.ts

@@ -1,22 +1,22 @@
 import { type Core } from '@cachemap/core';
-import { type PlainObject } from '@graphql-box/core';
+import { type PlainObject, type SetCacheMetadata } from '@graphql-box/core';
+import { type GraphQLResolveInfo } from 'graphql';
 import {
   type CachedEdges,
   type CursorGroupMetadata,
   type Getters,
   type Node,
   type ResourceResolver,
-  type SetCacheMetadata,
 } from '../types.ts';
 import { cacheCursors } from './cacheCursors.ts';
 import { makeEdges } from './makeEdges.ts';
 
 export type Context<Resource extends PlainObject, ResourceNode extends Node> = {
   cursorCache: Core;
-  fieldPath: string;
   getters: Getters<Resource, ResourceNode>;
   groupCursor: string;
   makeIDCursor: (id: string | number) => string;
+  resolverInfo: GraphQLResolveInfo;
   resourceResolver: ResourceResolver<Resource>;
   setCacheMetadata: SetCacheMetadata | undefined;
 };
@@ -29,10 +29,10 @@ export const requestAndCachePages = async <Resource extends PlainObject, Resourc
   pages: number[],
   {
     cursorCache,
-    fieldPath,
     getters,
     groupCursor,
     makeIDCursor,
+    resolverInfo,
     resourceResolver,
     setCacheMetadata,
   }: Context<Resource, ResourceNode>,
@@ -52,7 +52,7 @@ export const requestAndCachePages = async <Resource extends PlainObject, Resourc
     });
 
     if (pageResultData) {
-      setCacheMetadata?.(fieldPath, pageResultHeaders);
+      setCacheMetadata?.(pageResultData, resolverInfo, pageResultHeaders);
     }
 
     if (pageResultData && !pageResultErrors?.length) {

package/src/helpers/resolveConnection.ts

@@ -1,12 +1,7 @@
 import { type Core } from '@cachemap/core';
-import { type PlainObject } from '@graphql-box/core';
-import {
-  type ConnectionInputOptions,
-  type Getters,
-  type Node,
-  type ResourceResolver,
-  type SetCacheMetadata,
-} from '../types.ts';
+import { type PlainObject, type SetCacheMetadata } from '@graphql-box/core';
+import { type GraphQLResolveInfo } from 'graphql';
+import { type ConnectionInputOptions, type Getters, type Node, type ResourceResolver } from '../types.ts';
 import { extractEdges } from './extractEdges.ts';
 import { extractNodes } from './extractNodes.ts';
 import { getInRangeCachedEdges } from './getInRangeCachedEdges.ts';
@@ -17,10 +12,10 @@ import { retrieveCachedConnection } from './retrieveCachedConnection.ts';
 
 export type Context<Resource extends PlainObject, ResourceNode extends Node> = {
   cursorCache: Core;
-  fieldPath: string;
   getters: Getters<Resource, ResourceNode>;
   groupCursor: string;
   makeIDCursor: (id: string | number) => string;
+  resolverInfo: GraphQLResolveInfo;
   resourceResolver: ResourceResolver<Resource>;
   resultsPerPage: number;
   setCacheMetadata: SetCacheMetadata | undefined;
@@ -30,10 +25,10 @@ export const resolveConnection = async <Resource extends PlainObject, ResourceNo
   args: PlainObject & ConnectionInputOptions,
   {
     cursorCache,
-    fieldPath,
     getters,
     groupCursor,
     makeIDCursor,
+    resolverInfo,
     resourceResolver,
     resultsPerPage,
     setCacheMetadata,
@@ -65,10 +60,10 @@ export const resolveConnection = async <Resource extends PlainObject, ResourceNo
 
   const { cachedEdges: missingCachedEdges, errors } = await requestAndCachePages<Resource, ResourceNode>(missingPages, {
     cursorCache,
-    fieldPath,
     getters,
     groupCursor,
     makeIDCursor,
+    resolverInfo,
     resourceResolver,
     setCacheMetadata,
   });

package/src/main/index.ts

@@ -83,10 +83,10 @@ export const makeConnectionResolver =
       return resolver(
         await resolveConnection(args, {
           cursorCache,
-          fieldPath,
           getters,
           groupCursor,
           makeIDCursor,
+          resolverInfo: info,
           resourceResolver,
           resultsPerPage,
           setCacheMetadata,
@@ -98,10 +98,10 @@ export const makeConnectionResolver =
       return resolver(
         await resolveConnection(args, {
           cursorCache,
-          fieldPath,
           getters,
           groupCursor,
           makeIDCursor,
+          resolverInfo: info,
           resourceResolver,
           resultsPerPage,
           setCacheMetadata,
@@ -111,10 +111,10 @@ export const makeConnectionResolver =
 
     await requestAndCachePages<Resource, ResourceNode>([1], {
       cursorCache,
-      fieldPath,
       getters,
       groupCursor,
       makeIDCursor,
+      resolverInfo: info,
       resourceResolver,
       setCacheMetadata,
     });
@@ -122,10 +122,10 @@ export const makeConnectionResolver =
     return resolver(
       await resolveConnection(args, {
         cursorCache,
-        fieldPath,
         getters,
         groupCursor,
         makeIDCursor,
+        resolverInfo: info,
         resourceResolver,
         resultsPerPage,
         setCacheMetadata,

package/src/types.ts

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