Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/execution/Executor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ export class Executor<
this.promiseAll = promiseAll;
}

executeQueryOrMutationOrSubscriptionEvent(): PromiseOrValue<
executeRootSelectionSet(): PromiseOrValue<
ExecutionResult | TAlternativeInitialResponse
> {
const externalAbortSignal = this.validatedExecutionArgs.externalAbortSignal;
Expand Down
26 changes: 10 additions & 16 deletions src/execution/execute.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function execute(args: ExecutionArgs): PromiseOrValue<ExecutionResult> {
return { errors: validatedExecutionArgs };
}

return executeQueryOrMutationOrSubscriptionEvent(validatedExecutionArgs);
return executeRootSelectionSet(validatedExecutionArgs);
}

/**
Expand All @@ -109,9 +109,7 @@ export function experimentalExecuteIncrementally(
return { errors: validatedExecutionArgs };
}

return experimentalExecuteQueryOrMutationOrSubscriptionEvent(
validatedExecutionArgs,
);
return experimentalExecuteRootSelectionSet(validatedExecutionArgs);
}

export function executeIgnoringIncremental(
Expand All @@ -126,9 +124,7 @@ export function executeIgnoringIncremental(
return { errors: validatedExecutionArgs };
}

return executeQueryOrMutationOrSubscriptionEventIgnoringIncremental(
validatedExecutionArgs,
);
return executeRootSelectionSetIgnoringIncremental(validatedExecutionArgs);
}

/**
Expand All @@ -146,28 +142,26 @@ export function executeIgnoringIncremental(
* at which point we still log the error and null the parent field, which
* in this case is the entire response.
*/
export function executeQueryOrMutationOrSubscriptionEvent(
export function executeRootSelectionSet(
validatedExecutionArgs: ValidatedExecutionArgs,
): PromiseOrValue<ExecutionResult> {
return new ExecutorThrowingOnIncremental(
validatedExecutionArgs,
).executeQueryOrMutationOrSubscriptionEvent();
).executeRootSelectionSet();
}

export function experimentalExecuteQueryOrMutationOrSubscriptionEvent(
export function experimentalExecuteRootSelectionSet(
validatedExecutionArgs: ValidatedExecutionArgs,
): PromiseOrValue<ExecutionResult | ExperimentalIncrementalExecutionResults> {
return new IncrementalExecutor(
validatedExecutionArgs,
).executeQueryOrMutationOrSubscriptionEvent();
).executeRootSelectionSet();
}

export function executeQueryOrMutationOrSubscriptionEventIgnoringIncremental(
export function executeRootSelectionSetIgnoringIncremental(
validatedExecutionArgs: ValidatedExecutionArgs,
): PromiseOrValue<ExecutionResult | ExperimentalIncrementalExecutionResults> {
return new Executor(
validatedExecutionArgs,
).executeQueryOrMutationOrSubscriptionEvent();
return new Executor(validatedExecutionArgs).executeRootSelectionSet();
}

/**
Expand All @@ -189,7 +183,7 @@ export function executeSync(args: ExecutionArgs): ExecutionResult {
export function executeSubscriptionEvent(
validatedExecutionArgs: ValidatedSubscriptionArgs,
): PromiseOrValue<ExecutionResult> {
return executeQueryOrMutationOrSubscriptionEvent(validatedExecutionArgs);
return executeRootSelectionSet(validatedExecutionArgs);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/execution/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ export { pathToArray as responsePathAsArray } from '../jsutils/Path.js';
export {
createSourceEventStream,
execute,
executeQueryOrMutationOrSubscriptionEvent,
executeRootSelectionSet,
executeSubscriptionEvent,
executeSync,
experimentalExecuteIncrementally,
experimentalExecuteQueryOrMutationOrSubscriptionEvent,
experimentalExecuteRootSelectionSet,
defaultFieldResolver,
defaultTypeResolver,
subscribe,
Expand Down
8 changes: 3 additions & 5 deletions src/execution/legacyIncremental/legacyExecuteIncrementally.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,15 @@ export function legacyExecuteIncrementally(
return { errors: validatedExecutionArgs };
}

return legacyExecuteQueryOrMutationOrSubscriptionEvent(
validatedExecutionArgs,
);
return legacyExecuteRootSelectionSet(validatedExecutionArgs);
}

export function legacyExecuteQueryOrMutationOrSubscriptionEvent(
export function legacyExecuteRootSelectionSet(
validatedExecutionArgs: ValidatedExecutionArgs,
): PromiseOrValue<
ExecutionResult | LegacyExperimentalIncrementalExecutionResults
> {
return new BranchingIncrementalExecutor(
validatedExecutionArgs,
).executeQueryOrMutationOrSubscriptionEvent();
).executeRootSelectionSet();
}
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,10 +360,10 @@ export type {
export {
AbortedGraphQLExecutionError,
execute,
executeQueryOrMutationOrSubscriptionEvent,
executeRootSelectionSet,
executeSubscriptionEvent,
experimentalExecuteIncrementally,
experimentalExecuteQueryOrMutationOrSubscriptionEvent,
experimentalExecuteRootSelectionSet,
executeSync,
defaultFieldResolver,
defaultTypeResolver,
Expand Down
Loading