@apollo/client 3.6.0-beta.1 → 3.6.0-beta.5

package/apollo-client.cjs

@@ -13,17 +13,16 @@ var context = require('@wry/context');
 var trie = require('@wry/trie');
 var graphqlTag = require('graphql-tag');
 var React = require('react');
-var shim = require('use-sync-external-store/shim');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
     var n = Object.create(null);
     if (e) {
-        Object.keys(e).forEach(function (k) {
+        for (var k in e) {
             n[k] = e[k];
-        });
+        }
     }
-    n['default'] = e;
+    n["default"] = e;
     return Object.freeze(n);
 }
 
@@ -46,7 +45,7 @@ function shouldInclude(_a, variables) {
         var evaledValue = false;
         if (ifArgument.value.kind === 'Variable') {
             evaledValue = variables && variables[ifArgument.value.name.value];
-            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @" + directive.name.value + " directive.") : tsInvariant.invariant(evaledValue !== void 0, 37);
+            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @".concat(directive.name.value, " directive.")) : tsInvariant.invariant(evaledValue !== void 0, 37);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -83,12 +82,12 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @" + directiveName + " directive.") : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 38);
+            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 38);
             var ifArgument = directiveArguments[0];
-            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @" + directiveName + " directive.") : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 39);
+            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 39);
             var ifValue = ifArgument.value;
             __DEV__ ? tsInvariant.invariant(ifValue &&
-                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), "Argument for the @" + directiveName + " directive must be a variable or a boolean value.") : tsInvariant.invariant(ifValue &&
+                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), "Argument for the @".concat(directiveName, " directive must be a variable or a boolean value.")) : tsInvariant.invariant(ifValue &&
                 (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 40);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
@@ -101,7 +100,7 @@ function getFragmentQueryDocument(document, fragmentName) {
     var fragments = [];
     document.definitions.forEach(function (definition) {
         if (definition.kind === 'OperationDefinition') {
-            throw __DEV__ ? new tsInvariant.InvariantError("Found a " + definition.operation + " operation" + (definition.name ? " named '" + definition.name.value + "'" : '') + ". " +
+            throw __DEV__ ? new tsInvariant.InvariantError("Found a ".concat(definition.operation, " operation").concat(definition.name ? " named '".concat(definition.name.value, "'") : '', ". ") +
                 'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(41);
         }
         if (definition.kind === 'FragmentDefinition') {
@@ -109,7 +108,7 @@ function getFragmentQueryDocument(document, fragmentName) {
         }
     });
     if (typeof actualFragmentName === 'undefined') {
-        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found " + fragments.length + " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.") : tsInvariant.invariant(fragments.length === 1, 42);
+        __DEV__ ? tsInvariant.invariant(fragments.length === 1, "Found ".concat(fragments.length, " fragments. `fragmentName` must be provided when there is not exactly 1 fragment.")) : tsInvariant.invariant(fragments.length === 1, 42);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -146,7 +145,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
             return selection;
         case 'FragmentSpread': {
             var fragment = fragmentMap && fragmentMap[selection.name.value];
-            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value + ".") : tsInvariant.invariant(fragment, 43);
+            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(selection.name.value, ".")) : tsInvariant.invariant(fragment, 43);
             return fragment;
         }
         default:
@@ -228,7 +227,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
         argObj[name.value] = null;
     }
     else {
-        throw __DEV__ ? new tsInvariant.InvariantError("The inline argument \"" + name.value + "\" of kind \"" + value.kind + "\"" +
+        throw __DEV__ ? new tsInvariant.InvariantError("The inline argument \"".concat(name.value, "\" of kind \"").concat(value.kind, "\"") +
             'is not supported. Use variables instead of inline arguments to ' +
             'overcome this limitation.') : new tsInvariant.InvariantError(52);
     }
@@ -280,7 +279,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
             filterKeys.forEach(function (key) {
                 filteredArgs_1[key] = args[key];
             });
-            return directives['connection']['key'] + "(" + stringify(filteredArgs_1) + ")";
+            return "".concat(directives['connection']['key'], "(").concat(stringify(filteredArgs_1), ")");
         }
         else {
             return directives['connection']['key'];
@@ -289,17 +288,17 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     var completeFieldName = fieldName;
     if (args) {
         var stringifiedArgs = stringify(args);
-        completeFieldName += "(" + stringifiedArgs + ")";
+        completeFieldName += "(".concat(stringifiedArgs, ")");
     }
     if (directives) {
         Object.keys(directives).forEach(function (key) {
             if (KNOWN_DIRECTIVES.indexOf(key) !== -1)
                 return;
             if (directives[key] && Object.keys(directives[key]).length) {
-                completeFieldName += "@" + key + "(" + stringify(directives[key]) + ")";
+                completeFieldName += "@".concat(key, "(").concat(stringify(directives[key]), ")");
             }
             else {
-                completeFieldName += "@" + key;
+                completeFieldName += "@".concat(key);
             }
         });
     }
@@ -369,11 +368,11 @@ function checkDocument(doc) {
         .filter(function (d) { return d.kind !== 'FragmentDefinition'; })
         .map(function (definition) {
         if (definition.kind !== 'OperationDefinition') {
-            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"" + definition.kind + "\"") : new tsInvariant.InvariantError(45);
+            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"".concat(definition.kind, "\"")) : new tsInvariant.InvariantError(45);
         }
         return definition;
     });
-    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains " + operations.length + " operations") : tsInvariant.invariant(operations.length <= 1, 46);
+    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains ".concat(operations.length, " operations")) : tsInvariant.invariant(operations.length <= 1, 46);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -1078,7 +1077,7 @@ var prefixCounts = new Map();
 function makeUniqueId(prefix) {
     var count = prefixCounts.get(prefix) || 1;
     prefixCounts.set(prefix, count + 1);
-    return prefix + ":" + count + ":" + Math.random().toString(36).slice(2);
+    return "".concat(prefix, ":").concat(count, ":").concat(Math.random().toString(36).slice(2));
 }
 
 function stringifyForDisplay(value) {
@@ -1143,7 +1142,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 __DEV__ ? new tsInvariant.InvariantError("illegal argument: " + key) : new tsInvariant.InvariantError(24);
+            throw __DEV__ ? new tsInvariant.InvariantError("illegal argument: ".concat(key)) : new tsInvariant.InvariantError(24);
         }
     }
     return operation;
@@ -1292,7 +1291,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.6.0-beta.1';
+var version = '3.6.0-beta.5';
 
 var hasOwnProperty$2 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -1313,14 +1312,14 @@ function parseAndCheckHttpResponse(operations) {
     })
         .then(function (result) {
         if (response.status >= 300) {
-            throwServerError(response, result, "Response not successful: Received status code " + response.status);
+            throwServerError(response, result, "Response not successful: Received status code ".concat(response.status));
         }
         if (!Array.isArray(result) &&
             !hasOwnProperty$2.call(result, 'data') &&
             !hasOwnProperty$2.call(result, 'errors')) {
-            throwServerError(response, result, "Server response was missing for query '" + (Array.isArray(operations)
+            throwServerError(response, result, "Server response was missing for query '".concat(Array.isArray(operations)
                 ? operations.map(function (op) { return op.operationName; })
-                : operations.operationName) + "'.");
+                : operations.operationName, "'."));
         }
         return result;
     }); };
