deep assign if nested fragment

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>

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. [PR #629](https://github.com/apollostack/apollo-client/pull/629)
 
 ### v0.4.14
 

package.json

@@ -37,6 +37,7 @@
   "author": "Sashko Stubailo <sashko@stubailo.com>",
   "license": "MIT",
   "dependencies": {
+    "deep-assign": "^2.0.0",
     "es6-promise": "^3.1.2",
     "graphql-tag": "^0.1.13",
     "lodash.assign": "^4.0.8",

src/data/diffAgainstStore.ts

@@ -2,7 +2,7 @@ import isArray = require('lodash.isarray');
 import isNull = require('lodash.isnull');
 import isObject = require('lodash.isobject');
 import has = require('lodash.has');
-import assign = require('lodash.assign');
+const deepAssign = require('deep-assign');
 
 import {
   storeKeyNameFromField,
@@ -221,7 +221,7 @@ export function diffSelectionSetAgainstStore({
           }
 
           if (isObject(fieldResult)) {
-            assign(result, fieldResult);
+            deepAssign(result, fieldResult);
           }
           if (!fragmentErrors[typename]) {
             fragmentErrors[typename] = null;
@@ -260,7 +260,7 @@ export function diffSelectionSetAgainstStore({
             pushMissingField(selection);
           }
           if (isObject(fieldResult)) {
-            assign(result, fieldResult);
+            deepAssign(result, fieldResult);
           }
 
           if (!fragmentErrors[typename]) {

test/readFromStore.ts

@@ -157,6 +157,84 @@ describe('reading from the store', () => {
     });
   });
 
+  it.only('runs a nested fragment with multiple fragments', () => {
+    const result: any = {
+      id: 'abcd',
+      stringField: 'This is a string!',
+      numberField: 5,
+      nullField: null,
+      nestedObj: {
+        id: 'abcde',
+        stringField: 'This is a string too!',
+        numberField: 6,
+        nullField: null,
+      } as StoreObject,
+      deepNestedObj: {
+        stringField: 'This is a deep string',
+        numberField: 7,
+      } as StoreObject,
+    };
+
+    const store = {
+      abcd: _.assign({}, _.assign({}, _.omit(result, 'nestedObj', 'deepNestedObj')), {
+        nestedObj: {
+          type: 'id',
+          id: 'abcde',
+          generated: false,
+        },
+      }) as StoreObject,
+      abcde: _.assign({}, result.nestedObj, {
+        deepNestedObj: {
+          type: 'id',
+          id: 'abcdef',
+          generated: false,
+        },
+      }) as StoreObject,
+      abcdef: result.deepNestedObj as StoreObject,
+    } as NormalizedCache;
+
+    const queryResult = readFragmentFromStore({
+      store,
+      fragment: gql`
+        fragment FragmentName on Item {
+          stringField,
+          numberField,
+          ...on Item {
+            nestedObj {
+              stringField
+              deepNestedObj {
+                stringField
+              }
+            }
+          }
+          ...on Item {
+            nestedObj {
+              numberField
+              deepNestedObj {
+                numberField
+              }
+            }
+          }
+        }
+      `,
+      rootId: 'abcd',
+    });
+
+    // The result of the query shouldn't contain __data_id fields
+    assert.deepEqual(queryResult, {
+      stringField: 'This is a string!',
+      numberField: 5,
+      nestedObj: {
+        stringField: 'This is a string too!',
+        numberField: 6,
+        deepNestedObj: {
+          stringField: 'This is a deep string',
+          numberField: 7,
+        },
+      },
+    });
+  });
+
   it('runs a nested fragment with an array without IDs', () => {
     const result: any = {
       id: 'abcd',