From a134059df23691d3434e0663ce20ae41934fc161 Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Mon, 11 Oct 2021 23:51:40 +0300 Subject: [PATCH] Move deprecated `SubscriptionArgs` to 'src/subscription' --- src/execution/index.ts | 2 -- src/execution/subscribe.ts | 12 +----------- src/index.ts | 3 ++- src/subscription/index.ts | 13 +++++++++++-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/execution/index.ts b/src/execution/index.ts index 679caf4411..b5871d47c8 100644 --- a/src/execution/index.ts +++ b/src/execution/index.ts @@ -15,6 +15,4 @@ export type { export { subscribe, createSourceEventStream } from './subscribe'; -export type { SubscriptionArgs } from './subscribe'; - export { getDirectiveValues } from './values'; diff --git a/src/execution/subscribe.ts b/src/execution/subscribe.ts index 7f93d57911..e42aefb4fa 100644 --- a/src/execution/subscribe.ts +++ b/src/execution/subscribe.ts @@ -27,16 +27,6 @@ import { } from './execute'; import { mapAsyncIterator } from './mapAsyncIterator'; -/** - * @deprecated use ExecutionArgs instead. Will be removed in v17 - * - * ExecutionArgs has been broadened to include all properties - * within SubscriptionArgs. The SubscriptionArgs type is retained - * for backwards compatibility. - */ -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface SubscriptionArgs extends ExecutionArgs {} - /** * Implements the "Subscribe" algorithm described in the GraphQL specification. * @@ -59,7 +49,7 @@ export interface SubscriptionArgs extends ExecutionArgs {} * Accepts either an object with named arguments, or individual arguments. */ export async function subscribe( - args: SubscriptionArgs, + args: ExecutionArgs, ): Promise | ExecutionResult> { const { schema, diff --git a/src/index.ts b/src/index.ts index 8f8d1ccd20..32d4aa0204 100644 --- a/src/index.ts +++ b/src/index.ts @@ -320,9 +320,10 @@ export type { ExecutionArgs, ExecutionResult, FormattedExecutionResult, - SubscriptionArgs, } from './execution/index'; +export type { SubscriptionArgs } from './subscription/index'; + /** Validate GraphQL documents. */ export { validate, diff --git a/src/subscription/index.ts b/src/subscription/index.ts index 63f6666732..9de1b86968 100644 --- a/src/subscription/index.ts +++ b/src/subscription/index.ts @@ -9,6 +9,15 @@ * will be dropped entirely. */ -export { subscribe, createSourceEventStream } from '../execution/subscribe'; +import type { ExecutionArgs } from '../execution/execute'; + +/** + * @deprecated use ExecutionArgs instead. Will be removed in v17 + * + * ExecutionArgs has been broadened to include all properties within SubscriptionArgs. + * The SubscriptionArgs type is retained for backwards compatibility. + */ +// eslint-disable-next-line @typescript-eslint/no-empty-interface +export interface SubscriptionArgs extends ExecutionArgs {} -export type { SubscriptionArgs } from '../execution/subscribe'; +export { subscribe, createSourceEventStream } from '../execution/subscribe';