improve type safety

Author: paulofaria

Sources/GraphQL/Language/AST.swift

@@ -208,10 +208,10 @@ extension InputObjectTypeDefinition : Node {}
 extension TypeExtensionDefinition   : Node {}
 extension DirectiveDefinition       : Node {}
 
-final class Name {
-    let kind: Kind = .name
-    let loc: Location?
-    let value: String
+public final class Name {
+    public let kind: Kind = .name
+    public let loc: Location?
+    public let value: String
 
     init(loc: Location? = nil, value: String) {
         self.loc = loc
@@ -220,7 +220,7 @@ final class Name {
 }
 
 extension Name : Equatable {
-    static func == (lhs: Name, rhs: Name) -> Bool {
+    public static func == (lhs: Name, rhs: Name) -> Bool {
         return lhs.value == rhs.value
     }
 }
@@ -772,10 +772,10 @@ public func == (lhs: Value, rhs: Value) -> Bool {
     return false
 }
 
-final class IntValue {
-    let kind: Kind = .intValue
-    let loc: Location?
-    let value: String
+public final class IntValue {
+    public let kind: Kind = .intValue
+    public let loc: Location?
+    public let value: String
 
     init(loc: Location? = nil, value: String) {
         self.loc = loc
@@ -784,15 +784,15 @@ final class IntValue {
 }
 
 extension IntValue : Equatable {
-    static func == (lhs: IntValue, rhs: IntValue) -> Bool {
+    public static func == (lhs: IntValue, rhs: IntValue) -> Bool {
         return lhs.value == rhs.value
     }
 }
 
-final class FloatValue {
-    let kind: Kind = .floatValue
-    let loc: Location?
-    let value: String
+public final class FloatValue {
+    public let kind: Kind = .floatValue
+    public let loc: Location?
+    public let value: String
 
     init(loc: Location? = nil, value: String) {
         self.loc = loc
@@ -801,15 +801,15 @@ final class FloatValue {
 }
 
 extension FloatValue : Equatable {
-    static func == (lhs: FloatValue, rhs: FloatValue) -> Bool {
+    public static func == (lhs: FloatValue, rhs: FloatValue) -> Bool {
         return lhs.value == rhs.value
     }
 }
 
-final class StringValue {
-    let kind: Kind = .stringValue
-    let loc: Location?
-    let value: String
+public final class StringValue {
+    public let kind: Kind = .stringValue
+    public let loc: Location?
+    public let value: String
 
     init(loc: Location? = nil, value: String) {
         self.loc = loc
@@ -818,15 +818,15 @@ final class StringValue {
 }
 
 extension StringValue : Equatable {
-    static func == (lhs: StringValue, rhs: StringValue) -> Bool {
+    public static func == (lhs: StringValue, rhs: StringValue) -> Bool {
         return lhs.value == rhs.value
     }
 }
 
-final class BooleanValue {
-    let kind: Kind = .booleanValue
-    let loc: Location?
-    let value: Bool
+public final class BooleanValue {
+    public let kind: Kind = .booleanValue
+    public let loc: Location?
+    public let value: Bool
 
     init(loc: Location? = nil, value: Bool) {
         self.loc = loc
@@ -835,15 +835,15 @@ final class BooleanValue {
 }
 
 extension BooleanValue : Equatable {
-    static func == (lhs: BooleanValue, rhs: BooleanValue) -> Bool {
+    public static func == (lhs: BooleanValue, rhs: BooleanValue) -> Bool {
         return lhs.value == rhs.value
     }
 }
 
-final class EnumValue {
-    let kind: Kind = .enumValue
-    let loc: Location?
-    let value: String
+public final class EnumValue {
+    public let kind: Kind = .enumValue
+    public let loc: Location?
+    public let value: String
 
     init(loc: Location? = nil, value: String) {
         self.loc = loc
@@ -852,15 +852,15 @@ final class EnumValue {
 }
 
 extension EnumValue : Equatable {
-    static func == (lhs: EnumValue, rhs: EnumValue) -> Bool {
+    public static func == (lhs: EnumValue, rhs: EnumValue) -> Bool {
         return lhs.value == rhs.value
     }
 }
 
-final class ListValue {
-    let kind: Kind = .listValue
-    let loc: Location?
-    let values: [Value]
+public final class ListValue {
+    public let kind: Kind = .listValue
+    public let loc: Location?
+    public let values: [Value]
 
     init(loc: Location? = nil, values: [Value]) {
         self.loc = loc
@@ -869,7 +869,7 @@ final class ListValue {
 }
 
 extension ListValue : Equatable {
-    static func == (lhs: ListValue, rhs: ListValue) -> Bool {
+    public static func == (lhs: ListValue, rhs: ListValue) -> Bool {
         guard lhs.values.count == rhs.values.count else {
             return false
         }
@@ -884,10 +884,10 @@ extension ListValue : Equatable {
     }
 }
 
-final class ObjectValue {
-    let kind: Kind = .objectValue
-    let loc: Location?
-    let fields: [ObjectField]
+public final class ObjectValue {
+    public let kind: Kind = .objectValue
+    public let loc: Location?
+    public let fields: [ObjectField]
 
     init(loc: Location? = nil, fields: [ObjectField]) {
         self.loc = loc
@@ -896,16 +896,16 @@ final class ObjectValue {
 }
 
 extension ObjectValue : Equatable {
-    static func == (lhs: ObjectValue, rhs: ObjectValue) -> Bool {
+    public static func == (lhs: ObjectValue, rhs: ObjectValue) -> Bool {
         return lhs.fields == rhs.fields
     }
 }
 
-final class ObjectField {
-    let kind: Kind = .objectField
-    let loc: Location?
-    let name: Name
-    let value: Value
+public final class ObjectField {
+    public let kind: Kind = .objectField
+    public let loc: Location?
+    public let name: Name
+    public let value: Value
 
     init(loc: Location? = nil, name: Name, value: Value) {
         self.loc = loc
@@ -915,7 +915,7 @@ final class ObjectField {
 }
 
 extension ObjectField : Equatable {
-    static func == (lhs: ObjectField, rhs: ObjectField) -> Bool {
+    public static func == (lhs: ObjectField, rhs: ObjectField) -> Bool {
         return lhs.name == rhs.name &&
             lhs.value == rhs.value
     }

Sources/GraphQL/Type/Definition.swift

@@ -49,7 +49,7 @@ extension GraphQLNonNull          : GraphQLOutputType {}
  */
 public protocol GraphQLLeafType : GraphQLType, GraphQLNamedType {
     func serialize(value: Any) throws -> Map
-    func parseValue(value: Any) throws -> Map
+    func parseValue(value: Map) throws -> Map
     func parseLiteral(valueAST: Value) throws -> Map
 }
 
@@ -161,14 +161,14 @@ extension GraphQLNonNull : GraphQLWrapperType {}
 public final class GraphQLScalarType {
     public let name: String
     let description: String?
-    let serialize: (Any) throws -> Any
-    let parseValue: ((Any) throws -> Any)?
-    let parseLiteral: ((Value) throws -> Any)?
+    let serialize: (Any) throws -> Map
+    let parseValue: ((Map) throws -> Map)?
+    let parseLiteral: ((Value) throws -> Map)?
 
     public init(
         name: String,
         description: String? = nil,
-        serialize: @escaping (Any) throws -> Any
+        serialize: @escaping (Any) throws -> Map
     ) throws {
         try assertValid(name: name)
         self.name = name
@@ -181,9 +181,9 @@ public final class GraphQLScalarType {
     public init(
         name: String,
         description: String? = nil,
-        serialize: @escaping (Any) throws -> Any,
-        parseValue: @escaping (Any) throws -> Any,
-        parseLiteral: @escaping (Value) throws -> Any
+        serialize: @escaping (Any) throws -> Map,
+        parseValue: @escaping (Map) throws -> Map,
+        parseLiteral: @escaping (Value) throws -> Map
     ) throws {
         try assertValid(name: name)
         self.name = name
@@ -195,17 +195,17 @@ public final class GraphQLScalarType {
 
     // Serializes an internal value to include in a response.
     public func serialize(value: Any) throws -> Map {
-        return try GraphQL.map(from: self.serialize(value))
+        return try self.serialize(value)
     }
 
     // Parses an externally provided value to use as an input.
-    public func parseValue(value: Any) throws -> Map {
-        return try GraphQL.map(from: self.parseValue?(value))
+    public func parseValue(value: Map) throws -> Map {
+        return try self.parseValue?(value) ?? Map.null
     }
 
     // Parses an externally provided literal value to use as an input.
     public func parseLiteral(valueAST: Value) throws -> Map {
-        return try GraphQL.map(from: self.parseLiteral?(valueAST))
+        return try self.parseLiteral?(valueAST) ?? Map.null
     }
 }
 
@@ -837,8 +837,8 @@ public final class GraphQLEnumType {
         return try valueLookup[GraphQL.map(from: value)].map({ .string($0.name) }) ?? .null
     }
 
-    public func parseValue(value: Any) throws -> Map {
-        if case .string(let value) = try GraphQL.map(from: value) {
+    public func parseValue(value: Map) throws -> Map {
+        if case .string(let value) = value {
             return nameLookup[value]?.value ?? .null
         }
 

Sources/GraphQL/Type/Scalars.swift

@@ -3,14 +3,14 @@ public let GraphQLInt = try! GraphQLScalarType(
     description:
     "The `Int` scalar type represents non-fractional signed whole numeric " +
     "values. Int can represent values between -(2^31) and 2^31 - 1.",
-    serialize: { try map(from: $0).asInt(converting: true) } ,
-    parseValue: { try map(from: $0).asInt(converting: true) },
+    serialize: { try map(from: $0) } ,
+    parseValue: { try $0.asInt(converting: true).map },
     parseLiteral: { ast in
         if let ast = ast as? IntValue, let int = Int(ast.value) {
-            return int
+            return .int(int)
         }
 
-        return Map.null
+        return .null
     }
 )
 
@@ -20,18 +20,18 @@ public let GraphQLFloat = try! GraphQLScalarType(
     "The `Float` scalar type represents signed double-precision fractional " +
     "values as specified by " +
     "[IEEE 754](http://en.wikipedia.org/wiki/IEEE_floating_point). ",
-    serialize: { try map(from: $0).asDouble(converting: true) } ,
-    parseValue: { try map(from: $0).asDouble(converting: true) },
+    serialize: { try map(from: $0) } ,
+    parseValue: { try $0.asDouble(converting: true).map },
     parseLiteral: { ast in
         if let ast = ast as? FloatValue, let double = Double(ast.value) {
-            return double
+            return .double(double)
         }
 
         if let ast = ast as? IntValue, let double = Double(ast.value) {
-            return double
+            return .double(double)
         }
 
-        return Map.null
+        return .null
     }
 )
 
@@ -41,28 +41,28 @@ public let GraphQLString = try! GraphQLScalarType(
     "The `String` scalar type represents textual data, represented as UTF-8 " +
     "character sequences. The String type is most often used by GraphQL to " +
     "represent free-form human-readable text.",
-    serialize: { try map(from: $0).asString(converting: true) } ,
-    parseValue: { try map(from: $0).asString(converting: true) },
+    serialize: { try map(from: $0) } ,
+    parseValue: { try $0.asString(converting: true).map },
     parseLiteral: { ast in
         if let ast = ast as? StringValue {
-            return ast.value
+            return .string(ast.value)
         }
 
-        return Map.null
+        return .null
     }
 )
 
 public let GraphQLBoolean = try! GraphQLScalarType(
     name: "Boolean",
     description: "The `Boolean` scalar type represents `true` or `false`.",
-    serialize: { try map(from: $0).asBool(converting: true) } ,
-    parseValue: { try map(from: $0).asBool(converting: true) },
+    serialize: { try map(from: $0) } ,
+    parseValue: { try $0.asBool(converting: true).map },
     parseLiteral: { ast in
         if let ast = ast as? BooleanValue {
-            return ast.value
+            return .bool(ast.value)
         }
 
-        return Map.null
+        return .null
     }
 )
 
@@ -74,17 +74,17 @@ public let GraphQLID = try! GraphQLScalarType(
     "response as a String; however, it is not intended to be human-readable. " +
     "When expected as an input type, any string (such as `\"4\"`) or integer " +
     "(such as `4`) input value will be accepted as an ID.",
-    serialize: { try map(from: $0).asString(converting: true) },
-    parseValue: { try map(from: $0).asString(converting: true) },
+    serialize: { try map(from: $0) },
+    parseValue: { try $0.asString(converting: true).map },
     parseLiteral: { ast in
         if let ast = ast as? StringValue {
-            return ast.value
+            return .string(ast.value)
         }
 
         if let ast = ast as? IntValue {
-            return ast.value
+            return .string(ast.value)
         }
 
-        return Map.null
+        return .null
     }
 )