@apollo/client 3.3.0-rc.2 → 3.3.0

package/apollo-client.cjs.js

@@ -16,7 +16,6 @@ var optimism = require('optimism');
 var context = require('@wry/context');
 var gql = _interopDefault(require('graphql-tag'));
 var React = require('react');
-var React__default = _interopDefault(React);
 
 function shouldInclude(_a, variables) {
     var directives = _a.directives;
@@ -1943,16 +1942,16 @@ var ObservableQuery = (function (_super) {
     ObservableQuery.prototype.tearDownQuery = function () {
         if (this.isTornDown)
             return;
-        var queryManager = this.queryManager;
         if (this.reobserver) {
             this.reobserver.stop();
             delete this.reobserver;
         }
-        this.isTornDown = true;
+        delete this.options.context;
         this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
         this.subscriptions.clear();
-        queryManager.stopQuery(this.queryId);
+        this.queryManager.stopQuery(this.queryId);
         this.observers.clear();
+        this.isTornDown = true;
     };
     return ObservableQuery;
 }(Observable));
@@ -2158,7 +2157,12 @@ var EntityStore = (function () {
                     fieldsToDirty_1.__exists = 1;
                 Object.keys(incoming).forEach(function (storeFieldName) {
                     if (!existing || existing[storeFieldName] !== merged[storeFieldName]) {
-                        fieldsToDirty_1[fieldNameFromStoreName(storeFieldName)] = 1;
+                        fieldsToDirty_1[storeFieldName] = 1;
+                        var fieldName = fieldNameFromStoreName(storeFieldName);
+                        if (fieldName !== storeFieldName &&
+                            !_this.policies.hasKeyArgs(merged.__typename, fieldName)) {
+                            fieldsToDirty_1[fieldName] = 1;
+                        }
                         if (merged[storeFieldName] === void 0 && !(_this instanceof Layer)) {
                             delete merged[storeFieldName];
                         }
@@ -2373,6 +2377,10 @@ var CacheGroup = (function () {
     CacheGroup.prototype.depend = function (dataId, storeFieldName) {
         if (this.d) {
             this.d(makeDepKey(dataId, storeFieldName));
+            var fieldName = fieldNameFromStoreName(storeFieldName);
+            if (fieldName !== storeFieldName) {
+                this.d(makeDepKey(dataId, fieldName));
+            }
         }
     };
     CacheGroup.prototype.dirty = function (dataId, storeFieldName) {
@@ -2383,7 +2391,7 @@ var CacheGroup = (function () {
     return CacheGroup;
 }());
 function makeDepKey(dataId, storeFieldName) {
-    return fieldNameFromStoreName(storeFieldName) + '#' + dataId;
+    return storeFieldName + '#' + dataId;
 }
 (function (EntityStore) {
     var Root = (function (_super) {
@@ -2954,10 +2962,12 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
 var varDep = optimism.dep();
 var cacheSlot = new context.Slot();
 function consumeAndIterate(set, callback) {
-    var items = [];
-    set.forEach(function (item) { return items.push(item); });
-    set.clear();
-    items.forEach(callback);
+    if (set.size) {
+        var items_1 = [];
+        set.forEach(function (item) { return items_1.push(item); });
+        set.clear();
+        items_1.forEach(callback);
+    }
 }
 var varsByCache = new WeakMap();
 function forgetCache(cache) {
@@ -2981,13 +2991,8 @@ function makeVar(value) {
         }
         else {
             var cache = cacheSlot.getValue();
-            if (cache) {
-                caches.add(cache);
-                var vars = varsByCache.get(cache);
-                if (!vars)
-                    varsByCache.set(cache, vars = new Set);
-                vars.add(rv);
-            }
+            if (cache)
+                attach(cache);
             varDep(rv);
         }
         return value;
@@ -2998,7 +3003,23 @@ function makeVar(value) {
             listeners.delete(listener);
         };
     };
-    rv.forgetCache = function (cache) { return caches.delete(cache); };
+    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);
+        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;
+    };
     return rv;
 }
 function broadcast(cache) {
@@ -3255,6 +3276,10 @@ var Policies = (function () {
         }
         return false;
     };
+    Policies.prototype.hasKeyArgs = function (typename, fieldName) {
+        var policy = this.getFieldPolicy(typename, fieldName, false);
+        return !!(policy && policy.keyFn);
+    };
     Policies.prototype.getStoreFieldName = function (fieldSpec) {
         var typename = fieldSpec.typename, fieldName = fieldSpec.fieldName;
         var policy = this.getFieldPolicy(typename, fieldName, false);
@@ -3975,6 +4000,12 @@ function wrapDestructiveCacheMethod(cache, methodName) {
         };
     }
 }
+function cancelNotifyTimeout(info) {
+    if (info["notifyTimeout"]) {
+        clearTimeout(info["notifyTimeout"]);
+        info["notifyTimeout"] = void 0;
+    }
+}
 var QueryInfo = (function () {
     function QueryInfo(cache) {
         this.cache = cache;
@@ -4068,10 +4099,7 @@ var QueryInfo = (function () {
     };
     QueryInfo.prototype.notify = function () {
         var _this = this;
-        if (this.notifyTimeout) {
-            clearTimeout(this.notifyTimeout);
-            this.notifyTimeout = void 0;
-        }
+        cancelNotifyTimeout(this);
         if (this.shouldNotify()) {
             this.listeners.forEach(function (listener) { return listener(_this); });
         }
@@ -4132,6 +4160,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.markResult = function (result, options, allowCacheWrite) {
         var _this = this;
         this.graphQLErrors = isNonEmptyArray(result.errors) ? result.errors : [];
+        cancelNotifyTimeout(this);
         if (options.fetchPolicy === 'no-cache') {
             this.diff = { result: result.data, complete: true };
         }
@@ -4183,6 +4212,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.markError = function (error) {
         this.networkStatus = exports.NetworkStatus.error;
         this.lastWrite = void 0;
+        cancelNotifyTimeout(this);
         if (error.graphQLErrors) {
             this.graphQLErrors = error.graphQLErrors;
         }
@@ -5090,27 +5120,19 @@ var ApolloClient = (function () {
 tsInvariant.setVerbosity("warn");
 var resetCaches = gql.resetCaches, disableFragmentWarnings = gql.disableFragmentWarnings, enableExperimentalFragmentVariables = gql.enableExperimentalFragmentVariables, disableExperimentalFragmentVariables = gql.disableExperimentalFragmentVariables;
 
-var contextSymbol = typeof Symbol === 'function' && Symbol.for ?
-    Symbol.for('__APOLLO_CONTEXT__') :
-    '__APOLLO_CONTEXT__';
-function resetApolloContext() {
-    Object.defineProperty(React__default, contextSymbol, {
-        value: React__default.createContext({}),
-        enumerable: false,
-        configurable: true,
-        writable: false,
-    });
-}
+var cache = new (canUseWeakMap ? WeakMap : Map)();
 function getApolloContext() {
-    if (!React__default[contextSymbol]) {
-        resetApolloContext();
+    var context = cache.get(React.createContext);
+    if (!context) {
+        context = React.createContext({});
+        cache.set(React.createContext, context);
     }
-    return React__default[contextSymbol];
+    return context;
 }
 
 var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
-    return React__default.createElement(ApolloContext.Consumer, null, function (context) {
+    return React.createElement(ApolloContext.Consumer, null, function (context) {
         process.env.NODE_ENV === "production" ? tsInvariant.invariant(context && context.client, 27) : tsInvariant.invariant(context && context.client, 'Could not find "client" in the context of ApolloConsumer. ' +
             'Wrap the root component in an <ApolloProvider>.');
         return props.children(context.client);
@@ -5120,19 +5142,19 @@ var ApolloConsumer = function (props) {
 var ApolloProvider = function (_a) {
     var client = _a.client, children = _a.children;
     var ApolloContext = getApolloContext();
-    return React__default.createElement(ApolloContext.Consumer, null, function (context) {
+    return React.createElement(ApolloContext.Consumer, null, function (context) {
         if (context === void 0) { context = {}; }
         if (client && context.client !== client) {
             context = Object.assign({}, context, { client: client });
         }
         process.env.NODE_ENV === "production" ? tsInvariant.invariant(context.client, 28) : tsInvariant.invariant(context.client, 'ApolloProvider was not passed a client instance. Make ' +
             'sure you pass in your client via the "client" prop.');
-        return (React__default.createElement(ApolloContext.Provider, { value: context }, children));
+        return (React.createElement(ApolloContext.Provider, { value: context }, children));
     });
 };
 
 function useApolloClient() {
-    var client = React__default.useContext(getApolloContext()).client;
+    var client = React.useContext(getApolloContext()).client;
     process.env.NODE_ENV === "production" ? tsInvariant.invariant(client, 33) : tsInvariant.invariant(client, 'No Apollo Client instance can be found. Please ensure that you ' +
         'have called `ApolloProvider` higher up in your tree.');
     return client;
@@ -5143,7 +5165,7 @@ function useApolloClient() {
     DocumentType[DocumentType["Mutation"] = 1] = "Mutation";
     DocumentType[DocumentType["Subscription"] = 2] = "Subscription";
 })(exports.DocumentType || (exports.DocumentType = {}));
-var cache = new Map();
+var cache$1 = new Map();
 function operationName(type) {
     var name;
     switch (type) {
@@ -5160,7 +5182,7 @@ function operationName(type) {
     return name;
 }
 function parser(document) {
-    var cached = cache.get(document);
+    var cached = cache$1.get(document);
     if (cached)
         return cached;
     var variables, type, name;
@@ -5205,7 +5227,7 @@ function parser(document) {
         name = 'data';
     }
     var payload = { name: name, type: type, variables: variables };
-    cache.set(document, payload);
+    cache$1.set(document, payload);
     return payload;
 }
 
@@ -5620,7 +5642,8 @@ var QueryData = (function (_super) {
         return result;
     };
     QueryData.prototype.getExecuteSsrResult = function () {
-        var ssrDisabled = this.getOptions().ssr === false;
+        var _a = this.getOptions(), ssr = _a.ssr, skip = _a.skip;
+        var ssrDisabled = ssr === false || skip;
         var fetchDisabled = this.refreshClient().client.disableNetworkFetches;
         var ssrLoading = tslib.__assign({ loading: true, networkStatus: exports.NetworkStatus.loading, called: true, data: undefined, stale: false, client: this.client }, this.observableQueryFields());
         if (ssrDisabled && (this.ssrInitiated() || fetchDisabled)) {
@@ -5924,7 +5947,7 @@ exports.mergeOptions = mergeOptions;
 exports.operationName = operationName;
 exports.parseAndCheckHttpResponse = parseAndCheckHttpResponse;
 exports.parser = parser;
-exports.resetApolloContext = resetApolloContext;
+exports.resetApolloContext = getApolloContext;
 exports.resetCaches = resetCaches;
 exports.rewriteURIForGET = rewriteURIForGET;
 exports.selectHttpOptionsAndBody = selectHttpOptionsAndBody;