Merge pull request #71 from Igor-Palaguta/intValue

Fix intValue() that always failed

Author: paulofaria

Sources/GraphQL/Execution/Values.swift

@@ -37,22 +37,11 @@ func getArgumentValues(argDefs: [GraphQLArgumentDefinition], argASTs: [Argument]
         let name = argDef.name
         let valueAST = argASTMap[name]?.value
 
-        var value = try valueFromAST(
+        let value = try valueFromAST(
             valueAST: valueAST,
             type: argDef.type,
             variables: variableValues
-        )
-
-        if value == nil {
-            value = try argDef.defaultValue.flatMap { string in
-                guard let data = string.data(using: .utf8) else {
-                    return nil
-                }
-                
-                let object = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
-                return try map(from: object)
-            }
-        }
+        ) ?? argDef.defaultValue
 
         if let value = value {
             result[name] = value

Sources/GraphQL/Map/Map.swift

@@ -4,11 +4,6 @@ public enum MapError : Error {
     case incompatibleType
     case outOfBounds
     case valueNotFound
-    case notMapInitializable(Any.Type)
-    case notMapRepresentable(Any.Type)
-    case notMapDictionaryKeyInitializable(Any.Type)
-    case notMapDictionaryKeyRepresentable(Any.Type)
-    case cannotInitialize(type: Any.Type, from: Any.Type)
 }
 
 // MARK: Map
@@ -229,27 +224,27 @@ extension Map {
 
 extension Map {
     public var bool: Bool? {
-        return try? get()
+        return try? boolValue()
     }
 
     public var int: Int? {
-        return try? (get() as Number).intValue
+        return try? intValue()
     }
 
     public var double: Double? {
-        return try? (get() as Number).doubleValue
+        return try? doubleValue()
     }
 
     public var string: String? {
-        return try? get()
+        return try? stringValue()
     }
 
     public var array: [Map]? {
-        return try? get()
+        return try? arrayValue()
     }
 
     public var dictionary: [String: Map]? {
-        return try? get()
+        return try? dictionaryValue()
     }
 }
 
@@ -288,7 +283,7 @@ extension Map {
 
     public func intValue(converting: Bool = false) throws -> Int {
         guard converting else {
-            return try get()
+            return try (get() as Number).intValue
         }
 
         switch self {
@@ -312,7 +307,7 @@ extension Map {
 
     public func doubleValue(converting: Bool = false) throws -> Double {
         guard converting else {
-            return try get()
+            return try (get() as Number).doubleValue
         }
 
         switch self {

Sources/GraphQL/Type/Definition.swift

@@ -667,7 +667,7 @@ public struct GraphQLArgument {
 public struct GraphQLArgumentDefinition {
     public let name: String
     public let type: GraphQLInputType
-    public let defaultValue: String?
+    public let defaultValue: Map?
     public let description: String?
 
     init(
@@ -678,7 +678,7 @@ public struct GraphQLArgumentDefinition {
     ) {
         self.name = name
         self.type = type
-        self.defaultValue = defaultValue?.description
+        self.defaultValue = defaultValue
         self.description = description
     }
 }

Sources/GraphQL/Type/Introspection.swift

@@ -360,7 +360,7 @@ let __InputValue = try! GraphQLObjectType(
                     return nil
                 }
 
-                return .string(defaultValue)
+                return .string(defaultValue.description)
             }
         )
     ]

Tests/GraphQLTests/MapTests/MapTests.swift

@@ -0,0 +1,51 @@
+@testable import GraphQL
+import XCTest
+
+class MapTests: XCTestCase {
+    func testThrowableConversion() throws {
+        XCTAssertEqual(try Map.number(5).intValue(), 5)
+        XCTAssertEqual(try Map.number(3.14).doubleValue(), 3.14)
+        XCTAssertEqual(try Map.bool(false).boolValue(), false)
+        XCTAssertEqual(try Map.bool(true).boolValue(), true)
+        XCTAssertEqual(try Map.string("Hello world").stringValue(), "Hello world")
+
+    }
+
+    func testOptionalConversion() {
+        XCTAssertEqual(Map.number(5).int, 5)
+        XCTAssertEqual(Map.number(3.14).double, 3.14)
+        XCTAssertEqual(Map.bool(false).bool, false)
+        XCTAssertEqual(Map.bool(true).bool, true)
+        XCTAssertEqual(Map.string("Hello world").string, "Hello world")
+    }
+
+    func testArrayConversion() throws {
+        let map = Map.array([.number(1), .number(4), .number(9)])
+        XCTAssertEqual(map.array?.count, 3)
+
+        let array = try map.arrayValue()
+        XCTAssertEqual(array.count, 3)
+
+        XCTAssertEqual(try array[0].intValue(), 1)
+        XCTAssertEqual(try array[1].intValue(), 4)
+        XCTAssertEqual(try array[2].intValue(), 9)
+    }
+
+    func testDictionaryConversion() throws {
+        let map = Map.dictionary(
+            [
+                "first": .number(1),
+                "second": .number(4),
+                "third": .number(9)
+            ]
+        )
+        XCTAssertEqual(map.dictionary?.count, 3)
+
+        let dictionary = try map.dictionaryValue()
+
+        XCTAssertEqual(dictionary.count, 3)
+        XCTAssertEqual(try dictionary["first"]?.intValue(), 1)
+        XCTAssertEqual(try dictionary["second"]?.intValue(), 4)
+        XCTAssertEqual(try dictionary["third"]?.intValue(), 9)
+    }
+}