chore: Swift 6 (#19)

danthorpe · web-flow · commit a79b31069f30 · 2024-09-24T18:13:07.000+01:00
* chore: Swift 6 * chore: update ci environments * chore: conditionalize package the other way * fix: Package.swift * chore: audit Sendable * chore: use Swift 6 ci branch * chore: string concurrency in Swift 6 * chore: swaps @swift files around * chore: only use @retroactive on swift 6+ * chore: add missing tests * chore: move back onto ci@main --------- Co-authored-by: danthorpe <danthorpe@users.noreply.github.com>
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,6 +29,10 @@ jobs:
             {
               "os": "macos-14",
               "xcode": "15.4"
+            },
+            {
+              "os": "macos-14",
+              "xcode": "16.0"
             }
           ]
         }
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
@@ -0,0 +1,58 @@
+// swift-tools-version: 6.0
+@preconcurrency import PackageDescription
+
+var package = Package(
+  name: "swift-composable-loadable",
+  platforms: [
+    .macOS(.v13),
+    .iOS(.v16),
+    .tvOS(.v16),
+    .watchOS(.v9),
+  ],
+  products: [
+    .library(name: "ComposableLoadable", targets: ["ComposableLoadable"])
+  ],
+  dependencies: [
+    .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.15.0"),
+  ],
+  targets: [
+    .target(
+      name: "ComposableLoadable",
+      dependencies: [
+        .product(
+          name: "ComposableArchitecture", package: "swift-composable-architecture"
+        )
+      ]
+    ),
+    .target(
+      name: "CommonTestHelpers",
+      dependencies: [
+        "ComposableLoadable",
+        .product(
+          name: "ComposableArchitecture", package: "swift-composable-architecture"
+        ),
+      ]
+    ),
+    .testTarget(
+      name: "ComposableLoadableTests",
+      dependencies: [
+        "CommonTestHelpers",
+        "ComposableLoadable",
+      ]
+    ),
+  ]
+)
+
+extension Target.Dependency {
+  static let composableArchitecture: Target.Dependency = .product(
+    name: "ComposableArchitecture", package: "swift-composable-architecture"
+  )
+}
+
+extension [SwiftSetting] {
+  static let concurrency: Self = [
+    .enableUpcomingFeature("StrictConcurrency"),
+    .enableUpcomingFeature("InferSendableFromCaptures"),
+  ]
+}
diff --git a/Sources/CommonTestHelpers/ParentFeature.swift b/Sources/CommonTestHelpers/ParentFeature.swift
@@ -23,3 +23,47 @@ struct ParentFeature {
     }
   }
 }
+
+@Reducer
+struct RandomFeature {
+  @ObservableState
+  struct State: Equatable {
+    @ObservationStateIgnored
+    @LoadableState<EmptyLoadRequest, CounterFeature.State> package var counter
+  }
+  enum Action: Equatable {
+    case counter(LoadingActionWith<EmptyLoadRequest, CounterFeature>)
+  }
+  @Dependency(\.testClient.getRandomValue) var getRandomValue
+  var body: some ReducerOf<Self> {
+    Reduce { _, _ in
+      return .none
+    }
+    .loadable(\.$counter, action: \.counter) {
+      CounterFeature()
+    } load: { _ in
+      CounterFeature.State(count: try await getRandomValue())
+    }
+  }
+}
+
+@Reducer
+struct ChildlessFeature {
+  @ObservableState
+  struct State: Equatable {
+    @ObservationStateIgnored
+    @LoadableState<String, Int> package var counterValue
+  }
+  enum Action: Equatable {
+    case counterValue(LoadingAction<String, Int, NoLoadingAction>)
+  }
+  @Dependency(\.testClient.getValue) var getValue
+  var body: some ReducerOf<Self> {
+    Reduce { _, _ in
+      return .none
+    }
+    .loadable(\.$counterValue, action: \.counterValue) { request, _ in
+      try await getValue(request)
+    }
+  }
+}
diff --git a/Sources/CommonTestHelpers/TestFeatureClient.swift b/Sources/CommonTestHelpers/TestFeatureClient.swift
@@ -1,10 +1,14 @@
-import ComposableArchitecture
+import Dependencies
+import DependenciesMacros
 
