refactor

apollographql · Sep 9, 2016 · 195c1ed · 195c1ed
1 parent 2e575a8
commit 195c1ed
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -40,3 +40,4 @@ delianides <drew@delianides.com>
 greenkeeperio-bot <support@greenkeeper.io>
 hammadj <jutt@ualberta.ca>
 matt debergalis <matt@meteor.com>
+Edvin Eriksson <edvinerikson@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ Expect active development and potentially significant breaking changes in the `0
 
 - Options set in middleware can override the fetch query in the network layer. [Issue #627](https://github.com/apollostack/apollo-client/issues/627) and [PR #628](https://github.com/apollostack/apollo-client/pull/628).
 - Make `returnPartialData` work better with fragments. [PR #580](https://github.com/apollostack/apollo-client/pull/580)
+- Fixed issue with nested fragments overriding each other.
 
 ### v0.4.14
 

diff --git a/src/data/diffAgainstStore.ts b/src/data/diffAgainstStore.ts
@@ -221,15 +221,16 @@ export function diffSelectionSetAgainstStore({
           }
 
           if (isObject(fieldResult)) {
-            for (const key in fieldResult) {
-              if (
-                (fieldResult.hasOwnProperty(key) && result.hasOwnProperty(key)) && (isObject(fieldResult[key]) && isObject(result[key]))) {
-                assign(result[key], fieldResult[key]);
+            Object.keys(fieldResult).forEach(key => {
+              if (shouldDeepMerge(key, result, fieldResult)) {
+                assign(
+                  (result as { [key: string]: Object })[key],
+                  (fieldResult as { [key: string]: Object })[key]
+                );
               } else {
                 assign(result, fieldResult);
               }
-            }
-
+            });
           }
           if (!fragmentErrors[typename]) {
             fragmentErrors[typename] = null;
@@ -268,7 +269,16 @@ export function diffSelectionSetAgainstStore({
             pushMissingField(selection);
           }
           if (isObject(fieldResult)) {
-            assign(result, fieldResult);
+            Object.keys(fieldResult).forEach(key => {
+              if (shouldDeepMerge(key, result, fieldResult)) {
+                assign(
+                  (result as { [key: string]: Object })[key],
+                  (fieldResult as { [key: string]: Object })[key]
+                );
+              } else {
+                assign(result, fieldResult);
+              }
+            });
           }
 
           if (!fragmentErrors[typename]) {
@@ -322,6 +332,14 @@ export function diffSelectionSetAgainstStore({
   };
 }
 
+function shouldDeepMerge(
+  key: string,
+  result: { [key: string]: any },
+  fieldResult: { [key: string]: any }
+): boolean {
+  return isObject(fieldResult[key]) && isObject(result[key]);
+}
+
 function diffFieldAgainstStore({
   field,
   throwOnMissingField,