@tmdb-graphql-api/resolvers 0.1.2-unstable.2 → 0.1.2-unstable.3

package/src/queries/credit.ts

@@ -5,13 +5,13 @@ import { type RawCredit } from '../types.ts';
 
 export const resolveCredit = buildArgsResolver<QueryCreditArgs, RawCredit>(CREDIT, async (args, ctx) => {
   const { id } = args;
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   const { data, errors, headers } = await restClient.credit<RawCredit>(
     {
       pathTemplateData: { id },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/discoverMovies.test.ts

@@ -50,12 +50,15 @@ describe('createMakeCursors', () => {
 
 describe('createResourceResolver', () => {
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: {
       discover: jest.fn().mockReturnValue({}),
     },
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;
@@ -76,17 +79,20 @@ describe('createResourceResolver', () => {
           sort_by: 'popularity.desc',
         },
       },
-      { requestID: undefined, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' }
+      { requestID: 'mockRequestID', tmdbGuestSessionId: 'mockTmdbGuestSessionId' }
     );
   });
 });
 
 describe('resolveDiscoverMovies', () => {
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;

package/src/queries/discoverMovies.ts

@@ -31,14 +31,14 @@ export const createResourceResolver: CreateResourceResolver<
   Context,
   RawDiscoverMovies
 > =
-  (_obj, args, { requestID, restClient, tmdbGuestSessionId }) =>
+  (_obj, args, { data: ctxData, restClient }) =>
   async ({ page }) =>
     restClient.discover<RawDiscoverMovies>(
       {
         pathTemplateData: { type: MOVIE },
         queryParams: { ...formatQueryParams(args), page },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
 export const cursorCache = new Core({

package/src/queries/discoverTv.test.ts

@@ -48,12 +48,15 @@ describe('createMakeCursors', () => {
 
 describe('createResourceResolver', () => {
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: {
       discover: jest.fn().mockReturnValue({}),
     },
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;
@@ -75,17 +78,20 @@ describe('createResourceResolver', () => {
           with_original_language: 'en',
         },
       },
-      { requestID: undefined, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' }
+      { requestID: 'mockRequestID', tmdbGuestSessionId: 'mockTmdbGuestSessionId' }
     );
   });
 });
 
 describe('resolveDiscoverTv', () => {
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;

package/src/queries/discoverTv.ts

@@ -26,14 +26,14 @@ export const createMakeCursors = (_obj: undefined, args: QueryDiscoverTvArgs) =>
 };
 
 export const createResourceResolver: CreateResourceResolver<undefined, QueryDiscoverTvArgs, Context, RawDiscoverTv> =
-  (_obj, args, { requestID, restClient, tmdbGuestSessionId }) =>
+  (_obj, args, { data: ctxData, restClient }) =>
   async ({ page }) =>
     restClient.discover<RawDiscoverTv>(
       {
         pathTemplateData: { type: TV },
         queryParams: { ...formatQueryParams(args), page },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
 export const cursorCache = new Core({

package/src/queries/episode.test.ts

@@ -22,10 +22,13 @@ describe('resolveEpisode >', () => {
   const id = 1399;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   beforeEach(() => {

package/src/queries/episode.ts

@@ -23,7 +23,7 @@ export const resolveEpisode = buildObjArgsResolver<
   | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers })
   | EnrichedRawEpisodeWithAppendToResponse[keyof EnrichedRawEpisodeWithAppendToResponse]
 >(EPISODE, async (obj, args, ctx, info) => {
-  const { fragmentDefinitions, requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, fragmentDefinitions, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawEpisode;
   const { episodeNumber, id, seasonNumber } = getTvIdSeasonAndEpisode(obj, args);
@@ -51,7 +51,7 @@ export const resolveEpisode = buildObjArgsResolver<
           }
         : {}),
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   const episodeData = {

package/src/queries/episodeCredits.test.ts

@@ -21,10 +21,13 @@ describe('resolveEpisodeCredits >', () => {
   const episodeNumber = 1;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   beforeEach(() => {

package/src/queries/episodeCredits.ts

@@ -15,7 +15,7 @@ export const resolveEpisodeCredits = buildObjResolver<
   EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
   RawEpisodeCredits['cast'] | RawEpisodeCredits['crew'] | RawEpisodeCredits['guest_stars']
 >(EPISODE, async (obj, ctx, info) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = snakeCase(fieldName) as 'cast' | 'crew' | 'guest_stars';
 
@@ -36,7 +36,7 @@ export const resolveEpisodeCredits = buildObjResolver<
         type: CREDITS,
       },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/episodeExternalIds.test.ts

@@ -22,10 +22,13 @@ describe('resolveEpisodeExternalIds >', () => {
   const episodeNumber = 1;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: EXTERNAL_IDS } as GraphQLResolveInfo;

package/src/queries/episodeExternalIds.ts

@@ -17,7 +17,7 @@ export const resolveEpisodeExternalIds = buildObjResolver<
   EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
   Except<RawEpisodeExternalIds, 'id'>
 >(EPISODE, async (obj, ctx, info) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = snakeCase(fieldName) as 'external_ids';
 
@@ -38,7 +38,7 @@ export const resolveEpisodeExternalIds = buildObjResolver<
         type: typedFieldName,
       },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   const { id: movieId, ...rest } = data ?? {};

package/src/queries/episodeStills.test.ts

@@ -21,10 +21,13 @@ describe('resolveEpisodeStills >', () => {
   const episodeNumber = 1;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: STILLS } as GraphQLResolveInfo;

package/src/queries/episodeStills.ts

@@ -15,7 +15,7 @@ export const resolveEpisodeStills = buildObjResolver<
   EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
   RawEpisodeImages['stills']
 >(EPISODE, async (obj, ctx, info) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = snakeCase(fieldName) as 'stills';
 
@@ -36,7 +36,7 @@ export const resolveEpisodeStills = buildObjResolver<
         type: IMAGES,
       },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/episodeTranslations.test.ts

@@ -21,10 +21,13 @@ describe('resolveEpisodeTranslations >', () => {
   const episodeNumber = 1;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: TRANSLATIONS } as GraphQLResolveInfo;

package/src/queries/episodeTranslations.ts

@@ -14,7 +14,7 @@ export const resolveEpisodeTranslations = buildObjResolver<
   EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
   RawEpisodeTranslations['translations']
 >(EPISODE, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isEnrichedRawEpisodeWithTranslations(obj)) {
     return {
@@ -33,7 +33,7 @@ export const resolveEpisodeTranslations = buildObjResolver<
         type: TRANSLATIONS,
       },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/episodeVideos.test.ts

@@ -21,10 +21,13 @@ describe('resolveEpisodeVideos >', () => {
   const episodeNumber = 1;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: TRANSLATIONS } as GraphQLResolveInfo;

package/src/queries/episodeVideos.ts

@@ -14,7 +14,7 @@ export const resolveEpisodeVideos = buildObjResolver<
   EnrichedRawEpisode | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers }),
   RawEpisodeVideos['results']
 >(EPISODE, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isEnrichedRawEpisodeWithVideos(obj)) {
     return {
@@ -33,7 +33,7 @@ export const resolveEpisodeVideos = buildObjResolver<
         type: VIDEOS,
       },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/find.test.ts

@@ -18,10 +18,13 @@ describe('resolveFind >', () => {
   const source = 'imdb_id' as ExternalSource;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;

package/src/queries/find.ts

@@ -13,14 +13,14 @@ type Data = {
 };
 
 export const resolveFind = buildArgsResolver<QueryFindArgs, Data>(FIND, async (args, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   const { data, errors, headers } = await restClient.find<RawFind>(
     {
       pathTemplateData: { id: args.id },
       queryParams: { ...snakeCasePropNames({ externalSource: args.source }) },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/genres.test.ts

@@ -15,10 +15,13 @@ const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveGenres >', () => {
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;

package/src/queries/genres.ts

@@ -5,13 +5,13 @@ import { type RawGenres } from '../types.ts';
 
 export const resolveGenres = buildArgsResolver<QueryGenresArgs, RawGenres['genres']>(GENRES, async (args, ctx) => {
   const { screenType } = args;
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   const { data, errors, headers } = await restClient.genres<RawGenres>(
     {
       pathTemplateData: { type: screenType.toLowerCase() },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/keyword.test.ts

@@ -15,10 +15,13 @@ describe('resolveKeyword >', () => {
   const id = 2;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = {} as GraphQLResolveInfo;

package/src/queries/keyword.ts

@@ -6,14 +6,14 @@ import { type RawKeyword } from '../types.ts';
 
 export const resolveKeyword = buildArgsResolver<QueryKeywordArgs, RawKeyword>(KEYWORD, async (args, ctx) => {
   const { id, includeAdult } = args;
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   const { data, errors, headers } = await restClient.keyword<RawKeyword>(
     {
       pathTemplateData: { id },
       queryParams: { ...snakeCasePropNames({ includeAdult }) },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/movie.test.ts

@@ -21,10 +21,13 @@ describe('resolveMovie >', () => {
   const id = 1891;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   beforeEach(() => {

package/src/queries/movie.ts

@@ -49,7 +49,7 @@ export const resolveMovie = buildObjArgsResolver<
   | (RawMovieWithAppendToResponse & { __headers?: Headers })
   | RawMovieWithAppendToResponse[keyof RawMovieWithAppendToResponse]
 >(MOVIE, async (obj, args, ctx, info) => {
-  const { fragmentDefinitions, requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, fragmentDefinitions, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawMovie;
 
@@ -74,7 +74,7 @@ export const resolveMovie = buildObjArgsResolver<
           }
         : {}),
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/movieAlternativeTitles.test.ts

@@ -20,10 +20,13 @@ describe('resolveMovieAlternativeTitles >', () => {
   const movieId = 1891;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: ALTERNATIVE_TITLES } as GraphQLResolveInfo;

package/src/queries/movieAlternativeTitles.ts

@@ -16,7 +16,7 @@ export const resolveMovieAlternativeTitles = buildObjArgsResolver<
   RawMovieAlternativeTitles['titles']
 >(MOVIE, async (obj, args, ctx, info) => {
   const { country } = args;
-  const { logger, requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, logger, restClient } = ctx;
   const { fieldNodes } = info;
 
   if (!obj) {
@@ -28,6 +28,7 @@ export const resolveMovieAlternativeTitles = buildObjArgsResolver<
   if (isRawMovieWithAlternativeTitles(obj)) {
     return {
       data: obj.alternative_titles?.titles,
+      headers: obj.__headers,
       source: 'parentNode',
     };
   }
@@ -37,7 +38,7 @@ export const resolveMovieAlternativeTitles = buildObjArgsResolver<
       pathTemplateData: { id: obj.id, type: snakeCase(ALTERNATIVE_TITLES) },
       queryParams: { country },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/movieCredits.test.ts

@@ -19,10 +19,13 @@ describe('resolveMovieCredits >', () => {
   const movieId = 1891;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   beforeEach(() => {

package/src/queries/movieCredits.ts

@@ -10,7 +10,7 @@ export const resolveMovieCredits = buildObjResolver<
   RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
   RawMovieCredits['cast'] | RawMovieCredits['crew']
 >(MOVIE, async (obj, ctx, info) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = fieldName as 'cast' | 'crew';
 
@@ -26,7 +26,7 @@ export const resolveMovieCredits = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: CREDITS },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/movieExternalIds.test.ts

@@ -19,10 +19,13 @@ describe('resolveMovieExternalIds >', () => {
   const movieId = 1891;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: EXTERNAL_IDS } as GraphQLResolveInfo;

package/src/queries/movieExternalIds.ts

@@ -12,7 +12,7 @@ export const resolveMovieExternalIds = buildObjResolver<
   RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
   Except<RawMovieExternalIds, 'id'>
 >(MOVIE, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isRawMovieWithExternalIds(obj)) {
     return {
@@ -26,7 +26,7 @@ export const resolveMovieExternalIds = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: snakeCase(EXTERNAL_IDS) },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   const { id: movieId, ...rest } = data!;

package/src/queries/movieImages.test.ts

@@ -19,10 +19,13 @@ describe('resolveMovieImages >', () => {
   const movieId = 1891;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   beforeEach(() => {

package/src/queries/movieImages.ts

@@ -10,7 +10,7 @@ export const resolveMovieImages = buildObjResolver<
   RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
   RawMovieImages['backdrops'] | RawMovieImages['logos'] | RawMovieImages['posters']
 >(MOVIE, async (obj, ctx, info) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = fieldName as 'backdrops' | 'logos' | 'posters';
 
@@ -26,7 +26,7 @@ export const resolveMovieImages = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: IMAGES },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/movieKeywords.test.ts

@@ -19,10 +19,13 @@ describe('resolveMovieKeywords >', () => {
   const movieId = 1891;
 
   const context = {
+    data: {
+      requestID: 'mockRequestID',
+      tmdbGuestSessionId: 'mockTmdbGuestSessionId',
+    },
     logger: createMockLogger(jest.fn),
     restClient: createRestClient(),
     setCacheMetadata: jest.fn(),
-    tmdbGuestSessionId: 'mock-tmdbGuestSessionId',
   } as unknown as Context;
 
   const info = { fieldName: KEYWORDS } as GraphQLResolveInfo;

package/src/queries/movieKeywords.ts

@@ -10,7 +10,7 @@ export const resolveMovieKeywords = buildObjResolver<
   RawMovie | (RawMovieWithAppendToResponse & { __headers?: Headers }),
   RawMovieKeywords['keywords']
 >(MOVIE, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isRawMovieWithKeywords(obj)) {
     return {
@@ -24,7 +24,7 @@ export const resolveMovieKeywords = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: KEYWORDS },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {