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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmdb-graphql-api/resolvers",
   "description": "The TMDB GraphQL resolvers module.",
-  "version": "0.1.15",
+  "version": "0.1.16-unstable.2",
   "author": "miami-man",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/themoviedb-graphql-api",
@@ -29,19 +29,18 @@
     "access": "public"
   },
   "dependencies": {
-    "@cachemap/core": "^5.3.0",
-    "@cachemap/map": "^5.1.0",
-    "@cachemap/reaper": "^5.2.0",
-    "@graphql-box/connection-resolver": "5.4.23-unstable-12345.6",
-    "@graphql-box/core": "5.4.14-unstable-12345.6",
+    "@cachemap/core": "^5.3.3-unstable-12345.3",
+    "@cachemap/reaper": "^5.2.1-unstable-12345.2",
+    "@graphql-box/connection-resolver": "5.4.23-unstable-12345.11",
+    "@graphql-box/core": "5.4.14-unstable-12345.8",
     "cacheability": "^4.0.27",
-    "getta": "^1.0.21",
+    "getta": "1.0.22-unstable-12345.3",
     "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.21",
-    "@tmdb-graphql-api/schema": "0.1.3"
+    "@tmdb-graphql-api/rest-client": "0.0.22-unstable.2",
+    "@tmdb-graphql-api/schema": "0.1.4-unstable.0"
   },
   "peerDependencies": {
     "@babel/runtime": "<8",
@@ -51,7 +50,7 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.2",
-    "@graphql-box/helpers": "5.4.14-unstable-12345.6",
+    "@graphql-box/helpers": "5.4.14-unstable-12345.13",
     "@jest/globals": "^29.7.0",
     "@types/lodash-es": "^4.14.191",
     "core-js": "^3.33.1",

package/src/__testUtils__/helpers/createRestClient.ts

@@ -1,9 +1,8 @@
 import { Core } from '@cachemap/core';
-import { init as map } from '@cachemap/map';
 import { createRestClient as create } from '@tmdb-graphql-api/rest-client';
 
 export const createRestClient = () =>
   create({
     apiKey: '12345',
-    cache: new Core({ name: 'cachemap', store: map(), type: 'GRAPHQL' }),
+    cache: new Core({ name: 'cachemap', type: 'GRAPHQL' }),
   });

package/src/constants.ts

@@ -75,9 +75,9 @@ export const RAW_WATCH_PROVIDERS = 'watch/providers' as const;
 
 export enum ResolverType {
   Args = 'ARGS',
+  NoObjArgs = 'NO_OBJ_ARGS',
   Obj = 'OBJ',
-  ObjAndArgs = 'OBJ_AND_ARGS',
-  OptsObjAndArgs = 'OPTS_OBJ_AND_ARGS',
+  ObjArgs = 'OBJ_ARGS',
 }
 
 export enum Source {

package/src/helpers/buildArgsResolver.ts

@@ -1,7 +1,8 @@
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
+import { type GraphQLResolveInfo } from 'graphql';
 import crypto from 'node:crypto';
 import { ResolverType, type Source } from '../constants.ts';
 import { type Context } from '../types.ts';
+import { executeResolver } from './executeResolver.ts';
 
 export const buildArgsResolver =
   <Args extends object, Data>(
@@ -10,7 +11,7 @@ export const buildArgsResolver =
       args: Args,
       ctx: Context,
       info: GraphQLResolveInfo
-    ) => Promise<{ data?: Data; errors?: Error[]; headers: Headers; source?: Source }>
+    ) => Promise<{ data?: Data; headers: Headers; source?: Source }>
   ) =>
   async (_obj: undefined, args: Args, ctx: Context, info: GraphQLResolveInfo) => {
     const { logger, setCacheMetadata } = ctx;
@@ -19,6 +20,8 @@ export const buildArgsResolver =
     const newCtx = {
       ...ctx,
       data: {
+        // This does not make sense in this instance
+        // eslint-disable-next-line unicorn/consistent-destructuring
         ...ctx.data,
         args,
         fieldPath: fieldName,
@@ -30,17 +33,12 @@ export const buildArgsResolver =
     const childLogger = logger.child(newCtx.data);
 
     childLogger.info(`Resolving ${fieldName} ${JSON.stringify(args)}`, { logEntryName: 'RESOLVER_START' });
-    const { data, errors, headers } = await callback(args, newCtx, info);
 
-    if (errors?.length) {
-      const message = `Failed to resolve ${fieldName}`;
-      childLogger.error(message, { errors: JSON.stringify(errors), logEntryName: 'RESOLVER_FAILED' });
-      throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
-    }
-
-    if (headers.has('cache-control')) {
-      setCacheMetadata(data, info, headers);
-    }
-
-    return data;
+    return executeResolver({
+      callback: () => callback(args, newCtx, info),
+      fieldNodes,
+      fieldPath: fieldName,
+      logger: childLogger,
+      setCacheMetadata: (data, headers) => setCacheMetadata(data, info, headers),
+    });
   };

package/src/helpers/buildNoObjArgsResolver.ts

@@ -1,15 +1,13 @@
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
+import { type GraphQLResolveInfo } from 'graphql';
 import crypto from 'node:crypto';
 import { ResolverType, type Source } from '../constants.ts';
 import type { Context } from '../types.ts';
+import { executeResolver } from './executeResolver.ts';
 
 export const buildNoObjArgsResolver =
   <Obj, Data>(
     parentFieldName: string,
-    callback: (
-      ctx: Context,
-      info: GraphQLResolveInfo
-    ) => Promise<{ data?: Data; errors?: Error[]; headers: Headers; source?: Source }>
+    callback: (ctx: Context, info: GraphQLResolveInfo) => Promise<{ data?: Data; headers: Headers; source?: Source }>
   ) =>
   async (obj: Obj | undefined, _args: undefined, ctx: Context, info: GraphQLResolveInfo) => {
     const { logger, setCacheMetadata } = ctx;
@@ -19,27 +17,24 @@ export const buildNoObjArgsResolver =
     const newCtx = {
       ...ctx,
       data: {
+        // This does not make sense in this instance
+        // eslint-disable-next-line unicorn/consistent-destructuring
         ...ctx.data,
         args: undefined,
         fieldPath,
         resolverRequestId: crypto.randomUUID(),
-        resolverType: ResolverType.OptsObjAndArgs,
+        resolverType: ResolverType.NoObjArgs,
       },
     };
 
     const childLogger = logger.child(newCtx.data);
     childLogger.info(`Resolving ${fieldPath}`, { logEntryName: 'RESOLVER_START' });
-    const { data, errors, headers } = await callback(newCtx, info);
 
-    if (errors?.length) {
-      const message = `Failed to resolve ${fieldPath}`;
-      childLogger.error(message, { errors: JSON.stringify(errors), logEntryName: 'RESOLVER_FAILED' });
-      throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
-    }
-
-    if (headers.has('cache-control')) {
-      setCacheMetadata(data, info, headers);
-    }
-
-    return data;
+    return executeResolver({
+      callback: () => callback(newCtx, info),
+      fieldNodes,
+      fieldPath,
+      logger: childLogger,
+      setCacheMetadata: (data, headers) => setCacheMetadata(data, info, headers),
+    });
   };

package/src/helpers/buildObjArgsResolver.ts

@@ -1,8 +1,9 @@
-import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
+import { type GraphQLResolveInfo } from 'graphql';
 import { isUndefined, snakeCase } from 'lodash-es';
 import crypto from 'node:crypto';
 import { ResolverType, type Source } from '../constants.ts';
 import { type Context } from '../types.ts';
+import { executeResolver } from './executeResolver.ts';
 
 export const buildObjArgsResolver =
   <Obj extends object, Args extends object, Data>(
@@ -12,7 +13,7 @@ export const buildObjArgsResolver =
       args: Args,
       ctx: Context,
       info: GraphQLResolveInfo
-    ) => Promise<{ data?: Data; errors?: Error[]; headers?: Headers; source?: Source }>
+    ) => Promise<{ data?: Data; headers?: Headers; source?: Source }>
   ) =>
   async (obj: Obj | undefined, args: Args, ctx: Context, info: GraphQLResolveInfo) => {
     const { logger, setCacheMetadata } = ctx;
@@ -22,11 +23,13 @@ export const buildObjArgsResolver =
     const newCtx = {
       ...ctx,
       data: {
+        // This does not make sense in this instance
+        // eslint-disable-next-line unicorn/consistent-destructuring
         ...ctx.data,
         args: { ...args, id },
         fieldPath: parentFieldName,
         resolverRequestId: crypto.randomUUID(),
-        resolverType: ResolverType.ObjAndArgs,
+        resolverType: ResolverType.ObjArgs,
       },
     };
 
@@ -44,21 +47,12 @@ export const buildObjArgsResolver =
       childLogger.info(enrichLogMessage('Resolving'), { logEntryName: 'RESOLVER_START' });
     }
 
