Fix build for Swift 6

Author: carson-katri

Sources/LiveViewNative/Coordinators/LiveSessionCoordinator.swift

@@ -118,8 +118,8 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
                         try await prev.last?.coordinator.disconnect()
                         let liveChannel = try! await self.liveSocket!.joinLiveviewChannel(
                             .some([
-                                "_format": .str(string: Self.platform),
-                                "_interface": Self.platformParams
+                                "_format": .str(string: LiveSessionParameters.platform),
+                                "_interface": .object(object: LiveSessionParameters.platformParams)
                             ]),
                             next.last!.url.absoluteString
                         )
@@ -130,8 +130,8 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
                         try await prev.last?.coordinator.disconnect()
                         let liveChannel = try! await self.liveSocket!.joinLiveviewChannel(
                             .some([
-                                "_format": .str(string: Self.platform),
-                                "_interface": Self.platformParams
+                                "_format": .str(string: LiveSessionParameters.platform),
+                                "_interface": .object(object: LiveSessionParameters.platformParams)
                             ]),
                             next.last!.url.absoluteString
                         )
@@ -195,15 +195,15 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
         let liveChannel = try! await self.liveSocket!.joinLiveviewChannel(
             .some([
                 "_format": .str(string: LiveSessionParameters.platform),
-                "_interface": LiveSessionParameters.platformParams
+                "_interface": .object(object: LiveSessionParameters.platformParams)
             ]),
             nil
         )
 
         self.rootLayout = self.liveSocket!.deadRender()
         let styleURLs = self.liveSocket!.styleUrls()
 
