Merge pull request #21 from PureSwift/feature/bridge

Bridge the evaluation core to the Compose interpreter

Author: colemancda

Demo/App.swiftpm/Sources/App.swift

@@ -1,20 +1,32 @@
 #if canImport(AndroidSwiftUI)
 import AndroidSwiftUI
-import AndroidKit
 #else
 import SwiftUI
 #endif
 
 // The gallery screens are restored alongside the view types they exercise as the
-// Compose-backed renderer is built up; until then this is a bare launch point.
+// Compose-backed renderer is built up.
+
+struct ContentView: View {
+
+    @State private var count = 0
+
+    var body: some View {
+        VStack(spacing: 12) {
+            Text("Count: \(count)")
+            Button("Increment") { count += 1 }
+            Toggle("Feature flag", isOn: .constant(true))
+        }
+    }
+}
 
 #if canImport(AndroidSwiftUI)
 
 /// App launch point, called from `MainActivity`.
 @_silgen_name("AndroidSwiftUIMain")
 func AndroidSwiftUIMain() {
-    let log = try! JavaClass<AndroidUtil.Log>()
-    _ = log.v("DemoApp", "Starting SwiftUI App")
+    AndroidSwiftUILog("Starting SwiftUI App")
+    AndroidSwiftUIApp.run(ContentView())
 }
 
 #else
@@ -24,7 +36,7 @@ struct DemoApp: App {
 
     var body: some Scene {
         WindowGroup {
-            Text("Demo")
+            ContentView()
         }
     }
 }

Demo/app/build.gradle.kts

@@ -67,6 +67,7 @@ android {
 }
 
 dependencies {
+    implementation(project(":swiftui"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)

Demo/desktop/build.gradle.kts

@@ -14,11 +14,24 @@ kotlin {
             implementation(compose.desktop.currentOs)
             implementation(compose.material3)
         }
+        jvmTest.dependencies {
+            implementation(kotlin("test"))
+            implementation(compose.desktop.uiTestJUnit4)
+        }
     }
 }
 
+// Absolute path to the Swift-built dylib; the loader loads its sibling
+// libSwiftJava.dylib first (JNI_OnLoad lives there).
+val swiftLibrary = rootDir.resolve("../.build/arm64-apple-macosx/debug/libSwiftUIDesktopDemo.dylib").canonicalPath
+
+tasks.withType<Test>().configureEach {
+    systemProperty("swiftui.library", swiftLibrary)
+}
+
 compose.desktop {
     application {
         mainClass = "com.pureswift.swiftui.desktop.MainKt"
+        jvmArgs += "-Dswiftui.library=$swiftLibrary"
     }
 }

Demo/desktop/src/jvmMain/kotlin/com/pureswift/swiftui/desktop/Main.kt

@@ -64,16 +64,35 @@ object Fixtures {
     )
 }
 
