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

package/cache/inmemory/readFromStore.js

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

package/cache/inmemory/writeToStore.js

@@ -66,7 +66,7 @@ export class StoreWriter {
             context,
         });
         if (!isReference(ref)) {
-            throw newInvariantError(105, result);
+            throw 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.
@@ -216,7 +216,7 @@ export 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.error(106, resultKeyNameFromField(field), result);
+                __DEV__ && invariant.error(105, resultKeyNameFromField(field), result);
             }
         });
         // Identify the result object, even if dataId was already provided,
@@ -363,7 +363,7 @@ export class StoreWriter {
                 else {
                     const fragment = getFragmentFromSelection(selection, context.lookupFragment);
                     if (!fragment && selection.kind === Kind.FRAGMENT_SPREAD) {
-                        throw newInvariantError(107, selection.name.value);
+                        throw newInvariantError(106, selection.name.value);
                     }
                     if (fragment &&
                         policies.fragmentMatches(fragment, typename, result, context.variables)) {
@@ -535,7 +535,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && invariant.warn(108, fieldName, parentType, childTypenames.length ?
+    __DEV__ && 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/core/ApolloClient.js

@@ -69,8 +69,8 @@ export class ApolloClient {
      */
     constructor(options) {
         if (__DEV__) {
-            invariant(options.cache, 67);
-            invariant(options.link, 68);
+            invariant(options.cache, 66);
+            invariant(options.link, 67);
         }
         const { cache, documentTransform, ssrMode = false, ssrForceFetchDelay = 0, 
         // Expose the client instance as window.__APOLLO_CLIENT__ and call
@@ -232,13 +232,13 @@ export class ApolloClient {
             options = mergeOptions(this.defaultOptions.query, options);
         }
         if (__DEV__) {
-            invariant(options.fetchPolicy !== "cache-and-network", 69);
-            invariant(options.fetchPolicy !== "standby", 70);
-            invariant(options.query, 71);
-            invariant(options.query.kind === "Document", 72);
-            invariant(!options.returnPartialData, 73);
-            invariant(!options.pollInterval, 74);
-            invariant(!options.notifyOnNetworkStatusChange, 75);
+            invariant(options.fetchPolicy !== "cache-and-network", 68);
+            invariant(options.fetchPolicy !== "standby", 69);
+            invariant(options.query, 70);
+            invariant(options.query.kind === "Document", 71);
+            invariant(!options.returnPartialData, 72);
+            invariant(!options.pollInterval, 73);
+            invariant(!options.notifyOnNetworkStatusChange, 74);
             checkDocument(options.query, OperationTypeNode.QUERY);
         }
         return this.queryManager.query(options);
@@ -462,7 +462,7 @@ export 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.debug(76, error);
+            __DEV__ && invariant.debug(75, error);
         });
         return result;
     }

package/core/ObservableQuery.d.ts

@@ -4,7 +4,6 @@ import { Observable } from "rxjs";
 import type { Cache, MissingFieldError } from "@apollo/client/cache";
 import type { MissingTree } from "@apollo/client/cache";
 import type { MaybeMasked, Unmasked } from "@apollo/client/masking";
-import type { LastWrite } from "./QueryInfo.js";
 import type { QueryManager } from "./QueryManager.js";
 import type { ApolloQueryResult, DefaultContext, OperationVariables, QueryResult, TypedDocumentNode } from "./types.js";
 import type { ErrorPolicy, FetchMoreQueryOptions, NextFetchPolicyContext, RefetchWritePolicy, SubscribeToMoreOptions, UpdateQueryMapFn, WatchQueryFetchPolicy, WatchQueryOptions } from "./watchQueryOptions.js";
@@ -177,7 +176,7 @@ export declare class ObservableQuery<TData = unknown, TVariables extends Operati
     * 
     * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
     */
-    _lastWrite?: LastWrite;
+    _lastWrite?: unknown;
     get query(): TypedDocumentNode<TData, TVariables>;
     /**
      * An object containing the variables that were provided for the query.

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(76, 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, 77);
         }
         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(78, 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, 79);
         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(80, missing);
     }
 }
 function isEqualQuery(a, b) {