sugg

Co-authored-by: Copilot <copilot@github.com>

Author: yaacovCR

integrationTests/diagnostics/test.js

@@ -205,7 +205,7 @@ function runResolveCase() {
         parentType: msg.parentType,
         fieldType: msg.fieldType,
         fieldPath: msg.fieldPath,
-        isTrivialResolver: msg.isTrivialResolver,
+        usesDefaultResolver: msg.usesDefaultResolver,
       }),
     end: () => events.push({ kind: 'end' }),
     asyncStart: () => events.push({ kind: 'asyncStart' }),
@@ -228,7 +228,7 @@ function runResolveCase() {
     assert.equal(hello.parentType, 'Query');
     assert.equal(hello.fieldType, 'String');
     // buildSchema never attaches field.resolve; all fields report as trivial.
-    assert.equal(hello.isTrivialResolver, true);
+    assert.equal(hello.usesDefaultResolver, true);
   } finally {
     channel.unsubscribe(handler);
   }

src/execution/Executor.ts

@@ -626,7 +626,7 @@ export class Executor<
       // is provided to every resolve function within an execution. It is commonly
       // used to represent an authenticated user, or request-specific caches.
       const result = tracingChannel
-        ? invokeResolverWithTracing(
+        ? this.invokeResolverWithTracing(
             tracingChannel,
             resolveFn,
             source,
@@ -672,6 +672,48 @@ export class Executor<
     }
   }
 
+  invokeResolverWithTracing(
+    tracingChannel: MinimalTracingChannel,
+    resolveFn: GraphQLFieldResolver<unknown, unknown>,
+    source: unknown,
+    args: { readonly [argument: string]: unknown },
+    contextValue: unknown,
+    info: GraphQLResolveInfo,
+    isTrivialResolver: boolean,
+  ): PromiseOrValue<unknown> {
+    return traceMixed(
+      tracingChannel,
+      this.buildResolveCtx(args, info, isTrivialResolver),
+      () => resolveFn(source, args, contextValue, info),
+    );
+  }
+
+  /**
+   * Build a graphql:resolve channel context for a single field invocation.
+   *
+   * `fieldPath` is exposed as a lazy getter because serializing the response
+   * path is O(depth) and APMs that depth-filter or skip default resolvers
+   * often never read it. `args` is passed through by reference.
+   */
+  buildResolveCtx(
+    args: ObjMap<unknown>,
+    info: GraphQLResolveInfo,
+    usesDefaultResolver: boolean,
+  ): object {
+    let cachedFieldPath: string | undefined;
+    return {
+      fieldName: info.fieldName,
+      parentType: info.parentType.name,
+      fieldType: String(info.returnType),
+      args,
+      usesDefaultResolver,
+      get fieldPath() {
+        cachedFieldPath ??= pathToArray(info.path).join('.');
+        return cachedFieldPath;
+      },
+    };
+  }
+
   handleFieldError(
     rawError: unknown,
     returnType: GraphQLOutputType,
@@ -1418,50 +1460,3 @@ export class Executor<
 function toNodes(fieldDetailsList: FieldDetailsList): ReadonlyArray<FieldNode> {
   return fieldDetailsList.map((fieldDetails) => fieldDetails.node);
 }
-
-/**
- * Build a graphql:resolve channel context for a single field invocation.
- *
- * `fieldPath` is exposed as a lazy getter because serializing the response
- * path is O(depth) and APMs that depth-filter or skip trivial resolvers
- * often never read it. `args` is passed through by reference.
- */
-function buildResolveCtx(
-  info: GraphQLResolveInfo,
-  args: { readonly [argument: string]: unknown },
-  isTrivialResolver: boolean,
-): object {
-  let cachedFieldPath: string | undefined;
-  return {
-    fieldName: info.fieldName,
-    parentType: info.parentType.name,
-    fieldType: String(info.returnType),
-    args,
-    isTrivialResolver,
-    get fieldPath() {
-      cachedFieldPath ??= pathToArray(info.path).join('.');
-      return cachedFieldPath;
-    },
-  };
-}
-
-/**
- * Traced path for a single resolver call. Extracted as a module-scope function to increase likelihood of inlining.
- *
- * @internal
- */
-function invokeResolverWithTracing(
-  tracingChannel: MinimalTracingChannel,
-  resolveFn: GraphQLFieldResolver<unknown, unknown>,
-  source: unknown,
-  args: { readonly [argument: string]: unknown },
-  contextValue: unknown,
-  info: GraphQLResolveInfo,
-  isTrivialResolver: boolean,
-): PromiseOrValue<unknown> {
-  return traceMixed(
-    tracingChannel,
-    buildResolveCtx(info, args, isTrivialResolver),
-    () => resolveFn(source, args, contextValue, info),
-  );
-}

src/execution/__tests__/resolve-diagnostics-test.ts

@@ -116,7 +116,7 @@ describe('resolve diagnostics channel', () => {
     );
   });
 
-  it('reports isTrivialResolver based on field.resolve presence', () => {
+  it('reports usesDefaultResolver based on field.resolve presence', () => {
     const trivialSchema = new GraphQLSchema({
       query: new GraphQLObjectType({
         name: 'Query',
@@ -141,7 +141,7 @@ describe('resolve diagnostics channel', () => {
 
     const starts = active.events.filter((e) => e.kind === 'start');
     const byField = new Map(
-      starts.map((e) => [e.ctx.fieldName, e.ctx.isTrivialResolver]),
+      starts.map((e) => [e.ctx.fieldName, e.ctx.usesDefaultResolver]),
     );
     expect(byField.get('trivial')).to.equal(true);
     expect(byField.get('custom')).to.equal(false);