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

package/apollo-client.cjs

@@ -13,7 +13,6 @@ var context = require('@wry/context');
 var trie = require('@wry/trie');
 var graphqlTag = require('graphql-tag');
 var React = require('react');
-var index_js = require('use-sync-external-store/shim/index.js');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -899,11 +898,14 @@ function asyncMap(observable, mapFn, catchFn) {
     });
 }
 
-var canUseWeakMap = typeof WeakMap === 'function' && !(typeof navigator === 'object' &&
-    navigator.product === 'ReactNative');
+var canUseWeakMap = typeof WeakMap === 'function' &&
+    maybe(function () { return navigator.product; }) !== 'ReactNative';
 var canUseWeakSet = typeof WeakSet === 'function';
 var canUseSymbol = typeof Symbol === 'function' &&
     typeof Symbol.for === 'function';
+var canUseDOM = typeof maybe(function () { return window.document.createElement; }) === "function";
+var usingJSDOM = maybe(function () { return navigator.userAgent.indexOf("jsdom") >= 0; }) || false;
+var canUseLayoutEffect = canUseDOM && !usingJSDOM;
 
 function fixObservableSubclass(subclass) {
     function set(key) {
@@ -927,7 +929,6 @@ var Concast = (function (_super) {
             return function () { return _this.removeObserver(observer); };
         }) || this;
         _this.observers = new Set();
-        _this.addCount = 0;
         _this.promise = new Promise(function (resolve, reject) {
             _this.resolve = resolve;
             _this.reject = reject;
@@ -936,6 +937,7 @@ var Concast = (function (_super) {
             next: function (result) {
                 if (_this.sub !== null) {
                     _this.latest = ["next", result];
+                    _this.notify("next", result);
                     iterateObserversSafely(_this.observers, "next", result);
                 }
             },
@@ -947,13 +949,17 @@ var Concast = (function (_super) {
                     _this.sub = null;
                     _this.latest = ["error", error];
                     _this.reject(error);
+                    _this.notify("error", error);
                     iterateObserversSafely(_this.observers, "error", error);
                 }
             },
             complete: function () {
-                if (_this.sub !== null) {
+                var sub = _this.sub;
+                if (sub !== null) {
                     var value = _this.sources.shift();
                     if (!value) {
+                        if (sub)
+                            setTimeout(function () { return sub.unsubscribe(); });
                         _this.sub = null;
                         if (_this.latest &&
                             _this.latest[0] === "next") {
@@ -962,6 +968,7 @@ var Concast = (function (_super) {
                         else {
                             _this.resolve();
                         }
+                        _this.notify("complete");
                         iterateObserversSafely(_this.observers, "complete");
                     }
                     else if (isPromiseLike(value)) {
@@ -973,6 +980,7 @@ var Concast = (function (_super) {
                 }
             },
         };
+        _this.nextResultListeners = new Set();
         _this.cancel = function (reason) {
             _this.reject(reason);
             _this.sources = [];
@@ -1014,34 +1022,29 @@ var Concast = (function (_super) {
         if (!this.observers.has(observer)) {
             this.deliverLastMessage(observer);
             this.observers.add(observer);
-            ++this.addCount;
         }
     };
-    Concast.prototype.removeObserver = function (observer, quietly) {
+    Concast.prototype.removeObserver = function (observer) {
         if (this.observers.delete(observer) &&
-            --this.addCount < 1 &&
-            !quietly) {
-            this.handlers.error(new Error("Observable cancelled prematurely"));
+            this.observers.size < 1) {
+            this.handlers.complete();
         }
     };
-    Concast.prototype.cleanup = function (callback) {
-        var _this = this;
+    Concast.prototype.notify = function (method, arg) {
+        var nextResultListeners = this.nextResultListeners;
+        if (nextResultListeners.size) {
+            this.nextResultListeners = new Set;
+            nextResultListeners.forEach(function (listener) { return listener(method, arg); });
+        }
+    };
+    Concast.prototype.beforeNext = function (callback) {
         var called = false;
-        var once = function () {
+        this.nextResultListeners.add(function (method, arg) {
             if (!called) {
                 called = true;
-                _this.observers.delete(observer);
-                callback();
+                callback(method, arg);
             }
-        };
-        var observer = {
-            next: once,
-            error: once,
-            complete: once,
-        };
-        var count = this.addCount;
-        this.addObserver(observer);
-        this.addCount = count;
+        });
     };
     return Concast;
 }(zenObservableTs.Observable));
@@ -1298,7 +1301,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.7.0-alpha.2';
+var version = '3.7.0-alpha.5';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -4330,7 +4333,7 @@ var ObservableQuery = (function (_super) {
         };
         if (!useDisposableConcast) {
             if (this.concast && this.observer) {
-                this.concast.removeObserver(this.observer, true);
+                this.concast.removeObserver(this.observer);
             }
             this.concast = concast;
             this.observer = observer;
@@ -5475,7 +5478,7 @@ var QueryManager = (function () {
                         execute(link, operation)
                     ]);
                     byVariables_1.set(varJson_1, observable = concast);
-                    concast.cleanup(function () {
+                    concast.beforeNext(function () {
                         if (byVariables_1.delete(varJson_1) &&
                             byVariables_1.size < 1) {
                             inFlightLinkObservables_1.delete(serverQuery);
@@ -5510,6 +5513,7 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
         var requestId = queryInfo.lastRequestId = this.generateRequestId();
+        options = cloneDeep(options);
         return asyncMap(this.getObservableFromLink(queryInfo.document, options.context, options.variables), function (result) {
             var hasErrors = isNonEmptyArray(result.errors);
             if (requestId >= queryInfo.lastRequestId) {
@@ -5568,7 +5572,7 @@ var QueryManager = (function () {
         var concast = new Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
             : fromVariables(normalized.variables));
-        concast.cleanup(function () {
+        concast.beforeNext(function () {
             _this.fetchCancelFns.delete(queryId);
             if (queryInfo.observableQuery) {
                 queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
@@ -6036,6 +6040,51 @@ function useApolloClient(override) {
     return client;
 }
 
+var didWarnUncachedGetSnapshot = false;
+var uSESKey = "useSyncExternalStore";
+var realHook = React__namespace[uSESKey];
+var useSyncExternalStore = realHook || (function (subscribe, getSnapshot, getServerSnapshot) {
+    var value = getSnapshot();
+    if (__DEV__ &&
+        !didWarnUncachedGetSnapshot &&
+        value !== getSnapshot()) {
+        didWarnUncachedGetSnapshot = true;
+        __DEV__ && tsInvariant.invariant.error('The result of getSnapshot should be cached to avoid an infinite loop');
+    }
+    var _a = React__namespace.useState({ inst: { value: value, getSnapshot: getSnapshot } }), inst = _a[0].inst, forceUpdate = _a[1];
+    if (canUseLayoutEffect) {
+        React__namespace.useLayoutEffect(function () {
+            Object.assign(inst, { value: value, getSnapshot: getSnapshot });
+            if (checkIfSnapshotChanged(inst)) {
+                forceUpdate({ inst: inst });
+            }
+        }, [subscribe, value, getSnapshot]);
+    }
+    else {
+        Object.assign(inst, { value: value, getSnapshot: getSnapshot });
+    }
+    React__namespace.useEffect(function () {
+        if (checkIfSnapshotChanged(inst)) {
+            forceUpdate({ inst: inst });
+        }
+        return subscribe(function handleStoreChange() {
+            if (checkIfSnapshotChanged(inst)) {
+                forceUpdate({ inst: inst });
+            }
+        });
+    }, [subscribe]);
+    return value;
+});
+function checkIfSnapshotChanged(_a) {
+    var value = _a.value, getSnapshot = _a.getSnapshot;
+    try {
+        return value !== getSnapshot();
+    }
+    catch (_b) {
+        return true;
+    }
+}
+
 exports.DocumentType = void 0;
 (function (DocumentType) {
     DocumentType[DocumentType["Query"] = 0] = "Query";
@@ -6152,6 +6201,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,13 +6219,22 @@ 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;
         this.renderPromises = React.useContext(getApolloContext()).renderPromises;
         this.useOptions(options);
         var obsQuery = this.useObservableQuery();
-        var result = index_js.useSyncExternalStore(React.useCallback(function () {
+        var result = useSyncExternalStore(React.useCallback(function () {
             if (_this.renderPromises) {
                 return function () { };
             }
@@ -6222,15 +6282,22 @@ var InternalState = (function () {
             this.client.disableNetworkFetches,
         ]), 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;
-        if (!equality.equal(watchQueryOptions, currentWatchQueryOptions)) {
+        if (this.optionsToIgnoreOnce.has(currentWatchQueryOptions) ||
+            !equality.equal(watchQueryOptions, currentWatchQueryOptions)) {
             this.watchQueryOptions = watchQueryOptions;
             if (currentWatchQueryOptions && this.observable) {
+                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;
@@ -6239,7 +6306,8 @@ var InternalState = (function () {
         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 ||
@@ -6301,11 +6369,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);
             }
         }
@@ -6400,22 +6468,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;
     }, []);
@@ -6533,6 +6591,12 @@ function useSubscription(subscription, options) {
             context: options === null || options === void 0 ? void 0 : options.context,
         });
     }), observable = _b[0], setObservable = _b[1];
+    var canResetObservableRef = React.useRef(false);
+    React.useEffect(function () {
+        return function () {
+            canResetObservableRef.current = true;
+        };
+    }, []);
     var ref = React.useRef({ client: client, subscription: subscription, options: options });
     React.useEffect(function () {
         var _a, _b, _c, _d;
@@ -6541,7 +6605,7 @@ function useSubscription(subscription, options) {
             shouldResubscribe = !!shouldResubscribe(options);
         }
         if (options === null || options === void 0 ? void 0 : options.skip) {
-            if (!(options === null || options === void 0 ? void 0 : options.skip) !== !((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip)) {
+            if (!(options === null || options === void 0 ? void 0 : options.skip) !== !((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip) || canResetObservableRef.current) {
                 setResult({
                     loading: false,
                     data: void 0,
@@ -6549,13 +6613,16 @@ function useSubscription(subscription, options) {
                     variables: options === null || options === void 0 ? void 0 : options.variables,
                 });
                 setObservable(null);
+                canResetObservableRef.current = false;
             }
         }
-        else if (shouldResubscribe !== false && (client !== ref.current.client ||
-            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))) {
+        else if ((shouldResubscribe !== false &&
+            (client !== ref.current.client ||
+                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))) ||
+            canResetObservableRef.current) {
             setResult({
                 loading: true,
                 data: void 0,
@@ -6568,9 +6635,10 @@ function useSubscription(subscription, options) {
                 fetchPolicy: options === null || options === void 0 ? void 0 : options.fetchPolicy,
                 context: options === null || options === void 0 ? void 0 : options.context,
             }));
+            canResetObservableRef.current = false;
         }
         Object.assign(ref.current, { client: client, subscription: subscription, options: options });
-    }, [client, subscription, options]);
+    }, [client, subscription, options, canResetObservableRef.current]);
     React.useEffect(function () {
         if (!observable) {
             return;