@tmdb-graphql-api/resolvers 0.1.15 → 0.1.16-unstable.2

package/src/queries/rated.ts

@@ -1,5 +1,4 @@
 import { Core } from '@cachemap/core';
-import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
 import {
   type CreateResourceResolver,
@@ -27,7 +26,7 @@ export const createMakeCursors = (_obj: undefined, args: QueryRatedArgs) => {
 export const createResourceResolver: CreateResourceResolver<undefined, QueryRatedArgs, Context, RawRated> =
   (_obj, { screenType }: QueryRatedArgs, { data: ctxData, restClient }: Context) =>
   async ({ page }: { page: number }) => {
-    const { data, errors, headers } = await restClient.rated<RawRated>(
+    const { data, headers } = await restClient.rated<RawRated>(
       {
         pathTemplateData: { id: ctxData.tmdbGuestSessionId, type: screenType.toLowerCase() },
         queryParams: { page },
@@ -35,13 +34,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryRate
       ctxData
     );
 
-    if (!data) {
-      return {
-        errors,
-        headers,
-      };
-    }
-
     data.results = data.results?.map(entry => {
       // @ts-expect-error required for type resolver
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -51,7 +43,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryRate
 
     return {
       data,
-      errors,
       headers,
     };
   };
@@ -59,7 +50,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryRate
 export const cursorCache = new Core({
   name: 'RATED_CONNECTION_RESOLVER',
   reaper: reaper({ interval: 300_000 }),
-  store: map(),
   type: 'GRAPHQL',
 });
 

package/src/queries/review.test.ts

@@ -32,9 +32,9 @@ describe('resolveReview >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/review.ts

@@ -19,7 +19,7 @@ export const resolveReview = buildObjArgsResolver<RawReview, QueryReviewArgs, Ra
       };
     }
 
-    const { data, errors, headers } = await restClient.review<RawReview>(
+    const { data, headers } = await restClient.review<RawReview>(
       {
         pathTemplateData: { id },
       },
@@ -27,8 +27,7 @@ export const resolveReview = buildObjArgsResolver<RawReview, QueryReviewArgs, Ra
     );
 
     return {
-      data: obj ? data?.[typedFieldName] : data,
-      errors,
+      data: obj ? data[typedFieldName] : data,
       headers,
     };
   }

package/src/queries/search.test.ts

@@ -76,7 +76,7 @@ describe('createResourceResolver', () => {
   };
 
   const restClient = {
-    search: jest.fn().mockReturnValue({}),
+    search: jest.fn().mockReturnValue({ data: {} }),
   } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
 
   it('when `restClient.search` is called', async () => {
@@ -124,10 +124,10 @@ describe('resolveSearch > collections', () => {
     );
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 
@@ -175,10 +175,10 @@ describe('resolveSearch > companies', () => {
     );
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 
@@ -234,10 +234,10 @@ describe('resolveSearch > movies', () => {
     );
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 
@@ -293,10 +293,10 @@ describe('resolveSearch > multi', () => {
     );
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 
@@ -344,10 +344,10 @@ describe('resolveSearch > people', () => {
     );
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 
@@ -372,10 +372,10 @@ describe('resolveSearch > tv', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/search.ts

@@ -1,5 +1,4 @@
 import { Core } from '@cachemap/core';
-import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
 import {
   type CreateResourceResolver,
@@ -33,7 +32,7 @@ export const createResourceResolver: CreateResourceResolver<undefined, QuerySear
   const { searchType, ...rest } = removeConnectionInputOptions(args);
 
   return async ({ page }: { page: number }) => {
-    const { data, errors, headers } = await restClient.search<RawSearch>(
+    const { data, headers } = await restClient.search<RawSearch>(
       {
         pathTemplateData: { type: (searchType ?? SearchType.Multi).toLowerCase() },
         queryParams: { ...snakeCasePropNames(rest), page },
@@ -41,13 +40,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QuerySear
       ctxData
     );
 
-    if (!data) {
-      return {
-        errors,
-        headers,
-      };
-    }
-
     data.results = data.results?.map(entry => {
       let mediaType = entry.media_type;
 
@@ -64,7 +56,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QuerySear
 
     return {
       data,
-      errors,
       headers,
     };
   };
@@ -73,7 +64,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QuerySear
 export const cursorCache = new Core({
   name: 'SEARCH_CONNECTION_RESOLVER',
   reaper: reaper({ interval: 300_000 }),
-  store: map(),
   type: 'GRAPHQL',
 });
 

package/src/queries/season.test.ts

@@ -38,9 +38,9 @@ describe('resolveSeason >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/season.ts

@@ -48,7 +48,7 @@ export const resolveSeason = buildObjArgsResolver<
 
   const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
-  const { data, errors, headers } = await restClient.season<EnrichedRawSeasonWithAppendToResponse>(
+  const { data, headers } = await restClient.season<EnrichedRawSeasonWithAppendToResponse>(
     {
       pathTemplateData: { id, number: seasonNumber },
       ...(appendToResponseKeys.length > 0
@@ -64,7 +64,7 @@ export const resolveSeason = buildObjArgsResolver<
 
   const seasonData = {
     ...data,
-    episodes: (data?.episodes ?? []).map(episode => ({ ...episode, tv_show_id: Number(id) })),
+    episodes: (data.episodes ?? []).map(episode => ({ ...episode, tv_show_id: Number(id) })),
     id: encodeId({ id, seasonNumber }),
     tv_show_id: Number(id),
   };
@@ -75,7 +75,6 @@ export const resolveSeason = buildObjArgsResolver<
       : appendToResponseKeys.length > 0
       ? { ...seasonData, __headers: headers }
       : seasonData,
-    errors,
     headers,
   };
 });

package/src/queries/seasonCredits.test.ts

@@ -33,9 +33,9 @@ describe('resolveSeasonCredits >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/seasonCredits.ts

@@ -23,7 +23,7 @@ export const resolveSeasonCredits = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.season<RawSeasonCredits>(
+  const { data, headers } = await restClient.season<RawSeasonCredits>(
     {
       pathTemplateData: { id: obj.tv_show_id, number: obj.season_number, type: CREDITS },
     },
@@ -31,8 +31,7 @@ export const resolveSeasonCredits = buildObjResolver<
   );
 
   return {
-    data: data?.[typedFieldName],
-    errors,
+    data: data[typedFieldName],
     headers,
   };
 });

package/src/queries/seasonExternalIds.test.ts

@@ -37,9 +37,9 @@ describe('resolveSeasonExternalIds >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/seasonExternalIds.ts

@@ -27,18 +27,17 @@ export const resolveSeasonExternalIds = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.season<RawSeasonExternalIds>(
+  const { data, headers } = await restClient.season<RawSeasonExternalIds>(
     {
       pathTemplateData: { id: obj.tv_show_id, number: obj.season_number, type: snakeCase(EXTERNAL_IDS) },
     },
     ctxData
   );
 
-  const { id: movieId, ...rest } = data ?? {};
+  const { id: movieId, ...rest } = data;
 
   return {
     data: rest,
-    errors,
     headers,
   };
 });

package/src/queries/seasonPosters.test.ts

@@ -34,9 +34,9 @@ describe('resolveSeasonPosters >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/seasonPosters.ts

@@ -20,7 +20,7 @@ export const resolveSeasonPosters = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.season<RawSeasonPosters>(
+  const { data, headers } = await restClient.season<RawSeasonPosters>(
     {
       pathTemplateData: { id: obj.tv_show_id, number: obj.season_number, type: IMAGES },
     },
@@ -28,8 +28,7 @@ export const resolveSeasonPosters = buildObjResolver<
   );
 
   return {
-    data: data?.posters,
-    errors,
+    data: data.posters,
     headers,
   };
 });

package/src/queries/seasonTranslations.test.ts

@@ -33,9 +33,9 @@ describe('resolveSeasonTranslations >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/seasonTranslations.ts

@@ -24,7 +24,7 @@ export const resolveSeasonTranslations = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.season<RawSeasonTranslations>(
+  const { data, headers } = await restClient.season<RawSeasonTranslations>(
     {
       pathTemplateData: { id: obj.tv_show_id, number: obj.season_number, type: TRANSLATIONS },
     },
@@ -32,8 +32,7 @@ export const resolveSeasonTranslations = buildObjResolver<
   );
 
   return {
-    data: data?.translations,
-    errors,
+    data: data.translations,
     headers,
   };
 });

package/src/queries/seasonVideos.test.ts

@@ -34,9 +34,9 @@ describe('resolveSeasonVideos >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/seasonVideos.ts

@@ -20,7 +20,7 @@ export const resolveSeasonVideos = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.season<RawSeasonVideos>(
+  const { data, headers } = await restClient.season<RawSeasonVideos>(
     {
       pathTemplateData: { id: obj.tv_show_id, number: obj.season_number, type: VIDEOS },
     },
@@ -28,8 +28,7 @@ export const resolveSeasonVideos = buildObjResolver<
   );
 
   return {
-    data: data?.results,
-    errors,
+    data: data.results,
     headers,
   };
 });

package/src/queries/trending.test.ts

@@ -54,7 +54,7 @@ describe('createMakeCursors', () => {
 
 describe('createResourceResolver', () => {
   const restClient = {
-    trending: jest.fn().mockReturnValue({}),
+    trending: jest.fn().mockReturnValue({ data: {} }),
   } as unknown as Getta & ShortcutProperties<ShortcutMethodNames>;
 
   it('when `restClient.trending` is called', async () => {
@@ -94,10 +94,10 @@ describe('resolveTrending', () => {
     mockEndpoint({ mediaType: TrendingMediaType.Movie, timeWindow: TrendingTimeWindow.Week }, 1, trendingMovieWeek);
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
-    await cursorCache.clear();
+    context.restClient.cache?.clear();
+    cursorCache.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/trending.ts

@@ -1,5 +1,4 @@
 import { Core } from '@cachemap/core';
-import { init as map } from '@cachemap/map';
 import { init as reaper } from '@cachemap/reaper';
 import {
   type CreateResourceResolver,
@@ -31,7 +30,7 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryTren
     const { mediaType, timeWindow } = args;
     const { data: ctxData, restClient } = ctx;
 
-    const { data, errors, headers } = await restClient.trending<RawTrending>(
+    const { data, headers } = await restClient.trending<RawTrending>(
       {
         pathTemplateData: { subType: timeWindow.toLowerCase(), type: mediaType.toLowerCase() },
         queryParams: { page },
@@ -39,13 +38,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryTren
       ctxData
     );
 
-    if (!data) {
-      return {
-        errors,
-        headers,
-      };
-    }
-
     data.results = data.results?.map(entry => {
       let type = entry.media_type;
 
@@ -62,7 +54,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryTren
 
     return {
       data,
-      errors,
       headers,
     };
   };
@@ -70,7 +61,6 @@ export const createResourceResolver: CreateResourceResolver<undefined, QueryTren
 export const cursorCache = new Core({
   name: 'TRENDING_CONNECTION_RESOLVER',
   reaper: reaper({ interval: 300_000 }),
-  store: map(),
   type: 'GRAPHQL',
 });
 

package/src/queries/tv.test.ts

@@ -37,9 +37,9 @@ describe('resolveTv >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/tv.ts

@@ -66,7 +66,7 @@ export const resolveTv = buildObjArgsResolver<
   const id = obj ? obj.id : args.id;
   const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
-  const { data, errors, headers } = await restClient.tv<RawTvWithAppendToResponse>(
+  const { data, headers } = await restClient.tv<RawTvWithAppendToResponse>(
     {
       pathTemplateData: { id },
       ...(appendToResponseKeys.length > 0
@@ -82,7 +82,7 @@ export const resolveTv = buildObjArgsResolver<
 
   const tvData = {
     ...data,
-    seasons: (data?.seasons ?? []).map(season => ({
+    seasons: (data.seasons ?? []).map(season => ({
       ...season,
       tv_show_id: Number(id),
     })),
@@ -90,7 +90,6 @@ export const resolveTv = buildObjArgsResolver<
 
   return {
     data: obj ? tvData[typedFieldName] : appendToResponseKeys.length > 0 ? { ...tvData, __headers: headers } : tvData,
-    errors,
     headers,
   };
 });

package/src/queries/tvAlternativeTitles.test.ts

@@ -37,9 +37,9 @@ describe('resolveTvAlternativeTitles >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/tvAlternativeTitles.ts

@@ -22,7 +22,7 @@ export const resolveTvAlternativeTitles = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.tv<RawTvAlternativeTitles>(
+  const { data, headers } = await restClient.tv<RawTvAlternativeTitles>(
     {
       pathTemplateData: { id: obj.id, type: snakeCase(ALTERNATIVE_TITLES) },
     },
@@ -30,8 +30,7 @@ export const resolveTvAlternativeTitles = buildObjResolver<
   );
 
   return {
-    data: data?.results,
-    errors,
+    data: data.results,
     headers,
   };
 });

package/src/queries/tvContentRatings.test.ts

@@ -37,9 +37,9 @@ describe('resolveTvContentRatings >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/tvContentRatings.ts

@@ -21,7 +21,7 @@ export const resolveTvContentRatings = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.tv<RawTvContentRatings>(
+  const { data, headers } = await restClient.tv<RawTvContentRatings>(
     {
       pathTemplateData: { id: obj.id, type: snakeCase(CONTENT_RATINGS) },
     },
@@ -29,8 +29,7 @@ export const resolveTvContentRatings = buildObjResolver<
   );
 
   return {
-    data: data?.results,
-    errors,
+    data: data.results,
     headers,
   };
 });

package/src/queries/tvCredits.test.ts

@@ -34,9 +34,9 @@ describe('resolveTvCredits >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/tvCredits.ts

@@ -22,7 +22,7 @@ export const resolveTvCredits = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.tv<RawTvCredits>(
+  const { data, headers } = await restClient.tv<RawTvCredits>(
     {
       pathTemplateData: { id: obj.id, type: CREDITS },
     },
@@ -30,8 +30,7 @@ export const resolveTvCredits = buildObjResolver<
   );
 
   return {
-    data: data?.[typedFieldName],
-    errors,
+    data: data[typedFieldName],
     headers,
   };
 });

package/src/queries/tvEpisodeGroups.test.ts

@@ -37,9 +37,9 @@ describe('resolveTvEpisodeGroups >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/tvEpisodeGroups.ts

@@ -21,7 +21,7 @@ export const resolveTvEpisodeGroups = buildObjResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.tv<RawTvEpisodeGroups>(
+  const { data, headers } = await restClient.tv<RawTvEpisodeGroups>(
     {
       pathTemplateData: { id: obj.id, type: snakeCase(EPISODE_GROUPS) },
     },
@@ -29,8 +29,7 @@ export const resolveTvEpisodeGroups = buildObjResolver<
   );
 
   return {
-    data: data?.results,
-    errors,
+    data: data.results,
     headers,
   };
 });

package/src/queries/tvExternalIds.test.ts

@@ -37,9 +37,9 @@ describe('resolveTvExternalIds >', () => {
     });
   });
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });