@apollo/client 3.6.0-rc.0 → 3.6.1

package/apollo-client.cjs

@@ -1088,6 +1088,12 @@ function stringifyForDisplay(value) {
     }).split(JSON.stringify(undefId)).join("<undefined>");
 }
 
+function mergeOptions(defaults, options) {
+    return compact(defaults, options, options.variables && {
+        variables: tslib.__assign(tslib.__assign({}, defaults.variables), options.variables),
+    });
+}
+
 function fromError(errorValue) {
     return new zenObservableTs.Observable(function (observer) {
         observer.error(errorValue);
@@ -1292,7 +1298,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-rc.0';
+var version = '3.6.1';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -3939,15 +3945,22 @@ var ObservableQuery = (function (_super) {
         }) || this;
         _this.observers = new Set();
         _this.subscriptions = new Set();
+        _this.queryInfo = queryInfo;
+        _this.queryManager = queryManager;
         _this.isTornDown = false;
         _this.options = tslib.__assign({ initialFetchPolicy: options.fetchPolicy || "cache-first" }, options);
         _this.queryId = queryInfo.queryId || queryManager.generateQueryId();
-        var opDef = getOperationDefinition(options.query);
+        var opDef = getOperationDefinition(_this.query);
         _this.queryName = opDef && opDef.name && opDef.name.value;
-        _this.queryManager = queryManager;
-        _this.queryInfo = queryInfo;
         return _this;
     }
+    Object.defineProperty(ObservableQuery.prototype, "query", {
+        get: function () {
+            return this.queryManager.transform(this.options.query).document;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(ObservableQuery.prototype, "variables", {
         get: function () {
             return this.options.variables;
@@ -4061,7 +4074,7 @@ var ObservableQuery = (function (_super) {
             reobserveOptions.fetchPolicy = 'network-only';
         }
         if (__DEV__ && variables && hasOwnProperty$2.call(variables, "variables")) {
-            var queryDef = getQueryDefinition(this.options.query);
+            var queryDef = getQueryDefinition(this.query);
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 __DEV__ && tsInvariant.invariant.warn("Called refetch(".concat(JSON.stringify(variables), ") for query ").concat(((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || JSON.stringify(queryDef), ", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?"));
@@ -4075,7 +4088,7 @@ var ObservableQuery = (function (_super) {
     };
     ObservableQuery.prototype.fetchMore = function (fetchMoreOptions) {
         var _this = this;
-        var combinedOptions = tslib.__assign(tslib.__assign({}, (fetchMoreOptions.query ? fetchMoreOptions : tslib.__assign(tslib.__assign(tslib.__assign({}, this.options), fetchMoreOptions), { variables: tslib.__assign(tslib.__assign({}, this.options.variables), fetchMoreOptions.variables) }))), { fetchPolicy: "no-cache" });
+        var combinedOptions = tslib.__assign(tslib.__assign({}, (fetchMoreOptions.query ? fetchMoreOptions : tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, this.options), { query: this.query }), fetchMoreOptions), { variables: tslib.__assign(tslib.__assign({}, this.options.variables), fetchMoreOptions.variables) }))), { fetchPolicy: "no-cache" });
         var qid = this.queryManager.generateQueryId();
         var queryInfo = this.queryInfo;
         var originalNetworkStatus = queryInfo.networkStatus;
@@ -4094,7 +4107,7 @@ var ObservableQuery = (function (_super) {
                     var updateQuery = fetchMoreOptions.updateQuery;
                     if (updateQuery) {
                         cache.updateQuery({
-                            query: _this.options.query,
+                            query: _this.query,
                             variables: _this.variables,
                             returnPartialData: true,
                             optimistic: false,
@@ -4117,7 +4130,7 @@ var ObservableQuery = (function (_super) {
             });
             return fetchMoreResult;
         }).finally(function () {
-            if (!updatedQuerySet.has(_this.options.query)) {
+            if (!updatedQuerySet.has(_this.query)) {
                 reobserveCacheFirst(_this);
             }
         });
@@ -5236,9 +5249,9 @@ var QueryManager = (function () {
         });
         this.queries.set(observable.queryId, queryInfo);
         queryInfo.init({
-            document: options.query,
+            document: observable.query,
             observableQuery: observable,
-            variables: options.variables,
+            variables: observable.variables,
         });
         return observable;
     };
@@ -5631,10 +5644,10 @@ 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: query,
+            document: this.transform(query).document,
             variables: variables,
             networkStatus: networkStatus,
         });
@@ -5663,28 +5676,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 &&
@@ -5759,11 +5756,6 @@ var QueryManager = (function () {
 }());
 
 var hasSuggestedDevtools = false;
-function mergeOptions(defaults, options) {
-    return compact(defaults, options, options.variables && {
-        variables: tslib.__assign(tslib.__assign({}, defaults.variables), options.variables),
-    });
-}
 var ApolloClient = (function () {
     function ApolloClient(options) {
         var _this = this;
@@ -6072,16 +6064,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 ||
@@ -6220,20 +6226,14 @@ var InternalState = (function () {
         var _a;
         var watchQueryOptions = this.createWatchQueryOptions(this.queryHookOptions = options);
         var currentWatchQueryOptions = this.watchQueryOptions;
-        var resolveFetchBlockingPromise;
         if (!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.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.ssrDisabled = !!(options.ssr === false ||
-            options.skip);
         this.onCompleted = options.onCompleted || InternalState.prototype.onCompleted;
         this.onError = options.onError || InternalState.prototype.onError;
         if ((this.renderPromises || this.client.disableNetworkFetches) &&
@@ -6298,15 +6298,11 @@ var InternalState = (function () {
     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(tslib.__assign({}, this.watchQueryOptions));
         this.obsQueryFields = React.useMemo(function () { return ({
             refetch: obsQuery.refetch.bind(obsQuery),
             reobserve: obsQuery.reobserve.bind(obsQuery),
@@ -6318,7 +6314,9 @@ var InternalState = (function () {
         }); }, [obsQuery]);
         if (this.renderPromises) {
             this.renderPromises.registerSSRObservable(obsQuery);
-            if (!this.ssrDisabled && obsQuery.getCurrentResult().loading) {
+            var ssrAllowed = !(this.queryHookOptions.ssr === false ||
+                this.queryHookOptions.skip);
+            if (ssrAllowed && obsQuery.getCurrentResult().loading) {
                 this.renderPromises.addObservableQueryPromise(obsQuery);
             }
         }
@@ -6375,21 +6373,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',
@@ -6535,9 +6518,12 @@ function useMutation(mutation, options) {
     var reset = React.useCallback(function () {
         setResult({ called: false, loading: false, client: client });
     }, []);
-    React.useEffect(function () { return function () {
-        ref.current.isMounted = false;
-    }; }, []);
+    React.useEffect(function () {
+        ref.current.isMounted = true;
+        return function () {
+            ref.current.isMounted = false;
+        };
+    }, []);
     return [execute, tslib.__assign({ reset: reset }, result)];
 }