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

package/src/queries/tvKeywords.ts

@@ -10,7 +10,7 @@ export const resolveTvKeywords = buildObjResolver<
   RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
   RawTvKeywords['results']
 >(TV, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isRawTvWithKeywords(obj)) {
     return {
@@ -24,7 +24,7 @@ export const resolveTvKeywords = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: KEYWORDS },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/tvRecommendations.test.ts

@@ -23,10 +23,13 @@ const mockedFetch = mockFetch(jest.fn);
 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;
 
 const info = {} as GraphQLResolveInfo;
@@ -62,7 +65,7 @@ describe('createResourceResolver', () => {
         pathTemplateData: { id, type: RECOMMENDATIONS },
         queryParams: { page: 1 },
       },
-      { requestID: undefined, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' }
+      { requestID: 'mockRequestID', tmdbGuestSessionId: 'mockTmdbGuestSessionId' }
     );
   });
 });

package/src/queries/tvRecommendations.ts

@@ -32,7 +32,7 @@ export const createResourceResolver: CreateResourceResolver<
 > =
   (obj, _args, ctx) =>
   async ({ page }: { page: number }) => {
-    const { requestID, restClient, tmdbGuestSessionId } = ctx;
+    const { data: ctxData, restClient } = ctx;
 
     if (isRawTvWithRecommendations(obj, page)) {
       return {
@@ -46,7 +46,7 @@ export const createResourceResolver: CreateResourceResolver<
         pathTemplateData: { id: obj.id, type: RECOMMENDATIONS },
         queryParams: { page },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/tvReviews.test.ts

@@ -18,10 +18,13 @@ const mockedFetch = mockFetch(jest.fn);
 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;
 
 const info = {} as GraphQLResolveInfo;
@@ -66,7 +69,7 @@ describe('createResourceResolver', () => {
         pathTemplateData: { id, type: REVIEWS },
         queryParams: { page: 1 },
       },
-      { requestID: undefined, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' }
+      { requestID: 'mockRequestID', tmdbGuestSessionId: 'mockTmdbGuestSessionId' }
     );
   });
 });

package/src/queries/tvReviews.ts

@@ -36,7 +36,7 @@ export const createResourceResolver: CreateResourceResolver<
   Context,
   RawTvReviews
 > =
-  (obj, _args, { requestID, restClient, tmdbGuestSessionId }) =>
+  (obj, _args, { data: ctxData, restClient }) =>
   async ({ page }: { page: number }) => {
     if (isRawTvWithReviews(obj, page)) {
       return {
@@ -50,7 +50,7 @@ export const createResourceResolver: CreateResourceResolver<
         pathTemplateData: { id: obj.id, type: REVIEWS },
         queryParams: { page },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/tvSimilarTvShows.test.ts

@@ -18,10 +18,13 @@ const mockedFetch = mockFetch(jest.fn);
 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;
 
 const info = {} as GraphQLResolveInfo;
@@ -66,7 +69,7 @@ describe('createResourceResolver', () => {
         pathTemplateData: { id, type: SIMILAR },
         queryParams: { page: 1 },
       },
-      { requestID: undefined, tmdbGuestSessionId: 'mock-tmdbGuestSessionId' }
+      { requestID: 'mockRequestID', tmdbGuestSessionId: 'mockTmdbGuestSessionId' }
     );
   });
 });

package/src/queries/tvSimilarTvShows.ts

@@ -30,7 +30,7 @@ export const createResourceResolver: CreateResourceResolver<
   Context,
   RawTvSimilarTvShows
 > =
-  (obj, _args, { requestID, restClient, tmdbGuestSessionId }) =>
+  (obj, _args, { data: ctxData, restClient }) =>
   async ({ page }: { page: number }) => {
     if (isRawTvWithSimilarShows(obj, page)) {
       return {
@@ -44,7 +44,7 @@ export const createResourceResolver: CreateResourceResolver<
         pathTemplateData: { id: obj.id, type: SIMILAR },
         queryParams: { page },
       },
-      { requestID, tmdbGuestSessionId }
+      ctxData
     );
 
     return {

package/src/queries/tvTranslations.test.ts

@@ -19,10 +19,13 @@ describe('resolveTvTranslations >', () => {
   const tvId = 1399;
 
   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/tvTranslations.ts

@@ -10,7 +10,7 @@ export const resolveTvTranslations = buildObjResolver<
   RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
   RawTvTranslations['translations']
 >(TV, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isRawTvWithTranslations(obj)) {
     return {
@@ -24,7 +24,7 @@ export const resolveTvTranslations = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: TRANSLATIONS },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/tvVideos.test.ts

@@ -19,10 +19,13 @@ describe('resolveTvVideos >', () => {
   const tvId = 1399;
 
   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/tvVideos.ts

@@ -10,7 +10,7 @@ export const resolveTvVideos = buildObjResolver<
   RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
   RawTvVideos['results']
 >(TV, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isRawTvWithVideos(obj)) {
     return {
@@ -24,7 +24,7 @@ export const resolveTvVideos = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: VIDEOS },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/queries/tvWatchProviders.test.ts

@@ -19,10 +19,13 @@ describe('resolveTvWatchProviders >', () => {
   const tvId = 1399;
 
   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/tvWatchProviders.ts

@@ -10,7 +10,7 @@ export const resolveTvWatchProviders = buildObjResolver<
   RawTv | (RawTvWithAppendToResponse & { __headers?: Headers }),
   RawTvWatchProviders['results']
 >(TV, async (obj, ctx) => {
-  const { requestID, restClient, tmdbGuestSessionId } = ctx;
+  const { data: ctxData, restClient } = ctx;
 
   if (isRawTvWithWatchProviders(obj)) {
     return {
@@ -24,7 +24,7 @@ export const resolveTvWatchProviders = buildObjResolver<
     {
       pathTemplateData: { id: obj.id, type: TV },
     },
-    { requestID, tmdbGuestSessionId }
+    ctxData
   );
 
   return {

package/src/types.ts

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import { type ExecutionContext } from '@graphql-box/core';
+import { type ExecutionContextValue, type ExecutionContextValueData } from '@graphql-box/core';
 import { type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
 import {
   type AlternativeNamesCopyResponses,
@@ -80,13 +80,12 @@ import {
 import { type Getta, type ShortcutProperties } from 'getta';
 import { type GraphQLFieldResolver } from 'graphql';
 import { type Except, type SetRequired } from 'type-fest';
-import type { Logger } from 'winston';
+import { type Logger } from 'winston';
 
-export type Context = ExecutionContext & {
+export type Context = ExecutionContextValue & {
+  data: ExecutionContextValueData & { tmdbGuestSessionId: string };
   logger: Logger;
-  operationName: string;
   restClient: Getta & ShortcutProperties<ShortcutMethodNames>;
-  tmdbGuestSessionId: string;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any