peachsim 0.1.939 → 0.1.1399

package/kotlin/fixtures/import-values/ImportValues.native.tsx

@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react'
+import { Text, View } from 'react-native'
+import { Values } from './Values.kt'
+
+const input = JSON.stringify({
+  items: [{ name: 'Kotlin' }, ['hello', 7, true, null]],
+  metadata: { source: 'One' },
+})
+
+export default function Index() {
+  const [result, setResult] = useState('running')
+  const [error, setError] = useState('')
+  useEffect(() => {
+    void Promise.all([
+      Values.read(input),
+      Values.failures(),
+      Values.nested({ first: [1, 2], second: [] }),
+      Values.nullable(null),
+      Values.nullable('hello'),
+      Values.nullableList([null, 'one', '', null]),
+      Values.nullableList([]),
+      Values.nullableMap({ first: [1, null, 3], empty: [] }),
+      Values.nullableMap({}),
+    ])
+      .then((values) => setResult(JSON.stringify(values)))
+      .catch((reason: unknown) => setError(String(reason)))
+  }, [])
+  return (
+    <View style={{ flex: 1, backgroundColor: '#fff', padding: 24, paddingTop: 80 }}>
+      <Text style={{ fontSize: 24 }}>Kotlin imported values</Text>
+      <Text testID="import-values-result">{result}</Text>
+      <Text testID="import-values-error">{error}</Text>
+    </View>
+  )
+}

package/kotlin/fixtures/import-values/README.md

@@ -0,0 +1,23 @@
+# Imported Kotlin values
+
+This fixture exercises a real `OneModule` through the same `.kt` import on
+Android and in Peach. Its visible result contains nested map/list round trips,
+nullable strings and collection elements, 14 JSON reads and 17 expected Android
+JSON errors. The nine results include null elements, empty lists, nested nullable
+map values and an empty map, so declaration errors cannot hide behind a scalar
+call that happens to work.
+
+Run One from this directory with `bunx one dev --port 8081`. Open that server in Peach with
+`peach open <port> --device pixel-8`, or generate Android with `bunx one prebuild --platform android` and build
+`android/` with `./gradlew assembleDebug`.
+Use the repository's remote builder for Android compilation. The module uses
+Android's own `org.json` on device and Peach's Kotlin implementation in Wasm.
+
+The `import-values-result` node starts as `running`, then contains the complete
+JSON result. `import-values-error` must stay empty. Compare parsed results
+between hosts, including error messages, nulls and empty collections.
+
+For Contrast, import these project files with their catalog dependency versions
+materialized. Its Android native bundle producer compiles `Values.kt`, publishes
+the generated Wasm and registers the module contract before calling methods.
+A successful bundle alone does not establish runtime acceptance.

package/kotlin/fixtures/import-values/Values.d.kt.ts

@@ -0,0 +1,11 @@
+// generated by one typegen; edits will be replaced
+export declare const Values: {
+  nested(values: Record<string, number[]>): Promise<Record<string, number[]>>
+  nullable(value: string | null): Promise<string | null>
+  nullableList(values: (string | null)[]): Promise<(string | null)[]>
+  nullableMap(
+    values: Record<string, (number | null)[]>,
+  ): Promise<Record<string, (number | null)[]>>
+  read(input: string): Promise<string[]>
+  failures(): Promise<string[]>
+}

package/kotlin/fixtures/import-values/Values.kt

