Fix query alias batching issue

CHANGELOG.md

@@ -3,6 +3,7 @@
 Expect active development and potentially significant breaking changes in the `0.x` track. We'll try to be diligent about releasing a `1.0` version in a timely fashion (ideally within 3 to 6 months), to signal the start of a more stable API.
 
 ### vNEXT
+- Fixed issue with alias names in batched queries. [PR #493](https://github.com/apollostack/apollo-client/pull/493) and [Issue #490](https://github.com/apollostack/apollo-client/issues).
 
 ### v0.4.9
 

src/batching/queryMerging.ts

@@ -49,6 +49,10 @@ import {
   Request,
 } from '../networkInterface';
 
+import {
+  resultKeyNameFromField,
+} from '../data/storeUtils';
+
 import assign = require('lodash.assign');
 import cloneDeep = require('lodash.clonedeep');
 
@@ -96,7 +100,7 @@ export function unpackMergedResult(result: GraphQLResult,
     const childRequestIndex = mergeInfo.requestIndex;
     const fieldMap = fieldMaps[childRequestIndex];
     const field = fieldMap[mergeInfo.fieldIndex];
-    data[field.name.value] = result.data[dataKey];
+    data[resultKeyNameFromField(field)] = result.data[dataKey];
 
     if (resultArray[childRequestIndex]) {
       assign(resultArray[childRequestIndex].data, data);

test/queryMerging.ts

@@ -788,4 +788,54 @@ describe('Query merging', () => {
     const mergedRequest = mergeRequests([{query: query1}, {query: query2}]);
     assert.equal(print(mergedRequest.query), print(expQuery));
   });
+
+  it('should be able to correctly merge queries with aliases', () => {
+    const query = gql`
+      query firstQuery {
+        someAlias: author {
+          firstName
+          lastName
+        }
+      }`;
+    const secondQuery = gql`
+      query secondQuery {
+        person {
+          name
+        }
+      }`;
+    const expQuery = gql`
+      query ___composed {
+        ___firstQuery___requestIndex_0___fieldIndex_0: author {
+          firstName
+          lastName
+        }
+
+        ___secondQuery___requestIndex_1___fieldIndex_0: person {
+          name
+        }
+     }`;
+    const firstResult = {
+      someAlias: {
+        firstName: 'John',
+        lastName: 'Smith',
+      },
+    };
+    const secondResult = {
+      person: {
+        name: 'Jane Smith',
+      },
+    };
+    const composedResult = {
+      ___firstQuery___requestIndex_0___fieldIndex_0: firstResult.someAlias,
+      ___secondQuery___requestIndex_1___fieldIndex_0: secondResult.person,
+    };
+    const requests = [{ query }, { query: secondQuery }];
+    const mergedRequest = mergeRequests(requests);
+    assert.equal(print(mergedRequest.query), print(expQuery));
+
+    const unpackedResults = unpackMergedResult({ data: composedResult }, requests);
+    assert.equal(unpackedResults.length, 2);
+    assert.deepEqual(unpackedResults[0], { data: firstResult });
+    assert.deepEqual(unpackedResults[1], { data: secondResult });
+  });
 });