Merge branch 'main' into user-agent-prefix

* main:
  Set session's path config from the global path config.
  Consolidate all global config by moving it in app delegate.
  Add utility func to load path config to the Hotwire enum.
  Move `matchQueryStrings` to `PathConfiguration`.
  Move `registerBridgeComponents` to `AppDelegate`.

Demo/AppDelegate.swift

@@ -4,13 +4,7 @@ import UIKit
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        Hotwire.config.backButtonDisplayMode = .minimal
-        Hotwire.config.showDoneButtonOnModals = true
-
-        #if DEBUG
-        Hotwire.config.debugLoggingEnabled = true
-        #endif
-
+        configureHotwire()
         return true
     }
 
@@ -19,4 +13,25 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
         UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
     }
+
+    private func configureHotwire() {
+        // Load the path configuration
+        Hotwire.loadPathConfiguration(from: [
+            .file(Bundle.main.url(forResource: "path-configuration", withExtension: "json")!)
+        ])
+
+        // Register bridge components
+        Hotwire.registerBridgeComponents([
+            FormComponent.self,
+            MenuComponent.self,
+            OverflowMenuComponent.self,
+        ])
+
+        // Set configuration options
+        Hotwire.config.backButtonDisplayMode = .minimal
+        Hotwire.config.showDoneButtonOnModals = true
+#if DEBUG
+        Hotwire.config.debugLoggingEnabled = true
+#endif
+    }
 }

Demo/SceneController.swift

@@ -7,54 +7,24 @@ final class SceneController: UIResponder {
     var window: UIWindow?
 
     private let rootURL = Demo.current
-    private lazy var navigator = Navigator(pathConfiguration: pathConfiguration, delegate: self)
-
-    // MARK: - Setup
-
-    private func configureBridge() {
-        // TODO: Move to AppDelegate when PR #55 is merged.
-        // https://github.com/hotwired/hotwire-native-ios/pull/55/files
-        Hotwire.config.applicationUserAgentPrefix = "Hotwire Demo;"
-
-        Hotwire.registerBridgeComponents([
-            FormComponent.self,
-            MenuComponent.self,
-            OverflowMenuComponent.self,
-        ])
-    }
-
-    private func configureRootViewController() {
-        guard let window = window else {
-            fatalError()
-        }
-
-        window.rootViewController = navigator.rootViewController
-    }
+    private lazy var navigator = Navigator(delegate: self)
 
     // MARK: - Authentication
 
     private func promptForAuthentication() {
         let authURL = rootURL.appendingPathComponent("/signin")
         navigator.route(authURL)
     }
-
-    // MARK: - Path Configuration
-
-    private lazy var pathConfiguration = PathConfiguration(sources: [
-        .file(Bundle.main.url(forResource: "path-configuration", withExtension: "json")!),
-    ])
 }
 
 extension SceneController: UIWindowSceneDelegate {
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = scene as? UIWindowScene else { return }
 
         window = UIWindow(windowScene: windowScene)
+        window?.rootViewController = navigator.rootViewController
         window?.makeKeyAndVisible()
 
-        configureBridge()
-        configureRootViewController()
-
         navigator.route(rootURL)
     }
 }

Source/Hotwire.swift

@@ -18,5 +18,14 @@ public enum Hotwire {
         }
     }
 
+
+    /// Loads the `PathConfiguration` JSON file(s) from the provided sources
+    /// to configure navigation rules
+    /// - Parameter sources: An array of `PathConfiguration.Source` objects representing
+    ///   the sources to load.
+    public static func loadPathConfiguration(from sources: [PathConfiguration.Source]) {
+        config.pathConfiguration.sources = sources
+    }
+
     static var bridgeComponentTypes = [BridgeComponent.Type]()
 }

Source/HotwireConfig.swift

@@ -87,11 +87,3 @@ public struct HotwireConfig {
         return configuration
     }
 }
-
-public extension HotwireConfig {
-    class PathConfiguration {
-        /// Enable to include the query string (in addition to the path) when applying rules.
-        /// Disable to only consider the path when applying rules.
-        public var matchQueryStrings = true
-    }
-}

Source/Turbo/Navigator/Navigator.swift

@@ -33,14 +33,13 @@ public class Navigator {
 
     /// Convenience initializer that doesn't require manually creating `Session` instances.
     /// - Parameters:
-    ///   - pathConfiguration: _optional:_ remote configuration reference
     ///   - delegate: _optional:_ delegate to handle custom view controllers
-    public convenience init(pathConfiguration: PathConfiguration? = nil, delegate: NavigatorDelegate? = nil) {
+    public convenience init(delegate: NavigatorDelegate? = nil) {
         let session = Session(webView: Hotwire.config.makeWebView())
-        session.pathConfiguration = pathConfiguration
+        session.pathConfiguration = Hotwire.config.pathConfiguration
 
         let modalSession = Session(webView: Hotwire.config.makeWebView())
-        modalSession.pathConfiguration = pathConfiguration
+        modalSession.pathConfiguration = Hotwire.config.pathConfiguration
 
         self.init(session: session, modalSession: modalSession, delegate: delegate)
     }

Source/Turbo/Path Configuration/PathConfiguration.swift

@@ -20,6 +20,10 @@ public struct PathConfigurationLoaderOptions {
 public final class PathConfiguration {
     public weak var delegate: PathConfigurationDelegate?
 
+    /// Enable to include the query string (in addition to the path) when applying rules.
+    /// Disable to only consider the path when applying rules.
+    public var matchQueryStrings = true
+
     /// Returns top-level settings: `{ settings: {} }`
     public private(set) var settings: [String: AnyHashable] = [:]