@apollo/client 4.0.0-alpha.21 → 4.0.0-alpha.22

package/core/QueryManager.d.ts

@@ -7,11 +7,11 @@ import type { FetchResult } from "@apollo/client/link";
 import type { LocalState } from "@apollo/client/local-state";
 import type { MaybeMasked } from "@apollo/client/masking";
 import { DocumentTransform } from "@apollo/client/utilities";
-import type { ApolloClient, DefaultOptions } from "./ApolloClient.js";
+import type { ApolloClient, ApolloClientOptions, DefaultOptions } from "./ApolloClient.js";
 import { NetworkStatus } from "./networkStatus.js";
 import { ObservableQuery } from "./ObservableQuery.js";
-import type { ClientAwareness, DefaultContext, InternalRefetchQueriesInclude, InternalRefetchQueriesMap, InternalRefetchQueriesOptions, MutateResult, OperationVariables, QueryNotification, QueryResult, SubscribeResult, SubscriptionObservable } from "./types.js";
-import type { MutationOptions, QueryOptions, SubscriptionOptions, WatchQueryFetchPolicy, WatchQueryOptions } from "./watchQueryOptions.js";
+import type { DefaultContext, InternalRefetchQueriesInclude, InternalRefetchQueriesMap, InternalRefetchQueriesOptions, MutateResult, OperationVariables, QueryNotification, QueryResult, SubscribeResult, SubscriptionObservable } from "./types.js";
+import type { ErrorPolicy, MutationFetchPolicy, MutationOptions, QueryOptions, SubscriptionOptions, WatchQueryFetchPolicy, WatchQueryOptions } from "./watchQueryOptions.js";
 interface MutationStoreValue {
     mutation: DocumentNode;
     variables: Record<string, any>;
@@ -28,6 +28,7 @@ interface TransformCacheEntry {
     defaultVars: OperationVariables;
     asQuery: DocumentNode;
     operationType: OperationTypeNode | undefined;
+    violation?: Error | undefined;
 }
 interface MaskFragmentOptions<TData> {
     fragment: DocumentNode;
@@ -47,12 +48,12 @@ interface MaskOperationOptions<TData> {
 }
 interface QueryManagerOptions {
     client: ApolloClient;
+    clientOptions: ApolloClientOptions;
     defaultOptions: DefaultOptions;
     documentTransform: DocumentTransform | null | undefined;
     queryDeduplication: boolean;
     onBroadcast: undefined | (() => void);
     ssrMode: boolean;
-    clientAwareness: ClientAwareness;
     assumeImmutableResults: boolean;
     defaultContext: Partial<DefaultContext> | undefined;
     dataMasking: boolean;
@@ -61,6 +62,10 @@ interface QueryManagerOptions {
 export declare class QueryManager {
     defaultOptions: DefaultOptions;
     readonly client: ApolloClient;
+    /**
+     * The options that were passed to the ApolloClient constructor.
+     */
+    readonly clientOptions: ApolloClientOptions;
     readonly assumeImmutableResults: boolean;
     readonly documentTransform: DocumentTransform;
     readonly ssrMode: boolean;
@@ -68,7 +73,6 @@ export declare class QueryManager {
     readonly dataMasking: boolean;
     localState: LocalState | undefined;
     private queryDeduplication;
-    private clientAwareness;
     /**
      * Whether to prioritize cache values over network results when
      * `fetchObservableWithInfo` is called.
@@ -98,7 +102,10 @@ export declare class QueryManager {
      */
     stop(): void;
     private cancelPendingFetches;
-    mutate<TData, TVariables extends OperationVariables, TCache extends ApolloCache>({ mutation, variables, optimisticResponse, updateQueries, refetchQueries, awaitRefetchQueries, update: updateWithProxyFn, onQueryUpdated, fetchPolicy, errorPolicy, keepRootFields, context, }: MutationOptions<TData, TVariables, TCache>): Promise<MutateResult<MaybeMasked<TData>>>;
+    mutate<TData, TVariables extends OperationVariables, TCache extends ApolloCache>({ mutation, variables, optimisticResponse, updateQueries, refetchQueries, awaitRefetchQueries, update: updateWithProxyFn, onQueryUpdated, fetchPolicy, errorPolicy, keepRootFields, context, }: MutationOptions<TData, TVariables, TCache> & {
+        errorPolicy: ErrorPolicy;
+        fetchPolicy: MutationFetchPolicy;
+    }): Promise<MutateResult<MaybeMasked<TData>>>;
     fetchQuery<TData, TVars extends OperationVariables>(options: WatchQueryOptions<TVars, TData>, networkStatus?: NetworkStatus): Promise<QueryResult<TData>>;
     transform(document: DocumentNode): DocumentNode;
     private transformCache;

package/core/QueryManager.js

@@ -17,6 +17,10 @@ import { QueryInfo } from "./QueryInfo.js";
 export class QueryManager {
     defaultOptions;
     client;
+    /**
+     * The options that were passed to the ApolloClient constructor.
+     */
+    clientOptions;
     assumeImmutableResults;
     documentTransform;
     ssrMode;
@@ -24,7 +28,6 @@ export class QueryManager {
     dataMasking;
     localState;
     queryDeduplication;
-    clientAwareness = {};
     /**
      * Whether to prioritize cache values over network results when
      * `fetchObservableWithInfo` is called.
@@ -54,7 +57,7 @@ export class QueryManager {
         this.client = options.client;
         this.defaultOptions = options.defaultOptions;
         this.queryDeduplication = options.queryDeduplication;
-        this.clientAwareness = options.clientAwareness;
+        this.clientOptions = options.clientOptions;
         this.ssrMode = options.ssrMode;
         this.assumeImmutableResults = options.assumeImmutableResults;
         this.dataMasking = options.dataMasking;
@@ -87,16 +90,13 @@ export class QueryManager {
      */
     stop() {
         this.obsQueries.forEach((oq) => oq.stop());
-        this.cancelPendingFetches(newInvariantError(81));
+        this.cancelPendingFetches(newInvariantError(83));
     }
     cancelPendingFetches(error) {
         this.fetchCancelFns.forEach((cancel) => cancel(error));
         this.fetchCancelFns.clear();
     }
-    async mutate({ mutation, variables, optimisticResponse, updateQueries, refetchQueries = [], awaitRefetchQueries = false, update: updateWithProxyFn, onQueryUpdated, fetchPolicy = this.defaultOptions.mutate?.fetchPolicy || "network-only", errorPolicy = this.defaultOptions.mutate?.errorPolicy || "none", keepRootFields, context, }) {
-        invariant(mutation, 82);
-        checkDocument(mutation, OperationTypeNode.MUTATION);
-        invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 83);
+    async mutate({ mutation, variables, optimisticResponse, updateQueries, refetchQueries = [], awaitRefetchQueries = false, update: updateWithProxyFn, onQueryUpdated, fetchPolicy, errorPolicy, keepRootFields, context, }) {
         const queryInfo = new QueryInfo(this);
         mutation = this.cache.transformForLink(this.transform(mutation));
         const { hasClientExports } = this.getDocumentInfo(mutation);
@@ -219,7 +219,10 @@ export class QueryManager {
         });
     }
     fetchQuery(options, networkStatus) {
-        return lastValueFrom(this.fetchObservableWithInfo(options, {
+        checkDocument(options.query, OperationTypeNode.QUERY);
+        // do the rest asynchronously to keep the same rejection timing as
+        // checks further in `.mutate`
+        return (async () => lastValueFrom(this.fetchObservableWithInfo(options, {
             networkStatus,
         }).observable.pipe(filterMap((value) => {
             switch (value.kind) {
@@ -234,7 +237,7 @@ export class QueryManager {
             // This default is needed when a `standby` fetch policy is used to avoid
             // an EmptyError from rejecting this promise.
             defaultValue: { data: undefined },
-        });
+        }))();
     }
     transform(document) {
         return this.documentTransform.transformDocument(document);
@@ -279,7 +282,11 @@ export class QueryManager {
             };
             transformCache.set(document, cacheEntry);
         }
-        return transformCache.get(document);
+        const entry = transformCache.get(document);
+        if (entry.violation) {
+            throw entry.violation;
+        }
+        return entry;
     }
     getVariables(document, variables) {
         const defaultVars = this.getDocumentInfo(document).defaultVars;
@@ -309,7 +316,7 @@ export class QueryManager {
         });
         return observable;
     }
-    async query(options) {
+    query(options) {
         const query = this.transform(options.query);
         return this.fetchQuery({
             ...options,
@@ -520,7 +527,6 @@ export class QueryManager {
                     ...this.defaultContext,
                     ...context,
                     queryDeduplication: deduplication,
-                    clientAwareness: this.clientAwareness,
                 },
                 extensions,
             };
@@ -1086,7 +1092,6 @@ function isFullyUnmaskedOperation(document) {
     return isUnmasked;
 }
 function addNonReactiveToNamedFragments(document) {
-    checkDocument(document);
     return visit(document, {
         FragmentSpread: (node) => {
             // Do not add `@nonreactive` if the fragment is marked with `@unmask`