peachsim 0.1.2203 → 0.1.2205

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-submit.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/is-record.ts
 function isRecord(value) {

package/dist-lib/swift-toolchain.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/worklet-executable.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/worklet-executable.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2203 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/worklet-executable.ts
 import { parse } from "acorn";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.2203",
+  "version": "0.1.2205",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/src/android-drawables.ts

@@ -75,7 +75,7 @@ export interface AndroidDrawable {
 }
 
 // the device the oracle measures runs API 37
-const DEVICE_API = 37
+export const DEVICE_API = 37
 // ResTable_config's density values, as the resource table records them
 const BUCKETS: Record<string, number> = {
   ldpi: 120,

package/src/android-layout-ids.ts

@@ -1,5 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import { DEVICE_API } from './android-drawables'
 import { parseXml, type XmlElement } from './android-xml'
 
 // the layout names and view ids a module's R class declares: every layout
@@ -8,11 +9,22 @@ import { parseXml, type XmlElement } from './android-xml'
 export interface AndroidLayoutIds {
   layouts: string[]
   ids: string[]
-  // the unqualified `layout` directory's files by name, which Resources inflates
-  elements: Map<string, XmlElement>
+  // each layout's files the device API can load, which Resources chooses
+  // between for the configuration
+  elements: Map<string, LayoutVariant[]>
 }
 
-const LAYOUT_DIR = /^layout(?:-[A-Za-z0-9+-]+)?$/
+// a layout directory's qualifiers as ResTable_config values: orientation 1
+// port, 2 land; night 1 notnight, 2 night; 0 leaves either unset
+export interface LayoutVariant {
+  orientation: number
+  night: number
+  version: number
+  element: XmlElement
+}
+
+// the qualifiers Peach resolves for layouts, in aapt2's required order
+const LAYOUT_DIR = /^layout(?:-(port|land))?(?:-(notnight|night))?(?:-v(\d+))?$/
 const ID_REFERENCE = /@\+?id\/([A-Za-z0-9_.]+)/g
 const ID_ITEM = /<item\b[^>]*\btype\s*=\s*"id"[^>]*>/g
 const ITEM_NAME = /\bname\s*=\s*"([^"]+)"/
