Swift-Concurrency adoption (#52)

* enabled swift concurrency

* fixed Swift Concurrency warnings

* sendable support for merge strategy closures

* sendable conformance for relationship

* sendable conformance for models

* removed swift concurrency flag

Package.swift

@@ -34,10 +34,12 @@ let package = Package(
         ),
         .target(
             name: "SwiftletModel",
+
             dependencies: [
                 "SwiftletModelMacros",
                 .product(name: "Collections", package: "swift-collections")
-            ]),
+            ]
+        ),
 
         .testTarget(
             name: "SwiftletModelTests",

Sources/SwiftletModel/Model/MergeStrategy.swift

@@ -7,10 +7,10 @@
 
 import Foundation
 
-public struct MergeStrategy<T> {
-    let merge: (_ old: T, _ new: T) -> T
+public struct MergeStrategy<T>: Sendable {
+    let merge: @Sendable (_ old: T, _ new: T) -> T
 
-    public init(merge: @escaping (T, T) -> T) {
+    public init(merge: @Sendable @escaping (T, T) -> T) {
         self.merge = merge
     }
 }
@@ -33,10 +33,13 @@ public extension MergeStrategy {
 
 public extension MergeStrategy {
 
-    static func patch<Entity, Value>(_ keyPath: WritableKeyPath<Entity, Value?>) -> MergeStrategy<Entity> {
+    static func patch<Entity, Value>(
+        _ keyPath: @Sendable @escaping @autoclosure () -> WritableKeyPath<Entity, Value?>
+    ) -> MergeStrategy<Entity> {
+
         MergeStrategy<Entity> { old, new in
             var new = new
-            new[keyPath: keyPath] = new[keyPath: keyPath] ?? old[keyPath: keyPath]
+            new[keyPath: keyPath()] = new[keyPath: keyPath()] ?? old[keyPath: keyPath()]
             return new
         }
     }
@@ -49,21 +52,27 @@ public extension MergeStrategy {
 }
 
 public extension MergeStrategy {
-    static func append<Entity, Value>(_ keyPath: WritableKeyPath<Entity, [Value]>) -> MergeStrategy<Entity> {
+    static func append<Entity, Value>(
+        _ keyPath: @Sendable @escaping @autoclosure () -> WritableKeyPath<Entity, [Value]>
+    ) -> MergeStrategy<Entity> {
+
         MergeStrategy<Entity> { old, new in
             var new = new
-            new[keyPath: keyPath] = [old[keyPath: keyPath], new[keyPath: keyPath]].flatMap { $0 }
+            new[keyPath: keyPath()] = [old[keyPath: keyPath()], new[keyPath: keyPath()]].flatMap { $0 }
             return new
         }
     }
 
-    static func append<Entity, Value>(_ keyPath: WritableKeyPath<Entity, [Value]?>) -> MergeStrategy<Entity> {
+    static func append<Entity, Value>(
+        _ keyPath: @Sendable @escaping @autoclosure () -> WritableKeyPath<Entity, [Value]?>
+    ) -> MergeStrategy<Entity> {
+
         MergeStrategy<Entity> { old, new in
             var new = new
-            let result = [old[keyPath: keyPath], new[keyPath: keyPath]]
+            let result = [old[keyPath: keyPath()], new[keyPath: keyPath()]]
                 .compactMap { $0 }
                 .flatMap { $0 }
-            new[keyPath: keyPath] = result.isEmpty ? nil : result
+            new[keyPath: keyPath()] = result.isEmpty ? nil : result
             return new
         }
     }

Sources/SwiftletModel/Relationship/DecodingStrategy.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct RelationDecodingStrategy: OptionSet {
+public struct RelationDecodingStrategy: OptionSet, Sendable {
     public let rawValue: UInt
 
     public init(rawValue: UInt) {

Sources/SwiftletModel/Relationship/EncodingStrategy.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum RelationEncodingStrategy {
+public enum RelationEncodingStrategy: Sendable {
     case plain
     case keyedContainer
     case explicitKeyedContainer

Sources/SwiftletModel/Relationship/Relation.swift

@@ -108,6 +108,12 @@ extension Relation {
 
 extension Relation.State: Codable where T: Codable { }
 
+// MARK: - Sendable
+
+extension Relation: Sendable where Entity: Sendable, Entity.ID: Sendable { }
+
+extension Relation.State: Sendable where T: Sendable, T.ID: Sendable { }
+
 // MARK: - Private State
 
 extension Relation {

Sources/SwiftletModel/Relationship/Relationship.swift

@@ -107,3 +107,8 @@ extension Relationship: Codable where Value: Codable, Entity: Codable {
         try relation = .init(from: decoder)
     }
 }
+
+// MARK: - Sendable
+
+extension Relationship: Sendable where Entity: Sendable, Entity.ID: Sendable { }
+

Tests/SwiftletModelTests/Models/Attachment.swift

@@ -17,7 +17,7 @@ extension Attachment {
 }
 
 @EntityModel
-struct Attachment: Codable {
+struct Attachment: Codable, Sendable {
     let id: String
     var kind: Kind
 

Tests/SwiftletModelTests/Models/Chat.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 @EntityModel
-struct Chat: Codable {
+struct Chat: Codable, Sendable {
     let id: String
 
     @Relationship(inverse: \.chats)

Tests/SwiftletModelTests/Models/Message.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 @EntityModel
-struct Message: Codable {
+struct Message: Codable, Sendable {
     let id: String
     let text: String
 

Tests/SwiftletModelTests/Models/User.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 @EntityModel
-struct CurrentUser: Codable {
+struct CurrentUser: Codable, Sendable {
     static let id: String = "current"
 
     var id: String = CurrentUser.id
@@ -32,7 +32,7 @@ extension User {
 }
 
 @EntityModel
-struct User: Codable {
+struct User: Codable, Sendable {
     let id: String
     private(set) var name: String?
     private(set) var avatar: Avatar?