Fix WithViewStore initializer ambiguity (#2278)

* Test to show when ambiguous init of ViewStore happens

* Fix #2275

* wip

---------

Co-authored-by: Johan Kool <[email protected]>

Author: stephencelis

Sources/ComposableArchitecture/SwiftUI/Binding.swift

@@ -289,6 +289,7 @@ extension WithViewStore where Content: View {
   ///   - isDuplicate: A function to determine when two `ViewState` values are equal. When values
   ///     are equal, repeat view computations are removed.
   ///   - content: A function that can generate content from a view store.
+  @_disfavoredOverload
   public init<State, Action>(
     _ store: Store<State, Action>,
     observe toViewState: @escaping (BindingViewStore<State>) -> ViewState,
@@ -328,6 +329,7 @@ extension WithViewStore where Content: View {
   ///   - isDuplicate: A function to determine when two `ViewState` values are equal. When values
   ///     are equal, repeat view computations are removed.
   ///   - content: A function that can generate content from a view store.
+  @_disfavoredOverload
   public init<State>(
     _ store: Store<State, ViewAction>,
     observe toViewState: @escaping (BindingViewStore<State>) -> ViewState,
@@ -360,6 +362,7 @@ extension WithViewStore where ViewState: Equatable, Content: View {
   ///     All changes to the view state will cause the `WithViewStore` to re-compute its view.
   ///   - fromViewAction: A function that transforms view actions into store action.
   ///   - content: A function that can generate content from a view store.
+  @_disfavoredOverload
   public init<State, Action>(
     _ store: Store<State, Action>,
     observe toViewState: @escaping (BindingViewStore<State>) -> ViewState,
@@ -389,6 +392,7 @@ extension WithViewStore where ViewState: Equatable, Content: View {
   ///   - toViewState: A function that transforms binding store state into observable view state.
   ///     All changes to the view state will cause the `WithViewStore` to re-compute its view.
   ///   - content: A function that can generate content from a view store.
+  @_disfavoredOverload
   public init<State>(
     _ store: Store<State, ViewAction>,
     observe toViewState: @escaping (BindingViewStore<State>) -> ViewState,

Tests/ComposableArchitectureTests/BindableStoreTests.swift

@@ -0,0 +1,35 @@
+import Combine
+@_spi(Internals) import ComposableArchitecture
+import XCTest
+import SwiftUI
+
+@MainActor
+final class BindableStoreTests: XCTestCase {
+  func testBindableStore() {
+    struct BindableReducer: ReducerProtocol {
+      struct State: Equatable {
+        @BindingState var something: Int
+      }
+
+      enum Action: BindableAction {
+        case binding(BindingAction<State>)
+      }
+
+      var body: some ReducerProtocol<State, Action> {
+        BindingReducer()
+      }
+    }
+
+    struct SomeView: View {
+      let store: StoreOf<BindableReducer>
+
+      struct ViewState: Equatable {}
+
+      var body: some View {
+        WithViewStore(store, observe: { _ in ViewState() }) { viewStore in
+          EmptyView()
+        }
+      }
+    }
+  }
+}

Tests/ComposableArchitectureTests/StoreTests.swift

@@ -11,7 +11,7 @@ final class StoreTests: BaseTCATestCase {
 
     XCTAssertEqual(store.effectCancellables.count, 0)
 
-    _ = store.send(())
+    store.send(())
 
     XCTAssertEqual(store.effectCancellables.count, 0)
   }
@@ -36,7 +36,7 @@ final class StoreTests: BaseTCATestCase {
 
     XCTAssertEqual(store.effectCancellables.count, 0)
 
-    _ = store.send(.start)
+    store.send(.start)
 
     XCTAssertEqual(store.effectCancellables.count, 1)
 
@@ -795,7 +795,7 @@ final class StoreTests: BaseTCATestCase {
       $0.date = .constant(Date(timeIntervalSinceReferenceDate: 1_234_567_890))
     }
 
-    _ = store.send(.tap)
+    store.send(.tap)
     XCTAssertEqual(store.state.value.date, Date(timeIntervalSinceReferenceDate: 1_234_567_890))
   }
 
@@ -879,7 +879,7 @@ final class StoreTests: BaseTCATestCase {
       .sink { _ in storeStateCount2 += 1 }
       .store(in: &self.cancellables)
 
-    _ = store.send(.tap)
+    store.send(.tap)
     XCTAssertEqual(removeDuplicatesCount1, 0)
     XCTAssertEqual(stateScopeCount1, 2)
     XCTAssertEqual(viewStoreCount1, 0)
@@ -888,7 +888,7 @@ final class StoreTests: BaseTCATestCase {
     XCTAssertEqual(stateScopeCount2, 2)
     XCTAssertEqual(viewStoreCount2, 0)
     XCTAssertEqual(storeStateCount2, 1)
-    _ = store.send(.tap)
+    store.send(.tap)
     XCTAssertEqual(removeDuplicatesCount1, 0)
     XCTAssertEqual(stateScopeCount1, 3)
     XCTAssertEqual(viewStoreCount1, 0)
@@ -898,7 +898,7 @@ final class StoreTests: BaseTCATestCase {
     XCTAssertEqual(viewStoreCount2, 0)
     XCTAssertEqual(storeStateCount2, 1)
 
-    _ = store.send(.child(.dismiss))
+    store.send(.child(.dismiss))
     _ = (childViewStore1, childViewStore2, childStore1, childStore2)
   }
 }

Tests/ComposableArchitectureTests/TestStoreNonExhaustiveTests.swift

@@ -894,7 +894,8 @@
       XCTTODO(
         """
         This test should pass once we have the concept of "copyable" dependencies.
-        """)
+        """
+      )
 
       let store = TestStore(initialState: Feature.State()) {
         Feature()