feat: API Improvements

CaptureContext · Dec 22, 2023 · 45dda86 · 45dda86
1 parent 844dd5e
commit 45dda86
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ final class MyViewController: UIViewController {
   func bindViewModel() {
     navigationDestination(
       viewModel.publisher(for: \.state.route),
-      switch: destinations { destinations, route in
+      switch: { destinations, route in
         switch route {
         case .details:
           destinations.$detailsController
@@ -110,7 +110,7 @@ final class MyViewController: UIViewController {
   func bindViewModel() {
     navigationStack(
       viewModel.publisher(for: \.state.path),
-      switch: destinations { destinations, route in
+      switch: { destinations, route in
         switch route {
         case .featureA:
           destinations.$featureAControllers

diff --git a/Sources/CombineNavigation/CocoaViewController+API.swift b/Sources/CombineNavigation/CocoaViewController+API.swift
@@ -8,15 +8,16 @@ import FoundationExtensions
 
 // MARK: navigationStack
 
-extension CocoaViewController {
+extension RoutingController {
 	/// Subscribes on publisher of navigation stack state
+	@inlinable
 	public func navigationStack<
 		P: Publisher,
 		C: Collection & Equatable,
 		Route: Hashable
 	>(
 		_ publisher: P,
-		switch destination: @escaping (Route) -> any GrouppedDestinationProtocol<C.Index>,
+		switch destination: @escaping (Destinations, Route) -> any GrouppedDestinationProtocol<C.Index>,
 		onPop: @escaping ([C.Index]) -> Void
 	) -> Cancellable where
 		P.Output == C,
@@ -27,61 +28,13 @@ extension CocoaViewController {
 	{
 		combineNavigationRouter.navigationStack(
 			publisher,
-			switch: destination,
-			onPop: onPop
-		)
-	}
-
-	/// Subscribes on publisher of navigation stack state
-	public func navigationStack<
-		P: Publisher,
-		C: Collection & Equatable,
-		Route: Hashable
-	>(
-		_ publisher: P,
-		switch controller: @escaping (Route, C.Index) -> CocoaViewController,
-		onPop: @escaping ([C.Index]) -> Void
-	) -> Cancellable where
-		P.Output == C,
-		P.Failure == Never,
-		C.Element == Route,
-		C.Index: Hashable,
-		C.Indices: Equatable
-	{
-		combineNavigationRouter.navigationStack(
-			publisher,
-			switch: controller,
-			onPop: onPop
-		)
-	}
-
-	/// Subscribes on publisher of navigation stack state
-	public func navigationStack<
-		P: Publisher,
-		Stack,
-		IDs: Collection & Equatable,
-		Route
-	>(
-		_ publisher: P,
-		ids: @escaping (Stack) -> IDs,
-		route: @escaping (Stack, IDs.Element) -> Route?,
-		switch destination: @escaping (Route) -> any GrouppedDestinationProtocol<IDs.Element>,
-		onPop: @escaping ([IDs.Element]) -> Void
-	) -> Cancellable where
-		P.Output == Stack,
-		P.Failure == Never,
-		IDs.Element: Hashable
-	{
-		combineNavigationRouter.navigationStack(
-			publisher,
-			ids: ids,
-			route: route,
-			switch: destination,
+			switch: destinations(destination),
 			onPop: onPop
 		)
 	}
 
 	/// Subscribes on publisher of navigation stack state
+	@inlinable
 	public func navigationStack<
 		P: Publisher,
 		Stack,
@@ -91,7 +44,7 @@ extension CocoaViewController {
 		_ publisher: P,
 		ids: @escaping (Stack) -> IDs,
 		route: @escaping (Stack, IDs.Element) -> Route?,
-		switch controller: @escaping (Route, IDs.Element) -> CocoaViewController,
+		switch destination: @escaping (Destinations, Route) -> any GrouppedDestinationProtocol<IDs.Element>,
 		onPop: @escaping ([IDs.Element]) -> Void
 	) -> Cancellable where
 		P.Output == Stack,
@@ -102,16 +55,17 @@ extension CocoaViewController {
 			publisher,
 			ids: ids,
 			route: route,
-			switch: controller,
+			switch: destinations(destination),
 			onPop: onPop
 		)
 	}
 }
 
 // MARK: navigationDestination
 
-extension CocoaViewController {
+extension RoutingController {
 	/// Subscribes on publisher of navigation destination state
+	@inlinable
 	public func navigationDestination<P: Publisher>(
 		_ id: AnyHashable,
 		isPresented publisher: P,
@@ -130,27 +84,10 @@ extension CocoaViewController {
 	}
 
 	/// Subscribes on publisher of navigation destination state
-	public func navigationDestination<P: Publisher>(
-		_ id: AnyHashable,
-		isPresented publisher: P,
-		controller: @escaping () -> CocoaViewController,
-		onPop: @escaping () -> Void
-	) -> AnyCancellable where
-		P.Output == Bool,
-		P.Failure == Never
-	{
-		combineNavigationRouter.navigationDestination(
-			id,
-			isPresented: publisher,
-			controller: controller,
-			onPop: onPop
-		)
-	}
-
-	/// Subscribes on publisher of navigation destination state
+	@inlinable
 	public func navigationDestination<P: Publisher, Route>(
 		_ publisher: P,
-		switch destination: @escaping (Route) -> SingleDestinationProtocol,
+		switch destination: @escaping (Destinations, Route) -> SingleDestinationProtocol,
 		onPop: @escaping () -> Void
 	) -> AnyCancellable where
 		Route: Hashable,
@@ -159,26 +96,33 @@ extension CocoaViewController {
 	{
 		combineNavigationRouter.navigationDestination(
 			publisher,
-			switch: destination,
+			switch: destinations(destination),
 			onPop: onPop
 		)
 	}
+}
 
-	/// Subscribes on publisher of navigation destination state
-	public func navigationDestination<P: Publisher, Route>(
-		_ publisher: P,
-		switch controller: @escaping (Route) -> CocoaViewController,
-		onPop: @escaping () -> Void
-	) -> AnyCancellable where
-		Route: Hashable,
-		P.Output == Route?,
-		P.Failure == Never
-	{
-		combineNavigationRouter.navigationDestination(
-			publisher,
-			switch: controller,
-			onPop: onPop
-		)
+// MARK: - Internal helpers
+
+extension RoutingController {
+	@usableFromInline
+	internal func destinations<Route>(
+		_ mapping: @escaping (Destinations, Route) -> SingleDestinationProtocol
+	) -> (Route) -> SingleDestinationProtocol {
+		let destinations = _makeDestinations()
+		return { route in
+			mapping(destinations, route)
+		}
+	}
+
+	@usableFromInline
+	internal func destinations<Route, DestinationID: Hashable>(
+		_ mapping: @escaping (Destinations, Route) -> any GrouppedDestinationProtocol<DestinationID>
+	) -> (Route) -> any GrouppedDestinationProtocol<DestinationID> {
+		let destinations = _makeDestinations()
+		return { route in
+			mapping(destinations, route)
+		}
 	}
 }
 #endif
diff --git a/Sources/CombineNavigation/Internal/CombineNavigationRouter.swift b/Sources/CombineNavigation/Internal/CombineNavigationRouter.swift
@@ -5,23 +5,28 @@ import Combine
 import FoundationExtensions
 
 extension CocoaViewController {
-	var combineNavigationRouter: CombineNavigationRouter {
+	@usableFromInline
+	internal var combineNavigationRouter: CombineNavigationRouter {
 		getAssociatedObject(forKey: #function) ?? {
 			let router = CombineNavigationRouter(self)
 			setAssociatedObject(router, forKey: #function)
 			return router
 		}()
 	}
 
+	@inlinable
 	public func addRoutedChild(_ controller: CocoaViewController) {
 		combineNavigationRouter.addChild(controller.combineNavigationRouter)
 		addChild(controller)
 	}
 }
 
 extension CombineNavigationRouter {
+	@usableFromInline
 	class NavigationRoute: Identifiable {
+		@usableFromInline
 		let id: AnyHashable
+
 		let routingControllerID: ObjectIdentifier
 		private(set) var routedControllerID: ObjectIdentifier?
 		private let controller: () -> CocoaViewController?
@@ -50,6 +55,7 @@ extension CombineNavigationRouter {
 	}
 }
 
+@usableFromInline
 final class CombineNavigationRouter: Weakifiable {
 	fileprivate weak var parent: CombineNavigationRouter?
 	fileprivate weak var node: CocoaViewController!
@@ -67,7 +73,8 @@ final class CombineNavigationRouter: Weakifiable {
 		self.node = node
 	}
 
-	fileprivate func addChild(_ router: CombineNavigationRouter) {
+	@usableFromInline
+	internal func addChild(_ router: CombineNavigationRouter) {
 		router.parent = self
 		directChildren.removeAll(where: { $0.object === router })
 		directChildren.append(.init(router))

diff --git a/Sources/CombineNavigation/RoutingController.swift b/Sources/CombineNavigation/RoutingController.swift
@@ -5,26 +5,4 @@ public protocol RoutingController: CocoaViewController {
 	associatedtype Destinations
 	func _makeDestinations() -> Destinations
 }
-
-extension RoutingController {
-	@inlinable
-	public func destinations<Route>(
-		_ mapping: @escaping (Destinations, Route) -> SingleDestinationProtocol
-	) -> (Route) -> SingleDestinationProtocol {
-		let destinations = _makeDestinations()
-		return { route in
-			mapping(destinations, route)
-		}
-	}
-
-	@inlinable
-	public func destinations<Route, DestinationID: Hashable>(
-		_ mapping: @escaping (Destinations, Route) -> any GrouppedDestinationProtocol<DestinationID>
-	) -> (Route) -> any GrouppedDestinationProtocol<DestinationID> {
-		let destinations = _makeDestinations()
-		return { route in
-			mapping(destinations, route)
-		}
-	}
-}
 #endif
diff --git a/Tests/CombineNavigationTests/NavigationAnimationTests.swift b/Tests/CombineNavigationTests/NavigationAnimationTests.swift
@@ -213,7 +213,7 @@ fileprivate class TreeViewController: CocoaViewController {
 	func bind<P: Publisher<TreeViewModel.State, Never>>(_ publisher: P) {
 		navigationDestination(
 			publisher.map(\.destination?.tag).removeDuplicates(),
-			switch: destinations { destinations, route in
+			switch: { destinations, route in
 				switch route {
 				case .orderDetail:
 					destinations.$orderDetailController

diff --git a/Tests/CombineNavigationTests/RoutingControllerStackTests.swift b/Tests/CombineNavigationTests/RoutingControllerStackTests.swift
@@ -189,7 +189,7 @@ fileprivate class StackViewController: CocoaViewController {
 	func bind<P: Publisher<StackViewModel.State, Never>>(_ publisher: P) {
 		navigationStack(
 			publisher.map(\.path).map { $0.map(\.tag) }.removeDuplicates(),
-			switch: destinations { destinations, route in
+			switch: { destinations, route in
 				switch route {
 				case .orderDetail:
 					destinations.$orderDetailControllers

diff --git a/Tests/CombineNavigationTests/RoutingControllerTests.swift b/Tests/CombineNavigationTests/RoutingControllerTests.swift
@@ -174,7 +174,7 @@ fileprivate class TreeViewController: CocoaViewController {
 
 		navigationDestination(
 			publisher.map(\.destination?.tag).removeDuplicates(),
-			switch: destinations { destinations, route in
+			switch: { destinations, route in
 				switch route {
 				case .tree:
 					destinations.$treeController
@@ -306,12 +306,12 @@ fileprivate class StackViewController: CocoaViewController {
 
 		navigationStack(
 			publisher.map(\.path).map { $0.map(\.tag) }.removeDuplicates(),
-			switch: destinations { destination, route in
+			switch: { destinations, route in
 				switch route {
 				case .tree:
-					destination.$treeControllers
+					destinations.$treeControllers
 				case .stack:
-					destination.$stackControllers
+					destinations.$stackControllers
 				}
 			},
 			onPop: capture { _self, indices in
@@ -320,5 +320,6 @@ fileprivate class StackViewController: CocoaViewController {
 		)
 		.store(in: &cancellables)
 	}
+
 }
 #endif
diff --git a/Tests/CombineNavigationTests/RoutingControllerTreeTests.swift b/Tests/CombineNavigationTests/RoutingControllerTreeTests.swift
@@ -105,7 +105,7 @@ fileprivate class TreeViewController: CocoaViewController {
 	func bind<P: Publisher<TreeViewModel.State, Never>>(_ publisher: P) {
 		navigationDestination(
 			publisher.map(\.destination?.tag).removeDuplicates(),
-			switch: destinations { destinations, route in
+			switch: { destinations, route in
 				switch route {
 				case .orderDetail:
 					destinations.$orderDetailController