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

package/__cjs/cache/inmemory/readFromStore.cjs

@@ -198,7 +198,7 @@ class StoreReader {
             else {
                 const fragment = (0, internal_1.getFragmentFromSelection)(selection, context.lookupFragment);
                 if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                    throw (0, invariant_1.newInvariantError)(103, selection.name.value);
+                    throw (0, invariant_1.newInvariantError)(102, selection.name.value);
                 }
                 if (fragment && policies.fragmentMatches(fragment, typename)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
@@ -282,7 +282,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
             if ((0, internal_1.isNonNullObject)(value)) {
                 (0, invariant_1.invariant)(
                     !(0, utilities_1.isReference)(value),
-                    104,
+                    103,
                     (0, helpers_js_1.getTypenameFromStoreObject)(store, value),
                     field.name.value
                 );

package/__cjs/cache/inmemory/writeToStore.cjs

@@ -73,7 +73,7 @@ class StoreWriter {
             context,
         });
         if (!(0, utilities_1.isReference)(ref)) {
-            throw (0, invariant_1.newInvariantError)(105, result);
+            throw (0, invariant_1.newInvariantError)(104, result);
         }
         // So far, the store has not been modified, so now it's time to process
         // context.incomingById and merge those incoming fields into context.store.
@@ -223,7 +223,7 @@ class StoreWriter {
                 // provide a default value, so its absence from the written data should
                 // not be cause for alarm.
                 !policies.getReadFunction(typename, field.name.value)) {
-                __DEV__ && invariant_1.invariant.error(106, (0, internal_1.resultKeyNameFromField)(field), result);
+                __DEV__ && invariant_1.invariant.error(105, (0, internal_1.resultKeyNameFromField)(field), result);
             }
         });
         // Identify the result object, even if dataId was already provided,
