@apollo/client 3.8.0-beta.2 → 3.8.0-beta.4

package/apollo-client.cjs

@@ -33,7 +33,7 @@ var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var version = '3.8.0-beta.2';
+var version = '3.8.0-beta.4';
 
 function maybe(thunk) {
     try {
@@ -614,6 +614,17 @@ var DocumentTransform = (function () {
     return DocumentTransform;
 }());
 
+var printCache = canUseWeakMap ? new WeakMap() : undefined;
+var print = function (ast) {
+    var result;
+    result = printCache === null || printCache === void 0 ? void 0 : printCache.get(ast);
+    if (!result) {
+        result = graphql.print(ast);
+        printCache === null || printCache === void 0 ? void 0 : printCache.set(ast, result);
+    }
+    return result;
+};
+
 var isArray = Array.isArray;
 function isNonEmptyArray(value) {
     return Array.isArray(value) && value.length > 0;
@@ -1453,12 +1464,13 @@ function transformOperation(operation) {
     return transformedOperation;
 }
 
-function filterOperationVariables(variables, operation) {
+function filterOperationVariables(variables, query) {
     var result = tslib.__assign({}, variables);
     var unusedNames = new Set(Object.keys(variables));
-    graphql.visit(operation.query, {
+    graphql.visit(query, {
         Variable: function (node, _key, parent) {
-            if (parent && parent.kind !== 'VariableDefinition') {
+            if (parent &&
+                parent.kind !== 'VariableDefinition') {
                 unusedNames.delete(node.name.value);
             }
         },
@@ -1970,7 +1982,7 @@ function selectHttpOptionsAndBodyInternal(operation, printer) {
     if (http.includeExtensions)
         body.extensions = extensions;
     if (http.includeQuery)
-        body.query = printer(query, graphql.print);
+        body.query = printer(query, print);
     return {
         options: options,
         body: body,
@@ -2107,7 +2119,7 @@ var createHttpLink = function (linkOptions) {
         }
         var _b = selectHttpOptionsAndBodyInternal(operation, print, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
         if (body.variables && !includeUnusedVariables) {
-            body.variables = filterOperationVariables(body.variables, operation);
+            body.variables = filterOperationVariables(body.variables, operation.query);
         }
         var controller;
         if (!options.signal) {
@@ -6263,8 +6275,9 @@ var QueryManager = (function () {
             };
             context = operation.context;
             if (deduplication) {
-                var byVariables_1 = inFlightLinkObservables_1.get(serverQuery) || new Map();
-                inFlightLinkObservables_1.set(serverQuery, byVariables_1);
+                var printedServerQuery_1 = print(serverQuery);
+                var byVariables_1 = inFlightLinkObservables_1.get(printedServerQuery_1) || new Map();
+                inFlightLinkObservables_1.set(printedServerQuery_1, byVariables_1);
                 var varJson_1 = canonicalStringify(variables);
                 observable = byVariables_1.get(varJson_1);
                 if (!observable) {
@@ -6275,7 +6288,7 @@ var QueryManager = (function () {
                     concast.beforeNext(function () {
                         if (byVariables_1.delete(varJson_1) &&
                             byVariables_1.size < 1) {
-                            inFlightLinkObservables_1.delete(serverQuery);
+                            inFlightLinkObservables_1.delete(printedServerQuery_1);
                         }
                     });
                 }
@@ -7654,15 +7667,20 @@ function useSuspenseQuery(query, options) {
     if (options === void 0) { options = Object.create(null); }
     var client = useApolloClient(options.client);
     var suspenseCache = useSuspenseCache(options.suspenseCache);
-    var watchQueryOptions = useWatchQueryOptions({ query: query, options: options });
-    var variables = watchQueryOptions.variables;
+    var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
+    var fetchPolicy = watchQueryOptions.fetchPolicy, variables = watchQueryOptions.variables;
     var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
     var cacheKey = [client, query, canonicalStringify(variables)].concat(queryKey);
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
+    var currentFetchPolicy = queryRef.watchQueryOptions.fetchPolicy;
     var _b = React.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
     var promise = promiseCache.get(queryRef.key);
+    if (currentFetchPolicy === 'standby' && fetchPolicy !== currentFetchPolicy) {
+        promise = queryRef.reobserve({ fetchPolicy: fetchPolicy });
+        promiseCache.set(queryRef.key, promise);
+    }
     if (!promise) {
         promise = queryRef.promise;
         promiseCache.set(queryRef.key, promise);
@@ -7675,7 +7693,16 @@ function useSuspenseQuery(query, options) {
             });
         });
     }, [queryRef]);
-    var result = __use(promise);
+    var skipResult = React.useMemo(function () {
+        var error = toApolloError(queryRef.result);
+        return {
+            loading: false,
+            data: queryRef.result.data,
+            networkStatus: error ? exports.NetworkStatus.error : exports.NetworkStatus.ready,
+            error: error,
+        };
+    }, [queryRef.result]);
+    var result = watchQueryOptions.fetchPolicy === 'standby' ? skipResult : __use(promise);
     var fetchMore = React.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
         setPromiseCache(function (previousPromiseCache) {
@@ -7737,26 +7764,40 @@ function useTrackedQueryRefs(queryRef) {
     });
 }
 function useWatchQueryOptions(_a) {
-    var query = _a.query, options = _a.options;
-    var watchQueryOptions = useDeepMemo(function () { return (tslib.__assign(tslib.__assign({}, options), { query: query, notifyOnNetworkStatusChange: false, nextFetchPolicy: void 0 })); }, [options, query]);
-    if (__DEV__) {
-        validateOptions(watchQueryOptions);
-    }
-    return watchQueryOptions;
+    var client = _a.client, query = _a.query, options = _a.options;
+    return useDeepMemo(function () {
+        var _a;
+        var fetchPolicy = options.fetchPolicy ||
+            ((_a = client.defaultOptions.watchQuery) === null || _a === void 0 ? void 0 : _a.fetchPolicy) ||
+            'cache-first';
+        var watchQueryOptions = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: fetchPolicy, query: query, notifyOnNetworkStatusChange: false, nextFetchPolicy: void 0 });
+        if (__DEV__) {
+            validateOptions(watchQueryOptions);
+        }
+        if (options.skip) {
+            watchQueryOptions.fetchPolicy = 'standby';
+        }
+        return watchQueryOptions;
+    }, [client, options, query]);
 }
 
 function useBackgroundQuery(query, options) {
     if (options === void 0) { options = Object.create(null); }
     var suspenseCache = useSuspenseCache(options.suspenseCache);
     var client = useApolloClient(options.client);
-    var watchQueryOptions = useWatchQueryOptions({ query: query, options: options });
-    var variables = watchQueryOptions.variables;
+    var watchQueryOptions = useWatchQueryOptions({ client: client, query: query, options: options });
+    var fetchPolicy = watchQueryOptions.fetchPolicy, variables = watchQueryOptions.variables;
     var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
     var cacheKey = [client, query, canonicalStringify(variables)].concat(queryKey);
     var queryRef = suspenseCache.getQueryRef(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
+    var currentFetchPolicy = queryRef.watchQueryOptions.fetchPolicy;
     var _b = React.useState(function () { return new Map([[queryRef.key, queryRef.promise]]); }), promiseCache = _b[0], setPromiseCache = _b[1];
+    if (currentFetchPolicy === 'standby' && fetchPolicy !== currentFetchPolicy) {
+        var promise = queryRef.reobserve({ fetchPolicy: fetchPolicy });
+        promiseCache.set(queryRef.key, promise);
+    }
     useTrackedQueryRefs(queryRef);
     var fetchMore = React.useCallback(function (options) {
         var promise = queryRef.fetchMore(options);
@@ -7786,6 +7827,15 @@ function useBackgroundQuery(query, options) {
 function useReadQuery(queryRef) {
     var _a = React.useState(0), forceUpdate = _a[1];
     invariant(queryRef.promiseCache, 49);
+    var skipResult = React.useMemo(function () {
+        var error = toApolloError(queryRef.result);
+        return {
+            loading: false,
+            data: queryRef.result.data,
+            networkStatus: error ? exports.NetworkStatus.error : exports.NetworkStatus.ready,
+            error: error,
+        };
+    }, [queryRef.result]);
     var promise = queryRef.promiseCache.get(queryRef.key);
     if (!promise) {
         promise = queryRef.promise;
@@ -7797,7 +7847,9 @@ function useReadQuery(queryRef) {
             forceUpdate(function (prevState) { return prevState + 1; });
         });
     }, [queryRef]);
-    var result = __use(promise);
+    var result = queryRef.watchQueryOptions.fetchPolicy === 'standby'
+        ? skipResult
+        : __use(promise);
     return React.useMemo(function () {
         return {
             data: result.data,
@@ -7843,6 +7895,13 @@ var QueryReference = (function () {
         }
         this.autoDisposeTimeoutId = setTimeout(this.dispose, (_a = options.autoDisposeTimeoutMs) !== null && _a !== void 0 ? _a : 30000);
     }
+    Object.defineProperty(QueryReference.prototype, "watchQueryOptions", {
+        get: function () {
+            return this.observable.options;
+        },
+        enumerable: false,
+        configurable: true
+    });
     QueryReference.prototype.listen = function (listener) {
         var _this = this;
         clearTimeout(this.autoDisposeTimeoutId);
@@ -7862,6 +7921,11 @@ var QueryReference = (function () {
         this.promise = promise;
         return promise;
     };
+    QueryReference.prototype.reobserve = function (watchQueryOptions) {
+        var promise = this.observable.reobserve(watchQueryOptions);
+        this.promise = promise;
+        return promise;
+    };
     QueryReference.prototype.dispose = function () {
         this.subscription.unsubscribe();
         this.onDispose();
@@ -7913,21 +7977,21 @@ var QueryReference = (function () {
 var SuspenseCache = (function () {
     function SuspenseCache(options) {
         if (options === void 0) { options = Object.create(null); }
-        this.cacheKeys = new trie.Trie(canUseWeakMap, function (cacheKey) { return cacheKey; });
-        this.queryRefs = new Map();
+        this.queryRefs = new trie.Trie(canUseWeakMap);
         this.options = options;
     }
     SuspenseCache.prototype.getQueryRef = function (cacheKey, createObservable) {
-        var _this = this;
-        var stableCacheKey = this.cacheKeys.lookupArray(cacheKey);
-        if (!this.queryRefs.has(stableCacheKey)) {
-            this.queryRefs.set(stableCacheKey, new QueryReference(createObservable(), {
-                key: stableCacheKey,
+        var ref = this.queryRefs.lookupArray(cacheKey);
+        if (!ref.current) {
+            ref.current = new QueryReference(createObservable(), {
+                key: cacheKey,
                 autoDisposeTimeoutMs: this.options.autoDisposeTimeoutMs,
-                onDispose: function () { return _this.queryRefs.delete(stableCacheKey); },
-            }));
+                onDispose: function () {
+                    delete ref.current;
+                },
+            });
         }
-        return this.queryRefs.get(stableCacheKey);
+        return ref.current;
     };
     return SuspenseCache;
 }());