@@ -0,0 +1,66 @@
+package dev.contrast.kotlinimports
+
+import dev.onejs.one.source.OneModule
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+
+object Values : OneModule {
+    fun nested(values: Map<String, List<Int>>): Map<String, List<Int>> = values
+
+    fun nullable(value: String?): String? = value
+
+    fun nullableList(values: List<String?>): List<String?> = values
+
+    fun nullableMap(values: Map<String, List<Int?>>): Map<String, List<Int?>> = values
+
+    fun read(input: String): List<String> {
+        val document = JSONObject(input)
+        val items = document.getJSONArray("items")
+        val child = items.getJSONObject(0)
+        val nested = items.getJSONArray(1)
+        return listOf(
+            child.getString("name"),
+            nested.getString(0),
+            nested.getString(1),
+            nested.getString(2),
+            nested.getString(3),
+            document.getJSONObject("metadata").getString("source"),
+            (document.optJSONArray("items") === items).toString(),
+            (items.optJSONObject(0) === child).toString(),
+            (items.optJSONArray(1) === nested).toString(),
+            (document.optJSONObject("metadata") != null).toString(),
+            (document.optJSONObject("items") == null).toString(),
+            (document.optJSONArray("missing") == null).toString(),
+            (items.optJSONObject(-1) == null).toString(),
+            (items.optJSONArray(20) == null).toString(),
+        )
+    }
+
+    fun failures(): List<String> {
+        val document = JSONObject("""{"text":"hello","number":7,"decimal":1.0,"flag":false,"nothing":null,"items":[],"child":{}}""")
+        val values = JSONArray("""["hello",7,1.0,false,null,[],{}]""")
+        val reads: List<() -> Any> = listOf(
+            { document.getJSONArray("text") },
+            { document.getJSONObject("number") },
+            { document.getJSONArray("decimal") },
+            { document.getJSONObject("flag") },
+            { document.getJSONArray("nothing") },
+            { document.getJSONObject("items") },
+            { document.getJSONArray("child") },
+            { document.getJSONObject("missing") },
+            { values.getJSONArray(0) },
+            { values.getJSONObject(1) },
+            { values.getJSONArray(2) },
+            { values.getJSONObject(3) },
+            { values.getJSONArray(4) },
+            { values.getJSONObject(5) },
+            { values.getJSONArray(6) },
+            { values.getString(20) },
+            { JSONArray().put(null).getString(0) },
+        )
+        return reads.map { read ->
+            try { read(); "unexpected success" } catch (error: JSONException) { error.message ?: "missing error message" }
+        }
+    }
+}

package/kotlin/fixtures/import-values/app/_layout.tsx

@@ -0,0 +1,4 @@
+import { Slot } from 'one'
+export default function Layout() {
+  return <Slot />
+}

package/kotlin/fixtures/import-values/app/index+spa.tsx

@@ -0,0 +1 @@
+export { default } from '../ImportValues.native'

package/kotlin/fixtures/import-values/package.json

@@ -0,0 +1,23 @@
+{
+  "name": "peach-kotlin-import-values-fixture",
+  "private": true,
+  "type": "module",
+  "targets": [
+    "native"
+  ],
+  "dependencies": {
+    "@react-navigation/core": "catalog:",
+    "@react-navigation/native": "catalog:",
+    "one": "catalog:",
+    "react": "catalog:",
+    "react-native": "catalog:",
+    "react-native-reanimated": "catalog:",
+    "react-native-screens": "catalog:",
+    "react-native-worklets": "catalog:"
+  },
+  "devDependencies": {
+    "@react-native-community/template": "catalog:",
+    "peachsim": "workspace:*",
+    "vite": "catalog:"
+  }
+}

package/kotlin/fixtures/import-values/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "~/*": ["./*"]
+    },
+    "strict": true,
+    "allowArbitraryExtensions": true,
+    "rootDir": ".",
+    "module": "Preserve",
+    // allows react-native style imports without path extensions, for compat with platform-specific files
+    "moduleResolution": "Bundler",
+    "preserveSymlinks": true,
+    "skipLibCheck": true,
+    "jsx": "react-jsx",
+    "noImplicitAny": false,
+    "types": ["node", "react", "vite/client"],
+    "lib": ["dom", "esnext"]
+  },
+  "exclude": ["node_modules", "**/test", "**/dist", "**/types", "**/__tests__"]
+}

package/kotlin/fixtures/import-values/vite.config.ts

@@ -0,0 +1,20 @@
+import { one } from 'one/vite'
+import { peachPlugin } from 'peachsim/vite'
+export default {
+  root: import.meta.dirname,
+  plugins: [
+    one({
+      web: { defaultRenderMode: 'spa' },
+      native: {
+        bundler: 'vite',
+        app: {
+          name: 'KotlinImports',
+          scheme: 'kotlinimports',
+          android: { applicationId: 'dev.contrast.kotlinimports' },
+        },
+      },
+    }),
+    peachPlugin(),
+  ],
+  server: { host: '0.0.0.0' },
+}

