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

package/utilities/utilities.cjs.native.js

@@ -166,6 +166,43 @@ function getFragmentFromSelection(selection, fragmentMap) {
     }
 }
 
+var canonicalStringify = Object.assign(function canonicalStringify(value) {
+    return JSON.stringify(value, stableObjectReplacer);
+}, {
+    reset: function () {
+        sortingMap.clear();
+    },
+});
+var sortingMap = new Map();
+function stableObjectReplacer(key, value) {
+    if (value && typeof value === "object") {
+        var proto = Object.getPrototypeOf(value);
+        if (proto === Object.prototype || proto === null) {
+            var keys = Object.keys(value);
+            if (keys.every(everyKeyInOrder))
+                return value;
+            var unsortedKey = JSON.stringify(keys);
+            var sortedKeys = sortingMap.get(unsortedKey);
+            if (!sortedKeys) {
+                keys.sort();
+                var sortedKey = JSON.stringify(keys);
+                sortedKeys = sortingMap.get(sortedKey) || keys;
+                sortingMap.set(unsortedKey, sortedKeys);
+                sortingMap.set(sortedKey, sortedKeys);
+            }
+            var sortedObject_1 = Object.create(proto);
+            sortedKeys.forEach(function (key) {
+                sortedObject_1[key] = value[key];
+            });
+            return sortedObject_1;
+        }
+    }
+    return value;
+}
+function everyKeyInOrder(key, i, keys) {
+    return i === 0 || keys[i - 1] <= key;
+}
+
 function makeReference(id) {
     return { __ref: String(id) };
 }
@@ -272,6 +309,7 @@ var KNOWN_DIRECTIVES = [
     "export",
     "nonreactive",
 ];
+var storeKeyNameStringify = canonicalStringify;
 var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     if (args &&
         directives &&
@@ -287,7 +325,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
             filterKeys.forEach(function (key) {
                 filteredArgs_1[key] = args[key];
             });
-            return "".concat(directives["connection"]["key"], "(").concat(stringify(filteredArgs_1), ")");
+            return "".concat(directives["connection"]["key"], "(").concat(storeKeyNameStringify(filteredArgs_1), ")");
         }
         else {
             return directives["connection"]["key"];
@@ -295,7 +333,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     }
     var completeFieldName = fieldName;
     if (args) {
-        var stringifiedArgs = stringify(args);
+        var stringifiedArgs = storeKeyNameStringify(args);
         completeFieldName += "(".concat(stringifiedArgs, ")");
     }
     if (directives) {
@@ -303,7 +341,7 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
             if (KNOWN_DIRECTIVES.indexOf(key) !== -1)
                 return;
             if (directives[key] && Object.keys(directives[key]).length) {
-                completeFieldName += "@".concat(key, "(").concat(stringify(directives[key]), ")");
+                completeFieldName += "@".concat(key, "(").concat(storeKeyNameStringify(directives[key]), ")");
             }
             else {
                 completeFieldName += "@".concat(key);
@@ -313,25 +351,11 @@ var getStoreKeyName = Object.assign(function (fieldName, args, directives) {
     return completeFieldName;
 }, {
     setStringify: function (s) {
-        var previous = stringify;
-        stringify = s;
+        var previous = storeKeyNameStringify;
+        storeKeyNameStringify = s;
         return previous;
     },
 });
-var stringify = function defaultStringify(value) {
-    return JSON.stringify(value, stringifyReplacer);
-};
-function stringifyReplacer(_key, value) {
-    if (isNonNullObject(value) && !Array.isArray(value)) {
-        value = Object.keys(value)
-            .sort()
-            .reduce(function (copy, key) {
-            copy[key] = value[key];
-            return copy;
-        }, {});
-    }
-    return value;
-}
 function argumentsObjectFromField(field, variables) {
     if (field.arguments && field.arguments.length) {
         var argObj_1 = {};
@@ -1249,48 +1273,31 @@ function iterateObserversSafely(observers, method, argument) {
 
 function asyncMap(observable, mapFn, catchFn) {
     return new zenObservableTs.Observable(function (observer) {
-        var next = observer.next, error = observer.error, complete = observer.complete;
-        var activeCallbackCount = 0;
-        var completed = false;
         var promiseQueue = {
             then: function (callback) {
                 return new Promise(function (resolve) { return resolve(callback()); });
             },
         };
-        function makeCallback(examiner, delegate) {
-            if (examiner) {
-                return function (arg) {
-                    ++activeCallbackCount;
-                    var both = function () { return examiner(arg); };
-                    promiseQueue = promiseQueue
-                        .then(both, both)
-                        .then(function (result) {
-                        --activeCallbackCount;
-                        next && next.call(observer, result);
-                        if (completed) {
-                            handler.complete();
-                        }
-                    }, function (error) {
-                        --activeCallbackCount;
-                        throw error;
-                    })
-                        .catch(function (caught) {
-                        error && error.call(observer, caught);
-                    });
-                };
-            }
-            else {
-                return function (arg) { return delegate && delegate.call(observer, arg); };
-            }
+        function makeCallback(examiner, key) {
+            return function (arg) {
+                if (examiner) {
+                    var both = function () {
+                        return observer.closed
+                            ? 0
+                            : examiner(arg);
+                    };
+                    promiseQueue = promiseQueue.then(both, both).then(function (result) { return observer.next(result); }, function (error) { return observer.error(error); });
+                }
+                else {
+                    observer[key](arg);
+                }
+            };
         }
         var handler = {
-            next: makeCallback(mapFn, next),
-            error: makeCallback(catchFn, error),
+            next: makeCallback(mapFn, "next"),
+            error: makeCallback(catchFn, "error"),
             complete: function () {
-                completed = true;
-                if (!activeCallbackCount) {
-                    complete && complete.call(observer);
-                }
+                promiseQueue.then(function () { return observer.complete(); });
             },
         };
         var sub = observable.subscribe(handler);
@@ -1591,6 +1598,7 @@ exports.canUseLayoutEffect = canUseLayoutEffect;
 exports.canUseSymbol = canUseSymbol;
 exports.canUseWeakMap = canUseWeakMap;
 exports.canUseWeakSet = canUseWeakSet;
+exports.canonicalStringify = canonicalStringify;
 exports.checkDocument = checkDocument;
 exports.cloneDeep = cloneDeep;
 exports.compact = compact;

package/version.js

@@ -1,2 +1,2 @@
-export var version = "3.9.0-alpha.1";
+export var version = "3.9.0-alpha.2";
 //# sourceMappingURL=version.js.map