@apollo/client 4.0.10 → 4.0.11

package/core/ObservableQuery.js

@@ -2,7 +2,7 @@ import { equal } from "@wry/equality";
 import { BehaviorSubject, Observable, share, Subject, tap } from "rxjs";
 import { isNetworkRequestInFlight } from "@apollo/client/utilities";
 import { __DEV__ } from "@apollo/client/utilities/environment";
-import { compact, equalByQuery, filterMap, getOperationDefinition, getOperationName, getQueryDefinition, preventUnhandledRejection, toQueryResult, } from "@apollo/client/utilities/internal";
+import { compact, equalByQuery, filterMap, getOperationDefinition, getOperationName, getQueryDefinition, preventUnhandledRejection, toQueryResult, variablesUnknownSymbol, } from "@apollo/client/utilities/internal";
 import { invariant } from "@apollo/client/utilities/invariant";
 import { NetworkStatus } from "./networkStatus.js";
 const { assign, hasOwnProperty } = Object;
@@ -23,6 +23,7 @@ const empty = {
 export class ObservableQuery {
     options;
     queryName;
+    variablesUnknown = false;
     /**
     * @internal will be read and written from `QueryInfo`
     * 
@@ -71,6 +72,10 @@ export class ObservableQuery {
         const { fetchPolicy = defaultFetchPolicy, 
         // Make sure we don't store "standby" as the initialFetchPolicy.
         initialFetchPolicy = fetchPolicy === "standby" ? defaultFetchPolicy : (fetchPolicy), } = options;
+        if (options[variablesUnknownSymbol]) {
+            invariant(fetchPolicy === "standby", 77);
+            this.variablesUnknown = true;
+        }
         this.lastQuery = transformedQuery;
         this.options = {
             ...options,
@@ -372,7 +377,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)) {
@@ -388,7 +393,7 @@ export class ObservableQuery {
     fetchMore({ query, variables, context, errorPolicy, updateQuery, }) {
         invariant(
             this.options.fetchPolicy !== "cache-only",
-            78,
+            79,
             getOperationName(this.query, "(anonymous)")
         );
         const combinedOptions = {
@@ -422,7 +427,7 @@ export class ObservableQuery {
         let wasUpdated = false;
         const isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            invariant(updateQuery, 79);
+            invariant(updateQuery, 80);
         }
         const { finalize, pushNotification } = this.pushOperation(NetworkStatus.fetchMore);
         pushNotification({
@@ -558,7 +563,7 @@ export class ObservableQuery {
                         onError(error);
                     }
                     else {
-                        invariant.error(80, error);
+                        invariant.error(81, error);
                     }
                     return;
                 }
@@ -802,7 +807,7 @@ export class ObservableQuery {
                 if (!this.didWarnCacheOnlyPolling &&
                     pollInterval &&
                     fetchPolicy === "cache-only") {
-                    __DEV__ && invariant.warn(81, getOperationName(this.query, "(anonymous)"));
+                    __DEV__ && invariant.warn(82, getOperationName(this.query, "(anonymous)"));
                     this.didWarnCacheOnlyPolling = true;
                 }
             }
@@ -877,6 +882,10 @@ export class ObservableQuery {
         const oldVariables = this.variables;
         const oldFetchPolicy = this.options.fetchPolicy;
         const mergedOptions = compact(this.options, newOptions || {});
+        // This request will hit the network, so even if there are no variables,
+        // we now know that's intentional. (see #12996)
+        // Even if that happens only once, we want `variablesUnknown` to stay false permanently.
+        this.variablesUnknown &&= mergedOptions.fetchPolicy === "standby";
         const options = useDisposableObservable ?
             // Disposable Observable fetches receive a shallow copy of this.options
             // (merged with newOptions), leaving this.options unmodified.
@@ -1154,7 +1163,9 @@ export class ObservableQuery {
         // "fetchMore" having priority over "polling" or "loading" network statuses
         // as for now we just take the "latest" operation that is still active,
         // as that lines up best with previous behavior[]
-        const operation = Array.from(this.activeOperations.values()).findLast((operation) => isEqualQuery(operation, this) && operation.override !== undefined);
+        const operation = Array.from(this.activeOperations.values())
+            .reverse()
+            .find((operation) => isEqualQuery(operation, this) && operation.override !== undefined);
         return operation?.override ?? baseNetworkStatus;
     }
     abortActiveOperations() {
@@ -1298,7 +1309,7 @@ export class ObservableQuery {
 }
 export function logMissingFieldErrors(missing) {
     if (__DEV__ && missing) {
-        __DEV__ && invariant.debug(82, missing);
+        __DEV__ && invariant.debug(83, missing);
     }
 }
 function isEqualQuery(a, b) {