@apollo/client 3.3.7 → 3.3.11

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/README.md

@@ -20,3 +20,4 @@ The Apollo Client API reference can be found at: <br/>
 
 - [@benjamn](https://github.com/benjamn) (Apollo)
 - [@hwillson](https://github.com/hwillson) (Apollo)
+- [@jcreighton](https://github.com/jcreighton) (Apollo)

package/apollo-client.cjs.js

@@ -851,6 +851,17 @@ function asyncMap(observable, mapFn, catchFn) {
     });
 }
 
+function fixObservableSubclass(subclass) {
+    function set(key) {
+        Object.defineProperty(subclass, key, { value: Observable });
+    }
+    if (typeof Symbol === "function" && Symbol.species) {
+        set(Symbol.species);
+    }
+    set("@@species");
+    return subclass;
+}
+
 function isPromiseLike(value) {
     return value && typeof value.then === "function";
 }
@@ -914,6 +925,9 @@ var Concast = (function (_super) {
             _this.handlers.complete();
         };
         _this.promise.catch(function (_) { });
+        if (typeof sources === "function") {
+            sources = [new Observable(sources)];
+        }
         if (isPromiseLike(sources)) {
             sources.then(function (iterable) { return _this.start(iterable); }, _this.handlers.error);
         }
@@ -977,11 +991,7 @@ var Concast = (function (_super) {
     };
     return Concast;
 }(Observable));
-if (typeof Symbol === "function" && Symbol.species) {
-    Object.defineProperty(Concast, Symbol.species, {
-        value: Observable,
-    });
-}
+fixObservableSubclass(Concast);
 
 function isNonEmptyArray(value) {
     return Array.isArray(value) && value.length > 0;
@@ -1217,7 +1227,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.3.7';
+var version = '3.3.11';
 
 var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1947,7 +1957,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);
@@ -1956,6 +1965,7 @@ var ObservableQuery = (function (_super) {
     };
     return ObservableQuery;
 }(Observable));
+fixObservableSubclass(ObservableQuery);
 function defaultSubscriptionObserverErrorCallback(error) {
     process.env.NODE_ENV === "production" || tsInvariant.invariant.error('Unhandled error', error.message, error.stack);
 }
@@ -2960,7 +2970,6 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
         : "") + "define a custom merge function for the " + typeDotName + " field, so InMemoryCache can safely merge these objects:\n\n  existing: " + JSON.stringify(existing).slice(0, 1000) + "\n  incoming: " + JSON.stringify(incoming).slice(0, 1000) + "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n");
 }
 
-var varDep = optimism.dep();
 var cacheSlot = new context.Slot();
 function consumeAndIterate(set, callback) {
     if (set.size) {
@@ -2970,13 +2979,22 @@ function consumeAndIterate(set, callback) {
         items_1.forEach(callback);
     }
 }
-var varsByCache = new WeakMap();
-function forgetCache(cache) {
-    var vars = varsByCache.get(cache);
-    if (vars) {
-        consumeAndIterate(vars, function (rv) { return rv.forgetCache(cache); });
-        varsByCache.delete(cache);
+var cacheInfoMap = new WeakMap();
+function getCacheInfo(cache) {
+    var info = cacheInfoMap.get(cache);
+    if (!info) {
+        cacheInfoMap.set(cache, info = {
+            vars: new Set,
+            dep: optimism.dep(),
+        });
     }
+    return info;
+}
+function forgetCache(cache) {
+    getCacheInfo(cache).vars.forEach(function (rv) { return rv.forgetCache(cache); });
+}
+function recallCache(cache) {
+    getCacheInfo(cache).vars.forEach(function (rv) { return rv.attachCache(cache); });
 }
 function makeVar(value) {
     var caches = new Set();
@@ -2985,16 +3003,19 @@ function makeVar(value) {
         if (arguments.length > 0) {
             if (value !== newValue) {
                 value = newValue;
-                varDep.dirty(rv);
-                caches.forEach(broadcast);
+                caches.forEach(function (cache) {
+                    getCacheInfo(cache).dep.dirty(rv);
+                    broadcast(cache);
+                });
                 consumeAndIterate(listeners, function (listener) { return listener(value); });
             }
         }
         else {
             var cache = cacheSlot.getValue();
-            if (cache)
+            if (cache) {
                 attach(cache);
-            varDep(rv);
+                getCacheInfo(cache).dep(rv);
+            }
         }
         return value;
     };
@@ -3006,21 +3027,10 @@ function makeVar(value) {
     };
     var attach = rv.attachCache = function (cache) {
         caches.add(cache);
-        var vars = varsByCache.get(cache);
-        if (!vars)
-            varsByCache.set(cache, vars = new Set);
-        vars.add(rv);
+        getCacheInfo(cache).vars.add(rv);
         return rv;
     };
-    rv.forgetCache = function (cache) {
-        var deleted = caches.delete(cache);
-        if (deleted) {
-            var vars = varsByCache.get(cache);
-            if (vars)
-                vars.delete(rv);
-        }
-        return deleted;
-    };
+    rv.forgetCache = function (cache) { return caches.delete(cache); };
     return rv;
 }
 function broadcast(cache) {
@@ -3609,6 +3619,9 @@ var InMemoryCache = (function (_super) {
     };
     InMemoryCache.prototype.watch = function (watch) {
         var _this = this;
+        if (!this.watches.size) {
+            recallCache(this);
+        }
         this.watches.add(watch);
         if (watch.immediate) {
             this.maybeBroadcastWatch(watch);
@@ -4050,6 +4063,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)) {
@@ -4161,11 +4179,11 @@ 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 };
         }
-        else if (allowCacheWrite) {
+        else if (!this.stopped && allowCacheWrite) {
             if (shouldWriteResult(result, options.errorPolicy)) {
                 this.cache.performTransaction(function (cache) {
                     if (_this.shouldWrite(result, options.variables)) {
@@ -4213,7 +4231,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;
         }
@@ -5818,24 +5836,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,
@@ -5846,9 +5860,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 }); }, [
@@ -5923,6 +5934,9 @@ function useReactiveVar(rv) {
     var value = rv();
     var _a = React.useState(value), setValue = _a[1];
     React.useEffect(function () { return rv.onNextChange(setValue); }, [value]);
+    React.useEffect(function () {
+        setValue(rv());
+    }, []);
     return value;
 }