peachsim 0.1.2187 → 0.1.2189

package/src/swift-compile.ts

@@ -4903,26 +4903,27 @@ export function writeSwiftProject(
           allowExisting: true,
         })
         // clang resolves a framework map loaded through extern module against
-        // the map directory, not the framework root, so mirror the umbrella there
+        // the map directory, not the framework root, so mirror every header
+        // the map names there. clang looks in Headers/ and PrivateHeaders/ for
+        // a framework module's header, whatever its keyword (a podspec
+        // module_map names private headers in explicit submodules).
         if (modulemap.endsWith('/Modules/module.modulemap')) {
-          const headers = path.posix.join(
-            path.posix.dirname(path.posix.dirname(modulemap)),
-            'Headers',
-          )
-          const mirrored = path.posix.join(path.posix.dirname(modulemap), 'Headers')
-          for (const [, umbrella] of moduleContents
+          const framework = path.posix.dirname(path.posix.dirname(modulemap))
+          for (const [, header] of moduleContents
             .toString()
-            .matchAll(/\bumbrella\s+header\s+"([^"]+)"/g)) {
-            const source = settings.productHeaders[path.posix.join(headers, umbrella!)]
-            const contents = source === undefined ? undefined : input.files[source]
-            if (contents !== undefined)
-              stageTargetFile(
-                target.name,
-                path.join(layout.root, mirrored, umbrella!),
-                contents,
-                { allowExisting: true },
-              )
-          }
+            .matchAll(/\bheader\s+"([^"]+)"/g))
+            for (const folder of ['Headers', 'PrivateHeaders']) {
+              const source =
+                settings.productHeaders[path.posix.join(framework, folder, header!)]
+              const contents = source === undefined ? undefined : input.files[source]
+              if (contents !== undefined)
+                stageTargetFile(
+                  target.name,
+                  path.join(layout.root, path.posix.dirname(modulemap), folder, header!),
+                  contents,
+                  { allowExisting: true },
+                )
+            }
         }
         if (nativeC && path.posix.basename(modulemap) !== 'module.modulemap') {
           stageTargetFile(
@@ -5342,7 +5343,16 @@ export function writeSwiftProject(
           swiftModules.delete(name)
           projectOverlayFrameworks.delete(name)
         }
+      // a mixed target's framework map is the clang half of its own module
+      // (swift imports it as the underlying module), not a framework a Swift
+      // module replaces, so its submodule imports stay.
+      const mixedModules = new Set(
+        [...native].flatMap(([name, value]) =>
+          value.mixed ? [swiftTargetModuleName(name)] : [],
+        ),
+      )
       for (const name of sourceModules) swiftModules.add(name)
+      for (const name of mixedModules) swiftModules.delete(name)
       for (const [file, contents] of Object.entries(input.files))
         if (file.endsWith('.modulemap'))
           addSwiftOverlayFrameworks(contents, swiftModules, projectOverlayFrameworks)

package/src/swift-distribution-contract.ts

@@ -161,3 +161,75 @@ export function parseSwiftDistributionLock(value: unknown): SwiftDistributionLoc
 export function swiftDistributionKey(id: string, host: SwiftDistributionHost): string {
   return `${id}/${host}.tar.gz`
 }
+
+/** the canary index under PEACH_SWIFT_ENDPOINT: the newest unpinned builds. */
+export const SWIFT_CANARY_INDEX = 'canary/index.json'
+
+/** one unpinned distribution build any agent can fetch instead of rebuilding.
+ *  its wasm SDK is a pinned public URL, or a local candidate uploaded beside it
+ *  under `wasmSdkKey`. */
+export interface SwiftDistributionCanary extends SwiftWasmSdk {
+  /** the distribution id plus the SDK checksum prefix: one set of build inputs. */
+  id: string
+  distribution: string
+  release: string
+  /** the commit the module sources were built from. */
+  source: string
+  builtBy: string
+  builtAt: string
+  wasmSdkKey?: string
+  hosts: Partial<Record<SwiftDistributionHost, { sha256: string; size: number }>>
+}
+
+export function swiftCanaryKey(id: string, host: SwiftDistributionHost): string {
+  return `canary/${id}/${host}.tar.gz`
+}
+
+export function parseSwiftCanaryIndex(value: unknown): SwiftDistributionCanary[] {
+  if (!Array.isArray(value)) throw new Error('invalid Swift canary index')
+  return value.map((item) => {
+    if (
+      !isRecord(item) ||
+      ![
+        item.id,
+        item.distribution,
+        item.release,
+        item.source,
+        item.builtBy,
+        item.builtAt,
+        item.wasmSdkId,
+        item.wasmSdkUrl,
+        item.wasmSdkChecksum,
+      ].every((field) => typeof field === 'string') ||
+      (item.wasmSdkKey !== undefined && typeof item.wasmSdkKey !== 'string') ||
+      !isRecord(item.hosts)
+    )
+      throw new Error('invalid Swift canary index entry')
+    const hosts: SwiftDistributionCanary['hosts'] = {}
+    for (const host of SWIFT_DISTRIBUTION_HOSTS) {
+      const archive = item.hosts[host]
+      if (archive === undefined) continue
+      if (
+        !isRecord(archive) ||
+        typeof archive.sha256 !== 'string' ||
+        !/^[a-f0-9]{64}$/.test(archive.sha256) ||
+        typeof archive.size !== 'number'
+      )
+        throw new Error(`invalid Swift canary archive for ${host}`)
+      hosts[host] = { sha256: archive.sha256, size: archive.size }
+    }
+    return {
+      id: String(item.id),
+      distribution: String(item.distribution),
+      release: String(item.release),
+      source: String(item.source),
+      builtBy: String(item.builtBy),
+      builtAt: String(item.builtAt),
+      wasmSdkId: String(item.wasmSdkId),
+      wasmSdkUrl: String(item.wasmSdkUrl),
+      wasmSdkChecksum: String(item.wasmSdkChecksum),
+      ...(typeof item.wasmSdkKey === 'string' ? { wasmSdkKey: item.wasmSdkKey } : {}),
+      hosts,
+    }
+  })
+}

package/src/swift-guest-source-plan.ts

@@ -123,10 +123,14 @@ export function guestSourceObjects(
       target.sourceTarget === null ? [] : [target.sourceTarget],
     ),
   )
-  // swiftpm names each build directory by its target's c99 module name
-  const owners = new Map(
-    [...generatedOwners].map(([name, owner]) => [swiftTargetModuleName(name), owner]),
-  )
+  // swiftpm names each build directory by its target's c99 module name; a
+  // target of a package kept as a dependency builds into the same tree.
+  const owners = new Map([
+    ...[...names].map((name) => [swiftTargetModuleName(name), name] as const),
+    ...[...generatedOwners].map(
+      ([name, owner]) => [swiftTargetModuleName(name), owner] as const,
+    ),
+  ])
   // a binary target's prebuilt WebAssembly library is named for the target
   const libraries = new Map(
     graph.targets.flatMap((target) =>

package/src/swift-toolchain.ts

@@ -529,7 +529,8 @@ export const SWIFT_AUTOLINK_LINKER = '.peach-wasm-ld'
  * for a 42MB output). the linker written here keeps the first copy of each
  * -l flag in clang's response file and runs the toolchain's wasm-ld, which
  * links the same bytes in about 1GiB. callers pass its path to clang with
- * `-Xclang-linker -fuse-ld=<path>`.
+ * `-Xclang-linker -fuse-ld=<path>`. it also drops apple ld's -ObjC, which wasm-ld
+ * rejects; the guest link loads objective-c archive members itself.
  */
 export function writeSwiftAutolinkLinker(
   directory: string,
@@ -543,7 +544,7 @@ for arg in "$@"; do
   case $arg in
     @*)
       rsp=\${arg#@}
-      awk 'BEGIN { RS = " "; ORS = " " } /^"-l/ { if (seen[$0]++) next }${omitLibraries.map((name) => ` $0 == "\\"-l${name}\\"" { next }`).join('')} { print }' "$rsp" > "$rsp.dedup"
+      awk 'BEGIN { RS = " "; ORS = " " } /^"-l/ { if (seen[$0]++) next }${omitLibraries.map((name) => ` $0 == "\\"-l${name}\\"" { next }`).join('')} $0 == "\\"-ObjC\\"" { next } { print }' "$rsp" > "$rsp.dedup"
       mv "$rsp.dedup" "$rsp"
       if [ "\${PEACH_DEFER_WASM_LINK:-}" = "1" ] && grep -q '"--start-lib"' "$rsp"; then
         cp "$rsp" ${JSON.stringify(path.join(directory, '.peach-link.rsp'))}
@@ -567,7 +568,7 @@ exec ${JSON.stringify(path.join(toolchainBin, 'wasm-ld'))} "$@"
 }
 
 // home-paths.ts's rnxHomeDir, repeated because this file imports node builtins only.
-function peachHome(): string {
+export function peachHome(): string {
   const override = process.env.PEACH_HOME
   return override ? path.resolve(override) : path.join(os.homedir(), '.peach')
 }

package/src/xcode-project.ts

@@ -3188,7 +3188,9 @@ export function readXcodeAppTarget(
           installName: settings('LD_DYLIB_INSTALL_NAME') || null,
           buildVersion: {
             platform: settings('PLATFORM_NAME') || null,
-            minimumOS: settings('IPHONEOS_DEPLOYMENT_TARGET') || null,
+            minimumOS:
+              settings('IPHONEOS_DEPLOYMENT_TARGET') ||
+              XCODE_DEFAULT_IOS_DEPLOYMENT_TARGET,
             sdk: settings('SDK_VERSION') || null,
           },
           machOType: settings('MACH_O_TYPE') || null,