Skip to content

Commit 747c01c

Browse files
committed
drop ExecutionPatchResult since it's not official or really used
1 parent 595189c commit 747c01c

File tree

5 files changed

+19
-58
lines changed

5 files changed

+19
-58
lines changed

.changeset/popular-jobs-deliver.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'graphql-ws': patch
3+
---
4+
5+
Drop `ExecutionPatchResult` and `FormattedExecutionPatchResult` types
6+
7+
Neither of the types are officially supported (yet) and the future versions of graphql-js adding support for stream/defer will a different signature for the incremental execution result.

src/client.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
ConnectionAckMessage,
1010
ConnectionInitMessage,
1111
Disposable,
12-
FormattedExecutionPatchResult,
1312
FormattedExecutionResult,
1413
GRAPHQL_TRANSPORT_WS_PROTOCOL,
1514
ID,
@@ -422,21 +421,15 @@ export interface Client extends Disposable {
422421
*/
423422
subscribe<Data = Record<string, unknown>, Extensions = unknown>(
424423
payload: SubscribePayload,
425-
sink: Sink<
426-
| FormattedExecutionResult<Data, Extensions>
427-
| FormattedExecutionPatchResult<Data, Extensions>
428-
>,
424+
sink: Sink<FormattedExecutionResult<Data, Extensions>>,
429425
): () => void;
430426
/**
431427
* Subscribes and iterates over emitted results from the WebSocket
432428
* through the returned async iterator.
433429
*/
434430
iterate<Data = Record<string, unknown>, Extensions = unknown>(
435431
payload: SubscribePayload,
436-
): AsyncIterableIterator<
437-
| FormattedExecutionResult<Data, Extensions>
438-
| FormattedExecutionPatchResult<Data, Extensions>
439-
>;
432+
): AsyncIterableIterator<FormattedExecutionResult<Data, Extensions>>;
440433
/**
441434
* Terminates the WebSocket abruptly and immediately.
442435
*

src/common.ts

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,6 @@ export interface ExecutionResult<
145145
extensions?: Extensions | undefined;
146146
}
147147

148-
/** @category Common */
149-
export interface ExecutionPatchResult<
150-
Data = unknown,
151-
Extensions = Record<string, unknown>,
152-
> {
153-
errors?: ReadonlyArray<GraphQLError> | undefined;
154-
data?: Data | null | undefined;
155-
path?: ReadonlyArray<string | number> | undefined;
156-
label?: string | undefined;
157-
hasNext: boolean;
158-
extensions?: Extensions | undefined;
159-
}
160-
161148
/** @category Common */
162149
export interface FormattedExecutionResult<
163150
Data = Record<string, unknown>,
@@ -169,24 +156,11 @@ export interface FormattedExecutionResult<
169156
extensions?: Extensions | undefined;
170157
}
171158

172-
/** @category Common */
173-
export interface FormattedExecutionPatchResult<
174-
Data = unknown,
175-
Extensions = Record<string, unknown>,
176-
> {
177-
errors?: ReadonlyArray<GraphQLFormattedError> | undefined;
178-
data?: Data | null | undefined;
179-
path?: ReadonlyArray<string | number> | undefined;
180-
label?: string | undefined;
181-
hasNext: boolean;
182-
extensions?: Extensions | undefined;
183-
}
184-
185159
/** @category Common */
186160
export interface NextMessage {
187161
readonly id: ID;
188162
readonly type: MessageType.Next;
189-
readonly payload: FormattedExecutionResult | FormattedExecutionPatchResult;
163+
readonly payload: FormattedExecutionResult;
190164
}
191165

192166
/** @category Common */

src/server.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ import {
2121
import {
2222
CloseCode,
2323
ConnectionInitMessage,
24-
ExecutionPatchResult,
2524
ExecutionResult,
26-
FormattedExecutionPatchResult,
2725
GRAPHQL_TRANSPORT_WS_PROTOCOL,
2826
ID,
2927
JSONMessageReplacer,
@@ -42,12 +40,12 @@ import { isAsyncGenerator, isAsyncIterable, isObject } from './utils';
4240
/** @category Server */
4341
export type OperationResult =
4442
| Promise<
45-
| AsyncGenerator<ExecutionResult | ExecutionPatchResult>
46-
| AsyncIterable<ExecutionResult | ExecutionPatchResult>
43+
| AsyncGenerator<ExecutionResult>
44+
| AsyncIterable<ExecutionResult>
4745
| ExecutionResult
4846
>
49-
| AsyncGenerator<ExecutionResult | ExecutionPatchResult>
50-
| AsyncIterable<ExecutionResult | ExecutionPatchResult>
47+
| AsyncGenerator<ExecutionResult>
48+
| AsyncIterable<ExecutionResult>
5149
| ExecutionResult;
5250

5351
/**
@@ -384,13 +382,10 @@ export interface ServerOptions<
384382
id: string,
385383
payload: SubscribePayload,
386384
args: ExecutionArgs,
387-
result: ExecutionResult | ExecutionPatchResult,
385+
result: ExecutionResult,
388386
) =>
389-
| Promise<
390-
FormattedExecutionResult | FormattedExecutionPatchResult | void
391-
>
387+
| Promise<FormattedExecutionResult | void>
392388
| FormattedExecutionResult
393-
| FormattedExecutionPatchResult
394389
| void);
395390
/**
396391
* The complete callback is executed after the
@@ -698,7 +693,7 @@ export function makeServer<
698693

699694
const emit = {
700695
next: async (
701-
result: ExecutionResult | ExecutionPatchResult,
696+
result: ExecutionResult,
702697
{ id, payload }: SubscribeMessage,
703698
args: ExecutionArgs,
704699
) => {

tests/client.test.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
} from '../src/client';
1212
import {
1313
CloseCode,
14-
FormattedExecutionPatchResult,
1514
FormattedExecutionResult,
1615
MessageType,
1716
parseMessage,
@@ -47,11 +46,7 @@ function noop(): void {
4746

4847
interface TSubscribe<T> {
4948
waitForNext: (
50-
test?: (
51-
value:
52-
| FormattedExecutionResult<T, unknown>
53-
| FormattedExecutionPatchResult<T, unknown>,
54-
) => void,
49+
test?: (value: FormattedExecutionResult<T, unknown>) => void,
5550
expire?: number,
5651
) => Promise<void>;
5752
waitForError: (
@@ -67,10 +62,7 @@ function tsubscribe<T = unknown>(
6762
payload: SubscribePayload,
6863
): TSubscribe<T> {
6964
const emitter = new EventEmitter();
70-
const results: (
71-
| FormattedExecutionResult<T, unknown>
72-
| FormattedExecutionPatchResult<T, unknown>
73-
)[] = [];
65+
const results: FormattedExecutionResult<T, unknown>[] = [];
7466
let error: unknown,
7567
completed = false;
7668
const dispose = client.subscribe<T>(payload, {

0 commit comments

Comments
 (0)