@apollo/client 3.6.0-beta.7 → 3.6.0-beta.8

package/apollo-client.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var tsInvariant = require('ts-invariant');
-var equality = require('@wry/equality');
+var equal = require('@wry/equality');
 var zenObservableTs = require('zen-observable-ts');
 require('symbol-observable');
 var graphql = require('graphql');
@@ -14,6 +14,8 @@ var trie = require('@wry/trie');
 var graphqlTag = require('graphql-tag');
 var React = require('react');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
+
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
     var n = Object.create(null);
@@ -26,6 +28,7 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
+var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 function maybe(thunk) {
@@ -1291,7 +1294,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-beta.7';
+var version = '3.6.0-beta.8';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -2159,7 +2162,7 @@ var Layer = (function (_super) {
                     }
                     else if (ownStoreObject !== parentStoreObject) {
                         Object.keys(ownStoreObject).forEach(function (storeFieldName) {
-                            if (!equality.equal(ownStoreObject[storeFieldName], parentStoreObject[storeFieldName])) {
+                            if (!equal.equal(ownStoreObject[storeFieldName], parentStoreObject[storeFieldName])) {
                                 _this.group.dirty(dataId, storeFieldName);
                             }
                         });
@@ -2203,7 +2206,7 @@ var Stump = (function (_super) {
 function storeObjectReconciler(existingObject, incomingObject, property) {
     var existingValue = existingObject[property];
     var incomingValue = incomingObject[property];
-    return equality.equal(existingValue, incomingValue) ? existingValue : incomingValue;
+    return equal.equal(existingValue, incomingValue) ? existingValue : incomingValue;
 }
 function supportsResultCaching(store) {
     return !!(store instanceof EntityStore && store.group.caching);
@@ -3533,7 +3536,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
         return;
     if (isReference(existing))
         return;
-    if (equality.equal(existing, incoming))
+    if (equal.equal(existing, incoming))
         return;
     if (Object.keys(existing).every(function (key) { return store.getFieldValue(incoming, key) !== void 0; })) {
         return;
@@ -3847,7 +3850,7 @@ var InMemoryCache = (function (_super) {
                 return;
             }
         }
-        if (!lastDiff || !equality.equal(lastDiff.result, diff.result)) {
+        if (!lastDiff || !equal.equal(lastDiff.result, diff.result)) {
             c.callback(c.lastDiff = diff, lastDiff);
         }
     };
@@ -3992,7 +3995,7 @@ var ObservableQuery = (function (_super) {
             if (diff.complete || this.options.returnPartialData) {
                 result.data = diff.result;
             }
-            if (equality.equal(result.data, {})) {
+            if (equal.equal(result.data, {})) {
                 result.data = void 0;
             }
             if (diff.complete) {
@@ -4023,13 +4026,13 @@ var ObservableQuery = (function (_super) {
         return result;
     };
     ObservableQuery.prototype.isDifferentFromLastResult = function (newResult) {
-        return !this.last || !equality.equal(this.last.result, newResult);
+        return !this.last || !equal.equal(this.last.result, newResult);
     };
     ObservableQuery.prototype.getLast = function (key, variablesMustMatch) {
         var last = this.last;
         if (last &&
             last[key] &&
-            (!variablesMustMatch || equality.equal(last.variables, this.variables))) {
+            (!variablesMustMatch || equal.equal(last.variables, this.variables))) {
             return last[key];
         }
     };
@@ -4068,7 +4071,7 @@ var ObservableQuery = (function (_super) {
                 __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 })?"));
             }
         }
-        if (variables && !equality.equal(this.options.variables, variables)) {
+        if (variables && !equal.equal(this.options.variables, variables)) {
             reobserveOptions.variables = this.options.variables = tslib.__assign(tslib.__assign({}, this.options.variables), variables);
         }
         this.queryInfo.resetLastWrite();
@@ -4149,7 +4152,7 @@ var ObservableQuery = (function (_super) {
         return this.reobserve(newOptions);
     };
     ObservableQuery.prototype.setVariables = function (variables) {
-        if (equality.equal(this.variables, variables)) {
+        if (equal.equal(this.variables, variables)) {
             return this.observers.size
                 ? this.result()
                 : Promise.resolve();
@@ -4261,7 +4264,7 @@ var ObservableQuery = (function (_super) {
             if (newOptions &&
                 newOptions.variables &&
                 !newOptions.fetchPolicy &&
-                !equality.equal(newOptions.variables, oldVariables)) {
+                !equal.equal(newOptions.variables, oldVariables)) {
                 options.fetchPolicy = this.initialFetchPolicy;
                 if (newNetworkStatus === void 0) {
                     newNetworkStatus = exports.NetworkStatus.setVariables;
@@ -4643,10 +4646,10 @@ var QueryInfo = (function () {
         var networkStatus = query.networkStatus || exports.NetworkStatus.loading;
         if (this.variables &&
             this.networkStatus !== exports.NetworkStatus.loading &&
-            !equality.equal(this.variables, query.variables)) {
+            !equal.equal(this.variables, query.variables)) {
             networkStatus = exports.NetworkStatus.setVariables;
         }
-        if (!equality.equal(query.variables, this.variables)) {
+        if (!equal.equal(query.variables, this.variables)) {
             this.lastDiff = void 0;
         }
         Object.assign(this, {
@@ -4672,7 +4675,7 @@ var QueryInfo = (function () {
     QueryInfo.prototype.getDiff = function (variables) {
         if (variables === void 0) { variables = this.variables; }
         var options = this.getDiffOptions(variables);
-        if (this.lastDiff && equality.equal(options, this.lastDiff.options)) {
+        if (this.lastDiff && equal.equal(options, this.lastDiff.options)) {
             return this.lastDiff.diff;
         }
         this.updateWatch(this.variables = variables);
@@ -4706,7 +4709,7 @@ var QueryInfo = (function () {
         var oldDiff = this.lastDiff && this.lastDiff.diff;
         this.updateLastDiff(diff);
         if (!this.dirty &&
-            !equality.equal(oldDiff && oldDiff.result, diff && diff.result)) {
+            !equal.equal(oldDiff && oldDiff.result, diff && diff.result)) {
             this.dirty = true;
             if (!this.notifyTimeout) {
                 this.notifyTimeout = setTimeout(function () { return _this.notify(); }, 0);
@@ -4780,7 +4783,7 @@ var QueryInfo = (function () {
         }
         var watchOptions = tslib.__assign(tslib.__assign({}, this.getDiffOptions(variables)), { watcher: this, callback: function (diff) { return _this.setDiff(diff); } });
         if (!this.lastWatch ||
-            !equality.equal(watchOptions, this.lastWatch)) {
+            !equal.equal(watchOptions, this.lastWatch)) {
             this.cancel();
             this.cancel = this.cache.watch(this.lastWatch = watchOptions);
         }
@@ -4792,8 +4795,8 @@ var QueryInfo = (function () {
         var lastWrite = this.lastWrite;
         return !(lastWrite &&
             lastWrite.dmCount === destructiveMethodCounts.get(this.cache) &&
-            equality.equal(variables, lastWrite.variables) &&
-            equality.equal(result.data, lastWrite.result.data));
+            equal.equal(variables, lastWrite.variables) &&
+            equal.equal(result.data, lastWrite.result.data));
     };
     QueryInfo.prototype.markResult = function (result, options, cacheWriteBehavior) {
         var _this = this;
@@ -5594,7 +5597,7 @@ var QueryManager = (function () {
             var data = diff.result;
             if (__DEV__ &&
                 !returnPartialData &&
-                !equality.equal(data, {})) {
+                !equal.equal(data, {})) {
                 logMissingFieldErrors(diff.missing);
             }
             var fromData = function (data) { return zenObservableTs.Observable.of(tslib.__assign({ data: data, loading: isNetworkRequestInFlight(networkStatus), networkStatus: networkStatus }, (diff.complete ? null : { partial: true }))); };
@@ -6057,9 +6060,27 @@ function verifyDocumentType(document, type) {
         "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 34);
 }
 
+function useNormalizedOptions(optionsOrFunction) {
+    var optionsRef = React.useRef();
+    var options = optionsRef.current || Object.create(null);
+    if (typeof optionsOrFunction === "function") {
+        var newOptions = optionsOrFunction(options);
+        if (newOptions !== options) {
+            Object.assign(options, newOptions, newOptions.variables && {
+                variables: tslib.__assign(tslib.__assign({}, options.variables), newOptions.variables),
+            });
+        }
+    }
+    else if (optionsOrFunction && !equal__default(optionsOrFunction, options)) {
+        options = optionsOrFunction;
+    }
+    return optionsRef.current = options;
+}
+
 var hasOwnProperty = Object.prototype.hasOwnProperty;
-function useQuery(query, options) {
-    return useInternalState(useApolloClient(options && options.client), query).useQuery(options);
+function useQuery(query, optionsOrFunction) {
+    var options = useNormalizedOptions(optionsOrFunction);
+    return useInternalState(useApolloClient(options.client), query).useQuery(options);
 }
 function useInternalState(client, query) {
     var stateRef = React.useRef();
@@ -6094,8 +6115,8 @@ var InternalState = (function () {
     };
     InternalState.prototype.useOptions = function (options) {
         this.renderPromises = React.useContext(getApolloContext()).renderPromises;
-        var watchQueryOptions = this.createWatchQueryOptions(this.queryHookOptions = options || {});
-        if (!equality.equal(watchQueryOptions, this.watchQueryOptions)) {
+        var watchQueryOptions = this.createWatchQueryOptions(this.queryHookOptions = options);
+        if (!equal.equal(watchQueryOptions, this.watchQueryOptions)) {
             this.watchQueryOptions = watchQueryOptions;
         }
         this.ssrDisabled = !!(options && (options.ssr === false ||
@@ -6198,7 +6219,7 @@ var InternalState = (function () {
                 if (previousResult &&
                     previousResult.loading === result.loading &&
                     previousResult.networkStatus === result.networkStatus &&
-                    equality.equal(previousResult.data, result.data)) {
+                    equal.equal(previousResult.data, result.data)) {
                     return;
                 }
                 _this.setResult(result);
@@ -6219,7 +6240,7 @@ var InternalState = (function () {
                 var previousResult = _this.result;
                 if (!previousResult ||
                     (previousResult && previousResult.loading) ||
-                    !equality.equal(error, previousResult.error)) {
+                    !equal.equal(error, previousResult.error)) {
                     _this.setResult({
                         data: (previousResult && previousResult.data),
                         error: error,
@@ -6315,7 +6336,8 @@ var EAGER_METHODS = [
     'startPolling',
     'subscribeToMore',
 ];
-function useLazyQuery(query, options) {
+function useLazyQuery(query, optionsOrFunction) {
+    var options = useNormalizedOptions(optionsOrFunction);
     var _a = React.useState({
         called: false,
     }), execution = _a[0], setExecution = _a[1];
@@ -6406,7 +6428,7 @@ function useMutation(mutation, options) {
                     error: error,
                     client: client,
                 };
-                if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
+                if (ref.current.isMounted && !equal.equal(ref.current.result, result_1)) {
                     setResult(ref.current.result = result_1);
                 }
             }
@@ -6424,7 +6446,7 @@ function useMutation(mutation, options) {
                     called: true,
                     client: client,
                 };
-                if (!equality.equal(ref.current.result, result_2)) {
+                if (!equal.equal(ref.current.result, result_2)) {
                     setResult(ref.current.result = result_2);
                 }
             }
@@ -6487,7 +6509,7 @@ function useSubscription(subscription, options) {
             subscription !== ref.current.subscription ||
             (options === null || options === void 0 ? void 0 : options.fetchPolicy) !== ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.fetchPolicy) ||
             !(options === null || options === void 0 ? void 0 : options.skip) !== !((_c = ref.current.options) === null || _c === void 0 ? void 0 : _c.skip) ||
-            !equality.equal(options === null || options === void 0 ? void 0 : options.variables, (_d = ref.current.options) === null || _d === void 0 ? void 0 : _d.variables))) {
+            !equal.equal(options === null || options === void 0 ? void 0 : options.variables, (_d = ref.current.options) === null || _d === void 0 ? void 0 : _d.variables))) {
             setResult({
                 loading: true,
                 data: void 0,