Add OpenSwiftUICore and OpenSwiftUICoreTests (#110)

* Update Package.swift to add OpenSwiftUICore

* Remove duplicated Color declaration

* Fix ContentResponder implementation

* Add BitVectorTests for OpenSwiftUICoreTests

Author: Kyle-Ye

Package.swift

@@ -81,10 +81,18 @@ if warningsAsErrorsCondition {
     sharedSwiftSettings.append(.unsafeFlags(["-warnings-as-errors"]))
 }
 
+let openSwiftUICoreTarget = Target.target(
+    name: "OpenSwiftUICore",
+    dependencies: [
+        .product(name: "OpenGraphShims", package: "OpenGraph"),
+    ],
+    swiftSettings: sharedSwiftSettings
+)
 let openSwiftUITarget = Target.target(
     name: "OpenSwiftUI",
     dependencies: [
         "COpenSwiftUI",
+        "OpenSwiftUICore",
         .target(name: "CoreServices", condition: .when(platforms: [.iOS])),
         .product(name: "OpenGraphShims", package: "OpenGraph"),
     ],
@@ -97,6 +105,14 @@ let openSwiftUIExtensionTarget = Target.target(
     ],
     swiftSettings: sharedSwiftSettings
 )
+let openSwiftUICoreTestTarget = Target.testTarget(
+    name: "OpenSwiftUICoreTests",
+    dependencies: [
+        "OpenSwiftUICore",
+    ],
+    exclude: ["README.md"],
+    swiftSettings: sharedSwiftSettings
+)
 let openSwiftUITestTarget = Target.testTarget(
     name: "OpenSwiftUITests",
     dependencies: [
@@ -148,6 +164,7 @@ let package = Package(
             ]
         ),
         .binaryTarget(name: "CoreServices", path: "PrivateFrameworks/CoreServices.xcframework"),
+        openSwiftUICoreTarget,
         openSwiftUITarget,
         openSwiftUIExtensionTarget,
     ]
@@ -164,15 +181,37 @@ extension Target {
         // FIXME: Weird SwiftPM behavior for test Target. Otherwize we'll get the following error message
         // "could not determine executable path for bundle 'AttributeGraph.framework'"
         dependencies.append(.product(name: "AttributeGraph", package: "OpenGraph"))
-
         var swiftSettings = swiftSettings ?? []
         swiftSettings.append(.define("OPENGRAPH_ATTRIBUTEGRAPH"))
         self.swiftSettings = swiftSettings
     }
+
+    func addOpenCombineSettings() {
+        dependencies.append(.product(name: "OpenCombine", package: "OpenCombine"))
+        var swiftSettings = swiftSettings ?? []
+        swiftSettings.append(.define("OPENSWIFTUI_OPENCOMBINE"))
+        self.swiftSettings = swiftSettings
+    }
+
+    func addSwiftLogSettings() {
+        dependencies.append(.product(name: "Logging", package: "swift-log"))
+        var swiftSettings = swiftSettings ?? []
+        swiftSettings.append(.define("OPENSWIFTUI_SWIFT_LOG"))
+        self.swiftSettings = swiftSettings
+    }
+
+    func addSwiftTestingSettings() {
+        dependencies.append(.product(name: "Testing", package: "swift-testing"))
+        var swiftSettings = swiftSettings ?? []
+        swiftSettings.append(.define("OPENSWIFTUI_SWIFT_TESTING"))
+        self.swiftSettings = swiftSettings
+    }
 }
 
 if attributeGraphCondition {
+    openSwiftUICoreTarget.addAGSettings()
     openSwiftUITarget.addAGSettings()
+    openSwiftUICoreTestTarget.addAGSettings()
     openSwiftUITestTarget.addAGSettings()
     openSwiftUITempTestTarget.addAGSettings()
     openSwiftUICompatibilityTestTarget.addAGSettings()
@@ -187,12 +226,8 @@ if openCombineCondition {
     package.dependencies.append(
         .package(url: "https://github.com/OpenSwiftUIProject/OpenCombine.git", from: "0.15.0")
     )
-    openSwiftUITarget.dependencies.append(
-        .product(name: "OpenCombine", package: "OpenCombine")
-    )
-    var swiftSettings: [SwiftSetting] = (openSwiftUITarget.swiftSettings ?? [])
-    swiftSettings.append(.define("OPENSWIFTUI_OPENCOMBINE"))
-    openSwiftUITarget.swiftSettings = swiftSettings
+    openSwiftUICoreTarget.addOpenCombineSettings()
+    openSwiftUITarget.addOpenCombineSettings()
 }
 
 #if os(macOS)
@@ -204,12 +239,8 @@ if swiftLogCondition {
     package.dependencies.append(
         .package(url: "https://github.com/apple/swift-log", from: "1.5.3")
     )
-    openSwiftUITarget.dependencies.append(
-        .product(name: "Logging", package: "swift-log")
-    )
-    var swiftSettings: [SwiftSetting] = (openSwiftUITarget.swiftSettings ?? [])
-    swiftSettings.append(.define("OPENSWIFTUI_SWIFT_LOG"))
-    openSwiftUITarget.swiftSettings = swiftSettings
+    openSwiftUICoreTarget.addSwiftLogSettings()
+    openSwiftUITarget.addSwiftLogSettings()
 }
 
 // Remove the check when swift-testing reaches 1.0.0
@@ -219,19 +250,14 @@ if swiftTestingCondition {
         // Fix it to be 0.3.0 before we bump to Swift 5.10
         .package(url: "https://github.com/apple/swift-testing", exact: "0.6.0")
     )
-    openSwiftUITestTarget.dependencies.append(
-        .product(name: "Testing", package: "swift-testing")
-    )
+    openSwiftUICoreTestTarget.addSwiftTestingSettings()
+    openSwiftUITestTarget.addSwiftTestingSettings()
+    openSwiftUITempTestTarget.addSwiftTestingSettings()
+    openSwiftUICompatibilityTestTarget.addSwiftTestingSettings()
+
+    package.targets.append(openSwiftUICoreTestTarget)
     package.targets.append(openSwiftUITestTarget)
-    
-    openSwiftUITempTestTarget.dependencies.append(
-        .product(name: "Testing", package: "swift-testing")
-    )
     package.targets.append(openSwiftUITempTestTarget)
-    
-    openSwiftUICompatibilityTestTarget.dependencies.append(
-        .product(name: "Testing", package: "swift-testing")
-    )
     package.targets.append(openSwiftUICompatibilityTestTarget)
 }
 

