Avoid erasing to AnyView in Routed (#2)

* Add debug navigator

* Avoid erasing to AnyView in Routed

* Update documentation

Author: ohitsdaniel

Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture",
         "state": {
           "branch": null,
-          "revision": "b67569f69813140cd9c984db33ee959d9711a008",
-          "version": "0.9.0"
+          "revision": "37c6312ba43ec697063abe5956908db6b71aa68a",
+          "version": "0.11.0"
         }
       }
     ]

Package.swift

@@ -25,7 +25,7 @@ let package = Package(
     .package(
       name: "swift-composable-architecture",
       url: "https://github.com/pointfreeco/swift-composable-architecture",
-      .upToNextMinor(from: "0.11.0")
+      from: "0.7.0"
     ),
   ],
   targets: [

Sources/ComposableNavigator/Navigator/Navigator.swift

@@ -1,13 +1,18 @@
 import Foundation
 
 public struct Navigator {
+  private let _path: () -> [IdentifiedScreen]
   private let _go: (AnyScreen, ScreenID) -> Void
   private let _goBack: (AnyScreen) -> Void
   private let _replace: ([AnyScreen]) -> Void
   private let _dismiss: (ScreenID) -> Void
   private let _dismissSuccessor: (ScreenID) -> Void
   private let _didAppear: (ScreenID) -> Void
 
+  func path() -> [IdentifiedScreen] {
+    _path()
+  }
+
   public func go<S: Screen>(to screen: S, on id: ScreenID) {
     _go(screen.eraseToAnyScreen(), id)
   }
@@ -37,13 +42,15 @@ public struct Navigator {
   }
 
   public init(
+    path: @escaping () -> [IdentifiedScreen],
     go: @escaping (AnyScreen, ScreenID) -> Void,
     goBack: @escaping (AnyScreen) -> Void,
     replace: @escaping ([AnyScreen]) -> Void,
     dismiss: @escaping (ScreenID) -> Void,
     dismissSuccessor: @escaping (ScreenID) -> Void,
     didAppear: @escaping (ScreenID) -> Void
   ) {
+    self._path = path
     self._go = go
     self._goBack = goBack
     self._replace = replace
@@ -53,8 +60,10 @@ public struct Navigator {
   }
 }
 
+// MARK: - Stub
 public extension Navigator {
   static func stub(
+    path: @escaping () -> [IdentifiedScreen] = { fatalError("path() unimplemented in stub. Make sure to wrap your application in a Root view or inject Navigator via .environment(\\.navigator, navigator) for testing purposes.") },
     go: @escaping (AnyScreen, ScreenID) -> Void = { _, _ in fatalError("go(to:) unimplemented in stub. Make sure to wrap your application in a Root view or inject Navigator via .environment(\\.navigator, navigator) for testing purposes.") },
     goBack: @escaping (AnyScreen) -> Void = { _ in fatalError("goBack(to:) unimplemented in stub. Make sure to wrap your application in a Root view or inject Navigator via .environment(\\.navigator, navigator) for testing purposes.") },
     replace: @escaping ([AnyScreen]) -> Void = { _ in fatalError("replace(path:) unimplemented in stub. Make sure to wrap your application in a Root view or inject Navigator via .environment(\\.navigator, navigator) for testing purposes.") },
@@ -63,6 +72,7 @@ public extension Navigator {
     didAppear: @escaping (ScreenID) -> Void = { _ in fatalError("didAppear(id:) unimplemented in stub. Make sure to wrap your application in a Root view or inject Navigator via .environment(\\.navigator, navigator) for testing purposes.") }
   ) -> Navigator {
     Navigator(
+      path: path,
       go: go,
       goBack: goBack,
       replace: replace,
@@ -72,3 +82,42 @@ public extension Navigator {
     )
   }
 }
+
+// MARK: - Debug
+public extension Navigator {
+  func debug() -> Navigator {
+    Navigator(
+      path: path,
+      go: { (screen, id) in
+        _go(screen, id)
+        print("Sent go(to: \(screen), on: \(id)).\nNew path:")
+        dump(path())
+      },
+      goBack: { (predecessor) in
+        _goBack(predecessor)
+        print("Sent goBack(to: \(predecessor)).\nNew path:")
+        dump(path())
+      },
+      replace: { (newPath) in
+        _replace(newPath)
+        print("Sent replace(path: \(newPath)).\nNew path:")
+        dump(path())
+      },
+      dismiss: { (id) in
+        _dismiss(id)
+        print("Sent dismiss(id: \(id)).\nNew path:")
+        dump(path())
+      },
+      dismissSuccessor: { (id) in
+        _dismissSuccessor(id)
+        print("Sent dismissSuccessor(of: \(id)).\nNew path:")
+        dump(path())
+      },
+      didAppear: { (id) in
+        _didAppear(id)
+        print("Sent didAppear(id: \(id)).\nNew path:")
+        dump(path())
+      }
+    )
+  }
+}

Sources/ComposableNavigator/Navigator/NavigatorDataSource+Navigator.swift

@@ -1,6 +1,7 @@
 public extension Navigator {
   init(dataSource: Navigator.Datasource) {
     self.init(
+      path: { dataSource.path },
       go: { screen, id in
         dataSource.go(to: screen, on: id)
       },

Sources/ComposableNavigator/PathBuilder/PathBuilder.swift

@@ -1,11 +1,13 @@
-public struct PathBuilder {
-  private let _buildPath: ([IdentifiedScreen]) -> Routed?
+import SwiftUI
 
-  public init(buildPath: @escaping ([IdentifiedScreen]) -> Routed?) {
+public struct PathBuilder<Content: View> {
+  private let _buildPath: ([IdentifiedScreen]) -> Content?
+
+  public init(buildPath: @escaping ([IdentifiedScreen]) -> Content?) {
     self._buildPath = buildPath
   }
 
-  public func build(path: [IdentifiedScreen]) -> Routed? {
+  public func build(path: [IdentifiedScreen]) -> Content? {
     return _buildPath(path)
   }
 }