Merge pull request #156 from NeedleInAJayStack/fix/bool-parseValue

Allows numeric values to be parsed as GraphQLBools
GraphQLSwift · Oct 24, 2024 · ec809df · ec809df
2 parents 0dfa0d9 + eee1ee8
commit ec809df
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/Sources/GraphQL/Type/Scalars.swift b/Sources/GraphQL/Type/Scalars.swift
@@ -201,6 +201,11 @@ public let GraphQLBoolean = try! GraphQLScalarType(
         if case let .bool(value) = inputValue {
             return inputValue
         }
+        // NOTE: We deviate from graphql-js and allow numeric conversions here because
+        // the MapCoder's round-trip conversion to NSObject for Bool converts to 0/1 numbers.
+        if case let .number(value) = inputValue {
+            return .bool(value.intValue != 0)
+        }
         throw GraphQLError(
             message: "Boolean cannot represent a non boolean value: \(inputValue)"
         )

diff --git a/Tests/GraphQLTests/TypeTests/ScalarTests.swift b/Tests/GraphQLTests/TypeTests/ScalarTests.swift
@@ -300,18 +300,12 @@ class ScalarTests: XCTestCase {
             GraphQLBoolean.parseValue(.null),
             "Boolean cannot represent a non boolean value: null"
         )
-        try XCTAssertThrowsError(
-            GraphQLBoolean.parseValue(0),
-            "Boolean cannot represent a non boolean value: 0"
-        )
-        try XCTAssertThrowsError(
-            GraphQLBoolean.parseValue(1),
-            "Boolean cannot represent a non boolean value: 1"
-        )
-        try XCTAssertThrowsError(
-            GraphQLBoolean.parseValue(.double(Double.nan)),
-            "Boolean cannot represent a non boolean value: NaN"
-        )
+        // NOTE: We deviate from graphql-js and allow numeric conversions here because
+        // the MapCoder's round-trip conversion to NSObject for Bool converts to 0/1 numbers.
+        try XCTAssertNoThrow(GraphQLBoolean.parseValue(0))
+        try XCTAssertNoThrow(GraphQLBoolean.parseValue(1))
+        try XCTAssertNoThrow(GraphQLBoolean.parseValue(.double(Double.nan)))
+
         try XCTAssertThrowsError(
             GraphQLBoolean.parseValue(""),
             #"Boolean cannot represent a non boolean value: """#