@graphql-box/connection-resolver 5.4.3 → 5.4.5

package/package.json

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

package/src/helpers/requestAndCachePages.ts

@@ -6,7 +6,7 @@ import { makeEdges } from './makeEdges.ts';
 
 export type Context<Resource extends PlainObject, ResourceNode extends Node> = {
   cursorCache: Core;
-  fieldName: string;
+  fieldPath: string;
   getters: Getters<Resource, ResourceNode>;
   groupCursor: string;
   makeIDCursor: (id: string | number) => string;
@@ -18,7 +18,7 @@ export const requestAndCachePages = async <Resource extends PlainObject, Resourc
   pages: number[],
   {
     cursorCache,
-    fieldName,
+    fieldPath,
     getters,
     groupCursor,
     makeIDCursor,
@@ -39,7 +39,7 @@ export const requestAndCachePages = async <Resource extends PlainObject, Resourc
       });
 
       if (pageResultData) {
-        setCacheMetadata?.(fieldName, pageResultHeaders);
+        setCacheMetadata?.(fieldPath, pageResultHeaders);
       }
 
       if (pageResultData && !pageResultErrors?.length) {

package/src/helpers/resolveConnection.ts

@@ -18,7 +18,7 @@ import { retrieveCachedConnection } from './retrieveCachedConnection.ts';
 
 export type Context<Resource extends PlainObject, ResourceNode extends Node> = {
   cursorCache: Core;
-  fieldName: string;
+  fieldPath: string;
   getters: Getters<Resource, ResourceNode>;
   groupCursor: string;
   logger: Logger | undefined;
@@ -32,7 +32,7 @@ export const resolveConnection = async <Resource extends PlainObject, ResourceNo
   args: PlainObject & ConnectionInputOptions,
   {
     cursorCache,
-    fieldName,
+    fieldPath,
     getters,
     groupCursor,
     logger,
@@ -51,7 +51,7 @@ export const resolveConnection = async <Resource extends PlainObject, ResourceNo
 
   if (missingPages.length === 0) {
     const edges = extractEdges(cachedEdges);
-    logger?.info(`Successfully resolved ${fieldName} from cache`);
+    logger?.info(`Successfully resolved ${fieldPath} from cache`);
 
     return {
       edges,
@@ -69,7 +69,7 @@ export const resolveConnection = async <Resource extends PlainObject, ResourceNo
 
   const { cachedEdges: missingCachedEdges, errors } = await requestAndCachePages<Resource, ResourceNode>(missingPages, {
     cursorCache,
-    fieldName,
+    fieldPath,
     getters,
     groupCursor,
     makeIDCursor,
@@ -84,7 +84,7 @@ export const resolveConnection = async <Resource extends PlainObject, ResourceNo
   });
 
   const edges = extractEdges(mergedCachedEdges);
-  logger?.info(`Successfully resolved ${fieldName} from api`);
+  logger?.info(`Successfully resolved ${fieldPath} from api`);
 
   return {
     edges,

package/src/main/index.ts

@@ -37,18 +37,18 @@ export const makeConnectionResolver =
     const resourceResolver = createResourceResolver(source, args, context, info);
     const groupCursor = makeGroupCursor();
     const { logger, operationName, requestID, setCacheMetadata, tmdbGuestSessionId } = context;
-    const { fieldName } = info;
+    const { fieldName: fieldPath } = info;
 
     const childLogger = logger?.child({
       args,
-      field: fieldName,
+      fieldPath,
       groupCursor,
       operationName,
       requestID,
       tmdbGuestSessionId,
     });
 
-    childLogger?.info(`Resolving ${fieldName}`);
+    childLogger?.info(`Resolving ${fieldPath}`);
 
     if (isCursorSupplied(args)) {
       const cursorError = await validateCursor(args, info, {
@@ -58,7 +58,7 @@ export const makeConnectionResolver =
       });
 
       if (cursorError) {
-        childLogger?.error(`Failed to resolve ${fieldName}, validation cursor error`, {
+        childLogger?.error(`Failed to resolve ${fieldPath}, validation cursor error`, {
           errors: [cursorError],
         });
 
@@ -77,7 +77,7 @@ export const makeConnectionResolver =
       return resolver(
         await resolveConnection(args, {
           cursorCache,
-          fieldName,
+          fieldPath,
           getters,
           groupCursor,
           logger: childLogger,
@@ -93,7 +93,7 @@ export const makeConnectionResolver =
       return resolver(
         await resolveConnection(args, {
           cursorCache,
-          fieldName,
+          fieldPath,
           getters,
           groupCursor,
           logger: childLogger,
@@ -107,7 +107,7 @@ export const makeConnectionResolver =
 
     await requestAndCachePages<Resource, ResourceNode>([1], {
       cursorCache,
-      fieldName,
+      fieldPath,
       getters,
       groupCursor,
       makeIDCursor,
@@ -118,7 +118,7 @@ export const makeConnectionResolver =
     return resolver(
       await resolveConnection(args, {
         cursorCache,
-        fieldName,
+        fieldPath,
         getters,
         groupCursor,
         logger: childLogger,

package/src/types.ts

@@ -52,10 +52,12 @@ export type Connection = {
   totalCount: number;
 };
 
-export interface ResourceResponse<Resource extends PlainObject> extends Response {
+export type ResourceResponse<Resource extends PlainObject> = {
   data?: Resource;
   errors?: Error[];
-}
+  headers: Headers;
+  status: number;
+};
 
 export type ResourceResolver<Resource extends PlainObject> = (args: {
   page: number;