Merge pull request #785 from apollostack/fix-776

Test and fix for #776
apollographql · Oct 15, 2016 · 46d4622 · 46d4622
2 parents 580c855 + 797948a
commit 46d4622
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Expect active development and potentially significant breaking changes in the `0
 - added "ApolloClient" to the named exports to make it compatible with Angular2 AOT compile [Issue #758](https://github.com/apollostack/apollo-client/issues/758) [PR #778](https://github.com/apollostack/apollo-client/pull/778)
 - Fix: moved dev @types to devDependencies otherwise they potentially brake projects that are importing apollo-client [Issue #713](https://github.com/apollostack/apollo-client/issues/713) [PR #778](https://github.com/apollostack/apollo-client/pull/778)
 - Fix rejecting promises on `refetch` and similar methods. Also improve error handling and stop using `ApolloError` internally. [Failing test in PR #524](https://github.com/apollostack/apollo-client/pull/524) [PR #781](https://github.com/apollostack/apollo-client/pull/781)
+- Fix multidimentional array handling. [Issue #776](https://github.com/apollostack/apollo-client/issues/776) [PR #785](https://github.com/apollostack/apollo-client/pull/785)
 
 ### v0.4.21
 - Added some temporary functions (`_setVariablesNoResult` and `_setOptionsNoResult`) to work around a `react-apollo` problem fundamentally caused by the issue highlighted in [PR #694](https://github.com/apollostack/apollo-client/pull/694). The code as been refactored on `master`, so we expect it to be fixed in 0.5.x, and is not worth resolving now.

diff --git a/src/data/writeToStore.ts b/src/data/writeToStore.ts
@@ -259,38 +259,10 @@ function writeFieldToStore({
       json: value,
     };
   } else if (Array.isArray(value)) {
-    // this is an array with sub-objects
-    const thisIdList: Array<string> = [];
+    const generatedId = `${dataId}.${storeFieldName}`;
 
-    value.forEach((item: any, index: any) => {
-      if (isNull(item)) {
-        thisIdList.push(null);
-      } else {
-        let itemDataId = `${dataId}.${storeFieldName}.${index}`;
-
-        if (dataIdFromObject) {
-          const semanticId = dataIdFromObject(item);
-
-          if (semanticId) {
-            itemDataId = semanticId;
-          }
-        }
-
-        thisIdList.push(itemDataId);
-
-        writeSelectionSetToStore({
-          dataId: itemDataId,
-          result: item,
-          store,
-          selectionSet: field.selectionSet,
-          variables,
-          dataIdFromObject,
-          fragmentMap,
-        });
-      }
-    });
-
-    storeValue = thisIdList;
+    storeValue = processArrayValue(value, generatedId, dataIdFromObject, store,
+      field.selectionSet, variables, fragmentMap);
   } else {
     // It's an object
     let valueDataId = `${dataId}.${storeFieldName}`;
@@ -370,3 +342,46 @@ function writeFieldToStore({
     store[dataId] = newStoreObj;
   }
 }
+
+function processArrayValue(
+  value: any[],
+  generatedId: string,
+  dataIdFromObject: IdGetter,
+  store: NormalizedCache,
+  selectionSet: SelectionSet,
+  variables: any,
+  fragmentMap: FragmentMap,
+): any[] {
+  return value.map((item: any, index: any) => {
+    if (isNull(item)) {
+      return null;
+    }
+
+    let itemDataId = `${generatedId}.${index}`;
+
+    if (Array.isArray(item)) {
+      return processArrayValue(item, itemDataId, dataIdFromObject, store, selectionSet,
+        variables, fragmentMap);
+    }
+
+    if (dataIdFromObject) {
+      const semanticId = dataIdFromObject(item);
+
+      if (semanticId) {
+        itemDataId = semanticId;
+      }
+    }
+
+    writeSelectionSetToStore({
+      dataId: itemDataId,
+      result: item,
+      store,
+      selectionSet,
+      variables,
+      dataIdFromObject,
+      fragmentMap,
+    });
+
+    return itemDataId;
+  });
+}
diff --git a/test/roundtrip.ts b/test/roundtrip.ts
@@ -30,6 +30,27 @@ describe('roundtrip', () => {
     });
   });
 
+  it('multidimensional array (#776)', () => {
+    storeRoundtrip(gql`
+      {
+        rows {
+          value
+        }
+      }
+    `, {
+      rows: [
+        [
+          { value: 1 },
+          { value: 2 },
+        ],
+        [
+          { value: 3 },
+          { value: 4 },
+        ],
+      ],
+    });
+  });
+
   it('with an alias', () => {
     storeRoundtrip(gql`
       {