@apollo/client 4.0.0-alpha.7 → 4.0.0-alpha.8

package/__cjs/core/QueryManager.cjs

@@ -96,16 +96,16 @@ class QueryManager {
         this.queries.forEach((_info, queryId) => {
             this.removeQuery(queryId);
         });
-        this.cancelPendingFetches((0, invariant_1.newInvariantError)(70));
+        this.cancelPendingFetches((0, invariant_1.newInvariantError)(72));
     }
     cancelPendingFetches(error) {
         this.fetchCancelFns.forEach((cancel) => cancel(error));
         this.fetchCancelFns.clear();
     }
     async mutate({ mutation, variables, optimisticResponse, updateQueries, refetchQueries = [], awaitRefetchQueries = false, update: updateWithProxyFn, onQueryUpdated, fetchPolicy = this.defaultOptions.mutate?.fetchPolicy || "network-only", errorPolicy = this.defaultOptions.mutate?.errorPolicy || "none", keepRootFields, context, }) {
-        (0, invariant_1.invariant)(mutation, 71);
+        (0, invariant_1.invariant)(mutation, 73);
         (0, utilities_1.checkDocument)(mutation, graphql_1.OperationTypeNode.MUTATION);
-        (0, invariant_1.invariant)(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 72);
+        (0, invariant_1.invariant)(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 74);
         const mutationId = this.generateMutationId();
         mutation = this.cache.transformForLink(this.transform(mutation));
         const { hasClientExports } = this.getDocumentInfo(mutation);
@@ -198,7 +198,7 @@ class QueryManager {
                     }
                 },
                 error: (err) => {
-                    const error = maybeWrapError(err);
+                    const error = (0, errors_1.toErrorLike)(err);
                     if (mutationStoreValue) {
                         mutationStoreValue.loading = false;
                         mutationStoreValue.error = error;
@@ -403,7 +403,7 @@ class QueryManager {
         return true;
     }
     fetchQuery(queryId, options, networkStatus) {
-        return (0, rxjs_1.lastValueFrom)(this.fetchObservableWithInfo(queryId, options, networkStatus).observable.pipe((0, rxjs_1.map)(internal_1.toQueryResult)), {
+        return (0, rxjs_1.lastValueFrom)(this.fetchObservableWithInfo(this.getOrCreateQuery(queryId), options, networkStatus).observable.pipe((0, rxjs_1.map)(internal_1.toQueryResult)), {
             // This default is needed when a `standby` fetch policy is used to avoid
             // an EmptyError from rejecting this promise.
             defaultValue: { data: undefined },
@@ -478,7 +478,9 @@ class QueryManager {
             options,
         });
         observable["lastQuery"] = query;
-        this.queries.set(observable.queryId, queryInfo);
+        if (!ObservableQuery_js_1.ObservableQuery["inactiveOnCreation"].getValue()) {
+            this.queries.set(observable.queryId, queryInfo);
+        }
         // We give queryInfo the transformed query to ensure the first cache diff
         // uses the transformed query instead of the raw query
         queryInfo.init({ document: query, variables: observable.variables });
@@ -520,7 +522,7 @@ class QueryManager {
         // depend on values that previously existed in the data portion of the
         // store. So, we cancel the promises and observers that we have issued
         // so far and not yet resolved (in the case of queries).
-        this.cancelPendingFetches((0, invariant_1.newInvariantError)(73));
+        this.cancelPendingFetches((0, invariant_1.newInvariantError)(75));
         this.queries.forEach((queryInfo) => {
             if (queryInfo.observableQuery) {
                 // Set loading to true so listeners don't trigger unless they want
@@ -586,7 +588,7 @@ class QueryManager {
                 // pre-allocate a new query ID here, using a special prefix to enable
                 // cleaning up these temporary queries later, after fetching.
                 const queryId = (0, utilities_4.makeUniqueId)("legacyOneTimeQuery");
-                const queryInfo = this.getQuery(queryId).init({
+                const queryInfo = this.getOrCreateQuery(queryId).init({
                     document: options.query,
                     variables: options.variables,
                 });
@@ -608,10 +610,10 @@ class QueryManager {
                 if (!included) {
                     const queryName = queryNames.get(nameOrQueryString);
                     if (queryName) {
-                        __DEV__ && invariant_1.invariant.warn(74, queryName);
+                        __DEV__ && invariant_1.invariant.warn(76, queryName);
                     }
                     else {
-                        __DEV__ && invariant_1.invariant.warn(75);
+                        __DEV__ && invariant_1.invariant.warn(77);
                     }
                 }
             });
@@ -627,14 +629,11 @@ class QueryManager {
                 (fetchPolicy !== "standby" && fetchPolicy !== "cache-only")) {
                 observableQueryPromises.push(observableQuery.refetch());
             }
-            this.getQuery(queryId).setDiff(null);
+            (this.queries.get(queryId) || observableQuery["queryInfo"]).setDiff(null);
         });
         this.broadcastQueries();
         return Promise.all(observableQueryPromises);
     }
-    setObservableQuery(observableQuery) {
-        this.getQuery(observableQuery.queryId).setObservableQuery(observableQuery);
-    }
     startGraphQLSubscription(options) {
         let { query, variables } = options;
         const { fetchPolicy, errorPolicy = "none", context = {}, extensions = {}, } = options;
@@ -681,7 +680,7 @@ class QueryManager {
             if (errorPolicy === "ignore") {
                 return (0, rxjs_1.of)({ data: undefined });
             }
-            return (0, rxjs_1.of)({ data: undefined, error: maybeWrapError(error) });
+            return (0, rxjs_1.of)({ data: undefined, error: (0, errors_1.toErrorLike)(error) });
         }), (0, rxjs_1.filter)((result) => !!(result.data || result.error)));
         if (this.getDocumentInfo(query).hasClientExports) {
             const observablePromise = this.localState
@@ -707,14 +706,14 @@ class QueryManager {
         // The same queryId could have two rejection fns for two promises
         this.fetchCancelFns.delete(queryId);
         if (this.queries.has(queryId)) {
-            this.getQuery(queryId).stop();
+            this.queries.get(queryId)?.stop();
             this.queries.delete(queryId);
         }
     }
     broadcastQueries() {
         if (this.onBroadcast)
             this.onBroadcast();
-        this.queries.forEach((info) => info.notify());
+        this.queries.forEach((info) => info.observableQuery?.["notify"]());
     }
     getLocalState() {
         return this.localState;
@@ -793,7 +792,7 @@ class QueryManager {
             if (requestId >= queryInfo.lastRequestId) {
                 if (hasErrors && errorPolicy === "none") {
                     queryInfo.resetLastWrite();
-                    queryInfo.reset();
+                    queryInfo.observableQuery?.["resetNotifications"]();
                     // Throwing here effectively calls observer.error.
                     throw new errors_1.CombinedGraphQLErrors(result);
                 }
@@ -821,11 +820,11 @@ class QueryManager {
             }
             return aqr;
         }), (0, rxjs_1.catchError)((error) => {
-            error = maybeWrapError(error);
+            error = (0, errors_1.toErrorLike)(error);
             // Avoid storing errors from older interrupted queries.
             if (requestId >= queryInfo.lastRequestId && errorPolicy === "none") {
                 queryInfo.resetLastWrite();
-                queryInfo.reset();
+                queryInfo.observableQuery?.["resetNotifications"]();
                 throw error;
             }
             const aqr = {
@@ -841,13 +840,12 @@ class QueryManager {
             return (0, rxjs_1.of)(aqr);
         }));
     }
-    fetchObservableWithInfo(queryId, options, 
+    fetchObservableWithInfo(queryInfo, options, 
     // The initial networkStatus for this fetch, most often
     // NetworkStatus.loading, but also possibly fetchMore, poll, refetch,
     // or setVariables.
     networkStatus = networkStatus_js_1.NetworkStatus.loading, query = options.query, emitLoadingState = false) {
         const variables = this.getVariables(query, options.variables);
-        const queryInfo = this.getQuery(queryId);
         const defaults = this.defaultOptions.watchQuery;
         let { fetchPolicy = (defaults && defaults.fetchPolicy) || "cache-first", errorPolicy = (defaults && defaults.errorPolicy) || "none", returnPartialData = false, notifyOnNetworkStatusChange = false, context = {}, } = options;
         if (this.prioritizeCacheValues &&
@@ -881,13 +879,13 @@ class QueryManager {
         // This cancel function needs to be set before the concast is created,
         // in case concast creation synchronously cancels the request.
         const cleanupCancelFn = () => {
-            this.fetchCancelFns.delete(queryId);
+            this.fetchCancelFns.delete(queryInfo.queryId);
             // We need to call `complete` on the subject here otherwise the merged
             // observable will never complete since it waits for all source
             // observables to complete before itself completes.
             fetchCancelSubject.complete();
         };
-        this.fetchCancelFns.set(queryId, (reason) => {
+        this.fetchCancelFns.set(queryInfo.queryId, (reason) => {
             fetchCancelSubject.error(reason);
             cleanupCancelFn();
         });
@@ -925,7 +923,7 @@ class QueryManager {
             this.getObservableQueries(include).forEach((oq, queryId) => {
                 includedQueriesById.set(queryId, {
                     oq,
-                    lastDiff: this.getQuery(queryId).getDiff(),
+                    lastDiff: (this.queries.get(queryId) || oq["queryInfo"]).getDiff(),
                 });
             });
         }
@@ -1011,9 +1009,7 @@ class QueryManager {
                 // queries, even the QueryOptions ones.
                 if (onQueryUpdated) {
                     if (!diff) {
-                        const info = oq["queryInfo"];
-                        info.reset(); // Force info.getDiff() to read from cache.
-                        diff = info.getDiff();
+                        diff = this.cache.diff(oq["queryInfo"]["getDiffOptions"]());
                     }
                     result = onQueryUpdated(oq, diff, lastDiff);
                 }
@@ -1053,7 +1049,7 @@ class QueryManager {
                 !(0, utilities_3.isFullyUnmaskedOperation)(document) &&
                 !this.noCacheWarningsByQueryId.has(operationId)) {
                 this.noCacheWarningsByQueryId.add(operationId);
-                __DEV__ && invariant_1.invariant.warn(76, (0, utilities_4.getOperationName)(document) ??
+                __DEV__ && invariant_1.invariant.warn(78, (0, utilities_4.getOperationName)(document) ??
                     `Unnamed ${operationType ?? "operation"}`);
             }
         }
@@ -1200,7 +1196,7 @@ class QueryManager {
                 return { fromLink: false, observable: rxjs_1.EMPTY };
         }
     }
-    getQuery(queryId) {
+    getOrCreateQuery(queryId) {
         if (queryId && !this.queries.has(queryId)) {
             this.queries.set(queryId, new QueryInfo_js_1.QueryInfo(this, queryId));
         }
@@ -1216,23 +1212,6 @@ class QueryManager {
     }
 }
 exports.QueryManager = QueryManager;
-function isErrorLike(error) {
-    return (error !== null &&
-        typeof error === "object" &&
-        typeof error.message === "string" &&
-        typeof error.name === "string" &&
-        (typeof error.stack === "undefined" ||
-            typeof error.stack === "string"));
-}
-function maybeWrapError(error) {
-    if (isErrorLike(error)) {
-        return error;
-    }
-    if (typeof error === "string") {
-        return new Error(error, { cause: error });
-    }
-    return new errors_1.UnconventionalError(error);
-}
 function validateDidEmitValue() {
     let didEmitValue = false;
     return (0, rxjs_1.tap)({
@@ -1240,7 +1219,7 @@ function validateDidEmitValue() {
             didEmitValue = true;
         },
         complete() {
-            (0, invariant_1.invariant)(didEmitValue, 77);
+            (0, invariant_1.invariant)(didEmitValue, 79);
         },
     });
 }