@apollo/client 3.3.9 → 3.3.13

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
+Copyright (c) 2021 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.9';
+var version = '3.3.13';
 
 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);
@@ -1957,7 +1964,6 @@ var ObservableQuery = (function (_super) {
             this.reobserver.stop();
             delete this.reobserver;
         }
-        delete this.options.context;
         this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
         this.subscriptions.clear();
         this.queryManager.stopQuery(this.queryId);
@@ -4064,6 +4070,11 @@ var QueryInfo = (function () {
         }
         return this;
     };
+    QueryInfo.prototype.reset = function () {
+        cancelNotifyTimeout(this);
+        this.diff = null;
+        this.dirty = false;
+    };
     QueryInfo.prototype.getDiff = function (variables) {
         if (variables === void 0) { variables = this.variables; }
         if (this.diff && equality.equal(variables, this.variables)) {
@@ -4175,7 +4186,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.markResult = function (result, options, allowCacheWrite) {
         var _this = this;
         this.graphQLErrors = isNonEmptyArray(result.errors) ? result.errors : [];
-        cancelNotifyTimeout(this);
+        this.reset();
         if (options.fetchPolicy === 'no-cache') {
             this.diff = { result: result.data, complete: true };
         }
@@ -4227,7 +4238,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.markError = function (error) {
         this.networkStatus = exports.NetworkStatus.error;
         this.lastWrite = void 0;
-        cancelNotifyTimeout(this);
+        this.reset();
         if (error.graphQLErrors) {
             this.graphQLErrors = error.graphQLErrors;
         }
@@ -4392,6 +4403,7 @@ var QueryManager = (function () {
                                                     self.queries.forEach(function (_a) {
                                                         var observableQuery = _a.observableQuery;
                                                         if (observableQuery &&
+                                                            observableQuery.hasObservers() &&
                                                             observableQuery.queryName === refetchQuery) {
                                                             refetchQueryPromises.push(observableQuery.refetch());
                                                         }
@@ -5359,7 +5371,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 () {
@@ -5832,24 +5845,20 @@ function useBaseQuery(query, options, lazy) {
     var _a = React.useReducer(function (x) { return x + 1; }, 0), tick = _a[0], forceUpdate = _a[1];
     var updatedOptions = options ? tslib.__assign(tslib.__assign({}, options), { query: query }) : { query: query };
     var queryDataRef = React.useRef();
-    var queryData = queryDataRef.current ||
-        new QueryData({
-            options: updatedOptions,
-            context: context,
-            onNewData: function () {
-                if (!queryData.ssrInitiated()) {
-                    Promise.resolve().then(forceUpdate);
-                }
-                else {
-                    forceUpdate();
-                }
+    var queryData = queryDataRef.current || (queryDataRef.current = new QueryData({
+        options: updatedOptions,
+        context: context,
+        onNewData: function () {
+            if (!queryData.ssrInitiated()) {
+                Promise.resolve().then(function () { return queryDataRef.current && forceUpdate(); });
             }
-        });
+            else {
+                forceUpdate();
+            }
+        }
+    }));
     queryData.setOptions(updatedOptions);
     queryData.context = context;
-    if (queryData.ssrInitiated() && !queryDataRef.current) {
-        queryDataRef.current = queryData;
-    }
     var memo = {
         options: tslib.__assign(tslib.__assign({}, updatedOptions), { onError: undefined, onCompleted: undefined }),
         context: context,
@@ -5860,9 +5869,6 @@ function useBaseQuery(query, options, lazy) {
         ? result[1]
         : result;
     React.useEffect(function () {
-        if (!queryDataRef.current) {
-            queryDataRef.current = queryData;
-        }
         return function () { return queryData.cleanup(); };
     }, []);
     React.useEffect(function () { return queryData.afterExecute({ lazy: lazy }); }, [