@apollo/client 3.8.0-alpha.12 → 3.8.0-alpha.13

package/apollo-client.cjs

@@ -67,7 +67,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 @".concat(directive.name.value, " directive.")) : tsInvariant.invariant(evaledValue !== void 0, 42);
+            __DEV__ ? tsInvariant.invariant(evaledValue !== void 0, "Invalid variable referenced in @".concat(directive.name.value, " directive.")) : tsInvariant.invariant(evaledValue !== void 0, 41);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -75,7 +75,6 @@ function shouldInclude(_a, variables) {
         return directive.name.value === 'skip' ? !evaledValue : evaledValue;
     });
 }
-var hasAnyDirectives = function (names, root) { return hasDirectives(names, root, false); };
 function hasDirectives(names, root, all) {
     var nameSet = new Set(names);
     var uniqueCount = nameSet.size;
@@ -104,13 +103,13 @@ 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 @".concat(directiveName, " directive.")) : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 43);
+            __DEV__ ? tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, "Incorrect number of arguments for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(directiveArguments && directiveArguments.length === 1, 42);
             var ifArgument = directiveArguments[0];
-            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 44);
+            __DEV__ ? tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', "Invalid argument for the @".concat(directiveName, " directive.")) : tsInvariant.invariant(ifArgument.name && ifArgument.name.value === 'if', 43);
             var ifValue = ifArgument.value;
             __DEV__ ? 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'), 45);
+                (ifValue.kind === 'Variable' || ifValue.kind === 'BooleanValue'), 44);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -123,14 +122,14 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === 'OperationDefinition') {
             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(46);
+                'No operations are allowed when using a fragment as a query. Only fragments are allowed.') : new tsInvariant.InvariantError(45);
         }
         if (definition.kind === 'FragmentDefinition') {
             fragments.push(definition);
         }
     });
     if (typeof actualFragmentName === 'undefined') {
-        __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, 47);
+        __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, 46);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -171,7 +170,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
                 return fragmentMap(fragmentName);
             }
             var fragment = fragmentMap && fragmentMap[fragmentName];
-            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(fragmentName)) : tsInvariant.invariant(fragment, 48);
+            __DEV__ ? tsInvariant.invariant(fragment, "No fragment named ".concat(fragmentName)) : tsInvariant.invariant(fragment, 47);
             return fragment || null;
         }
         default:
@@ -261,7 +260,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
     else {
         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(57);
+            'overcome this limitation.') : new tsInvariant.InvariantError(56);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -396,16 +395,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    __DEV__ ? tsInvariant.invariant(doc && doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc && doc.kind === 'Document', 49);
+    __DEV__ ? tsInvariant.invariant(doc && doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc && doc.kind === 'Document', 48);
     var operations = doc.definitions
         .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: \"".concat(definition.kind, "\"")) : new tsInvariant.InvariantError(50);
+            throw __DEV__ ? new tsInvariant.InvariantError("Schema type definitions not allowed in queries. Found: \"".concat(definition.kind, "\"")) : new tsInvariant.InvariantError(49);
         }
         return definition;
     });
-    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains ".concat(operations.length, " operations")) : tsInvariant.invariant(operations.length <= 1, 51);
+    __DEV__ ? tsInvariant.invariant(operations.length <= 1, "Ambiguous GraphQL document: contains ".concat(operations.length, " operations")) : tsInvariant.invariant(operations.length <= 1, 50);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -428,14 +427,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    __DEV__ ? tsInvariant.invariant(queryDef && queryDef.operation === 'query', 'Must contain a query definition.') : tsInvariant.invariant(queryDef && queryDef.operation === 'query', 52);
+    __DEV__ ? tsInvariant.invariant(queryDef && queryDef.operation === 'query', 'Must contain a query definition.') : tsInvariant.invariant(queryDef && queryDef.operation === 'query', 51);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    __DEV__ ? tsInvariant.invariant(doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc.kind === 'Document', 53);
-    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 54);
+    __DEV__ ? tsInvariant.invariant(doc.kind === 'Document', "Expecting a parsed GraphQL document. Perhaps you need to wrap the query string in a \"gql\" tag? http://docs.apollostack.com/apollo-client/core.html#gql") : tsInvariant.invariant(doc.kind === 'Document', 52);
+    __DEV__ ? tsInvariant.invariant(doc.definitions.length <= 1, 'Fragment must have exactly one definition.') : tsInvariant.invariant(doc.definitions.length <= 1, 53);
     var fragmentDef = doc.definitions[0];
