peachsim 0.1.2222 → 0.1.2224

package/dist-types/packages/peach-globals/src/browser-object-url.d.ts

@@ -0,0 +1,10 @@
+export declare const BrowserURL: {
+    new (url: string | URL, base?: string | URL): URL;
+    prototype: URL;
+    canParse(url: string | URL, base?: string | URL): boolean;
+    createObjectURL(obj: Blob | MediaSource): string;
+    parse(url: string | URL, base?: string | URL): URL | null;
+    revokeObjectURL(url: string): void;
+};
+export declare const createBrowserObjectURL: (obj: Blob | MediaSource) => string;
+export declare const revokeBrowserObjectURL: (url: string) => void;

package/package.json

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

package/runtime-companion.json

@@ -1 +1 @@
-{"abi":1,"sha256":"6b48c0f7ae1d87e581af7cf445b2eaad2e1a4aa8fad23a00e1ae90916b2bbc02","file":"node/cli-6b48c0f7ae1d87e581af7cf445b2eaad2e1a4aa8fad23a00e1ae90916b2bbc02.cjs"}
+{"abi":1,"sha256":"ef38a3e8be87c77f4035640cf265efa9aff735577a2de14feb63c8a09afabd42","file":"node/cli-ef38a3e8be87c77f4035640cf265efa9aff735577a2de14feb63c8a09afabd42.cjs"}

package/sdk/ios/System/Library/Frameworks/UIKit.framework/Headers/UISegmentedControl.h

