Skip to content

Commit 4fbfd22

Browse files
committed
Follow up: improve legibility of graphql/execute fns
1 parent fee8abb commit 4fbfd22

File tree

2 files changed

+18
-22
lines changed

2 files changed

+18
-22
lines changed

src/execution/execute.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,20 +149,18 @@ export function execute(
149149
fieldResolver
150150
) {
151151
// Extract arguments from object args if provided.
152-
const args = arguments.length === 1 ? argsOrSchema : undefined;
153-
const schema = args ? args.schema : argsOrSchema;
154-
return args ?
152+
return arguments.length === 1 ?
155153
executeImpl(
156-
schema,
157-
args.document,
158-
args.rootValue,
159-
args.contextValue,
160-
args.variableValues,
161-
args.operationName,
162-
args.fieldResolver
154+
argsOrSchema.schema,
155+
argsOrSchema.document,
156+
argsOrSchema.rootValue,
157+
argsOrSchema.contextValue,
158+
argsOrSchema.variableValues,
159+
argsOrSchema.operationName,
160+
argsOrSchema.fieldResolver
163161
) :
164162
executeImpl(
165-
schema,
163+
argsOrSchema,
166164
document,
167165
rootValue,
168166
contextValue,

src/graphql.js

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,18 @@ export function graphql(
7575
fieldResolver
7676
) {
7777
// Extract arguments from object args if provided.
78-
const args = arguments.length === 1 ? argsOrSchema : undefined;
79-
const schema = args ? args.schema : argsOrSchema;
80-
return args ?
78+
return arguments.length === 1 ?
8179
graphqlImpl(
82-
schema,
83-
args.source,
84-
args.rootValue,
85-
args.contextValue,
86-
args.variableValues,
87-
args.operationName,
88-
args.fieldResolver
80+
argsOrSchema.schema,
81+
argsOrSchema.source,
82+
argsOrSchema.rootValue,
83+
argsOrSchema.contextValue,
84+
argsOrSchema.variableValues,
85+
argsOrSchema.operationName,
86+
argsOrSchema.fieldResolver
8987
) :
9088
graphqlImpl(
91-
schema,
89+
argsOrSchema,
9290
source,
9391
rootValue,
9492
contextValue,

0 commit comments

Comments
 (0)