@apollo/client 3.8.0-beta.1 → 3.8.0-beta.3

package/apollo-client.cjs

@@ -33,7 +33,7 @@ var equal__default = /*#__PURE__*/_interopDefaultLegacy(equal);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var version = '3.8.0-beta.1';
+var version = '3.8.0-beta.3';
 
 function maybe(thunk) {
     try {
@@ -614,6 +614,17 @@ var DocumentTransform = (function () {
     return DocumentTransform;
 }());
 
+var printCache = canUseWeakMap ? new WeakMap() : undefined;
+var print = function (ast) {
+    var result;
+    result = printCache === null || printCache === void 0 ? void 0 : printCache.get(ast);
+    if (!result) {
+        result = graphql.print(ast);
+        printCache === null || printCache === void 0 ? void 0 : printCache.set(ast, result);
+    }
+    return result;
+};
+
 var isArray = Array.isArray;
 function isNonEmptyArray(value) {
     return Array.isArray(value) && value.length > 0;
@@ -1453,12 +1464,13 @@ function transformOperation(operation) {
     return transformedOperation;
 }
 
-function filterOperationVariables(variables, operation) {
+function filterOperationVariables(variables, query) {
     var result = tslib.__assign({}, variables);
     var unusedNames = new Set(Object.keys(variables));
-    graphql.visit(operation.query, {
+    graphql.visit(query, {
         Variable: function (node, _key, parent) {
-            if (parent && parent.kind !== 'VariableDefinition') {
+            if (parent &&
+                parent.kind !== 'VariableDefinition') {
                 unusedNames.delete(node.name.value);
             }
         },
@@ -1970,7 +1982,7 @@ function selectHttpOptionsAndBodyInternal(operation, printer) {
     if (http.includeExtensions)
         body.extensions = extensions;
     if (http.includeQuery)
-        body.query = printer(query, graphql.print);
+        body.query = printer(query, print);
     return {
         options: options,
         body: body,
@@ -2107,7 +2119,7 @@ var createHttpLink = function (linkOptions) {
         }
         var _b = selectHttpOptionsAndBodyInternal(operation, print, fallbackHttpConfig, linkConfig, contextConfig), options = _b.options, body = _b.body;
         if (body.variables && !includeUnusedVariables) {
-            body.variables = filterOperationVariables(body.variables, operation);
+            body.variables = filterOperationVariables(body.variables, operation.query);
         }
         var controller;
         if (!options.signal) {
@@ -6263,8 +6275,9 @@ var QueryManager = (function () {
             };
             context = operation.context;
             if (deduplication) {
-                var byVariables_1 = inFlightLinkObservables_1.get(serverQuery) || new Map();
-                inFlightLinkObservables_1.set(serverQuery, byVariables_1);
+                var printedServerQuery_1 = print(serverQuery);
+                var byVariables_1 = inFlightLinkObservables_1.get(printedServerQuery_1) || new Map();
+                inFlightLinkObservables_1.set(printedServerQuery_1, byVariables_1);
                 var varJson_1 = canonicalStringify(variables);
                 observable = byVariables_1.get(varJson_1);
                 if (!observable) {
@@ -6275,7 +6288,7 @@ var QueryManager = (function () {
                     concast.beforeNext(function () {
                         if (byVariables_1.delete(varJson_1) &&
                             byVariables_1.size < 1) {
-                            inFlightLinkObservables_1.delete(serverQuery);
+                            inFlightLinkObservables_1.delete(printedServerQuery_1);
                         }
                     });
                 }
@@ -6805,17 +6818,8 @@ var contextKey = canUseSymbol
     : '__APOLLO_CONTEXT__';
 function getApolloContext() {
     invariant('createContext' in React__namespace, 44);
-    var contextStorage = global$1[contextKey];
-    if (!contextStorage) {
-        contextStorage = global$1[contextKey] = new Map();
-    }
-    var context = contextStorage.get(React__namespace);
-    if (!context) {
-        context = React__namespace.createContext({});
-        context.displayName = 'ApolloContext';
-        contextStorage.set(React__namespace, context);
-    }
-    return context;
+    var contextStorage = global$1[contextKey] || (global$1[contextKey] = Object.create(null));
+    return contextStorage[React__namespace.version] || (contextStorage[React__namespace.version] = Object.assign(React__namespace.createContext({}), { displayName: 'ApolloContext' }));
 }
 var resetApolloContext = getApolloContext;
 
@@ -7922,21 +7926,21 @@ var QueryReference = (function () {
 var SuspenseCache = (function () {
     function SuspenseCache(options) {
         if (options === void 0) { options = Object.create(null); }
-        this.cacheKeys = new trie.Trie(canUseWeakMap, function (cacheKey) { return cacheKey; });
-        this.queryRefs = new Map();
+        this.queryRefs = new trie.Trie(canUseWeakMap);
         this.options = options;
     }
     SuspenseCache.prototype.getQueryRef = function (cacheKey, createObservable) {
-        var _this = this;
-        var stableCacheKey = this.cacheKeys.lookupArray(cacheKey);
-        if (!this.queryRefs.has(stableCacheKey)) {
-            this.queryRefs.set(stableCacheKey, new QueryReference(createObservable(), {
-                key: stableCacheKey,
+        var ref = this.queryRefs.lookupArray(cacheKey);
+        if (!ref.current) {
+            ref.current = new QueryReference(createObservable(), {
+                key: cacheKey,
                 autoDisposeTimeoutMs: this.options.autoDisposeTimeoutMs,
-                onDispose: function () { return _this.queryRefs.delete(stableCacheKey); },
-            }));
+                onDispose: function () {
+                    delete ref.current;
+                },
+            });
         }
-        return this.queryRefs.get(stableCacheKey);
+        return ref.current;
     };
     return SuspenseCache;
 }());