Skip to content

Commit 26c1d78

Browse files
committed
incremental: add id
1 parent d1d66a3 commit 26c1d78

File tree

4 files changed

+250
-246
lines changed

4 files changed

+250
-246
lines changed

src/execution/IncrementalPublisher.ts

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ export interface IncrementalDeferResult<
100100
> {
101101
errors?: ReadonlyArray<GraphQLError>;
102102
data: TData;
103-
path: ReadonlyArray<string | number>;
103+
id: string;
104+
subPath?: ReadonlyArray<string | number>;
104105
extensions?: TExtensions;
105106
}
106107

@@ -110,7 +111,8 @@ export interface FormattedIncrementalDeferResult<
110111
> {
111112
errors?: ReadonlyArray<GraphQLFormattedError>;
112113
data: TData;
113-
path: ReadonlyArray<string | number>;
114+
id: string;
115+
subPath?: ReadonlyArray<string | number>;
114116
extensions?: TExtensions;
115117
}
116118

@@ -120,7 +122,8 @@ export interface IncrementalStreamResult<
120122
> {
121123
errors?: ReadonlyArray<GraphQLError>;
122124
items: TData;
123-
path: ReadonlyArray<string | number>;
125+
id: string;
126+
subPath?: ReadonlyArray<string | number>;
124127
extensions?: TExtensions;
125128
}
126129

@@ -130,7 +133,8 @@ export interface FormattedIncrementalStreamResult<
130133
> {
131134
errors?: ReadonlyArray<GraphQLFormattedError>;
132135
items: TData;
133-
path: ReadonlyArray<string | number>;
136+
id: string;
137+
subPath?: ReadonlyArray<string | number>;
134138
extensions?: TExtensions;
135139
}
136140

@@ -146,13 +150,13 @@ export type FormattedIncrementalResult<
146150
| FormattedIncrementalStreamResult<TData, TExtensions>;
147151

148152
export interface PendingResult {
153+
id: string;
149154
path: ReadonlyArray<string | number>;
150155
label?: string;
151156
}
152157

153158
export interface CompletedResult {
154-
path: ReadonlyArray<string | number>;
155-
label?: string;
159+
id: string;
156160
errors?: ReadonlyArray<GraphQLError>;
157161
}
158162

@@ -178,6 +182,7 @@ export interface FormattedCompletedResult {
178182
* @internal
179183
*/
180184
export class IncrementalPublisher {
185+
private _nextId = 0;
181186
private _released: Set<SubsequentResultRecord>;
182187
private _pending: Set<SubsequentResultRecord>;
183188

@@ -372,7 +377,10 @@ export class IncrementalPublisher {
372377
const pendingResults: Array<PendingResult> = [];
373378
for (const pendingSource of pendingSources) {
374379
pendingSource.pendingSent = true;
380+
const id = this._getNextId();
381+
pendingSource.id = id;
375382
const pendingResult: PendingResult = {
383+
id,
376384
path: pendingSource.path,
377385
};
378386
if (pendingSource.label !== undefined) {
@@ -383,6 +391,10 @@ export class IncrementalPublisher {
383391
return pendingResults;
384392
}
385393

394+
private _getNextId(): string {
395+
return String(this._nextId++);
396+
}
397+
386398
private _subscribe(): AsyncGenerator<
387399
SubsequentIncrementalExecutionResult,
388400
void,
@@ -596,11 +608,9 @@ export class IncrementalPublisher {
596608
completedRecord: DeferredFragmentRecord | StreamRecord,
597609
): CompletedResult {
598610
const result: CompletedResult = {
599-
path: completedRecord.path,
611+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
612+
id: completedRecord.id!,
600613
};
601-
if (completedRecord.label !== undefined) {
602-
result.label = completedRecord.label;
603-
}
604614
if (completedRecord.errors.length > 0) {
605615
result.errors = completedRecord.errors;
606616
}
@@ -736,6 +746,7 @@ export class DeferredGroupedFieldSetRecord {
736746
export class DeferredFragmentRecord {
737747
path: ReadonlyArray<string | number>;
738748
label: string | undefined;
749+
id: string | undefined;
739750
children: Set<SubsequentResultRecord>;
740751
deferredGroupedFieldSetRecords: Set<DeferredGroupedFieldSetRecord>;
741752
errors: Array<GraphQLError>;
@@ -758,6 +769,7 @@ export class DeferredFragmentRecord {
758769
export class StreamRecord {
759770
label: string | undefined;
760771
path: ReadonlyArray<string | number>;
772+
id: string | undefined;
761773
errors: Array<GraphQLError>;
762774
earlyReturn?: (() => Promise<unknown>) | undefined;
763775
pendingSent?: boolean;

0 commit comments

Comments
 (0)