-    __DEV__ ? tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 'Must be a fragment definition.') : tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 55);
+    __DEV__ ? tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 'Must be a fragment definition.') : tsInvariant.invariant(fragmentDef.kind === 'FragmentDefinition', 54);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -458,7 +457,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw __DEV__ ? new tsInvariant.InvariantError('Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment.') : new tsInvariant.InvariantError(56);
+    throw __DEV__ ? new tsInvariant.InvariantError('Expected a parsed GraphQL query with a query, mutation, subscription, or a fragment.') : new tsInvariant.InvariantError(55);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -817,6 +816,18 @@ var DeepMerger = (function () {
     return DeepMerger;
 }());
 
+function createFulfilledPromise(value) {
+    var promise = Promise.resolve(value);
+    promise.status = 'fulfilled';
+    promise.value = value;
+    return promise;
+}
+function createRejectedPromise(reason) {
+    var promise = Promise.reject(reason);
+    promise.status = 'rejected';
+    promise.reason = reason;
+    return promise;
+}
 function isStatefulPromise(promise) {
     return 'status' in promise;
 }
@@ -1490,7 +1501,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.8.0-alpha.12';
+var version = '3.8.0-alpha.13';
 
 function asyncIterator(source) {
     var _a;
@@ -6741,7 +6752,7 @@ var ApolloConsumer = function (props) {
     var ApolloContext = getApolloContext();
     return (React__namespace.createElement(ApolloContext.Consumer, null, function (context) {
         __DEV__ ? tsInvariant.invariant(context && context.client, 'Could not find "client" in the context of ApolloConsumer. ' +
-            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 29);
+            'Wrap the root component in an <ApolloProvider>.') : tsInvariant.invariant(context && context.client, 28);
         return props.children(context.client);
     }));
 };
@@ -6758,7 +6769,7 @@ var ApolloProvider = function (_a) {
             context = Object.assign({}, context, { suspenseCache: suspenseCache });
         }
         __DEV__ ? tsInvariant.invariant(context.client, 'ApolloProvider was not passed a client instance. Make ' +
-            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 30);
+            'sure you pass in your client via the "client" prop.') : tsInvariant.invariant(context.client, 29);
         return (React__namespace.createElement(ApolloContext.Provider, { value: context }, children));
     }));
 };
@@ -6768,7 +6779,7 @@ function useApolloClient(override) {
     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 ' +
-        'instance in via options.') : tsInvariant.invariant(!!client, 33);
+        'instance in via options.') : tsInvariant.invariant(!!client, 32);
     return client;
 }
 
@@ -6846,7 +6857,7 @@ function parser(document) {
     var variables, type, name;
     __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, 36);
+        "to convert your operation into a document") : tsInvariant.invariant(!!document && !!document.kind, 35);
     var fragments = [];
     var queries = [];
     var mutations = [];
@@ -6874,11 +6885,11 @@ function parser(document) {
     __DEV__ ? tsInvariant.invariant(!fragments.length ||
         (queries.length || mutations.length || subscriptions.length), "Passing only a fragment to 'graphql' is not yet supported. " +
         "You must include a query, subscription or mutation as well") : tsInvariant.invariant(!fragments.length ||
-        (queries.length || mutations.length || subscriptions.length), 37);
+        (queries.length || mutations.length || subscriptions.length), 36);
     __DEV__ ? tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, "react-apollo only supports a query, subscription, or a mutation per HOC. " +
         "".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, 38);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(queries.length + mutations.length + subscriptions.length <= 1, 37);
     type = queries.length ? exports.DocumentType.Query : exports.DocumentType.Mutation;
     if (!queries.length && !mutations.length)
         type = exports.DocumentType.Subscription;
@@ -6889,7 +6900,7 @@ function parser(document) {
             : subscriptions;
     __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, 39);
