@apollo/client 3.7.13 → 3.7.15

package/apollo-client.cjs

@@ -340,9 +340,7 @@ function resultKeyNameFromField(field) {
     return field.alias ? field.alias.value : field.name.value;
 }
 function getTypenameFromResult(result, selectionSet, fragmentMap) {
-    if (typeof result.__typename === 'string') {
-        return result.__typename;
-    }
+    var fragments;
     for (var _i = 0, _a = selectionSet.selections; _i < _a.length; _i++) {
         var selection = _a[_i];
         if (isField(selection)) {
@@ -350,7 +348,19 @@ function getTypenameFromResult(result, selectionSet, fragmentMap) {
                 return result[resultKeyNameFromField(selection)];
             }
         }
+        else if (fragments) {
+            fragments.push(selection);
+        }
         else {
+            fragments = [selection];
+        }
+    }
+    if (typeof result.__typename === 'string') {
+        return result.__typename;
+    }
+    if (fragments) {
+        for (var _b = 0, fragments_1 = fragments; _b < fragments_1.length; _b++) {
+            var selection = fragments_1[_b];
             var typename = getTypenameFromResult(result, getFragmentFromSelection(selection, fragmentMap).selectionSet, fragmentMap);
             if (typeof typename === 'string') {
                 return typename;
@@ -1360,7 +1370,7 @@ var concat = ApolloLink.concat;
 
 var execute = ApolloLink.execute;
 
-var version = '3.7.13';
+var version = '3.7.15';
 
 function isNodeResponse(value) {
     return !!value.body;
@@ -1565,7 +1575,7 @@ var hasOwnProperty$3 = Object.prototype.hasOwnProperty;
 function readMultipartBody(response, observer) {
     var _a, _b, _c, _d, _e;
     return tslib.__awaiter(this, void 0, void 0, function () {
-        var decoder, contentType, delimiter, boundaryVal, boundary, buffer, iterator, running, _f, value, done, chunk, bi, message, i, headers, contentType_1, body, result, next;
+        var decoder, contentType, delimiter, boundaryVal, boundary, buffer, iterator, running, _f, value, done, chunk, searchFrom, bi, message, i, headers, contentType_1, body, result, next;
         var _g, _h;
         return tslib.__generator(this, function (_j) {
             switch (_j.label) {
@@ -1579,7 +1589,7 @@ function readMultipartBody(response, observer) {
                     boundaryVal = (contentType === null || contentType === void 0 ? void 0 : contentType.includes(delimiter))
                         ? contentType === null || contentType === void 0 ? void 0 : contentType.substring((contentType === null || contentType === void 0 ? void 0 : contentType.indexOf(delimiter)) + delimiter.length).replace(/['"]/g, "").replace(/\;(.*)/gm, "").trim()
                         : "-";
-                    boundary = "--".concat(boundaryVal);
+                    boundary = "\r\n--".concat(boundaryVal);
                     buffer = "";
                     iterator = responseIterator(response);
                     running = true;
@@ -1590,26 +1600,27 @@ function readMultipartBody(response, observer) {
                 case 2:
                     _f = _j.sent(), value = _f.value, done = _f.done;
                     chunk = typeof value === "string" ? value : decoder.decode(value);
+                    searchFrom = buffer.length - boundary.length + 1;
                     running = !done;
                     buffer += chunk;
-                    bi = buffer.indexOf(boundary);
+                    bi = buffer.indexOf(boundary, searchFrom);
                     while (bi > -1) {
                         message = void 0;
                         _g = [
                             buffer.slice(0, bi),
                             buffer.slice(bi + boundary.length),
                         ], message = _g[0], buffer = _g[1];
-                        if (message.trim()) {
-                            i = message.indexOf("\r\n\r\n");
-                            headers = parseHeaders(message.slice(0, i));
-                            contentType_1 = headers["content-type"];
-                            if (contentType_1 &&
-                                contentType_1.toLowerCase().indexOf("application/json") === -1) {
-                                throw new Error("Unsupported patch content type: application/json is required.");
-                            }
-                            body = message.slice(i);
+                        i = message.indexOf("\r\n\r\n");
+                        headers = parseHeaders(message.slice(0, i));
+                        contentType_1 = headers["content-type"];
+                        if (contentType_1 &&
+                            contentType_1.toLowerCase().indexOf("application/json") === -1) {
+                            throw new Error("Unsupported patch content type: application/json is required.");
+                        }
+                        body = message.slice(i);
+                        if (body) {
                             try {
-                                result = parseJsonBody(response, body.replace("\r\n", ""));
+                                result = parseJsonBody(response, body);
                                 if (Object.keys(result).length > 1 ||
                                     "data" in result ||
                                     "incremental" in result ||
@@ -3265,7 +3276,7 @@ var Policies = (function () {
         var policy = typename && this.getTypePolicy(typename);
         var keyFn = policy && policy.keyFn || this.config.dataIdFromObject;
         while (keyFn) {
-            var specifierOrId = keyFn(object, context);
+            var specifierOrId = keyFn(tslib.__assign(tslib.__assign({}, object), storeObject), context);
             if (isArray(specifierOrId)) {
                 keyFn = keyFieldsFnFromSpecifier(specifierOrId);
             }