-        self.stylesheet = try! await withThrowingTaskGroup(of: Stylesheet<R>.self) { group in
+        self.stylesheet = try! await withThrowingTaskGroup(of: Stylesheet<R>.self) { @Sendable group in
             for style in styleURLs {
                 guard let url = await URL(string: style, relativeTo: self.url)
                 else { continue }
@@ -216,7 +216,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
             }
 
             return try await group.reduce(Stylesheet<R>(content: [], classes: [:])) { result, next in
-                return result.merge(with: next)
+                return await result.merge(with: next)
             }
         }
 
@@ -233,7 +233,7 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
     func bindLiveReloadListener() {
         let eventListener = self.liveReloadChannel!.channel().eventStream()
         self.liveReloadListener = eventListener
-        self.liveReloadListenerLoop = Task { [weak self] in
+        self.liveReloadListenerLoop = Task { @MainActor [weak self] in
             for try await event in eventListener {
                 guard let self else { return }
                 switch event.event {
@@ -349,8 +349,8 @@ public class LiveSessionCoordinator<R: RootRegistry>: ObservableObject {
 @MainActor
 enum LiveSessionParameters {
     static var platform: String { "swiftui" }
-    static var platformParams: LiveViewNativeCore.Json {
-        .object(object: [
+    static var platformParams: [String:LiveViewNativeCore.Json] {
+        [
             "app_version": .str(string: getAppVersion()),
             "app_build": .str(string: getAppBuild()),
             "bundle_id": .str(string: getBundleID()),
@@ -359,7 +359,7 @@ enum LiveSessionParameters {
             "target": .str(string: getTarget()),
             "l10n": getLocalization(),
             "i18n": getInternationalization()
-        ])
+        ]
     }
 
     private static func getAppVersion() -> String {
@@ -454,11 +454,11 @@ enum LiveSessionParameters {
         /// Create a nested structure of query items.
         ///
         /// `_root[key][nested_key]=value`
-        func queryParameters(for object: [String:Any]) -> [(name: String, value: String?)] {
+        func queryParameters(for object: [String:Json]) -> [(name: String, value: String?)] {
             object.reduce(into: [(name: String, value: String?)]()) { (result, pair) in
                 if let value = pair.value as? String {
                     result.append((name: "[\(pair.key)]", value: value))
-                } else if let nested = pair.value as? [String:Any] {
+                } else if case let .object(nested) = pair.value {
                     result.append(contentsOf: queryParameters(for: nested).map {
                         return (name: "[\(pair.key)]\($0.name)", value: $0.value)
                     })

Sources/LiveViewNative/Coordinators/LiveViewCoordinator.swift

@@ -289,7 +289,7 @@ public class LiveViewCoordinator<R: RootRegistry>: ObservableObject {
         let channel = liveChannel.channel()
         self.channel = channel
 
-        statusListenerLoop = Task { [weak self] in
+        statusListenerLoop = Task { @MainActor [weak self] in
             for try await status in channel.statusStream() {
                 guard let self else { return }
                 self.internalState = switch status {

Sources/LiveViewNative/ViewModel.swift

@@ -64,6 +64,7 @@ public class FormModel: ObservableObject, CustomDebugStringConvertible {
     }
 
     @_spi(LiveForm) public func updateFromElement(_ element: ElementNode, submitAction: @escaping () -> ()) {
+        let pushEventImpl = pushEventImpl!
         self.changeEvent = element.attributeValue(for: .init(name: "phx-change")).flatMap({ event in
             { value in
                 Task {
@@ -161,7 +162,7 @@ public class FormModel: ObservableObject, CustomDebugStringConvertible {
         _ = try await pushEventImpl("form", event, try buildFormQuery(), nil)
     }
 
-    public var debugDescription: String {
+    public nonisolated var debugDescription: String {
         return "FormModel(element: #\(elementID), id: \(ObjectIdentifier(self))"
     }
 

Sources/LiveViewNative/__CoreExtensions.swift

@@ -8,6 +8,19 @@
 import LiveViewNativeCore
 import Foundation
 
+extension LiveViewNativeCore.ChannelStatus: @unchecked Sendable {}
+extension LiveViewNativeCore.PhoenixEvent: @unchecked Sendable {}
+extension LiveViewNativeCore.Event: @unchecked Sendable {}
+extension LiveViewNativeCore.Json: @unchecked Sendable {}
+extension LiveViewNativeCore.Payload: @unchecked Sendable {}
+extension LiveViewNativeCore.EventPayload: @unchecked Sendable {}
+
+extension LiveViewNativeCore.LiveChannel: @unchecked Sendable {}
+extension LiveViewNativeCore.LiveSocket: @unchecked Sendable {}
+
+extension LiveViewNativeCore.Events: @unchecked Sendable {}
+extension LiveViewNativeCore.ChannelStatuses: @unchecked Sendable {}
+
 extension Node: Identifiable {
     public var id: NodeRef {
         self.id()
@@ -767,6 +780,11 @@ private extension __JsonEncoder {
 
             // We can pop because the closure encoded something.
             return self.storage.popReference()
+        @unknown default:
+            try with(path: codingPath + (additionalKey.map({ [$0] }) ?? [])) {
+                try date.encode(to: self)
+            }
+            return self.storage.popReference()
         }
     }
 
@@ -814,6 +832,23 @@ private extension __JsonEncoder {
             }
 
             // We can pop because the closure encoded something.
+            return self.storage.popReference()
+        @unknown default:
+            let depth = self.storage.count
+            do {
+                try with(path: codingPath + (additionalKey.map({ [$0] }) ?? [])) {
+                    try data.encode(to: self)
+                }
+            } catch {
+                // If the value pushed a container before throwing, pop it back off to restore state.
+                // This shouldn't be possible for Data (which encodes as an array of bytes), but it can't hurt to catch a failure.
+                if self.storage.count > depth {
+                    let _ = self.storage.popReference()
+                }
+
+                throw error
+            }
+
             return self.storage.popReference()
         }
     }
@@ -1220,6 +1255,10 @@ extension __JsonDecoder {
             return try with(value: value, path: codingPath + (additionalKey.map({ [$0] }) ?? [])) {
                 try closure(self)
             }
+        @unknown default:
+            return try with(value: value, path: codingPath + (additionalKey.map({ [$0] }) ?? [])) {
+                try Date(from: self)
+            }
         }
     }
 
@@ -1243,6 +1282,10 @@ extension __JsonDecoder {
             return try with(value: value, path: codingPath + (additionalKey.map({ [$0] }) ?? [])) {
                 try closure(self)
             }
+        @unknown default:
+            return try with(value: value, path: codingPath + (additionalKey.map({ [$0] }) ?? [])) {
+                try Data(from: self)
+            }
         }
     }