diff --git a/.api-reports/api-report-core.api.md b/.api-reports/api-report-core.api.md index ff04f3d158e..df88556aeb9 100644 --- a/.api-reports/api-report-core.api.md +++ b/.api-reports/api-report-core.api.md @@ -1029,8 +1029,6 @@ class QueryManager { }): ObservableAndInfo; // (undocumented) fetchQuery(options: ApolloClient.WatchQueryOptions, networkStatus?: NetworkStatus): Promise>; - // (undocumented) - generateRequestId(): number; // Warning: (ae-forgotten-export) The symbol "TransformCacheEntry" needs to be exported by the entry point index.d.ts // // (undocumented) diff --git a/.api-reports/api-report.api.md b/.api-reports/api-report.api.md index 30fe49a5ef4..cdc55f65707 100644 --- a/.api-reports/api-report.api.md +++ b/.api-reports/api-report.api.md @@ -2443,8 +2443,6 @@ class QueryManager { }): ObservableAndInfo; // (undocumented) fetchQuery(options: ApolloClient.WatchQueryOptions, networkStatus?: NetworkStatus): Promise>; - // (undocumented) - generateRequestId(): number; // Warning: (ae-forgotten-export) The symbol "TransformCacheEntry" needs to be exported by the entry point index.d.ts // // (undocumented) diff --git a/.changeset/hip-clocks-exercise.md b/.changeset/hip-clocks-exercise.md new file mode 100644 index 00000000000..9762a854d5f --- /dev/null +++ b/.changeset/hip-clocks-exercise.md @@ -0,0 +1,5 @@ +--- +"@apollo/client": patch +--- + +Cleanup some unused internals. Please file an issue if you notice anything change. diff --git a/src/core/QueryInfo.ts b/src/core/QueryInfo.ts index 02c04e5553a..c395d0f89ee 100644 --- a/src/core/QueryInfo.ts +++ b/src/core/QueryInfo.ts @@ -98,9 +98,6 @@ export class QueryInfo< TVariables extends OperationVariables = OperationVariables, TCache extends ApolloCache = ApolloCache, > { - // TODO remove soon - this should be able to be handled by cancelling old operations before starting new ones - lastRequestId = 1; - private cache: TCache; private queryManager: Pick< QueryManager, diff --git a/src/core/QueryManager.ts b/src/core/QueryManager.ts index 06f31042838..d1e33eae6d3 100644 --- a/src/core/QueryManager.ts +++ b/src/core/QueryManager.ts @@ -618,11 +618,6 @@ export class QueryManager { })); } - private requestIdCounter = 1; - public generateRequestId() { - return this.requestIdCounter++; - } - public clearStore( options: Cache.ResetOptions = { discardWatches: true, @@ -1053,7 +1048,6 @@ export class QueryManager { exposeExtensions?: boolean; } ): Observable> { - const requestId = (queryInfo.lastRequestId = this.generateRequestId()); const { errorPolicy } = options; // Performing transformForLink here gives this.cache a chance to fill in @@ -1107,10 +1101,6 @@ export class QueryManager { aqr[extensionsSymbol] = result.extensions; } - // In the case we start multiple network requests simultaneously, we - // want to ensure we properly set `data` if we're reporting on an old - // result which will not be caught by the conditional above that ends up - // throwing the markError result. if (hasErrors) { if (errorPolicy === "none") { aqr.data = void 0 as TData; @@ -1129,8 +1119,7 @@ export class QueryManager { return aqr; }), catchError((error) => { - // Avoid storing errors from older interrupted queries. - if (requestId >= queryInfo.lastRequestId && errorPolicy === "none") { + if (errorPolicy === "none") { queryInfo.resetLastWrite(); observableQuery?.["resetNotifications"](); throw error;