peachsim 0.1.2191 → 0.1.2193

package/src/swift-toolchain.ts

@@ -34,22 +34,7 @@ export function sourceSwiftCheckout(): string {
 
 /** swiftpm's SDK directory option, shared by discovery and compilation. */
 export function swiftSdkOptions(): string[] {
-  const directory = process.env.PEACH_SWIFT_SDKS_PATH
-  if (directory) return ['--swift-sdks-path', path.resolve(directory)]
-  // child config is confined, but source checkouts still discover the SDK
-  // from the caller's original linux default, including a custom xdg home.
-  if (scratch && process.platform === 'linux') {
-    const config = process.env.XDG_CONFIG_HOME
-    if (config !== undefined && !path.isAbsolute(config))
-      throw new Error('XDG_CONFIG_HOME must be an absolute path')
-    return [
-      '--swift-sdks-path',
-      config === undefined
-        ? path.join(os.userInfo().homedir, '.swiftpm', 'swift-sdks')
-        : path.join(config, 'swiftpm', 'swift-sdks'),
-    ]
-  }
-  return []
+  return ['--swift-sdks-path', path.resolve(peachSwiftSdksDir())]
 }
 
 // host archives include the official driver/runtime and the qualified patched frontend.
@@ -395,9 +380,22 @@ export function ensureSwiftLinuxRuntime(release: string): void {
     process.stderr.write(`peach: installing Linux runtime libxml2.so.2 into ${root}…\n`)
     const download = `${plan.dest}.${process.pid}.tmp`
     try {
-      execFileSync('curl', ['-fsSL', '--show-error', plan.url, '-o', download], {
-        stdio: 'inherit',
-      })
+      execFileSync(
+        'curl',
+        [
+          '-fsSL',
+          '--show-error',
+          '--retry',
+          '3',
+          '--retry-all-errors',
+          plan.url,
+          '-o',
+          download,
+        ],
+        {
+          stdio: 'inherit',
+        },
+      )
       if (swiftFileChecksum(download) !== plan.checksum)
         throw new Error('declared Linux runtime checksum mismatch')
       fs.renameSync(download, plan.dest)
@@ -573,6 +571,11 @@ export function peachHome(): string {
   return override ? path.resolve(override) : path.join(os.homedir(), '.peach')
 }
 
+/** where the pinned wasm SDK installs unless PEACH_SWIFT_SDKS_PATH names another. */
+export function peachSwiftSdksDir(): string {
+  return process.env.PEACH_SWIFT_SDKS_PATH ?? path.join(peachHome(), 'swift', 'sdks')
+}
+
 export const BUILDERS_ROOT_ENV = 'CONTRAST_BUILDERS_ROOT'
 
 let agentBuildersRoot: string | undefined
@@ -935,10 +938,7 @@ function installSwiftSdkArchive(swift: string, sdk: SwiftWasmSdk, archive: strin
       store,
     ])
     const expected = swiftSdkPayloadChecksum(stagedBundle)
-    const directory = process.env.PEACH_SWIFT_SDKS_PATH
-    const locks = directory
-      ? path.join(path.resolve(directory), '.peach-locks')
-      : path.join(os.homedir(), '.swiftpm', 'builder-locks')
+    const locks = path.join(path.resolve(peachSwiftSdksDir()), '.peach-locks')
     fs.mkdirSync(locks, { recursive: true })
     execFileSync(
       'perl',
@@ -1004,9 +1004,22 @@ export function installSwiftWasmSdk(release: string, sdk: SwiftWasmSdk): void {
     if (sdk.wasmSdkUrl.startsWith('file:'))
       fs.copyFileSync(fileURLToPath(sdk.wasmSdkUrl), archive)
     else
-      execFileSync('curl', ['-fsSL', '--show-error', sdk.wasmSdkUrl, '-o', archive], {
-        stdio: 'inherit',
-      })
+      execFileSync(
+        'curl',
+        [
+          '-fsSL',
+          '--show-error',
+          '--retry',
+          '3',
+          '--retry-all-errors',
+          sdk.wasmSdkUrl,
+          '-o',
+          archive,
+        ],
+        {
+          stdio: 'inherit',
+        },
+      )
     installSwiftSdkArchive(swift, sdk, archive)
     swiftToolchain(release, sdk)
   } finally {
@@ -1166,10 +1179,7 @@ export function swiftSdkInstallStep(release: string, wasmSdk: SwiftWasmSdk): str
 function swiftSdkInstallCommand(release: string, wasmSdk: SwiftWasmSdk): string {
   const { wasmSdkId, wasmSdkUrl, wasmSdkChecksum } = wasmSdk
   const program = `import { installSwiftWasmSdk } from "peachsim/swift-toolchain"; installSwiftWasmSdk(${JSON.stringify(release)}, ${JSON.stringify({ wasmSdkId, wasmSdkUrl, wasmSdkChecksum })})`
-  const directory = process.env.PEACH_SWIFT_SDKS_PATH
-  const environment = directory
-    ? `PEACH_SWIFT_SDKS_PATH='${path.resolve(directory).replaceAll("'", "'\\''")}' `
-    : ''
+  const environment = `PEACH_SWIFT_SDKS_PATH='${path.resolve(peachSwiftSdksDir()).replaceAll("'", "'\\''")}' `
   return `${environment}node --input-type=module -e '${program.replaceAll("'", "'\\''")}'`
 }
 

package/src/swift-wasm-prune.ts

@@ -1121,10 +1121,11 @@ export function pruneSwiftWasmLink(
   const distDir = path.join(moduleRoot, 'lib')
   // the app's own struct and class field descriptors stay: SwiftUI attaches
   // @State and @StateObject by reflecting the app's view structs.
-  // the shim reflects its own wrappers and views (State, ObservedObject, Published), so SwiftUI and Combine keep their descriptors
+  // the shim reflects its own wrappers and views (State, ObservedObject, Published), so SwiftUI and Combine keep their descriptors.
+  // a framework's SwiftUI overlay (_StoreKit_SwiftUI) declares views whose @State and @Environment attach the same way.
   const dropsReflection = (obj: ParsedObject, name: string | undefined) =>
     !!name &&
-    !/^(SwiftUI|Combine)-/.test(path.basename(obj.file)) &&
+    !/^(SwiftUI|Combine|_[A-Za-z0-9]+_SwiftUI)-/.test(path.basename(obj.file)) &&
     (name.startsWith('l__swift5_reflection_descriptor') ||
       (name.startsWith('$s') &&
         (name.endsWith('CMF') || name.endsWith('VMF')) &&

package/src/turbo-runtime.lock.json

@@ -8,11 +8,11 @@
   },
   "compiler": "swift-6.4.0-RELEASE-custom-11345d60dca47496",
   "sdk": {
-    "id": "swift-6.4.0-RELEASE_wasm-peach-3452e5a2",
-    "checksum": "fe042506d9418d5b73a3a30d62157931439c23e3bcb869871a0fcb8747223a02"
+    "id": "swift-6.4.0-RELEASE_wasm-peach-19471d4b",
+    "checksum": "764c16e7e34156bf90d6c3372a2b77b98b9d8c3470235520d0f9619f90f33456"
   },
   "framework": {
-    "distribution": "2405235872029d30",
+    "distribution": "87fc4d2ff9d5d588",
     "wireAbi": "246b8412514b644113e6a26252c8ebd6de49ab4156ac5f5c98bb9e4c2ff2568b"
   },
   "archives": [
@@ -20,71 +20,71 @@
       "headers": {
         "reactNativeJsi": "0f8c2defbca69a27a848a81ae72363073bf9602fd316e57a75811be1a0528358"
       },
-      "sha256": "038855e8522f39ea85557bcafc84eb64ec5d9b155c686dca3cff6fa397de0165",
-      "size": 25395
+      "sha256": "6f416d065d88a6f592f0c34dca2d898f2c1adadeeacc07c2f8f4de453715f298",
+      "size": 25393
     },
     {
       "headers": {
         "reactNativeJsi": "21a624ea24fd17d56bf26832d496fc1177067f89640414c20e6486c7984dfb0a"
       },
-      "sha256": "b815028eb321b50907658ba883329d13204d29368cc598dab5c39b2a249de88f",
+      "sha256": "0c68d14139a733fa990e55fa23224589fe9a74ce82db0ce5b9b52da51211390e",
       "size": 26139
     },
     {
       "headers": {
         "reactNativeJsi": "324aefd8591d9ce688bce7589c4c2b516cd33ecb95d35c47239a87a8fcf6a8da"
       },
-      "sha256": "f8fd89f680b86d8abb42a644db8866eb33ff82b4370a7c373bc054efdec33095",
-      "size": 25395
+      "sha256": "adba5b074a4fc2d6c367de74f24aa4b6273363f8b39c9ad9d15be2775f08a2e1",
+      "size": 25394
     },
     {
       "headers": {
         "reactNativeJsi": "33596664ee7d7a6623f0796a6feb429543316c3a41b211150acda6e1d835286c"
       },
-      "sha256": "9190e3a9f312d8c156aacf727904cf1b9c543b30833f544164daa32e3c005d84",
-      "size": 25168
+      "sha256": "778f943ad7fcfba7060e2f29d2bf9d3d7365c60d09b8e2fcccfe11f95920b321",
+      "size": 25165
     },
     {
       "headers": {
         "reactNativeJsi": "66b2cd5a38511195207f6c8a76aba735f9b9cc66a52a0d00780ffe5d331623f7"
       },
-      "sha256": "89bc0c5214c848b06e50424dcecf1cb0d3b01b058270d606a86c2e799d529c15",
-      "size": 25401
+      "sha256": "06cdf08b6f177a54dbf734f76f23ff192c4eb50238fae5207e923fa8e0cfb4bd",
+      "size": 25398
     },
     {
       "headers": {
         "reactNativeJsi": "96db4e758dd53e9320cef7cad485e00aa06e7a982cefd920f17007de8a5bd9f9"
       },
-      "sha256": "8c0d4fa4b65b44dc649c7401df0832663c837098bb5794b143751073c800e66b",
-      "size": 26139
+      "sha256": "62920d91d1805ae0df3ad0f672f6405575c04df4e66948ea37b4e165f39f8eb5",
+      "size": 26141
     },
     {
       "headers": {
         "reactNativeJsi": "aeab590ddd1218df963462242d3954ce467b0fa88f70e91429e4ffc74d230893"
       },
-      "sha256": "ea3395926d0c9202404ca292fed40561c04537cbc11bb8b49ac8a7d9f983fa60",
+      "sha256": "fab02f584e10cee2197c10b5c488873d5203313e10f07b2940283bee3ae12a57",
       "size": 26138
     },
     {
       "headers": {
         "reactNativeJsi": "b5fb260522384dd7ab07d740cdc534b529922446fcec798341c7817d9eaa49f4"
       },
-      "sha256": "7a17d6b3e143a8cf38d73b18b21e142b40fc2c0076d7a01dfb1837194c977f43",
-      "size": 25268
+      "sha256": "72bbd117ff2d4495f46fceecd0959e8bd2a0647fdf514bf2e2e95922514bcb66",
+      "size": 25267
     },
     {
       "headers": {
         "reactNativeJsi": "c6b391a1e870ccf7cdd534be63582862840f8245b99ebd253317deece1e6ffd5"
       },
-      "sha256": "96f6b7bb8bd33d20ee9b6249c0f747e2d160d80515efbf74f9a263f57d847667",
-      "size": 26142
+      "sha256": "10e28d5ce3eb41c695bef897fa974f8919559558a2b847963047f13ce06dc6a0",
+      "size": 26144
     },
     {
       "headers": {
         "reactNativeJsi": "c8270f1315745ecc204c4209a4f50f58ff6f14b4a385ad6820a69800270b53c6"
       },
-      "sha256": "bf587717d6b32d1e7abc630e952f0c70ea964488f87e83c20028b86781317b6f",
-      "size": 25104
+      "sha256": "52226df9610d8b5f9b47fee6bedbdbaa04df7f2f562213bd8b433a5f998d8aa3",
+      "size": 25105
     }
   ]
 }