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

package/utilities/utilities.cjs.native.js

@@ -20,7 +20,7 @@ function shouldInclude(_a, variables) {
         if (ifArgument.value.kind === "Variable") {
             evaledValue =
                 variables && variables[ifArgument.value.name.value];
-            globals.invariant(evaledValue !== void 0, 64, directive.name.value);
+            globals.invariant(evaledValue !== void 0, 65, directive.name.value);
         }
         else {
             evaledValue = ifArgument.value.value;
@@ -70,12 +70,12 @@ function getInclusionDirectives(directives) {
                 return;
             var directiveArguments = directive.arguments;
             var directiveName = directive.name.value;
-            globals.invariant(directiveArguments && directiveArguments.length === 1, 65, directiveName);
+            globals.invariant(directiveArguments && directiveArguments.length === 1, 66, directiveName);
             var ifArgument = directiveArguments[0];
-            globals.invariant(ifArgument.name && ifArgument.name.value === "if", 66, directiveName);
+            globals.invariant(ifArgument.name && ifArgument.name.value === "if", 67, directiveName);
             var ifValue = ifArgument.value;
             globals.invariant(ifValue &&
-                (ifValue.kind === "Variable" || ifValue.kind === "BooleanValue"), 67, directiveName);
+                (ifValue.kind === "Variable" || ifValue.kind === "BooleanValue"), 68, directiveName);
             result.push({ directive: directive, ifArgument: ifArgument });
         });
     }
@@ -107,7 +107,7 @@ function getFragmentQueryDocument(document, fragmentName) {
     document.definitions.forEach(function (definition) {
         if (definition.kind === "OperationDefinition") {
             throw globals.newInvariantError(
-                68,
+                69,
                 definition.operation,
                 definition.name ? " named '".concat(definition.name.value, "'") : ""
             );
@@ -117,7 +117,7 @@ function getFragmentQueryDocument(document, fragmentName) {
         }
     });
     if (typeof actualFragmentName === "undefined") {
-        globals.invariant(fragments.length === 1, 69, fragments.length);
+        globals.invariant(fragments.length === 1, 70, fragments.length);
         actualFragmentName = fragments[0].name.value;
     }
     var query = tslib.__assign(tslib.__assign({}, document), { definitions: tslib.__spreadArray([
@@ -158,7 +158,7 @@ function getFragmentFromSelection(selection, fragmentMap) {
                 return fragmentMap(fragmentName);
             }
             var fragment = fragmentMap && fragmentMap[fragmentName];
-            globals.invariant(fragment, 70, fragmentName);
+            globals.invariant(fragment, 71, fragmentName);
             return fragment || null;
         }
         default:
@@ -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) };
 }
@@ -236,7 +273,7 @@ function valueToObjectRepresentation(argObj, name, value, variables) {
         argObj[name.value] = null;
     }
     else {
-        throw globals.newInvariantError(79, name.value, value.kind);
+        throw globals.newInvariantError(80, name.value, value.kind);
     }
 }
 function storeKeyNameFromField(field, variables) {
@@ -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 = {};
@@ -383,16 +407,16 @@ function isInlineFragment(selection) {
 }
 
 function checkDocument(doc) {
-    globals.invariant(doc && doc.kind === "Document", 71);
+    globals.invariant(doc && doc.kind === "Document", 72);
     var operations = doc.definitions
         .filter(function (d) { return d.kind !== "FragmentDefinition"; })
         .map(function (definition) {
         if (definition.kind !== "OperationDefinition") {
-            throw globals.newInvariantError(72, definition.kind);
+            throw globals.newInvariantError(73, definition.kind);
         }
         return definition;
     });
-    globals.invariant(operations.length <= 1, 73, operations.length);
+    globals.invariant(operations.length <= 1, 74, operations.length);
     return doc;
 }
 function getOperationDefinition(doc) {
@@ -415,14 +439,14 @@ function getFragmentDefinitions(doc) {
 }
 function getQueryDefinition(doc) {
     var queryDef = getOperationDefinition(doc);
-    globals.invariant(queryDef && queryDef.operation === "query", 74);
+    globals.invariant(queryDef && queryDef.operation === "query", 75);
     return queryDef;
 }
 function getFragmentDefinition(doc) {
-    globals.invariant(doc.kind === "Document", 75);
-    globals.invariant(doc.definitions.length <= 1, 76);
+    globals.invariant(doc.kind === "Document", 76);
+    globals.invariant(doc.definitions.length <= 1, 77);
     var fragmentDef = doc.definitions[0];
-    globals.invariant(fragmentDef.kind === "FragmentDefinition", 77);
+    globals.invariant(fragmentDef.kind === "FragmentDefinition", 78);
     return fragmentDef;
 }
 function getMainDefinition(queryDoc) {
@@ -445,7 +469,7 @@ function getMainDefinition(queryDoc) {
     if (fragmentDefinition) {
         return fragmentDefinition;
     }
-    throw globals.newInvariantError(78);
+    throw globals.newInvariantError(79);
 }
 function getDefaultValues(definition) {
     var defaultValues = Object.create(null);
@@ -517,7 +541,7 @@ var DocumentTransform = (function () {
             return;
         var cacheKeys = this.getCacheKey(document);
         if (cacheKeys) {
-            globals.invariant(Array.isArray(cacheKeys), 63);
+            globals.invariant(Array.isArray(cacheKeys), 64);
             return this.stableCacheKeys.lookupArray(cacheKeys);
         }
     };
@@ -613,7 +637,7 @@ function removeDirectivesFromDocument(directives, doc) {
                 return getInUseByFragmentName(ancestor.name.value);
             }
         }
-        globalThis.__DEV__ !== false && globals.invariant.error(80);
+        globalThis.__DEV__ !== false && globals.invariant.error(81);
         return null;
     };
     var operationCount = 0;
@@ -800,7 +824,7 @@ var connectionRemoveConfig = {
         if (willRemove) {
             if (!directive.arguments ||
                 !directive.arguments.some(function (arg) { return arg.name.value === "key"; })) {
-                globalThis.__DEV__ !== false && globals.invariant.warn(81);
+                globalThis.__DEV__ !== false && globals.invariant.warn(82);
             }
         }
         return willRemove;
@@ -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.0";
+export var version = "3.9.0-alpha.2";
 //# sourceMappingURL=version.js.map