Sources/OpenSwiftUI/Data/Other/BitVector64.swift

@@ -7,6 +7,7 @@
 
 import Foundation
 internal import COpenSwiftUI
+@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
 
 protocol ContentResponder {
     func contains(points: [CGPoint], size: CGSize) -> BitVector64
@@ -17,11 +18,8 @@ protocol ContentResponder {
 extension ContentResponder {
     func contains(points: [CGPoint], size: CGSize) -> BitVector64 {
         guard !points.isEmpty else { return BitVector64() }
-        #if OPENSWIFTUI_RELEASE_2024
-        // TODO: mapBool
-        #else
-        fatalError("TODO")
-        #endif
+        let rect = CGRect(origin: .zero, size: size)
+        return points.mapBool { rect.contains($0) }
     }
 
     func contentPath(size: CGSize) -> Path {

Sources/OpenSwiftUI/EventHandling/InputEvent/HitTesting/ContentResponder.swift

@@ -0,0 +1 @@
+@_exported import OpenSwiftUICore

Sources/OpenSwiftUI/Export.swift

@@ -9,9 +9,6 @@
 #if os(iOS)
 import UIKit
 
-// FIXME
-struct Color {}
-
 private struct Switch: UIViewRepresentable {
     typealias UIViewType = UISwitch
     typealias Coordinator = PlatformSwitchCoordinator

Sources/OpenSwiftUI/View/Toggle/Switch.swift

@@ -0,0 +1,74 @@
+//
+//  BitVector64Tests.swift
+//  OpenSwiftUICoreTests
+
+@testable import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+import Testing
+
+struct BitVector64Tests {
+    @Test
+    func testInit() {
+        let bitVector = BitVector64()
+        #expect(bitVector.rawValue == 0)
+    }
+
+    @Test(arguments: [
+        (rawValue: 0x1, index: 0),
+        (rawValue: 0x2, index: 1),
+        (rawValue: 0x4, index: 2),
+        (rawValue: 0x8, index: 3),
+        (rawValue: 0x10, index: 4),
+        (rawValue: 0x20, index: 5),
+        (rawValue: 0x40, index: 6),
+        (rawValue: 0x80, index: 7),
+        (rawValue: 0x100, index: 8),
+        (rawValue: 0x200, index: 9),
+    ])
+    func testSubscriptGetter(rawValue: UInt64, index: Int) {
+        let bitVector = BitVector64(rawValue: rawValue)
+        for i in 0..<64 {
+            if i == index {
+                #expect(bitVector[i] == true)
+            } else {
+                #expect(bitVector[i] == false)
+            }
+        }
+    }
+
+    @Test
+    func testSubscriptSetter() {
+        var bitVector = BitVector64(rawValue: 0)
+        bitVector.rawValue = 4
+        #expect(bitVector[0] == false)
+        #expect(bitVector[1] == false)
+        #expect(bitVector[2] == true)
+
+        bitVector[0] = true
+        #expect(bitVector[0] == true)
+        #expect(bitVector[1] == false)
+        #expect(bitVector[2] == true)
+        #expect(bitVector.rawValue == 5)
+
+        bitVector[1] = true
+        #expect(bitVector[0] == true)
+        #expect(bitVector[1] == true)
+        #expect(bitVector[2] == true)
+        #expect(bitVector.rawValue == 7)
+
+        bitVector[2] = false
+        #expect(bitVector[0] == true)
+        #expect(bitVector[1] == true)
+        #expect(bitVector[2] == false)
+        #expect(bitVector.rawValue == 3)
+    }
+    
+    @Test
+    func testMapBool() {
+        let array = [Bool.random(), Bool.random(), Bool.random(), Bool.random()]
+        let bitVector = array.mapBool { $0 }
+        for i in 0..<array.count {
+            #expect(bitVector[i] == array[i])
+        }
+    }
+}

Tests/OpenSwiftUICoreTests/Data/Other/BitVector64Tests.swift

@@ -0,0 +1,53 @@
+//
+//  BitVectorTests.swift
+//  OpenSwiftUICoreTests
+
+@testable import OpenSwiftUICore
+import Testing
+
+struct BitVectorTests {
+    @Test(arguments: [0, 1, 60, 64])
+    func testInlineKind(count: Int) {
+        var bitVector = BitVector(count: count)
+        #expect(bitVector.count == count)
+        #expect(bitVector.vector.rawValue == 0)
+        #expect(bitVector.array == [])
+        
+        for (index, value) in bitVector.enumerated() {
+            #expect(value == false)
+            bitVector[index] = true
+        }
+        for value in bitVector {
+            #expect(value == true)
+        }
+        
+        if count == 0 {
+            #expect(bitVector.vector.rawValue == 0)
+        } else {
+            #expect(bitVector.vector.rawValue > 0)
+        }
+        #expect(bitVector.array == [])
+    }
+    
+    @Test(arguments: [
+        (count: 65, arrayCount: 2),
+        (count: 128, arrayCount: 2),
+        (count: 129, arrayCount: 3),
+    ])
+    func testArrayKind(count: Int, arrayCount: Int) {
+        var bitVector = BitVector(count: count)
+        #expect(bitVector.count == count)
+        #expect(bitVector.vector.rawValue == 0)
+        #expect(bitVector.array.count == arrayCount)
+        for (index, value) in bitVector.enumerated() {
+            #expect(value == false)
+            bitVector[index] = true
+        }
+        for value in bitVector {
+            #expect(value == true)
+        }
+        
+        #expect(bitVector.vector.rawValue == 0)
+        #expect(bitVector.array.map(\.rawValue).allSatisfy { $0 > 0 })
+    }
+}

Tests/OpenSwiftUICoreTests/Data/Other/BitVectorTests.swift

@@ -0,0 +1,8 @@
+## OpenSwiftUICoreTests
+
+Test internal API of OpenSwiftUICore
+
+```swift
+@testable import OpenSwiftUICore
+@_spi(ForOpenSwiftUIOnly) import OpenSwiftUICore
+```

Tests/OpenSwiftUICoreTests/README.md

@@ -0,0 +1,15 @@
+//
+//  Scaffolding.swift
+//
+//
+//  Created by Kyle on 2023/11/8.
+//
+
+import Testing
+import XCTest
+
+final class AllTests: XCTestCase {
+    func testAll() async {
+        await XCTestScaffold.runAllTests(hostedBy: self)
+    }
+}