Merge pull request #64 from NeedleInAJayStack/fix/preserveResultOrder

Preserve result order

Author: NeedleInAJayStack

Package.resolved

@@ -7,7 +7,7 @@ let package = Package(
         .library(name: "Graphiti", targets: ["Graphiti"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", .upToNextMajor(from: "1.3.0"))
+        .package(url: "https://github.com/GraphQLSwift/GraphQL.git", .upToNextMajor(from: "2.0.0"))
     ],
     targets: [
         .target(name: "Graphiti", dependencies: ["GraphQL"]),

Package.swift

@@ -1,4 +1,5 @@
 import GraphQL
+import OrderedCollections
 
 open class Scalar<Resolver, Context, ScalarType : Codable> : Component<Resolver, Context> {
     override func update(typeProvider: SchemaTypeProvider) throws {
@@ -92,7 +93,7 @@ extension GraphQL.Value {
         if
             let value = self as? ObjectValue
         {
-            let dictionary = value.fields.reduce(into: [:]) { result, field in
+            let dictionary: OrderedDictionary<String, Map> = value.fields.reduce(into: [:]) { result, field in
                 result[field.name.value] = field.value.map
             }
 

Sources/Graphiti/Scalar/Scalar.swift

@@ -331,8 +331,8 @@ class StarWarsIntrospectionTests : XCTestCase {
                                 "name": nil,
                                 "kind": "NON_NULL",
                                 "ofType": [
-                                    "kind": "LIST",
-                                    "name": nil
+                                    "name": nil,
+                                    "kind": "LIST"
                                 ]
                             ]
                         ],
@@ -342,8 +342,8 @@ class StarWarsIntrospectionTests : XCTestCase {
                                 "name": nil,
                                 "kind": "NON_NULL",
                                 "ofType": [
-                                    "kind": "LIST",
-                                    "name": nil
+                                    "name": nil,
+                                    "kind": "LIST"
                                 ]
                             ]
                         ],