@apollo/client 3.8.0-beta.4 → 3.8.0-beta.6

package/core/core.cjs.native.js

@@ -19,7 +19,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 
-var version = '3.8.0-beta.4';
+var version = '3.8.0-beta.6';
 
 function isNonNullObject(obj) {
     return obj !== null && typeof obj === 'object';
@@ -223,6 +223,7 @@ var ObservableQuery = (function (_super) {
         _this.subscriptions = new Set();
         _this.queryInfo = queryInfo;
         _this.queryManager = queryManager;
+        _this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy);
         _this.isTornDown = false;
         var _b = queryManager.defaultOptions.watchQuery, _c = _b === void 0 ? {} : _b, _d = _c.fetchPolicy, defaultFetchPolicy = _d === void 0 ? "cache-first" : _d;
         var _e = options.fetchPolicy, fetchPolicy = _e === void 0 ? defaultFetchPolicy : _e, _f = options.initialFetchPolicy, initialFetchPolicy = _f === void 0 ? (fetchPolicy === "standby" ? defaultFetchPolicy : fetchPolicy) : _f;
@@ -273,10 +274,11 @@ var ObservableQuery = (function (_super) {
             exports.NetworkStatus.ready;
         var result = tslib.__assign(tslib.__assign({}, lastResult), { loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus });
         var _a = this.options.fetchPolicy, fetchPolicy = _a === void 0 ? "cache-first" : _a;
-        if (fetchPolicy === 'network-only' ||
-            fetchPolicy === 'no-cache' ||
-            fetchPolicy === 'standby' ||
+        if (skipCacheDataFor(fetchPolicy) ||
             this.queryManager.getDocumentInfo(this.query).hasForcedResolvers) ;
+        else if (this.waitForOwnResult) {
+            this.queryInfo['updateWatch']();
+        }
         else {
             var diff = this.queryInfo.getDiff();
             if (diff.complete || this.options.returnPartialData) {
@@ -363,7 +365,7 @@ var ObservableQuery = (function (_super) {
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 globals.__DEV__ && globals.invariant.warn(
-                    19,
+                    18,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -454,7 +456,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                globals.__DEV__ && globals.invariant.error(20, err);
+                globals.__DEV__ && globals.invariant.error(19, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -467,6 +469,10 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.setOptions = function (newOptions) {
         return this.reobserve(newOptions);
     };
+    ObservableQuery.prototype.silentSetOptions = function (newOptions) {
+        var mergedOptions = utilities.compact(this.options, newOptions || {});
+        assign(this.options, mergedOptions);
+    };
     ObservableQuery.prototype.setVariables = function (variables) {
         if (equal.equal(this.variables, variables)) {
             return this.observers.size
@@ -552,7 +558,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        globals.invariant(pollInterval, 21);
+        globals.invariant(pollInterval, 20);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -614,13 +620,21 @@ var ObservableQuery = (function (_super) {
             }
         }
         var fetchOptions = query === options.query ? options : tslib.__assign(tslib.__assign({}, options), { query: query });
-        var variables = options.variables && tslib.__assign({}, options.variables);
+        this.waitForOwnResult && (this.waitForOwnResult = skipCacheDataFor(fetchOptions.fetchPolicy));
+        var finishWaitingForOwnResult = function () {
+            if (_this.concast === concast) {
+                _this.waitForOwnResult = false;
+            }
+        };
+        var variables = fetchOptions.variables && tslib.__assign({}, fetchOptions.variables);
         var _a = this.fetch(fetchOptions, newNetworkStatus), concast = _a.concast, fromLink = _a.fromLink;
         var observer = {
             next: function (result) {
+                finishWaitingForOwnResult();
                 _this.reportResult(result, variables);
             },
             error: function (error) {
+                finishWaitingForOwnResult();
                 _this.reportError(error, variables);
             },
         };
@@ -697,13 +711,16 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    globals.__DEV__ && globals.invariant.error(22, error.message, error.stack);
+    globals.__DEV__ && globals.invariant.error(21, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (globals.__DEV__ && missing) {
-        globals.__DEV__ && globals.invariant.debug(23, missing);
+        globals.__DEV__ && globals.invariant.debug(22, missing);
     }
 }
+function skipCacheDataFor(fetchPolicy) {
+    return fetchPolicy === "network-only" || fetchPolicy === "no-cache" || fetchPolicy === "standby";
+}
 
 var LocalState = (function () {
     function LocalState(_a) {
@@ -880,7 +897,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            globals.invariant(fragment, 17, selection.name.value);
+                            globals.invariant(fragment, 16, selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -993,7 +1010,7 @@ var LocalState = (function () {
                     },
                     FragmentSpread: function (spread, _, __, ___, ancestors) {
                         var fragment = fragmentMap[spread.name.value];
-                        globals.invariant(fragment, 18, spread.name.value);
+                        globals.invariant(fragment, 17, spread.name.value);
                         var fragmentSelections = collectByDefinition(fragment);
                         if (fragmentSelections.size > 0) {
                             ancestors.forEach(function (node) {
@@ -1330,7 +1347,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(globals.newInvariantError(24));
+        this.cancelPendingFetches(globals.newInvariantError(23));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1344,9 +1361,9 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
-                        globals.invariant(mutation, 25);
+                        globals.invariant(mutation, 24);
                         globals.invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 26);
+                            fetchPolicy === 'no-cache', 25);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -1664,10 +1681,10 @@ var QueryManager = (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        globals.invariant(options.query, 27);
-        globals.invariant(options.query.kind === 'Document', 28);
-        globals.invariant(!options.returnPartialData, 29);
-        globals.invariant(!options.pollInterval, 30);
+        globals.invariant(options.query, 26);
+        globals.invariant(options.query.kind === 'Document', 27);
+        globals.invariant(!options.returnPartialData, 28);
+        globals.invariant(!options.pollInterval, 29);
         return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -1692,7 +1709,7 @@ var QueryManager = (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(globals.newInvariantError(31));
+        this.cancelPendingFetches(globals.newInvariantError(30));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -1768,7 +1785,7 @@ var QueryManager = (function () {
         if (globals.__DEV__ && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    globals.__DEV__ && globals.invariant.warn(typeof nameOrDoc === "string" ? 32 : 33, nameOrDoc);
+                    globals.__DEV__ && globals.invariant.warn(typeof nameOrDoc === "string" ? 31 : 32, nameOrDoc);
                 }
             });
         }
@@ -2230,7 +2247,8 @@ var ApolloClient = (function () {
                     }
                 }
                 if (url) {
-                    globals.__DEV__ && globals.invariant.log(14, url);
+                    globals.__DEV__ && globals.invariant.log("Download the Apollo DevTools for a better development " +
+                        "experience: %s", url);
                 }
             }
         }
@@ -2293,7 +2311,7 @@ var ApolloClient = (function () {
         if (this.defaultOptions.query) {
             options = utilities.mergeOptions(this.defaultOptions.query, options);
         }
-        globals.invariant(options.fetchPolicy !== 'cache-and-network', 15);
+        globals.invariant(options.fetchPolicy !== 'cache-and-network', 14);
         if (this.disableNetworkFetches && options.fetchPolicy === 'network-only') {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: 'cache-first' });
         }
@@ -2382,7 +2400,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            globals.__DEV__ && globals.invariant.debug(16, error);
+            globals.__DEV__ && globals.invariant.debug(15, error);
         });
         return result;
     };