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

package/core/ObservableQuery.js

@@ -5,7 +5,6 @@ import { compact, filterMap, getOperationDefinition, getQueryDefinition, prevent
 import { invariant } from "@apollo/client/utilities/invariant";
 import { equalByQuery } from "./equalByQuery.js";
 import { isNetworkRequestInFlight, NetworkStatus } from "./networkStatus.js";
-import { QueryInfo } from "./QueryInfo.js";
 const { assign, hasOwnProperty } = Object;
 const uninitialized = {
     loading: true,
@@ -346,7 +345,7 @@ export class ObservableQuery {
             const queryDef = getQueryDefinition(this.query);
             const vars = queryDef.variableDefinitions;
             if (!vars || !vars.some((v) => v.variable.name.value === "variables")) {
-                __DEV__ && invariant.warn(77, variables, queryDef.name?.value || queryDef);
+                __DEV__ && invariant.warn(78, variables, queryDef.name?.value || queryDef);
             }
         }
         if (variables && !equal(this.variables, variables)) {
@@ -395,7 +394,7 @@ export class ObservableQuery {
         const updateQuery = fetchMoreOptions?.updateQuery;
         const isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            invariant(updateQuery, 78);
+            invariant(updateQuery, 79);
         }
         const { finalize, pushNotification } = this.pushOperation(NetworkStatus.fetchMore);
         pushNotification({
@@ -528,7 +527,7 @@ export class ObservableQuery {
                         onError(error);
                     }
                     else {
-                        __DEV__ && invariant.error(79, error);
+                        __DEV__ && invariant.error(80, error);
                     }
                     return;
                 }
@@ -667,10 +666,6 @@ export class ObservableQuery {
         // TODO Make sure we update the networkStatus (and infer fetchVariables)
         // before actually committing to the fetch.
         const initialFetchPolicy = this.options.fetchPolicy;
-        const queryInfo = new QueryInfo({
-            queryManager: this.queryManager,
-            observableQuery: this,
-        });
         options.context ??= {};
         let synchronouslyEmitted = false;
         const onCacheHit = () => {
@@ -716,7 +711,13 @@ export class ObservableQuery {
                 }
             }
         });
-        let { observable, fromLink } = this.queryManager.fetchObservableWithInfo(queryInfo, options, { networkStatus, query: fetchQuery, onCacheHit, fetchQueryOperator });
+        let { observable, fromLink } = this.queryManager.fetchObservableWithInfo(options, {
+            networkStatus,
+            query: fetchQuery,
+            onCacheHit,
+            fetchQueryOperator,
+            observableQuery: this,
+        });
         // track query and variables from the start of the operation
         const { query, variables } = this;
         const operation = {
@@ -772,7 +773,7 @@ export class ObservableQuery {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        invariant(pollInterval, 80);
+        invariant(pollInterval, 81);
         const info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         const maybeFetch = () => {
@@ -1108,6 +1109,9 @@ export class ObservableQuery {
         };
     }
     calculateNetworkStatus(baseNetworkStatus) {
+        if (baseNetworkStatus === NetworkStatus.streaming) {
+            return baseNetworkStatus;
+        }
         // in the future, this could be more complex logic, e.g. "refetch" and
         // "fetchMore" having priority over "polling" or "loading" network statuses
         // as for now we just take the "latest" operation that is still active,
@@ -1255,7 +1259,7 @@ export class ObservableQuery {
 }
 export function logMissingFieldErrors(missing) {
     if (__DEV__ && missing) {
-        __DEV__ && invariant.debug(81, missing);
+        __DEV__ && invariant.debug(82, missing);
     }
 }
 function isEqualQuery(a, b) {