@apollo/client 3.7.0-alpha.3 → 3.7.0-alpha.6

package/apollo-client.cjs

@@ -761,18 +761,15 @@ var DeepMerger = (function () {
     };
     DeepMerger.prototype.shallowCopyForMerge = function (value) {
         if (isNonNullObject(value)) {
-            if (this.pastCopies.has(value)) {
-                if (!Object.isFrozen(value))
-                    return value;
-                this.pastCopies.delete(value);
-            }
-            if (Array.isArray(value)) {
-                value = value.slice(0);
-            }
-            else {
-                value = tslib.__assign({ __proto__: Object.getPrototypeOf(value) }, value);
+            if (!this.pastCopies.has(value)) {
+                if (Array.isArray(value)) {
+                    value = value.slice(0);
+                }
+                else {
+                    value = tslib.__assign({ __proto__: Object.getPrototypeOf(value) }, value);
+                }
+                this.pastCopies.add(value);
             }
-            this.pastCopies.add(value);
         }
         return value;
     };
@@ -929,7 +926,6 @@ var Concast = (function (_super) {
             return function () { return _this.removeObserver(observer); };
         }) || this;
         _this.observers = new Set();
-        _this.addCount = 0;
         _this.promise = new Promise(function (resolve, reject) {
             _this.resolve = resolve;
             _this.reject = reject;
@@ -938,6 +934,7 @@ var Concast = (function (_super) {
             next: function (result) {
                 if (_this.sub !== null) {
                     _this.latest = ["next", result];
+                    _this.notify("next", result);
                     iterateObserversSafely(_this.observers, "next", result);
                 }
             },
@@ -949,6 +946,7 @@ var Concast = (function (_super) {
                     _this.sub = null;
                     _this.latest = ["error", error];
                     _this.reject(error);
+                    _this.notify("error", error);
                     iterateObserversSafely(_this.observers, "error", error);
                 }
             },
@@ -967,6 +965,7 @@ var Concast = (function (_super) {
                         else {
                             _this.resolve();
                         }
+                        _this.notify("complete");
                         iterateObserversSafely(_this.observers, "complete");
                     }
                     else if (isPromiseLike(value)) {
@@ -978,6 +977,7 @@ var Concast = (function (_super) {
                 }
             },
         };
+        _this.nextResultListeners = new Set();
         _this.cancel = function (reason) {
             _this.reject(reason);
             _this.sources = [];
@@ -1019,34 +1019,29 @@ var Concast = (function (_super) {
         if (!this.observers.has(observer)) {
             this.deliverLastMessage(observer);
             this.observers.add(observer);
-            ++this.addCount;
         }
     };
-    Concast.prototype.removeObserver = function (observer, quietly) {
+    Concast.prototype.removeObserver = function (observer) {
         if (this.observers.delete(observer) &&
-            --this.addCount < 1 &&
-            !quietly) {
+            this.observers.size < 1) {
             this.handlers.complete();
         }
     };
-    Concast.prototype.cleanup = function (callback) {
-        var _this = this;
+    Concast.prototype.notify = function (method, arg) {
+        var nextResultListeners = this.nextResultListeners;
+        if (nextResultListeners.size) {
+            this.nextResultListeners = new Set;
+            nextResultListeners.forEach(function (listener) { return listener(method, arg); });
+        }
+    };
+    Concast.prototype.beforeNext = function (callback) {
         var called = false;
-        var once = function () {
+        this.nextResultListeners.add(function (method, arg) {
             if (!called) {
                 called = true;
-                _this.observers.delete(observer);
-                callback();
+                callback(method, arg);
             }
-        };
-        var observer = {
-            next: once,
-            error: once,
-            complete: once,
-        };
-        var count = this.addCount;
-        this.addObserver(observer);
-        this.addCount = count;
+        });
     };
     return Concast;
 }(zenObservableTs.Observable));
@@ -1303,7 +1298,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.7.0-alpha.3';
+var version = '3.7.0-alpha.6';
 
 var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function parseAndCheckHttpResponse(operations) {
@@ -2396,7 +2391,6 @@ var StoreReader = (function () {
         var policies = this.config.cache.policies;
         variables = tslib.__assign(tslib.__assign({}, getDefaultValues(getQueryDefinition(query))), variables);
         var rootRef = makeReference(rootId);
-        var merger = new DeepMerger;
         var execResult = this.executeSelectionSet({
             selectionSet: getMainDefinition(query).selectionSet,
             objectOrReference: rootRef,
@@ -2409,9 +2403,6 @@ var StoreReader = (function () {
                 varString: canonicalStringify(variables),
                 canonizeResults: canonizeResults,
                 fragmentMap: createFragmentMap(getFragmentDefinitions(query)),
-                merge: function (a, b) {
-                    return merger.merge(a, b);
-                },
             },
         });
         var missing;
@@ -2450,17 +2441,18 @@ var StoreReader = (function () {
         }
         var variables = context.variables, policies = context.policies, store = context.store;
         var typename = store.getFieldValue(objectOrReference, "__typename");
-        var result = {};
+        var objectsToMerge = [];
         var missing;
+        var missingMerger = new DeepMerger();
         if (this.config.addTypename &&
             typeof typename === "string" &&
             !policies.rootIdsByTypename[typename]) {
-            result = { __typename: typename };
+            objectsToMerge.push({ __typename: typename });
         }
         function handleMissing(result, resultName) {
             var _a;
             if (result.missing) {
-                missing = context.merge(missing, (_a = {}, _a[resultName] = result.missing, _a));
+                missing = missingMerger.merge(missing, (_a = {}, _a[resultName] = result.missing, _a));
             }
             return result.result;
         }
@@ -2479,7 +2471,7 @@ var StoreReader = (function () {
                 var resultName = resultKeyNameFromField(selection);
                 if (fieldValue === void 0) {
                     if (!addTypenameToDocument.added(selection)) {
-                        missing = context.merge(missing, (_a = {},
+                        missing = missingMerger.merge(missing, (_a = {},
                             _a[resultName] = "Can't find field '".concat(selection.name.value, "' on ").concat(isReference(objectOrReference)
                                 ? objectOrReference.__ref + " object"
                                 : "object " + JSON.stringify(objectOrReference, null, 2)),
@@ -2508,7 +2500,7 @@ var StoreReader = (function () {
                     }), resultName);
                 }
                 if (fieldValue !== void 0) {
-                    result = context.merge(result, (_b = {}, _b[resultName] = fieldValue, _b));
+                    objectsToMerge.push((_b = {}, _b[resultName] = fieldValue, _b));
                 }
             }
             else {
@@ -2518,6 +2510,7 @@ var StoreReader = (function () {
                 }
             }
         });
+        var result = mergeDeepArray(objectsToMerge);
         var finalResult = { result: result, missing: missing };
         var frozen = context.canonizeResults
             ? this.canon.admit(finalResult)
@@ -2531,10 +2524,11 @@ var StoreReader = (function () {
         var _this = this;
         var field = _a.field, array = _a.array, enclosingRef = _a.enclosingRef, context = _a.context;
         var missing;
+        var missingMerger = new DeepMerger();
         function handleMissing(childResult, i) {
             var _a;
             if (childResult.missing) {
-                missing = context.merge(missing, (_a = {}, _a[i] = childResult.missing, _a));
+                missing = missingMerger.merge(missing, (_a = {}, _a[i] = childResult.missing, _a));
             }
             return childResult.result;
         }
@@ -4307,7 +4301,7 @@ var ObservableQuery = (function (_super) {
             newNetworkStatus === exports.NetworkStatus.poll;
         var oldVariables = this.options.variables;
         var oldFetchPolicy = this.options.fetchPolicy;
-        var mergedOptions = mergeOptions(this.options, newOptions || {});
+        var mergedOptions = compact(this.options, newOptions || {});
         var options = useDisposableConcast
             ? mergedOptions
             : assign(this.options, mergedOptions);
@@ -4335,7 +4329,7 @@ var ObservableQuery = (function (_super) {
         };
         if (!useDisposableConcast) {
             if (this.concast && this.observer) {
-                this.concast.removeObserver(this.observer, true);
+                this.concast.removeObserver(this.observer);
             }
             this.concast = concast;
             this.observer = observer;
@@ -5480,7 +5474,7 @@ var QueryManager = (function () {
                         execute(link, operation)
                     ]);
                     byVariables_1.set(varJson_1, observable = concast);
-                    concast.cleanup(function () {
+                    concast.beforeNext(function () {
                         if (byVariables_1.delete(varJson_1) &&
                             byVariables_1.size < 1) {
                             inFlightLinkObservables_1.delete(serverQuery);
@@ -5515,6 +5509,7 @@ var QueryManager = (function () {
     };
     QueryManager.prototype.getResultsFromLink = function (queryInfo, cacheWriteBehavior, options) {
         var requestId = queryInfo.lastRequestId = this.generateRequestId();
+        options = cloneDeep(options);
         return asyncMap(this.getObservableFromLink(queryInfo.document, options.context, options.variables), function (result) {
             var hasErrors = isNonEmptyArray(result.errors);
             if (requestId >= queryInfo.lastRequestId) {
@@ -5573,7 +5568,7 @@ var QueryManager = (function () {
         var concast = new Concast(this.transform(normalized.query).hasClientExports
             ? this.localState.addExportedVariables(normalized.query, normalized.variables, normalized.context).then(fromVariables)
             : fromVariables(normalized.variables));
-        concast.cleanup(function () {
+        concast.beforeNext(function () {
             _this.fetchCancelFns.delete(queryId);
             if (queryInfo.observableQuery) {
                 queryInfo.observableQuery["applyNextFetchPolicy"]("after-fetch", options);
@@ -6042,11 +6037,9 @@ function useApolloClient(override) {
 }
 
 var didWarnUncachedGetSnapshot = false;
-var useSyncExternalStore = function (subscribe, getSnapshot, getServerSnapshot) {
-    var realHook = React__namespace.useSyncExternalStore;
-    if (realHook) {
-        return realHook(subscribe, getSnapshot, getServerSnapshot);
-    }
+var uSESKey = "useSyncExternalStore";
+var realHook = React__namespace[uSESKey];
+var useSyncExternalStore = realHook || (function (subscribe, getSnapshot, getServerSnapshot) {
     var value = getSnapshot();
     if (__DEV__ &&
         !didWarnUncachedGetSnapshot &&
@@ -6077,7 +6070,7 @@ var useSyncExternalStore = function (subscribe, getSnapshot, getServerSnapshot)
         });
     }, [subscribe]);
     return value;
-};
+});
 function checkIfSnapshotChanged(_a) {
     var value = _a.value, getSnapshot = _a.getSnapshot;
     try {
@@ -6191,7 +6184,7 @@ function useInternalState(client, query) {
     if (!stateRef.current ||
         client !== stateRef.current.client ||
         query !== stateRef.current.query) {
-        stateRef.current = new InternalState(client, query);
+        stateRef.current = new InternalState(client, query, stateRef.current);
     }
     var state = stateRef.current;
     var _a = React.useState(0); _a[0]; var setTick = _a[1];
@@ -6201,7 +6194,7 @@ function useInternalState(client, query) {
     return state;
 }
 var InternalState = (function () {
-    function InternalState(client, query) {
+    function InternalState(client, query, previous) {
         this.client = client;
         this.query = query;
         this.asyncResolveFns = new Set();
@@ -6220,6 +6213,11 @@ var InternalState = (function () {
         });
         this.toQueryResultCache = new (canUseWeakMap ? WeakMap : Map)();
         verifyDocumentType(query, exports.DocumentType.Query);
+        var previousResult = previous && previous.result;
+        var previousData = previousResult && previousResult.data;
+        if (previousData) {
+            this.previousData = previousData;
+        }
     }
     InternalState.prototype.forceUpdate = function () {
         __DEV__ && tsInvariant.invariant.warn("Calling default no-op implementation of InternalState#forceUpdate");
@@ -6594,6 +6592,12 @@ function useSubscription(subscription, options) {
             context: options === null || options === void 0 ? void 0 : options.context,
         });
     }), observable = _b[0], setObservable = _b[1];
+    var canResetObservableRef = React.useRef(false);
+    React.useEffect(function () {
+        return function () {
+            canResetObservableRef.current = true;
+        };
+    }, []);
     var ref = React.useRef({ client: client, subscription: subscription, options: options });
     React.useEffect(function () {
         var _a, _b, _c, _d;
@@ -6602,7 +6606,7 @@ function useSubscription(subscription, options) {
             shouldResubscribe = !!shouldResubscribe(options);
         }
         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)) {
+            if (!(options === null || options === void 0 ? void 0 : options.skip) !== !((_a = ref.current.options) === null || _a === void 0 ? void 0 : _a.skip) || canResetObservableRef.current) {
                 setResult({
                     loading: false,
                     data: void 0,
@@ -6610,13 +6614,16 @@ function useSubscription(subscription, options) {
                     variables: options === null || options === void 0 ? void 0 : options.variables,
                 });
                 setObservable(null);
+                canResetObservableRef.current = false;
             }
         }
-        else if (shouldResubscribe !== false && (client !== ref.current.client ||
-            subscription !== ref.current.subscription ||
-            (options === null || options === void 0 ? void 0 : options.fetchPolicy) !== ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.fetchPolicy) ||
-            !(options === null || options === void 0 ? void 0 : options.skip) !== !((_c = ref.current.options) === null || _c === void 0 ? void 0 : _c.skip) ||
-            !equality.equal(options === null || options === void 0 ? void 0 : options.variables, (_d = ref.current.options) === null || _d === void 0 ? void 0 : _d.variables))) {
+        else if ((shouldResubscribe !== false &&
+            (client !== ref.current.client ||
+                subscription !== ref.current.subscription ||
+                (options === null || options === void 0 ? void 0 : options.fetchPolicy) !== ((_b = ref.current.options) === null || _b === void 0 ? void 0 : _b.fetchPolicy) ||
+                !(options === null || options === void 0 ? void 0 : options.skip) !== !((_c = ref.current.options) === null || _c === void 0 ? void 0 : _c.skip) ||
+                !equality.equal(options === null || options === void 0 ? void 0 : options.variables, (_d = ref.current.options) === null || _d === void 0 ? void 0 : _d.variables))) ||
+            canResetObservableRef.current) {
             setResult({
                 loading: true,
                 data: void 0,
@@ -6629,9 +6636,10 @@ function useSubscription(subscription, options) {
                 fetchPolicy: options === null || options === void 0 ? void 0 : options.fetchPolicy,
                 context: options === null || options === void 0 ? void 0 : options.context,
             }));
+            canResetObservableRef.current = false;
         }
         Object.assign(ref.current, { client: client, subscription: subscription, options: options });
-    }, [client, subscription, options]);
+    }, [client, subscription, options, canResetObservableRef.current]);
     React.useEffect(function () {
         if (!observable) {
             return;