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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmdb-graphql-api/resolvers",
   "description": "The TMDB GraphQL resolvers module.",
-  "version": "0.1.2-unstable.1",
+  "version": "0.1.2-unstable.3",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/themoviedb-graphql-api",
@@ -32,16 +32,16 @@
     "@cachemap/core": "^5.2.7",
     "@cachemap/map": "^5.0.9",
     "@cachemap/reaper": "^5.1.3",
-    "@graphql-box/connection-resolver": "^5.4.6",
-    "@graphql-box/core": "^5.4.2",
-    "cacheability": "^4.0.20",
+    "@graphql-box/connection-resolver": "^5.4.8",
+    "@graphql-box/core": "^5.4.4",
+    "cacheability": "^4.0.27",
     "getta": "^1.0.10",
     "js-base64": "^3.6.0",
     "query-string": "^8.1.0",
     "type-fest": "^4.37.0",
     "winston": "^3.17.0",
-    "@tmdb-graphql-api/rest-client": "0.0.11-unstable.1",
-    "@tmdb-graphql-api/schema": "0.1.1-unstable.0"
+    "@tmdb-graphql-api/rest-client": "0.0.11-unstable.3",
+    "@tmdb-graphql-api/schema": "0.1.1-unstable.1"
   },
   "peerDependencies": {
     "@babel/runtime": "<8",
@@ -51,14 +51,14 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.2",
-    "@graphql-box/helpers": "^5.4.2",
+    "@graphql-box/helpers": "^5.4.3",
     "@jest/globals": "^29.7.0",
     "@types/lodash-es": "^4.14.191",
     "core-js": "^3.33.1",
-    "cts-types": "^0.0.6",
+    "cts-types": "^0.0.8",
     "del-cli": "^5.1.0",
-    "fetch-mocked": "^0.0.21",
-    "graphql": "^16.8.1",
+    "fetch-mocked": "^0.0.27",
+    "graphql": "^16.10.0",
     "lodash-es": "^4.17.21",
     "@tmdb-graphql-api/test-utils": "0.1.0"
   },

package/src/helpers/buildArgsResolver.ts

