Merge pull request #1281 from sprylab/fix_cache_key_for_arrays

designatednerd · web-flow · commit c41c1858ac63 · 2020-07-08T09:49:21.000-05:00
Fix cache key generation for arrays by calling orderIndependentKey fo…
diff --git a/Sources/Apollo/GraphQLSelectionSet.swift b/Sources/Apollo/GraphQLSelectionSet.swift
@@ -89,6 +89,8 @@ private func orderIndependentKey(for object: JSONObject) -> String {
   return object.sorted { $0.key < $1.key }.map {
     if let object = $0.value as? JSONObject {
       return "[\($0.key):\(orderIndependentKey(for: object))]"
+    } else if let array = $0.value as? [JSONObject] {
+      return "\($0.key):[\(array.map { orderIndependentKey(for: $0) }.joined(separator: ","))]"
     } else {
       return "\($0.key):\($0.value)"
     }

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,8 @@ private func orderIndependentKey(for object: JSONObject) -> String {`
`89`	`89`	`return object.sorted { $0.key < $1.key }.map {`
`90`	`90`	`if let object = $0.value as? JSONObject {`
`91`	`91`	`return "[\($0.key):\(orderIndependentKey(for: object))]"`
	`92`	`+ } else if let array = $0.value as? [JSONObject] {`
	`93`	`+ return "\($0.key):[\(array.map { orderIndependentKey(for: $0) }.joined(separator: ","))]"`
`92`	`94`	`} else {`
`93`	`95`	`return "\($0.key):\($0.value)"`
`94`	`96`	`}`