@@ -40,7 +40,7 @@ typedef NS_ENUM(NSInteger, UISegmentedControlSegment) {
 @class UIImage, UIColor;
 
 UIKIT_EXTERN API_AVAILABLE(ios(2.0)) API_UNAVAILABLE(watchos) NS_SWIFT_UI_ACTOR
-@interface UISegmentedControl : UIControl <NSCoding>
+PEACH_SWIFT_CLASS(UIKitCore) @interface UISegmentedControl : UIControl <NSCoding>
 
 - (instancetype)initWithFrame:(CGRect)frame NS_DESIGNATED_INITIALIZER;
 - (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;

package/sdk/ios/System/Library/Frameworks/UIKit.framework/Headers/UITabBar.h

@@ -22,7 +22,7 @@ NS_HEADER_AUDIT_BEGIN(nullability, sendability)
 @protocol UITabBarDelegate;
 
 UIKIT_EXTERN API_AVAILABLE(ios(2.0)) API_UNAVAILABLE(watchos) NS_SWIFT_UI_ACTOR
-@interface UITabBar : UIView
+PEACH_SWIFT_CLASS(UIKitCore) @interface UITabBar : UIView
 
 @property(nullable, nonatomic, weak) id<UITabBarDelegate> delegate;     // weak reference. default is nil
 @property(nullable, nonatomic, copy) NSArray<UITabBarItem *> *items;        // get/set visible UITabBarItems. default is nil. changes not animated. shown in order

package/src/conformance-comparison-contract.ts

@@ -121,15 +121,6 @@ export function outsideDisplayPixels(
   height: number,
 ): Uint8Array | null {
   const count = width * height
-  let anyTransparent = false
-  for (let i = 0; i < count; i++) {
-    if (candidate[i * 4 + 3] !== 255) {
-      anyTransparent = true
-      break
-    }
-  }
-  if (!anyTransparent) return null
-
   // a compared frame is the physical framebuffer or a one-pixel common-area
   // crop of it (commonAreaSize), so the lookup probes the crop back up.
   const spec =
@@ -168,6 +159,15 @@ export function outsideDisplayPixels(
     return null
   }
 
+  let anyTransparent = false
+  for (let i = 0; i < count; i++) {
+    if (candidate[i * 4 + 3] !== 255) {
+      anyTransparent = true
+      break
+    }
+  }
+  if (!anyTransparent) return null
+
   const outside = new Uint8Array(count)
   const corners = [
     { x0: 0, y0: 0, cx: radiiPx.topLeft, cy: radiiPx.topLeft, r: radiiPx.topLeft },

package/src/conformance-pixel-comparison.ts

@@ -132,11 +132,24 @@ export function compareConformancePixels(options: {
   }
   if (identical) {
     options.diff?.fill(0)
+    const columns = Math.ceil(options.width)
+    const excludedColumns =
+      region.cornerRadius > 0
+        ? Math.min(
+            columns,
+            Math.ceil(region.cornerRadius) +
+              columns -
+              Math.max(0, Math.ceil(options.width - region.cornerRadius)),
+          )
+        : 0
     let totalPixels = 0
     for (let y = region.yStart; y < region.yEnd; y++) {
-      for (let x = 0; x < options.width; x++) {
-        if (!excluded(x, y)) totalPixels++
-      }
+      const globalY = region.globalYStart + y
+      totalPixels +=
+        globalY < region.cornerRadius ||
+        globalY >= region.fullHeight - region.cornerRadius
+          ? columns - excludedColumns
+          : columns
     }
     return { differingPixels: 0, totalPixels }
   }

package/src/swift-compile.ts

@@ -5337,10 +5337,10 @@ export function writeSwiftProject(
     const moduleName = swiftTargetModuleName(name)
     const originalMap = originalMaps.get(moduleName)
     const stagedMap = sourceModuleMaps.get(moduleName)
-    const originalPath = originalMap
-      ? path.join(layout.root, originalMap)
-      : stagedMap?.path
-    const originalContents = originalMap ? input.files[originalMap]! : stagedMap?.contents
+    const originalPath =
+      stagedMap?.path ?? (originalMap ? path.join(layout.root, originalMap) : undefined)
+    const originalContents =
+      stagedMap?.contents ?? (originalMap && input.files[originalMap])
     const originalTokens = originalContents ? moduleMapTokens(originalContents) : []
     if (
       originalPath &&

package/src/swift-host.ts

@@ -2812,6 +2812,28 @@ export function compileInput(
   )
 }
 
+export function swiftBuildRoot(packagePath: string, moduleRoot: string): string {
+  if (process.env.CONTRAST_SWIFT_BUILD_ROOT) return process.env.CONTRAST_SWIFT_BUILD_ROOT
+  const resolvedPath = path.resolve(packagePath)
+  const parts = resolvedPath.split(path.sep)
+  const scopedAt = Math.max(
+    parts.lastIndexOf('peach-expo-swift'),
+    parts.lastIndexOf('peach-nitro-swift'),
+  )
+  const buildKeyPath =
+    scopedAt >= 0 && parts.length >= scopedAt + 3
+      ? parts.slice(0, scopedAt + 2).join(path.sep)
+      : (sourceEntries().get(resolvedPath) ?? resolvedPath)
+  return path.join(
+    swiftCacheDir(),
+    'swift-builds',
+    createHash('sha256')
+      .update(`${moduleRoot}\0${buildKeyPath}`)
+      .digest('hex')
+      .slice(0, 16),
+  )
+}
+
 // the compile input of an installed workspace with the binary frameworks its
 // pods and project vendor, read from one layout.
 export function installedWorkspaceInput(
@@ -2922,32 +2944,7 @@ async function compile(
     // building each other's sources. each app and module checkout still gets
     // its own root, so they do not queue and the same app keeps its
     // incremental build across restarts.
-    buildRoot: (() => {
-      if (process.env.CONTRAST_SWIFT_BUILD_ROOT)
-        return process.env.CONTRAST_SWIFT_BUILD_ROOT
-      const resolvedPath = path.resolve(packagePath)
-      // units of one app or nitro module share a root so the module cache stays
-      // warm across server restarts: peach-expo-swift/<app>/<scope>/<package>
-      // and peach-nitro-swift/<module>/<scope> share <app> or <module>.
-      // servers on one app or module queue on the root lock.
-      const parts = resolvedPath.split(path.sep)
-      const scopedAt = Math.max(
-        parts.lastIndexOf('peach-expo-swift'),
-        parts.lastIndexOf('peach-nitro-swift'),
-      )
-      const buildKeyPath =
-        scopedAt >= 0 && parts.length >= scopedAt + 3
-          ? parts.slice(0, scopedAt + 2).join(path.sep)
-          : (sourceEntries().get(resolvedPath) ?? resolvedPath)
-      return path.join(
-        swiftCacheDir(),
-        'swift-builds',
-        createHash('sha256')
-          .update(`${moduleRoot}\0${buildKeyPath}`)
-          .digest('hex')
-          .slice(0, 16),
-      )
-    })(),
+    buildRoot: swiftBuildRoot(packagePath, moduleRoot),
     moduleRoot,
     ...toolchain,
     signal,

package/src/swift-root-lock.ts

@@ -20,6 +20,7 @@ import { readProcessTable, type ProcessRow } from './process-table.ts'
 import type { Readable, Writable } from 'node:stream'
 
 const POLL_MS = 250
+const INSPECT_ATTEMPTS = 5
 // ps derives a start time from the boot time, which drifts by a second or two
 // on linux; a reused pid starts later than this.
 const START_TOLERANCE_MS = 2_000
@@ -53,6 +54,24 @@ function processTable(pid?: number): ProcessRow[] {
   }
 }
 
+// a loaded host can stall ps past its deadline once without the table being
+// broken, and the lock only ever waits on that answer, so lock acquisition
+// asks again before giving up.
+async function processTableWithRetry(
+  pid: number | undefined,
+  signal: AbortSignal | undefined,
+): Promise<ProcessRow[]> {
+  for (let attempt = 1; ; attempt++) {
+    try {
+      return processTable(pid)
+    } catch (error) {
+      if (attempt >= INSPECT_ATTEMPTS) throw error
+      await pause(POLL_MS * attempt, signal)
+      signal?.throwIfAborted()
+    }
+  }
+}
+
 function sameProcess(row: ProcessRow, identity: Identity): boolean {
   return (
     row.pid === identity.pid && Math.abs(row.start - identity.start) <= START_TOLERANCE_MS
@@ -204,7 +223,11 @@ export async function withSwiftRootLock<T>(
   )
   mkdirSync(directory, { recursive: true })
   const token = randomUUID()
-  const owner = JSON.stringify(ownIdentity(process.pid))
+  const ownRow = (await processTableWithRetry(process.pid, signal)).find(
+    (candidate) => candidate.pid === process.pid && !candidate.zombie,
+  )
+  if (!ownRow) throw new Error(`swift root lock cannot find process ${process.pid}`)
+  const owner = JSON.stringify({ pid: process.pid, start: ownRow.start })
   const pending = path.join(directory, `pending.${token}`)
   let held = 0
   for (;;) {
@@ -213,15 +236,15 @@ export async function withSwiftRootLock<T>(
     const current = newest > 0 ? readGeneration(directory, newest) : null
     if (newest > 0 && !current) continue
     if (current && !current.released) {
-      const owner = processTable(current.holder.pid)
-      if (owner.some((row) => !row.zombie && sameProcess(row, current.holder))) {
+      const holder = await processTableWithRetry(current.holder.pid, signal)
+      if (holder.some((row) => !row.zombie && sameProcess(row, current.holder))) {
         if (!wait) return undefined
         await pause(POLL_MS, signal)
         continue
       }
       const children = readChildren(directory, newest)
       if (children.length) {
-        const table = processTable()
+        const table = await processTableWithRetry(undefined, signal)
         if (children.some((child) => groupAlive(table, child))) {
           if (!wait) return undefined
           await pause(POLL_MS, signal)

package/src/vite-plugin.ts

@@ -839,11 +839,16 @@ export function hostBootChunkPlugin(): Plugin {
       }
     },
     outputOptions(options) {
+      const chunkFileNames = options.chunkFileNames ?? 'assets/[name]-[hash].js'
       return {
         ...options,
         // host resource urls are relative to the runtime root.
         chunkFileNames: (chunk) =>
-          chunk.name === 'host-home' ? 'host-home-[hash].js' : 'assets/[name]-[hash].js',
+          chunk.name === 'host-home'
+            ? 'host-home-[hash].js'
+            : typeof chunkFileNames === 'function'
+              ? chunkFileNames(chunk)
+              : chunkFileNames,
         strictExecutionOrder: true,
         codeSplitting: {
           groups: [