@tmdb-graphql-api/resolvers 0.1.12 → 0.1.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tmdb-graphql-api/resolvers",
   "description": "The TMDB GraphQL resolvers module.",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "author": "miami-man",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/themoviedb-graphql-api",
@@ -29,19 +29,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@cachemap/core": "^5.2.7",
-    "@cachemap/map": "^5.0.9",
-    "@cachemap/reaper": "^5.1.3",
-    "@graphql-box/connection-resolver": "^5.4.20",
-    "@graphql-box/core": "^5.4.11",
+    "@cachemap/core": "^5.3.0",
+    "@cachemap/map": "^5.1.0",
+    "@cachemap/reaper": "^5.2.0",
+    "@graphql-box/connection-resolver": "5.4.23-unstable-12345.5",
+    "@graphql-box/core": "5.4.14-unstable-12345.5",
     "cacheability": "^4.0.27",
     "getta": "^1.0.21",
     "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.19",
-    "@tmdb-graphql-api/schema": "0.1.2"
+    "@tmdb-graphql-api/rest-client": "0.0.20",
+    "@tmdb-graphql-api/schema": "0.1.3"
   },
   "peerDependencies": {
     "@babel/runtime": "<8",
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.2",
-    "@graphql-box/helpers": "^5.4.11",
+    "@graphql-box/helpers": "5.4.14-unstable-12345.5",
     "@jest/globals": "^29.7.0",
     "@types/lodash-es": "^4.14.191",
     "core-js": "^3.33.1",

package/src/__testUtils__/helpers/buildResolveInfoArg.ts

@@ -1,29 +1,20 @@
-import { type ParentNode, getChildFields, getName, getOperationDefinitions } from '@graphql-box/helpers';
+import { getOperationDefinitions } from '@graphql-box/helpers';
 import { schema } from '@tmdb-graphql-api/schema';
-import { type FieldNode, type GraphQLObjectType, type GraphQLResolveInfo, parse } from 'graphql';
+import { type GraphQLObjectType, type GraphQLResolveInfo, parse } from 'graphql';
+import { getChildField } from './getChildField.ts';
 
 export const buildResolveInfoArgument = (request: string, path: string[]): GraphQLResolveInfo => {
   const ast = parse(request);
-  const operationDefinitions = getOperationDefinitions(ast);
-
-  const fieldNodes = path.reduce((nodes: ParentNode[], pathEntry) => {
-    const node = nodes[0];
-
-    if (!node) {
-      return nodes;
-    }
-
-    return getChildFields(node, { name: pathEntry })?.map(({ fieldNode }) => fieldNode) ?? nodes;
-  }, operationDefinitions) as FieldNode[];
-
-  const fieldName = (fieldNodes[0] ? getName(fieldNodes[0]) : undefined) ?? '';
+  const operationDefinition = getOperationDefinitions(ast)[0]!;
+  const childField = getChildField(operationDefinition, path)!;
+  const fieldName = childField.name.value;
   const mockType = {};
 
   return {
     fieldName,
-    fieldNodes,
+    fieldNodes: [childField],
     fragments: {},
-    operation: operationDefinitions[0],
+    operation: operationDefinition,
     parentType: mockType as GraphQLObjectType,
     path: { key: 0, prev: undefined, typename: '' },
     returnType: mockType as GraphQLObjectType,

package/src/__testUtils__/helpers/getChildField.ts

@@ -0,0 +1,35 @@
+import { type ParentNode, isKind } from '@graphql-box/helpers';
+import { type FieldNode, type InlineFragmentNode, Kind } from 'graphql';
+
+export const getChildField = (node: ParentNode, names: string[] = []): FieldNode | undefined => {
+  if (!node.selectionSet || names.length === 0) {
+    return;
+  }
+
+  let fieldNode: FieldNode | undefined;
+  const [firstName, ...restNames] = names;
+
+  for (const selection of node.selectionSet.selections) {
+    if (isKind<FieldNode>(selection, Kind.FIELD) && selection.name.value === firstName) {
+      if (restNames.length > 0) {
+        const result = getChildField(selection, restNames);
+
+        if (result) {
+          fieldNode = result;
+        }
+      } else {
+        fieldNode = selection;
+      }
+    }
+
+    if (isKind<InlineFragmentNode>(selection, Kind.INLINE_FRAGMENT)) {
+      const result = getChildField(selection, names);
+
+      if (result) {
+        fieldNode = result;
+      }
+    }
+  }
+
+  return fieldNode;
+};

package/src/helpers/buildArgsResolver.ts

@@ -38,6 +38,9 @@ export const buildArgsResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    setCacheMetadata(fieldName, headers);
+    if (headers.has('cache-control')) {
+      setCacheMetadata(data, info, headers);
+    }
+
     return data;
   };

package/src/helpers/buildNoObjArgsResolver.ts

@@ -20,6 +20,7 @@ export const buildNoObjArgsResolver =
       ...ctx,
       data: {
         ...ctx.data,
+        args: undefined,
         fieldPath,
         resolverRequestId: crypto.randomUUID(),
         resolverType: ResolverType.OptsObjAndArgs,
@@ -36,6 +37,9 @@ export const buildNoObjArgsResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    setCacheMetadata(fieldPath, headers);
+    if (headers.has('cache-control')) {
+      setCacheMetadata(data, info, headers);
+    }
+
     return data;
   };

package/src/helpers/buildObjArgsResolver.ts

@@ -17,13 +17,13 @@ export const buildObjArgsResolver =
   async (obj: Obj | undefined, args: Args, ctx: Context, info: GraphQLResolveInfo) => {
     const { logger, setCacheMetadata } = ctx;
     const { fieldName, fieldNodes } = info;
-    const fieldPath = obj ? `${parentFieldName}.${fieldName}` : parentFieldName;
+    const id = obj && 'id' in obj && obj.id ? obj.id : 'id' in args ? args.id : undefined;
 
     const newCtx = {
       ...ctx,
       data: {
         ...ctx.data,
-        args,
+        args: { ...args, id },
         fieldPath: parentFieldName,
         resolverRequestId: crypto.randomUUID(),
         resolverType: ResolverType.ObjAndArgs,
@@ -31,7 +31,6 @@ export const buildObjArgsResolver =
     };
 
     const childLogger = logger.child(newCtx.data);
-    const id = obj && 'id' in obj && obj.id ? obj.id : 'id' in args ? args.id : undefined;
 
     const enrichLogMessage = (message: string) => {
       const enrichedMessage = `${message} ${parentFieldName}`;
@@ -57,8 +56,8 @@ export const buildObjArgsResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    if (headers) {
-      setCacheMetadata(fieldPath, headers);
+    if (headers?.has('cache-control')) {
+      setCacheMetadata(data, info, headers);
     }
 
     return data;

package/src/helpers/buildObjResolver.ts

@@ -21,8 +21,8 @@ export const buildObjResolver =
       ...ctx,
       data: {
         ...ctx.data,
+        args: obj?.id ? { id: obj.id } : undefined,
         fieldPath,
-        parentFieldId: obj?.id,
         resolverRequestId: crypto.randomUUID(),
         resolverType: ResolverType.Obj,
       },
@@ -45,8 +45,8 @@ export const buildObjResolver =
       throw new GraphQLError(message, { nodes: fieldNodes, originalError: errors[0] });
     }
 
-    if (headers) {
-      setCacheMetadata(fieldPath, headers);
+    if (headers?.has('cache-control')) {
+      setCacheMetadata(data, info, headers);
     }
 
     return data;

package/src/helpers/createDefaultFieldResolver.ts

@@ -8,7 +8,7 @@ export const createDefaultFieldResolver =
     Context extends PlainObject = PlainObject,
     Args extends PlainObject = PlainObject
   >(): GraphQLFieldResolver<Source, Context, Args> =>
-  (object, _arguments, _context, { fieldNodes }) => {
+  (object, _arguments, _context, { fieldNodes }): unknown => {
     const currentField = fieldNodes[0]!;
     const { value: name } = currentField.name;
 

package/src/helpers/getAppendToResponseKeys.ts

@@ -1,28 +1,39 @@
-import { type FragmentDefinitionNodeMap } from '@graphql-box/core';
-import { getChildFields, getName } from '@graphql-box/helpers';
-import { type FieldNode } from 'graphql';
+import { isKind } from '@graphql-box/helpers';
+import { type FieldNode, type InlineFragmentNode, Kind } from 'graphql';
 
 export const getAppendToResponseKeys = (
-  parentFieldNode: FieldNode,
-  appendToResponse: Record<string, string>,
-  fragmentDefinitions?: FragmentDefinitionNodeMap
-) =>
-  (getChildFields(parentFieldNode, { fragmentDefinitions }) ?? []).reduce((acc: string[], { fieldNode }) => {
-    const name = getName(fieldNode);
-
-    if (!name) {
-      return acc;
-    }
+  node: FieldNode | InlineFragmentNode,
+  appendToResponseRecord: Record<string, string>
+): string[] => {
+  if (!node.selectionSet) {
+    return [];
+  }
+
+  const appendToResponseKeys: string[] = [];
 
-    const key = appendToResponse[name];
+  for (const selection of node.selectionSet.selections) {
+    if (isKind<FieldNode>(selection, Kind.FIELD)) {
+      const appendToResponseKey = appendToResponseRecord[selection.name.value];
 
-    if (!key) {
-      return acc;
+      if (!appendToResponseKey) {
+        continue;
+      }
+
+      if (!appendToResponseKeys.includes(appendToResponseKey)) {
+        appendToResponseKeys.push(appendToResponseKey);
+      }
     }
 
-    if (!acc.includes(key)) {
-      acc.push(key);
+    if (isKind<InlineFragmentNode>(selection, Kind.INLINE_FRAGMENT)) {
+      const inlineFragmentKeys = getAppendToResponseKeys(selection, appendToResponseRecord);
+
+      for (const inlineFragmentKey of inlineFragmentKeys) {
+        if (!appendToResponseKeys.includes(inlineFragmentKey)) {
+          appendToResponseKeys.push(inlineFragmentKey);
+        }
+      }
     }
+  }
 
-    return acc;
-  }, []);
+  return appendToResponseKeys;
+};

package/src/helpers/removeNullValues.ts

@@ -1,7 +1,7 @@
 import { type PlainObject } from '@graphql-box/core';
 
-export const removeNullValues = <P extends PlainObject>(props: P) =>
-  Object.keys(props).reduce<PlainObject>((acc, propName) => {
+export const removeNullValues = <P extends PlainObject<unknown>>(props: P) =>
+  Object.keys(props).reduce<PlainObject<unknown>>((acc, propName) => {
     if (props[propName] === null) {
       return acc;
     }

package/src/helpers/snakeCasePropNames.ts

@@ -2,8 +2,8 @@ import { type PlainObject } from '@graphql-box/core';
 import { snakeCase } from 'lodash-es';
 import { type SnakeCasedPropertiesDeep } from 'type-fest';
 
-export const snakeCasePropNames = <P extends PlainObject>(props: P) =>
-  Object.keys(props).reduce<PlainObject>((snakeCased, propName) => {
+export const snakeCasePropNames = <P extends PlainObject<unknown>>(props: P) =>
+  Object.keys(props).reduce<PlainObject<unknown>>((snakeCased, propName) => {
     snakeCased[snakeCase(propName)] = props[propName];
     return snakeCased;
   }, {}) as SnakeCasedPropertiesDeep<P>;

package/src/queries/episode.test.ts

@@ -1,5 +1,5 @@
 import { type PlainArray } from '@graphql-box/core';
-import { getChildFields, getOperationDefinitions } from '@graphql-box/helpers';
+import { getOperationDefinitions } from '@graphql-box/helpers';
 import { jest } from '@jest/globals';
 import { EPISODE_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
 import { episodeDetails as episodeDetailsQuery } from '@tmdb-graphql-api/test-utils/requests/queries/episode/details.ts';
@@ -11,6 +11,7 @@ import { type GraphQLResolveInfo, OperationTypeNode, parse } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
 import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
+import { getChildField } from '../__testUtils__/helpers/getChildField.ts';
 import { EPISODE } from '../constants.ts';
 import { encodeId } from '../helpers/encodeId.ts';
 import { type Context } from '../types.ts';
@@ -45,7 +46,7 @@ describe('resolveEpisode >', () => {
 
   it('should return the correct episode details', async () => {
     const operationDefinition = getOperationDefinitions(parse(episodeDetailsQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: EPISODE })![0]!;
+    const fieldNode = getChildField(operationDefinition, [EPISODE]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     await expect(
@@ -55,7 +56,7 @@ describe('resolveEpisode >', () => {
 
   it('should request the correct resources when append to response fields are found', async () => {
     const operationDefinition = getOperationDefinitions(parse(episodeDetailsLgQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: EPISODE })![0]!;
+    const fieldNode = getChildField(operationDefinition, [EPISODE]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     const episodeFetchMock = jest

package/src/queries/episode.ts

@@ -24,7 +24,7 @@ export const resolveEpisode = buildObjArgsResolver<
   | (EnrichedRawEpisodeWithAppendToResponse & { __headers?: Headers })
   | EnrichedRawEpisodeWithAppendToResponse[keyof EnrichedRawEpisodeWithAppendToResponse]
 >(EPISODE, async (obj, args, ctx, info) => {
-  const { data: ctxData, fragmentDefinitions, languageCode, restClient } = ctx;
+  const { data: ctxData, languageCode, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawEpisode;
   const { episodeNumber, id, seasonNumber } = getTvIdSeasonAndEpisode(obj, args);
@@ -39,7 +39,7 @@ export const resolveEpisode = buildObjArgsResolver<
     };
   }
 
-  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse, fragmentDefinitions);
+  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
   const { data, errors, headers } = await restClient.episode<EnrichedRawEpisodeWithAppendToResponse>(
     {

package/src/queries/movie.test.ts

@@ -1,5 +1,5 @@
 import { type PlainArray } from '@graphql-box/core';
-import { getChildFields, getOperationDefinitions } from '@graphql-box/helpers';
+import { getOperationDefinitions } from '@graphql-box/helpers';
 import { jest } from '@jest/globals';
 import { MOVIE_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
 import { movieDetails as movieDetailsQuery } from '@tmdb-graphql-api/test-utils/requests/queries/movie/details.ts';
@@ -11,6 +11,7 @@ import { type GraphQLResolveInfo, OperationTypeNode, parse } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
 import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
+import { getChildField } from '../__testUtils__/helpers/getChildField.ts';
 import { MOVIE } from '../constants.ts';
 import { type Context } from '../types.ts';
 import { resolveMovie } from './movie.ts';
@@ -44,14 +45,14 @@ describe('resolveMovie >', () => {
 
   it('should return the correct movie details', async () => {
     const operationDefinition = getOperationDefinitions(parse(movieDetailsQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: MOVIE })![0]!;
+    const fieldNode = getChildField(operationDefinition, [MOVIE]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
     await expect(resolveMovie(undefined, { id: String(id) }, context, info)).resolves.toMatchSnapshot();
   });
 
   it('should request the correct resources when append to response fields are found', async () => {
     const operationDefinition = getOperationDefinitions(parse(movieDetailsLgQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: MOVIE })![0]!;
+    const fieldNode = getChildField(operationDefinition, [MOVIE]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     const movieFetchMock = jest

package/src/queries/movie.ts

@@ -51,7 +51,7 @@ export const resolveMovie = buildObjArgsResolver<
   | (RawMovieWithAppendToResponse & { __headers?: Headers })
   | RawMovieWithAppendToResponse[keyof RawMovieWithAppendToResponse]
 >(MOVIE, async (obj, args, ctx, info) => {
-  const { data: ctxData, fragmentDefinitions, languageCode, restClient } = ctx;
+  const { data: ctxData, languageCode, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawMovie;
 
@@ -63,7 +63,7 @@ export const resolveMovie = buildObjArgsResolver<
   }
 
   const id = obj ? obj.id : args.id;
-  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse, fragmentDefinitions);
+  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
   const { data, errors, headers } = await restClient.movie<RawMovieWithAppendToResponse>(
     {

package/src/queries/person.test.ts

@@ -1,5 +1,5 @@
 import { type PlainArray } from '@graphql-box/core';
-import { getChildFields, getOperationDefinitions } from '@graphql-box/helpers';
+import { getOperationDefinitions } from '@graphql-box/helpers';
 import { jest } from '@jest/globals';
 import { PERSON_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
 import { personDetails as personDetailsQuery } from '@tmdb-graphql-api/test-utils/requests/queries/person/details.ts';
@@ -11,6 +11,7 @@ import { type GraphQLResolveInfo, OperationTypeNode, parse } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
 import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
+import { getChildField } from '../__testUtils__/helpers/getChildField.ts';
 import { PERSON } from '../constants.ts';
 import { type Context } from '../types.ts';
 import { resolvePerson } from './person.ts';
@@ -44,14 +45,14 @@ describe('resolvePerson >', () => {
 
   it('should return the correct person details', async () => {
     const operationDefinition = getOperationDefinitions(parse(personDetailsQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: PERSON })![0]!;
+    const fieldNode = getChildField(operationDefinition, [PERSON]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
     await expect(resolvePerson(undefined, { id: String(id) }, context, info)).resolves.toMatchSnapshot();
   });
 
   it('should request the correct resources when append to response fields are found', async () => {
     const operationDefinition = getOperationDefinitions(parse(personDetailsLgQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: PERSON })![0]!;
+    const fieldNode = getChildField(operationDefinition, [PERSON]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     const personFetchMock = jest

package/src/queries/person.ts

@@ -31,7 +31,7 @@ export const resolvePerson = buildObjArgsResolver<
   | (RawPersonWithAppendToResponse & { __headers?: Headers })
   | RawPersonWithAppendToResponse[keyof RawPersonWithAppendToResponse]
 >(PERSON, async (obj, args, ctx, info) => {
-  const { data: ctxData, fragmentDefinitions, languageCode, restClient } = ctx;
+  const { data: ctxData, languageCode, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawPerson;
 
@@ -43,7 +43,7 @@ export const resolvePerson = buildObjArgsResolver<
   }
 
   const id = obj ? obj.id : args.id;
-  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse, fragmentDefinitions);
+  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
   const { data, errors, headers } = await restClient.person<RawPersonWithAppendToResponse>(
     {

package/src/queries/season.test.ts

@@ -1,5 +1,5 @@
 import { type PlainArray } from '@graphql-box/core';
-import { getChildFields, getOperationDefinitions } from '@graphql-box/helpers';
+import { getOperationDefinitions } from '@graphql-box/helpers';
 import { jest } from '@jest/globals';
 import { SEASON_PATH, type ShortcutMethodNames } from '@tmdb-graphql-api/rest-client';
 import { seasonDetails as seasonDetailsQuery } from '@tmdb-graphql-api/test-utils/requests/queries/season/details.ts';
@@ -11,6 +11,7 @@ import { type GraphQLResolveInfo, OperationTypeNode, parse } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
 import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
+import { getChildField } from '../__testUtils__/helpers/getChildField.ts';
 import { SEASON } from '../constants.ts';
 import { encodeId } from '../helpers/encodeId.ts';
 import { type Context } from '../types.ts';
@@ -45,7 +46,7 @@ describe('resolveSeason >', () => {
 
   it('should return the correct season details', async () => {
     const operationDefinition = getOperationDefinitions(parse(seasonDetailsQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: SEASON })![0]!;
+    const fieldNode = getChildField(operationDefinition, [SEASON]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     await expect(
@@ -55,7 +56,7 @@ describe('resolveSeason >', () => {
 
   it('should request the correct resources when append to response fields are found', async () => {
     const operationDefinition = getOperationDefinitions(parse(seasonDetailsLgQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: SEASON })![0]!;
+    const fieldNode = getChildField(operationDefinition, [SEASON]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     const seasonFetchMock = jest

package/src/queries/season.ts

@@ -34,7 +34,7 @@ export const resolveSeason = buildObjArgsResolver<
   | (EnrichedRawSeasonWithAppendToResponse & { __headers?: Headers })
   | EnrichedRawSeasonWithAppendToResponse[keyof EnrichedRawSeasonWithAppendToResponse]
 >(SEASON, async (obj, args, ctx, info) => {
-  const { data: ctxData, fragmentDefinitions, languageCode, restClient } = ctx;
+  const { data: ctxData, languageCode, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawSeason;
   const { id, seasonNumber } = getTvIdSeasonAndEpisode(obj, args);
@@ -46,7 +46,7 @@ export const resolveSeason = buildObjArgsResolver<
     };
   }
 
-  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse, fragmentDefinitions);
+  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
   const { data, errors, headers } = await restClient.season<EnrichedRawSeasonWithAppendToResponse>(
     {

package/src/queries/tv.test.ts

@@ -1,5 +1,5 @@
 import { type PlainArray } from '@graphql-box/core';
-import { getChildFields, getOperationDefinitions } from '@graphql-box/helpers';
+import { getOperationDefinitions } from '@graphql-box/helpers';
 import { jest } from '@jest/globals';
 import { type ShortcutMethodNames, TV_PATH } from '@tmdb-graphql-api/rest-client';
 import { tvDetails as tvDetailsQuery } from '@tmdb-graphql-api/test-utils/requests/queries/tv/details.ts';
@@ -11,6 +11,7 @@ import { type GraphQLResolveInfo, OperationTypeNode, parse } from 'graphql';
 import { buildEndpoint } from '../__testUtils__/helpers/buildEndpoint.ts';
 import { createMockLogger } from '../__testUtils__/helpers/createMockLogger.ts';
 import { createRestClient } from '../__testUtils__/helpers/createRestClient.ts';
+import { getChildField } from '../__testUtils__/helpers/getChildField.ts';
 import { TV } from '../constants.ts';
 import { type Context } from '../types.ts';
 import { resolveTv } from './tv.ts';
@@ -44,14 +45,14 @@ describe('resolveTv >', () => {
 
   it('should return the correct tv details', async () => {
     const operationDefinition = getOperationDefinitions(parse(tvDetailsQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: TV })![0]!;
+    const fieldNode = getChildField(operationDefinition, [TV]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
     await expect(resolveTv(undefined, { id: String(id) }, context, info)).resolves.toMatchSnapshot();
   });
 
   it('should request the correct resources when append to response fields are found', async () => {
     const operationDefinition = getOperationDefinitions(parse(tvDetailsLgQuery()), OperationTypeNode.QUERY)[0]!;
-    const { fieldNode } = getChildFields(operationDefinition, { name: TV })![0]!;
+    const fieldNode = getChildField(operationDefinition, [TV]);
     const info = { fieldNodes: [fieldNode] } as unknown as GraphQLResolveInfo;
 
     const tvFetchMock = jest

package/src/queries/tv.ts

@@ -52,7 +52,7 @@ export const resolveTv = buildObjArgsResolver<
   QueryTvArgs,
   (RawTvWithAppendToResponse & { __headers?: Headers }) | RawTvWithAppendToResponse[keyof RawTvWithAppendToResponse]
 >(TV, async (obj, args, ctx, info) => {
-  const { data: ctxData, fragmentDefinitions, languageCode, restClient } = ctx;
+  const { data: ctxData, languageCode, restClient } = ctx;
   const { fieldName, fieldNodes } = info;
   const typedFieldName = snakeCase(fieldName) as keyof RawTv;
 
@@ -64,7 +64,7 @@ export const resolveTv = buildObjArgsResolver<
   }
 
   const id = obj ? obj.id : args.id;
-  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse, fragmentDefinitions);
+  const appendToResponseKeys = getAppendToResponseKeys(fieldNodes[0]!, appendToResponse);
 
   const { data, errors, headers } = await restClient.tv<RawTvWithAppendToResponse>(
     {