package/kotlin/fixtures/kotlin-app-variants/BarBehavior.kt

@@ -0,0 +1,38 @@
+package dev.contrast.kotlinapp
+
+import android.view.WindowInsetsController
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+@Composable
+internal fun BarBehavior(controller: WindowInsetsController) {
+    var behavior by remember { mutableIntStateOf(controller.systemBarsBehavior) }
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Text("Behavior: $behavior")
+        Button(onClick = {
+            controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            behavior = controller.systemBarsBehavior
+        }) { Text("Transient bars") }
+        Button(onClick = {
+            controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_DEFAULT
+            behavior = controller.systemBarsBehavior
+        }) { Text("Default bars") }
+    }
+}

package/kotlin/fixtures/kotlin-app-variants/BarVisibility.kt

@@ -0,0 +1,36 @@
+package dev.contrast.kotlinapp
+
+import android.view.WindowInsetsController
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+
+@Composable
+internal fun BarVisibility(controller: WindowInsetsController) {
+    val density = LocalDensity.current
+    val status = WindowInsets.statusBars.getTop(density)
+    val navigation = WindowInsets.navigationBars.getBottom(density)
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Text("Bars: status $status navigation $navigation")
+        Button(onClick = { controller.hide(android.view.WindowInsets.Type.statusBars()) }) { Text("Hide status") }
+        Button(onClick = { controller.hide(android.view.WindowInsets.Type.navigationBars()) }) { Text("Hide navigation") }
+        Button(onClick = { controller.show(android.view.WindowInsets.Type.statusBars()) }) { Text("Show status") }
+        Button(onClick = { controller.show(android.view.WindowInsets.Type.navigationBars()) }) { Text("Show navigation") }
+    }
+}

package/kotlin/fixtures/kotlin-app-variants/Ime.kt

