@apollo/client 3.7.0-alpha.1 → 3.7.0-alpha.2

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.7.0-alpha.1';
+var version = '3.7.0-alpha.2';
 
 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;
@@ -6250,51 +6252,38 @@ 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 () {
@@ -6302,7 +6291,7 @@ var InternalState = (function () {
             this.renderPromises
                 && this.renderPromises.getSSRObservable(this.watchQueryOptions)
                 || this.observable
-                || this.client.watchQuery(tslib.__assign({}, this.watchQueryOptions));
+                || 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),
@@ -6385,12 +6374,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,
     });