fix: Standard scalars deliver correct error messages

Author: NeedleInAJayStack

Sources/GraphQL/Type/Definition.swift

@@ -1018,7 +1018,7 @@ public final class GraphQLEnumType {
         let mapValue = try map(from: value)
         guard let enumValue = valueLookup[mapValue] else {
             throw GraphQLError(
-                message: "Enum '\(name)' cannot represent value '\(mapValue)'."
+                message: "Enum \"\(name)\" cannot represent value: \(mapValue)."
             )
         }
         return .string(enumValue.name)
@@ -1027,13 +1027,13 @@ public final class GraphQLEnumType {
     public func parseValue(value: Map) throws -> Map {
         guard let valueStr = value.string else {
             throw GraphQLError(
-                message: "Enum '\(name)' cannot represent non-string value '\(value)'." +
+                message: "Enum \"\(name)\" cannot represent non-string value: \(value)." +
                     didYouMeanEnumValue(unknownValueStr: value.description)
             )
         }
         guard let enumValue = nameLookup[valueStr] else {
             throw GraphQLError(
-                message: "Value '\(valueStr)' does not exist in '\(name)' enum." +
+                message: "Value \"\(valueStr)\" does not exist in \"\(name)\" enum." +
                     didYouMeanEnumValue(unknownValueStr: valueStr)
             )
         }
@@ -1043,14 +1043,14 @@ public final class GraphQLEnumType {
     public func parseLiteral(valueAST: Value) throws -> Map {
         guard let enumNode = valueAST as? EnumValue else {
             throw GraphQLError(
-                message: "Enum '\(name)' cannot represent non-enum value '\(valueAST)'." +
-                    didYouMeanEnumValue(unknownValueStr: "\(valueAST)"),
+                message: "Enum \"\(name)\" cannot represent non-enum value: \(print(ast: valueAST))." +
+                    didYouMeanEnumValue(unknownValueStr: print(ast: valueAST)),
                 nodes: [valueAST]
             )
         }
         guard let enumValue = nameLookup[enumNode.value] else {
             throw GraphQLError(
-                message: "Value '\(enumNode)' does not exist in '\(name)' enum." +
+                message: "Value \"\(enumNode.value)\" does not exist in \"\(name)\" enum." +
                     didYouMeanEnumValue(unknownValueStr: enumNode.value),
                 nodes: [valueAST]
             )

Sources/GraphQL/Type/Scalars.swift

@@ -10,7 +10,10 @@ public let GraphQLInt = try! GraphQLScalarType(
             return .int(int)
         }
 
-        return .null
+        throw GraphQLError(
+            message: "Int cannot represent non-integer value: \(print(ast: ast))",
+            nodes: [ast]
+        )
     }
 )
 
@@ -31,7 +34,10 @@ public let GraphQLFloat = try! GraphQLScalarType(
             return .double(double)
         }
 
-        return .null
+        throw GraphQLError(
+            message: "Float cannot represent non-numeric value: \(print(ast: ast))",
+            nodes: [ast]
+        )
     }
 )
 
@@ -48,7 +54,10 @@ public let GraphQLString = try! GraphQLScalarType(
             return .string(ast.value)
         }
 
-        return .null
+        throw GraphQLError(
+            message: "String cannot represent a non-string value: \(print(ast: ast))",
+            nodes: [ast]
+        )
     }
 )
 
@@ -62,7 +71,10 @@ public let GraphQLBoolean = try! GraphQLScalarType(
             return .bool(ast.value)
         }
 
-        return .null
+        throw GraphQLError(
+            message: "Boolean cannot represent a non-boolean value: \(print(ast: ast))",
+            nodes: [ast]
+        )
     }
 )
 
@@ -85,6 +97,9 @@ public let GraphQLID = try! GraphQLScalarType(
             return .string(ast.value)
         }
 
-        return .null
+        throw GraphQLError(
+            message: "ID cannot represent a non-string and non-integer value: \(print(ast: ast))",
+            nodes: [ast]
+        )
     }
 )