peachsim 0.1.646 → 0.1.648

package/dist-lib/vite.cjs

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

package/package.json

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

package/src/swift-compile.ts

@@ -229,9 +229,10 @@ export function swiftArtifactHash(
   moduleRoot: string,
 ): string {
   const hash = createHash('sha256')
-  // v5: a target declaring resources gets SwiftPM's Bundle.module accessor
-  // (v4: sources compile through swiftSourceAsIOS)
-  hash.update(`swift-compile/v5\n${release}\n`)
+  // v6: app and scene delegate classes compile final
+  // (v5: a target declaring resources gets SwiftPM's Bundle.module accessor;
+  // v4: sources compile through swiftSourceAsIOS)
+  hash.update(`swift-compile/v6\n${release}\n`)
   if (input.oneModule) hash.update('one-module\n')
   hash.update(linkedModuleDigest(moduleRoot))
   for (const file of Object.keys(input.files).sort()) {
@@ -361,11 +362,19 @@ function syncSwiftTree(base: string, files: Map<string, string>): void {
 // `@objcMembers` `@ObjCMembers`, `@IBAction` `@ObjC` padded, and `#selector(`
 // `#Selector(`: the module's macros that expose a method to selector dispatch
 // (plans/peach/uikit-shell.md, gate B). all keep their width except an
-// explicit `@objc(name:)`, whose name becomes a string argument.
+// explicit `@objc(name:)`, whose name becomes a string argument, and a
+// delegate class that becomes final (below).
 const DIRECTIVE = /^[ \t]*#(?:if|elseif)\b/
 const OS_IOS = /\bos\(\s*iOS\s*\)/g
 const OBJC_ATTRIBUTE = /^@(?:objcMembers\b|objc\b(?:(\s*)\(([^()]*)\))?|IBAction\b)/
 const SELECTOR = /^#selector\b/
+// uikit makes app and scene delegates from their class through the objc
+// runtime; here their protocols require init(), which a non-final class
+// meets only with a required one. a class declaring one of them that is
+// neither final nor open becomes final, and subclassing it fails to
+// compile naming itself.
+const DELEGATE_CLASS =
+  /^class\s+[A-Za-z_]\w*\s*(?:<[^>{]*>)?\s*:[^{]*\b(?:UIApplicationDelegate|UISceneDelegate|UIWindowSceneDelegate)\b[^{]*\{/
 export function swiftSourceAsIOS(source: string): string {
   const { lineStarts, tokens } = swiftCodeScan(source)
   let offset = 0
@@ -382,7 +391,15 @@ export function swiftSourceAsIOS(source: string): string {
   let out = ''
   let copied = 0
   for (const at of tokens) {
-    const rest = conditioned.slice(at, at + 200)
+    const rest = conditioned.slice(at, at + 400)
+    if (rest.startsWith('class')) {
+      const modifiers = conditioned.slice(conditioned.lastIndexOf('\n', at - 1) + 1, at)
+      if (DELEGATE_CLASS.test(rest) && !/\b(?:final|open)\b/.test(modifiers)) {
+        out += `${conditioned.slice(copied, at)}final `
+        copied = at
+      }
+      continue
+    }
     const selector = SELECTOR.exec(rest)
     const match = selector ?? OBJC_ATTRIBUTE.exec(rest)
     if (!match) continue
@@ -398,8 +415,8 @@ export function swiftSourceAsIOS(source: string): string {
   return out + conditioned.slice(copied)
 }
 
-// the offsets of the lines that begin in code, and of every `@` and `#` that
-// stands in code (an interpolation's code included), from a scan of Swift's
+// the offsets of the lines that begin in code, and of every `@`, `#` and
+// `class` keyword that stands in code (an interpolation's code included), from a scan of Swift's
 // lexical contexts: nested block comments, line comments, string literals (single and
 // multiline, raw with any number of #, interpolations holding code and
 // strings of their own) and #/ /# regex literals. a bare /regex/ literal
@@ -487,6 +504,13 @@ function swiftCodeScan(source: string): { lineStarts: Set<number>; tokens: numbe
       if (top.parens === 0 && stack.length > 1) stack.pop()
       else top.parens--
       i++
+    } else if (
+      source.startsWith('class', i) &&
+      !/[\w$]/.test(source[i - 1] ?? '') &&
+      !/[\w$]/.test(source[i + 5] ?? '')
+    ) {
+      tokens.push(i)
+      i += 5
     } else {
       if (char === '@') tokens.push(i)
       i++

package/src/swift-submit.ts

@@ -44,8 +44,10 @@ export const MAX_SWIFT_COMPILE_IMAGE_TOTAL_BYTES = 16 * 1024 * 1024
  * `peach.icu_data_v1` (`packages/sootsim-swift/src/icuData.ts`). a request
  * without one comes from before this field, a host that is 0.
  * 2: scroll anchors carry numeric unit coordinates to the kit.
+ * 3: the host provides `rnx.measure_text`, UIKitCore's synchronous text
+ * measure (`packages/sootsim-swift/src/mount.tsx`).
  */
-export const SWIFT_HOST_ABI = 2
+export const SWIFT_HOST_ABI = 3
 
 export interface SwiftImageUpload {
   /** the raster file picked for the asset (has the extension). */

package/src/vite-plugin-swift.ts

@@ -2,6 +2,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { swiftEntryModuleEsm } from '../../sootsim-swift/src/entryModule'
+import { swiftModuleInputFiles } from './swift-compile'
 import {
   artifactFor,
   entryRootId,
@@ -133,12 +134,15 @@ export function swiftPlugin(options: SwiftPluginOptions = {}): Plugin {
         this.addWatchFile(source)
       this.addWatchFile(path.join(packagePath, 'Package.swift'))
       // an edit to the linked SwiftUI module rebuilds the artifact without
-      // touching the project's own sources, so those files gate the reload
-      // too: the new hash in the emitted module is what tells the mount it
-      // is looking at a different app.
-      for (const root of linkedModuleRoots(packagePath)) {
-        for (const source of sourceFiles(root)) this.addWatchFile(source)
-      }
+      // touching the project's own sources, so the module inputs the source
+      // stamp hashes gate the reload too. the module is never uploaded, so
+      // the compile service's source caps do not apply to it.
+      const moduleRoot = linkedModuleRoots(packagePath).find((root) =>
+        fs.existsSync(path.join(root, 'toolchain.json')),
+      )
+      if (moduleRoot)
+        for (const relative of swiftModuleInputFiles(moduleRoot))
+          this.addWatchFile(path.join(moduleRoot, relative))
       let artifact: SwiftArtifact
       try {
         artifact = await artifactFor(project, entry)