@apollo/client 4.0.11 → 4.0.12-beta.0

package/core/QueryManager.js

@@ -9,7 +9,7 @@ import { execute } from "@apollo/client/link";
 import { maskFragment, maskOperation } from "@apollo/client/masking";
 import { cacheSizes, DocumentTransform, isNetworkRequestInFlight, print, } from "@apollo/client/utilities";
 import { __DEV__ } from "@apollo/client/utilities/environment";
-import { AutoCleanedWeakCache, checkDocument, filterMap, getDefaultValues, getOperationDefinition, getOperationName, graphQLResultHasError, hasDirectives, hasForcedResolvers, isDocumentNode, isNonNullObject, makeUniqueId, removeDirectivesFromDocument, toQueryResult, } from "@apollo/client/utilities/internal";
+import { AutoCleanedWeakCache, checkDocument, extensionsSymbol, filterMap, getDefaultValues, getOperationDefinition, getOperationName, graphQLResultHasError, hasDirectives, hasForcedResolvers, isDocumentNode, isNonNullObject, makeUniqueId, removeDirectivesFromDocument, streamDetailsSymbol, toQueryResult, } from "@apollo/client/utilities/internal";
 import { invariant, newInvariantError, } from "@apollo/client/utilities/invariant";
 import { NetworkStatus } from "./networkStatus.js";
 import { logMissingFieldErrors, ObservableQuery } from "./ObservableQuery.js";