@@ -21,19 +33,30 @@ export function readAndroidLayoutIds(moduleDir: string): AndroidLayoutIds {
   const res = path.join(moduleDir, 'src/main/res')
   const layouts = new Set<string>()
   const ids = new Set<string>()
-  const elements = new Map<string, XmlElement>()
+  const elements = new Map<string, LayoutVariant[]>()
   for (const dir of fs.existsSync(res) ? fs.readdirSync(res).sort() : []) {
     const directory = path.join(res, dir)
-    if (LAYOUT_DIR.test(dir)) {
+    if (dir === 'layout' || dir.startsWith('layout-')) {
+      const match = LAYOUT_DIR.exec(dir)
+      if (!match)
+        throw new Error(
+          `${res}/${dir}: layouts under this qualifier are not resolved by Peach yet`,
+        )
+      const orientation = match[1] === 'port' ? 1 : match[1] === 'land' ? 2 : 0
+      const night = match[2] === 'notnight' ? 1 : match[2] === 'night' ? 2 : 0
+      const version = Number(match[3] ?? 0)
       for (const entry of fs.readdirSync(directory).sort()) {
         if (!entry.endsWith('.xml')) continue
-        layouts.add(entry.slice(0, -'.xml'.length))
+        const name = entry.slice(0, -'.xml'.length)
+        layouts.add(name)
         const xml = fs.readFileSync(path.join(directory, entry), 'utf8')
-        for (const match of xml.matchAll(ID_REFERENCE)) ids.add(match[1])
-        if (dir === 'layout') {
-          const root = parseXml(xml, path.join(directory, entry)).children[0]
-          if (root) elements.set(entry.slice(0, -'.xml'.length), root)
-        }
+        for (const reference of xml.matchAll(ID_REFERENCE)) ids.add(reference[1])
+        const element = parseXml(xml, path.join(directory, entry)).children[0]
+        if (!element || version > DEVICE_API) continue
+        elements.set(name, [
+          ...(elements.get(name) ?? []),
+          { orientation, night, version, element },
+        ])
       }
     } else if (dir.startsWith('values')) {
       for (const entry of fs.readdirSync(directory).sort()) {

package/src/expo-native-prebuilt.ts

@@ -8,7 +8,8 @@
 // answered packages, the Swift pin and these compilers' sources. an app whose
 // inputs match fetches one metadata file and loads the published wasm; any
 // other app prepares and compiles as before. identity values stay out of the
-// artifact: an app reads its own from its prebuilt Xcode project.
+// artifact: an app reads its own from its prebuilt Xcode project, with the
+// plist values pod install added.
 import { createHash } from 'node:crypto'
 import fs from 'node:fs'
 import { createRequire } from 'node:module'
@@ -330,13 +331,19 @@ export function servedExpoSwift(
   if (!entry.expoSwift) return null
   const rootId = `${createHash('sha256').update(fs.realpathSync(appRoot)).digest('hex')}/Expo`
   if (app.infoPlist === null) throw new Error('the prebuilt app target has no Info.plist')
-  const infoPlist = Buffer.from(
-    installedInfoPlist(app.infoPlist, entry.infoPlist),
-  ).toString('base64')
+  // pod install writes values such as RCTNewArchEnabled into the plist after
+  // prebuild. the compile reads identity from that plist, so the hit must too.
+  const installed = installedInfoPlist(app.infoPlist, entry.infoPlist)
+  const infoPlist = Buffer.from(installed).toString('base64')
   return {
     ...entry.expoSwift,
     ...(entry.identity
-      ? { nativeAppIdentity: readNativeAppIdentityFromXcodeTarget(app) }
+      ? {
+          nativeAppIdentity: readNativeAppIdentityFromXcodeTarget({
+            ...app,
+            infoPlist: installed,
+          }),
+        }
       : {}),
     modules: entry.expoSwift.modules.map((module) => ({
       ...module,

package/src/kotlin-host.ts

@@ -865,7 +865,7 @@ export async function kotlinAppArtifact(
       '',
       '@JsExport',
       'fun peachAppMount(density: Float, fontScale: Float, locale: String,',
-      '    font: String, insets: String, night: Boolean,',
+      '    font: String, insets: String, night: Boolean, orientation: Int,',
       '    invalidate: (Boolean) -> Unit): String = dev.peach.app.peachStartApp(',
       '    dev.peach.app.PeachAppSpec(',
       '        dev.peach.app.compiledAppResources,',
@@ -882,7 +882,7 @@ export async function kotlinAppArtifact(
       '        },',
       `        ${app.predictiveBack},`,
       '    ),',
-      '    density, fontScale, locale, font, insets, night, invalidate,',
+      '    density, fontScale, locale, font, insets, night, orientation, invalidate,',
       ')',
       '',
       '@JsExport',
@@ -1009,15 +1009,21 @@ function appResourceSources(app: KotlinAppProject): Record<string, string> {
           .join(',\n')}\n)`,
       })),
     },
-    // a layout is its element tree; one only in a qualified directory has none
+    // a layout is the element tree of each file the device API can load, with
+    // its directory's qualifiers
     {
       type: 'layout',
       table: 'peachAppLayouts',
-      value: 'LayoutNode?',
-      entries: app.layoutIds.layouts.map((name) => {
-        const element = app.layoutIds.elements.get(name)
-        return { name, init: element ? layoutInit(element) : 'null' }
-      }),
+      value: 'List<LayoutVariant>',
+      entries: app.layoutIds.layouts.map((name) => ({
+        name,
+        init: `listOf(${(app.layoutIds.elements.get(name) ?? [])
+          .map(
+            (variant) =>
+              `LayoutVariant(${variant.orientation}, ${variant.night}, ${variant.version}, ${layoutInit(variant.element)})`,
+          )
+          .join(', ')})`,
+      })),
     },
     // the day and the night ARGB
     {
@@ -1045,7 +1051,11 @@ function appResourceSources(app: KotlinAppProject): Record<string, string> {
     })),
   })
   const kinds = tableKinds.map((kind, index) => numbered(kind, index))
-  const viewClasses = layoutViewClasses(app.layoutIds.elements.values())
+  const viewClasses = layoutViewClasses(
+    [...app.layoutIds.elements.values()].flatMap((variants) =>
+      variants.map((variant) => variant.element),
+    ),
+  )
   const rKinds = [
     ...kinds,
     ...nameOnly.map((kind, index) =>
@@ -1084,6 +1094,7 @@ function appResourceSources(app: KotlinAppProject): Record<string, string> {
         'androidx.compose.ui.unit.Dp',
         'android.content.Context',
         'android.util.AttributeSet',
+        'android.content.res.LayoutVariant',
         'android.view.LayoutNode',
         'android.view.View',
       ].map((name) => `import ${name}`),