-    const { data, errors, headers } = await callback(obj, args, newCtx, info);
-
-    if (errors?.length) {
-      const message = enrichLogMessage('Failed to resolve');
-
-      if (loggingEnabled) {
-        childLogger.error(message, { errors: JSON.stringify(errors), logEntryName: 'RESOLVER_FAILED' });
-      }
-
-      throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
-    }
-
-    if (headers?.has('cache-control')) {
-      setCacheMetadata(data, info, headers);
-    }
-
-    return data;
+    return executeResolver({
+      callback: () => callback(obj, args, newCtx, info),
+      fieldNodes,
+      fieldPath: fieldName,
+      logger: childLogger,
+      setCacheMetadata: (data, headers) => setCacheMetadata(data, info, headers),
+      suppressLogging: !loggingEnabled,
+    });
   };

package/src/helpers/buildObjResolver.ts

@@ -2,6 +2,7 @@ import { GraphQLError, type GraphQLResolveInfo } from 'graphql';
 import crypto from 'node:crypto';
 import { ResolverType, type Source } from '../constants.ts';
 import { type Context } from '../types.ts';
+import { executeResolver } from './executeResolver.ts';
 
 export const buildObjResolver =
   <Obj extends { id: number | string }, Data>(
@@ -10,7 +11,7 @@ export const buildObjResolver =
       obj: Obj,
       ctx: Context,
       info: GraphQLResolveInfo
-    ) => Promise<{ data?: Data; errors?: Error[]; headers?: Headers; source?: Source }>
+    ) => Promise<{ data?: Data; headers?: Headers; source?: Source }>
   ) =>
   async (obj: Obj | undefined, _args: undefined, ctx: Context, info: GraphQLResolveInfo) => {
     const { logger, setCacheMetadata } = ctx;
@@ -20,6 +21,8 @@ export const buildObjResolver =
     const newCtx = {
       ...ctx,
       data: {
+        // This does not make sense in this instance
+        // eslint-disable-next-line unicorn/consistent-destructuring
         ...ctx.data,
         args: obj?.id ? { id: obj.id } : undefined,
         fieldPath,
@@ -37,17 +40,12 @@ export const buildObjResolver =
     }
 
     childLogger.info(`Resolving ${fieldPath}`, { logEntryName: 'RESOLVER_START' });
-    const { data, errors, headers } = await callback(obj, newCtx, info);
 
-    if (errors?.length) {
-      const message = `Failed to resolve ${fieldPath}`;
-      childLogger.error(message, { errors: JSON.stringify(errors), logEntryName: 'RESOLVER_FAILED' });
-      throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
-    }
-
-    if (headers?.has('cache-control')) {
-      setCacheMetadata(data, info, headers);
-    }
-
-    return data;
+    return executeResolver({
+      callback: () => callback(obj, newCtx, info),
+      fieldNodes,
+      fieldPath,
+      logger: childLogger,
+      setCacheMetadata: (data, headers) => setCacheMetadata(data, info, headers),
+    });
   };

package/src/helpers/executeResolver.ts

@@ -0,0 +1,39 @@
+import { type FieldNode, GraphQLError } from 'graphql';
+import { type Logger } from 'winston';
+
+export type ExecuteResolverArgs<Data> = {
+  callback: () => Promise<{ data?: Data; headers?: Headers }>;
+  fieldNodes: readonly FieldNode[];
+  fieldPath: string;
+  logger: Logger;
+  setCacheMetadata: (data: unknown, headers: Headers) => void;
+  suppressLogging?: boolean;
+};
+
+export const executeResolver = async <Data>({
+  callback,
+  fieldNodes,
+  fieldPath,
+  logger,
+  setCacheMetadata,
+  suppressLogging,
+}: ExecuteResolverArgs<Data>) => {
+  try {
+    const { data, headers } = await callback();
+
+    if (headers?.has('cache-control')) {
+      setCacheMetadata(data, headers);
+    }
+
+    return data;
+  } catch (error) {
+    const message = `Failed to resolve ${fieldPath}`;
+    const originalError = error instanceof Error ? error : new Error(message, { cause: error });
+
+    if (!suppressLogging) {
+      logger.error(message, { error: originalError, logEntryName: 'RESOLVER_FAILED' });
+    }
+
+    throw new GraphQLError(message, { nodes: fieldNodes, originalError });
+  }
+};

package/src/queries/certifications.test.ts

@@ -26,9 +26,9 @@ describe('resolveCertifications >', () => {
 
   const info = {} as GraphQLResolveInfo;
 
-  afterEach(async () => {
+  afterEach(() => {
     mockedFetch.mockReset();
-    await context.restClient.cache?.clear();
+    context.restClient.cache?.clear();
     jest.clearAllMocks();
   });
 

package/src/queries/certifications.ts

@@ -9,7 +9,7 @@ export const resolveCertifications = buildArgsResolver<QueryCertificationsArgs,
     const { screenType } = args;
     const { data: ctxData, restClient } = ctx;
 
-    const { data, errors } = await restClient.certifications<RawCertifications>(
+    const { data } = await restClient.certifications<RawCertifications>(
       {
         pathTemplateData: { type: screenType.toLowerCase() },
       },
@@ -17,9 +17,8 @@ export const resolveCertifications = buildArgsResolver<QueryCertificationsArgs,
     );
 
     return {
-      data: data?.certifications,
-      errors,
-      headers: new Headers({ cacheControl: 'public, max-age=28800' }),
+      data: data.certifications,
+      headers: new Headers({ 'cache-control': 'public, max-age=28800' }),
     };
   }
 );

package/src/queries/collection.test.ts

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

package/src/queries/collection.ts

@@ -21,7 +21,7 @@ export const resolveCollection = buildObjArgsResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.collection<RawCollection>(
+  const { data, headers } = await restClient.collection<RawCollection>(
     {
       pathTemplateData: { id },
     },
@@ -29,8 +29,7 @@ export const resolveCollection = buildObjArgsResolver<
   );
 
   return {
-    data: obj ? data?.[typedFieldName] : data,
-    errors,
+    data: obj ? data[typedFieldName] : data,
     headers,
   };
 });

package/src/queries/collectionImages.test.ts

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

package/src/queries/collectionImages.ts

@@ -9,7 +9,7 @@ export const resolveCollectionImages = buildObjResolver<
   const { data: ctxData, restClient } = ctx;
   const { fieldName } = info;
 
-  const { data, errors, headers } = await restClient.collection<RawCollectionImages>(
+  const { data, headers } = await restClient.collection<RawCollectionImages>(
     {
       pathTemplateData: { id: obj.id, type: IMAGES },
     },
@@ -19,8 +19,7 @@ export const resolveCollectionImages = buildObjResolver<
   const typedFieldName = fieldName as 'backdrops' | 'posters';
 
   return {
-    data: data?.[typedFieldName],
-    errors,
+    data: data[typedFieldName],
     headers,
   };
 });

package/src/queries/collectionTranslations.test.ts

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

package/src/queries/collectionTranslations.ts

@@ -7,7 +7,7 @@ export const resolveCollectionTranslations = buildObjResolver<RawCollection, Raw
   async (obj, ctx) => {
     const { data: ctxData, restClient } = ctx;
 
-    const { data, errors, headers } = await restClient.collection<RawCollectionTranslations>(
+    const { data, headers } = await restClient.collection<RawCollectionTranslations>(
       {
         pathTemplateData: { id: obj.id, type: TRANSLATIONS },
       },
@@ -15,8 +15,7 @@ export const resolveCollectionTranslations = buildObjResolver<RawCollection, Raw
     );
 
     return {
-      data: data?.translations,
-      errors,
+      data: data.translations,
       headers,
     };
   }

package/src/queries/company.test.ts

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

package/src/queries/company.ts

@@ -21,7 +21,7 @@ export const resolveCompany = buildObjArgsResolver<
     };
   }
 
-  const { data, errors, headers } = await restClient.company<RawCompany>(
+  const { data, headers } = await restClient.company<RawCompany>(
     {
       pathTemplateData: { id },
     },
@@ -29,8 +29,7 @@ export const resolveCompany = buildObjArgsResolver<
   );
 
   return {
-    data: obj ? data?.[typedFieldName] : data,
-    errors,
+    data: obj ? data[typedFieldName] : data,
     headers,
   };
 });

package/src/queries/companyAlternativeNames.test.ts

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

package/src/queries/companyAlternativeNames.ts

@@ -8,7 +8,7 @@ export const resolveCompanyAlternativeNames = buildObjResolver<RawCollection, Ra
   async (obj, ctx) => {
     const { data: ctxData, restClient } = ctx;
 
-    const { data, errors, headers } = await restClient.company<RawCompanyAlternativeNames>(
+    const { data, headers } = await restClient.company<RawCompanyAlternativeNames>(
       {
         pathTemplateData: { id: obj.id, type: snakeCase(ALTERNATIVE_NAMES) },
       },
@@ -16,8 +16,7 @@ export const resolveCompanyAlternativeNames = buildObjResolver<RawCollection, Ra
     );
 
     return {
-      data: data?.results,
-      errors,
+      data: data.results,
       headers,
     };
   }

package/src/queries/companyLogos.test.ts

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

package/src/queries/companyLogos.ts

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

package/src/queries/configuration.test.ts

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

package/src/queries/configuration.ts

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

package/src/queries/configurationCountries.test.ts

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

package/src/queries/configurationCountries.ts

@@ -7,7 +7,7 @@ export const resolveConfigurationCountries = buildNoObjArgsResolver<RawConfigura
   async ctx => {
     const { data: ctxData, restClient } = ctx;
 
-    const { data, errors, headers } = await restClient.configuration<RawConfigurationCountries>(
+    const { data, headers } = await restClient.configuration<RawConfigurationCountries>(
       {
         pathTemplateData: { type: COUNTRIES },
       },
@@ -16,7 +16,6 @@ export const resolveConfigurationCountries = buildNoObjArgsResolver<RawConfigura
 
     return {
       data,
-      errors,
       headers,
     };
   }

package/src/queries/configurationJobs.test.ts

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

package/src/queries/configurationJobs.ts

@@ -7,7 +7,7 @@ export const resolveConfigurationJobs = buildNoObjArgsResolver<RawConfiguration,
   async ctx => {
     const { data: ctxData, restClient } = ctx;
 
-    const { data, errors, headers } = await restClient.configuration<RawConfigurationJobs>(
+    const { data, headers } = await restClient.configuration<RawConfigurationJobs>(
       {
         pathTemplateData: { type: JOBS },
       },
@@ -16,7 +16,6 @@ export const resolveConfigurationJobs = buildNoObjArgsResolver<RawConfiguration,
 
     return {
       data,
-      errors,
       headers,
     };
   }