@apollo/client 4.1.0-alpha.7 → 4.1.0-alpha.9

package/core/ObservableQuery.js

@@ -2,7 +2,7 @@ import { equal } from "@wry/equality";
 import { BehaviorSubject, filter, Observable, share, Subject, tap } from "rxjs";
 import { isNetworkRequestInFlight, isNetworkRequestSettled, } 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, extensionsSymbol, 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`
     * 
@@ -74,6 +75,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", 80);
+            this.variablesUnknown = true;
+        }
         this.lastQuery = transformedQuery;
         this.options = {
             ...options,
@@ -375,7 +380,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(80, variables, queryDef.name?.value || queryDef);
+                __DEV__ && invariant.warn(81, variables, queryDef.name?.value || queryDef);
             }
         }
         if (variables && !equal(this.variables, variables)) {
@@ -391,7 +396,7 @@ export class ObservableQuery {
     fetchMore({ query, variables, context, errorPolicy, updateQuery, }) {
         invariant(
             this.options.fetchPolicy !== "cache-only",
-            81,
+            82,
             getOperationName(this.query, "(anonymous)")
         );
         const combinedOptions = {
@@ -425,7 +430,7 @@ export class ObservableQuery {
         let wasUpdated = false;
         const isCached = this.options.fetchPolicy !== "no-cache";
         if (!isCached) {
-            invariant(updateQuery, 82);
+            invariant(updateQuery, 83);
         }
         const { finalize, pushNotification } = this.pushOperation(NetworkStatus.fetchMore);
         pushNotification({
@@ -434,13 +439,14 @@ export class ObservableQuery {
             value: {},
         }, { shouldEmit: 3 /* EmitBehavior.networkStatusChange */ });
         const { promise, operator } = getTrackingOperatorPromise();
-        const { observable } = this.queryManager.fetchObservableWithInfo(combinedOptions, { networkStatus: NetworkStatus.fetchMore });
+        const { observable } = this.queryManager.fetchObservableWithInfo(combinedOptions, { networkStatus: NetworkStatus.fetchMore, exposeExtensions: true });
         const subscription = observable
             .pipe(operator, filter((notification) => notification.kind === "N" && notification.source === "network"))
             .subscribe({
             next: (notification) => {
                 wasUpdated = false;
                 const fetchMoreResult = notification.value;
+                const extensions = fetchMoreResult[extensionsSymbol];
                 if (isNetworkRequestSettled(notification.value.networkStatus)) {
                     finalize();
                 }
@@ -461,6 +467,7 @@ export class ObservableQuery {
                                     variables: this.variables,
                                     returnPartialData: true,
                                     optimistic: false,
+                                    extensions,
                                 }, (previous) => updateQuery(previous, {
                                     fetchMoreResult: fetchMoreResult.data,
                                     variables: combinedOptions.variables,
@@ -476,6 +483,7 @@ export class ObservableQuery {
                                     query: combinedOptions.query,
                                     variables: combinedOptions.variables,
                                     data: fetchMoreResult.data,
+                                    extensions,
                                 });
                             }
                         },
@@ -598,7 +606,7 @@ export class ObservableQuery {
                         onError(error);
                     }
                     else {
-                        invariant.error(83, error);
+                        invariant.error(84, error);
                     }
                     return;
                 }
@@ -842,7 +850,7 @@ export class ObservableQuery {
                 if (!this.didWarnCacheOnlyPolling &&
                     pollInterval &&
                     fetchPolicy === "cache-only") {
-                    __DEV__ && invariant.warn(84, getOperationName(this.query, "(anonymous)"));
+                    __DEV__ && invariant.warn(85, getOperationName(this.query, "(anonymous)"));
                     this.didWarnCacheOnlyPolling = true;
                 }
             }
@@ -917,6 +925,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.
@@ -1186,7 +1198,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() {
@@ -1330,7 +1344,7 @@ export class ObservableQuery {
 }
 export function logMissingFieldErrors(missing) {
     if (__DEV__ && missing) {
-        __DEV__ && invariant.debug(85, missing);
+        __DEV__ && invariant.debug(86, missing);
     }
 }
 function isEqualQuery(a, b) {