@apollo/client 3.7.5 → 3.7.6

package/core/core.cjs

@@ -15,7 +15,7 @@ var utils = require('../link/utils');
 var tsInvariant = require('ts-invariant');
 var graphqlTag = require('graphql-tag');
 
-var version = '3.7.5';
+var version = '3.7.6';
 
 function isNonEmptyArray(value) {
     return Array.isArray(value) && value.length > 0;
@@ -475,7 +475,7 @@ var ObservableQuery = (function (_super) {
             pollingInfo.interval === pollInterval) {
             return;
         }
-        __DEV__ ? globals.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : globals.invariant(pollInterval, 12);
+        __DEV__ ? globals.invariant(pollInterval, 'Attempted to start a polling query without a polling interval.') : globals.invariant(pollInterval, 13);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -621,6 +621,7 @@ function logMissingFieldErrors(missing) {
 var LocalState = (function () {
     function LocalState(_a) {
         var cache = _a.cache, client = _a.client, resolvers = _a.resolvers, fragmentMatcher = _a.fragmentMatcher;
+        this.selectionsToResolveCache = new WeakMap();
         this.cache = cache;
         if (client) {
             this.client = client;
@@ -731,13 +732,13 @@ var LocalState = (function () {
         if (fragmentMatcher === void 0) { fragmentMatcher = function () { return true; }; }
         if (onlyRunForcedResolvers === void 0) { onlyRunForcedResolvers = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var mainDefinition, fragments, fragmentMap, definitionOperation, defaultOperationType, _a, cache, client, execContext;
+            var mainDefinition, fragments, fragmentMap, selectionsToResolve, definitionOperation, defaultOperationType, _a, cache, client, execContext, isClientFieldDescendant;
             return tslib.__generator(this, function (_b) {
                 mainDefinition = utilities.getMainDefinition(document);
                 fragments = utilities.getFragmentDefinitions(document);
                 fragmentMap = utilities.createFragmentMap(fragments);
-                definitionOperation = mainDefinition
-                    .operation;
+                selectionsToResolve = this.collectSelectionsToResolve(mainDefinition, fragmentMap);
+                definitionOperation = mainDefinition.operation;
                 defaultOperationType = definitionOperation
                     ? definitionOperation.charAt(0).toUpperCase() +
                         definitionOperation.slice(1)
@@ -750,16 +751,18 @@ var LocalState = (function () {
                     fragmentMatcher: fragmentMatcher,
                     defaultOperationType: defaultOperationType,
                     exportedVariables: {},
+                    selectionsToResolve: selectionsToResolve,
                     onlyRunForcedResolvers: onlyRunForcedResolvers,
                 };
-                return [2, this.resolveSelectionSet(mainDefinition.selectionSet, rootValue, execContext).then(function (result) { return ({
+                isClientFieldDescendant = false;
+                return [2, this.resolveSelectionSet(mainDefinition.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (result) { return ({
                         result: result,
                         exportedVariables: execContext.exportedVariables,
                     }); })];
             });
         });
     };
-    LocalState.prototype.resolveSelectionSet = function (selectionSet, rootValue, execContext) {
+    LocalState.prototype.resolveSelectionSet = function (selectionSet, isClientFieldDescendant, rootValue, execContext) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var fragmentMap, context, variables, resultsToMerge, execute;
             var _this = this;
@@ -769,11 +772,14 @@ var LocalState = (function () {
                 execute = function (selection) { return tslib.__awaiter(_this, void 0, void 0, function () {
                     var fragment, typeCondition;
                     return tslib.__generator(this, function (_a) {
+                        if (!isClientFieldDescendant && !execContext.selectionsToResolve.has(selection)) {
+                            return [2];
+                        }
                         if (!utilities.shouldInclude(selection, variables)) {
                             return [2];
                         }
                         if (utilities.isField(selection)) {
-                            return [2, this.resolveField(selection, rootValue, execContext).then(function (fieldResult) {
+                            return [2, this.resolveField(selection, isClientFieldDescendant, rootValue, execContext).then(function (fieldResult) {
                                     var _a;
                                     if (typeof fieldResult !== 'undefined') {
                                         resultsToMerge.push((_a = {},
@@ -792,7 +798,7 @@ var LocalState = (function () {
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
                             if (execContext.fragmentMatcher(rootValue, typeCondition, context)) {
-                                return [2, this.resolveSelectionSet(fragment.selectionSet, rootValue, execContext).then(function (fragmentResult) {
+                                return [2, this.resolveSelectionSet(fragment.selectionSet, isClientFieldDescendant, rootValue, execContext).then(function (fragmentResult) {
                                         resultsToMerge.push(fragmentResult);
                                     })];
                             }
@@ -806,7 +812,7 @@ var LocalState = (function () {
             });
         });
     };
-    LocalState.prototype.resolveField = function (field, rootValue, execContext) {
+    LocalState.prototype.resolveField = function (field, isClientFieldDescendant, rootValue, execContext) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var variables, fieldName, aliasedFieldName, aliasUsed, defaultResult, resultPromise, resolverType, resolverMap, resolve;
             var _this = this;
@@ -834,6 +840,7 @@ var LocalState = (function () {
                     }
                 }
                 return [2, resultPromise.then(function (result) {
+                        var _a, _b;
                         if (result === void 0) { result = defaultResult; }
                         if (field.directives) {
                             field.directives.forEach(function (directive) {
@@ -852,30 +859,70 @@ var LocalState = (function () {
                         if (result == null) {
                             return result;
                         }
+                        var isClientField = (_b = (_a = field.directives) === null || _a === void 0 ? void 0 : _a.some(function (d) { return d.name.value === 'client'; })) !== null && _b !== void 0 ? _b : false;
                         if (Array.isArray(result)) {
-                            return _this.resolveSubSelectedArray(field, result, execContext);
+                            return _this.resolveSubSelectedArray(field, isClientFieldDescendant || isClientField, result, execContext);
                         }
                         if (field.selectionSet) {
-                            return _this.resolveSelectionSet(field.selectionSet, result, execContext);
+                            return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant || isClientField, result, execContext);
                         }
                     })];
             });
         });
     };
-    LocalState.prototype.resolveSubSelectedArray = function (field, result, execContext) {
+    LocalState.prototype.resolveSubSelectedArray = function (field, isClientFieldDescendant, result, execContext) {
         var _this = this;
         return Promise.all(result.map(function (item) {
             if (item === null) {
                 return null;
             }
             if (Array.isArray(item)) {
-                return _this.resolveSubSelectedArray(field, item, execContext);
+                return _this.resolveSubSelectedArray(field, isClientFieldDescendant, item, execContext);
             }
             if (field.selectionSet) {
-                return _this.resolveSelectionSet(field.selectionSet, item, execContext);
+                return _this.resolveSelectionSet(field.selectionSet, isClientFieldDescendant, item, execContext);
             }
         }));
     };
+    LocalState.prototype.collectSelectionsToResolve = function (mainDefinition, fragmentMap) {
+        var isSingleASTNode = function (node) { return !Array.isArray(node); };
+        var selectionsToResolveCache = this.selectionsToResolveCache;
+        function collectByDefinition(definitionNode) {
+            if (!selectionsToResolveCache.has(definitionNode)) {
+                var matches_1 = new Set();
+                selectionsToResolveCache.set(definitionNode, matches_1);
+                graphql.visit(definitionNode, {
+                    Directive: function (node, _, __, ___, ancestors) {
+                        if (node.name.value === 'client') {
+                            ancestors.forEach(function (node) {
+                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
+                                    matches_1.add(node);
+                                }
+                            });
+                        }
+                    },
+                    FragmentSpread: function (spread, _, __, ___, ancestors) {
+                        var fragment = fragmentMap[spread.name.value];
+                        __DEV__ ? globals.invariant(fragment, "No fragment named ".concat(spread.name.value)) : globals.invariant(fragment, 12);
+                        var fragmentSelections = collectByDefinition(fragment);
+                        if (fragmentSelections.size > 0) {
+                            ancestors.forEach(function (node) {
+                                if (isSingleASTNode(node) && graphql.isSelectionNode(node)) {
+                                    matches_1.add(node);
+                                }
+                            });
+                            matches_1.add(spread);
+                            fragmentSelections.forEach(function (selection) {
+                                matches_1.add(selection);
+                            });
+                        }
+                    }
+                });
+            }
+            return selectionsToResolveCache.get(definitionNode);
+        }
+        return collectByDefinition(mainDefinition);
+    };
     return LocalState;
 }());
 
@@ -1186,7 +1233,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(__DEV__ ? new globals.InvariantError('QueryManager stopped while query was in flight') : new globals.InvariantError(13));
+        this.cancelPendingFetches(__DEV__ ? new globals.InvariantError('QueryManager stopped while query was in flight') : new globals.InvariantError(14));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -1200,10 +1247,10 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
-                        __DEV__ ? globals.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : globals.invariant(mutation, 14);
+                        __DEV__ ? globals.invariant(mutation, 'mutation option is required. You must specify your GraphQL document in the mutation option.') : globals.invariant(mutation, 15);
                         __DEV__ ? globals.invariant(fetchPolicy === 'network-only' ||
                             fetchPolicy === 'no-cache', "Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write.") : globals.invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 15);
+                            fetchPolicy === 'no-cache', 16);
                         mutationId = this.generateMutationId();
                         _h = this.transform(mutation), document = _h.document, hasClientExports = _h.hasClientExports;
                         mutation = this.cache.transformForLink(document);
@@ -1320,7 +1367,10 @@ var QueryManager = (function () {
                     optimistic: false,
                     returnPartialData: true,
                 });
-                var mergedData = mergeIncrementalData(diff.result, result);
+                var mergedData = void 0;
+                if (diff.result) {
+                    mergedData = mergeIncrementalData(diff.result, result);
+                }
                 if (typeof mergedData !== 'undefined') {
                     result.data = mergedData;
                     cacheWrites.push({
@@ -1522,10 +1572,10 @@ var QueryManager = (function () {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
         __DEV__ ? globals.invariant(options.query, 'query option is required. You must specify your GraphQL document ' +
-            'in the query option.') : globals.invariant(options.query, 16);
-        __DEV__ ? globals.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : globals.invariant(options.query.kind === 'Document', 17);
-        __DEV__ ? globals.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : globals.invariant(!options.returnPartialData, 18);
-        __DEV__ ? globals.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : globals.invariant(!options.pollInterval, 19);
+            'in the query option.') : globals.invariant(options.query, 17);
+        __DEV__ ? globals.invariant(options.query.kind === 'Document', 'You must wrap the query string in a "gql" tag.') : globals.invariant(options.query.kind === 'Document', 18);
+        __DEV__ ? globals.invariant(!options.returnPartialData, 'returnPartialData option only supported on watchQuery.') : globals.invariant(!options.returnPartialData, 19);
+        __DEV__ ? globals.invariant(!options.pollInterval, 'pollInterval option only supported on watchQuery.') : globals.invariant(!options.pollInterval, 20);
         return this.fetchQuery(queryId, options).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -1550,7 +1600,7 @@ var QueryManager = (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(__DEV__ ? new globals.InvariantError('Store reset while query was in flight (not completed in link chain)') : new globals.InvariantError(20));
+        this.cancelPendingFetches(__DEV__ ? new globals.InvariantError('Store reset while query was in flight (not completed in link chain)') : new globals.InvariantError(21));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;