Allow integer conversion in FastBSONDecoder

orlandos-nl · Mar 15, 2023 · 6056eae · 6056eae
1 parent 3ca41d3
commit 6056eae
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/Sources/BSON/Codable/Decoding/Fast/FastBSONDecoder.swift b/Sources/BSON/Codable/Decoding/Fast/FastBSONDecoder.swift
@@ -378,11 +378,16 @@ struct _FastSingleValueContainer<P: Primitive>: SingleValueDecodingContainer, An
     }
 
     func decode(_ type: Int.Type) throws -> Int {
-        if let value = value as? Int {
+        switch value {
+        case let value as Int:
             return value
+        case let value as Int32:
+            return Int(value)
+        case let value as _BSON64BitInteger where value >= Int.min && value <= Int.max:
+            return Int(value)
+        default:
+            throw BSONValueNotFound(type: Int.self, path: codingPath.map(\.stringValue))
         }
-
-        throw BSONValueNotFound(type: Int.self, path: codingPath.map(\.stringValue))
     }
 
     func decode(_ type: Int8.Type) throws -> Int8 {
@@ -394,19 +399,25 @@ struct _FastSingleValueContainer<P: Primitive>: SingleValueDecodingContainer, An
     }
 
     func decode(_ type: Int32.Type) throws -> Int32 {
-        if let value = value as? Int32 {
+        switch value {
+        case let value as Int32:
             return value
+        case let value as _BSON64BitInteger where value >= Int32.min && value <= Int32.max:
+            return Int32(value)
+        default:
+            throw BSONValueNotFound(type: Int32.self, path: codingPath.map(\.stringValue))
         }
-
-        throw BSONValueNotFound(type: Int32.self, path: codingPath.map(\.stringValue))
     }
 
     func decode(_ type: Int64.Type) throws -> Int64 {
-        if let value = value as? Int64 {
-            return value
+        switch value {
+        case let value as Int64:
+            return Int64(value)
+        case let value as _BSON64BitInteger:
+            return Int64(value)
+        default:
+            throw BSONValueNotFound(type: Int32.self, path: codingPath.map(\.stringValue))
         }
-
-        throw BSONValueNotFound(type: Int64.self, path: codingPath.map(\.stringValue))
     }
 
     func decode(_ type: UInt.Type) throws -> UInt {

diff --git a/Sources/BSON/Document/Document.swift b/Sources/BSON/Document/Document.swift
@@ -25,7 +25,7 @@ public struct Document: Primitive, @unchecked Sendable {
     }
 
     /// Dictates whether this `Document` is an `Array` or `Dictionary`-like type
-    public internal(set) var isArray: Bool
+    public var isArray: Bool
 
     /// Creates a new empty BSONDocument
     ///

diff --git a/Tests/BSONTests/BSONEncoderTests.swift b/Tests/BSONTests/BSONEncoderTests.swift
@@ -1,5 +1,5 @@
 import Foundation
-@testable import BSON
+import BSON
 import XCTest
 
 @available(iOS 10.0, *)

diff --git a/Tests/BSONTests/BSONPublicTests.swift b/Tests/BSONTests/BSONPublicTests.swift
@@ -9,7 +9,7 @@
 import NIOCore
 import Foundation
 import XCTest
-@testable import BSON
+import BSON
 
 #if os(Linux)
     import Glibc
@@ -160,7 +160,10 @@ final class BSONPublicTests: XCTestCase {
         }
 
         XCTAssertEqual(array.count, 17)
-        XCTAssertEqual(copy, array)
+
+        for _ in 0..<10_00_000 {
+            XCTAssertEqual(copy, array)
+        }
     }
 
     func testEquatability() {