Skip to content

Commit eea1a8e

Browse files
committed
rename from isTrivialResolver => isDefaultResolver
1 parent 13ccd02 commit eea1a8e

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

integrationTests/diagnostics/test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ function runResolveCase() {
205205
parentType: msg.parentType,
206206
fieldType: msg.fieldType,
207207
fieldPath: msg.fieldPath,
208-
isTrivialResolver: msg.isTrivialResolver,
208+
isDefaultResolver: msg.isDefaultResolver,
209209
}),
210210
end: () => events.push({ kind: 'end' }),
211211
asyncStart: () => events.push({ kind: 'asyncStart' }),
@@ -228,7 +228,7 @@ function runResolveCase() {
228228
assert.equal(hello.parentType, 'Query');
229229
assert.equal(hello.fieldType, 'String');
230230
// buildSchema never attaches field.resolve; all fields report as trivial.
231-
assert.equal(hello.isTrivialResolver, true);
231+
assert.equal(hello.isDefaultResolver, true);
232232
} finally {
233233
channel.unsubscribe(handler);
234234
}

src/execution/Executor.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1429,15 +1429,15 @@ function toNodes(fieldDetailsList: FieldDetailsList): ReadonlyArray<FieldNode> {
14291429
function buildResolveCtx(
14301430
info: GraphQLResolveInfo,
14311431
args: { readonly [argument: string]: unknown },
1432-
isTrivialResolver: boolean,
1432+
isDefaultResolver: boolean,
14331433
): object {
14341434
let cachedFieldPath: string | undefined;
14351435
return {
14361436
fieldName: info.fieldName,
14371437
parentType: info.parentType.name,
14381438
fieldType: String(info.returnType),
14391439
args,
1440-
isTrivialResolver,
1440+
isDefaultResolver,
14411441
get fieldPath() {
14421442
cachedFieldPath ??= pathToArray(info.path).join('.');
14431443
return cachedFieldPath;
@@ -1457,11 +1457,11 @@ function invokeResolverWithTracing(
14571457
args: { readonly [argument: string]: unknown },
14581458
contextValue: unknown,
14591459
info: GraphQLResolveInfo,
1460-
isTrivialResolver: boolean,
1460+
isDefaultResolver: boolean,
14611461
): PromiseOrValue<unknown> {
14621462
return traceMixed(
14631463
tracingChannel,
1464-
buildResolveCtx(info, args, isTrivialResolver),
1464+
buildResolveCtx(info, args, isDefaultResolver),
14651465
() => resolveFn(source, args, contextValue, info),
14661466
);
14671467
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ describe('resolve diagnostics channel', () => {
116116
);
117117
});
118118

119-
it('reports isTrivialResolver based on field.resolve presence', () => {
119+
it('reports isDefaultResolver based on field.resolve presence', () => {
120120
const trivialSchema = new GraphQLSchema({
121121
query: new GraphQLObjectType({
122122
name: 'Query',
@@ -141,7 +141,7 @@ describe('resolve diagnostics channel', () => {
141141

142142
const starts = active.events.filter((e) => e.kind === 'start');
143143
const byField = new Map(
144-
starts.map((e) => [e.ctx.fieldName, e.ctx.isTrivialResolver]),
144+
starts.map((e) => [e.ctx.fieldName, e.ctx.isDefaultResolver]),
145145
);
146146
expect(byField.get('trivial')).to.equal(true);
147147
expect(byField.get('custom')).to.equal(false);

0 commit comments

Comments
 (0)