Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: DRY with context building and *Impl functions #3656

Closed
wants to merge 1 commit into from
Closed

refactor: DRY with context building and *Impl functions #3656

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 18 additions & 27 deletions src/execution/execute.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,13 @@ export interface ExecutionArgs {
* a GraphQLError will be thrown immediately explaining the invalid input.
*/
export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
return prepareContextAndRunFn(args, executeImpl);
}

function prepareContextAndRunFn<T>(
args: ExecutionArgs,
fn: (exeContext: ExecutionContext) => T,
): ExecutionResult | T {
// If a valid execution context cannot be created due to incorrect arguments,
// a "Response" with only errors is returned.
const exeContext = buildExecutionContext(args);
Expand All @@ -174,7 +181,7 @@ export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
return { errors: exeContext };
}

return executeImpl(exeContext);
return fn(exeContext);
}

function executeImpl(
Expand Down Expand Up @@ -1034,24 +1041,17 @@ export function subscribe(
): PromiseOrValue<
AsyncGenerator<ExecutionResult, void, void> | ExecutionResult
> {
// If a valid execution context cannot be created due to incorrect arguments,
// a "Response" with only errors is returned.
const exeContext = buildExecutionContext(args);
return prepareContextAndRunFn(args, (exeContext: ExecutionContext) => {
const resultOrStream = createSourceEventStreamImpl(exeContext);

// Return early errors if execution context failed.
if (!('schema' in exeContext)) {
return { errors: exeContext };
}

const resultOrStream = createSourceEventStreamImpl(exeContext);

if (isPromise(resultOrStream)) {
return resultOrStream.then((resolvedResultOrStream) =>
mapSourceToResponse(exeContext, resolvedResultOrStream),
);
}
if (isPromise(resultOrStream)) {
return resultOrStream.then((resolvedResultOrStream) =>
mapSourceToResponse(exeContext, resolvedResultOrStream),
);
}

return mapSourceToResponse(exeContext, resultOrStream);
return mapSourceToResponse(exeContext, resultOrStream);
});
}

function mapSourceToResponse(
Expand Down Expand Up @@ -1106,16 +1106,7 @@ function mapSourceToResponse(
export function createSourceEventStream(
args: ExecutionArgs,
): PromiseOrValue<AsyncIterable<unknown> | ExecutionResult> {
// If a valid execution context cannot be created due to incorrect arguments,
// a "Response" with only errors is returned.
const exeContext = buildExecutionContext(args);

// Return early errors if execution context failed.
if (!('schema' in exeContext)) {
return { errors: exeContext };
}

return createSourceEventStreamImpl(exeContext);
return prepareContextAndRunFn(args, createSourceEventStreamImpl);
}

function createSourceEventStreamImpl(
Expand Down