+        "You can use 'compose' to join multiple operation types to a component") : tsInvariant.invariant(definitions.length === 1, 38);
     var definition = definitions[0];
     variables = definition.variableDefinitions || [];
     if (definition.name && definition.name.kind === 'Name') {
@@ -6907,7 +6918,7 @@ function verifyDocumentType(document, type) {
     var requiredOperationName = operationName(type);
     var usedOperationName = operationName(operation.type);
     __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, 40);
+        "".concat(requiredOperationName, ", but a ").concat(usedOperationName, " was used instead.")) : tsInvariant.invariant(operation.type === type, 39);
 }
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -7438,9 +7449,13 @@ function useSubscription(subscription, options) {
         if (!observable) {
             return;
         }
+        var subscriptionStopped = false;
         var subscription = observable.subscribe({
             next: function (fetchResult) {
                 var _a, _b;
+                if (subscriptionStopped) {
+                    return;
+                }
                 var result = {
                     loading: false,
                     data: fetchResult.data,
@@ -7463,26 +7478,33 @@ function useSubscription(subscription, options) {
             },
             error: function (error) {
                 var _a, _b;
-                setResult({
-                    loading: false,
-                    data: void 0,
-                    error: error,
-                    variables: options === null || options === void 0 ? void 0 : options.variables,
-                });
-                (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
+                if (!subscriptionStopped) {
+                    setResult({
+                        loading: false,
+                        data: void 0,
+                        error: error,
+                        variables: options === null || options === void 0 ? void 0 : options.variables,
+                    });
+                    (_b = (_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, error);
+                }
             },
             complete: function () {
                 var _a, _b;
-                if ((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onComplete) {
-                    ref.current.options.onComplete();
-                }
-                else if ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.onSubscriptionComplete) {
-                    ref.current.options.onSubscriptionComplete();
+                if (!subscriptionStopped) {
+                    if ((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.onComplete) {
+                        ref.current.options.onComplete();
+                    }
+                    else if ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.onSubscriptionComplete) {
+                        ref.current.options.onSubscriptionComplete();
+                    }
                 }
             },
         });
         return function () {
-            subscription.unsubscribe();
+            subscriptionStopped = true;
+            setTimeout(function () {
+                subscription.unsubscribe();
+            });
         };
     }, [observable]);
     return result;
@@ -7574,46 +7596,40 @@ function useSuspenseCache(override) {
     var suspenseCache = override || context.suspenseCache;
     __DEV__ ? tsInvariant.invariant(suspenseCache, 'Could not find a "suspenseCache" in the context or passed in as an option. ' +
         'Wrap the root component in an <ApolloProvider> and provide a suspenseCache, ' +
-        'or pass a SuspenseCache instance in via options.') : tsInvariant.invariant(suspenseCache, 34);
+        'or pass a SuspenseCache instance in via options.') : tsInvariant.invariant(suspenseCache, 33);
     return suspenseCache;
 }
 
 function useSuspenseQuery_experimental(query, options) {
     if (options === void 0) { options = Object.create(null); }
-    var didPreviouslySuspend = React.useRef(false);
     var client = useApolloClient(options.client);
     var suspenseCache = useSuspenseCache(options.suspenseCache);
     var watchQueryOptions = useWatchQueryOptions({ query: query, options: options });
-    var _a = watchQueryOptions.returnPartialData, returnPartialData = _a === void 0 ? false : _a, variables = watchQueryOptions.variables;
-    var _b = options.suspensePolicy, suspensePolicy = _b === void 0 ? 'always' : _b, _c = options.queryKey, queryKey = _c === void 0 ? [] : _c;
-    var shouldSuspend = suspensePolicy === 'always' || !didPreviouslySuspend.current;
+    var variables = watchQueryOptions.variables;
+    var _a = options.queryKey, queryKey = _a === void 0 ? [] : _a;
+    var _b = usePromiseVersion(), version = _b[0], setVersion = _b[1];
     var cacheKey = [client, query, canonicalStringify(variables)].concat(queryKey);
     var subscription = suspenseCache.getSubscription(cacheKey, function () {
         return client.watchQuery(watchQueryOptions);
     });
-    var dispose = useTrackedSubscriptions(subscription);
-    useStrictModeSafeCleanupEffect(dispose);
-    var result = useSyncExternalStore(subscription.listen, function () { return subscription.result; }, function () { return subscription.result; });
-    var previousVariables = React.useRef(variables);
-    var previousData = React.useRef(result.data);
-    if (!equal.equal(variables, previousVariables.current)) {
-        if (result.networkStatus !== exports.NetworkStatus.ready) {
-            result = tslib.__assign(tslib.__assign({}, result), { data: previousData.current, networkStatus: exports.NetworkStatus.setVariables });
-        }
-        previousVariables.current = variables;
-        previousData.current = result.data;
-    }
-    if (result.networkStatus === exports.NetworkStatus.error ||
-        (shouldSuspend &&
-            !shouldUseCachedResult(subscription.result, {
-                returnPartialData: returnPartialData,
-                fetchPolicy: options.fetchPolicy,
-            }))) {
-        __use(subscription.promise);
-    }
-    didPreviouslySuspend.current = true;
-    var fetchMore = React.useCallback(function (options) { return subscription.fetchMore(options); }, [subscription]);
-    var refetch = React.useCallback(function (variables) { return subscription.refetch(variables); }, [subscription]);
+    useTrackedSubscriptions(subscription);
+    React.useEffect(function () {
+        return subscription.listen(function () {
+            setVersion('main');
+        });
+    }, [subscription]);
+    var promise = subscription.promises[version] || subscription.promises.main;
+    var result = __use(promise);
+    var fetchMore = React.useCallback(function (options) {
+        var promise = subscription.fetchMore(options);
+        setVersion('network');
+        return promise;
+    }, [subscription]);
+    var refetch = React.useCallback(function (variables) {
+        var promise = subscription.refetch(variables);
+        setVersion('network');
+        return promise;
+    }, [subscription]);
     var subscribeToMore = React.useCallback(function (options) { return subscription.observable.subscribeToMore(options); }, [subscription]);
     return React.useMemo(function () {
         return {
@@ -7641,7 +7657,7 @@ function validateFetchPolicy(fetchPolicy) {
         'no-cache',
         'cache-and-network',
     ];
-    __DEV__ ? tsInvariant.invariant(supportedFetchPolicies.includes(fetchPolicy), "The fetch policy `".concat(fetchPolicy, "` is not supported with suspense.")) : tsInvariant.invariant(supportedFetchPolicies.includes(fetchPolicy), 35);
+    __DEV__ ? tsInvariant.invariant(supportedFetchPolicies.includes(fetchPolicy), "The fetch policy `".concat(fetchPolicy, "` is not supported with suspense.")) : tsInvariant.invariant(supportedFetchPolicies.includes(fetchPolicy), 34);
 }
 function validatePartialDataReturn(fetchPolicy, returnPartialData) {
     if (fetchPolicy === 'no-cache' && returnPartialData) {
@@ -7656,73 +7672,62 @@ function toApolloError(result) {
 function useTrackedSubscriptions(subscription) {
     var trackedSubscriptions = React.useRef(new Set());
     trackedSubscriptions.current.add(subscription);
-    return function dispose() {
+    useStrictModeSafeCleanupEffect(function () {
         trackedSubscriptions.current.forEach(function (sub) { return sub.dispose(); });
-    };
+    });
+}
+function usePromiseVersion() {
+    var _a = React.useState({
+        version: 'main',
+    }), version = _a[0].version, setState = _a[1];
+    var setVersion = React.useCallback(function (version) { return setState({ version: version }); }, []);
+    return [version, setVersion];
 }
 function useWatchQueryOptions(_a) {
     var query = _a.query, options = _a.options;
-    var watchQueryOptions = useDeepMemo(function () { return (tslib.__assign(tslib.__assign({}, options), { query: query, notifyOnNetworkStatusChange: true, nextFetchPolicy: void 0 })); }, [options, query]);
+    var watchQueryOptions = useDeepMemo(function () { return (tslib.__assign(tslib.__assign({}, options), { query: query, notifyOnNetworkStatusChange: false, nextFetchPolicy: void 0 })); }, [options, query]);
     if (__DEV__) {
         validateOptions(watchQueryOptions);
     }
     return watchQueryOptions;
 }
-function shouldUseCachedResult(result, _a) {
-    var returnPartialData = _a.returnPartialData, fetchPolicy = _a.fetchPolicy;
-    if (result.networkStatus === exports.NetworkStatus.refetch ||
-        result.networkStatus === exports.NetworkStatus.fetchMore ||
-        result.networkStatus === exports.NetworkStatus.error) {
-        return false;
-    }
-    switch (fetchPolicy) {
-        case void 0:
-        case 'cache-first':
-        case 'cache-and-network': {
-            return Boolean(result.data && (!result.partial || returnPartialData));
-        }
-        default:
-            return false;
-    }
-}
 
-function wrapWithCustomPromise(concast) {
-    return new Promise(function (resolve, reject) {
-        var subscription = concast.subscribe({
-            next: function (value) {
-                resolve(value);
-                subscription.unsubscribe();
-            },
-            error: reject,
-        });
-    });
-}
-var isMultipartQuery = optimism.wrap(function (query) {
-    return hasAnyDirectives(['defer', 'stream'], query);
-});
 var QuerySubscription = (function () {
     function QuerySubscription(observable, options) {
         if (options === void 0) { options = Object.create(null); }
+        var _this = this;
         var _a;
         this.listeners = new Set();
+        this.initialized = false;
+        this.refetching = false;
         this.listen = this.listen.bind(this);
         this.handleNext = this.handleNext.bind(this);
         this.handleError = this.handleError.bind(this);
         this.dispose = this.dispose.bind(this);
         this.observable = observable;
-        this.result = observable.getCurrentResult();
+        this.result = observable.getCurrentResult(false);
         if (options.onDispose) {
             this.onDispose = options.onDispose;
         }
+        if (isNetworkRequestSettled(this.result.networkStatus) ||
+            (this.result.data &&
+                (!this.result.partial || this.observable.options.returnPartialData))) {
+            this.promises = { main: createFulfilledPromise(this.result) };
+            this.initialized = true;
+            this.refetching = false;
+        }
         this.subscription = observable.subscribe({
             next: this.handleNext,
             error: this.handleError,
         });
-        __DEV__ ? tsInvariant.invariant(observable['concast'], 'Unexpected error: A concast was not found on the observable.') : tsInvariant.invariant(observable['concast'], 28);
-        var concast = observable['concast'];
-        this.promise = isMultipartQuery(observable.query)
-            ? wrapWithCustomPromise(concast)
-            : concast.promise;
+        if (!this.promises) {
+            this.promises = {
+                main: new Promise(function (resolve, reject) {
+                    _this.resolve = resolve;
+                    _this.reject = reject;
+                }),
+            };
+        }
         this.autoDisposeTimeoutId = setTimeout(this.dispose, (_a = options.autoDisposeTimeoutMs) !== null && _a !== void 0 ? _a : 30000);
     }
     QuerySubscription.prototype.listen = function (listener) {
@@ -7734,12 +7739,15 @@ var QuerySubscription = (function () {
         };
     };
     QuerySubscription.prototype.refetch = function (variables) {
-        this.promise = this.observable.refetch(variables);
-        return this.promise;
+        this.refetching = true;
+        var promise = this.observable.refetch(variables);
+        this.promises.network = promise;
+        return promise;
     };
     QuerySubscription.prototype.fetchMore = function (options) {
-        this.promise = this.observable.fetchMore(options);
-        return this.promise;
+        var promise = this.observable.fetchMore(options);
+        this.promises.network = promise;
+        return promise;
     };
     QuerySubscription.prototype.dispose = function () {
         this.subscription.unsubscribe();
@@ -7748,21 +7756,39 @@ var QuerySubscription = (function () {
     QuerySubscription.prototype.onDispose = function () {
     };
     QuerySubscription.prototype.handleNext = function (result) {
-        if (isNetworkRequestSettled(result.networkStatus) &&
-            this.result.data &&
-            result.data === void 0) {
+        if (!this.initialized) {
+            this.initialized = true;
+            this.result = result;
+            this.resolve(result);
+            return;
+        }
+        if (result.data === this.result.data) {
+            return;
+        }
+        if (this.result.data && result.data === void 0) {
             result.data = this.result.data;
         }
         this.result = result;
-        this.deliver(result);
+        this.promises.main = createFulfilledPromise(result);
+        this.deliver();
     };
     QuerySubscription.prototype.handleError = function (error) {
         var result = tslib.__assign(tslib.__assign({}, this.result), { error: error, networkStatus: exports.NetworkStatus.error });
         this.result = result;
-        this.deliver(result);
+        if (!this.initialized || this.refetching) {
+            this.initialized = true;
+            this.refetching = false;
+            this.reject(error);
+            return;
+        }
+        this.result = result;
+        this.promises.main = result.data
+            ? createFulfilledPromise(result)
+            : createRejectedPromise(result);
+        this.deliver();
     };
-    QuerySubscription.prototype.deliver = function (result) {
-        this.listeners.forEach(function (listener) { return listener(result); });
+    QuerySubscription.prototype.deliver = function () {
+        this.listeners.forEach(function (listener) { return listener(); });
     };
     return QuerySubscription;
 }());