@apollo/client 3.4.10 → 3.4.14

package/README.md

@@ -22,9 +22,9 @@ Learn how to use Apollo Client with self-paced hands-on training on Odyssey, Apo
 ## Maintainers
 
 - [@benjamn](https://github.com/benjamn) (Apollo)
-- [@hwillson](https://github.com/hwillson) (Apollo)
-- [@jcreighton](https://github.com/jcreighton) (Apollo)
 - [@brainkim](https://github.com/brainkim) (Apollo)
+- [@jcreighton](https://github.com/jcreighton) (Netflix)
+- [@hwillson](https://github.com/hwillson) (Apollo)
 
 ## Who is Apollo?
 

package/apollo-client.cjs.js

@@ -128,7 +128,7 @@ function getFragmentQueryDocument(document, fragmentName) {
                     ],
                 },
             }
-        ], document.definitions) });
+        ], document.definitions, true) });
     return query;
 }
 function createFragmentMap(fragments) {
@@ -564,7 +564,7 @@ var addTypenameToDocument = Object.assign(function (doc) {
                     field.directives.some(function (d) { return d.name.value === 'export'; })) {
                     return;
                 }
-                return tslib.__assign(tslib.__assign({}, node), { selections: tslib.__spreadArray(tslib.__spreadArray([], selections), [TYPENAME_FIELD]) });
+                return tslib.__assign(tslib.__assign({}, node), { selections: tslib.__spreadArray(tslib.__spreadArray([], selections, true), [TYPENAME_FIELD], false) });
             },
         },
     });
@@ -743,7 +743,7 @@ var DeepMerger = (function () {
                 if (hasOwnProperty$3.call(target, sourceKey)) {
                     var targetValue = target[sourceKey];
                     if (source[sourceKey] !== targetValue) {
-                        var result = _this.reconciler.apply(_this, tslib.__spreadArray([target, source, sourceKey], context));
+                        var result = _this.reconciler.apply(_this, tslib.__spreadArray([target, source, sourceKey], context, false));
                         if (result !== targetValue) {
                             target = _this.shallowCopyForMerge(target);
                             target[sourceKey] = result;
@@ -810,9 +810,7 @@ function cloneDeepHelper(val, seen) {
 function deepFreeze(value) {
     var workSet = new Set([value]);
     workSet.forEach(function (obj) {
-        if (isNonNullObject(obj)) {
-            if (!Object.isFrozen(obj))
-                Object.freeze(obj);
+        if (isNonNullObject(obj) && shallowFreeze(obj) === obj) {
             Object.getOwnPropertyNames(obj).forEach(function (name) {
                 if (isNonNullObject(obj[name]))
                     workSet.add(obj[name]);
@@ -821,6 +819,19 @@ function deepFreeze(value) {
     });
     return value;
 }
+function shallowFreeze(obj) {
+    if (__DEV__ && !Object.isFrozen(obj)) {
+        try {
+            Object.freeze(obj);
+        }
+        catch (e) {
+            if (e instanceof TypeError)
+                return null;
+            throw e;
+        }
+    }
+    return obj;
+}
 function maybeDeepFreeze(obj) {
     if (__DEV__) {
         deepFreeze(obj);
@@ -882,11 +893,17 @@ function asyncMap(observable, mapFn, catchFn) {
     });
 }
 
+var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
+    navigator.product === 'ReactNative');
+var canUseWeakSet = typeof WeakSet === 'function';
+var canUseSymbol = typeof Symbol === 'function' &&
+    typeof Symbol.for === 'function';
+
 function fixObservableSubclass(subclass) {
     function set(key) {
         Object.defineProperty(subclass, key, { value: zenObservableTs.Observable });
     }
-    if (typeof Symbol === "function" && Symbol.species) {
+    if (canUseSymbol && Symbol.species) {
         set(Symbol.species);
     }
     set("@@species");
@@ -1032,10 +1049,6 @@ function graphQLResultHasError(result) {
     return (result.errors && result.errors.length > 0) || false;
 }
 
-var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
-    navigator.product === 'ReactNative');
-var canUseWeakSet = typeof WeakSet === 'function';
-
 function compact() {
     var objects = [];
     for (var _i = 0; _i < arguments.length; _i++) {
@@ -1273,7 +1286,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.4.10';
+var version = '3.4.14';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1632,6 +1645,36 @@ var MissingFieldError = (function (_super) {
 }(Error));
 
 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")
@@ -1860,14 +1903,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");
@@ -2255,7 +2298,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;
@@ -2297,7 +2343,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);
@@ -2877,23 +2923,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) {
@@ -3368,12 +3397,6 @@ function computeKeyObject(response, specifier, strict, aliasMap) {
     return keyObj;
 }
 
-var defaultConfig = {
-    dataIdFromObject: defaultDataIdFromObject,
-    addTypename: true,
-    resultCaching: true,
-    typePolicies: {},
-};
 var InMemoryCache = (function (_super) {
     tslib.__extends(InMemoryCache, _super);
     function InMemoryCache(config) {
@@ -3383,7 +3406,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,
@@ -3409,6 +3432,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,
@@ -3531,7 +3555,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) {
@@ -3540,8 +3564,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();
     };
@@ -3631,11 +3658,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") {
@@ -4483,14 +4506,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) {
@@ -5063,7 +5086,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" ||
@@ -5716,13 +5740,19 @@ var ApolloClient = (function () {
     return ApolloClient;
 }());
 
-var cache$1 = new (canUseWeakMap ? WeakMap : Map)();
+var contextKey = canUseSymbol
+    ? Symbol.for('__APOLLO_CONTEXT__')
+    : '__APOLLO_CONTEXT__';
 function getApolloContext() {
-    var context = cache$1.get(React__namespace.createContext);
+    var context = React__namespace.createContext[contextKey];
     if (!context) {
-        context = React__namespace.createContext({});
+        Object.defineProperty(React__namespace.createContext, contextKey, {
+            value: context = React__namespace.createContext({}),
+            enumerable: false,
+            writable: false,
+            configurable: true,
+        });
         context.displayName = 'ApolloContext';
-        cache$1.set(React__namespace.createContext, context);
     }
     return context;
 }