Merge pull request #40 from NicholasBellucci/updates/cursor-pagination

Updates/cursor pagination

README.md

@@ -552,8 +552,8 @@ Weave(.query) {
 ```graphql
 {
   comments(first: 2) {
-    cursor
     edges {
+      cursor
       node {
         id
         author
@@ -589,8 +589,8 @@ Weave(.query) {
 ```graphql
 {
   comments(first: 2) {
-    cursor
     edges {
+      cursor
       node {
         id
         author

Sources/SociableWeaver/Extensions/String+Utils.swift

@@ -8,9 +8,9 @@ extension String {
     */
     func withSubfields(_ fields: String, paginationType: PaginationType? = nil, pageInfo: PageInfoModel? = nil) -> String {
         if let pageInfo = pageInfo, paginationType == .cursor {
-            return "\(self) { cursor edges { node { \(fields) } } \(String(describing: pageInfo.type)) { \(pageInfo.keys.joined(separator: " ")) } }"
+            return "\(self) { edges { cursor node { \(fields) } } \(String(describing: pageInfo.type)) { \(pageInfo.keys.joined(separator: " ")) } }"
         } else if paginationType == .cursor {
-            return "\(self) { cursor edges { node { \(fields) } } }"
+            return "\(self) { edges { cursor node { \(fields) } } }"
         } else {
             return "\(self) { \(fields) }"
         }

Tests/SociableWeaverTests/SociableWeaverBuilderTests.swift

@@ -179,7 +179,7 @@ final class SociableWeaverBuilderTests: XCTestCase {
             .paginationType(.cursor)
         }
 
-        let expected = "query { comments(first: 2) { cursor edges { node { id author content } } } }"
+        let expected = "query { comments(first: 2) { edges { cursor node { id author content } } } }"
         XCTAssertEqual(String(describing: query), expected)
     }
 
@@ -212,7 +212,7 @@ final class SociableWeaverBuilderTests: XCTestCase {
                             PageInfo.CodingKeys.hasNextPage)
         }
 
-        let expected = "query { comments(first: 2) { cursor edges { node { id author content } } pageInfo { startCursor endCursor hasNextPage } } }"
+        let expected = "query { comments(first: 2) { edges { cursor node { id author content } } pageInfo { startCursor endCursor hasNextPage } } }"
         XCTAssertEqual(String(describing: query), expected)
     }
 
@@ -231,7 +231,7 @@ final class SociableWeaverBuilderTests: XCTestCase {
                             "hasNextPage")
         }
 
-        let expected = "query { comments(first: 2) { cursor edges { node { id author content } } pageInfo { startCursor endCursor hasNextPage } } }"
+        let expected = "query { comments(first: 2) { edges { cursor node { id author content } } pageInfo { startCursor endCursor hasNextPage } } }"
         XCTAssertEqual(String(describing: query), expected)
     }