@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.isImeVisible
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.OutlinedTextField
@@ -31,6 +32,7 @@ fun Ime() {
     var height by remember { mutableStateOf(0) }
     var tallest by remember { mutableStateOf(0) }
     val shown = WindowInsets.ime.getBottom(LocalDensity.current) > 0
+    val visible = WindowInsets.isImeVisible
     Column(
         Modifier.fillMaxSize()
             .onSizeChanged { height = it.height; tallest = maxOf(tallest, it.height) }
@@ -38,7 +40,7 @@ fun Ime() {
             .safeDrawingPadding()
             .padding(16.dp),
     ) {
-        Text("Ime: ${if (shown) "shown" else "hidden"} lifted ${height < tallest}")
+        Text("Ime: ${if (shown) "shown" else "hidden"} visible $visible lifted ${height < tallest}")
         OutlinedTextField(
             value = note,
             onValueChange = { note = it },

package/kotlin/fixtures/kotlin-app-variants/TransientInsets.kt

@@ -0,0 +1,50 @@
+package dev.contrast.kotlinapp
+
+import android.view.WindowInsetsController
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+
+@Composable
+internal fun TransientInsets(controller: WindowInsetsController) {
+    val density = LocalDensity.current
+    val statusBars = WindowInsets.statusBars
+    val top = statusBars.getTop(density)
+    var armed by remember { mutableStateOf(false) }
+    var peak by remember { mutableIntStateOf(0) }
+    LaunchedEffect(statusBars, density) {
+        controller.systemBarsBehavior = WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        snapshotFlow { statusBars.getTop(density) }.collect { value ->
+            if (armed) peak = maxOf(peak, value)
+        }
+    }
+    Column(
+        Modifier.fillMaxSize().background(Color(0xFFE8EEF8)).safeDrawingPadding().padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        Text("Status: $top Peak: $peak")
+        Button(onClick = {
+            controller.hide(android.view.WindowInsets.Type.statusBars())
+            armed = true
+        }) { Text("Hide status") }
+    }
+}

package/kotlin/fork/NOTICE

@@ -28,12 +28,17 @@ React Native tenants do not expose. The Compose patch also formats UTC
 timestamps at UTC, uses the Android
 DefaultNavTransitions expressions in the web actual, and initializes the
 Compose paint stroke join to Miter to agree with Skia and Android.
-The built klibs are ui-wasm-js, ui-text-wasm-js, ui-skiko-wasm-js and
+The Compose patch also uses Android click and system-defined touch focus, keeping sibling controls from taking an active text field.
+Dialog.skiko.kt and PlatformContext.skiko.kt attach distinct native dialog windows and dispatchers.
+The built klibs are foundation-wasm-js, ui-wasm-js, ui-text-wasm-js, ui-skiko-wasm-js and
 material3-wasm-js 1.13.0-alpha01, navigation-compose-wasm-js 2.10.0-beta01,
 and skiko-wasm-js 0.152.0-alpha02 compiled from the patched sources.
 skiko-wasm-0.152.0-alpha02.jar contains that worker-safe loader and
 Skiko's own wasm runtime.
 
+LinkSkikoTask.kt sorts object paths before linking to remove filesystem order
+from the Wasm binary; library order retains upstream symbol resolution.
+
 The Compose patch also selects integer static glyph advances on Android and
 scales letter spacing to the integer shaping size, retaining fractional Animated
 text. skia-android-shaping.patch truncates only the measurement-font copy for

package/kotlin/fork/README.md

@@ -9,6 +9,8 @@ Android behavior for the approved web differences and static text shaping below.
 
 | module | file | native host binding |
 | --- | --- | --- |
+| Compose `foundation` and `ui` | `RequestFocusOnClick.web.kt`, `Focusability.web.kt` | Android click and touch focus policy keeps sibling controls from taking a text field’s focus |
+| Compose `ui` | `Dialog.skiko.kt`, `PlatformContext.skiko.kt` | distinct Dialog window and navigation dispatcher isolate Back from the activity |
 | Compose `ui` | `Actuals.wasm.kt` | clock reads `globalThis.performance.now()` |
 | Compose `ui` | `PlatformClipboard.web.kt` | worker-safe secure-context and clipboard reads |
 | Compose `ui` | `SystemTheme.kt` | `LocalSystemTheme` visible to the host, which provides the device's night mode |
@@ -18,13 +20,14 @@ Android behavior for the approved web differences and static text shaping below.
 | Skia shaper | `SkShaper_harfbuzz.cpp` | measurement-font copy truncates static shaping size; the painted run font retains the requested size |
 | Skia raster | `SkFontHost_FreeType.cpp`, `SkFontHost_FreeType_common.cpp`, `SkSurface.cpp` | Android implicit autohinting policy and text gamma 1.4, contrast 0 |
 | Skia paragraph | `Run.cpp`, `TextLine.cpp`, `TextWrapper.cpp`, `DartTypes.h` | Android inter-glyph spacing, caret boundaries, edge trimming before line fits and integer center origins |
-| Compose `ui-skiko` | `SkikoParagraphIntrinsics.nonAndroid.kt`, `SkikoParagraph.nonAndroid.kt`, `SkikoParagraphBuilder.nonAndroid.kt` | Android letter-spacing intrinsic padding, centered line bounds and explicit center alignment |
+| Compose `ui-skiko` | `SkikoParagraphIntrinsics.nonAndroid.kt`, `SkikoParagraph.nonAndroid.kt`, `SkikoParagraphBuilder.nonAndroid.kt` | Android letter-spacing intrinsic padding, centered line bounds, explicit center alignment and fitting BoringLayout line extents |
 | Skiko paragraph | `Alignment.kt` | transports the Android center ordinal without changing existing alignments |
 | Compose `material3` | `PlatformDateFormat.web.kt` | timestamp formatting uses UTC, as Android does |
 | Navigation `navigation-compose` | `DefaultNavTransitions.web.kt` | Android forward fades and predictive pop defaults |
 | Skiko | `OsArch.web.kt` | explicit `setHostOsProvider`; its default lazily retains upstream OS detection |
 | Skiko | `Actuals.web.kt` | nanosecond clock reads `globalThis.performance.now()` |
 | Skiko loader build | `OptimizeSkikoWasmTask.kt` | script directory reads `import.meta.url`, without `self.location` |
+| Skiko linker | `LinkSkikoTask.kt` | object paths sort before linking; library order retains its symbol resolution contract |
 
 The Compose host installs the locale provider once before any scene, from the
 same device locale it passes to `PlatformContext`, and installs `OS.Android`
@@ -38,7 +41,10 @@ Every changed upstream file carries a modification notice. `LICENSE` and
 runtime jar with the upstream Gradle builds on the Linux builder. The Skia shaping, paragraph and raster
 units are fetched at their pinned commit, patched, and compiled into Skiko; the linker
 uses them instead of the same units in the pinned Skia archive. All other Skia
-objects retain their upstream build. FreeType headers match the pinned Skia DEPS revision;
+objects retain their upstream build. The linker sorts object paths, so filesystem
+enumeration does not change the Wasm binary. Static archives retain their declared
+order because that order controls symbol resolution. Sorting costs once per link,
+outside app runtime. FreeType headers match the pinned Skia DEPS revision;
 the FreeType binary remains the archive version. Raster changes add no allocation
 and retain the existing A8 preblend path. This adds no allocation beyond the existing
 measurement-font copy, and truncates once per shaped font, outside the glyph loop.
@@ -46,8 +52,10 @@ Paragraph spacing adds constant arithmetic per glyph or cluster; line fits trim
 the same edge half-spaces as completed lines, without allocation. Android centered
 lines use the platform integer origin; other platforms retain fractional centering.
 Intrinsic measurement checks span letter spacing once and adds Android’s 0.5 px
-padding; line bounds use the platform floor and ceil. These corrections add no
-allocation. Skiko builds before Compose, whose `skiko-wasm-js` dependency resolves
+padding; line bounds use the platform floor and ceil. Fitting Android BoringLayout
+paragraphs expose the ceiled paragraph extent while preserving fractional glyph
+positions, including Animated text. Eligibility is scanned once per intrinsic
+construction. These corrections add no allocation. Skiko builds before Compose, whose `skiko-wasm-js` dependency resolves
 from this invocation’s Maven directory through `skiko-local.init.gradle`. The init
 script travels in the immutable build record with the patches.
 
@@ -83,6 +91,6 @@ fixture. The six original widths, twelve spacing assertions and the 162/164 px
 wrapping threshold pass their paired Android controls. The body Range probe
 retains its existing 0.00098 px difference. The original plain Month raster rows pass the strict 16/255 comparison in
 the actual Kotlin app; the old frame fails the retained raster check. Other
-pixel residuals, mixed-font bold
-advances, the primary caret at a style boundary and Animated whole-width rounding
-remain open in the lane plan. These corrections do not certify full text parity.
+pixel residuals remain open in the lane plan. The original Animated motion widths
+match Android, and the retained mixed-font/caret controls pass after the extent
+correction. These corrections do not certify full text parity.

package/kotlin/fork/build.sh

@@ -155,6 +155,7 @@ checkout 0
     -Pjetbrains.publication.version.COMPOSE_MATERIAL3=1.13.0-alpha01 \
     -Pjetbrains.publication.version.NAVIGATION=2.10.0-beta01 \
     :compose:ui:ui:publishWasmJsPublicationToMavenLocal \
+    :compose:foundation:foundation:publishWasmJsPublicationToMavenLocal \
     :compose:ui:ui-text:publishWasmJsPublicationToMavenLocal \
     :compose:ui:ui-skiko:publishWasmJsPublicationToMavenLocal \
     :compose:material3:material3:publishWasmJsPublicationToMavenLocal \
@@ -162,6 +163,7 @@ checkout 0
 )
 
 cp "${M2}/org/jetbrains/compose/ui/ui-wasm-js/1.13.0-alpha01/ui-wasm-js-1.13.0-alpha01.klib" \
+  "${M2}/org/jetbrains/compose/foundation/foundation-wasm-js/1.13.0-alpha01/foundation-wasm-js-1.13.0-alpha01.klib" \
   "${M2}/org/jetbrains/compose/ui/ui-text-wasm-js/1.13.0-alpha01/ui-text-wasm-js-1.13.0-alpha01.klib" \
   "${M2}/org/jetbrains/compose/ui/ui-skiko-wasm-js/1.13.0-alpha01/ui-skiko-wasm-js-1.13.0-alpha01.klib" \
   "${M2}/org/jetbrains/compose/material3/material3-wasm-js/1.13.0-alpha01/material3-wasm-js-1.13.0-alpha01.klib" \