peachsim 0.1.1406 → 0.1.1463

package/src/swift-compile.ts

@@ -612,7 +612,7 @@ const FOUNDATION_IMPLICIT_FLAGS = FOUNDATION_IMPLICIT_MODULES.map(
 const ONE_IMPLICIT_FLAGS = ', "-Xfrontend", "-import-module", "-Xfrontend", "One"'
 
 /** bump with any change to the emitted multi-target manifest text. */
-export const MULTI_MANIFEST_VERSION = 18
+export const MULTI_MANIFEST_VERSION = 19
 
 export function swiftArtifactHash(
   input: SwiftCompileInput,
@@ -620,6 +620,7 @@ export function swiftArtifactHash(
   moduleRoot: string,
 ): string {
   const hash = createHash('sha256')
+  // v24: distribution objects use an ordered linker response file
   // v22: Foundation sources see Darwin, which carries the libc and Mach
   // v21: Foundation sources see the ObservableObject and Published aliases
   // v20: supplied table editing and swipe methods preserve objective-c selectors
@@ -638,7 +639,7 @@ export function swiftArtifactHash(
   // 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/v23\n${release}\n`)
+  hash.update(`swift-compile/v24\n${release}\n`)
   if (input.oneModule) hash.update('one-module\n')
   hash.update(swiftModuleDigest(moduleRoot))
   for (const file of Object.keys(input.files).sort()) {
@@ -721,6 +722,8 @@ export function emitSwiftPackageManifest(args: {
   spriteKit?: boolean
   /** link the prebuilt distribution at moduleRoot instead of its sources. */
   distribution?: SwiftDistributionManifest
+  /** ordered distribution objects, read by the linker without expanding argv. */
+  distributionLink?: { path: string; files: Map<string, string | Buffer> }
   /** the static library each target links, by target name. */
   libraries?: Map<string, string>
 }): string {
@@ -741,11 +744,27 @@ export function emitSwiftPackageManifest(args: {
   }
   // the distribution builder names each object lib/<target>-<file>.o.
   // preserve link order while leaving unreached optional module objects out.
-  const distributionObjects = distribution?.objects.filter((object) =>
-    [...OPTIONAL_FRAMEWORKS, 'SpriteKit', 'PeachBox2D'].every(
-      (name) => !object.startsWith(`lib/${name}-`) || reachedFrameworks.has(name),
-    ),
-  )
+  const distributionLink = args.distributionLink
+  if (distribution && !distributionLink)
+    throw new Error(
+      'swift-compile: distribution linking requires its object response file',
+    )
+  if (distribution && distributionLink) {
+    const objects = distribution.objects.filter((object) =>
+      [...OPTIONAL_FRAMEWORKS, 'SpriteKit', 'PeachBox2D'].every(
+        (name) => !object.startsWith(`lib/${name}-`) || reachedFrameworks.has(name),
+      ),
+    )
+    distributionLink.files.set(
+      distributionLink.path,
+      objects
+        .map(
+          (object) =>
+            `"${path.join(moduleRoot, object).replaceAll('\\', '\\\\').replaceAll('"', '\\"')}"`,
+        )
+        .join('\n') + '\n',
+    )
+  }
   const executable = targets.find((target) => target.executable)
   if (!executable) throw new Error('swift-compile: no executable target to emit')
   // each target compiles in the language mode and default isolation its
@@ -807,14 +826,12 @@ export function emitSwiftPackageManifest(args: {
           : [`"${dependency}"`],
       ),
     ].join(', ')
-    const library = distribution
-      ? [
-          ...(distributionObjects ?? []).map((object) => path.join(moduleRoot, object)),
-          ...distribution.link,
-        ]
-          .map((flag) => `, ${JSON.stringify(flag)}`)
-          .join('')
-      : ''
+    const library =
+      distribution && distributionLink
+        ? ['-Xlinker', `@${distributionLink.path}`, ...distribution.link]
+            .map((flag) => `, ${JSON.stringify(flag)}`)
+            .join('')
+        : ''
     const kind = target.executable ? '.executableTarget' : '.target'
     const link = target.executable
       ? `,
@@ -2554,6 +2571,10 @@ export function writeSwiftProject(
         oneModule: input.oneModule,
         spriteKit: importsSpriteKit(input.files),
         distribution: distribution ?? undefined,
+        distributionLink: {
+          path: path.join(layout.root, '.peach-distribution-objects.rsp'),
+          files,
+        },
         libraries,
       }) + moduleFiles,
     )

package/src/swift-distribution.lock.json

@@ -1,10 +1,10 @@
 {
-  "id": "3246f7e5ccb24952",
+  "id": "c60899948fe25af8",
   "release": "swift-6.4.0-RELEASE",
   "wasmSdkId": "swift-6.4.0-RELEASE_wasm-peach-e4629014",
   "wasmSdkUrl": "https://r2.sootsim.com/swift-wasm-sdk/swift-6.4.0-RELEASE_wasm-peach-e4629014.artifactbundle.tar.gz",
   "wasmSdkChecksum": "522f3ff98e951872d64751376d45e36394e572ec2aa4e0a52fb0027824bf41f6",
-  "source": "a1e87668019272a329f6d9fada213573e3c5107f",
+  "source": "22d7666f9c66ec4b558db482661d440e581d84ff",
   "targets": [
     "ExpoModulesCore",
     "PeachJSON",
@@ -118,16 +118,16 @@
   ],
   "hosts": {
     "darwin-arm64": {
-      "sha256": "fb5a3e9db1eae670b5ba84432345e52de8b55b5fdf0e468ff95dfa25a62a6968",
-      "size": 55050821
+      "sha256": "4661b87b8d627792bd28ef41d856bc9abcc913eb816efa448075d48e88abe823",
+      "size": 55595616
     },
     "linux-x64": {
-      "sha256": "46a0eae68905751ee7c6536e79f626bc71d9d5a22cf9a76ce12b8d6c3aa34293",
-      "size": 55056198
+      "sha256": "85dc5fc24acd33568f5ddccb3d69905c638162f5d5d767eefbbc16f9a4cca845",
+      "size": 55601101
     },
     "linux-arm64": {
-      "sha256": "ea6453b55ff428d4d152d829731504400d49969ab0750264a931eaf0d7659122",
-      "size": 55055213
+      "sha256": "009f687e2f5a03cf2af277638861543aead3ad907136c2de8e48a6a702040182",
+      "size": 55600268
     }
   }
 }

package/src/swift-standin-emit.ts

@@ -862,7 +862,16 @@ export function emitSwiftStandin(
         if (fix && !/^(?:prefix|infix|postfix)\b/.test(spelled))
           spelled = `${fix} ${spelled}`
       }
-      emit(`${attrs}public ${spelled} { ${trap(path)} }`)
+      const measured = behavior.get(path)
+      if (measured) used.add(path)
+      const overloadBody = /\basync\b/.test(spelled)
+        ? measured?.asyncBody
+        : /\bResult</.test(spelled)
+          ? measured?.resultBody
+          : undefined
+      emit(
+        `${attrs}public ${spelled} { ${overloadBody ?? measured?.body ?? trap(path)} }`,
+      )
     } else if (kind === 'swift.var') {
       const parsed = splitAccessors(text(symbol).replace(/^let /, 'var '))
       // a measured global keeps the sdk's declaration with a working getter,

package/src/swift-standins.ts

@@ -15,6 +15,7 @@ import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
 import { getCliVersion } from './cli-version'
+import { parsePlistSource } from './plist'
 import {
   swiftDistributionAt,
   swiftMacroPlugins,
@@ -773,6 +774,25 @@ function crateFor(root: string, name: string): string | null {
   return walk(root, 4)
 }
 
+// the simulator slice's static library as the xcframework's Info.plist
+// declares it, the name Xcode links; the archive itself may be unbuilt.
+function simulatorLibraryName(dir: string): string | undefined {
+  const info = parsePlistSource(fs.readFileSync(path.join(dir, 'Info.plist'), 'utf8'))
+  const libraries =
+    info && typeof info === 'object' ? Reflect.get(info, 'AvailableLibraries') : undefined
+  if (!Array.isArray(libraries)) return undefined
+  return libraries
+    .filter(
+      (entry: unknown): entry is object =>
+        typeof entry === 'object' &&
+        entry !== null &&
+        Reflect.get(entry, 'SupportedPlatform') === 'ios' &&
+        Reflect.get(entry, 'SupportedPlatformVariant') === 'simulator',
+    )
+    .map((entry): unknown => Reflect.get(entry, 'LibraryPath'))
+    .find((name): name is string => typeof name === 'string' && /^lib.+\.a$/.test(name))
+}
+
 /**
  * the WebAssembly static library a c stand-in links in place of its traps,
  * or null when it has none. a build the developer supplies in the
@@ -785,13 +805,7 @@ export function standinLibrary(
   searchRoot: string,
 ): string | null {
   const dir = xcframework(binary).dir
-  const slice = fs
-    .readdirSync(dir)
-    .filter((name) => /^ios-.+-simulator$/.test(name))
-    .sort()[0]
-  const library = slice
-    ? fs.readdirSync(path.join(dir, slice)).find((name) => /^lib.+\.a$/.test(name))
-    : undefined
+  const library = simulatorLibraryName(dir)
   const supplied = path.join(dir, RUST_TARGET)
   if (fs.existsSync(supplied)) {
     const found = fs.readdirSync(supplied).filter((name) => name.endsWith('.a'))

package/src/swift-submit.ts

@@ -98,7 +98,12 @@ export const MAX_SWIFT_COMPILE_IMAGE_TOTAL_BYTES = 16 * 1024 * 1024
 // 39: canvas image draw operations retain their target bundle.
 // 40: implicit animations retain typed value changes through a generation marker.
 // 41: original compiled SwiftUI libraries retain data and deferred URL inputs.
-export const SWIFT_HOST_ABI = 41
+// 42: shader image arguments retain system symbol identity and content textures.
+// 43: Foundation preferences retain property-list values through the tenant owner.
+// 44: swift scene phase follows the tenant's application lifecycle.
+// 45: confirmation dialogs present from a measured `presentationSource`, and a
+// refreshable's pull ends on the host's `refreshEnded` request.
+export const SWIFT_HOST_ABI = 45
 
 export interface SwiftImageUpload {
   /** the raster file picked for the asset (has the extension). */