vxrn 2.13.10 → 2.14.1

package/expo-plugin.cjs

@@ -898,11 +898,24 @@ extern void OneSwiftRegisterPackage(const char *name, int (*entry)(int, char **)
         return nextConfig
       },
     ],
+    [
+      withGradleProperties,
+      (nextConfig) => {
+        // MainActivity opts into androidx edge-to-edge; this tells react
+        // native the window is edge-to-edge on every api level.
+        const properties = nextConfig.modResults.filter(
+          (item) => !(item.type === 'property' && item.key === 'edgeToEdgeEnabled')
+        )
+        properties.push({ type: 'property', key: 'edgeToEdgeEnabled', value: 'true' })
+        nextConfig.modResults = properties
+        return nextConfig
+      },
+    ],
     [
       withMainActivity,
       (nextConfig) => {
-        const contents = nativeProjectPatches.addReactNativeScreensFix(
-          nextConfig.modResults.contents
+        const contents = nativeProjectPatches.enableEdgeToEdgeInMainActivity(
+          nativeProjectPatches.addReactNativeScreensFix(nextConfig.modResults.contents)
         )
         nextConfig.modResults.contents = options.holdLaunchScreen
           ? nativeProjectPatches.holdLaunchScreenInMainActivity(contents)

package/native-project-patches.cjs

@@ -704,6 +704,47 @@ function addReactNativeScreensFix(input) {
   return input
 }
 
+// edge-to-edge status bars follow the system appearance: AppCompat's DayNight
+// theme leaves the status bar icon style at its white default, so every One
+// android activity opts into androidx edge-to-edge like a native app. runs
+// after addReactNativeScreensFix, which guarantees onCreate exists.
+const EDGE_TO_EDGE_KT_IMPORT = 'import androidx.activity.enableEdgeToEdge'
+const EDGE_TO_EDGE_JAVA_IMPORT = 'import androidx.activity.EdgeToEdge;'
+
+function enableEdgeToEdgeInMainActivity(mainActivity) {
+  if (
+    mainActivity.includes(EDGE_TO_EDGE_KT_IMPORT) ||
+    mainActivity.includes(EDGE_TO_EDGE_JAVA_IMPORT)
+  ) {
+    return mainActivity
+  }
+  const isKotlin = mainActivity.includes('class MainActivity : ReactActivity()')
+  if (isKotlin) {
+    if (!SUPER_ON_CREATE.test(mainActivity)) {
+      throw new Error(
+        '[vxrn] MainActivity.kt changed shape: cannot enable edge-to-edge before super.onCreate'
+      )
+    }
+    return mainActivity
+      .replace(/package\s+[\w.]+/, '$&\n' + EDGE_TO_EDGE_KT_IMPORT)
+      .replace(
+        SUPER_ON_CREATE,
+        '$1// [vxrn/one] status bar icons follow the system appearance\n$1enableEdgeToEdge()\n$1super.onCreate(null)'
+      )
+  }
+  if (!/^([ \t]*)super\.onCreate\(savedInstanceState\);$/m.test(mainActivity)) {
+    throw new Error(
+      '[vxrn] MainActivity.java changed shape: cannot enable edge-to-edge before super.onCreate'
+    )
+  }
+  return mainActivity
+    .replace(/package\s+[\w.]+;/, '$&\n' + EDGE_TO_EDGE_JAVA_IMPORT)
+    .replace(
+      /^([ \t]*)super\.onCreate\(savedInstanceState\);$/m,
+      '$1// [vxrn/one] status bar icons follow the system appearance\n$1EdgeToEdge.enable(this);\n$1super.onCreate(savedInstanceState);'
+    )
+}
+
 /**
  * swift packages in the app (a directory with Package.swift whose view a
  * react native screen imports) are generated by prebuild as one local pod each
@@ -849,4 +890,5 @@ module.exports = {
   replaceAppBuildGradleReactBlock,
   addDepsPatchToAppBuildGradle,
   addReactNativeScreensFix,
+  enableEdgeToEdgeInMainActivity,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxrn",
-  "version": "2.13.10",
+  "version": "2.14.1",
   "sideEffects": false,
   "type": "module",
   "exports": {
@@ -80,14 +80,14 @@
     "@react-native-community/cli": "^20.2.0",
     "@react-native-community/cli-config": "^20.2.0",
     "@react-native/dev-middleware": "^0.88.0",
-    "@vxrn/compiler": "2.13.10",
-    "@vxrn/debug": "2.13.10",
-    "@vxrn/query-string": "2.13.10",
-    "@vxrn/resolve": "2.13.10",
-    "@vxrn/url-parse": "2.13.10",
-    "@vxrn/utils": "2.13.10",
-    "@vxrn/vendor": "2.13.10",
-    "@vxrn/vite-flow": "2.13.10",
+    "@vxrn/compiler": "2.14.1",
+    "@vxrn/debug": "2.14.1",
+    "@vxrn/query-string": "2.14.1",
+    "@vxrn/resolve": "2.14.1",
+    "@vxrn/url-parse": "2.14.1",
+    "@vxrn/utils": "2.14.1",
+    "@vxrn/vendor": "2.14.1",
+    "@vxrn/vite-flow": "2.14.1",
     "citty": "^0.1.6",
     "dotenv": "^17.2.1",
     "dotenv-expand": "^12.0.2",
@@ -121,20 +121,20 @@
     "react-native": "0.88.0",
     "typescript": "7.0.2",
     "vitest": "^4.1.0",
-    "@vxrn/vite-plugin-metro": "2.13.10"
+    "@vxrn/vite-plugin-metro": "2.14.1"
   },
   "publishConfig": {
     "access": "public"
   },
   "peerDependencies": {
-    "@vxrn/vite-plugin-metro": "2.13.10"
+    "@vxrn/vite-plugin-metro": "2.14.1"
   },
   "peerDependenciesMeta": {
     "@vxrn/vite-plugin-metro": {
       "optional": true
     }
   },
-  "releaseSourceCommit": "10ae059cc30ab9f70a12d9711ba8346d596d61d2",
+  "releaseSourceCommit": "e780d1ad0bdf938d0e21a5cdff99a0cc78184030",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/onejs/one.git",

package/src/exports/expoPlugin.test.mjs

@@ -131,6 +131,37 @@ class MainActivity : ReactActivity() {
     expect(result).toContain('RNScreensFragmentFactory')
     expect(result).toContain('super.onCreate(null)')
   })
+
+  it('enables edge-to-edge in MainActivity', () => {
+    const kotlin = patches.enableEdgeToEdgeInMainActivity(
+      patches.addReactNativeScreensFix(`
+package dev.one.test
+import com.facebook.react.ReactActivity
+class MainActivity : ReactActivity() {
+}
+`)
+    )
+
+    expect(kotlin).toContain('import androidx.activity.enableEdgeToEdge')
+    expect(kotlin).toContain('enableEdgeToEdge()')
+    expect(kotlin.indexOf('enableEdgeToEdge()')).toBeLessThan(
+      kotlin.indexOf('super.onCreate(null)')
+    )
+    expect(patches.enableEdgeToEdgeInMainActivity(kotlin)).toBe(kotlin)
+
+    const java = patches.enableEdgeToEdgeInMainActivity(
+      patches.addReactNativeScreensFix(`
+package dev.one.test;
+import com.facebook.react.ReactActivity;
+public class MainActivity extends ReactActivity {
+}
+`)
+    )
+
+    expect(java).toContain('import androidx.activity.EdgeToEdge;')
+    expect(java).toContain('EdgeToEdge.enable(this);')
+    expect(patches.enableEdgeToEdgeInMainActivity(java)).toBe(java)
+  })
 })
 
 function expoProject() {
@@ -282,6 +313,27 @@ describe('vxrn/expo-plugin', () => {
     })
   })
 
+  it('writes edgeToEdgeEnabled to gradle.properties', async () => {
+    const projectRoot = expoProject()
+    const config = withVxrn({
+      name: 'TestApp',
+      slug: 'test-app',
+      _internal: { projectRoot },
+    })
+    const properties = (
+      await config.mods.android.gradleProperties({
+        ...config,
+        modRequest: { projectRoot, introspect: false, projectName: 'TestApp' },
+        modResults: [{ type: 'property', key: 'hermesEnabled', value: 'true' }],
+      })
+    ).modResults
+    expect(properties).toContainEqual({
+      type: 'property',
+      key: 'edgeToEdgeEnabled',
+      value: 'true',
+    })
+  })
+
   it('resolves Expo config plugins from the app and binds the dangerous mod', async () => {
     const projectRoot = expoProject()
     const iosRoot = join(projectRoot, 'ios')

package/src/exports/prebuildWithoutExpo.test.ts

@@ -820,6 +820,24 @@ extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autoli
     )
   })
 
+  it('writes edgeToEdgeEnabled to gradle.properties', () => {
+    const props = renderPrebuildFile({
+      relativePath: 'gradle.properties',
+      content: 'hermesEnabled=true',
+      platform: 'android',
+      app,
+    })
+    expect(props.content).toContain('edgeToEdgeEnabled=true')
+
+    const twice = renderPrebuildFile({
+      relativePath: 'gradle.properties',
+      content: props.content,
+      platform: 'android',
+      app,
+    })
+    expect(twice.content).toBe(props.content)
+  })
+
   it('omits notification entries when notifications is unset', () => {
     const bare = { ...app, notifications: undefined }
     const infoPlist = renderPrebuildFile({

package/src/exports/prebuildWithoutExpo.ts

@@ -69,6 +69,7 @@ type NativeProjectPatches = {
   replaceAppBuildGradleReactBlock(input: string): string
   addDepsPatchToAppBuildGradle(input: string): string
   addReactNativeScreensFix(input: string): string
+  enableEdgeToEdgeInMainActivity(mainActivity: string): string
 }
 
 const requireVxrn = module.createRequire(import.meta.url)
@@ -2511,6 +2512,17 @@ ${schemes.map((scheme) => `\t\t\t\t<string>${scheme}</string>`).join('\n')}
         rendered = `${trailed}\n# One.UI.Map: set by native.app.android.googleMapsApiKey.\n${line}\n`
       }
     }
+    if (platform === 'android' && relativePath === 'gradle.properties') {
+      // MainActivity opts into androidx edge-to-edge; this tells react
+      // native the window is edge-to-edge on every api level, so its
+      // status bar paths skip the legacy decorFitsSystemWindows route that
+      // would undo it on android 14 and older.
+      const line = 'edgeToEdgeEnabled=true'
+      if (!rendered.includes(line)) {
+        const trailed = rendered.endsWith('\n') ? rendered : `${rendered}\n`
+        rendered = `${trailed}\n# Edge-to-edge: set by one prebuild to match enableEdgeToEdge in MainActivity.\n${line}\n`
+      }
+    }
     if (
       platform === 'android' &&
       relativePath === 'app/src/main/res/values/styles.xml' &&
@@ -3250,11 +3262,16 @@ export function applyAndroidDependencyPatches(args: {
     'MainActivity.kt'
   )
   const rendered = nativeProjectPatches.holdLaunchScreenInMainActivity(
-    nativeProjectPatches.addReactNativeScreensFix(readFileSync(activityPath, 'utf8'))
+    nativeProjectPatches.enableEdgeToEdgeInMainActivity(
+      nativeProjectPatches.addReactNativeScreensFix(readFileSync(activityPath, 'utf8'))
+    )
   )
   if (!rendered.includes('RNScreensFragmentFactory')) {
     throw new Error('[vxrn] failed to apply the react-native-screens activity patch')
   }
+  if (!rendered.includes('enableEdgeToEdge')) {
+    throw new Error('[vxrn] failed to apply the edge-to-edge activity patch')
+  }
   writeFileSync(activityPath, rendered)
 }
 

package/src/utils/nativeSourceContract.test.ts

@@ -132,7 +132,9 @@ fun helper(x: Int) = x`
     ])
     const glue = renderKotlinSourceGlue('K_counter', contract).source
     expect(glue).toContain('class OneNativeSourceViews_K_counter: OneNativeSourceViewDispatch')
-    expect(glue).toContain('onPick = if (props.optBoolean("onPick")) ({ a0 -> emit("onPick"')
+    expect(glue).toContain('val reader = OneJsonReader_K_counter(propsJson)')
+    expect(glue).not.toContain('JSONObject(propsJson)')
+    expect(glue).toContain('onPick = if (h.hasOnPick) ({ a0 -> emit("onPick"')
     expect(() =>
       nativeSourceContract('/app/native/Bad.kt', '@Composable\nfun Bad(count: Int = 1) {}')
     ).toThrow(/Bad\.kt:2:.*may only default to null/)
@@ -141,6 +143,51 @@ fun helper(x: Int) = x`
     ).toThrow(/must return Unit/)
   })
 
+  it('decodes keyed change documents into held view state', () => {
+    const contract = nativeSourceContract(
+      '/app/native/Counter.kt',
+      `package app.counter
+data class Row(val id: Int, val title: String)
+@Composable
+fun Counter(rows: List<Row>, tick: Int, note: String? = null, onTap: () -> Unit, onPick: ((Int) -> Unit)? = null, modifier: Modifier = Modifier) {
+  Text("x")
+}`
+    )
+    const glue = renderKotlinSourceGlue('K_counter', contract).source
+    // decode runs at prop commit, render reads the held props: a change whose
+    // base the host no longer holds refuses (false) instead of rendering stale
+    expect(glue).toContain('fun apply(view: String, propsJson: String, state: OneNativeSourceKeyedState): Boolean')
+    expect(glue).toContain('fun Content(view: String, state: OneNativeSourceKeyedState, emit: (String, String) -> Unit)')
+    expect(glue).toContain('private class HeldCounter_K_counter {')
+    expect(glue).toContain('var rows: List<app.counter.Row>? = null')
+    expect(glue).toContain('var tick: Int = 0')
+    expect(glue).toContain('var hasOnPick: Boolean = false')
+    expect(glue).toContain('reader.selectName("\\$seq", "\\$base", "\\$lists", "rows", "tick", "note", "onTap", "onPick")')
+    expect(glue).toContain('if (hasBase && !hasSeq) error("seq: required")')
+    expect(glue).toContain('if (sawLists && !hasBase) error("lists: needs a change document")')
+    expect(glue).toContain('state.views["Counter"]')
+    expect(glue).toContain('state.seq = seq')
+    expect(glue).toContain('if (seq == state.seq) return true')
+    expect(glue).toContain('return false')
+    expect(glue).toContain('state.revision++')
+    expect(glue).toContain('val revision = state.revision')
+    expect(glue).toContain('private fun mergeListsCounterRows(reader: OneJsonReader_K_counter, old: List<app.counter.Row>?, prop: String): List<app.counter.Row>? {')
+    expect(glue).toContain('val current = old ?: return null')
+    expect(glue).toContain('var rowsMergeFailed = false')
+    expect(glue).toContain('if (mergedRows == null) rowsMergeFailed = true else rows = mergedRows')
+    expect(glue).toContain('if (rowsMergeFailed) error("lists.rows: cannot merge")')
+    expect(glue).toContain('lists.$prop: needs length')
+    expect(glue).toContain('lists.$prop: set out of order')
+    expect(glue).not.toContain('no held list')
+    expect(glue).not.toContain('missing index')
+    expect(glue).toContain('val si = readInt(itemReader, itemPath); if (!itemReader.hasNext()) error("$itemPath: expected element")')
+    expect(glue).toContain('rows = h.rows!!')
+    // apply owns the one reader and closes the document it decoded; a second
+    // close throws on device (expected '}' at end of document).
+    expect(glue.match(/val reader = OneJsonReader_K_counter\(propsJson\)/g)).toHaveLength(1)
+    expect(glue.match(/reader\.endDocument\(\)/g)).toHaveLength(1)
+  })
+
   it('omits the events import and date/data helpers a contract never uses', () => {
     // kotlin/wasm cannot resolve the jvm/android/event-host symbols, so a
     // resources-shaped contract must not reference them.
@@ -167,6 +214,7 @@ fun Resources(title: String, onStep: ((Int) -> Unit)? = null) {
       expect(glue).not.toContain(symbol)
     }
     expect(glue).toContain('import androidx.compose.runtime.Composable')
+    expect(glue).toContain('import dev.onejs.one.OneNativeSourceKeyedState')
     expect(glue).toContain('import dev.onejs.one.OneNativeSourceDispatch')
     expect(glue).toContain('title = readString(')
     const dated = nativeSourceContract(
@@ -213,8 +261,12 @@ struct Helper: View {
     ])
     const glue = renderSwiftSourceGlue('rn_host_app', [contract]).source
     expect(glue).toContain('@objc(OneNativeSourceViews_rn_host_app) @MainActor public final class OneNativeSourceViews_rn_host_app: NSObject, OneNativeSourceViewDispatch')
-    expect(glue).toContain('value: try decode(props["value"] ?? missing("props.value"), as: Double.self),')
-    expect(glue).toContain('onReset: (props["onReset"] as? Bool) == true ? { () -> Void in emit("onReset", args([])) } : nil')
+    expect(glue).toContain('var `value`: Double')
+    expect(glue).toContain('private struct Doc_Level: Decodable')
+    expect(glue).toContain('guard let props = held as? Held_Level else')
+    expect(glue).toContain('public func updateView(_ held: AnyObject?, _ name: String, _ document: String) throws -> AnyObject?')
+    expect(glue).toContain('value: props.`value`,')
+    expect(glue).toContain('onReset: props.`onReset` == true ? { () -> Void in emit("onReset", args([])) } : nil')
 
     const temp = mkdtempSync(join(tmpdir(), 'one-native-source-views-'))
     writeFileSync(join(temp, 'Level.d.swift.ts'), contract.declaration)
@@ -222,10 +274,10 @@ struct Helper: View {
       compilerOptions: { strict: true, noEmit: true, allowArbitraryExtensions: true, module: 'esnext', moduleResolution: 'bundler', types: [] },
       include: ['use.ts'],
     }))
-    writeFileSync(join(temp, 'react.d.ts'), "declare module 'react' { export interface ReactElement {} }")
+    writeFileSync(join(temp, 'react.d.ts'), "declare module 'react' { export interface ReactElement {} }\ndeclare module 'react-native' { export type ViewStyle = { flex?: number }; export type StyleProp<T> = T | null | undefined }")
     writeFileSync(join(temp, 'use.ts'), `/// <reference path="./react.d.ts" />
 import { Level } from './Level.swift'
-Level({ value: 1, onChange: (next: number) => void next, onReset: null })
+Level({ value: 1, onChange: (next: number) => void next, onReset: null, style: { flex: 1 } })
 Level({ value: 'wrong', onChange: () => {} })
 `)
     // one compilation must accept the valid element and reject only the wrong prop.
@@ -511,7 +563,18 @@ object Atlas : OneModule {
       'object Atlas : OneModule {\n    fun at(moment: java.util.Date): java.util.Date = moment\n}'
     )
     expect(kotlin.modules[0].methods[0].parameters[0].type).toBe('Date')
-    expect(renderKotlinSourceGlue('K_atlas', kotlin).source).toContain('readDate(args.get(0), "args[0]")')
+    expect(renderKotlinSourceGlue('K_atlas', kotlin).source).toContain('readDate(reader, "args[0]")')
+  })
+
+  it('eats commas between positional module args', () => {
+    const kotlin = nativeSourceContract(
+      '/app/native/Atlas.kt',
+      'object Atlas : OneModule {\n    fun combine(first: Int, second: String): String = second\n}'
+    )
+    const glue = renderKotlinSourceGlue('K_atlas', kotlin).source
+    expect(glue).toContain('val arg0 = readInt(reader, "args[0]")')
+    expect(glue).toContain('require(reader.hasNext()) { "K_atlas.Atlas.combine expects 2 arguments" }')
+    expect(glue).toContain('val arg1 = readString(reader, "args[1]")')
   })
 
   it('rejects unusable named types at their use site', () => {
@@ -573,10 +636,12 @@ public struct Level: View {
 
     const kotlin = nativeSourceContract('/app/native/Atlas.kt', kotlinSource)
     const kotlinGlue = renderKotlinSourceGlue('K_atlas', kotlin).source
-    expect(kotlinGlue).toContain('private fun readPoint(value: Any, path: String): app.atlas.Point {')
+    expect(kotlinGlue).toContain('private class OneJsonReader_K_atlas(private val text: String) {')
+    expect(kotlinGlue).toContain('private fun readPoint(reader: OneJsonReader_K_atlas, path: String): app.atlas.Point {')
     expect(kotlinGlue).toContain('private fun encodePoint(value: app.atlas.Point): JSONObject {')
-    expect(kotlinGlue).toContain('private fun readDate(value: Any, path: String): java.util.Date {')
-    expect(kotlinGlue).toContain('readPoint(args.get(0), "args[0]")')
+    expect(kotlinGlue).toContain('private fun readDate(reader: OneJsonReader_K_atlas, path: String): java.util.Date {')
+    expect(kotlinGlue).toContain('readPoint(reader, "args[0]")')
+    expect(kotlinGlue).not.toContain('JSONArray(argsJson)')
     expect(kotlinGlue).toContain('JSONArray().put(dateToString(result))')
   })