@@ -370,7 +370,7 @@ class StoreWriter {
                 else {
                     const fragment = (0, internal_1.getFragmentFromSelection)(selection, context.lookupFragment);
                     if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
-                        throw (0, invariant_1.newInvariantError)(107, selection.name.value);
+                        throw (0, invariant_1.newInvariantError)(106, selection.name.value);
                     }
                     if (fragment &&
                         policies.fragmentMatches(fragment, typename, result, context.variables)) {
@@ -543,7 +543,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && invariant_1.invariant.warn(108, fieldName, parentType, childTypenames.length ?
+    __DEV__ && invariant_1.invariant.warn(107, fieldName, parentType, childTypenames.length ?
         "either ensure all objects of type " +
             childTypenames.join(" and ") +
             " have an ID or a custom merge function, or "

package/__cjs/core/ApolloClient.cjs

@@ -76,8 +76,8 @@ class ApolloClient {
      */
     constructor(options) {
         if (environment_1.__DEV__) {
-            (0, invariant_1.invariant)(options.cache, 67);
-            (0, invariant_1.invariant)(options.link, 68);
+            (0, invariant_1.invariant)(options.cache, 66);
+            (0, invariant_1.invariant)(options.link, 67);
         }
         const { cache, documentTransform, ssrMode = false, ssrForceFetchDelay = 0, 
         // Expose the client instance as window.__APOLLO_CLIENT__ and call
@@ -239,13 +239,13 @@ class ApolloClient {
             options = (0, internal_1.mergeOptions)(this.defaultOptions.query, options);
         }
         if (environment_1.__DEV__) {
-            (0, invariant_1.invariant)(options.fetchPolicy !== "cache-and-network", 69);
-            (0, invariant_1.invariant)(options.fetchPolicy !== "standby", 70);
-            (0, invariant_1.invariant)(options.query, 71);
-            (0, invariant_1.invariant)(options.query.kind === "Document", 72);
-            (0, invariant_1.invariant)(!options.returnPartialData, 73);
-            (0, invariant_1.invariant)(!options.pollInterval, 74);
-            (0, invariant_1.invariant)(!options.notifyOnNetworkStatusChange, 75);
+            (0, invariant_1.invariant)(options.fetchPolicy !== "cache-and-network", 68);
+            (0, invariant_1.invariant)(options.fetchPolicy !== "standby", 69);
+            (0, invariant_1.invariant)(options.query, 70);
+            (0, invariant_1.invariant)(options.query.kind === "Document", 71);
+            (0, invariant_1.invariant)(!options.returnPartialData, 72);
+            (0, invariant_1.invariant)(!options.pollInterval, 73);
+            (0, invariant_1.invariant)(!options.notifyOnNetworkStatusChange, 74);
             (0, internal_1.checkDocument)(options.query, graphql_1.OperationTypeNode.QUERY);
         }
         return this.queryManager.query(options);
@@ -469,7 +469,7 @@ class ApolloClient {
         // result.queries and result.results instead, you shouldn't have to worry
         // about preventing uncaught rejections for the Promise.all result.
         result.catch((error) => {
-            __DEV__ && invariant_1.invariant.debug(76, error);
+            __DEV__ && invariant_1.invariant.debug(75, error);
         });
         return result;
     }

package/__cjs/core/ObservableQuery.cjs

@@ -13,7 +13,6 @@ const internal_1 = require("@apollo/client/utilities/internal");
 const invariant_1 = require("@apollo/client/utilities/invariant");
 const equalByQuery_js_1 = require("./equalByQuery.cjs");
 const networkStatus_js_1 = require("./networkStatus.cjs");
-const QueryInfo_js_1 = require("./QueryInfo.cjs");
 const { assign, hasOwnProperty } = Object;
 const uninitialized = {
     loading: true,
@@ -354,7 +353,7 @@ class ObservableQuery {
             const queryDef = (0, internal_1.getQueryDefinition)(this.query);
             const vars = queryDef.variableDefinitions;
             if (!vars || !vars.some((v) => v.variable.name.value === "variables")) {
-                __DEV__ && invariant_1.invariant.warn(77, variables, queryDef.name?.value || queryDef);
+                __DEV__ && invariant_1.invariant.warn(76, variables, queryDef.name?.value || queryDef);
             }
         }
         if (variables && !(0, equality_1.equal)(this.variables, variables)) {
@@ -403,7 +402,7 @@ class ObservableQuery {
         const updateQuery = fetchMoreOptions?.updateQuery;
         const isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            (0, invariant_1.invariant)(updateQuery, 78);
+            (0, invariant_1.invariant)(updateQuery, 77);
         }
         const { finalize, pushNotification } = this.pushOperation(networkStatus_js_1.NetworkStatus.fetchMore);
         pushNotification({
@@ -536,7 +535,7 @@ class ObservableQuery {
                         onError(error);
                     }
                     else {
-                        __DEV__ && invariant_1.invariant.error(79, error);
+                        __DEV__ && invariant_1.invariant.error(78, error);
                     }
                     return;
                 }
@@ -675,10 +674,6 @@ 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_js_1.QueryInfo({
-            queryManager: this.queryManager,
-            observableQuery: this,
-        });
         options.context ??= {};
         let synchronouslyEmitted = false;
         const onCacheHit = () => {
@@ -724,7 +719,13 @@ 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 = {
@@ -780,7 +781,7 @@ class ObservableQuery {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        (0, invariant_1.invariant)(pollInterval, 80);
+        (0, invariant_1.invariant)(pollInterval, 79);
         const info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         const maybeFetch = () => {
@@ -1116,6 +1117,9 @@ class ObservableQuery {
         };
     }
     calculateNetworkStatus(baseNetworkStatus) {
+        if (baseNetworkStatus === networkStatus_js_1.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,
@@ -1264,7 +1268,7 @@ class ObservableQuery {
 exports.ObservableQuery = ObservableQuery;
 function logMissingFieldErrors(missing) {
     if (environment_1.__DEV__ && missing) {
-        __DEV__ && invariant_1.invariant.debug(81, missing);
+        __DEV__ && invariant_1.invariant.debug(80, missing);
     }
 }
 function isEqualQuery(a, b) {