Fallback on Group for unknown Views

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -26,13 +26,13 @@ let package = Package(
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"),
         .package(url: "https://github.com/davidstump/SwiftPhoenixClient.git", .upToNextMinor(from: "5.3.2")),
-        .package(url: "https://github.com/apple/swift-async-algorithms", from: "0.1.0"),
-        .package(url: "https://github.com/liveview-native/liveview-native-core-swift.git", exact: "0.2.1"),
+        .package(url: "https://github.com/apple/swift-async-algorithms", from: "1.0.0"),
+        .package(url: "https://github.com/liveview-native/liveview-native-core", exact: "0.4.0-alpha-11"),
 
-        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.2"),
+        .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
         .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.2.0"),
 
-        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "509.0.2"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.1"),
 
         .package(url: "https://github.com/pointfreeco/swift-parsing", from: "0.13.0"),
     ],
@@ -45,7 +45,7 @@ let package = Package(
                 "SwiftSoup",
                 "SwiftPhoenixClient",
                 .product(name: "AsyncAlgorithms", package: "swift-async-algorithms"),
-                .product(name: "LiveViewNativeCore", package: "liveview-native-core-swift"),
+                .product(name: "LiveViewNativeCore", package: "liveview-native-core"),
                 "LiveViewNativeMacros",
                 "LiveViewNativeStylesheet"
             ],
@@ -146,7 +146,7 @@ let package = Package(
             name: "LiveViewNativeStylesheet",
             dependencies: [
                 "LiveViewNativeStylesheetMacros",
-                .product(name: "LiveViewNativeCore", package: "liveview-native-core-swift"),
+                .product(name: "LiveViewNativeCore", package: "liveview-native-core"),
                 .product(name: "Parsing", package: "swift-parsing"),
             ]
         ),

Plugins/BuiltinRegistryGeneratorPlugin/BuiltinRegistryGeneratorPlugin.swift

