Skip to content

Commit 567cad8

Browse files
Add deprecations to query/mutation/subscription result types (#12751)
* Add doc block for data property * Add InteropApolloQueryResult type * Use InteropApolloQueryResult * Future tense * Add InteropMutateResult * Add InteropSubscribeResult type * Update deprecation message * Add warning for partialRefetch on watchQuery * Remove unused import * Rerun api report * Warn if using standby fetch policy with client.query * Remove unused import * Update size limits * Add changesets --------- Co-authored-by: Lenz Weber-Tronic <[email protected]>
1 parent 96000b2 commit 567cad8

20 files changed

+1248
-186
lines changed

.api-reports/api-report-core.api.md

Lines changed: 75 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ export class ApolloClient<TCacheShape> implements DataProxy {
127127
//
128128
// (undocumented)
129129
localState: LocalState<TCacheShape>;
130-
mutate<TData = any, TVariables extends OperationVariables = OperationVariables, TContext extends Record<string, any> = DefaultContext, TCache extends ApolloCache<any> = ApolloCache<any>>(options: MutationOptions<TData, TVariables, TContext>): Promise<FetchResult<MaybeMasked<TData>>>;
130+
mutate<TData = any, TVariables extends OperationVariables = OperationVariables, TContext extends Record<string, any> = DefaultContext, TCache extends ApolloCache<any> = ApolloCache<any>>(options: MutationOptions<TData, TVariables, TContext>): Promise<InteropMutateResult<MaybeMasked<TData>>>;
131131
onClearStore(cb: () => Promise<any>): () => void;
132132
onResetStore(cb: () => Promise<any>): () => void;
133133
get prioritizeCacheValues(): boolean;
134134
set prioritizeCacheValues(value: boolean);
135-
query<T = any, TVariables extends OperationVariables = OperationVariables>(options: QueryOptions<TVariables, T>): Promise<ApolloQueryResult<MaybeMasked<T>>>;
135+
query<T = any, TVariables extends OperationVariables = OperationVariables>(options: QueryOptions<TVariables, T>): Promise<InteropApolloQueryResult<MaybeMasked<T>>>;
136136
// (undocumented)
137137
queryDeduplication: boolean;
138138
readFragment<T = any, TVariables = OperationVariables>(options: DataProxy.Fragment<TVariables, T>, optimistic?: boolean): Unmasked<T> | null;
@@ -147,7 +147,7 @@ export class ApolloClient<TCacheShape> implements DataProxy {
147147
// @deprecated
148148
setResolvers(resolvers: Resolvers | Resolvers[]): void;
149149
stop(): void;
150-
subscribe<T = any, TVariables extends OperationVariables = OperationVariables>(options: SubscriptionOptions<TVariables, T>): Observable<FetchResult<MaybeMasked<T>>>;
150+
subscribe<T = any, TVariables extends OperationVariables = OperationVariables>(options: SubscriptionOptions<TVariables, T>): Observable<InteropSubscribeResult<MaybeMasked<T>>>;
151151
// (undocumented)
152152
readonly typeDefs: ApolloClientOptions<TCacheShape>["typeDefs"];
153153
// (undocumented)
@@ -279,7 +279,6 @@ export interface ApolloPayloadResult<TData = Record<string, any>, TExtensions =
279279

280280
// @public (undocumented)
281281
export interface ApolloQueryResult<T> {
282-
// (undocumented)
283282
data: T;
284283
error?: ApolloError;
285284
errors?: ReadonlyArray<GraphQLFormattedError>;
@@ -1259,6 +1258,71 @@ export type InternalRefetchQueriesResult<TResult> = TResult extends boolean ? Pr
12591258
// @public (undocumented)
12601259
export type InternalRefetchQueryDescriptor = RefetchQueryDescriptor | QueryOptions;
12611260

1261+
// @public @deprecated (undocumented)
1262+
export interface InteropApolloQueryResult<T> {
1263+
data: T;
1264+
error?: ApolloError;
1265+
// @deprecated (undocumented)
1266+
errors?: ReadonlyArray<GraphQLFormattedError>;
1267+
// @deprecated (undocumented)
1268+
loading: boolean;
1269+
// @deprecated (undocumented)
1270+
networkStatus: NetworkStatus;
1271+
// @deprecated (undocumented)
1272+
partial?: boolean;
1273+
}
1274+
1275+
// @public @deprecated (undocumented)
1276+
export type InteropExecutionPatchResult<TData = Record<string, any>, TExtensions = Record<string, any>> = InteropMutationExecutionPatchInitialResult<TData, TExtensions> | InteropMutationExecutionPatchIncrementalResult<TData, TExtensions>;
1277+
1278+
// Warning: (ae-forgotten-export) The symbol "InteropSingleExecutionResult" needs to be exported by the entry point index.d.ts
1279+
//
1280+
// @public @deprecated (undocumented)
1281+
export type InteropMutateResult<TData = Record<string, any>, TContext = DefaultContext, TExtensions = Record<string, any>> = InteropSingleExecutionResult<TData, TContext, TExtensions> | InteropExecutionPatchResult<TData, TExtensions>;
1282+
1283+
// @public @deprecated (undocumented)
1284+
export interface InteropMutationExecutionPatchIncrementalResult<TData = Record<string, any>, TExtensions = Record<string, any>> {
1285+
// (undocumented)
1286+
data?: never;
1287+
// @deprecated (undocumented)
1288+
errors?: never;
1289+
// (undocumented)
1290+
extensions?: never;
1291+
// @deprecated (undocumented)
1292+
hasNext?: boolean;
1293+
// @deprecated (undocumented)
1294+
incremental?: IncrementalPayload<TData, TExtensions>[];
1295+
}
1296+
1297+
// @public @deprecated (undocumented)
1298+
export interface InteropMutationExecutionPatchInitialResult<TData = Record<string, any>, TExtensions = Record<string, any>> {
1299+
// (undocumented)
1300+
data: TData | null | undefined;
1301+
// @deprecated (undocumented)
1302+
errors?: ReadonlyArray<GraphQLFormattedError>;
1303+
// (undocumented)
1304+
extensions?: TExtensions;
1305+
// @deprecated (undocumented)
1306+
hasNext?: boolean;
1307+
// @deprecated (undocumented)
1308+
incremental?: never;
1309+
}
1310+
1311+
// @public @deprecated (undocumented)
1312+
interface InteropSingleExecutionResult<TData = Record<string, any>, TContext = DefaultContext, TExtensions = Record<string, any>> {
1313+
// @deprecated (undocumented)
1314+
context?: TContext;
1315+
// (undocumented)
1316+
data?: TData | null;
1317+
// @deprecated (undocumented)
1318+
errors?: ReadonlyArray<GraphQLFormattedError>;
1319+
// (undocumented)
1320+
extensions?: TExtensions;
1321+
}
1322+
1323+
// @public @deprecated (undocumented)
1324+
export type InteropSubscribeResult<TData = Record<string, any>, TContext = DefaultContext, TExtensions = Record<string, any>> = InteropSingleExecutionResult<TData, TContext, TExtensions> | InteropExecutionPatchResult<TData, TExtensions>;
1325+
12621326
// @public (undocumented)
12631327
interface InvalidateModifier {
12641328
// (undocumented)
@@ -1700,7 +1764,7 @@ export class ObservableQuery<TData = any, TVariables extends OperationVariables
17001764
fetchMoreResult: Unmasked<TFetchData>;
17011765
variables: TFetchVars;
17021766
}) => Unmasked<TData>;
1703-
}): Promise<ApolloQueryResult<MaybeMasked<TFetchData>>>;
1767+
}): Promise<InteropApolloQueryResult<MaybeMasked<TFetchData>>>;
17041768
// (undocumented)
17051769
getCurrentResult(saveAsLastResult?: boolean): ApolloQueryResult<MaybeMasked<TData>>;
17061770
// (undocumented)
@@ -1721,9 +1785,9 @@ export class ObservableQuery<TData = any, TVariables extends OperationVariables
17211785
readonly queryId: string;
17221786
// (undocumented)
17231787
readonly queryName?: string;
1724-
refetch(variables?: Partial<TVariables>): Promise<ApolloQueryResult<MaybeMasked<TData>>>;
1788+
refetch(variables?: Partial<TVariables>): Promise<InteropApolloQueryResult<MaybeMasked<TData>>>;
17251789
// (undocumented)
1726-
reobserve(newOptions?: Partial<WatchQueryOptions<TVariables, TData>>, newNetworkStatus?: NetworkStatus): Promise<ApolloQueryResult<MaybeMasked<TData>>>;
1790+
reobserve(newOptions?: Partial<WatchQueryOptions<TVariables, TData>>, newNetworkStatus?: NetworkStatus): Promise<InteropApolloQueryResult<MaybeMasked<TData>>>;
17271791
// Warning: (ae-forgotten-export) The symbol "Concast" needs to be exported by the entry point index.d.ts
17281792
//
17291793
// (undocumented)
@@ -1745,8 +1809,8 @@ export class ObservableQuery<TData = any, TVariables extends OperationVariables
17451809
// @internal (undocumented)
17461810
protected scheduleNotify(): void;
17471811
// (undocumented)
1748-
setOptions(newOptions: Partial<WatchQueryOptions<TVariables, TData>>): Promise<ApolloQueryResult<MaybeMasked<TData>>>;
1749-
setVariables(variables: TVariables): Promise<ApolloQueryResult<MaybeMasked<TData>> | void>;
1812+
setOptions(newOptions: Partial<WatchQueryOptions<TVariables, TData>>): Promise<InteropApolloQueryResult<MaybeMasked<TData>>>;
1813+
setVariables(variables: TVariables): Promise<InteropApolloQueryResult<MaybeMasked<TData>> | void>;
17501814
// (undocumented)
17511815
silentSetOptions(newOptions: Partial<WatchQueryOptions<TVariables, TData>>): void;
17521816
startPolling(pollInterval: number): void;
@@ -2547,8 +2611,8 @@ interface WriteContext extends ReadMergeModifyContext {
25472611
// src/cache/inmemory/policies.ts:162:3 - (ae-forgotten-export) The symbol "KeySpecifier" needs to be exported by the entry point index.d.ts
25482612
// src/cache/inmemory/policies.ts:162:3 - (ae-forgotten-export) The symbol "KeyArgsFunction" needs to be exported by the entry point index.d.ts
25492613
// src/cache/inmemory/types.ts:139:3 - (ae-forgotten-export) The symbol "KeyFieldsFunction" needs to be exported by the entry point index.d.ts
2550-
// src/core/ObservableQuery.ts:129:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
2551-
// src/core/ObservableQuery.ts:130:5 - (ae-forgotten-export) The symbol "QueryInfo" needs to be exported by the entry point index.d.ts
2614+
// src/core/ObservableQuery.ts:130:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
2615+
// src/core/ObservableQuery.ts:131:5 - (ae-forgotten-export) The symbol "QueryInfo" needs to be exported by the entry point index.d.ts
25522616
// src/core/QueryManager.ts:160:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
25532617
// src/core/QueryManager.ts:415:7 - (ae-forgotten-export) The symbol "UpdateQueries" needs to be exported by the entry point index.d.ts
25542618
// src/link/http/selectHttpOptionsAndBody.ts:128:32 - (ae-forgotten-export) The symbol "HttpQueryOptions" needs to be exported by the entry point index.d.ts

0 commit comments

Comments
 (0)