@apollo/client 3.5.0-beta.16 → 3.5.0-beta.17

package/apollo-client.cjs

@@ -760,7 +760,12 @@ var DeepMerger = (function () {
         return source;
     };
     DeepMerger.prototype.shallowCopyForMerge = function (value) {
-        if (isNonNullObject(value) && !this.pastCopies.has(value)) {
+        if (isNonNullObject(value)) {
+            if (this.pastCopies.has(value)) {
+                if (!Object.isFrozen(value))
+                    return value;
+                this.pastCopies.delete(value);
+            }
             if (Array.isArray(value)) {
                 value = value.slice(0);
             }
@@ -1286,7 +1291,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.5.0-beta.16';
+var version = '3.5.0-beta.17';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1669,6 +1674,36 @@ var MissingFieldError = (function () {
 }());
 
 var hasOwn = Object.prototype.hasOwnProperty;
+function defaultDataIdFromObject(_a, context) {
+    var __typename = _a.__typename, id = _a.id, _id = _a._id;
+    if (typeof __typename === "string") {
+        if (context) {
+            context.keyObject =
+                id !== void 0 ? { id: id } :
+                    _id !== void 0 ? { _id: _id } :
+                        void 0;
+        }
+        if (id === void 0)
+            id = _id;
+        if (id !== void 0) {
+            return __typename + ":" + ((typeof id === "number" ||
+                typeof id === "string") ? id : JSON.stringify(id));
+        }
+    }
+}
+var defaultConfig = {
+    dataIdFromObject: defaultDataIdFromObject,
+    addTypename: true,
+    resultCaching: true,
+    canonizeResults: false,
+};
+function normalizeConfig(config) {
+    return compact(defaultConfig, config);
+}
+function shouldCanonizeResults(config) {
+    var value = config.canonizeResults;
+    return value === void 0 ? defaultConfig.canonizeResults : value;
+}
 function getTypenameFromStoreObject(store, objectOrReference) {
     return isReference(objectOrReference)
         ? store.get(objectOrReference.__ref, "__typename")
@@ -1897,14 +1932,14 @@ var EntityStore = (function () {
         }
         return false;
     };
-    EntityStore.prototype.evict = function (options) {
+    EntityStore.prototype.evict = function (options, limit) {
         var evicted = false;
         if (options.id) {
             if (hasOwn.call(this.data, options.id)) {
                 evicted = this.delete(options.id, options.fieldName, options.args);
             }
-            if (this instanceof Layer) {
-                evicted = this.parent.evict(options) || evicted;
+            if (this instanceof Layer && this !== limit) {
+                evicted = this.parent.evict(options, limit) || evicted;
             }
             if (options.fieldName || evicted) {
                 this.group.dirty(options.id, options.fieldName || "__exists");
@@ -2289,7 +2324,10 @@ var StoreReader = (function () {
     function StoreReader(config) {
         var _this = this;
         this.knownResults = new (canUseWeakMap ? WeakMap : Map)();
-        this.config = tslib.__assign(tslib.__assign({}, config), { addTypename: config.addTypename !== false });
+        this.config = compact(config, {
+            addTypename: config.addTypename !== false,
+            canonizeResults: shouldCanonizeResults(config),
+        });
         this.canon = config.canon || new ObjectCanon;
         this.executeSelectionSet = optimism.wrap(function (options) {
             var _a;
@@ -2331,7 +2369,7 @@ var StoreReader = (function () {
         this.canon = new ObjectCanon;
     };
     StoreReader.prototype.diffQueryAgainstStore = function (_a) {
-        var store = _a.store, query = _a.query, _b = _a.rootId, rootId = _b === void 0 ? 'ROOT_QUERY' : _b, variables = _a.variables, _c = _a.returnPartialData, returnPartialData = _c === void 0 ? true : _c, _d = _a.canonizeResults, canonizeResults = _d === void 0 ? true : _d;
+        var store = _a.store, query = _a.query, _b = _a.rootId, rootId = _b === void 0 ? 'ROOT_QUERY' : _b, variables = _a.variables, _c = _a.returnPartialData, returnPartialData = _c === void 0 ? true : _c, _d = _a.canonizeResults, canonizeResults = _d === void 0 ? this.config.canonizeResults : _d;
         var policies = this.config.cache.policies;
         variables = tslib.__assign(tslib.__assign({}, getDefaultValues(getQueryDefinition(query))), variables);
         var rootRef = makeReference(rootId);
@@ -2928,23 +2966,6 @@ function argsFromFieldSpecifier(spec) {
     return spec.args !== void 0 ? spec.args :
         spec.field ? argumentsObjectFromField(spec.field, spec.variables) : null;
 }
-var defaultDataIdFromObject = function (_a, context) {
-    var __typename = _a.__typename, id = _a.id, _id = _a._id;
-    if (typeof __typename === "string") {
-        if (context) {
-            context.keyObject =
-                id !== void 0 ? { id: id } :
-                    _id !== void 0 ? { _id: _id } :
-                        void 0;
-        }
-        if (id === void 0)
-            id = _id;
-        if (id !== void 0) {
-            return __typename + ":" + ((typeof id === "number" ||
-                typeof id === "string") ? id : JSON.stringify(id));
-        }
-    }
-};
 var nullKeyFieldsFn = function () { return void 0; };
 var simpleKeyArgsFn = function (_args, context) { return context.fieldName; };
 var mergeTrueFn = function (existing, incoming, _a) {
@@ -3462,12 +3483,6 @@ function computeKeyArgsObject(specifier, field, source, variables) {
     return keyObj;
 }
 
-var defaultConfig = {
-    dataIdFromObject: defaultDataIdFromObject,
-    addTypename: true,
-    resultCaching: true,
-    typePolicies: {},
-};
 var InMemoryCache = (function (_super) {
     tslib.__extends(InMemoryCache, _super);
     function InMemoryCache(config) {
@@ -3477,7 +3492,7 @@ var InMemoryCache = (function (_super) {
         _this.typenameDocumentCache = new Map();
         _this.makeVar = makeVar;
         _this.txCount = 0;
-        _this.config = tslib.__assign(tslib.__assign({}, defaultConfig), config);
+        _this.config = normalizeConfig(config);
         _this.addTypename = !!_this.config.addTypename;
         _this.policies = new Policies({
             cache: _this,
@@ -3503,6 +3518,7 @@ var InMemoryCache = (function (_super) {
             cache: this,
             addTypename: this.addTypename,
             resultCacheMaxSize: this.config.resultCacheMaxSize,
+            canonizeResults: shouldCanonizeResults(this.config),
             canon: resetResultIdentities
                 ? void 0
                 : previousReader && previousReader.canon,
@@ -3631,7 +3647,7 @@ var InMemoryCache = (function (_super) {
         }
         try {
             ++this.txCount;
-            return this.optimisticData.evict(options);
+            return this.optimisticData.evict(options, this.data);
         }
         finally {
             if (!--this.txCount && options.broadcast !== false) {
@@ -3640,8 +3656,11 @@ var InMemoryCache = (function (_super) {
         }
     };
     InMemoryCache.prototype.reset = function () {
+        var _this = this;
         this.init();
-        this.broadcastWatches();
+        this.watches.forEach(function (watch) { return _this.maybeBroadcastWatch.forget(watch); });
+        this.watches.clear();
+        forgetCache(this);
         canonicalStringify.reset();
         return Promise.resolve();
     };
@@ -3733,11 +3752,7 @@ var InMemoryCache = (function (_super) {
     };
     InMemoryCache.prototype.broadcastWatch = function (c, options) {
         var lastDiff = c.lastDiff;
-        var diff = this.diff({
-            query: c.query,
-            variables: c.variables,
-            optimistic: c.optimistic,
-        });
+        var diff = this.diff(c);
         if (options) {
             if (c.optimistic &&
                 typeof options.optimistic === "string") {
@@ -4589,14 +4604,14 @@ var QueryInfo = (function () {
         } : void 0;
     };
     QueryInfo.prototype.getDiffOptions = function (variables) {
+        var _a;
         if (variables === void 0) { variables = this.variables; }
-        var oq = this.observableQuery;
         return {
             query: this.document,
             variables: variables,
             returnPartialData: true,
             optimistic: true,
-            canonizeResults: !oq || oq.options.canonizeResults !== false,
+            canonizeResults: (_a = this.observableQuery) === null || _a === void 0 ? void 0 : _a.options.canonizeResults,
         };
     };
     QueryInfo.prototype.setDiff = function (diff) {
@@ -5169,7 +5184,8 @@ var QueryManager = (function () {
                     return;
                 }
                 var queryName = oq.queryName, fetchPolicy = oq.options.fetchPolicy;
-                if (fetchPolicy === "standby" || !oq.hasObservers()) {
+                if (fetchPolicy === "standby" ||
+                    (include === "active" && !oq.hasObservers())) {
                     return;
                 }
                 if (include === "active" ||