WIP

Author: muukii

.mise.toml

@@ -1,2 +1,2 @@
 [tools]
-tuist = "4.10.2"
+tuist = "4.24.0"

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 import PackageDescription
 import CompilerPluginSupport
 
@@ -26,8 +26,8 @@ let package = Package(
     .package(url: "https://github.com/VergeGroup/swift-concurrency-task-manager", from: "1.1.0"),
 
     /// for testing
-    .package(url: "https://github.com/nalexn/ViewInspector.git", from: "0.9.3"),
-    .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"),
+    .package(url: "https://github.com/nalexn/ViewInspector.git", branch: "0.10.0"),
+    .package(url: "https://github.com/apple/swift-syntax.git", from: "510.0.3"),
     .package(url: "https://github.com/pointfreeco/swift-macro-testing.git", from: "0.2.1")
   ],
   targets: [
@@ -121,5 +121,5 @@ let package = Package(
       .product(name: "MacroTesting", package: "swift-macro-testing"),
     ])
   ],
-  swiftLanguageVersions: [.v5]
+  swiftLanguageModes: [.v5, .v6]
 )

Sources/Verge/Store/StoreType+SwiftUI.swift

@@ -42,7 +42,7 @@ extension BindingDerived {
 }
 
 @available(iOS 13.0, macOS 10.15, tvOS 13.0, watchOS 6.0, *)
-extension StoreDriverType {
+extension StoreDriverType where Self : Sendable {
 
   public func binding() -> SwiftUI.Binding<Scope> {
     .init(get: { [self /* source store lives until binding released */] in
@@ -65,7 +65,7 @@ extension StoreDriverType {
   ///   - mutation: A closure to update the state.
   ///   If the closure is nil, state will be automatically updated.
   /// - Returns: The result of binding
-  public func binding<T>(_ keypath: WritableKeyPath<Scope, T>, with mutation: ((T) -> Void)? = nil) -> SwiftUI.Binding<T> {
+  public func binding<T>(_ keypath: WritableKeyPath<Scope, T> & Sendable, with mutation: (@Sendable (T) -> Void)? = nil) -> SwiftUI.Binding<T> {
     .init(get: { [self /* source store lives until binding released */] in
       return self.state.primitive[keyPath: keypath]
     }, set: { [weak self] value in

Sources/VergeNormalization/Selector.swift

@@ -10,9 +10,9 @@ public struct KeyPathTableSelector<
   Table: TableType
 >: TableSelector, Equatable {
 
-  public let keyPath: KeyPath<Storage, Table>
+  public let keyPath: KeyPath<Storage, Table> & Sendable
 
-  public init(keyPath: KeyPath<Storage, Table>) {
+  public init(keyPath: KeyPath<Storage, Table> & Sendable) {
     self.keyPath = keyPath
   }
 
@@ -28,7 +28,7 @@ extension TableSelector {
     Storage: NormalizedStorageType,
     Table: TableType
   >(
-    _ keyPath: KeyPath<Storage, Table>
+    _ keyPath: KeyPath<Storage, Table> & Sendable
   ) -> Self where Self == KeyPathTableSelector<Storage, Table> {
     return .init(keyPath: keyPath)
   }
@@ -46,9 +46,9 @@ public struct KeyPathStorageSelector<
   Storage: NormalizedStorageType
 >: StorageSelector, Equatable {
 
-  public let keyPath: KeyPath<Source, Storage>
+  public let keyPath: KeyPath<Source, Storage> & Sendable
 
-  public init(keyPath: KeyPath<Source, Storage>) {
+  public init(keyPath: KeyPath<Source, Storage> & Sendable) {
     self.keyPath = keyPath
   }
 
@@ -65,7 +65,7 @@ extension StorageSelector {
     Storage: NormalizedStorageType
   >
   (
-    _ keyPath: KeyPath<Source, Storage>
+    _ keyPath: KeyPath<Source, Storage> & Sendable
   ) -> Self where Self == KeyPathStorageSelector<Source, Storage> {
     return .init(keyPath: keyPath)
   }

Sources/VergeTiny/Source.swift

@@ -215,7 +215,7 @@ public final class DynamicPropertyStorage {
 
 }
 
-private var _storageKey: Void?
+nonisolated(unsafe) private var _storageKey: Void?
 
 extension NSObject {