@apollo/client 3.9.0-alpha.1 → 3.9.0-alpha.3

package/apollo-client.cjs

@@ -31,7 +31,7 @@ function _interopNamespace(e) {
 var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-var version = "3.9.0-alpha.1";
+var version = "3.9.0-alpha.3";
 
 function maybe(thunk) {
     try {
@@ -71,11 +71,14 @@ function wrap(fn) {
             args[_i - 1] = arguments[_i];
         }
         if (typeof message === "number") {
-            fn(getErrorMsg(message, args));
-        }
-        else {
-            fn.apply(void 0, tslib.__spreadArray([message], args, false));
+            var arg0 = message;
+            message = getHandledErrorMsg(arg0);
+            if (!message) {
+                message = getFallbackErrorMsg(arg0, args);
+                args = [];
+            }
         }
+        fn.apply(void 0, [message].concat(args));
     };
 }
 var invariant = Object.assign(function invariant(condition, message) {
@@ -84,7 +87,7 @@ var invariant = Object.assign(function invariant(condition, message) {
         args[_i - 2] = arguments[_i];
     }
     if (!condition) {
-        tsInvariant.invariant(condition, getErrorMsg(message, args));
+        tsInvariant.invariant(condition, getHandledErrorMsg(message, args) || getFallbackErrorMsg(message, args));
     }
 }, {
     debug: wrap(tsInvariant.invariant.debug),
@@ -97,23 +100,31 @@ function newInvariantError(message) {
     for (var _i = 1; _i < arguments.length; _i++) {
         optionalParams[_i - 1] = arguments[_i];
     }
-    return new tsInvariant.InvariantError(getErrorMsg(message, optionalParams));
+    return new tsInvariant.InvariantError(getHandledErrorMsg(message, optionalParams) ||
+        getFallbackErrorMsg(message, optionalParams));
 }
 var ApolloErrorMessageHandler = Symbol.for("ApolloErrorMessageHandler_" + version);
-function getErrorMsg(message, messageArgs) {
+function stringify(arg) {
+    return typeof arg == "string"
+        ? arg
+        : stringifyForDisplay(arg, 2).slice(0, 1000);
+}
+function getHandledErrorMsg(message, messageArgs) {
     if (messageArgs === void 0) { messageArgs = []; }
     if (!message)
         return;
-    var args = messageArgs.map(function (arg) {
-        return typeof arg == "string" ? arg : stringifyForDisplay(arg, 2).slice(0, 1000);
-    });
-    return ((global$1[ApolloErrorMessageHandler] &&
-        global$1[ApolloErrorMessageHandler](message, args)) ||
-        "An error occurred! For more details, see the full error text at https://go.apollo.dev/c/err#".concat(encodeURIComponent(JSON.stringify({
-            version: version,
-            message: message,
-            args: args,
-        }))));
+    return (global$1[ApolloErrorMessageHandler] &&
+        global$1[ApolloErrorMessageHandler](message, messageArgs.map(stringify)));
+}
+function getFallbackErrorMsg(message, messageArgs) {
+    if (messageArgs === void 0) { messageArgs = []; }
+    if (!message)
+        return;
+    return "An error occurred! For more details, see the full error text at https://go.apollo.dev/c/err#".concat(encodeURIComponent(JSON.stringify({
+        version: version,
+        message: message,
+        args: messageArgs.map(stringify),
+    })));
 }
 
 function shouldInclude(_a, variables) {
@@ -127,7 +138,7 @@ function shouldInclude(_a, variables) {
         if (ifArgument.value.kind === "Variable") {
             evaledValue =
                 variables && variables[ifArgument.value.name.value];
-            invariant(evaledValue !== void 0, 65, directive.name.value);
+            invariant(evaledValue !== void 0, 67, directive.name.value);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -162,12 +173,12 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            invariant(directiveArguments && directiveArguments.length === 1, 66, directiveName);
+            invariant(directiveArguments && directiveArguments.length === 1, 68, directiveName);
             var ifArgument = directiveArguments[0];
-            invariant(ifArgument.name && ifArgument.name.value === "if", 67, directiveName);
+            invariant(ifArgument.name && ifArgument.name.value === "if", 69, directiveName);
             var ifValue = ifArgument.value;
             invariant(ifValue &&
-                (ifValue.kind === "Variable" || ifValue.kind === "BooleanValue"), 68, directiveName);
+                (ifValue.kind === "Variable" || ifValue.kind === "BooleanValue"), 70, directiveName);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -193,7 +204,7 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === "OperationDefinition") {
             throw newInvariantError(
-                69,
+                71,
                 definition.operation,
                 definition.name ? " named '".concat(definition.name.value, "'") : ""
             );
@@ -203,7 +214,7 @@ function getFragmentQueryDocument(document, fragmentName) {
         }
     });
     if (typeof actualFragmentName === "undefined") {
-        invariant(fragments.length === 1, 70, fragments.length);
+        invariant(fragments.length === 1, 72, fragments.length);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -244,7 +255,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
                 return fragmentMap(fragmentName);
             }
             var fragment = fragmentMap && fragmentMap[fragmentName];
-            invariant(fragment, 71, fragmentName);
+            invariant(fragment, 73, fragmentName);
             return fragment || null;
         }
         default:
@@ -252,6 +263,43 @@ function getFragmentFromSelection(selection, fragmentMap) {
     }
 }
 
+var canonicalStringify = Object.assign(function canonicalStringify(value) {
+    return JSON.stringify(value, stableObjectReplacer);
+}, {
+    reset: function () {
+        sortingMap.clear();
+    },
+});
+var sortingMap = new Map();
+function stableObjectReplacer(key, value) {
+    if (value && typeof value === "object") {
+        var proto = Object.getPrototypeOf(value);
+        if (proto === Object.prototype || proto === null) {
+            var keys = Object.keys(value);
+            if (keys.every(everyKeyInOrder))
+                return value;
+            var unsortedKey = JSON.stringify(keys);
+            var sortedKeys = sortingMap.get(unsortedKey);
+            if (!sortedKeys) {
+                keys.sort();
+                var sortedKey = JSON.stringify(keys);
+                sortedKeys = sortingMap.get(sortedKey) || keys;
+                sortingMap.set(unsortedKey, sortedKeys);
+                sortingMap.set(sortedKey, sortedKeys);
+            }
+            var sortedObject_1 = Object.create(proto);
+            sortedKeys.forEach(function (key) {
+                sortedObject_1[key] = value[key];
+            });
+            return sortedObject_1;
+        }
+    }
+    return value;
+}
+function everyKeyInOrder(key, i, keys) {
+    return i === 0 || keys[i - 1] <= key;
+}
+
 function makeReference(id) {
     return { __ref: String(id) };
 }
@@ -322,7 +370,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
         argObj[name.value] = null;
     }
     else {
-        throw newInvariantError(80, name.value, value.kind);
+        throw newInvariantError(82, name.value, value.kind);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -358,6 +406,7 @@ var KNOWN_DIRECTIVES = [
     "export",
     "nonreactive",
 ];
+var storeKeyNameStringify = canonicalStringify;
 var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     if (args &&
         directives &&
@@ -373,7 +422,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
             filterKeys.forEach(function (key) {
                 filteredArgs_1[key] = args[key];
             });
-            return "".concat(directives["connection"]["key"], "(").concat(stringify(filteredArgs_1), ")");
+            return "".concat(directives["connection"]["key"], "(").concat(storeKeyNameStringify(filteredArgs_1), ")");
         }
         else {
             return directives["connection"]["key"];
@@ -381,7 +430,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     }
     var completeFieldName = fieldName;
     if (args) {
-        var stringifiedArgs = stringify(args);
+        var stringifiedArgs = storeKeyNameStringify(args);
         completeFieldName += "(".concat(stringifiedArgs, ")");
     }
     if (directives) {
@@ -389,7 +438,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
             if (KNOWN_DIRECTIVES.indexOf(key) !== -1)
                 return;
             if (directives[key] && Object.keys(directives[key]).length) {
-                completeFieldName += "@".concat(key, "(").concat(stringify(directives[key]), ")");
+                completeFieldName += "@".concat(key, "(").concat(storeKeyNameStringify(directives[key]), ")");
             }
             else {
                 completeFieldName += "@".concat(key);
@@ -399,25 +448,11 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     return completeFieldName;
 }, {
     setStringify: function (s) {
-        var previous = stringify;
-        stringify = s;
+        var previous = storeKeyNameStringify;
+        storeKeyNameStringify = s;
         return previous;
     },
 });
-var stringify = function defaultStringify(value) {
-    return JSON.stringify(value, stringifyReplacer);
-};
-function stringifyReplacer(_key, value) {
-    if (isNonNullObject(value) && !Array.isArray(value)) {
-        value = Object.keys(value)
-            .sort()
-            .reduce(function (copy, key) {
-            copy[key] = value[key];
-            return copy;
-        }, {});
-    }
-    return value;
-}
 function argumentsObjectFromField(field, variables) {
     if (field.arguments && field.arguments.length) {
         var argObj_1 = {};
@@ -469,16 +504,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    invariant(doc && doc.kind === "Document", 72);
+    invariant(doc && doc.kind === "Document", 74);
     var operations = doc.definitions
         .filter(function (d) { return d.kind !== "FragmentDefinition"; })
         .map(function (definition) {
         if (definition.kind !== "OperationDefinition") {
-            throw newInvariantError(73, definition.kind);
+            throw newInvariantError(75, definition.kind);
         }
         return definition;
     });
-    invariant(operations.length <= 1, 74, operations.length);
+    invariant(operations.length <= 1, 76, operations.length);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -501,14 +536,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    invariant(queryDef && queryDef.operation === "query", 75);
+    invariant(queryDef && queryDef.operation === "query", 77);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    invariant(doc.kind === "Document", 76);
-    invariant(doc.definitions.length <= 1, 77);
+    invariant(doc.kind === "Document", 78);
+    invariant(doc.definitions.length <= 1, 79);
     var fragmentDef = doc.definitions[0];
-    invariant(fragmentDef.kind === "FragmentDefinition", 78);
+    invariant(fragmentDef.kind === "FragmentDefinition", 80);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -531,7 +566,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw newInvariantError(79);
+    throw newInvariantError(81);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -603,7 +638,7 @@ var DocumentTransform = (function () {
             return;
         var cacheKeys = this.getCacheKey(document);
         if (cacheKeys) {
-            invariant(Array.isArray(cacheKeys), 64);
+            invariant(Array.isArray(cacheKeys), 66);
             return this.stableCacheKeys.lookupArray(cacheKeys);
         }
     };
@@ -699,7 +734,7 @@ function removeDirectivesFromDocument(directives, doc) {
                 return getInUseByFragmentName(ancestor.name.value);
             }
         }
-        globalThis.__DEV__ !== false && invariant.error(81);
+        globalThis.__DEV__ !== false && invariant.error(83);
         return null;
     };
     var operationCount = 0;
@@ -1092,48 +1127,31 @@ function iterateObserversSafely(observers, method, argument) {
 
 function asyncMap(observable, mapFn, catchFn) {
     return new zenObservableTs.Observable(function (observer) {
-        var next = observer.next, error = observer.error, complete = observer.complete;
-        var activeCallbackCount = 0;
-        var completed = false;
         var promiseQueue = {
             then: function (callback) {
                 return new Promise(function (resolve) { return resolve(callback()); });
             },
         };
-        function makeCallback(examiner, delegate) {
-            if (examiner) {
-                return function (arg) {
-                    ++activeCallbackCount;
-                    var both = function () { return examiner(arg); };
-                    promiseQueue = promiseQueue
-                        .then(both, both)
-                        .then(function (result) {
-                        --activeCallbackCount;
-                        next && next.call(observer, result);
-                        if (completed) {
-                            handler.complete();
-                        }
-                    }, function (error) {
-                        --activeCallbackCount;
-                        throw error;
-                    })
-                        .catch(function (caught) {
-                        error && error.call(observer, caught);
-                    });
-                };
-            }
-            else {
-                return function (arg) { return delegate && delegate.call(observer, arg); };
-            }
+        function makeCallback(examiner, key) {
+            return function (arg) {
+                if (examiner) {
+                    var both = function () {
+                        return observer.closed
+                            ? 0
+                            : examiner(arg);
+                    };
+                    promiseQueue = promiseQueue.then(both, both).then(function (result) { return observer.next(result); }, function (error) { return observer.error(error); });
+                }
+                else {
+                    observer[key](arg);
+                }
+            };
         }
         var handler = {
-            next: makeCallback(mapFn, next),
-            error: makeCallback(catchFn, error),
+            next: makeCallback(mapFn, "next"),
+            error: makeCallback(catchFn, "error"),
             complete: function () {
-                completed = true;
-                if (!activeCallbackCount) {
-                    complete && complete.call(observer);
-                }
+                promiseQueue.then(function () { return observer.complete(); });
             },
         };
         var sub = observable.subscribe(handler);
@@ -1369,7 +1387,7 @@ function toPromise(observable) {
         observable.subscribe({
             next: function (data) {
                 if (completed) {
-                    globalThis.__DEV__ !== false && invariant.warn(40);
+                    globalThis.__DEV__ !== false && invariant.warn(42);
                 }
                 else {
                     completed = true;
@@ -1412,7 +1430,7 @@ function validateOperation(operation) {
     for (var _i = 0, _a = Object.keys(operation); _i < _a.length; _i++) {
         var key = _a[_i];
         if (OPERATION_FIELDS.indexOf(key) < 0) {
-            throw newInvariantError(41, key);
+            throw newInvariantError(43, key);
         }
     }
     return operation;
@@ -1519,7 +1537,7 @@ var ApolloLink = (function () {
     ApolloLink.concat = function (first, second) {
         var firstLink = toLink(first);
         if (isTerminating(firstLink)) {
-            globalThis.__DEV__ !== false && invariant.warn(33, firstLink);
+            globalThis.__DEV__ !== false && invariant.warn(35, firstLink);
             return firstLink;
         }
         var nextLink = toLink(second);
@@ -1543,7 +1561,7 @@ var ApolloLink = (function () {
         return ApolloLink.concat(this, next);
     };
     ApolloLink.prototype.request = function (operation, forward) {
-        throw newInvariantError(34);
+        throw newInvariantError(36);
     };
     ApolloLink.prototype.onError = function (error, observer) {
         if (observer && observer.error) {
@@ -1920,7 +1938,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = newInvariantError(37, label, e.message);
+        var parseError = newInvariantError(39, label, e.message);
         parseError.parseError = e;
         throw parseError;
     }
@@ -2006,7 +2024,7 @@ function removeDuplicateHeaders(headers, preserveHeaderCase) {
 
 var checkFetcher = function (fetcher) {
     if (!fetcher && typeof fetch === "undefined") {
-        throw newInvariantError(35);
+        throw newInvariantError(37);
     }
 };
 
@@ -2139,7 +2157,7 @@ var createHttpLink = function (linkOptions) {
             options.headers = options.headers || {};
             var acceptHeader = "multipart/mixed;";
             if (isSubscription && hasDefer) {
-                globalThis.__DEV__ !== false && invariant.warn(36);
+                globalThis.__DEV__ !== false && invariant.warn(38);
             }
             if (isSubscription) {
                 acceptHeader +=
@@ -2566,6 +2584,41 @@ var EntityStore = (function () {
                             changedFields_1[storeFieldName] = newValue;
                             needToMerge_1 = true;
                             fieldValue = newValue;
+                            if (globalThis.__DEV__ !== false) {
+                                var checkReference = function (ref) {
+                                    if (_this.lookup(ref.__ref) === undefined) {
+                                        globalThis.__DEV__ !== false && invariant.warn(2, ref);
+                                        return true;
+                                    }
+                                };
+                                if (isReference(newValue)) {
+                                    checkReference(newValue);
+                                }
+                                else if (Array.isArray(newValue)) {
+                                    var seenReference = false;
+                                    var someNonReference = void 0;
+                                    for (var _i = 0, newValue_1 = newValue; _i < newValue_1.length; _i++) {
+                                        var value = newValue_1[_i];
+                                        if (isReference(value)) {
+                                            seenReference = true;
+                                            if (checkReference(value))
+                                                break;
+                                        }
+                                        else {
+                                            if (typeof value === "object" && !!value) {
+                                                var id = _this.policies.identify(value)[0];
+                                                if (id) {
+                                                    someNonReference = value;
+                                                }
+                                            }
+                                        }
+                                        if (seenReference && someNonReference !== undefined) {
+                                            globalThis.__DEV__ !== false && invariant.warn(3, someNonReference);
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -2962,28 +3015,6 @@ var ObjectCanon = (function () {
     };
     return ObjectCanon;
 }());
-var canonicalStringify = Object.assign(function (value) {
-    if (isNonNullObject(value)) {
-        if (stringifyCanon === void 0) {
-            resetCanonicalStringify();
-        }
-        var canonical = stringifyCanon.admit(value);
-        var json = stringifyCache.get(canonical);
-        if (json === void 0) {
-            stringifyCache.set(canonical, (json = JSON.stringify(canonical)));
-        }
-        return json;
-    }
-    return JSON.stringify(value);
-}, {
-    reset: resetCanonicalStringify,
-});
-var stringifyCanon;
-var stringifyCache;
-function resetCanonicalStringify() {
-    stringifyCanon = new ObjectCanon();
-    stringifyCache = new (canUseWeakMap ? WeakMap : Map)();
-}
 
 function execSelectionSetKeyArgs(options) {
     return [
@@ -3157,7 +3188,7 @@ var StoreReader = (function () {
             else {
                 var fragment = getFragmentFromSelection(selection, context.lookupFragment);
                 if (!fragment && selection.kind === graphql.Kind.FRAGMENT_SPREAD) {
-                    throw newInvariantError(7, selection.name.value);
+                    throw newInvariantError(9, selection.name.value);
                 }
                 if (fragment && policies.fragmentMatches(fragment, typename)) {
                     fragment.selectionSet.selections.forEach(workSet.add, workSet);
@@ -3241,7 +3272,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
             if (isNonNullObject(value)) {
                 invariant(
                     !isReference(value),
-                    8,
+                    10,
                     getTypenameFromStoreObject(store, value),
                     field.name.value
                 );
@@ -3333,7 +3364,7 @@ function keyFieldsFnFromSpecifier(specifier) {
                     hasOwn.call(object, schemaKeyPath[0])) {
                     extracted = extractKeyPath(object, schemaKeyPath, extractKey);
                 }
-                invariant(extracted !== void 0, 2, schemaKeyPath.join("."), object);
+                invariant(extracted !== void 0, 4, schemaKeyPath.join("."), object);
                 return extracted;
             }));
             return "".concat(context.typename, ":").concat(JSON.stringify(keyObject));
@@ -3435,7 +3466,6 @@ function normalize(value) {
     return value;
 }
 
-getStoreKeyName.setStringify(canonicalStringify);
 function argsFromFieldSpecifier(spec) {
     return spec.args !== void 0
         ? spec.args
@@ -3588,7 +3618,7 @@ var Policies = (function () {
         var rootId = "ROOT_" + which.toUpperCase();
         var old = this.rootTypenamesById[rootId];
         if (typename !== old) {
-            invariant(!old || old === which, 3, which);
+            invariant(!old || old === which, 5, which);
             if (old)
                 delete this.rootIdsByTypename[old];
             this.rootIdsByTypename[typename] = rootId;
@@ -3685,7 +3715,7 @@ var Policies = (function () {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            globalThis.__DEV__ !== false && invariant.warn(4, typename, supertype);
+                            globalThis.__DEV__ !== false && invariant.warn(6, typename, supertype);
                         }
                         typenameSupertypeSet.add(supertype);
                     }
@@ -3847,7 +3877,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
         }
     }
     if (globalThis.__DEV__ !== false && options.from === void 0) {
-        globalThis.__DEV__ !== false && invariant.warn(5, stringifyForDisplay(Array.from(readFieldArgs)));
+        globalThis.__DEV__ !== false && invariant.warn(7, stringifyForDisplay(Array.from(readFieldArgs)));
     }
     if (void 0 === options.variables) {
         options.variables = variables;
@@ -3857,7 +3887,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
 function makeMergeObjectsFunction(store) {
     return function mergeObjects(existing, incoming) {
         if (isArray(existing) || isArray(incoming)) {
-            throw newInvariantError(6);
+            throw newInvariantError(8);
         }
         if (isNonNullObject(existing) && isNonNullObject(incoming)) {
             var eType = store.getFieldValue(existing, "__typename");
@@ -3917,7 +3947,7 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!isReference(ref)) {
-            throw newInvariantError(9, result);
+            throw newInvariantError(11, result);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var storeObject = _a.storeObject, mergeTree = _a.mergeTree, fieldNodeSet = _a.fieldNodeSet;
@@ -4022,7 +4052,7 @@ var StoreWriter = (function () {
                 !context.deferred &&
                 !addTypenameToDocument.added(field) &&
                 !policies.getReadFunction(typename, field.name.value)) {
-                globalThis.__DEV__ !== false && invariant.error(10, resultKeyNameFromField(field), result);
+                globalThis.__DEV__ !== false && invariant.error(12, resultKeyNameFromField(field), result);
             }
         });
         try {
@@ -4127,7 +4157,7 @@ var StoreWriter = (function () {
                 else {
                     var fragment = getFragmentFromSelection(selection, context.lookupFragment);
                     if (!fragment && selection.kind === graphql.Kind.FRAGMENT_SPREAD) {
-                        throw newInvariantError(11, selection.name.value);
+                        throw newInvariantError(13, selection.name.value);
                     }
                     if (fragment &&
                         policies.fragmentMatches(fragment, typename, result, context.variables)) {
@@ -4269,7 +4299,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    globalThis.__DEV__ !== false && invariant.warn(12, fieldName, parentType, childTypenames.length
+    globalThis.__DEV__ !== false && invariant.warn(14, fieldName, parentType, childTypenames.length
         ? "either ensure all objects of type " +
             childTypenames.join(" and ") +
             " have an ID or a custom merge function, or "
@@ -4830,7 +4860,7 @@ var ObservableQuery = (function (_super) {
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
                 globalThis.__DEV__ !== false && invariant.warn(
-                    18,
+                    20,
                     variables,
                     ((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || queryDef
                 );
@@ -4928,7 +4958,7 @@ var ObservableQuery = (function (_super) {
                     options.onError(err);
                     return;
                 }
-                globalThis.__DEV__ !== false && invariant.error(19, err);
+                globalThis.__DEV__ !== false && invariant.error(21, err);
             },
         });
         this.subscriptions.add(subscription);
@@ -5007,9 +5037,9 @@ var ObservableQuery = (function (_super) {
         }
         return options.fetchPolicy;
     };
-    ObservableQuery.prototype.fetch = function (options, newNetworkStatus) {
+    ObservableQuery.prototype.fetch = function (options, newNetworkStatus, query) {
         this.queryManager.setObservableQuery(this);
-        return this.queryManager["fetchConcastWithInfo"](this.queryId, options, newNetworkStatus);
+        return this.queryManager["fetchConcastWithInfo"](this.queryId, options, newNetworkStatus, query);
     };
     ObservableQuery.prototype.updatePolling = function () {
         var _this = this;
@@ -5027,7 +5057,7 @@ var ObservableQuery = (function (_super) {
         if (pollingInfo && pollingInfo.interval === pollInterval) {
             return;
         }
-        invariant(pollInterval, 20);
+        invariant(pollInterval, 22);
         var info = pollingInfo || (this.pollingInfo = {});
         info.interval = pollInterval;
         var maybeFetch = function () {
@@ -5091,15 +5121,14 @@ var ObservableQuery = (function (_super) {
                 }
             }
         }
-        var fetchOptions = query === options.query ? options : tslib.__assign(tslib.__assign({}, options), { query: query });
-        this.waitForOwnResult && (this.waitForOwnResult = skipCacheDataFor(fetchOptions.fetchPolicy));
+        this.waitForOwnResult && (this.waitForOwnResult = skipCacheDataFor(options.fetchPolicy));
         var finishWaitingForOwnResult = function () {
             if (_this.concast === concast) {
                 _this.waitForOwnResult = false;
             }
         };
-        var variables = fetchOptions.variables && tslib.__assign({}, fetchOptions.variables);
-        var _a = this.fetch(fetchOptions, newNetworkStatus), concast = _a.concast, fromLink = _a.fromLink;
+        var variables = options.variables && tslib.__assign({}, options.variables);
+        var _a = this.fetch(options, newNetworkStatus, query), concast = _a.concast, fromLink = _a.fromLink;
         var observer = {
             next: function (result) {
                 finishWaitingForOwnResult();
@@ -5193,11 +5222,11 @@ function reobserveCacheFirst(obsQuery) {
     return obsQuery.reobserve();
 }
 function defaultSubscriptionObserverErrorCallback(error) {
-    globalThis.__DEV__ !== false && invariant.error(21, error.message, error.stack);
+    globalThis.__DEV__ !== false && invariant.error(23, error.message, error.stack);
 }
 function logMissingFieldErrors(missing) {
     if (globalThis.__DEV__ !== false && missing) {
-        globalThis.__DEV__ !== false && invariant.debug(22, missing);
+        globalThis.__DEV__ !== false && invariant.debug(24, missing);
     }
 }
 function skipCacheDataFor(fetchPolicy) {
@@ -5382,7 +5411,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            invariant(fragment, 16, selection.name.value);
+                            invariant(fragment, 18, selection.name.value);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -5495,7 +5524,7 @@ var LocalState = (function () {
                     },
                     FragmentSpread: function (spread, _, __, ___, ancestors) {
                         var fragment = fragmentMap[spread.name.value];
-                        invariant(fragment, 17, spread.name.value);
+                        invariant(fragment, 19, spread.name.value);
                         var fragmentSelections = collectByDefinition(fragment);
                         if (fragmentSelections.size > 0) {
                             ancestors.forEach(function (node) {
@@ -5541,7 +5570,6 @@ var QueryInfo = (function () {
         this.listeners = new Set();
         this.document = null;
         this.lastRequestId = 1;
-        this.subscriptions = new Set();
         this.stopped = false;
         this.dirty = false;
         this.observableQuery = null;
@@ -5676,7 +5704,6 @@ var QueryInfo = (function () {
             this.reset();
             this.cancel();
             this.cancel = QueryInfo.prototype.cancel;
-            this.subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
             var oq = this.observableQuery;
             if (oq)
                 oq.stopPolling();
@@ -5795,7 +5822,7 @@ var hasOwnProperty$1 = Object.prototype.hasOwnProperty;
 var QueryManager = (function () {
     function QueryManager(_a) {
         var _this = this;
-        var cache = _a.cache, link = _a.link, defaultOptions = _a.defaultOptions, documentTransform = _a.documentTransform, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, _e = _a.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? !!cache.assumeImmutableResults : _e;
+        var cache = _a.cache, link = _a.link, defaultOptions = _a.defaultOptions, documentTransform = _a.documentTransform, _b = _a.queryDeduplication, queryDeduplication = _b === void 0 ? false : _b, onBroadcast = _a.onBroadcast, _c = _a.ssrMode, ssrMode = _c === void 0 ? false : _c, _d = _a.clientAwareness, clientAwareness = _d === void 0 ? {} : _d, localState = _a.localState, _e = _a.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? !!cache.assumeImmutableResults : _e, defaultContext = _a.defaultContext;
         this.clientAwareness = {};
         this.queries = new Map();
         this.fetchCancelFns = new Map();
@@ -5818,6 +5845,7 @@ var QueryManager = (function () {
                 .concat(documentTransform)
                 .concat(defaultDocumentTransform)
             : defaultDocumentTransform;
+        this.defaultContext = defaultContext || Object.create(null);
         if ((this.onBroadcast = onBroadcast)) {
             this.mutationStore = Object.create(null);
         }
@@ -5827,7 +5855,7 @@ var QueryManager = (function () {
         this.queries.forEach(function (_info, queryId) {
             _this.stopQueryNoBroadcast(queryId);
         });
-        this.cancelPendingFetches(newInvariantError(23));
+        this.cancelPendingFetches(newInvariantError(25));
     };
     QueryManager.prototype.cancelPendingFetches = function (error) {
         this.fetchCancelFns.forEach(function (cancel) { return cancel(error); });
@@ -5841,8 +5869,8 @@ var QueryManager = (function () {
             return tslib.__generator(this, function (_h) {
                 switch (_h.label) {
                     case 0:
-                        invariant(mutation, 24);
-                        invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 25);
+                        invariant(mutation, 26);
+                        invariant(fetchPolicy === "network-only" || fetchPolicy === "no-cache", 27);
                         mutationId = this.generateMutationId();
                         mutation = this.cache.transformForLink(this.transform(mutation));
                         hasClientExports = this.getDocumentInfo(mutation).hasClientExports;
@@ -6163,10 +6191,10 @@ var QueryManager = (function () {
     QueryManager.prototype.query = function (options, queryId) {
         var _this = this;
         if (queryId === void 0) { queryId = this.generateQueryId(); }
-        invariant(options.query, 26);
-        invariant(options.query.kind === "Document", 27);
-        invariant(!options.returnPartialData, 28);
-        invariant(!options.pollInterval, 29);
+        invariant(options.query, 28);
+        invariant(options.query.kind === "Document", 29);
+        invariant(!options.returnPartialData, 30);
+        invariant(!options.pollInterval, 31);
         return this.fetchQuery(queryId, tslib.__assign(tslib.__assign({}, options), { query: this.transform(options.query) })).finally(function () { return _this.stopQuery(queryId); });
     };
     QueryManager.prototype.generateQueryId = function () {
@@ -6191,7 +6219,7 @@ var QueryManager = (function () {
         if (options === void 0) { options = {
             discardWatches: true,
         }; }
-        this.cancelPendingFetches(newInvariantError(30));
+        this.cancelPendingFetches(newInvariantError(32));
         this.queries.forEach(function (queryInfo) {
             if (queryInfo.observableQuery) {
                 queryInfo.networkStatus = exports.NetworkStatus.loading;
@@ -6267,7 +6295,7 @@ var QueryManager = (function () {
         if (globalThis.__DEV__ !== false && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    globalThis.__DEV__ !== false && invariant.warn(typeof nameOrDoc === "string" ? 31 : 32, nameOrDoc);
+                    globalThis.__DEV__ !== false && invariant.warn(typeof nameOrDoc === "string" ? 33 : 34, nameOrDoc);
                 }
             });
         }
@@ -6423,7 +6451,7 @@ var QueryManager = (function () {
     QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
         var requestId = (queryInfo.lastRequestId = this.generateRequestId());
         var linkDocument = this.cache.transformForLink(options.query);
-        return asyncMap(this.getObservableFromLink(linkDocument, options.context, options.variables), function (result) {
+        return asyncMap(this.getObservableFromLink(linkDocument, compact(this.defaultContext, options.context), options.variables), function (result) {
             var graphQLErrors = getGraphQLErrorsFromResult(result);
             var hasErrors = graphQLErrors.length > 0;
             if (requestId >= queryInfo.lastRequestId) {
@@ -6455,10 +6483,10 @@ var QueryManager = (function () {
             throw error;
         });
     };
-    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options, networkStatus) {
+    QueryManager.prototype.fetchConcastWithInfo = function (queryId, options, networkStatus, query) {
         var _this = this;
         if (networkStatus === void 0) { networkStatus = exports.NetworkStatus.loading; }
-        var query = options.query;
+        if (query === void 0) { query = options.query; }
         var variables = this.getVariables(query, options.variables);
         var queryInfo = this.getQuery(queryId);
         var defaults = this.defaultOptions.watchQuery;
@@ -6704,11 +6732,11 @@ var ApolloClient = (function () {
         this.resetStoreCallbacks = [];
         this.clearStoreCallbacks = [];
         if (!options.cache) {
-            throw newInvariantError(13);
+            throw newInvariantError(15);
         }
         var uri = options.uri, credentials = options.credentials, headers = options.headers, cache = options.cache, documentTransform = options.documentTransform, _a = options.ssrMode, ssrMode = _a === void 0 ? false : _a, _b = options.ssrForceFetchDelay, ssrForceFetchDelay = _b === void 0 ? 0 : _b, _c = options.connectToDevTools, connectToDevTools = _c === void 0 ? typeof window === "object" &&
             !window.__APOLLO_CLIENT__ &&
-            globalThis.__DEV__ !== false : _c, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version;
+            globalThis.__DEV__ !== false : _c, _d = options.queryDeduplication, queryDeduplication = _d === void 0 ? true : _d, defaultOptions = options.defaultOptions, defaultContext = options.defaultContext, _e = options.assumeImmutableResults, assumeImmutableResults = _e === void 0 ? cache.assumeImmutableResults : _e, resolvers = options.resolvers, typeDefs = options.typeDefs, fragmentMatcher = options.fragmentMatcher, clientAwarenessName = options.name, clientAwarenessVersion = options.version;
         var link = options.link;
         if (!link) {
             link = uri
@@ -6740,6 +6768,7 @@ var ApolloClient = (function () {
             cache: this.cache,
             link: this.link,
             defaultOptions: this.defaultOptions,
+            defaultContext: defaultContext,
             documentTransform: documentTransform,
             queryDeduplication: queryDeduplication,
             ssrMode: ssrMode,
@@ -6829,7 +6858,7 @@ var ApolloClient = (function () {
         if (this.defaultOptions.query) {
             options = mergeOptions(this.defaultOptions.query, options);
         }
-        invariant(options.fetchPolicy !== "cache-and-network", 14);
+        invariant(options.fetchPolicy !== "cache-and-network", 16);
         if (this.disableNetworkFetches && options.fetchPolicy === "network-only") {
             options = tslib.__assign(tslib.__assign({}, options), { fetchPolicy: "cache-first" });
         }
@@ -6922,7 +6951,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            globalThis.__DEV__ !== false && invariant.debug(15, error);
+            globalThis.__DEV__ !== false && invariant.debug(17, error);
         });
         return result;
     };
@@ -6951,6 +6980,13 @@ var ApolloClient = (function () {
     ApolloClient.prototype.setLink = function (newLink) {
         this.link = this.queryManager.link = newLink;
     };
+    Object.defineProperty(ApolloClient.prototype, "defaultContext", {
+        get: function () {
+            return this.queryManager.defaultContext;
+        },
+        enumerable: false,
+        configurable: true
+    });
     return ApolloClient;
 }());
 
@@ -6958,7 +6994,7 @@ var contextKey = canUseSymbol
     ? Symbol.for("__APOLLO_CONTEXT__")
     : "__APOLLO_CONTEXT__";
 function getApolloContext() {
-    invariant("createContext" in React__namespace, 43);
+    invariant("createContext" in React__namespace, 45);
     var context = React__namespace.createContext[contextKey];
     if (!context) {
         Object.defineProperty(React__namespace.createContext, contextKey, {
@@ -6976,7 +7012,7 @@ var resetApolloContext = getApolloContext;
 var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
     return (React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
-        invariant(context && context.client, 42);
+        invariant(context && context.client, 44);
         return props.children(context.client);
     }));
 };
@@ -6988,14 +7024,14 @@ var ApolloProvider = function (_a) {
     var context = React__namespace.useMemo(function () {
         return tslib.__assign(tslib.__assign({}, parentContext), { client: client || parentContext.client });
     }, [parentContext, client]);
-    invariant(context.client, 44);
+    invariant(context.client, 46);
     return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
 };
 
 function useApolloClient(override) {
     var context = React__namespace.useContext(getApolloContext());
     var client = override || context.client;
-    invariant(!!client, 47);
+    invariant(!!client, 49);
     return client;
 }
 
@@ -7009,7 +7045,7 @@ var useSyncExternalStore = realHook$1 ||
             !didWarnUncachedGetSnapshot &&
             value !== getSnapshot()) {
             didWarnUncachedGetSnapshot = true;
-            globalThis.__DEV__ !== false && invariant.error(56);
+            globalThis.__DEV__ !== false && invariant.error(58);
         }
         var _a = React__namespace.useState({
             inst: { value: value, getSnapshot: getSnapshot },
@@ -7074,7 +7110,7 @@ function parser(document) {
     if (cached)
         return cached;
     var variables, type, name;
-    invariant(!!document && !!document.kind, 57, document);
+    invariant(!!document && !!document.kind, 59, document);
     var fragments = [];
     var queries = [];
     var mutations = [];
@@ -7102,10 +7138,10 @@ function parser(document) {
     invariant(!fragments.length ||
         queries.length ||
         mutations.length ||
-        subscriptions.length, 58);
+        subscriptions.length, 60);
     invariant(
         queries.length + mutations.length + subscriptions.length <= 1,
-        59,
+        61,
         document,
         queries.length,
         subscriptions.length,
@@ -7119,7 +7155,7 @@ function parser(document) {
         : mutations.length
             ? mutations
             : subscriptions;
-    invariant(definitions.length === 1, 60, document, definitions.length);
+    invariant(definitions.length === 1, 62, document, definitions.length);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === "Name") {
@@ -7138,7 +7174,7 @@ function verifyDocumentType(document, type) {
     var usedOperationName = operationName(operation.type);
     invariant(
         operation.type === type,
-        61,
+        63,
         requiredOperationName,
         requiredOperationName,
         usedOperationName
@@ -7188,7 +7224,7 @@ var InternalState = (function () {
         }
     }
     InternalState.prototype.forceUpdateState = function () {
-        globalThis.__DEV__ !== false && invariant.warn(48);
+        globalThis.__DEV__ !== false && invariant.warn(50);
     };
     InternalState.prototype.executeQuery = function (options) {
         var _this = this;
@@ -7609,10 +7645,10 @@ function useSubscription(subscription, options) {
     if (!hasIssuedDeprecationWarningRef.current) {
         hasIssuedDeprecationWarningRef.current = true;
         if (options === null || options === void 0 ? void 0 : options.onSubscriptionData) {
-            globalThis.__DEV__ !== false && invariant.warn(options.onData ? 50 : 51);
+            globalThis.__DEV__ !== false && invariant.warn(options.onData ? 52 : 53);
         }
         if (options === null || options === void 0 ? void 0 : options.onSubscriptionComplete) {
-            globalThis.__DEV__ !== false && invariant.warn(options.onComplete ? 52 : 53);
+            globalThis.__DEV__ !== false && invariant.warn(options.onComplete ? 54 : 55);
         }
     }
     var _b = React__namespace.useState(function () {
@@ -7829,7 +7865,6 @@ var OBSERVED_CHANGED_OPTIONS = [
 var InternalQueryReference = (function () {
     function InternalQueryReference(observable, options) {
         var _this = this;
-        var _a;
         this.listeners = new Set();
         this.status = "loading";
         this.references = 0;
@@ -7863,7 +7898,13 @@ var InternalQueryReference = (function () {
             next: this.handleNext,
             error: this.handleError,
         });
-        this.autoDisposeTimeoutId = setTimeout(this.dispose, (_a = options.autoDisposeTimeoutMs) !== null && _a !== void 0 ? _a : 30000);
+        var startDisposeTimer = function () {
+            var _a;
+            if (!_this.references) {
+                _this.autoDisposeTimeoutId = setTimeout(_this.dispose, (_a = options.autoDisposeTimeoutMs) !== null && _a !== void 0 ? _a : 30000);
+            }
+        };
+        this.promise.then(startDisposeTimer, startDisposeTimer);
     }
     Object.defineProperty(InternalQueryReference.prototype, "watchQueryOptions", {
         get: function () {
@@ -8118,11 +8159,11 @@ function validateFetchPolicy(fetchPolicy) {
         "no-cache",
         "cache-and-network",
     ];
-    invariant(supportedFetchPolicies.includes(fetchPolicy), 54, fetchPolicy);
+    invariant(supportedFetchPolicies.includes(fetchPolicy), 56, fetchPolicy);
 }
 function validatePartialDataReturn(fetchPolicy, returnPartialData) {
     if (fetchPolicy === "no-cache" && returnPartialData) {
-        globalThis.__DEV__ !== false && invariant.warn(55);
+        globalThis.__DEV__ !== false && invariant.warn(57);
     }
 }
 function toApolloError(result) {
@@ -8197,7 +8238,7 @@ function useBackgroundQuery(query, options) {
 
 function useReadQuery(queryRef) {
     var internalQueryRef = unwrapQueryRef(queryRef);
-    invariant(internalQueryRef.promiseCache, 49);
+    invariant(internalQueryRef.promiseCache, 51);
     var promiseCache = internalQueryRef.promiseCache, key = internalQueryRef.key;
     if (!promiseCache.has(key)) {
         promiseCache.set(key, internalQueryRef.promise);