@apollo/client 3.6.0-rc.0 → 3.6.1

package/core/core.cjs

@@ -5,17 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var globals = require('../utilities/globals');
 var tslib = require('tslib');
 var core = require('../link/core');
-var utilities = require('../utilities');
 var http = require('../link/http');
 var equality = require('@wry/equality');
 var cache = require('../cache');
+var utilities = require('../utilities');
 var errors = require('../errors');
 var graphql = require('graphql');
 var utils = require('../link/utils');
 var tsInvariant = require('ts-invariant');
 var graphqlTag = require('graphql-tag');
 
-var version = '3.6.0-rc.0';
+var version = '3.6.1';
 
 exports.NetworkStatus = void 0;
 (function (NetworkStatus) {
@@ -64,15 +64,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 = utilities.getOperationDefinition(options.query);
+        var opDef = utilities.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;
@@ -186,7 +193,7 @@ var ObservableQuery = (function (_super) {
             reobserveOptions.fetchPolicy = 'network-only';
         }
         if (__DEV__ && variables && hasOwnProperty$1.call(variables, "variables")) {
-            var queryDef = utilities.getQueryDefinition(this.options.query);
+            var queryDef = utilities.getQueryDefinition(this.query);
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 __DEV__ && globals.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 })?"));
@@ -200,7 +207,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;
@@ -219,7 +226,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,
@@ -242,7 +249,7 @@ var ObservableQuery = (function (_super) {
             });
             return fetchMoreResult;
         }).finally(function () {
-            if (!updatedQuerySet.has(_this.options.query)) {
+            if (!updatedQuerySet.has(_this.query)) {
                 reobserveCacheFirst(_this);
             }
         });
@@ -412,7 +419,7 @@ var ObservableQuery = (function (_super) {
             newNetworkStatus === exports.NetworkStatus.poll;
         var oldVariables = this.options.variables;
         var oldFetchPolicy = this.options.fetchPolicy;
-        var mergedOptions = mergeOptions(this.options, newOptions || {});
+        var mergedOptions = utilities.mergeOptions(this.options, newOptions || {});
         var options = useDisposableConcast
             ? mergedOptions
             : assign(this.options, mergedOptions);
@@ -1361,9 +1368,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;
     };
@@ -1756,10 +1763,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,
         });
@@ -1788,28 +1795,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() : utilities.Observable.of(); }, function (error) {
-                var apolloError = errors.isApolloError(error)
-                    ? error
-                    : new errors.ApolloError({ clientErrors: [error] });
-                if (errorPolicy !== "ignore") {
-                    queryInfo.markError(apolloError);
-                }
-                return utilities.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 &&
@@ -1884,11 +1875,6 @@ var QueryManager = (function () {
 }());
 
 var hasSuggestedDevtools = false;
-function mergeOptions(defaults, options) {
-    return utilities.compact(defaults, options, options.variables && {
-        variables: tslib.__assign(tslib.__assign({}, defaults.variables), options.variables),
-    });
-}
 var ApolloClient = (function () {
     function ApolloClient(options) {
         var _this = this;
@@ -1987,7 +1973,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.watchQuery = function (options) {
         if (this.defaultOptions.watchQuery) {
-            options = mergeOptions(this.defaultOptions.watchQuery, options);
+            options = utilities.mergeOptions(this.defaultOptions.watchQuery, options);
         }
         if (this.disableNetworkFetches &&
             (options.fetchPolicy === 'network-only' ||
@@ -1998,7 +1984,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.query = function (options) {
         if (this.defaultOptions.query) {
-            options = mergeOptions(this.defaultOptions.query, options);
+            options = utilities.mergeOptions(this.defaultOptions.query, options);
         }
         __DEV__ ? globals.invariant(options.fetchPolicy !== 'cache-and-network', 'The cache-and-network fetchPolicy does not work with client.query, because ' +
             'client.query can only return a single result. Please use client.watchQuery ' +
@@ -2011,7 +1997,7 @@ var ApolloClient = (function () {
     };
     ApolloClient.prototype.mutate = function (options) {
         if (this.defaultOptions.mutate) {
-            options = mergeOptions(this.defaultOptions.mutate, options);
+            options = utilities.mergeOptions(this.defaultOptions.mutate, options);
         }
         return this.queryManager.mutate(options);
     };
@@ -2120,15 +2106,16 @@ var ApolloClient = (function () {
 
 tsInvariant.setVerbosity(globals.DEV ? "log" : "silent");
 
-exports.Observable = utilities.Observable;
-exports.isReference = utilities.isReference;
-exports.makeReference = utilities.makeReference;
 exports.ApolloCache = cache.ApolloCache;
 exports.Cache = cache.Cache;
 exports.InMemoryCache = cache.InMemoryCache;
 exports.MissingFieldError = cache.MissingFieldError;
 exports.defaultDataIdFromObject = cache.defaultDataIdFromObject;
 exports.makeVar = cache.makeVar;
+exports.Observable = utilities.Observable;
+exports.isReference = utilities.isReference;
+exports.makeReference = utilities.makeReference;
+exports.mergeOptions = utilities.mergeOptions;
 exports.ApolloError = errors.ApolloError;
 exports.isApolloError = errors.isApolloError;
 exports.fromError = utils.fromError;
@@ -2143,7 +2130,6 @@ exports.gql = graphqlTag.gql;
 exports.resetCaches = graphqlTag.resetCaches;
 exports.ApolloClient = ApolloClient;
 exports.ObservableQuery = ObservableQuery;
-exports.mergeOptions = mergeOptions;
 for (var k in core) {
     if (k !== 'default' && !exports.hasOwnProperty(k)) exports[k] = core[k];
 }