@@ -11,32 +11,36 @@ import Foundation
 @main
 struct BuiltinRegistryGeneratorPlugin: BuildToolPlugin {
     func createBuildCommands(context: PluginContext, target: Target) async throws -> [Command] {
-        guard let target = target as? SourceModuleTarget else { return [] }
+        guard let target = target as? SwiftSourceModuleTarget else { return [] }
         let tool = try context.tool(named: "BuiltinRegistryGenerator")
-        let output = context.pluginWorkDirectory.appending("BuiltinRegistry+Views.swift")
+        let output = context.pluginWorkDirectoryURL.appending(path: "BuiltinRegistry+Views.swift")
         let viewFiles = target.sourceFiles
-            .filter({ $0.path.string.starts(with: target.directory.appending("Views").string) })
+            .filter({ $0.url.pathComponents.starts(with: target.directoryURL.appending(path: "Views").pathComponents) })
             .filter({ $0.type == .source })
-            .map(\.path)
+            .map(\.url)
         let modifierFiles = target.sourceFiles
-            .filter({ $0.path.string.hasSuffix("_GeneratedModifiers.swift") })
+            .filter({ $0.url.lastPathComponent == "_GeneratedModifiers.swift" })
             .filter({ $0.type == .source })
-            .map(\.path)
+            .map(\.url)
+        let arguments: [String] = [target.directoryURL.path(percentEncoded: false), output.path(percentEncoded: false)] +
+        viewFiles
+            .reduce(into: [String]()) { partialResult, url in
+                partialResult.append("--view")
+                partialResult.append(url.path(percentEncoded: false))
+            }
+        + modifierFiles
+        .reduce(into: [String]()) { partialResult, url in
+            partialResult.append("--modifier")
+            partialResult.append(url.path(percentEncoded: false))
+        }
+        print(viewFiles)
+        print(modifierFiles)
+        print(arguments)
         return [
             .buildCommand(
                 displayName: tool.name,
-                executable: tool.path,
-                arguments: [target.directory.string, output.string] +
-                    viewFiles
-                        .reduce(into: [String]()) { partialResult, path in
-                            partialResult.append("--view")
-                            partialResult.append(path.string)
-                        }
-                    + modifierFiles
-                    .reduce(into: [String]()) { partialResult, path in
-                        partialResult.append("--modifier")
-                        partialResult.append(path.string)
-                    },
+                executable: tool.url,
+                arguments: arguments,
                 environment: [:],
                 inputFiles: viewFiles + modifierFiles,
                 outputFiles: [output]

Plugins/DocumentationExtensionGeneratorPlugin/DocumentationExtensionGeneratorPlugin.swift

@@ -5,19 +5,19 @@ import Foundation
 struct DocumentationExtensionGeneratorPlugin: CommandPlugin {
     func performCommand(context: PluginContext, arguments: [String]) throws {
         let process = Process()
-        process.executableURL = URL(fileURLWithPath: try context.tool(named: "DocumentationExtensionGenerator").path.string)
+        process.executableURL = try context.tool(named: "DocumentationExtensionGenerator").url
 
-        let target = context.package.targets.first(where: { $0.name == "LiveViewNative" })! as! SourceModuleTarget
+        let target = context.package.targets.first(where: { $0.name == "LiveViewNative" })! as! SwiftSourceModuleTarget
         let viewFiles = target.sourceFiles
-            .filter({ $0.path.string.starts(with: target.directory.appending("Views").string) })
+            .filter({ $0.url.pathComponents.starts(with: target.directoryURL.appending(path: "Views").pathComponents) })
             .filter({ $0.type == .source })
-            .map(\.path)
+            .map(\.url)
 
         process.arguments = arguments
             + viewFiles
-                .reduce(into: [String]()) { partialResult, path in
+                .reduce(into: [String]()) { partialResult, url in
                     partialResult.append("--view")
-                    partialResult.append(path.string)
+                    partialResult.append(url.path())
                 }
 
         try process.run()

Sources/BuiltinRegistryGenerator/BuiltinRegistryGenerator.swift

@@ -43,7 +43,9 @@ struct BuiltinRegistryGenerator: ParsableCommand {
         "RoundedRectangle": "Shape<R, RoundedRectangle>(shape: RoundedRectangle(from: element))",
         "Color": "ColorView<R>()",
         "Image": "ImageView<R>()",
-        "phx-main": "PhxMain<R>()"
+
+        // FIXME: The server should send a platform-specific tag name, or core should have the ability to split the dead render from the main app.
+        "div": "PhxMain<R>()"
     ]
 
     var platformFamilyName: String? {
@@ -66,6 +68,9 @@ struct BuiltinRegistryGenerator: ParsableCommand {
         let generated = """
         import SwiftUI
         import LiveViewNativeStylesheet
+        import OSLog
+
+        private let logger = Logger(subsystem: "LiveViewNative", category: "BuiltinRegistry") 
 
         // This switch can't be inlined into BuiltinRegistry.lookup because it results in that method's return type
         // being a massive pile of nested _ConditionalContents. Instead, lift it out into a separate View type
@@ -80,7 +85,8 @@ struct BuiltinRegistryGenerator: ParsableCommand {
         \(Self.additionalViews.map(additionalViewCase(name:initializer:)).joined(separator: "\n"))
                 default:
                     // log here that view type cannot be found
-                    EmptyView()
+                    let _ = logger.error("'<\\(name)>' is not a known element.")
+                    Group<R>()
                 }
             }
         }

Sources/LiveViewNative/BuiltinRegistry+applyBinding.swift

@@ -17,6 +17,7 @@ public enum _EventBinding: String {
 }
 
 extension BuiltinRegistry {
+    @MainActor
     @ViewBuilder
     static func applyBinding(
         _ binding: _EventBinding,

Sources/LiveViewNative/Coordinators/LiveConnectionError.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import SwiftPhoenixClient
+@preconcurrency import SwiftPhoenixClient
 
 /// An error that occurred when connecting to a live view.
 public enum LiveConnectionError: Error, LocalizedError {
@@ -43,7 +43,7 @@ public enum LiveConnectionError: Error, LocalizedError {
         }
     }
 
-    public enum InitialParseComponent: CustomStringConvertible {
+    public enum InitialParseComponent: CustomStringConvertible, Sendable {
         case document
         case csrfToken
         case phxMain

Sources/LiveViewNative/Coordinators/LiveSessionConfiguration.swift

@@ -51,10 +51,10 @@ public struct LiveSessionConfiguration {
         self.reconnectBehavior = reconnectBehavior
     }
 
-    public struct ReconnectBehavior {
-        let delay: ((_ tries: Int) -> TimeInterval)?
+    public struct ReconnectBehavior: Sendable {
+        let delay: (@Sendable (_ tries: Int) -> TimeInterval)?
 
-        public init(_ delay: @escaping (_ tries: Int) -> TimeInterval) {
+        public init(_ delay: @escaping @Sendable (_ tries: Int) -> TimeInterval) {
             self.delay = delay
         }