-struct TestFeatureClient: TestDependencyKey {
-  static let testValue = TestFeatureClient(
-    getValue: unimplemented("TestFeatureClient.getValue")
-  )
+@DependencyClient
+struct TestFeatureClient {
   var getValue: @Sendable (String) async throws -> Int
+  var getRandomValue: @Sendable () async throws -> Int
+}
+
+extension TestFeatureClient: TestDependencyKey {
+  static let testValue = TestFeatureClient()
 }
 
 extension DependencyValues {
diff --git a/Sources/ComposableLoadable/Loadable/LoadableClient.swift b/Sources/ComposableLoadable/Loadable/LoadableClient.swift
@@ -3,7 +3,7 @@ import Foundation
 
 // MARK: - Loadable Client
 
-package protocol LoadableClient<Request, State, Value> {
+package protocol LoadableClient<Request, State, Value>: Sendable {
   associatedtype Value
   associatedtype State
   associatedtype Request
diff --git a/Sources/ComposableLoadable/Loadable/LoadableState.swift b/Sources/ComposableLoadable/Loadable/LoadableState.swift
@@ -292,3 +292,11 @@ extension LoadableState: Equatable where Value: Equatable {
     lhs.current == rhs.current && lhs.previous == rhs.previous
   }
 }
+
+extension LoadedValue: Sendable where Request: Sendable, Value: Sendable {}
+
+extension LoadedFailure: Sendable where Request: Sendable, Failure: Sendable {}
+
+extension LoadableState.State: Sendable where Request: Sendable, Value: Sendable {}
+
+extension LoadableState: Sendable where Request: Sendable, Value: Sendable {}
diff --git a/Sources/ComposableLoadable/Loadable/LoadingReducer.swift b/Sources/ComposableLoadable/Loadable/LoadingReducer.swift
@@ -3,7 +3,7 @@ import Foundation
 
 // MARK: - Public API
 
-extension Reducer {
+extension Reducer where State: Sendable {
 
   /// Integrate a Loadable child domain with a generic Request type
   public func loadable<
@@ -18,7 +18,7 @@ extension Reducer {
     load: @escaping @Sendable (Request, State) async throws -> ChildState,
     fileID: StaticString = #fileID,
     line: UInt = #line
-  ) -> some ReducerOf<Self> where ChildState == Child.State, ChildAction == Child.Action {
+  ) -> some ReducerOf<Self> where Child.State: Sendable, ChildState == Child.State, ChildAction == Child.Action {
     loadable(
       fileID: fileID,
       line: line,
@@ -43,7 +43,7 @@ extension Reducer {
     load: @escaping @Sendable (State) async throws -> ChildState,
     fileID: StaticString = #fileID,
     line: UInt = #line
-  ) -> some ReducerOf<Self> where ChildState == Child.State, ChildAction == Child.Action {
+  ) -> some ReducerOf<Self> where Child.State: Sendable, ChildState == Child.State, ChildAction == Child.Action {
     loadable(
       fileID: fileID,
       line: line,
@@ -79,7 +79,7 @@ extension Reducer {
 
 // MARK: - Internal API
 
-extension Reducer {
+extension Reducer where State: Sendable {
 
   fileprivate func loadable<
     Child: Reducer,
diff --git a/Sources/ComposableLoadable/Pagination/PaginationFeature+.swift b/Sources/ComposableLoadable/Pagination/PaginationFeature+.swift
@@ -1,3 +1,5 @@
+// MARK: - Equatable Conformance
+
 extension PaginationFeature.State.Page: Equatable where Element: Equatable {
   public static func == (lhs: Self, rhs: Self) -> Bool {
     lhs.previous == rhs.previous
diff --git a/Sources/ComposableLoadable/Pagination/PaginationFeature.swift b/Sources/ComposableLoadable/Pagination/PaginationFeature.swift
@@ -8,10 +8,10 @@ import Foundation
 /// has already be fetched. i.e. you fetch some elements, and have
 /// pagination cursors for previous & next. You can use
 /// `LoadableState` etc to do this.
-@Reducer public struct PaginationFeature<Element: Identifiable & Sendable>: Sendable {
+@Reducer public struct PaginationFeature<Element: Identifiable & Sendable>: Sendable where Element.ID: Sendable {
 
   @ObservableState
-  public struct State {
+  public struct State: Sendable {
     /// Access the `PaginationContext`
     public internal(set) var context: any PaginationContext
 
diff --git a/Sources/ComposableLoadable/Views/PaginationLoadMore.swift b/Sources/ComposableLoadable/Views/PaginationLoadMore.swift
@@ -7,7 +7,7 @@ public struct PaginationLoadMore<
   Failure: View,
   Loading: View,
   NoMoreResults: View
->: View {
+>: View where Element.ID: Sendable {
 
   public typealias Retry = () -> Void
   public typealias FailureViewBuilder = (any Error, @escaping Retry) -> Failure
@@ -55,7 +55,7 @@ public struct PaginationLoadMore<
 }
 
 extension LoadableView {
-  fileprivate typealias AppearAction = () -> Void
+  fileprivate typealias AppearAction = @MainActor @Sendable () -> Void
   fileprivate init<ErrorView: View>(
     _ store: LoadableStore<Request, State, Action>,
     @ViewBuilder onError: @escaping (any Error, @escaping AppearAction) -> ErrorView,
diff --git a/Tests/ComposableLoadableTests/LoadableReducerTests.swift b/Tests/ComposableLoadableTests/LoadableReducerTests.swift
@@ -85,9 +85,8 @@ final class ReducerBasicTests: XCTestCase {
       }
     }
 
-    await store.send(.counter(.load(request))) {
-      $0.$counter.previous = .pending
-      $0.$counter.current = .active(request)
+    await store.send(\.counter.load, request) {
+      $0.$counter.becomeActive(request)
     }
 
     await store.receive(.counter(.finished(request, didRefresh: false, .success(100)))) {
@@ -113,4 +112,50 @@ final class ReducerBasicTests: XCTestCase {
       $0.$counter.wrappedValue?.count = 99
     }
   }
+
+  @MainActor func test__empty_request() async throws {
+    let randomInt = Int.random(in: 0 ... Int.max)
+    let store = TestStore(initialState: RandomFeature.State()) {
+      RandomFeature()
+    } withDependencies: {
+      $0.testClient.getRandomValue = {
+        randomInt
+      }
+    }
+
+    await store.send(.counter(.load)) {
+      $0.$counter.becomeActive()
+    }
+    let result = await TaskResult {
+      CounterFeature.State(count: randomInt)
+    }
+    await store.receive(
+      .counter(.finished(EmptyLoadRequest(), didRefresh: false, result))
+    ) {
+      $0.$counter.finish(Result(result))
+    }
+  }
+
+  @MainActor func test__no_child_domain() async throws {
+    let request = "Hello"
+    let store = TestStore(initialState: ChildlessFeature.State()) {
+      ChildlessFeature()
+    } withDependencies: {
+      $0.testClient.getValue = { input in
+        XCTAssertEqual(input, "Hello")
+        return 100
+      }
+    }
+
+    await store.send(\.counterValue.load, request) {
+      $0.$counterValue.becomeActive(request)
+    }
+    let result = await TaskResult { 100 }
+    await store.receive(
+      .counterValue(.finished(request, didRefresh: false, result))
+    ) {
+      $0.$counterValue.finish(request, result: Result(result))
+    }
+
+  }
 }
diff --git a/Tests/ComposableLoadableTests/PaginationFeatureTests.swift b/Tests/ComposableLoadableTests/PaginationFeatureTests.swift
@@ -8,7 +8,11 @@ private struct Message: Equatable, Identifiable {
   let message: String
 }
 
+#if compiler(>=6)
+extension String: @retroactive Error {}
+#else
 extension String: Error {}
+#endif
 
 final class PaginationFeatureTests: XCTestCase {
 

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ jobs:`
`29`	`29`	`{`
`30`	`30`	`"os": "macos-14",`
`31`	`31`	`"xcode": "15.4"`
	`32`	`+ },`
	`33`	`+ {`
	`34`	`+ "os": "macos-14",`
	`35`	`+ "xcode": "16.0"`
`32`	`36`	`}`
`33`	`37`	`]`
`34`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,3 +292,11 @@ extension LoadableState: Equatable where Value: Equatable {`
`292`	`292`	`lhs.current == rhs.current && lhs.previous == rhs.previous`
`293`	`293`	`}`
`294`	`294`	`}`
	`295`	`+`
	`296`	`+extension LoadedValue: Sendable where Request: Sendable, Value: Sendable {}`
	`297`	`+`
	`298`	`+extension LoadedFailure: Sendable where Request: Sendable, Failure: Sendable {}`
	`299`	`+`
	`300`	`+extension LoadableState.State: Sendable where Request: Sendable, Value: Sendable {}`
	`301`	`+`
	`302`	`+extension LoadableState: Sendable where Request: Sendable, Value: Sendable {}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// MARK: - Equatable Conformance`
	`2`	`+`
`1`	`3`	`extension PaginationFeature.State.Page: Equatable where Element: Equatable {`
`2`	`4`	`public static func == (lhs: Self, rhs: Self) -> Bool {`
`3`	`5`	`lhs.previous == rhs.previous`