@@ -3,7 +3,7 @@ import { type Context } from '../types.ts';
 
 export const buildArgsResolver =
   <Args extends object, Data>(
-    field: string,
+    fieldName: string,
     callback: (
       args: Args,
       ctx: Context,
@@ -11,27 +11,30 @@ export const buildArgsResolver =
     ) => Promise<{ data?: Data; errors?: Error[]; headers: Headers; source?: string }>
   ) =>
   async (_obj: undefined, args: Args, ctx: Context, info: GraphQLResolveInfo) => {
-    const { logger, operationName, requestID, setCacheMetadata, tmdbGuestSessionId } = ctx;
+    const { logger, setCacheMetadata } = ctx;
     const { fieldNodes } = info;
 
-    const childLogger = logger.child({
-      args,
-      field,
-      operationName,
-      requestID,
-      tmdbGuestSessionId,
-    });
+    const newCtx = {
+      ...ctx,
+      data: {
+        ...ctx.data,
+        args,
+        fieldPath: fieldName,
+      },
+    };
 
-    childLogger.info(`Resolving ${field}`);
-    const { data, errors, headers, source = 'api' } = await callback(args, ctx, info);
+    const childLogger = logger.child(newCtx.data);
+
+    childLogger.info(`Resolving ${fieldName}`);
+    const { data, errors, headers, source = 'api' } = await callback(args, newCtx, info);
 
     if (errors?.length) {
-      const message = `Failed to resolve ${field}`;
+      const message = `Failed to resolve ${fieldName}`;
       childLogger.error(message, { errors });
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    childLogger.info(`Successfully resolved ${field} from ${source}`);
-    setCacheMetadata(field, headers);
+    childLogger.info(`Successfully resolved ${fieldName} from ${source}`);
+    setCacheMetadata(fieldName, headers);
     return data;
   };

package/src/helpers/buildNoObjArgsResolver.ts

@@ -10,19 +10,21 @@ export const buildNoObjArgsResolver =
     ) => Promise<{ data?: Data; errors?: Error[]; headers: Headers; source?: string }>
   ) =>
   async (obj: Obj | undefined, _args: undefined, ctx: Context, info: GraphQLResolveInfo) => {
-    const { logger, operationName, requestID, setCacheMetadata, tmdbGuestSessionId } = ctx;
+    const { logger, setCacheMetadata } = ctx;
     const { fieldName, fieldNodes } = info;
     const fieldPath = obj ? `${parentFieldName}.${fieldName}` : parentFieldName;
 
-    const childLogger = logger.child({
-      fieldPath,
-      operationName,
-      requestID,
-      tmdbGuestSessionId,
-    });
+    const newCtx = {
+      ...ctx,
+      data: {
+        ...ctx.data,
+        fieldPath,
+      },
+    };
 
+    const childLogger = logger.child(newCtx.data);
     childLogger.info(`Resolving ${fieldPath}`);
-    const { data, errors, headers } = await callback(ctx, info);
+    const { data, errors, headers } = await callback(newCtx, info);
 
     if (errors?.length) {
       const message = `Failed to resolve ${fieldPath}`;

package/src/helpers/buildObjArgsResolver.ts

@@ -12,20 +12,22 @@ export const buildObjArgsResolver =
     ) => Promise<{ data?: Data; errors?: Error[]; headers?: Headers; source?: string }>
   ) =>
   async (obj: Obj | undefined, args: Args, ctx: Context, info: GraphQLResolveInfo) => {
-    const { logger, operationName, requestID, setCacheMetadata, tmdbGuestSessionId } = ctx;
+    const { logger, setCacheMetadata } = ctx;
     const { fieldName, fieldNodes } = info;
     const fieldPath = obj ? `${parentFieldName}.${fieldName}` : parentFieldName;
 
-    const childLogger = logger.child({
-      args,
-      fieldPath,
-      operationName,
-      requestID,
-      tmdbGuestSessionId,
-    });
+    const newCtx = {
+      ...ctx,
+      data: {
+        ...ctx.data,
+        args,
+        fieldPath,
+      },
+    };
 
+    const childLogger = logger.child(newCtx.data);
     childLogger.info(`Resolving ${fieldPath}`);
-    const { data, errors, headers, source = 'api' } = await callback(obj, args, ctx, info);
+    const { data, errors, headers, source = 'api' } = await callback(obj, args, newCtx, info);
 
     if (errors?.length) {
       const message = `Failed to resolve ${fieldPath}`;

package/src/helpers/buildObjResolver.ts

@@ -11,17 +11,20 @@ export const buildObjResolver =
     ) => Promise<{ data?: Data; errors?: Error[]; headers?: Headers; source?: string }>
   ) =>
   async (obj: Obj | undefined, _args: undefined, ctx: Context, info: GraphQLResolveInfo) => {
-    const { logger, operationName, requestID, setCacheMetadata, tmdbGuestSessionId } = ctx;
+    const { logger, setCacheMetadata } = ctx;
     const { fieldName, fieldNodes } = info;
     const fieldPath = `${parentFieldName}.${fieldName}`;
 
-    const childLogger = logger.child({
-      fieldPath,
-      operationName,
-      parentFieldId: obj?.id,
-      requestID,
-      tmdbGuestSessionId,
-    });
+    const newCtx = {
+      ...ctx,
+      data: {
+        ...ctx.data,
+        fieldPath,
+        parentFieldId: obj?.id,
+      },
+    };
+
+    const childLogger = logger.child(newCtx.data);
 
     if (!obj) {
       const message = `Required ${parentFieldName} node missing`;
@@ -30,7 +33,7 @@ export const buildObjResolver =
     }
 
     childLogger.info(`Resolving ${fieldPath}`);
-    const { data, errors, headers, source = 'api' } = await callback(obj, ctx, info);
+    const { data, errors, headers, source = 'api' } = await callback(obj, newCtx, info);
 
     if (errors?.length) {
       const message = `Failed to resolve ${fieldPath}`;

package/src/queries/certifications.test.ts

@@ -15,10 +15,13 @@ const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveCertifications >', () => {
   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/certifications.ts

@@ -7,13 +7,13 @@ export const resolveCertifications = buildArgsResolver<QueryCertificationsArgs,
   CERTIFICATIONS,
   async (args, ctx) => {
     const { screenType } = args;
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors } = await restClient.certifications<RawCertifications>(
       {
         pathTemplateData: { type: screenType.toLowerCase() },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/collection.test.ts

@@ -15,10 +15,13 @@ describe('resolveCollection >', () => {
   const id = 10;
 
   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/collection.ts

@@ -10,7 +10,7 @@ export const resolveCollection = buildObjArgsResolver<
   RawCollection | RawCollection[keyof RawCollection]
 >(COLLECTION, async (obj, args, ctx, info) => {
   const id = obj?.id ?? args.id;
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawCollection;
 
@@ -25,7 +25,7 @@ export const resolveCollection = buildObjArgsResolver<
     {
       pathTemplateData: { id },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/collectionImages.test.ts

@@ -15,10 +15,13 @@ const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveCollectionImages >', () => {
   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/collectionImages.ts

@@ -6,14 +6,14 @@ export const resolveCollectionImages = buildObjResolver<
   RawCollection,
   RawCollectionImages['backdrops'] | RawCollectionImages['posters']
 >(COLLECTION, async (obj, ctx, info) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
 
   const { data, errors, headers } = await restClient.collection<RawCollectionImages>(
     {
       pathTemplateData: { id: obj.id, type: IMAGES },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   const typedFieldName = fieldName as 'backdrops' | 'posters';

package/src/queries/collectionTranslations.test.ts

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

package/src/queries/collectionTranslations.ts

@@ -5,13 +5,13 @@ import { type RawCollection, type RawCollectionTranslations } from '../types.ts'
 export const resolveCollectionTranslations = buildObjResolver<RawCollection, RawCollectionTranslations['translations']>(
   COLLECTION,
   async (obj, ctx) => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors, headers } = await restClient.collection<RawCollectionTranslations>(
       {
         pathTemplateData: { id: obj.id, type: TRANSLATIONS },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/company.test.ts

@@ -15,10 +15,13 @@ describe('resolveCompany >', () => {
   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/company.ts

@@ -10,7 +10,7 @@ export const resolveCompany = buildObjArgsResolver<
   RawCompany | RawCompany[keyof RawCompany]
 >(COMPANY, async (obj, args, ctx, info) => {
   const id = obj?.id ?? args.id;
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawCompany;
 
@@ -25,7 +25,7 @@ export const resolveCompany = buildObjArgsResolver<
     {
       pathTemplateData: { id },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/companyAlternativeNames.test.ts

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

package/src/queries/companyAlternativeNames.ts

@@ -6,13 +6,13 @@ import { type RawCollection, type RawCompanyAlternativeNames } from '../types.ts
 export const resolveCompanyAlternativeNames = buildObjResolver<RawCollection, RawCompanyAlternativeNames['results']>(
   COMPANY,
   async (obj, ctx) => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors, headers } = await restClient.company<RawCompanyAlternativeNames>(
       {
         pathTemplateData: { id: obj.id, type: snakeCase(ALTERNATIVE_NAMES) },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/companyLogos.test.ts

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

package/src/queries/companyLogos.ts

@@ -3,13 +3,13 @@ import { buildObjResolver } from '../helpers/buildObjResolver.ts';
 import type { RawCompany, RawCompanyLogos } from '../types.ts';
 
 export const resolveCompanyLogos = buildObjResolver<RawCompany, RawCompanyLogos['logos']>(COMPANY, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   const { data, errors, headers } = await restClient.company<RawCompanyLogos>(
     {
       pathTemplateData: { id: obj.id, type: IMAGES },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/configuration.test.ts

@@ -13,10 +13,13 @@ const mockedFetch = mockFetch(jest.fn);
 
 describe('resolveConfiguration >', () => {
   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/configuration.ts

@@ -3,12 +3,8 @@ import { buildNoObjArgsResolver } from '../helpers/buildNoObjArgsResolver.ts';
 import { type RawConfiguration } from '../types.ts';
 
 export const resolveConfiguration = buildNoObjArgsResolver<undefined, RawConfiguration>(CONFIGURATION, async ctx => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
-
-  const { data, errors, headers } = await restClient.configuration<RawConfiguration>(undefined, {
-    requestID,
-    tmdbGuestSessionId,
-  });
+  const { data: ctxData, restClient } = ctx;
+  const { data, errors, headers } = await restClient.configuration<RawConfiguration>(undefined, ctxData);
 
   return {
     data,

package/src/queries/configurationCountries.test.ts

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

package/src/queries/configurationCountries.ts

@@ -5,13 +5,13 @@ import { type RawConfiguration, type RawConfigurationCountries } from '../types.
 export const resolveConfigurationCountries = buildNoObjArgsResolver<RawConfiguration, RawConfigurationCountries>(
   CONFIGURATION,
   async ctx => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors, headers } = await restClient.configuration<RawConfigurationCountries>(
       {
         pathTemplateData: { type: COUNTRIES },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/configurationJobs.test.ts

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

package/src/queries/configurationJobs.ts

@@ -5,13 +5,13 @@ import { type RawConfiguration, type RawConfigurationJobs } from '../types.ts';
 export const resolveConfigurationJobs = buildNoObjArgsResolver<RawConfiguration, RawConfigurationJobs>(
   CONFIGURATION,
   async ctx => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors, headers } = await restClient.configuration<RawConfigurationJobs>(
       {
         pathTemplateData: { type: JOBS },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/configurationLanguages.test.ts

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

package/src/queries/configurationLanguages.ts

@@ -5,13 +5,13 @@ import { type RawConfiguration, type RawConfigurationLanguages } from '../types.
 export const resolveConfigurationLanguages = buildNoObjArgsResolver<RawConfiguration, RawConfigurationLanguages>(
   CONFIGURATION,
   async ctx => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors, headers } = await restClient.configuration<RawConfigurationLanguages>(
       {
         pathTemplateData: { type: LANGUAGES },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/configurationPrimaryTranslations.test.ts

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

package/src/queries/configurationPrimaryTranslations.ts

@@ -7,13 +7,13 @@ export const resolveConfigurationPrimaryTranslations = buildNoObjArgsResolver<
   RawConfiguration,
   RawConfigurationPrimaryTranslations
 >(CONFIGURATION, async ctx => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   const { data, errors, headers } = await restClient.configuration<RawConfigurationPrimaryTranslations>(
     {
       pathTemplateData: { type: snakeCase(PRIMARY_TRANSLATIONS) },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/configurationTimezones.test.ts

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

package/src/queries/configurationTimezones.ts

@@ -5,13 +5,13 @@ import { type RawConfiguration, type RawConfigurationTimezones } from '../types.
 export const resolveConfigurationTimezones = buildNoObjArgsResolver<RawConfiguration, RawConfigurationTimezones>(
   CONFIGURATION,
   async ctx => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     const { data, errors, headers } = await restClient.configuration<RawConfigurationTimezones>(
       {
         pathTemplateData: { type: TIMEZONES },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/credit.test.ts

@@ -15,10 +15,13 @@ describe('resolveCredit >', () => {
   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;