-fun main() = application {
-    Window(onCloseRequest = ::exitApplication, title = "AndroidSwiftUI desktop rig") {
-        MaterialTheme {
-            Surface {
-                RigContent()
+fun main() {
+    val live = SwiftRuntime.load()
+    application {
+        Window(onCloseRequest = ::exitApplication, title = "AndroidSwiftUI desktop rig") {
+            MaterialTheme {
+                Surface {
+                    if (live) {
+                        LiveContent()
+                    } else {
+                        RigContent()
+                    }
+                }
             }
         }
     }
 }
 
+/// Live mode: the Swift dylib evaluates its root view and drives the store.
+@Composable
+private fun LiveContent() {
+    val store = remember {
+        TreeStore().also {
+            com.pureswift.swiftui.SwiftBridge.sink = com.pureswift.swiftui.SwiftCallbackSink()
+            SwiftRuntime().start(it)
+        }
+    }
+    store.root?.let { Render(it) }
+}
+
 @Composable
 private fun RigContent() {
     val store = remember { TreeStore() }

Demo/desktop/src/jvmMain/kotlin/com/pureswift/swiftui/desktop/SwiftRuntime.kt

@@ -0,0 +1,29 @@
+package com.pureswift.swiftui.desktop
+
+import com.pureswift.swiftui.TreeStore
+
+// Entry point into the Swift dylib on the desktop JVM. Loading the library
+// fires swift-java's JNI_OnLoad; `start` hands Swift the tree store, and the
+// Swift side evaluates its root view and drives the store from then on.
+class SwiftRuntime {
+
+    external fun start(store: TreeStore)
+
+    companion object {
+
+        /// Loads the Swift libraries from `-Dswiftui.library=<absolute path>`.
+        /// swift-java's `JNI_OnLoad` lives in libSwiftJava, and the JVM only
+        /// fires it for explicitly loaded libraries — so the runtime library
+        /// (sibling `libSwiftJava.dylib`) loads first, then the app library.
+        /// Returns false (rig falls back to fixtures) when not configured.
+        fun load(): Boolean {
+            val path = System.getProperty("swiftui.library") ?: return false
+            val runtime = java.io.File(java.io.File(path).parentFile, "libSwiftJava.dylib")
+            if (runtime.exists()) {
+                System.load(runtime.absolutePath)
+            }
+            System.load(path)
+            return true
+        }
+    }
+}

Demo/desktop/src/jvmTest/kotlin/com/pureswift/swiftui/desktop/BridgeTests.kt

@@ -0,0 +1,47 @@
+package com.pureswift.swiftui.desktop
+
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import com.pureswift.swiftui.Render
+import com.pureswift.swiftui.SwiftBridge
+import com.pureswift.swiftui.SwiftCallbackSink
+import com.pureswift.swiftui.TreeStore
+import org.junit.Assume.assumeTrue
+import org.junit.Rule
+import org.junit.Test
+
+/// The end-to-end bridge test: native Swift evaluates the view tree, JNI
+/// materializes it into Kotlin nodes, Compose renders it, a click dispatches
+/// back into Swift, Swift re-evaluates, and the UI shows the new state.
+/// Runs headless on the host JVM — no emulator, no window.
+class BridgeTests {
+
+    @get:Rule
+    val compose = createComposeRule()
+
+    @Test
+    fun counterRoundTripAcrossTheBridge() {
+        assumeTrue("swiftui.library not set — bridge test skipped", SwiftRuntime.load())
+
+        val store = TreeStore()
+        SwiftBridge.sink = SwiftCallbackSink()
+        SwiftRuntime().start(store)
+
+        compose.setContent {
+            store.root?.let { Render(it) }
+        }
+
+        // initial tree evaluated in Swift
+        compose.onNodeWithText("Count: 0").assertIsDisplayed()
+
+        // Compose click → JNI → Swift @State write → re-evaluate → new tree
+        compose.onNodeWithText("Increment").performClick()
+        compose.onNodeWithText("Count: 1").assertIsDisplayed()
+
+        // and again, proving the callback registry survives re-registration
+        compose.onNodeWithText("Increment").performClick()
+        compose.onNodeWithText("Count: 2").assertIsDisplayed()
+    }
+}

Demo/swiftui/build.gradle.kts

@@ -28,6 +28,15 @@ kotlin {
             implementation(compose.material3)
             implementation(libs.kotlinx.serialization.json)
         }
+        // `external fun` is JVM-only; both targets are JVM, so the bridge's
+        // Swift-implemented classes live in a source set they share.
+        val jvmShared by creating {
+            dependsOn(commonMain.get())
+        }
+        androidMain.get().dependsOn(jvmShared)
+        val desktopMain by getting {
+            dependsOn(jvmShared)
+        }
         val desktopTest by getting {
             dependencies {
                 implementation(kotlin("test"))

Demo/swiftui/src/androidMain/kotlin/com/pureswift/swiftui/SwiftUIHostView.kt

@@ -0,0 +1,32 @@
+package com.pureswift.swiftui
+
+import android.content.Context
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.ui.platform.ComposeView
+
+// The Android host: one Compose island rendering the whole Swift-evaluated
+// tree. Swift constructs this, hands its store to the bridge runtime, and
+// installs it as the activity's content view.
+class SwiftUIHostView(context: Context) : FrameLayout(context) {
+
+    val store = TreeStore()
+
+    init {
+        SwiftBridge.sink = SwiftCallbackSink()
+        val composeView = ComposeView(context)
+        composeView.setContent {
+            MaterialTheme {
+                Surface {
+                    store.root?.let { Render(it) }
+                }
+            }
+        }
+        addView(
+            composeView,
+            ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
+        )
+    }
+}

Demo/swiftui/src/commonMain/kotlin/com/pureswift/swiftui/ViewNode.kt

@@ -2,10 +2,12 @@ package com.pureswift.swiftui
 
 import androidx.compose.runtime.Immutable
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.longOrNull
 
 /// One entry in a node's ordered modifier chain. Order is significant: the
@@ -39,6 +41,33 @@ data class ViewNode(
     val itemProviderId: Long? = null,
 ) {
 
+    /// Bridge constructor: the Swift materializer builds nodes through this,
+    /// crossing JNI with flat arrays (one call per node, arrays as single
+    /// arguments). Prop and modifier-arg values arrive as JSON literals
+    /// ("\"text\"", "42", "true"), keeping the typed JsonObject model without
+    /// per-field JNI calls. Negative count/provider mean "absent".
+    constructor(
+        type: String,
+        id: String,
+        propKeys: Array<String>,
+        propValues: Array<String>,
+        modifierKinds: Array<String>,
+        modifierArgs: Array<String>,
+        children: Array<ViewNode>,
+        count: Int,
+        itemProviderId: Long,
+    ) : this(
+        type = type,
+        id = id,
+        props = JsonObject(propKeys.indices.associate { propKeys[it] to Json.parseToJsonElement(propValues[it]) }),
+        modifiers = modifierKinds.indices.map {
+            ModifierNode(modifierKinds[it], Json.parseToJsonElement(modifierArgs[it]).jsonObject)
+        },
+        children = children.toList(),
+        count = if (count >= 0) count else null,
+        itemProviderId = if (itemProviderId >= 0) itemProviderId else null,
+    )
+
     // Typed prop accessors used by the interpreter.
 
     fun string(key: String): String? = (props[key] as? JsonPrimitive)?.content

Demo/swiftui/src/jvmShared/kotlin/com/pureswift/swiftui/SwiftCallbackSink.kt

@@ -0,0 +1,19 @@
+package com.pureswift.swiftui
+
+// The entire Kotlin→Swift bridge surface: five externals dispatching event
+// callback ids into the Swift registry. The JNI symbol for each derives from
+// the SWIFT @JavaImplementation signature — these declarations and the Swift
+// counterparts in SwiftCallbackSink.swift must stay exactly in sync, and this
+// class must never grow per-view methods.
+class SwiftCallbackSink : CallbackSink {
+
+    external override fun invokeVoid(id: Long)
+
+    external override fun invokeBool(id: Long, value: Boolean)
+
+    external override fun invokeDouble(id: Long, value: Double)
+
+    external override fun invokeInt(id: Long, value: Int)
+
+    external override fun invokeString(id: Long, value: String)
+}