peachsim 0.1.2204 → 0.1.2205

package/dist-lib/scripts/dev-server-scanner.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (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/sdk.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (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/sdk.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);

package/dist-lib/skills.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (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;
@@ -96945,7 +96945,7 @@ async function kotlinAppArtifact(app, moduleRoot, origin) {
     "",
     "@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,",
@@ -96962,7 +96962,7 @@ async function kotlinAppArtifact(app, moduleRoot, origin) {
     "        },",
     `        ${app.predictiveBack},`,
     "    ),",
-    "    density, fontScale, locale, font, insets, night, invalidate,",
+    "    density, fontScale, locale, font, insets, night, orientation, invalidate,",
     ")",
     "",
     "@JsExport",
@@ -97057,15 +97057,18 @@ ${drawable.files.map((file) => drawableInit(file, import_node_path125.default.re
 )`
       }))
     },
-    // 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((name3) => {
-        const element = app.layoutIds.elements.get(name3);
-        return { name: name3, init: element ? layoutInit(element) : "null" };
-      })
+      value: "List<LayoutVariant>",
+      entries: app.layoutIds.layouts.map((name3) => ({
+        name: name3,
+        init: `listOf(${(app.layoutIds.elements.get(name3) ?? []).map(
+          (variant2) => `LayoutVariant(${variant2.orientation}, ${variant2.night}, ${variant2.version}, ${layoutInit(variant2.element)})`
+        ).join(", ")})`
+      }))
     },
     // the day and the night ARGB
     {
@@ -97087,7 +97090,11 @@ ${drawable.files.map((file) => drawableInit(file, import_node_path125.default.re
     }))
   });
   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((variant2) => variant2.element)
+    )
+  );
   const rKinds = [
     ...kinds,
     ...nameOnly.map(
@@ -97126,6 +97133,7 @@ ${drawable.files.map((file) => drawableInit(file, import_node_path125.default.re
         "androidx.compose.ui.unit.Dp",
         "android.content.Context",
         "android.util.AttributeSet",
+        "android.content.res.LayoutVariant",
         "android.view.LayoutNode",
         "android.view.View"
       ].map((name3) => `import ${name3}`),
@@ -115932,16 +115940,27 @@ function readAndroidLayoutIds(moduleDir) {
   const elements = /* @__PURE__ */ new Map();
   for (const dir of import_node_fs143.default.existsSync(res) ? import_node_fs143.default.readdirSync(res).sort() : []) {
     const directory2 = import_node_path145.default.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 version2 = Number(match[3] ?? 0);
       for (const entry of import_node_fs143.default.readdirSync(directory2).sort()) {
         if (!entry.endsWith(".xml")) continue;
-        layouts.add(entry.slice(0, -".xml".length));
+        const name3 = entry.slice(0, -".xml".length);
+        layouts.add(name3);
         const xml = import_node_fs143.default.readFileSync(import_node_path145.default.join(directory2, entry), "utf8");
-        for (const match of xml.matchAll(ID_REFERENCE)) ids.add(match[1]);
-        if (dir === "layout") {
-          const root = parseXml(xml, import_node_path145.default.join(directory2, 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, import_node_path145.default.join(directory2, entry)).children[0];
+        if (!element || version2 > DEVICE_API) continue;
+        elements.set(name3, [
+          ...elements.get(name3) ?? [],
+          { orientation, night, version: version2, element }
+        ]);
       }
     } else if (dir.startsWith("values")) {
       for (const entry of import_node_fs143.default.readdirSync(directory2).sort()) {
@@ -115963,8 +115982,9 @@ var init_android_layout_ids = __esm({
     init_define_SWIFT_COVERAGE_SOURCE_DIGESTS();
     import_node_fs143 = __toESM(require("node:fs"), 1);
     import_node_path145 = __toESM(require("node:path"), 1);
+    init_android_drawables();
     init_android_xml();
-    LAYOUT_DIR = /^layout(?:-[A-Za-z0-9+-]+)?$/;
+    LAYOUT_DIR = /^layout(?:-(port|land))?(?:-(notnight|night))?(?:-v(\d+))?$/;
     ID_REFERENCE = /@\+?id\/([A-Za-z0-9_.]+)/g;
     ID_ITEM = /<item\b[^>]*\btype\s*=\s*"id"[^>]*>/g;
     ITEM_NAME = /\bname\s*=\s*"([^"]+)"/;

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (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-compile.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/swift-compile.ts
 import {

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (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-package.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2205 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/swift-package.ts
 function swiftManifestSettings(target) {

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2204 | (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.2204 | (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.2204 | (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.2204 | (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.2204 | (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.2204 | (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.2204 | (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.2204 | (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.2204",
+  "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/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}`),