@apollo/client 3.8.1 → 3.8.3

package/core/QueryManager.js

@@ -1,23 +1,23 @@
 import { __assign, __awaiter, __generator } from "tslib";
-import { invariant, newInvariantError } from '../utilities/globals/index.js';
-import { equal } from '@wry/equality';
-import { execute } from '../link/core/index.js';
-import { hasDirectives, isExecutionPatchIncrementalResult, isExecutionPatchResult, removeDirectivesFromDocument, } from '../utilities/index.js';
-import { canonicalStringify } from '../cache/index.js';
-import { getDefaultValues, getOperationDefinition, getOperationName, hasClientExports, graphQLResultHasError, getGraphQLErrorsFromResult, canUseWeakMap, Observable, asyncMap, isNonEmptyArray, Concast, makeUniqueId, isDocumentNode, isNonNullObject, DocumentTransform, } from '../utilities/index.js';
-import { mergeIncrementalData } from '../utilities/common/incrementalResult.js';
-import { ApolloError, isApolloError, graphQLResultHasProtocolErrors } from '../errors/index.js';
-import { ObservableQuery, logMissingFieldErrors } from './ObservableQuery.js';
-import { NetworkStatus, isNetworkRequestInFlight } from './networkStatus.js';
-import { LocalState } from './LocalState.js';
-import { QueryInfo, shouldWriteResult, } from './QueryInfo.js';
-import { PROTOCOL_ERRORS_SYMBOL } from '../errors/index.js';
-import { print } from '../utilities/index.js';
+import { invariant, newInvariantError } from "../utilities/globals/index.js";
+import { equal } from "@wry/equality";
+import { execute } from "../link/core/index.js";
+import { hasDirectives, isExecutionPatchIncrementalResult, isExecutionPatchResult, removeDirectivesFromDocument, } from "../utilities/index.js";
+import { canonicalStringify } from "../cache/index.js";
+import { getDefaultValues, getOperationDefinition, getOperationName, hasClientExports, graphQLResultHasError, getGraphQLErrorsFromResult, canUseWeakMap, Observable, asyncMap, isNonEmptyArray, Concast, makeUniqueId, isDocumentNode, isNonNullObject, DocumentTransform, } from "../utilities/index.js";
+import { mergeIncrementalData } from "../utilities/common/incrementalResult.js";
+import { ApolloError, isApolloError, graphQLResultHasProtocolErrors, } from "../errors/index.js";
+import { ObservableQuery, logMissingFieldErrors } from "./ObservableQuery.js";
+import { NetworkStatus, isNetworkRequestInFlight } from "./networkStatus.js";
+import { LocalState } from "./LocalState.js";
+import { QueryInfo, shouldWriteResult, } from "./QueryInfo.js";
+import { PROTOCOL_ERRORS_SYMBOL } from "../errors/index.js";
+import { print } from "../utilities/index.js";
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 var QueryManager = (function () {
     function QueryManager(_a) {
-        var cache = _a.cache, link = _a.link, defaultOptions = _a.defaultOptions, documentTransform = _a.documentTransform, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, _e = _a.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? !!cache.assumeImmutableResults : _e;
         var _this = this;
+        var cache = _a.cache, link = _a.link, defaultOptions = _a.defaultOptions, documentTransform = _a.documentTransform, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, _e = _a.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? !!cache.assumeImmutableResults : _e;
         this.clientAwareness = {};
         this.queries = new Map();
         this.fetchCancelFns = new Map();
@@ -64,8 +64,7 @@ var QueryManager = (function () {
                 switch (_h.label) {
                     case 0:
                         invariant(mutation, 24);
-                        invariant(fetchPolicy === 'network-only' ||
-                            fetchPolicy === 'no-cache', 25);
+                        invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 25);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -100,7 +99,7 @@ var QueryManager = (function () {
                         self = this;
                         return [2, new Promise(function (resolve, reject) {
                                 return asyncMap(self.getObservableFromLink(mutation, __assign(__assign({}, context), { optimisticResponse: optimisticResponse }), variables, false), function (result) {
-                                    if (graphQLResultHasError(result) && errorPolicy === 'none') {
+                                    if (graphQLResultHasError(result) && errorPolicy === "none") {
                                         throw new ApolloError({
                                             graphQLErrors: getGraphQLErrorsFromResult(result),
                                         });
@@ -113,8 +112,7 @@ var QueryManager = (function () {
                                     if (typeof refetchQueries === "function") {
                                         refetchQueries = refetchQueries(storeResult);
                                     }
-                                    if (errorPolicy === 'ignore' &&
-                                        graphQLResultHasError(storeResult)) {
+                                    if (errorPolicy === "ignore" && graphQLResultHasError(storeResult)) {
                                         delete storeResult.errors;
                                     }
                                     return self.markMutationResult({
@@ -136,7 +134,7 @@ var QueryManager = (function () {
                                 }).subscribe({
                                     next: function (storeResult) {
                                         self.broadcastQueries();
-                                        if (!('hasNext' in storeResult) || storeResult.hasNext === false) {
+                                        if (!("hasNext" in storeResult) || storeResult.hasNext === false) {
                                             resolve(storeResult);
                                         }
                                     },
@@ -149,9 +147,11 @@ var QueryManager = (function () {
                                             self.cache.removeOptimistic(mutationId);
                                         }
                                         self.broadcastQueries();
-                                        reject(err instanceof ApolloError ? err : new ApolloError({
-                                            networkError: err,
-                                        }));
+                                        reject(err instanceof ApolloError
+                                            ? err
+                                            : new ApolloError({
+                                                networkError: err,
+                                            }));
                                     },
                                 });
                             })];
@@ -169,12 +169,13 @@ var QueryManager = (function () {
             if (!isExecutionPatchIncrementalResult(result)) {
                 cacheWrites.push({
                     result: result.data,
-                    dataId: 'ROOT_MUTATION',
+                    dataId: "ROOT_MUTATION",
                     query: mutation.document,
                     variables: mutation.variables,
                 });
             }
-            if (isExecutionPatchIncrementalResult(result) && isNonEmptyArray(result.incremental)) {
+            if (isExecutionPatchIncrementalResult(result) &&
+                isNonEmptyArray(result.incremental)) {
                 var diff = cache.diff({
                     id: "ROOT_MUTATION",
                     query: this.getDocumentInfo(mutation.document).asQuery,
@@ -186,11 +187,11 @@ var QueryManager = (function () {
                 if (diff.result) {
                     mergedData = mergeIncrementalData(diff.result, result);
                 }
-                if (typeof mergedData !== 'undefined') {
+                if (typeof mergedData !== "undefined") {
                     result.data = mergedData;
                     cacheWrites.push({
                         result: mergedData,
-                        dataId: 'ROOT_MUTATION',
+                        dataId: "ROOT_MUTATION",
                         query: mutation.document,
                         variables: mutation.variables,
                     });
@@ -215,13 +216,13 @@ var QueryManager = (function () {
                     if (complete && currentQueryResult) {
                         var nextQueryResult = updater(currentQueryResult, {
                             mutationResult: result,
-                            queryName: document && getOperationName(document) || void 0,
+                            queryName: (document && getOperationName(document)) || void 0,
                             queryVariables: variables,
                         });
                         if (nextQueryResult) {
                             cacheWrites.push({
                                 result: nextQueryResult,
-                                dataId: 'ROOT_QUERY',
+                                dataId: "ROOT_QUERY",
                                 query: document,
                                 variables: variables,
                             });
@@ -255,10 +256,10 @@ var QueryManager = (function () {
                             });
                             if (diff.complete) {
                                 result = __assign(__assign({}, result), { data: diff.result });
-                                if ('incremental' in result) {
+                                if ("incremental" in result) {
                                     delete result.incremental;
                                 }
-                                if ('hasNext' in result) {
+                                if ("hasNext" in result) {
                                     delete result.hasNext;
                                 }
                             }
@@ -272,7 +273,7 @@ var QueryManager = (function () {
                     }
                     if (!skipCache && !mutation.keepRootFields && isFinalResult) {
                         cache.modify({
-                            id: 'ROOT_MUTATION',
+                            id: "ROOT_MUTATION",
                             fields: function (value, _a) {
                                 var fieldName = _a.fieldName, DELETE = _a.DELETE;
                                 return fieldName === "__typename" ? value : DELETE;
@@ -306,7 +307,8 @@ var QueryManager = (function () {
         }, mutation.mutationId);
     };
     QueryManager.prototype.fetchQuery = function (queryId, options, networkStatus) {
-        return this.fetchConcastWithInfo(queryId, options, networkStatus).concast.promise;
+        return this.fetchConcastWithInfo(queryId, options, networkStatus).concast
+            .promise;
     };
     QueryManager.prototype.getQueryStore = function () {
         var store = Object.create(null);
@@ -336,12 +338,12 @@ var QueryManager = (function () {
             var cacheEntry = {
                 hasClientExports: hasClientExports(document),
                 hasForcedResolvers: this.localState.shouldForceResolvers(document),
-                hasNonreactiveDirective: hasDirectives(['nonreactive'], document),
+                hasNonreactiveDirective: hasDirectives(["nonreactive"], document),
                 clientQuery: this.localState.clientQuery(document),
                 serverQuery: removeDirectivesFromDocument([
-                    { name: 'client', remove: true },
-                    { name: 'connection' },
-                    { name: 'nonreactive' },
+                    { name: "client", remove: true },
+                    { name: "connection" },
+                    { name: "nonreactive" },
                 ], document),
                 defaultVars: getDefaultValues(getOperationDefinition(document)),
                 asQuery: __assign(__assign({}, document), { definitions: document.definitions.map(function (def) {
@@ -350,7 +352,7 @@ var QueryManager = (function () {
                             return __assign(__assign({}, def), { operation: "query" });
                         }
                         return def;
-                    }) })
+                    }) }),
             };
             transformCache.set(document, cacheEntry);
         }
@@ -362,7 +364,7 @@ var QueryManager = (function () {
     QueryManager.prototype.watchQuery = function (options) {
         var query = this.transform(options.query);
         options = __assign(__assign({}, options), { variables: this.getVariables(query, options.variables) });
-        if (typeof options.notifyOnNetworkStatusChange === 'undefined') {
+        if (typeof options.notifyOnNetworkStatusChange === "undefined") {
             options.notifyOnNetworkStatusChange = false;
         }
         var queryInfo = new QueryInfo(this);
@@ -371,7 +373,7 @@ var QueryManager = (function () {
             queryInfo: queryInfo,
             options: options,
         });
-        observable['lastQuery'] = query;
+        observable["lastQuery"] = query;
         this.queries.set(observable.queryId, queryInfo);
         queryInfo.init({
             document: query,
@@ -384,7 +386,7 @@ var QueryManager = (function () {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
         invariant(options.query, 26);
-        invariant(options.query.kind === 'Document', 27);
+        invariant(options.query.kind === "Document", 27);
         invariant(!options.returnPartialData, 28);
         invariant(!options.pollInterval, 29);
         return this.fetchQuery(queryId, __assign(__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
@@ -501,8 +503,7 @@ var QueryManager = (function () {
             var fetchPolicy = observableQuery.options.fetchPolicy;
             observableQuery.resetLastResults();
             if (includeStandby ||
-                (fetchPolicy !== "standby" &&
-                    fetchPolicy !== "cache-only")) {
+                (fetchPolicy !== "standby" && fetchPolicy !== "cache-only")) {
                 observableQueryPromises.push(observableQuery.refetch());
             }
             _this.getQuery(queryId).setDiff(null);
@@ -515,17 +516,17 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.startGraphQLSubscription = function (_a) {
         var _this = this;
-        var query = _a.query, fetchPolicy = _a.fetchPolicy, errorPolicy = _a.errorPolicy, variables = _a.variables, _b = _a.context, context = _b === void 0 ? {} : _b;
+        var query = _a.query, fetchPolicy = _a.fetchPolicy, _b = _a.errorPolicy, errorPolicy = _b === void 0 ? "none" : _b, variables = _a.variables, _c = _a.context, context = _c === void 0 ? {} : _c;
         query = this.transform(query);
         variables = this.getVariables(query, variables);
         var makeObservable = function (variables) {
             return _this.getObservableFromLink(query, context, variables).map(function (result) {
-                if (fetchPolicy !== 'no-cache') {
+                if (fetchPolicy !== "no-cache") {
                     if (shouldWriteResult(result, errorPolicy)) {
                         _this.cache.write({
                             query: query,
                             result: result.data,
-                            dataId: 'ROOT_SUBSCRIPTION',
+                            dataId: "ROOT_SUBSCRIPTION",
                             variables: variables,
                         });
                     }
@@ -541,16 +542,23 @@ var QueryManager = (function () {
                     if (hasProtocolErrors) {
                         errors.protocolErrors = result.extensions[PROTOCOL_ERRORS_SYMBOL];
                     }
-                    throw new ApolloError(errors);
+                    if (errorPolicy === "none" || hasProtocolErrors) {
+                        throw new ApolloError(errors);
+                    }
+                }
+                if (errorPolicy === "ignore") {
+                    delete result.errors;
                 }
                 return result;
             });
         };
         if (this.getDocumentInfo(query).hasClientExports) {
-            var observablePromise_1 = this.localState.addExportedVariables(query, variables, context).then(makeObservable);
+            var observablePromise_1 = this.localState
+                .addExportedVariables(query, variables, context)
+                .then(makeObservable);
             return new Observable(function (observer) {
                 var sub = null;
-                observablePromise_1.then(function (observable) { return sub = observable.subscribe(observer); }, observer.error);
+                observablePromise_1.then(function (observable) { return (sub = observable.subscribe(observer)); }, observer.error);
                 return function () { return sub && sub.unsubscribe(); };
             });
         }
@@ -602,12 +610,11 @@ var QueryManager = (function () {
                 observable = byVariables_1.get(varJson_1);
                 if (!observable) {
                     var concast = new Concast([
-                        execute(link, operation)
+                        execute(link, operation),
                     ]);
-                    byVariables_1.set(varJson_1, observable = concast);
+                    byVariables_1.set(varJson_1, (observable = concast));
                     concast.beforeNext(function () {
-                        if (byVariables_1.delete(varJson_1) &&
-                            byVariables_1.size < 1) {
+                        if (byVariables_1.delete(varJson_1) && byVariables_1.size < 1) {
                             inFlightLinkObservables_1.delete(printedServerQuery_1);
                         }
                     });
@@ -615,14 +622,12 @@ var QueryManager = (function () {
             }
             else {
                 observable = new Concast([
-                    execute(link, operation)
+                    execute(link, operation),
                 ]);
             }
         }
         else {
-            observable = new Concast([
-                Observable.of({ data: {} })
-            ]);
+            observable = new Concast([Observable.of({ data: {} })]);
             context = this.prepareContext(context);
         }
         if (clientQuery) {
@@ -638,7 +643,7 @@ var QueryManager = (function () {
         return observable;
     };
     QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
-        var requestId = queryInfo.lastRequestId = this.generateRequestId();
+        var requestId = (queryInfo.lastRequestId = this.generateRequestId());
         var linkDocument = this.cache.transformForLink(options.query);
         return asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
             var graphQLErrors = getGraphQLErrorsFromResult(result);
@@ -679,7 +684,7 @@ var QueryManager = (function () {
         var variables = this.getVariables(query, options.variables);
         var queryInfo = this.getQuery(queryId);
         var defaults = this.defaultOptions.watchQuery;
-        var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? defaults && defaults.fetchPolicy || "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? defaults && defaults.errorPolicy || "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
+        var _a = options.fetchPolicy, fetchPolicy = _a === void 0 ? (defaults && defaults.fetchPolicy) || "cache-first" : _a, _b = options.errorPolicy, errorPolicy = _b === void 0 ? (defaults && defaults.errorPolicy) || "none" : _b, _c = options.returnPartialData, returnPartialData = _c === void 0 ? false : _c, _d = options.notifyOnNetworkStatusChange, notifyOnNetworkStatusChange = _d === void 0 ? false : _d, _e = options.context, context = _e === void 0 ? {} : _e;
         var normalized = Object.assign({}, options, {
             query: query,
             variables: variables,
@@ -708,7 +713,8 @@ var QueryManager = (function () {
         if (this.getDocumentInfo(normalized.query).hasClientExports) {
             concast = new Concast(this.localState
                 .addExportedVariables(normalized.query, normalized.variables, normalized.context)
-                .then(fromVariables).then(function (sourcesWithInfo) { return sourcesWithInfo.sources; }));
+                .then(fromVariables)
+                .then(function (sourcesWithInfo) { return sourcesWithInfo.sources; }));
             containsDataFromLink = true;
         }
         else {
@@ -734,15 +740,14 @@ var QueryManager = (function () {
                 });
             });
         }
-        var results = new Map;
+        var results = new Map();
         if (updateCache) {
             this.cache.batch({
                 update: updateCache,
-                optimistic: optimistic && removeOptimistic || false,
+                optimistic: (optimistic && removeOptimistic) || false,
                 removeOptimistic: removeOptimistic,
                 onWatchUpdated: function (watch, diff, lastDiff) {
-                    var oq = watch.watcher instanceof QueryInfo &&
-                        watch.watcher.observableQuery;
+                    var oq = watch.watcher instanceof QueryInfo && watch.watcher.observableQuery;
                     if (oq) {
                         if (onQueryUpdated) {
                             includedQueriesById.delete(oq.queryId);
@@ -799,43 +804,50 @@ var QueryManager = (function () {
             variables: variables,
             networkStatus: networkStatus,
         });
-        var readCache = function () { return queryInfo.getDiff(variables); };
+        var readCache = function () { return queryInfo.getDiff(); };
         var resultsFromCache = function (diff, networkStatus) {
             if (networkStatus === void 0) { networkStatus = queryInfo.networkStatus || NetworkStatus.loading; }
             var data = diff.result;
-            if (globalThis.__DEV__ !== false &&
-                !returnPartialData &&
-                !equal(data, {})) {
+            if (globalThis.__DEV__ !== false && !returnPartialData && !equal(data, {})) {
                 logMissingFieldErrors(diff.missing);
             }
-            var fromData = function (data) { return Observable.of(__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
+            var fromData = function (data) {
+                return Observable.of(__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true })));
+            };
             if (data && _this.getDocumentInfo(query).hasForcedResolvers) {
-                return _this.localState.runResolvers({
+                return _this.localState
+                    .runResolvers({
                     document: query,
                     remoteResult: { data: data },
                     context: context,
                     variables: variables,
                     onlyRunForcedResolvers: true,
-                }).then(function (resolved) { return fromData(resolved.data || void 0); });
+                })
+                    .then(function (resolved) { return fromData(resolved.data || void 0); });
             }
-            if (errorPolicy === 'none' &&
+            if (errorPolicy === "none" &&
                 networkStatus === NetworkStatus.refetch &&
                 Array.isArray(diff.missing)) {
                 return fromData(void 0);
             }
             return fromData(data);
         };
-        var cacheWriteBehavior = fetchPolicy === "no-cache" ? 0 :
-            (networkStatus === NetworkStatus.refetch &&
-                refetchWritePolicy !== "merge") ? 1
-                : 2;
-        var resultsFromLink = function () { return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
-            query: query,
-            variables: variables,
-            context: context,
-            fetchPolicy: fetchPolicy,
-            errorPolicy: errorPolicy,
-        }); };
+        var cacheWriteBehavior = fetchPolicy === "no-cache"
+            ? 0
+            :
+                networkStatus === NetworkStatus.refetch &&
+                    refetchWritePolicy !== "merge"
+                    ? 1
+                    : 2;
+        var resultsFromLink = function () {
+            return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
+                query: query,
+                variables: variables,
+                context: context,
+                fetchPolicy: fetchPolicy,
+                errorPolicy: errorPolicy,
+            });
+        };
         var shouldNotify = notifyOnNetworkStatusChange &&
             typeof oldNetworkStatus === "number" &&
             oldNetworkStatus !== networkStatus &&
@@ -845,35 +857,47 @@ var QueryManager = (function () {
             case "cache-first": {
                 var diff = readCache();
                 if (diff.complete) {
-                    return { fromLink: false, sources: [resultsFromCache(diff, queryInfo.markReady())] };
+                    return {
+                        fromLink: false,
+                        sources: [resultsFromCache(diff, queryInfo.markReady())],
+                    };
                 }
                 if (returnPartialData || shouldNotify) {
-                    return { fromLink: true, sources: [resultsFromCache(diff), resultsFromLink()] };
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(diff), resultsFromLink()],
+                    };
                 }
                 return { fromLink: true, sources: [resultsFromLink()] };
             }
             case "cache-and-network": {
                 var diff = readCache();
                 if (diff.complete || returnPartialData || shouldNotify) {
-                    return { fromLink: true, sources: [resultsFromCache(diff), resultsFromLink()] };
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(diff), resultsFromLink()],
+                    };
                 }
                 return { fromLink: true, sources: [resultsFromLink()] };
             }
             case "cache-only":
-                return { fromLink: false, sources: [resultsFromCache(readCache(), queryInfo.markReady())] };
+                return {
+                    fromLink: false,
+                    sources: [resultsFromCache(readCache(), queryInfo.markReady())],
+                };
             case "network-only":
                 if (shouldNotify) {
-                    return { fromLink: true, sources: [resultsFromCache(readCache()), resultsFromLink()] };
+                    return {
+                        fromLink: true,
+                        sources: [resultsFromCache(readCache()), resultsFromLink()],
+                    };
                 }
                 return { fromLink: true, sources: [resultsFromLink()] };
             case "no-cache":
                 if (shouldNotify) {
                     return {
                         fromLink: true,
-                        sources: [
-                            resultsFromCache(queryInfo.getDiff()),
-                            resultsFromLink(),
-                        ],
+                        sources: [resultsFromCache(queryInfo.getDiff()), resultsFromLink()],
                     };
                 }
                 return { fromLink: true, sources: [resultsFromLink()] };