@tmdb-graphql-api/resolvers 0.0.34 → 0.1.1-unstable.0

package/src/queries/movieRecommendations.test.ts

@@ -8,9 +8,10 @@ import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { decode } from 'js-base64';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { MOVIE, RECOMMENDATIONS } from '../constants.ts';
-import { type Context, type RawMovie, type RawMovieWithAppendToResponse } from '../types.ts';
+import { type Context } from '../types.ts';
 import {
   createMakeCursors,
   createResourceResolver,
@@ -21,18 +22,27 @@ import {
 const mockedFetch = mockFetch(jest.fn);
 const id = 1891;
 
+const context = {
+  logger: createMockLogger(jest.fn),
+  restClient: createRestClient(),
+  setCacheMetadata: jest.fn(),
+  tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+} as unknown as Context;
+
+const info = { fieldName: RECOMMENDATIONS } as GraphQLResolveInfo;
+
 describe('createMakeCursors', () => {
   const GROUP_CURSOR = `${id}::${MOVIE}::${RECOMMENDATIONS}`;
 
   it('makeGroupCursor', () => {
-    const { makeGroupCursor } = createMakeCursors({ id } as unknown as RawMovie);
+    const { makeGroupCursor } = createMakeCursors({ id });
     const groupCursor = makeGroupCursor();
     expect(decode(groupCursor)).toBe(GROUP_CURSOR);
   });
 
   it('makeIDCursor', () => {
     const recommendationMovieId = '6';
-    const { makeIDCursor } = createMakeCursors({ id } as unknown as RawMovie);
+    const { makeIDCursor } = createMakeCursors({ id });
     const idCursor = makeIDCursor(recommendationMovieId);
     expect(decode(idCursor)).toBe(`${recommendationMovieId}::${GROUP_CURSOR}`);
   });
@@ -43,15 +53,8 @@ describe('createResourceResolver', () => {
     movie: jest.fn().mockReturnValue({}),
   } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
 
-  const setCacheMetadata = jest.fn();
-
   it('when `restClient.movie` is called', async () => {
-    const resourceResolver = createResourceResolver({ id } as RawMovieWithAppendToResponse, {}, {
-      restClient,
-      setCacheMetadata,
-      tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-    } as unknown as Context);
-
+    const resourceResolver = createResourceResolver({ id }, {}, { ...context, restClient }, info);
     await resourceResolver({ page: 1 });
 
     expect(restClient.movie).toHaveBeenCalledWith(
@@ -65,9 +68,6 @@ describe('createResourceResolver', () => {
 });
 
 describe('resolveMovieRecommendations', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
-
   const mockEndpoint = (page: number, body: Jsonifiable) => {
     mockedFetch.mockGetOnce(buildEndpoint(MOVIE_PATH, { id, type: RECOMMENDATIONS }, { page }), {
       body,
@@ -75,49 +75,29 @@ describe('resolveMovieRecommendations', () => {
     });
   };
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
-
   beforeEach(() => {
     mockEndpoint(1, movieRecommendations);
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
     await cursorCache.clear();
+    jest.clearAllMocks();
   });
 
   describe('when the first 5 are requested', () => {
     it('should return the correct response', async () => {
-      await expect(
-        resolveMovieRecommendations(
-          { id } as RawMovieWithAppendToResponse,
-          { first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
-      ).resolves.toMatchSnapshot();
+      await expect(resolveMovieRecommendations({ id }, { first: 5 }, context, info)).resolves.toMatchSnapshot();
     });
   });
 
   describe('when the second 5 are requested', () => {
     it('should return the correct response', async () => {
-      const { pageInfo } = await resolveMovieRecommendations(
-        { id } as RawMovieWithAppendToResponse,
-        { first: 5 },
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      );
+      const { pageInfo } = await resolveMovieRecommendations({ id }, { first: 5 }, context, info);
 
       await expect(
-        resolveMovieRecommendations(
-          { id } as RawMovieWithAppendToResponse,
-          { after: pageInfo.endCursor, first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
+        resolveMovieRecommendations({ id }, { after: pageInfo.endCursor, first: 5 }, context, info)
       ).resolves.toMatchSnapshot();
     });
   });
@@ -134,14 +114,13 @@ describe('resolveMovieRecommendations', () => {
             ...movieDetails,
             __headers: new Headers(),
             recommendations: movieRecommendations,
-          } as unknown as RawMovieWithAppendToResponse & { __headers?: Headers },
+          },
           { first: 5 },
           {
+            ...context,
             restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -156,14 +135,13 @@ describe('resolveMovieRecommendations', () => {
           ...movieDetails,
           __headers: new Headers(),
           recommendations: movieRecommendations,
-        } as unknown as RawMovieWithAppendToResponse & { __headers?: Headers },
+        },
         { first: 5 },
         {
+          ...context,
           restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(movieFetchMock).not.toHaveBeenCalled();

package/src/queries/movieRecommendations.ts

@@ -1,9 +1,8 @@
 import { Core } from '@cachemap/core';
 import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
-import { type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
+import { type CreateResourceResolver, type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
 import { type MovieRecommendationsArgs } from '@tmdb-graphql-api/schema/types';
-import { type FetchResponse } from 'getta';
 import { encode } from 'js-base64';
 import { MOVIE, RECOMMENDATIONS } from '../constants.ts';
 import {
@@ -24,24 +23,28 @@ export const createMakeCursors = (obj: RawMovie) => {
   };
 };
 
-export const createResourceResolver =
-  (
-    obj: RawMovieWithAppendToResponse & { __headers?: Headers },
-    _args: MovieRecommendationsArgs,
-    { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context
-  ) =>
-  async ({ page }: { page: number }) => {
-    if (obj.recommendations?.page === page && obj.__headers) {
-      setCacheMetadata(`${MOVIE}.${RECOMMENDATIONS}`, obj.__headers);
+const isRawMovieWithRecommendations = (
+  obj: RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
+  page: number
+): obj is RawMovieWithAppendToResponse & { __headers: Headers } =>
+  RECOMMENDATIONS in obj && obj.recommendations?.page === page && '__headers' in obj;
 
+export const createResourceResolver: CreateResourceResolver<
+  RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
+  MovieRecommendationsArgs,
+  Context,
+  RawMovieRecommendations
+> =
+  (obj, _args, { requestID, restClient, tmdbGuestSessionId }) =>
+  async ({ page }) => {
+    if (isRawMovieWithRecommendations(obj, page)) {
       return {
         data: obj.recommendations,
-        errors: [],
         headers: obj.__headers,
-      } as unknown as FetchResponse<RawMovieRecommendations>;
+      };
     }
 
-    const result = await restClient.movie<RawMovieRecommendations>(
+    const { data, errors, headers } = await restClient.movie<RawMovieRecommendations>(
       {
         pathTemplateData: { id: obj.id, type: RECOMMENDATIONS },
         queryParams: { page },
@@ -49,11 +52,11 @@ export const createResourceResolver =
       { requestID, tmdbGuestSessionId }
     );
 
-    if (result.data) {
-      setCacheMetadata(`${MOVIE}.${RECOMMENDATIONS}`, result.headers);
-    }
-
-    return result;
+    return {
+      data,
+      errors,
+      headers,
+    };
   };
 
 export const cursorCache = new Core({
@@ -64,10 +67,11 @@ export const cursorCache = new Core({
 });
 
 export const getters: Getters<RawMovieRecommendations, RawMovie> = {
-  nodes: ({ results }) => results,
-  page: ({ page }) => page,
-  totalPages: ({ total_pages }) => total_pages,
-  totalResults: ({ total_results }) => total_results,
+  // @ts-expect-error minor type mismatch
+  nodes: ({ results = [] }) => results,
+  page: ({ page = 0 }) => page,
+  totalPages: ({ total_pages = 0 }) => total_pages,
+  totalResults: ({ total_results = 0 }) => total_results,
 };
 
 export const resolveMovieRecommendations = makeConnectionResolver({

package/src/queries/movieReleaseDates.test.ts

@@ -6,42 +6,42 @@ import movieReleaseDates from '@tmdb-graphql-api/test-utils/responses/themoviedb
 import { mockFetch } from 'fetch-mocked';
 import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
+import { snakeCase } from 'lodash-es';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
-import { type Context, type RawMovieWithAppendToResponse } from '../types.ts';
+import { RELEASE_DATES } from '../constants.ts';
+import { type Context } from '../types.ts';
 import { resolveMovieReleaseDates } from './movieReleaseDates.ts';
 
 const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveMovieReleaseDates >', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
   const movieId = 1891;
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
+
+  const info = { fieldName: RELEASE_DATES } as GraphQLResolveInfo;
 
   beforeEach(() => {
-    mockedFetch.mockGetOnce(buildEndpoint(MOVIE_PATH, { id: movieId, type: 'release_dates' }), {
+    mockedFetch.mockGetOnce(buildEndpoint(MOVIE_PATH, { id: movieId, type: snakeCase(RELEASE_DATES) }), {
       body: movieReleaseDates,
     });
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
+    jest.clearAllMocks();
   });
 
   it('should return the movie release dates', async () => {
-    await expect(
-      resolveMovieReleaseDates(
-        movieDetails as RawMovieWithAppendToResponse,
-        undefined,
-        { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-        {} as GraphQLResolveInfo
-      )
-    ).resolves.toMatchSnapshot();
+    await expect(resolveMovieReleaseDates(movieDetails, undefined, context, info)).resolves.toMatchSnapshot();
   });
 
   describe('when raw movie data has releaseDates', () => {
@@ -57,17 +57,15 @@ describe('resolveMovieReleaseDates >', () => {
           {
             ...movieDetails,
             __headers: new Headers(),
+            // @ts-expect-error arg is slightly modified version of movie details
             release_dates: rest,
-          } as unknown as RawMovieWithAppendToResponse & {
-            __headers?: Headers;
           },
           undefined,
           {
+            ...context,
             restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -83,17 +81,15 @@ describe('resolveMovieReleaseDates >', () => {
         {
           ...movieDetails,
           __headers: new Headers(),
+          // @ts-expect-error arg is slightly modified version of movie details
           release_dates: rest,
-        } as unknown as RawMovieWithAppendToResponse & {
-          __headers?: Headers;
         },
         undefined,
         {
+          ...context,
           restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(movieFetchMock).not.toHaveBeenCalled();

package/src/queries/movieReleaseDates.ts

@@ -1,17 +1,25 @@
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
 import { snakeCase } from 'lodash-es';
 import { MOVIE, RELEASE_DATES } from '../constants.ts';
-import { type Context, type RawMovieReleaseDates, type RawMovieWithAppendToResponse } from '../types.ts';
+import { buildObjResolver } from '../helpers/buildObjResolver.ts';
+import { type RawMovie, type RawMovieReleaseDates, type RawMovieWithAppendToResponse } from '../types.ts';
 
-export const resolveMovieReleaseDates = async (
-  obj: RawMovieWithAppendToResponse & { __headers?: Headers },
-  _args: undefined,
-  { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context,
-  { fieldNodes }: GraphQLResolveInfo
-) => {
-  if (obj.release_dates && obj.__headers) {
-    setCacheMetadata(`${MOVIE}.${RELEASE_DATES}`, obj.__headers);
-    return obj.release_dates.results;
+const isRawMovieWithReleaseDates = (
+  obj: RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers })
+): obj is RawMovieWithAppendToResponse & { __headers: Headers } =>
+  snakeCase(RELEASE_DATES) in obj && '__headers' in obj;
+
+export const resolveMovieReleaseDates = buildObjResolver<
+  RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
+  RawMovieReleaseDates['results']
+>(MOVIE, async (obj, ctx) => {
+  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+
+  if (isRawMovieWithReleaseDates(obj)) {
+    return {
+      data: obj.release_dates?.results,
+      headers: obj.__headers,
+      source: 'parentNode',
+    };
   }
 
   const { data, errors, headers } = await restClient.movie<RawMovieReleaseDates>(
@@ -21,13 +29,9 @@ export const resolveMovieReleaseDates = async (
     { requestID, tmdbGuestSessionId }
   );
 
-  if (errors?.length) {
-    throw new GraphQLError(`Failed to resolve ${MOVIE} ${obj.id} ${RELEASE_DATES}.`, {
-      nodes: fieldNodes,
-      originalError: errors[0],
-    });
-  }
-
-  setCacheMetadata(`${MOVIE}.${RELEASE_DATES}`, headers);
-  return data!.results;
-};
+  return {
+    data: data?.results,
+    errors,
+    headers,
+  };
+});

package/src/queries/movieReviews.test.ts

@@ -8,9 +8,10 @@ import { type FetchResponse, type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLResolveInfo } from 'graphql';
 import { decode } from 'js-base64';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
+import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
 import { MOVIE, REVIEWS } from '../constants.ts';
-import { type Context, type RawMovie, type RawMovieWithAppendToResponse } from '../types.ts';
+import { type Context, type RawMovie } from '../types.ts';
 import { createMakeCursors, createResourceResolver, cursorCache, resolveMovieReviews } from './movieReviews.ts';
 
 const mockedFetch = mockFetch(jest.fn);
@@ -34,22 +35,23 @@ describe('createMakeCursors', () => {
 });
 
 describe('createResourceResolver', () => {
-  const restClient = {
-    movie: jest.fn().mockReturnValue({}),
-  } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: {
+      movie: jest.fn().mockReturnValue({}),
+    },
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
 
-  const setCacheMetadata = jest.fn();
+  const info = { fieldName: REVIEWS } as GraphQLResolveInfo;
 
   it('when `restClient.movie` is called', async () => {
-    const resourceResolver = createResourceResolver({ id: movieId } as RawMovieWithAppendToResponse, {}, {
-      restClient,
-      setCacheMetadata,
-      tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-    } as unknown as Context);
+    const resourceResolver = createResourceResolver({ id: movieId }, {}, context, info);
 
     await resourceResolver({ page: 1 });
 
-    expect(restClient.movie).toHaveBeenCalledWith(
+    expect(context.restClient.movie).toHaveBeenCalledWith(
       {
         pathTemplateData: { id: movieId, type: REVIEWS },
         queryParams: { page: 1 },
@@ -60,8 +62,14 @@ describe('createResourceResolver', () => {
 });
 
 describe('resolveMovieReviews', () => {
-  let restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  const setCacheMetadata = jest.fn();
+  const context = {
+    logger: createMockLogger(jest.fn),
+    restClient: createRestClient(),
+    setCacheMetadata: jest.fn(),
+    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
+  } as unknown as Context;
+
+  const info = { fieldName: REVIEWS } as GraphQLResolveInfo;
 
   const mockEndpoint = (page: number, body: Jsonifiable) => {
     mockedFetch.mockGetOnce(buildEndpoint(MOVIE_PATH, { id: movieId, type: REVIEWS }, { page }), {
@@ -70,30 +78,20 @@ describe('resolveMovieReviews', () => {
     });
   };
 
-  beforeAll(() => {
-    restClient = createRestClient();
-  });
-
   beforeEach(() => {
     mockEndpoint(1, movieReviews);
   });
 
   afterEach(async () => {
     mockedFetch.mockReset();
-    await restClient.cache?.clear();
+    await context.restClient.cache?.clear();
     await cursorCache.clear();
+    jest.clearAllMocks();
   });
 
   describe('when the first 5 are requested', () => {
     it('should return the correct response', async () => {
-      await expect(
-        resolveMovieReviews(
-          { id: movieId } as RawMovieWithAppendToResponse,
-          { first: 5 },
-          { restClient, setCacheMetadata, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' } as unknown as Context,
-          {} as GraphQLResolveInfo
-        )
-      ).resolves.toMatchSnapshot();
+      await expect(resolveMovieReviews({ id: movieId }, { first: 5 }, context, info)).resolves.toMatchSnapshot();
     });
   });
 
@@ -111,14 +109,13 @@ describe('resolveMovieReviews', () => {
             ...movieDetails,
             __headers: new Headers(),
             reviews: rest,
-          } as unknown as RawMovieWithAppendToResponse & { __headers?: Headers },
+          },
           { first: 5 },
           {
+            ...context,
             restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-            setCacheMetadata,
-            tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-          } as unknown as Context,
-          {} as GraphQLResolveInfo
+          },
+          info
         )
       ).resolves.toMatchSnapshot();
     });
@@ -135,14 +132,13 @@ describe('resolveMovieReviews', () => {
           ...movieDetails,
           __headers: new Headers(),
           reviews: rest,
-        } as unknown as RawMovieWithAppendToResponse & { __headers?: Headers },
+        },
         { first: 5 },
         {
+          ...context,
           restClient: { movie: movieFetchMock } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>,
-          setCacheMetadata,
-          tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
-        } as unknown as Context,
-        {} as GraphQLResolveInfo
+        },
+        info
       );
 
       expect(movieFetchMock).not.toHaveBeenCalled();

package/src/queries/movieReviews.ts

@@ -1,9 +1,8 @@
 import { Core } from '@cachemap/core';
 import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
-import { type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
+import { type CreateResourceResolver, type Getters, makeConnectionResolver } from '@graphql-box/connection-resolver';
 import { type MovieReviewsArgs } from '@tmdb-graphql-api/schema/types';
-import { type FetchResponse } from 'getta';
 import { encode } from 'js-base64';
 import { MOVIE, REVIEWS } from '../constants.ts';
 import {
@@ -25,24 +24,28 @@ export const createMakeCursors = (obj: RawMovie) => {
   };
 };
 
-export const createResourceResolver =
-  (
-    obj: RawMovieWithAppendToResponse & { __headers?: Headers },
-    _args: MovieReviewsArgs,
-    { requestID, restClient, setCacheMetadata, tmdbGuestSessionId }: Context
-  ) =>
-  async ({ page }: { page: number }) => {
-    if (obj.reviews?.page === page && obj.__headers) {
-      setCacheMetadata(`${MOVIE}.${REVIEWS}`, obj.__headers);
+const isRawMovieWithReviews = (
+  obj: RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
+  page: number
+): obj is RawMovieWithAppendToResponse & { __headers: Headers } =>
+  REVIEWS in obj && obj.reviews?.page === page && '__headers' in obj;
 
+export const createResourceResolver: CreateResourceResolver<
+  RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
+  MovieReviewsArgs,
+  Context,
+  RawMovieReviews
+> =
+  (obj, _args, { requestID, restClient, tmdbGuestSessionId }: Context) =>
+  async ({ page }: { page: number }) => {
+    if (isRawMovieWithReviews(obj, page)) {
       return {
         data: obj.reviews,
-        errors: [],
         headers: obj.__headers,
-      } as unknown as FetchResponse<RawMovieReviews>;
+      };
     }
 
-    const result = await restClient.movie<RawMovieReviews>(
+    const { data, errors, headers } = await restClient.movie<RawMovieReviews>(
       {
         pathTemplateData: { id: obj.id, type: REVIEWS },
         queryParams: { page },
@@ -50,11 +53,11 @@ export const createResourceResolver =
       { requestID, tmdbGuestSessionId }
     );
 
-    if (result.data) {
-      setCacheMetadata(`${MOVIE}.${REVIEWS}`, result.headers);
-    }
-
-    return result;
+    return {
+      data,
+      errors,
+      headers,
+    };
   };
 
 export const cursorCache = new Core({
@@ -65,10 +68,12 @@ export const cursorCache = new Core({
 });
 
 export const getters: Getters<RawMovieReviews, RawReview> = {
-  nodes: ({ results }) => results,
-  page: ({ page }) => page,
-  totalPages: ({ total_pages }) => total_pages,
-  totalResults: ({ total_results }) => total_results,
+  // @ts-expect-error nested identifier is optional when
+  // it shouldn't be
+  nodes: ({ results = [] }) => results,
+  page: ({ page = 0 }) => page,
+  totalPages: ({ total_pages = 0 }) => total_pages,
+  totalResults: ({ total_results = 0 }) => total_results,
 };
 
 export const resolveMovieReviews = makeConnectionResolver({