@apollo/client 3.3.11 → 3.3.15

package/apollo-client.cjs.js

@@ -10,7 +10,6 @@ var graphql = require('graphql');
 var stringify = _interopDefault(require('fast-json-stable-stringify'));
 var Observable = _interopDefault(require('zen-observable'));
 require('symbol-observable');
-var visitor = require('graphql/language/visitor');
 var equality = require('@wry/equality');
 var optimism = require('optimism');
 var context = require('@wry/context');
@@ -816,19 +815,27 @@ function asyncMap(observable, mapFn, catchFn) {
         var next = observer.next, error = observer.error, complete = observer.complete;
         var activeCallbackCount = 0;
         var completed = false;
+        var promiseQueue = {
+            then: function (callback) {
+                return new Promise(function (resolve) { return resolve(callback()); });
+            },
+        };
         function makeCallback(examiner, delegate) {
             if (examiner) {
                 return function (arg) {
                     ++activeCallbackCount;
-                    new Promise(function (resolve) { return resolve(examiner(arg)); }).then(function (result) {
+                    var both = function () { return examiner(arg); };
+                    promiseQueue = promiseQueue.then(both, both).then(function (result) {
                         --activeCallbackCount;
                         next && next.call(observer, result);
                         if (completed) {
                             handler.complete();
                         }
-                    }, function (e) {
+                    }, function (error) {
                         --activeCallbackCount;
-                        error && error.call(observer, e);
+                        throw error;
+                    }).catch(function (caught) {
+                        error && error.call(observer, caught);
                     });
                 };
             }
@@ -1227,7 +1234,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.3.11';
+var version = '3.3.15';
 
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1421,7 +1428,7 @@ var createHttpLink = function (linkOptions) {
         var _b = selectHttpOptionsAndBody(operation, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
         if (body.variables && !includeUnusedVariables) {
             var unusedNames_1 = new Set(Object.keys(body.variables));
-            visitor.visit(operation.query, {
+            graphql.visit(operation.query, {
                 Variable: function (node, _key, parent) {
                     if (parent && parent.kind !== 'VariableDefinition') {
                         unusedNames_1.delete(node.name.value);
@@ -3114,7 +3121,7 @@ var Policies = (function () {
                 break;
             }
         }
-        id = id && String(id);
+        id = id ? String(id) : void 0;
         return context.keyObject ? [id, context.keyObject] : [id];
     };
     Policies.prototype.addTypePolicies = function (typePolicies) {
@@ -3320,6 +3327,9 @@ var Policies = (function () {
                 ? storeKeyNameFromField(fieldSpec.field, fieldSpec.variables)
                 : getStoreKeyName(fieldName, argsFromFieldSpecifier(fieldSpec));
         }
+        if (storeFieldName === false) {
+            return fieldName;
+        }
         return fieldName === fieldNameFromStoreName(storeFieldName)
             ? storeFieldName
             : fieldName + ":" + storeFieldName;
@@ -4141,6 +4151,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.stop = function () {
         if (!this.stopped) {
             this.stopped = true;
+            this.reset();
             this.cancel();
             delete this.cancel;
             this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
@@ -4396,6 +4407,7 @@ var QueryManager = (function () {
                                                     self.queries.forEach(function (_a) {
                                                         var observableQuery = _a.observableQuery;
                                                         if (observableQuery &&
+                                                            observableQuery.hasObservers() &&
                                                             observableQuery.queryName === refetchQuery) {
                                                             refetchQueryPromises.push(observableQuery.refetch());
                                                         }
@@ -4753,10 +4765,10 @@ var QueryManager = (function () {
         return observable;
     };
     QueryManager.prototype.getResultsFromLink = function (queryInfo, allowCacheWrite, options) {
-        var lastRequestId = queryInfo.lastRequestId;
+        var requestId = queryInfo.lastRequestId = this.generateRequestId();
         return asyncMap(this.getObservableFromLink(queryInfo.document, options.context, options.variables), function (result) {
             var hasErrors = isNonEmptyArray(result.errors);
-            if (lastRequestId >= queryInfo.lastRequestId) {
+            if (requestId >= queryInfo.lastRequestId) {
                 if (hasErrors && options.errorPolicy === "none") {
                     throw queryInfo.markError(new ApolloError({
                         graphQLErrors: result.errors,
@@ -4778,7 +4790,7 @@ var QueryManager = (function () {
             var error = isApolloError(networkError)
                 ? networkError
                 : new ApolloError({ networkError: networkError });
-            if (lastRequestId >= queryInfo.lastRequestId) {
+            if (requestId >= queryInfo.lastRequestId) {
                 queryInfo.markError(error);
             }
             throw error;
@@ -4843,7 +4855,6 @@ var QueryManager = (function () {
         queryInfo.init({
             document: query,
             variables: variables,
-            lastRequestId: this.generateRequestId(),
             networkStatus: networkStatus,
         });
         var readCache = function () { return queryInfo.getDiff(variables); };
@@ -5363,7 +5374,8 @@ var SubscriptionData = (function (_super) {
         this.currentObservable.query = this.refreshClient().client.subscribe({
             query: options.subscription,
             variables: options.variables,
-            fetchPolicy: options.fetchPolicy
+            fetchPolicy: options.fetchPolicy,
+            context: options.context,
         });
     };
     SubscriptionData.prototype.startSubscription = function () {
@@ -5408,10 +5420,13 @@ var SubscriptionData = (function (_super) {
         });
     };
     SubscriptionData.prototype.completeSubscription = function () {
-        var onSubscriptionComplete = this.getOptions().onSubscriptionComplete;
-        if (onSubscriptionComplete)
-            onSubscriptionComplete();
-        this.endSubscription();
+        var _this = this;
+        Promise.resolve().then(function () {
+            var onSubscriptionComplete = _this.getOptions().onSubscriptionComplete;
+            if (onSubscriptionComplete)
+                onSubscriptionComplete();
+            _this.endSubscription();
+        });
     };
     SubscriptionData.prototype.endSubscription = function () {
         if (this.currentObservable.subscription) {
@@ -5678,17 +5693,13 @@ var QueryData = (function (_super) {
             this.previous.result = ssrLoading;
             return ssrLoading;
         }
-        var result;
         if (this.ssrInitiated()) {
-            if (skip) {
-                result = this.getQueryResult();
-            }
-            else {
-                result =
-                    this.context.renderPromises.addQueryPromise(this, this.getQueryResult) || ssrLoading;
+            var result = this.getQueryResult() || ssrLoading;
+            if (result.loading && !skip) {
+                this.context.renderPromises.addQueryPromise(this, function () { return null; });
             }
+            return result;
         }
-        return result;
     };
     QueryData.prototype.prepareObservableQueryOptions = function () {
         var options = this.getOptions();