all star wars tests passing

Author: paulofaria

Sources/GraphQL/Error/GraphQLError.swift

@@ -73,8 +73,8 @@ public struct GraphQLError : Error {
             self.positions = positions
         }
 
-        if let source = source, !positions.isEmpty {
-            self.locations = positions.map({ getLocation(source: source, position: $0) })
+        if let source = self.source, !self.positions.isEmpty {
+            self.locations = self.positions.map({ getLocation(source: source, position: $0) })
         } else {
             self.locations = []
         }
@@ -108,6 +108,15 @@ extension GraphQLError : MapRepresentable {
             dictionary["path"] = path.map({ $0.map }).map
         }
 
+        if !locations.isEmpty {
+            dictionary["locations"] = locations.map({
+                return [
+                    "line": $0.line.map,
+                    "column": $0.column.map
+                ] as Map
+            }).map
+        }
+
         return .dictionary(dictionary)
     }
 }

Sources/GraphQL/Error/LocatedError.swift

@@ -3,17 +3,15 @@
  * GraphQL operation, produce a new GraphQLError aware of the location in the
  * document responsible for the original Error.
  */
-func locatedError(originalError: Error?, nodes: [Node], path: [IndexPathElement]) -> GraphQLError {
+func locatedError(originalError: Error, nodes: [Node], path: [IndexPathElement]) -> GraphQLError {
     // Note: this uses a brand-check to support GraphQL errors originating from
     // other contexts.
     if let originalError = originalError as? GraphQLError {
         return originalError
     }
 
-    let message = originalError.map({ String(describing: $0) }) ?? "An unknown error occurred."
-
     return GraphQLError(
-        message: message,
+        message: String(describing: originalError),
         nodes: nodes,
         path: path,
         originalError: originalError