@@ -92,7 +92,7 @@ export class QueryManager {
      */
     stop() {
         this.obsQueries.forEach((oq) => oq.stop());
-        this.cancelPendingFetches(newInvariantError(84));
+        this.cancelPendingFetches(newInvariantError(87));
     }
     cancelPendingFetches(error) {
         this.fetchCancelFns.forEach((cancel) => cancel(error));
@@ -105,7 +105,7 @@ export class QueryManager {
         variables = this.getVariables(mutation, variables);
         if (hasClientExports) {
             if (__DEV__) {
-                invariant(this.localState, 85, getOperationName(mutation, "(anonymous)"));
+                invariant(this.localState, 88, getOperationName(mutation, "(anonymous)"));
             }
             variables = await this.localState.getExportedVariables({
                 client: this.client,
@@ -140,7 +140,7 @@ export class QueryManager {
             return this.getObservableFromLink(mutation, {
                 ...context,
                 optimisticResponse: isOptimistic ? optimisticResponse : void 0,
-            }, variables, {}, false)
+            }, variables, fetchPolicy, {}, false)
                 .observable.pipe(validateDidEmitValue(), mergeMap((result) => {
                 const storeResult = { ...result };
                 return from(queryInfo.markMutationResult(storeResult, {
@@ -163,7 +163,7 @@ export class QueryManager {
                 .pipe(map((storeResult) => {
                 const hasErrors = graphQLResultHasError(storeResult);
                 if (hasErrors && errorPolicy === "none") {
-                    throw new CombinedGraphQLErrors(storeResult);
+                    throw new CombinedGraphQLErrors(removeStreamDetailsFromExtensions(storeResult));
                 }
                 if (mutationStoreValue) {
                     mutationStoreValue.loading = false;
@@ -342,7 +342,7 @@ export class QueryManager {
         // depend on values that previously existed in the data portion of the
         // store. So, we cancel the promises and observers that we have issued
         // so far and not yet resolved (in the case of queries).
-        this.cancelPendingFetches(newInvariantError(86));
+        this.cancelPendingFetches(newInvariantError(89));
         this.obsQueries.forEach((observableQuery) => {
             // Set loading to true so listeners don't trigger unless they want
             // results with partial data.
@@ -412,10 +412,10 @@ export class QueryManager {
                 if (!included) {
                     const queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        __DEV__ && invariant.warn(87, queryName);
+                        __DEV__ && invariant.warn(90, queryName);
                     }
                     else {
-                        __DEV__ && invariant.warn(88);
+                        __DEV__ && invariant.warn(91);
                     }
                 }
             });
@@ -436,7 +436,7 @@ export class QueryManager {
     }
     startGraphQLSubscription(options) {
         let { query, variables } = options;
-        const { fetchPolicy, errorPolicy = "none", context = {}, extensions = {}, } = options;
+        const { fetchPolicy = "cache-first", errorPolicy = "none", context = {}, extensions = {}, } = options;
         checkDocument(query, OperationTypeNode.SUBSCRIPTION);
         query = this.transform(query);
         variables = this.getVariables(query, variables);
@@ -444,7 +444,7 @@ export class QueryManager {
         if (__DEV__) {
             invariant(
                 !this.getDocumentInfo(query).hasClientExports || this.localState,
-                89,
+                92,
                 getOperationName(query, "(anonymous)")
             );
         }
@@ -456,7 +456,7 @@ export class QueryManager {
                 context,
             }))
             : of(variables)).pipe(mergeMap((variables) => {
-            const { observable, restart: res } = this.getObservableFromLink(query, context, variables, extensions);
+            const { observable, restart: res } = this.getObservableFromLink(query, context, variables, fetchPolicy, extensions);
             const queryInfo = new QueryInfo(this);
             restart = res;
             return observable.pipe(map((rawResult) => {
@@ -509,7 +509,7 @@ export class QueryManager {
     // Use protected instead of private field so
     // @apollo/experimental-nextjs-app-support can access type info.
     inFlightLinkObservables = new Trie(false);
-    getObservableFromLink(query, context, variables, extensions, 
+    getObservableFromLink(query, context, variables, fetchPolicy, extensions, 
     // Prefer context.queryDeduplication if specified.
     deduplication = context?.queryDeduplication ??
         this.queryDeduplication) {
@@ -588,14 +588,14 @@ export class QueryManager {
             if (__DEV__) {
                 invariant(
                     this.localState,
-                    90,
+                    93,
                     operation[0].toUpperCase() + operation.slice(1),
                     operationName ?? "(anonymous)"
                 );
             }
             invariant(
                 !hasIncrementalDirective,
-                91,
+                94,
                 operation[0].toUpperCase() + operation.slice(1),
                 operationName ?? "(anonymous)"
             );
@@ -606,6 +606,7 @@ export class QueryManager {
                     remoteResult: result,
                     context,
                     variables,
+                    fetchPolicy,
                 }));
             }));
         }
@@ -618,14 +619,14 @@ export class QueryManager {
             })),
         };
     }
-    getResultsFromLink(options, { queryInfo, cacheWriteBehavior, observableQuery, }) {
+    getResultsFromLink(options, { queryInfo, cacheWriteBehavior, observableQuery, exposeExtensions, }) {
         const requestId = (queryInfo.lastRequestId = this.generateRequestId());
         const { errorPolicy } = options;
         // Performing transformForLink here gives this.cache a chance to fill in
         // missing fragment definitions (for example) before sending this document
         // through the link chain.
         const linkDocument = this.cache.transformForLink(options.query);
-        return this.getObservableFromLink(linkDocument, options.context, options.variables).observable.pipe(map((incoming) => {
+        return this.getObservableFromLink(linkDocument, options.context, options.variables, options.fetchPolicy).observable.pipe(map((incoming) => {
             // Use linkDocument rather than queryInfo.document so the
             // operation/fragments used to write the result are the same as the
             // ones used to obtain it from the link.
@@ -638,7 +639,7 @@ export class QueryManager {
             if (hasErrors && errorPolicy === "none") {
                 queryInfo.resetLastWrite();
                 observableQuery?.["resetNotifications"]();
-                throw new CombinedGraphQLErrors(result);
+                throw new CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
             }
             const aqr = {
                 data: result.data,
@@ -656,6 +657,9 @@ export class QueryManager {
                         partial: !result.data,
                     }),
             };
+            if (exposeExtensions && "extensions" in result) {
+                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
@@ -666,7 +670,7 @@ export class QueryManager {
                     aqr.dataState = "empty";
                 }
                 if (errorPolicy !== "ignore") {
-                    aqr.error = new CombinedGraphQLErrors(result);
+                    aqr.error = new CombinedGraphQLErrors(removeStreamDetailsFromExtensions(result));
                     if (aqr.dataState !== "streaming") {
                         aqr.networkStatus = NetworkStatus.error;
                     }
@@ -698,7 +702,7 @@ export class QueryManager {
     // The initial networkStatus for this fetch, most often
     // NetworkStatus.loading, but also possibly fetchMore, poll, refetch,
     // or setVariables.
-    networkStatus = NetworkStatus.loading, query = options.query, fetchQueryOperator = (x) => x, onCacheHit = () => { }, observableQuery, }) {
+    networkStatus = NetworkStatus.loading, query = options.query, fetchQueryOperator = (x) => x, onCacheHit = () => { }, observableQuery, exposeExtensions, }) {
         const variables = this.getVariables(query, options.variables);
         const defaults = this.defaultOptions.watchQuery;
         let { fetchPolicy = (defaults && defaults.fetchPolicy) || "cache-first", errorPolicy = (defaults && defaults.errorPolicy) || "none", returnPartialData = false, notifyOnNetworkStatusChange = true, context = {}, } = options;
@@ -728,7 +732,13 @@ export class QueryManager {
                     normalized.refetchWritePolicy !== "merge") ?
                     1 /* CacheWriteBehavior.OVERWRITE */
                     : 2 /* CacheWriteBehavior.MERGE */;
-            const observableWithInfo = this.fetchQueryByPolicy(normalized, { queryInfo, cacheWriteBehavior, onCacheHit, observableQuery });
+            const observableWithInfo = this.fetchQueryByPolicy(normalized, {
+                queryInfo,
+                cacheWriteBehavior,
+                onCacheHit,
+                observableQuery,
+                exposeExtensions,
+            });
             observableWithInfo.observable =
                 observableWithInfo.observable.pipe(fetchQueryOperator);
             if (
@@ -762,7 +772,7 @@ export class QueryManager {
         // we deprecated and removed LocalState.
         if (this.getDocumentInfo(normalized.query).hasClientExports) {
             if (__DEV__) {
-                invariant(this.localState, 92, getOperationName(normalized.query, "(anonymous)"));
+                invariant(this.localState, 95, getOperationName(normalized.query, "(anonymous)"));
             }
             observable = from(this.localState.getExportedVariables({
                 client: this.client,
@@ -935,7 +945,7 @@ export class QueryManager {
                 !isFullyUnmaskedOperation(document) &&
                 !this.noCacheWarningsByCause.has(cause)) {
                 this.noCacheWarningsByCause.add(cause);
-                __DEV__ && invariant.warn(93, getOperationName(document, `Unnamed ${operationType ?? "operation"}`));
+                __DEV__ && invariant.warn(96, getOperationName(document, `Unnamed ${operationType ?? "operation"}`));
             }
         }
         return (this.dataMasking ?
@@ -948,7 +958,7 @@ export class QueryManager {
             maskFragment(data, fragment, this.cache, fragmentName)
             : data;
     }
-    fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, }) {
+    fetchQueryByPolicy({ query, variables, fetchPolicy, errorPolicy, returnPartialData, context, }, { cacheWriteBehavior, onCacheHit, queryInfo, observableQuery, exposeExtensions, }) {
         const readCache = () => this.cache.diff({
             query,
             variables,
@@ -993,7 +1003,7 @@ export class QueryManager {
             (diff.complete || returnPartialData) &&
                 this.getDocumentInfo(query).hasForcedResolvers) {
                 if (__DEV__) {
-                    invariant(this.localState, 94, getOperationName(query, "(anonymous)"));
+                    invariant(this.localState, 97, getOperationName(query, "(anonymous)"));
                 }
                 onCacheHit();
                 return from(this.localState.execute({
@@ -1004,6 +1014,7 @@ export class QueryManager {
                     variables,
                     onlyRunForcedResolvers: true,
                     returnPartialData: true,
+                    fetchPolicy,
                 }).then((resolved) => ({
                     kind: "N",
                     value: toResult(resolved.data || void 0),
@@ -1031,6 +1042,7 @@ export class QueryManager {
             cacheWriteBehavior,
             queryInfo,
             observableQuery,
+            exposeExtensions,
         }).pipe(validateDidEmitValue(), materialize(), map((result) => ({
             ...result,
             source: "network",
@@ -1084,7 +1096,7 @@ function validateDidEmitValue() {
             didEmitValue = true;
         },
         complete() {
-            invariant(didEmitValue, 95);
+            invariant(didEmitValue, 98);
         },
     });
 }
@@ -1123,4 +1135,14 @@ function addNonReactiveToNamedFragments(document) {
         },
     });
 }
+function removeStreamDetailsFromExtensions(original) {
+    if (original.extensions?.[streamDetailsSymbol] == null) {
+        return original;
+    }
+    const { extensions: { [streamDetailsSymbol]: _, ...extensions }, ...result } = original;
+    if (Object.keys(extensions).length > 0) {
+        result.extensions = extensions;
+    }
+    return result;
+}
 //# sourceMappingURL=QueryManager.js.map