@apollo/client 3.6.0 → 3.6.3

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
+Copyright (c) 2022 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/apollo-client.cjs

@@ -1090,7 +1090,7 @@ function stringifyForDisplay(value) {
 
 function mergeOptions(defaults, options) {
     return compact(defaults, options, options.variables && {
-        variables: tslib.__assign(tslib.__assign({}, defaults.variables), options.variables),
+        variables: tslib.__assign(tslib.__assign({}, (defaults && defaults.variables)), options.variables),
     });
 }
 
@@ -1298,7 +1298,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0';
+var version = '3.6.3';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -3948,7 +3948,9 @@ var ObservableQuery = (function (_super) {
         _this.queryInfo = queryInfo;
         _this.queryManager = queryManager;
         _this.isTornDown = false;
-        _this.options = tslib.__assign({ initialFetchPolicy: options.fetchPolicy || "cache-first" }, options);
+        var _b = queryManager.defaultOptions.watchQuery, _c = _b === void 0 ? {} : _b, _d = _c.fetchPolicy, defaultFetchPolicy = _d === void 0 ? "cache-first" : _d;
+        var _e = options.fetchPolicy, fetchPolicy = _e === void 0 ? defaultFetchPolicy : _e, _f = options.initialFetchPolicy, initialFetchPolicy = _f === void 0 ? (fetchPolicy === "standby" ? defaultFetchPolicy : fetchPolicy) : _f;
+        _this.options = tslib.__assign(tslib.__assign({}, options), { initialFetchPolicy: initialFetchPolicy, fetchPolicy: fetchPolicy });
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
         var opDef = getOperationDefinition(_this.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
@@ -5644,7 +5646,7 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.fetchQueryByPolicy = function (queryInfo, _a, networkStatus) {
         var _this = this;
-        var query = _a.query, variables = _a.variables, fetchPolicy = _a.fetchPolicy, refetchWritePolicy = _a.refetchWritePolicy, errorPolicy = _a.errorPolicy, returnPartialData = _a.returnPartialData, context = _a.context, notifyOnNetworkStatusChange = _a.notifyOnNetworkStatusChange, fetchBlockingPromise = _a.fetchBlockingPromise;
+        var query = _a.query, variables = _a.variables, fetchPolicy = _a.fetchPolicy, refetchWritePolicy = _a.refetchWritePolicy, errorPolicy = _a.errorPolicy, returnPartialData = _a.returnPartialData, context = _a.context, notifyOnNetworkStatusChange = _a.notifyOnNetworkStatusChange;
         var oldNetworkStatus = queryInfo.networkStatus;
         queryInfo.init({
             document: this.transform(query).document,
@@ -5676,28 +5678,12 @@ var QueryManager = (function () {
             (networkStatus === exports.NetworkStatus.refetch &&
                 refetchWritePolicy !== "merge") ? 1
                 : 2;
-        var resultsFromLink = function () {
-            var get = function () { return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
-                variables: variables,
-                context: context,
-                fetchPolicy: fetchPolicy,
-                errorPolicy: errorPolicy,
-            }); };
-            return fetchBlockingPromise ? fetchBlockingPromise.then(function (ok) { return ok ? get() : zenObservableTs.Observable.of(); }, function (error) {
-                var apolloError = isApolloError(error)
-                    ? error
-                    : new ApolloError({ clientErrors: [error] });
-                if (errorPolicy !== "ignore") {
-                    queryInfo.markError(apolloError);
-                }
-                return zenObservableTs.Observable.of({
-                    loading: false,
-                    networkStatus: exports.NetworkStatus.error,
-                    error: apolloError,
-                    data: readCache().result,
-                });
-            }) : get();
-        };
+        var resultsFromLink = function () { return _this.getResultsFromLink(queryInfo, cacheWriteBehavior, {
+            variables: variables,
+            context: context,
+            fetchPolicy: fetchPolicy,
+            errorPolicy: errorPolicy,
+        }); };
         var shouldNotify = notifyOnNetworkStatusChange &&
             typeof oldNetworkStatus === "number" &&
             oldNetworkStatus !== networkStatus &&
@@ -6020,17 +6006,17 @@ function getApolloContext() {
 
 var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
-    return React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
+    return (React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
         __DEV__ ? tsInvariant.invariant(context && context.client, 'Could not find "client" in the context of ApolloConsumer. ' +
             'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 25);
         return props.children(context.client);
-    });
+    }));
 };
 
 var ApolloProvider = function (_a) {
     var client = _a.client, children = _a.children;
     var ApolloContext = getApolloContext();
-    return React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
+    return (React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
         if (context === void 0) { context = {}; }
         if (client && context.client !== client) {
             context = Object.assign({}, context, { client: client });
@@ -6038,7 +6024,7 @@ var ApolloProvider = function (_a) {
         __DEV__ ? tsInvariant.invariant(context.client, 'ApolloProvider was not passed a client instance. Make ' +
             'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 26);
         return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
-    });
+    }));
 };
 
 function useApolloClient(override) {
@@ -6080,16 +6066,30 @@ function parser(document) {
     __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of ".concat(document, " passed to parser was not a valid GraphQL ") +
         "DocumentNode. You may need to use 'graphql-tag' or another method " +
         "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 30);
-    var fragments = document.definitions.filter(function (x) { return x.kind === 'FragmentDefinition'; });
-    var queries = document.definitions.filter(function (x) {
-        return x.kind === 'OperationDefinition' && x.operation === 'query';
-    });
-    var mutations = document.definitions.filter(function (x) {
-        return x.kind === 'OperationDefinition' && x.operation === 'mutation';
-    });
-    var subscriptions = document.definitions.filter(function (x) {
-        return x.kind === 'OperationDefinition' && x.operation === 'subscription';
-    });
+    var fragments = [];
+    var queries = [];
+    var mutations = [];
+    var subscriptions = [];
+    for (var _i = 0, _a = document.definitions; _i < _a.length; _i++) {
+        var x = _a[_i];
+        if (x.kind === 'FragmentDefinition') {
+            fragments.push(x);
+            continue;
+        }
+        if (x.kind === 'OperationDefinition') {
+            switch (x.operation) {
+                case 'query':
+                    queries.push(x);
+                    break;
+                case 'mutation':
+                    mutations.push(x);
+                    break;
+                case 'subscription':
+                    subscriptions.push(x);
+                    break;
+            }
+        }
+    }
     __DEV__ ? tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), "Passing only a fragment to 'graphql' is not yet supported. " +
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
@@ -6152,6 +6152,8 @@ var InternalState = (function () {
     function InternalState(client, query) {
         this.client = client;
         this.query = query;
+        this.asyncResolveFns = new Set();
+        this.optionsToIgnoreOnce = new (canUseWeakSet ? WeakSet : Set)();
         this.ssrDisabledResult = maybeDeepFreeze({
             loading: true,
             data: void 0,
@@ -6168,6 +6170,15 @@ var InternalState = (function () {
         verifyDocumentType(query, exports.DocumentType.Query);
     }
     InternalState.prototype.forceUpdate = function () {
+        __DEV__ && tsInvariant.invariant.warn("Calling default no-op implementation of InternalState#forceUpdate");
+    };
+    InternalState.prototype.asyncUpdate = function () {
+        var _this = this;
+        return new Promise(function (resolve) {
+            _this.asyncResolveFns.add(resolve);
+            _this.optionsToIgnoreOnce.add(_this.watchQueryOptions);
+            _this.forceUpdate();
+        });
     };
     InternalState.prototype.useQuery = function (options) {
         var _this = this;
@@ -6220,30 +6231,34 @@ var InternalState = (function () {
             obsQuery,
             this.renderPromises,
             this.client.disableNetworkFetches,
-        ]), function () { return _this.getCurrentResult(); });
+        ]), function () { return _this.getCurrentResult(); }, function () { return _this.getCurrentResult(); });
         this.unsafeHandlePartialRefetch(result);
-        return this.toQueryResult(result);
+        var queryResult = this.toQueryResult(result);
+        if (!queryResult.loading && this.asyncResolveFns.size) {
+            this.asyncResolveFns.forEach(function (resolve) { return resolve(queryResult); });
+            this.asyncResolveFns.clear();
+        }
+        return queryResult;
     };
     InternalState.prototype.useOptions = function (options) {
         var _a;
         var watchQueryOptions = this.createWatchQueryOptions(this.queryHookOptions = options);
         var currentWatchQueryOptions = this.watchQueryOptions;
-        var resolveFetchBlockingPromise;
-        if (!equality.equal(watchQueryOptions, currentWatchQueryOptions)) {
+        if (this.optionsToIgnoreOnce.has(currentWatchQueryOptions) ||
+            !equality.equal(watchQueryOptions, currentWatchQueryOptions)) {
             this.watchQueryOptions = watchQueryOptions;
             if (currentWatchQueryOptions && this.observable) {
-                this.observable.reobserve(tslib.__assign({ fetchBlockingPromise: new Promise(function (resolve) {
-                        resolveFetchBlockingPromise = resolve;
-                    }) }, watchQueryOptions));
+                this.optionsToIgnoreOnce.delete(currentWatchQueryOptions);
+                this.observable.reobserve(watchQueryOptions);
                 this.previousData = ((_a = this.result) === null || _a === void 0 ? void 0 : _a.data) || this.previousData;
                 this.result = void 0;
             }
         }
-        useUnblockFetchEffect(this.renderPromises, resolveFetchBlockingPromise);
         this.onCompleted = options.onCompleted || InternalState.prototype.onCompleted;
         this.onError = options.onError || InternalState.prototype.onError;
         if ((this.renderPromises || this.client.disableNetworkFetches) &&
-            this.queryHookOptions.ssr === false) {
+            this.queryHookOptions.ssr === false &&
+            !this.queryHookOptions.skip) {
             this.result = this.ssrDisabledResult;
         }
         else if (this.queryHookOptions.skip ||
@@ -6256,63 +6271,46 @@ var InternalState = (function () {
         }
     };
     InternalState.prototype.createWatchQueryOptions = function (_a) {
+        var _b;
         if (_a === void 0) { _a = {}; }
-        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.displayName; var defaultOptions = _a.defaultOptions, otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "displayName", "defaultOptions"]);
-        var toMerge = [];
-        var globalDefaults = this.client.defaultOptions.watchQuery;
-        if (globalDefaults)
-            toMerge.push(globalDefaults);
-        if (defaultOptions)
-            toMerge.push(defaultOptions);
-        var latestOptions = this.observable && this.observable.options;
-        if (latestOptions && toMerge.length) {
-            var defaults_1 = toMerge.reduce(mergeOptions, Object.create(null));
-            toMerge.length = 1;
-            toMerge[0] = defaults_1;
-            Object.keys(defaults_1).forEach(function (defaultOptionName) {
-                var currentOptionValue = latestOptions[defaultOptionName];
-                if (hasOwnProperty.call(latestOptions, defaultOptionName) &&
-                    !equality.equal(defaults_1[defaultOptionName], currentOptionValue)) {
-                    defaults_1[defaultOptionName] = defaultOptionName === "variables"
-                        ? tslib.__assign(tslib.__assign({}, defaults_1.variables), currentOptionValue) : currentOptionValue;
-                }
-            });
-        }
-        toMerge.push(otherOptions);
-        var merged = toMerge.reduce(mergeOptions, Object.create(null));
-        var watchQueryOptions = Object.assign(merged, { query: this.query });
+        var skip = _a.skip; _a.ssr; _a.onCompleted; _a.onError; _a.displayName; _a.defaultOptions; var otherOptions = tslib.__rest(_a, ["skip", "ssr", "onCompleted", "onError", "displayName", "defaultOptions"]);
+        var watchQueryOptions = Object.assign(otherOptions, { query: this.query });
         if (this.renderPromises &&
             (watchQueryOptions.fetchPolicy === 'network-only' ||
                 watchQueryOptions.fetchPolicy === 'cache-and-network')) {
             watchQueryOptions.fetchPolicy = 'cache-first';
         }
-        else if (!watchQueryOptions.fetchPolicy) {
-            watchQueryOptions.fetchPolicy = 'cache-first';
+        if (!watchQueryOptions.variables) {
+            watchQueryOptions.variables = {};
         }
         if (skip) {
-            var _b = watchQueryOptions.initialFetchPolicy, initialFetchPolicy = _b === void 0 ? watchQueryOptions.fetchPolicy : _b;
+            var _c = watchQueryOptions.fetchPolicy, fetchPolicy = _c === void 0 ? this.getDefaultFetchPolicy() : _c, _d = watchQueryOptions.initialFetchPolicy, initialFetchPolicy = _d === void 0 ? fetchPolicy : _d;
             Object.assign(watchQueryOptions, {
                 initialFetchPolicy: initialFetchPolicy,
                 fetchPolicy: 'standby',
             });
         }
-        if (!watchQueryOptions.variables) {
-            watchQueryOptions.variables = {};
+        else if (!watchQueryOptions.fetchPolicy) {
+            watchQueryOptions.fetchPolicy =
+                ((_b = this.observable) === null || _b === void 0 ? void 0 : _b.options.initialFetchPolicy) ||
+                    this.getDefaultFetchPolicy();
         }
         return watchQueryOptions;
     };
+    InternalState.prototype.getDefaultFetchPolicy = function () {
+        var _a, _b;
+        return (((_a = this.queryHookOptions.defaultOptions) === null || _a === void 0 ? void 0 : _a.fetchPolicy) ||
+            ((_b = this.client.defaultOptions.watchQuery) === null || _b === void 0 ? void 0 : _b.fetchPolicy) ||
+            "cache-first");
+    };
     InternalState.prototype.onCompleted = function (data) { };
     InternalState.prototype.onError = function (error) { };
     InternalState.prototype.useObservableQuery = function () {
-        var resolveFetchBlockingPromise;
         var obsQuery = this.observable =
             this.renderPromises
                 && this.renderPromises.getSSRObservable(this.watchQueryOptions)
                 || this.observable
-                || this.client.watchQuery(tslib.__assign({ fetchBlockingPromise: new Promise(function (resolve) {
-                        resolveFetchBlockingPromise = resolve;
-                    }) }, this.watchQueryOptions));
-        useUnblockFetchEffect(this.renderPromises, resolveFetchBlockingPromise);
+                || this.client.watchQuery(mergeOptions(this.queryHookOptions.defaultOptions, this.watchQueryOptions));
         this.obsQueryFields = React.useMemo(function () { return ({
             refetch: obsQuery.refetch.bind(obsQuery),
             reobserve: obsQuery.reobserve.bind(obsQuery),
@@ -6322,11 +6320,11 @@ var InternalState = (function () {
             stopPolling: obsQuery.stopPolling.bind(obsQuery),
             subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
         }); }, [obsQuery]);
-        if (this.renderPromises) {
+        var ssrAllowed = !(this.queryHookOptions.ssr === false ||
+            this.queryHookOptions.skip);
+        if (this.renderPromises && ssrAllowed) {
             this.renderPromises.registerSSRObservable(obsQuery);
-            var ssrAllowed = !(this.queryHookOptions.ssr === false ||
-                this.queryHookOptions.skip);
-            if (ssrAllowed && obsQuery.getCurrentResult().loading) {
+            if (obsQuery.getCurrentResult().loading) {
                 this.renderPromises.addObservableQueryPromise(obsQuery);
             }
         }
@@ -6383,21 +6381,6 @@ var InternalState = (function () {
     };
     return InternalState;
 }());
-function useUnblockFetchEffect(renderPromises, resolveFetchBlockingPromise) {
-    if (resolveFetchBlockingPromise) {
-        if (renderPromises) {
-            resolveFetchBlockingPromise(true);
-        }
-        else {
-            setTimeout(function () { return resolveFetchBlockingPromise(false); }, 5000);
-        }
-    }
-    React.useEffect(function () {
-        if (resolveFetchBlockingPromise) {
-            resolveFetchBlockingPromise(true);
-        }
-    }, [resolveFetchBlockingPromise]);
-}
 
 var EAGER_METHODS = [
     'refetch',
@@ -6410,12 +6393,9 @@ var EAGER_METHODS = [
 function useLazyQuery(query, options) {
     var internalState = useInternalState(useApolloClient(options && options.client), query);
     var execOptionsRef = React.useRef();
-    var defaultOptions = internalState.client.defaultOptions.watchQuery;
-    var initialFetchPolicy = (options && options.fetchPolicy) ||
-        (execOptionsRef.current && execOptionsRef.current.fetchPolicy) ||
-        (defaultOptions && defaultOptions.fetchPolicy) ||
-        "cache-first";
     var useQueryResult = internalState.useQuery(tslib.__assign(tslib.__assign(tslib.__assign({}, options), execOptionsRef.current), { skip: !execOptionsRef.current }));
+    var initialFetchPolicy = useQueryResult.observable.options.initialFetchPolicy ||
+        internalState.getDefaultFetchPolicy();
     var result = Object.assign(useQueryResult, {
         called: !!execOptionsRef.current,
     });
@@ -6439,22 +6419,12 @@ function useLazyQuery(query, options) {
     }, []);
     Object.assign(result, eagerMethods);
     var execute = React.useCallback(function (executeOptions) {
-        var promise = result.reobserve(execOptionsRef.current = executeOptions ? tslib.__assign(tslib.__assign({}, executeOptions), { fetchPolicy: executeOptions.fetchPolicy || initialFetchPolicy }) : {
+        execOptionsRef.current = executeOptions ? tslib.__assign(tslib.__assign({}, executeOptions), { fetchPolicy: executeOptions.fetchPolicy || initialFetchPolicy }) : {
             fetchPolicy: initialFetchPolicy,
-        }).then(function (apolloQueryResult) {
-            apolloQueryResult = apolloQueryResult || internalState["getCurrentResult"]();
-            if (apolloQueryResult.error ||
-                isNonEmptyArray(apolloQueryResult.errors)) {
-                var _a = result.observable.options.errorPolicy, errorPolicy = _a === void 0 ? "none" : _a;
-                if (errorPolicy === "none") {
-                    throw apolloQueryResult.error || new ApolloError({
-                        graphQLErrors: apolloQueryResult.errors,
-                    });
-                }
-            }
-            return internalState.toQueryResult(apolloQueryResult);
-        }).then(function (queryResult) { return Object.assign(queryResult, eagerMethods); });
-        internalState.forceUpdate();
+        };
+        var promise = internalState
+            .asyncUpdate()
+            .then(function (queryResult) { return Object.assign(queryResult, eagerMethods); });
         promise.catch(function () { });
         return promise;
     }, []);