@@ -1332,7 +1331,7 @@ var serializeFetchParameter = function (p, label) {
         serialized = JSON.stringify(p);
     }
     catch (e) {
-        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. " + label + " is not serializable: " + e.message) : new tsInvariant.InvariantError(21);
+        var parseError = __DEV__ ? new tsInvariant.InvariantError("Network request failed. ".concat(label, " is not serializable: ").concat(e.message)) : new tsInvariant.InvariantError(21);
         parseError.parseError = e;
         throw parseError;
     }
@@ -1356,17 +1355,27 @@ var fallbackHttpConfig = {
     options: defaultOptions,
 };
 var defaultPrinter = function (ast, printer) { return printer(ast); };
-var selectHttpOptionsAndBody = function (operation, printer, fallbackConfig) {
+function selectHttpOptionsAndBody(operation, fallbackConfig) {
+    var configs = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        configs[_i - 2] = arguments[_i];
+    }
+    configs.unshift(fallbackConfig);
+    return selectHttpOptionsAndBodyInternal.apply(void 0, tslib.__spreadArray([operation,
+        defaultPrinter], configs, false));
+}
+function selectHttpOptionsAndBodyInternal(operation, printer) {
     var configs = [];
-    for (var _i = 3; _i < arguments.length; _i++) {
-        configs[_i - 3] = arguments[_i];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        configs[_i - 2] = arguments[_i];
     }
-    var options = tslib.__assign(tslib.__assign({}, fallbackConfig.options), { headers: fallbackConfig.headers, credentials: fallbackConfig.credentials });
-    var http = fallbackConfig.http || {};
+    var options = {};
+    var http = {};
     configs.forEach(function (config) {
         options = tslib.__assign(tslib.__assign(tslib.__assign({}, options), config.options), { headers: tslib.__assign(tslib.__assign({}, options.headers), headersToLowerCase(config.headers)) });
-        if (config.credentials)
+        if (config.credentials) {
             options.credentials = config.credentials;
+        }
         http = tslib.__assign(tslib.__assign({}, http), config.http);
     });
     var operationName = operation.operationName, extensions = operation.extensions, variables = operation.variables, query = operation.query;
@@ -1379,7 +1388,7 @@ var selectHttpOptionsAndBody = function (operation, printer, fallbackConfig) {
         options: options,
         body: body,
     };
-};
+}
 function headersToLowerCase(headers) {
     if (headers) {
         var normalized_1 = Object.create(null);
@@ -1422,7 +1431,7 @@ var selectURI = function (operation, fallbackURI) {
 function rewriteURIForGET(chosenURI, body) {
     var queryParams = [];
     var addQueryParam = function (key, value) {
-        queryParams.push(key + "=" + encodeURIComponent(value));
+        queryParams.push("".concat(key, "=").concat(encodeURIComponent(value)));
     };
     if ('query' in body) {
         addQueryParam('query', body.query);
@@ -1494,7 +1503,7 @@ var createHttpLink = function (linkOptions) {
             credentials: context.credentials,
             headers: contextHeaders,
         };
-        var _b = selectHttpOptionsAndBody(operation, print, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
+        var _b = selectHttpOptionsAndBodyInternal(operation, print, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
         if (body.variables && !includeUnusedVariables) {
             var unusedNames_1 = new Set(Object.keys(body.variables));
             graphql.visit(operation.query, {
@@ -1687,7 +1696,7 @@ function defaultDataIdFromObject(_a, context) {
         if (id === void 0)
             id = _id;
         if (id !== void 0) {
-            return __typename + ":" + ((typeof id === "number" ||
+            return "".concat(__typename, ":").concat((typeof id === "number" ||
                 typeof id === "string") ? id : JSON.stringify(id));
         }
     }
@@ -2423,7 +2432,7 @@ var StoreReader = (function () {
             !context.store.has(objectOrReference.__ref)) {
             return {
                 result: this.canon.empty,
-                missing: "Dangling reference to missing " + objectOrReference.__ref + " object",
+                missing: "Dangling reference to missing ".concat(objectOrReference.__ref, " object"),
             };
         }
         var variables = context.variables, policies = context.policies, store = context.store;
@@ -2458,7 +2467,7 @@ var StoreReader = (function () {
                 if (fieldValue === void 0) {
                     if (!addTypenameToDocument.added(selection)) {
                         missing = context.merge(missing, (_a = {},
-                            _a[resultName] = "Can't find field '" + selection.name.value + "' on " + (isReference(objectOrReference)
+                            _a[resultName] = "Can't find field '".concat(selection.name.value, "' on ").concat(isReference(objectOrReference)
                                 ? objectOrReference.__ref + " object"
                                 : "object " + JSON.stringify(objectOrReference, null, 2)),
                             _a));
@@ -2568,7 +2577,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
         var workSet_1 = new Set([fieldValue]);
         workSet_1.forEach(function (value) {
             if (isNonNullObject(value)) {
-                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type " + getTypenameFromStoreObject(store, value) + " returned for query field " + field.name.value) : tsInvariant.invariant(!isReference(value), 5);
+                __DEV__ ? tsInvariant.invariant(!isReference(value), "Missing selection set for object of type ".concat(getTypenameFromStoreObject(store, value), " returned for query field ").concat(field.name.value)) : tsInvariant.invariant(!isReference(value), 5);
                 Object.values(value).forEach(workSet_1.add, workSet_1);
             }
         });
@@ -2655,10 +2664,10 @@ function keyFieldsFnFromSpecifier(specifier) {
                 hasOwn.call(object, schemaKeyPath[0])) {
                 extracted = extractKeyPath(object, schemaKeyPath, extractKey);
             }
-            __DEV__ ? tsInvariant.invariant(extracted !== void 0, "Missing field '" + schemaKeyPath.join('.') + "' while extracting keyFields from " + JSON.stringify(object)) : tsInvariant.invariant(extracted !== void 0, 2);
+            __DEV__ ? tsInvariant.invariant(extracted !== void 0, "Missing field '".concat(schemaKeyPath.join('.'), "' while extracting keyFields from ").concat(JSON.stringify(object))) : tsInvariant.invariant(extracted !== void 0, 2);
             return extracted;
         });
-        return context.typename + ":" + JSON.stringify(keyObject);
+        return "".concat(context.typename, ":").concat(JSON.stringify(keyObject));
     });
 }
 function keyArgsFnFromSpecifier(specifier) {
@@ -2884,7 +2893,7 @@ var Policies = (function () {
         var rootId = "ROOT_" + which.toUpperCase();
         var old = this.rootTypenamesById[rootId];
         if (typename !== old) {
-            __DEV__ ? tsInvariant.invariant(!old || old === which, "Cannot change root " + which + " __typename more than once") : tsInvariant.invariant(!old || old === which, 3);
+            __DEV__ ? tsInvariant.invariant(!old || old === which, "Cannot change root ".concat(which, " __typename more than once")) : tsInvariant.invariant(!old || old === which, 3);
             if (old)
                 delete this.rootIdsByTypename[old];
             this.rootIdsByTypename[typename] = rootId;
@@ -2968,7 +2977,7 @@ var Policies = (function () {
                 if (supertypeSet.has(supertype)) {
                     if (!typenameSupertypeSet.has(supertype)) {
                         if (checkingFuzzySubtypes) {
-                            __DEV__ && tsInvariant.invariant.warn("Inferring subtype " + typename + " of supertype " + supertype);
+                            __DEV__ && tsInvariant.invariant.warn("Inferring subtype ".concat(typename, " of supertype ").concat(supertype));
                         }
                         typenameSupertypeSet.add(supertype);
                     }
@@ -3122,7 +3131,7 @@ function normalizeReadFieldOptions(readFieldArgs, objectOrReference, variables)
         }
     }
     if (__DEV__ && options.from === void 0) {
-        __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments " + stringifyForDisplay(Array.from(readFieldArgs)));
+        __DEV__ && tsInvariant.invariant.warn("Undefined 'from' passed to readField with arguments ".concat(stringifyForDisplay(Array.from(readFieldArgs))));
     }
     if (void 0 === options.variables) {
         options.variables = variables;
@@ -3162,7 +3171,7 @@ function makeMergeObjectsFunction(store) {
 }
 
 function getContextFlavor(context, clientOnly, deferred) {
-    var key = "" + clientOnly + deferred;
+    var key = "".concat(clientOnly).concat(deferred);
     var flavored = context.flavors.get(key);
     if (!flavored) {
         context.flavors.set(key, flavored = (context.clientOnly === clientOnly &&
@@ -3204,7 +3213,7 @@ var StoreWriter = (function () {
             context: context,
         });
         if (!isReference(ref)) {
-            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object " + JSON.stringify(result)) : new tsInvariant.InvariantError(6);
+            throw __DEV__ ? new tsInvariant.InvariantError("Could not identify object ".concat(JSON.stringify(result))) : new tsInvariant.InvariantError(6);
         }
         context.incomingById.forEach(function (_a, dataId) {
             var storeObject = _a.storeObject, mergeTree = _a.mergeTree, fieldNodeSet = _a.fieldNodeSet;
@@ -3309,7 +3318,7 @@ var StoreWriter = (function () {
                 !context.deferred &&
                 !addTypenameToDocument.added(field) &&
                 !policies.getReadFunction(typename, field.name.value)) {
-                __DEV__ && tsInvariant.invariant.error(("Missing field '" + resultKeyNameFromField(field) + "' while writing result " + JSON.stringify(result, null, 2)).substring(0, 1000));
+                __DEV__ && tsInvariant.invariant.error("Missing field '".concat(resultKeyNameFromField(field), "' while writing result ").concat(JSON.stringify(result, null, 2)).substring(0, 1000));
             }
         });
         try {
@@ -3531,7 +3540,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
     var parentType = store.getFieldValue(existingRef, "__typename") ||
         store.getFieldValue(incomingObj, "__typename");
     var fieldName = fieldNameFromStoreName(storeFieldName);
-    var typeDotName = parentType + "." + fieldName;
+    var typeDotName = "".concat(parentType, ".").concat(fieldName);
     if (warnings.has(typeDotName))
         return;
     warnings.add(typeDotName);
@@ -3546,10 +3555,10 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
             }
         });
     }
-    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the " + fieldName + " field of a " + parentType + " object.\n\nTo address this problem (which is not a bug in Apollo Client), " + (childTypenames.length
+    __DEV__ && tsInvariant.invariant.warn("Cache data may be lost when replacing the ".concat(fieldName, " field of a ").concat(parentType, " object.\n\nTo address this problem (which is not a bug in Apollo Client), ").concat(childTypenames.length
         ? "either ensure all objects of type " +
             childTypenames.join(" and ") + " have an ID or a custom merge function, or "
-        : "") + "define a custom merge function for the " + typeDotName + " field, so InMemoryCache can safely merge these objects:\n\n  existing: " + JSON.stringify(existing).slice(0, 1000) + "\n  incoming: " + JSON.stringify(incoming).slice(0, 1000) + "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n");
+        : "", "define a custom merge function for the ").concat(typeDotName, " field, so InMemoryCache can safely merge these objects:\n\n  existing: ").concat(JSON.stringify(existing).slice(0, 1000), "\n  incoming: ").concat(JSON.stringify(incoming).slice(0, 1000), "\n\nFor more information about these options, please refer to the documentation:\n\n  * Ensuring entity objects have IDs: https://go.apollo.dev/c/generating-unique-identifiers\n  * Defining custom merge functions: https://go.apollo.dev/c/merging-non-normalized-objects\n"));
 }
 
 var InMemoryCache = (function (_super) {
@@ -3856,11 +3865,11 @@ var generateErrorMessage = function (err) {
             var errorMessage = error
                 ? error.message
                 : 'Error message not found.';
-            message += errorMessage + "\n";
+            message += "".concat(errorMessage, "\n");
         });
     }
     if (err.networkError) {
-        message += err.networkError.message + "\n";
+        message += "".concat(err.networkError.message, "\n");
     }
     message = message.replace(/\n$/, '');
     return message;
@@ -4042,7 +4051,7 @@ var ObservableQuery = (function (_super) {
             pollInterval: 0,
         };
         var fetchPolicy = this.options.fetchPolicy;
-        if (fetchPolicy === 'standby' || fetchPolicy === 'cache-and-network') {
+        if (fetchPolicy === 'cache-and-network') {
             reobserveOptions.fetchPolicy = fetchPolicy;
         }
         else if (fetchPolicy === 'no-cache') {
@@ -4055,7 +4064,7 @@ var ObservableQuery = (function (_super) {
             var queryDef = getQueryDefinition(this.options.query);
             var vars = queryDef.variableDefinitions;
             if (!vars || !vars.some(function (v) { return v.variable.name.value === "variables"; })) {
-                __DEV__ && tsInvariant.invariant.warn("Called refetch(" + JSON.stringify(variables) + ") for query " + (((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || JSON.stringify(queryDef)) + ", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?");
+                __DEV__ && tsInvariant.invariant.warn("Called refetch(".concat(JSON.stringify(variables), ") for query ").concat(((_a = queryDef.name) === null || _a === void 0 ? void 0 : _a.value) || JSON.stringify(queryDef), ", which does not declare a $variables variable.\nDid you mean to call refetch(variables) instead of refetch({ variables })?"));
             }
         }
         if (variables && !equality.equal(this.options.variables, variables)) {
@@ -4282,8 +4291,11 @@ var ObservableQuery = (function (_super) {
         this.reportResult(this.getCurrentResult(false), this.variables);
     };
     ObservableQuery.prototype.reportResult = function (result, variables) {
-        if (this.getLastError() || this.isDifferentFromLastResult(result)) {
-            this.updateLastResult(result, variables);
+        var lastError = this.getLastError();
+        if (lastError || this.isDifferentFromLastResult(result)) {
+            if (lastError || !result.partial || this.options.returnPartialData) {
+                this.updateLastResult(result, variables);
+            }
             iterateObserversSafely(this.observers, 'next', result);
         }
     };
@@ -4318,7 +4330,7 @@ function defaultSubscriptionObserverErrorCallback(error) {
 }
 function logMissingFieldErrors(missing) {
     if (__DEV__ && missing) {
-        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: " + JSON.stringify(missing), missing);
+        __DEV__ && tsInvariant.invariant.debug("Missing cache result fields: ".concat(JSON.stringify(missing)), missing);
     }
 }
 function applyNextFetchPolicy(options) {
@@ -4499,7 +4511,7 @@ var LocalState = (function () {
                         }
                         else {
                             fragment = fragmentMap[selection.name.value];
-                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named " + selection.name.value) : tsInvariant.invariant(fragment, 9);
+                            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(selection.name.value)) : tsInvariant.invariant(fragment, 9);
                         }
                         if (fragment && fragment.typeCondition) {
                             typeCondition = fragment.typeCondition.name.value;
@@ -5290,7 +5302,7 @@ var QueryManager = (function () {
         if (__DEV__ && queryNamesAndDocs.size) {
             queryNamesAndDocs.forEach(function (included, nameOrDoc) {
                 if (!included) {
-                    __DEV__ && tsInvariant.invariant.warn("Unknown query " + (typeof nameOrDoc === "string" ? "named " : "") + JSON.stringify(nameOrDoc, null, 2) + " requested in refetchQueries options.include array");
+                    __DEV__ && tsInvariant.invariant.warn("Unknown query ".concat(typeof nameOrDoc === "string" ? "named " : "").concat(JSON.stringify(nameOrDoc, null, 2), " requested in refetchQueries options.include array"));
                 }
             });
         }
@@ -5881,7 +5893,7 @@ var ApolloClient = (function () {
         result.queries = queries;
         result.results = results;
         result.catch(function (error) {
-            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error " + error);
+            __DEV__ && tsInvariant.invariant.debug("In client.refetchQueries, Promise.all promise rejected with error ".concat(error));
         });
         return result;
     };
@@ -5957,8 +5969,8 @@ function useApolloClient(override) {
     var context = React.useContext(getApolloContext());
     var client = override || context.client;
     __DEV__ ? tsInvariant.invariant(!!client, 'Could not find "client" in the context or passed in as an option. ' +
-        'Wrap the root component in an <ApolloProvider>, or pass an ApolloClient' +
-        'ApolloClient instance in via options.') : tsInvariant.invariant(!!client, 29);
+        'Wrap the root component in an <ApolloProvider>, or pass an ApolloClient ' +
+        'instance in via options.') : tsInvariant.invariant(!!client, 29);
     return client;
 }
 
@@ -5989,7 +6001,7 @@ function parser(document) {
     if (cached)
         return cached;
     var variables, type, name;
-    __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of " + document + " passed to parser was not a valid GraphQL " +
+    __DEV__ ? tsInvariant.invariant(!!document && !!document.kind, "Argument of ".concat(document, " passed to parser was not a valid GraphQL ") +
         "DocumentNode. You may need to use 'graphql-tag' or another method " +
         "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 30);
     var fragments = document.definitions.filter(function (x) { return x.kind === 'FragmentDefinition'; });
@@ -6007,8 +6019,8 @@ function parser(document) {
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), 31);
     __DEV__ ? tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, "react-apollo only supports a query, subscription, or a mutation per HOC. " +
-        (document + " had " + queries.length + " queries, " + subscriptions.length + " ") +
-        ("subscriptions and " + mutations.length + " mutations. ") +
+        "".concat(document, " had ").concat(queries.length, " queries, ").concat(subscriptions.length, " ") +
+        "subscriptions and ".concat(mutations.length, " mutations. ") +
         "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 32);
     type = queries.length ? exports.DocumentType.Query : exports.DocumentType.Mutation;
     if (!queries.length && !mutations.length)
@@ -6018,8 +6030,8 @@ function parser(document) {
         : mutations.length
             ? mutations
             : subscriptions;
-    __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. " + document + " had " +
-        (definitions.length + " definitions. ") +
+    __DEV__ ? tsInvariant.invariant(definitions.length === 1, "react-apollo only supports one definition per HOC. ".concat(document, " had ") +
+        "".concat(definitions.length, " definitions. ") +
         "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 33);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
@@ -6037,23 +6049,18 @@ function verifyDocumentType(document, type) {
     var operation = parser(document);
     var requiredOperationName = operationName(type);
     var usedOperationName = operationName(operation.type);
-    __DEV__ ? tsInvariant.invariant(operation.type === type, "Running a " + requiredOperationName + " requires a graphql " +
-        (requiredOperationName + ", but a " + usedOperationName + " was used instead.")) : tsInvariant.invariant(operation.type === type, 34);
+    __DEV__ ? tsInvariant.invariant(operation.type === type, "Running a ".concat(requiredOperationName, " requires a graphql ") +
+        "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 34);
 }
 
 function useQuery(query, options) {
     var _a;
     var context = React.useContext(getApolloContext());
     var client = useApolloClient(options === null || options === void 0 ? void 0 : options.client);
+    var defaultWatchQueryOptions = client.defaultOptions.watchQuery;
     verifyDocumentType(query, exports.DocumentType.Query);
-    var ref = React.useRef({
-        client: client,
-        query: query,
-        options: options,
-        watchQueryOptions: createWatchQueryOptions(query, options),
-    });
     var _b = React.useState(function () {
-        var watchQueryOptions = createWatchQueryOptions(query, options);
+        var watchQueryOptions = createWatchQueryOptions(query, options, defaultWatchQueryOptions);
         var obsQuery = null;
         if (context.renderPromises) {
             obsQuery = context.renderPromises.getSSRObservable(watchQueryOptions);
@@ -6069,7 +6076,7 @@ function useQuery(query, options) {
             !(options === null || options === void 0 ? void 0 : options.skip) &&
             obsQuery.getCurrentResult().loading) {
             context.renderPromises.addQueryPromise({
-                getOptions: function () { return createWatchQueryOptions(query, options); },
+                getOptions: function () { return createWatchQueryOptions(query, options, defaultWatchQueryOptions); },
                 fetchData: function () { return new Promise(function (resolve) {
                     var sub = obsQuery.subscribe({
                         next: function (result) {
@@ -6091,96 +6098,112 @@ function useQuery(query, options) {
         }
         return obsQuery;
     }), obsQuery = _b[0], setObsQuery = _b[1];
+    var _c = React.useState(function () {
+        var _a, _b;
+        var result = obsQuery.getCurrentResult();
+        if (!result.loading && options) {
+            if (result.error) {
+                (_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, result.error);
+            }
+            else if (result.data) {
+                (_b = options.onCompleted) === null || _b === void 0 ? void 0 : _b.call(options, result.data);
+            }
+        }
+        return result;
+    }), result = _c[0], setResult = _c[1];
+    var ref = React.useRef({
+        client: client,
+        query: query,
+        options: options,
+        result: result,
+        previousData: void 0,
+        watchQueryOptions: createWatchQueryOptions(query, options, defaultWatchQueryOptions),
+    });
     React.useEffect(function () {
-        var watchQueryOptions = createWatchQueryOptions(query, options);
+        var _a, _b;
+        var watchQueryOptions = createWatchQueryOptions(query, options, defaultWatchQueryOptions);
+        var nextResult;
         if (ref.current.client !== client || !equality.equal(ref.current.query, query)) {
             var obsQuery_1 = client.watchQuery(watchQueryOptions);
             setObsQuery(obsQuery_1);
+            nextResult = obsQuery_1.getCurrentResult();
         }
         else if (!equality.equal(ref.current.watchQueryOptions, watchQueryOptions)) {
-            obsQuery.setOptions(watchQueryOptions);
-            setObsQuery(obsQuery);
-        }
-        Object.assign(ref.current, {
-            client: client,
-            query: query,
-            options: options,
-            watchQueryOptions: watchQueryOptions,
-        });
-    }, [obsQuery, client, query, options]);
-    var _c = React.useMemo(function () {
-        var previousResult;
-        var subscribe = function (forceUpdate) {
-            var subscription = obsQuery.subscribe(forceUpdate, onError);
-            function onError(error) {
-                forceUpdate();
-                subscription.unsubscribe();
-                var last = obsQuery["last"];
-                obsQuery.resetLastResults();
-                obsQuery.subscribe(forceUpdate, onError);
-                obsQuery["last"] = last;
-                if (!error.hasOwnProperty('graphQLErrors')) {
-                    throw error;
+            obsQuery.setOptions(watchQueryOptions).catch(function () { });
+            nextResult = obsQuery.getCurrentResult();
+            ref.current.watchQueryOptions = watchQueryOptions;
+        }
+        if (nextResult) {
+            var previousResult = ref.current.result;
+            if (previousResult.data) {
+                ref.current.previousData = previousResult.data;
+            }
+            setResult(ref.current.result = nextResult);
+            if (!nextResult.loading && options) {
+                if (nextResult.error) {
+                    (_a = options.onError) === null || _a === void 0 ? void 0 : _a.call(options, nextResult.error);
                 }
-            }
-            return function () {
-                subscription.unsubscribe();
-            };
-        };
-        var getSnapshot = function () {
-            var result = obsQuery.getCurrentResult();
-            if (result.errors && result.errors.length) {
-                result = tslib.__assign(tslib.__assign({}, result), { error: result.error || new ApolloError({ graphQLErrors: result.errors }) });
-            }
-            if (!previousResult ||
-                previousResult.loading !== result.loading ||
-                previousResult.networkStatus !== result.networkStatus ||
-                !equality.equal(previousResult.data, result.data) ||
-                !equality.equal(previousResult.error, result.error)) {
-                if (previousResult) {
-                    result = tslib.__assign(tslib.__assign({}, result), { previousData: previousResult.data || previousResult.previousData });
+                else if (nextResult.data) {
+                    (_b = options.onCompleted) === null || _b === void 0 ? void 0 : _b.call(options, nextResult.data);
                 }
-                previousResult = result;
             }
-            return previousResult;
-        };
-        return [subscribe, getSnapshot];
-    }, [obsQuery]), subscribe = _c[0], getSnapshot = _c[1];
-    var obsQueryMethods = React.useMemo(function () { return ({
-        refetch: obsQuery.refetch.bind(obsQuery),
-        fetchMore: obsQuery.fetchMore.bind(obsQuery),
-        updateQuery: obsQuery.updateQuery.bind(obsQuery),
-        startPolling: obsQuery.startPolling.bind(obsQuery),
-        stopPolling: obsQuery.stopPolling.bind(obsQuery),
-        subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
-    }); }, [obsQuery]);
-    var result = shim.useSyncExternalStore(subscribe, getSnapshot, getSnapshot);
+        }
+        Object.assign(ref.current, { client: client, query: query });
+    }, [obsQuery, client, query, options]);
     React.useEffect(function () {
-        var _a, _b, _c, _d, _e, _f;
-        if (((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip) ||
-            ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.fetchPolicy) === 'standby') {
+        if (context.renderPromises) {
             return;
         }
-        if (!result.loading) {
-            if (result.error) {
-                (_d = (_c = ref.current.options) === null || _c === void 0 ? void 0 : _c.onError) === null || _d === void 0 ? void 0 : _d.call(_c, result.error);
+        var subscription = obsQuery.subscribe(onNext, onError);
+        function onNext() {
+            var _a, _b;
+            var previousResult = ref.current.result;
+            var result = obsQuery.getCurrentResult();
+            if (previousResult &&
+                previousResult.loading === result.loading &&
+                previousResult.networkStatus === result.networkStatus &&
+                equality.equal(previousResult.data, result.data)) {
+                return;
             }
-            else if (result.data) {
-                (_f = (_e = ref.current.options) === null || _e === void 0 ? void 0 : _e.onCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, result.data);
+            if (previousResult.data) {
+                ref.current.previousData = previousResult.data;
+            }
+            setResult(ref.current.result = result);
+            if (!result.loading) {
+                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, result.data);
+            }
+        }
+        function onError(error) {
+            var _a, _b;
+            var last = obsQuery["last"];
+            subscription.unsubscribe();
+            try {
+                obsQuery.resetLastResults();
+                subscription = obsQuery.subscribe(onNext, onError);
+            }
+            finally {
+                obsQuery["last"] = last;
+            }
+            if (!error.hasOwnProperty('graphQLErrors')) {
+                throw error;
+            }
+            var previousResult = ref.current.result;
+            if ((previousResult && previousResult.loading) ||
+                !equality.equal(error, previousResult.error)) {
+                setResult(ref.current.result = {
+                    data: previousResult.data,
+                    error: error,
+                    loading: false,
+                    networkStatus: exports.NetworkStatus.error,
+                });
+                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
             }
         }
-    }, [result]);
+        return function () { return subscription.unsubscribe(); };
+    }, [obsQuery, context.renderPromises, client.disableNetworkFetches]);
     var partial;
     (_a = result, partial = _a.partial, result = tslib.__rest(_a, ["partial"]));
-    if ((options === null || options === void 0 ? void 0 : options.skip) || (options === null || options === void 0 ? void 0 : options.fetchPolicy) === 'standby') {
-        result = {
-            loading: false,
-            data: void 0,
-            error: void 0,
-            networkStatus: exports.NetworkStatus.ready,
-        };
-    }
-    else {
+    {
         if (partial &&
             (options === null || options === void 0 ? void 0 : options.partialRefetch) &&
             !result.loading &&
@@ -6189,17 +6212,52 @@ function useQuery(query, options) {
             result = tslib.__assign(tslib.__assign({}, result), { loading: true, networkStatus: exports.NetworkStatus.refetch });
             obsQuery.refetch();
         }
-        if (context.renderPromises && (options === null || options === void 0 ? void 0 : options.ssr) !== false && result.loading) {
-            obsQuery.setOptions(createWatchQueryOptions(query, options))
-                .catch(function () { });
+        if (context.renderPromises &&
+            (options === null || options === void 0 ? void 0 : options.ssr) !== false &&
+            !(options === null || options === void 0 ? void 0 : options.skip) &&
+            result.loading) {
+            obsQuery.setOptions(createWatchQueryOptions(query, options, defaultWatchQueryOptions)).catch(function () { });
         }
+        Object.assign(ref.current, { options: options });
+    }
+    if ((context.renderPromises || client.disableNetworkFetches) &&
+        (options === null || options === void 0 ? void 0 : options.ssr) === false) {
+        result = ref.current.result = {
+            loading: true,
+            data: void 0,
+            error: void 0,
+            networkStatus: exports.NetworkStatus.loading,
+        };
     }
-    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryMethods), { variables: obsQuery.variables, client: client, called: true }), result);
+    else if ((options === null || options === void 0 ? void 0 : options.skip) || (options === null || options === void 0 ? void 0 : options.fetchPolicy) === 'standby') {
+        result = {
+            loading: false,
+            data: void 0,
+            error: void 0,
+            networkStatus: exports.NetworkStatus.ready,
+        };
+    }
+    if (result.errors && result.errors.length) {
+        result = tslib.__assign(tslib.__assign({}, result), { error: result.error || new ApolloError({ graphQLErrors: result.errors }) });
+    }
+    var obsQueryFields = React.useMemo(function () { return ({
+        refetch: obsQuery.refetch.bind(obsQuery),
+        fetchMore: obsQuery.fetchMore.bind(obsQuery),
+        updateQuery: obsQuery.updateQuery.bind(obsQuery),
+        startPolling: obsQuery.startPolling.bind(obsQuery),
+        stopPolling: obsQuery.stopPolling.bind(obsQuery),
+        subscribeToMore: obsQuery.subscribeToMore.bind(obsQuery),
+    }); }, [obsQuery]);
+    return tslib.__assign(tslib.__assign(tslib.__assign({}, obsQueryFields), { variables: createWatchQueryOptions(query, options, defaultWatchQueryOptions).variables, client: client, called: true, previousData: ref.current.previousData }), result);
 }
-function createWatchQueryOptions(query, options) {
+function createWatchQueryOptions(query, options, defaultOptions) {
     var _a;
     if (options === void 0) { options = {}; }
-    var skip = options.skip; options.ssr; options.onCompleted; options.onError; options.displayName; var watchQueryOptions = tslib.__rest(options, ["skip", "ssr", "onCompleted", "onError", "displayName"]);
+    var skip = options.skip; options.ssr; options.onCompleted; options.onError; options.displayName; var otherOptions = tslib.__rest(options, ["skip", "ssr", "onCompleted", "onError", "displayName"]);
+    var watchQueryOptions = tslib.__assign({ query: query }, otherOptions);
+    if (defaultOptions) {
+        watchQueryOptions = mergeOptions(defaultOptions, watchQueryOptions);
+    }
     if (skip) {
         watchQueryOptions.fetchPolicy = 'standby';
     }
@@ -6211,7 +6269,10 @@ function createWatchQueryOptions(query, options) {
     else if (!watchQueryOptions.fetchPolicy) {
         watchQueryOptions.fetchPolicy = 'cache-first';
     }
-    return tslib.__assign({ query: query }, watchQueryOptions);
+    if (!watchQueryOptions.variables) {
+        watchQueryOptions.variables = {};
+    }
+    return watchQueryOptions;
 }
 
 var EAGER_METHODS = [
@@ -6224,36 +6285,16 @@ var EAGER_METHODS = [
 function useLazyQuery(query, options) {
     var _a = React.useState({
         called: false,
-        resolves: [],
     }), execution = _a[0], setExecution = _a[1];
-    var execute = React.useCallback(function (executeOptions) {
-        var resolve;
-        var promise = new Promise(function (resolve1) { return (resolve = resolve1); });
-        setExecution(function (execution) {
-            if (execution.called) {
-                result && result.refetch(executeOptions === null || executeOptions === void 0 ? void 0 : executeOptions.variables);
-            }
-            return {
-                called: true,
-                resolves: tslib.__spreadArray(tslib.__spreadArray([], execution.resolves, true), [resolve], false),
-                options: executeOptions,
-            };
-        });
-        return promise;
-    }, []);
     var result = useQuery(query, tslib.__assign(tslib.__assign(tslib.__assign({}, options), execution.options), { fetchPolicy: execution.called ? options === null || options === void 0 ? void 0 : options.fetchPolicy : 'standby', skip: undefined }));
-    React.useEffect(function () {
-        var resolves = execution.resolves;
-        if (!result.loading && resolves.length) {
-            setExecution(function (execution) { return (tslib.__assign(tslib.__assign({}, execution), { resolves: [] })); });
-            resolves.forEach(function (resolve) { return resolve(result); });
-        }
-    }, [result, execution]);
     if (!execution.called) {
         result = tslib.__assign(tslib.__assign({}, result), { loading: false, data: void 0, error: void 0, called: false });
+    }
+    var eagerMethods = React.useMemo(function () {
+        var eagerMethods = {};
         var _loop_1 = function (key) {
             var method = result[key];
-            result[key] = function () {
+            eagerMethods[key] = function () {
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
@@ -6266,7 +6307,20 @@ function useLazyQuery(query, options) {
             var key = EAGER_METHODS_1[_i];
             _loop_1(key);
         }
-    }
+        return eagerMethods;
+    }, []);
+    result.error = result.error || void 0;
+    Object.assign(result, eagerMethods);
+    var execute = React.useCallback(function (executeOptions) {
+        setExecution({ called: true, options: executeOptions });
+        var promise = result.refetch(executeOptions === null || executeOptions === void 0 ? void 0 : executeOptions.variables).then(function (result1) {
+            var result2 = tslib.__assign(tslib.__assign({}, result), { data: result1.data, error: result1.error, called: true, loading: false });
+            Object.assign(result2, eagerMethods);
+            return result2;
+        });
+        promise.catch(function () { });
+        return promise;
+    }, []);
     return [execute, result];
 }
 
@@ -6282,79 +6336,73 @@ function useMutation(mutation, options) {
         result: result,
         mutationId: 0,
         isMounted: true,
-        execute: null,
         client: client,
         mutation: mutation,
         options: options,
     });
-    var execute = React.useMemo(function () {
-        if (ref.current.execute != null &&
-            ref.current.client === client &&
-            equality.equal(options, ref.current.options) &&
-            equality.equal(mutation, ref.current.mutation)) {
-            return ref.current.execute;
-        }
-        ref.current.client = client;
-        ref.current.options = options;
-        ref.current.mutation = mutation;
-        ref.current.execute = function (executeOptions) {
-            if (executeOptions === void 0) { executeOptions = {}; }
-            var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
-            if (!ref.current.result.loading && !baseOptions.ignoreResults) {
-                setResult(ref.current.result = {
-                    loading: true,
-                    error: void 0,
-                    data: void 0,
+    {
+        Object.assign(ref.current, { client: client, options: options, mutation: mutation });
+    }
+    var execute = React.useCallback(function (executeOptions) {
+        if (executeOptions === void 0) { executeOptions = {}; }
+        var _a = ref.current, client = _a.client, options = _a.options, mutation = _a.mutation;
+        var baseOptions = tslib.__assign(tslib.__assign({}, options), { mutation: mutation });
+        if (!ref.current.result.loading && !baseOptions.ignoreResults) {
+            setResult(ref.current.result = {
+                loading: true,
+                error: void 0,
+                data: void 0,
+                called: true,
+                client: client,
+            });
+        }
+        var mutationId = ++ref.current.mutationId;
+        var clientOptions = mergeOptions(baseOptions, executeOptions);
+        return client.mutate(clientOptions).then(function (response) {
+            var _a, _b;
+            var data = response.data, errors = response.errors;
+            var error = errors && errors.length > 0
+                ? new ApolloError({ graphQLErrors: errors })
+                : void 0;
+            if (mutationId === ref.current.mutationId &&
+                !clientOptions.ignoreResults) {
+                var result_1 = {
                     called: true,
+                    loading: false,
+                    data: data,
+                    error: error,
                     client: client,
-                });
-            }
-            var mutationId = ++ref.current.mutationId;
-            var clientOptions = mergeOptions(baseOptions, executeOptions);
-            return client.mutate(clientOptions).then(function (response) {
-                var _a;
-                var data = response.data, errors = response.errors;
-                var error = errors && errors.length > 0
-                    ? new ApolloError({ graphQLErrors: errors })
-                    : void 0;
-                if (mutationId === ref.current.mutationId &&
-                    !baseOptions.ignoreResults) {
-                    var result_1 = {
-                        called: true,
-                        loading: false,
-                        data: data,
-                        error: error,
-                        client: client,
-                    };
-                    if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
-                        setResult(ref.current.result = result_1);
-                    }
-                }
-                (_a = baseOptions.onCompleted) === null || _a === void 0 ? void 0 : _a.call(baseOptions, response.data);
-                return response;
-            }).catch(function (error) {
-                if (mutationId === ref.current.mutationId &&
-                    ref.current.isMounted) {
-                    var result_2 = {
-                        loading: false,
-                        error: error,
-                        data: void 0,
-                        called: true,
-                        client: client,
-                    };
-                    if (!equality.equal(ref.current.result, result_2)) {
-                        setResult(ref.current.result = result_2);
-                    }
+                };
+                if (ref.current.isMounted && !equality.equal(ref.current.result, result_1)) {
+                    setResult(ref.current.result = result_1);
                 }
-                if (baseOptions.onError) {
-                    baseOptions.onError(error);
-                    return { data: void 0, errors: error };
+            }
+            (_a = baseOptions.onCompleted) === null || _a === void 0 ? void 0 : _a.call(baseOptions, response.data);
+            (_b = executeOptions.onCompleted) === null || _b === void 0 ? void 0 : _b.call(executeOptions, response.data);
+            return response;
+        }).catch(function (error) {
+            var _a, _b;
+            if (mutationId === ref.current.mutationId &&
+                ref.current.isMounted) {
+                var result_2 = {
+                    loading: false,
+                    error: error,
+                    data: void 0,
+                    called: true,
+                    client: client,
+                };
+                if (!equality.equal(ref.current.result, result_2)) {
+                    setResult(ref.current.result = result_2);
                 }
-                throw error;
-            });
-        };
-        return ref.current.execute;
-    }, [client, mutation, options]);
+            }
+            if (baseOptions.onError || clientOptions.onError) {
+                (_a = baseOptions.onError) === null || _a === void 0 ? void 0 : _a.call(baseOptions, error);
+                (_b = executeOptions.onError) === null || _b === void 0 ? void 0 : _b.call(executeOptions, error);
+                return { data: void 0, errors: error };
+            }
+            throw error;
+        });
+    }, []);
     var reset = React.useCallback(function () {
         setResult({ called: false, loading: false, client: client });
     }, []);
@@ -6391,14 +6439,16 @@ function useSubscription(subscription, options) {
         if (typeof shouldResubscribe === 'function') {
             shouldResubscribe = !!shouldResubscribe(options);
         }
-        if ((options === null || options === void 0 ? void 0 : options.skip) && !(options === null || options === void 0 ? void 0 : options.skip) !== !((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip)) {
-            setResult({
-                loading: false,
-                data: void 0,
-                error: void 0,
-                variables: options === null || options === void 0 ? void 0 : options.variables,
-            });
-            setObservable(null);
+        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)) {
+                setResult({
+                    loading: false,
+                    data: void 0,
+                    error: void 0,
+                    variables: options === null || options === void 0 ? void 0 : options.variables,
+                });
+                setObservable(null);
+            }
         }
         else if (shouldResubscribe !== false && (client !== ref.current.client ||
             subscription !== ref.current.subscription ||
@@ -6516,6 +6566,7 @@ exports.parser = parser;
 exports.resetApolloContext = getApolloContext;
 exports.rewriteURIForGET = rewriteURIForGET;
 exports.selectHttpOptionsAndBody = selectHttpOptionsAndBody;
+exports.selectHttpOptionsAndBodyInternal = selectHttpOptionsAndBodyInternal;
 exports.selectURI = selectURI;
 exports.serializeFetchParameter = serializeFetchParameter;
 exports.split = split;