peachsim 0.1.2220 → 0.1.2222

package/src/expo-native-workspace.ts

@@ -7,7 +7,7 @@ import path from 'node:path'
 import { promisify } from 'node:util'
 import { detectPackageManager } from '../cli/commands/detect'
 import { teamMachineInstalled } from './admitted-mac-build'
-import { workspaceExclusion } from './expo-workspace-exclusion'
+import { workspaceExclusion, type WorkspaceExclusion } from './expo-workspace-exclusion'
 import { cacheDir } from './home-paths'
 import { failedOutputLine } from './native-failure-output'
 import { requireNativeGit } from './native-git'
@@ -49,7 +49,7 @@ export function reactNativePodsEnvironment() {
 function workspacePackageManager(
   root: string,
   declared: unknown,
-  excluded: (relative: string) => boolean,
+  excluded: WorkspaceExclusion,
 ): string {
   const manager = typeof declared === 'string' ? declared : detectPackageManager(root)
   const locks = [
@@ -116,7 +116,7 @@ export async function verifyExpoWorkspaceCopy(app: string, work: string) {
     for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
       const file = path.join(directory, entry.name)
       const relative = path.relative(root, file)
-      if (excluded(relative)) continue
+      if (excluded(relative, entry.isDirectory())) continue
       const copy = path.join(work, relative)
       if (entry.isDirectory()) walk(file)
       else if (entry.isSymbolicLink()) {
@@ -212,7 +212,7 @@ async function hashWorkspaceInputs(
   hash: string
   // the subset of inputs that decides the prepared workspace
   nativeHash: string
-  excluded: (relative: string) => boolean
+  excluded: WorkspaceExclusion
 }> {
   const root = findWorkspaceRoot(app)
   const excluded = await workspaceExclusion(
@@ -286,7 +286,7 @@ async function hashWorkspaceInputs(
       signal?.throwIfAborted()
       const file = path.join(directory, entry.name)
       const relative = path.relative(root, file)
-      if (excluded(relative)) continue
+      if (excluded(relative, entry.isDirectory())) continue
       hash.update(`${relative}\0`)
       if (entry.isSymbolicLink()) {
         const link = `link\0${await fs.promises.readlink(file)}\0`
@@ -446,7 +446,7 @@ function syncChangedFiles(
   root: string,
   work: string,
   appRelative: string,
-  excluded: (relative: string) => boolean,
+  excluded: WorkspaceExclusion,
   installed: boolean,
 ) {
   const copyIfNewer = (file: string, relative: string, newerOnly: boolean) => {
@@ -464,8 +464,12 @@ function syncChangedFiles(
     )
       return
     fs.mkdirSync(path.dirname(target), { recursive: true })
-    fs.copyFileSync(file, target)
-    fs.utimesSync(target, source.atime, source.mtime)
+    // a tool already running from the copy (the autolinker) must never read a
+    // truncated script, so the new bytes land by rename
+    const staged = `${target}.${process.pid}.peach-sync`
+    fs.copyFileSync(file, staged)
+    fs.utimesSync(staged, source.atime, source.mtime)
+    fs.renameSync(staged, target)
   }
   const walkInstalled = (directory: string) => {
     for (const entry of fs.readdirSync(directory, { withFileTypes: true })) {
@@ -490,7 +494,7 @@ function syncChangedFiles(
       }
       // the app's ios project is prebuild output, not a source
       if (
-        excluded(relative) ||
+        excluded(relative, entry.isDirectory()) ||
         entry.isSymbolicLink() ||
         (!sourceIos && relative === path.join(appRelative, 'ios'))
       )
@@ -640,7 +644,7 @@ function prepare(app: string, stage: 'project' | 'workspace', signal?: AbortSign
 async function copyInstalledWorkspace(
   root: string,
   destination: string,
-  excluded: (relative: string) => boolean,
+  excluded: WorkspaceExclusion,
 ) {
   const installed: string[] = []
   await fs.promises.cp(root, destination, {

package/src/expo-workspace-exclusion.ts

@@ -4,6 +4,8 @@ import path from 'node:path'
 import { promisify } from 'node:util'
 import ignore from 'ignore'
 
+export type WorkspaceExclusion = (relative: string, isDirectory?: boolean) => boolean
+
 // eas build archives a repository without its gitignored paths, so the prepare
 // neither copies nor hashes them: files a dev server generates into an ignored
 // directory never invalidate the prepared workspace.
@@ -13,7 +15,7 @@ export async function workspaceExclusion(
   root: string,
   portable = false,
   linkedPackages: string[] = [],
-) {
+): Promise<WorkspaceExclusion> {
   const listed = await promisify(execFile)(
     'git',
     ['ls-files', '-z', '--others', '--ignored', '--exclude-standard', '--directory'],
@@ -34,8 +36,8 @@ export async function workspaceExclusion(
       .filter(Boolean)
       .map((entry) => entry.replace(/\/$/, '')),
   )
-  const ignoreFiles = new Map<string, ReturnType<typeof ignore>>()
-  return (relative: string) => {
+  const ignoreFiles = new Map<string, ReturnType<typeof ignore> | null>()
+  return (relative, knownDirectory) => {
     const parts = relative.split(path.sep)
     const linked = linkedPackages.some((directory) =>
       relative.startsWith(directory + path.sep),
@@ -47,16 +49,17 @@ export async function workspaceExclusion(
     }
     if (portable && relative) {
       let excluded = false
-      const isDirectory = fs.lstatSync(path.join(root, relative)).isDirectory()
+      const isDirectory =
+        knownDirectory ?? fs.lstatSync(path.join(root, relative)).isDirectory()
       for (let index = 0; index < parts.length; index++) {
         const directory = parts.slice(0, index).join(path.sep)
         let rules = ignoreFiles.get(directory)
-        if (!rules) {
-          rules = ignore()
+        if (rules === undefined) {
           const file = path.join(root, directory, '.gitignore')
-          if (fs.existsSync(file)) rules.add(fs.readFileSync(file, 'utf8'))
+          rules = fs.existsSync(file) ? ignore().add(fs.readFileSync(file, 'utf8')) : null
           ignoreFiles.set(directory, rules)
         }
+        if (!rules) continue
         const item = parts.slice(index).join('/')
         const result = rules.test(isDirectory ? `${item}/` : item)
         if (result.ignored) excluded = true

package/src/react-native-autolinking.ts

@@ -29,6 +29,7 @@ async function cliAdvertises(
   appRoot: string,
   signal?: AbortSignal,
 ): Promise<boolean> {
+  const started = Date.now()
   const { stdout, stderr } = await run('node', [cli, ...args], {
     cwd: appRoot,
     signal,
@@ -38,7 +39,7 @@ async function cliAdvertises(
   })
   if (!stdout.trim())
     throw new Error(
-      `${cli} ${args.join(' ')} returned empty help output${stderr.trim() ? `: ${stderr.trim()}` : ''}`,
+      `${cli} ${args.join(' ')} exited 0 after ${Date.now() - started}ms with empty help output${stderr.trim() ? `: ${stderr.trim()}` : ''}`,
     )
   return stdout.includes(token)
 }

package/src/runtime-delivery.ts

@@ -39,6 +39,13 @@ export const RNX_RUNTIME_PRODUCT: RuntimeProduct = {
   // vite/metro plugins serve, so its absence means the tarball is not one.
   installedMarker: 'index.html',
   verifyInstall: ensureCliCompanion,
+  // canvaskit's ganesh backend is a runtime pack because a browser with WebGPU
+  // never runs it, but linux and CI browsers usually have no GPU and always do
+  afterInstall: async (dir) => {
+    if (process.platform !== 'linux' && !process.env.CI) return
+    const { ensureRuntimePackFor } = await import('./runtime-packs.ts')
+    await ensureRuntimePackFor(dir, '/engine/canvaskit-ganesh.wasm')
+  },
   env: {
     cdnOrigin: 'PEACH_CDN_ORIGIN',
     channel: 'PEACH_RUNTIME_CHANNEL',

package/src/swift-compile.ts

@@ -140,7 +140,7 @@ import {
   SWIFT_FRAMEWORK_PRODUCT_FILE,
   swiftFrameworkProductSchema,
 } from './swiftRuntimeProductContract'
-import { optimizeWasm, WASM_OPTIMIZE_IDENTITY } from './wasm-optimize'
+import { KEEP_WASM_NAMES, optimizeWasm, WASM_OPTIMIZE_IDENTITY } from './wasm-optimize'
 import { writeBuildFile } from './write-build-file'
 import { writeXcodeHeaderSearch } from './xcode-header-search'
 import type { SwiftImageUpload } from './swift-submit'
@@ -424,11 +424,14 @@ export function swiftModuleInterface(
 // the compiler imports the module that defines a type, and UIKit's declarations
 // live in UIKitCore/UIKitText, which only the umbrella UIKit module represents
 // to clang. CoreFoundation's CGFloat lives in the Swift CoreFoundation overlay,
-// while clang's Foundation umbrella provides CoreFoundation/CoreFoundation.h.
+// while clang's Foundation umbrella also owns networking class declarations.
 const clangInterfaceHeader = (header: string): string =>
   header
     .replace(/^@import (?:UIKitCore|UIKitText);$/gm, '@import UIKit;')
-    .replace(/^@import CoreFoundation;$/gm, '@import Foundation;')
+    .replace(
+      /^@import (?:CoreFoundation|FoundationNetworking);$/gm,
+      '@import Foundation;',
+    )
     .replace(/\b_TtC10Foundation\d+(NS\w+)\b/g, '$1')
     .replace(/\b__attribute__\(\(objc_subclassing_restricted\)\)\s*/g, '')
 
@@ -836,7 +839,8 @@ const OPTIONAL_FRAMEWORK_DEPENDENCIES: Record<string, string[]> = {
   PeachCFNetwork: [],
   JavaScriptCore: ['PeachJavaScriptCore'],
   PeachJavaScriptCore: [],
-  GameplayKit: [],
+  // GameplayKit names SpriteKit and SceneKit nodes, as on iOS
+  GameplayKit: ['SpriteKit', 'SceneKit', 'PeachBox2D', 'simd', 'GLKit'],
   simd: [],
   ModelIO: ['simd'],
   GLKit: ['ModelIO'],
@@ -1593,14 +1597,25 @@ export function swiftTargetDependencies(
 }
 
 const ONE_PRODUCT = '.product(name: "One", package: "sootsim-swift")'
-const SPRITEKIT_PRODUCT = '.product(name: "SpriteKit", package: "sootsim-swift")'
-// SpriteKit is an optional family (plans/peach/spritekit.md): it links only
-// into an app whose sources import it, so no other artifact carries it.
-const importsSpriteKit = (files: Record<string, string>): boolean =>
-  Object.entries(files).some(
-    ([file, contents]) =>
-      file.endsWith('.swift') && swiftImportNames(contents).includes('SpriteKit'),
+// the game family (plans/peach/spritekit.md, plans/peach/scenekit.md) links
+// only into an app whose sources import it, so no other artifact carries it.
+// SceneKit names SpriteKit, so importing it links both.
+const GAME_FAMILY = ['SpriteKit', 'SceneKit'] as const
+const gameProducts = (files: Record<string, string>): string[] => {
+  const imported = new Set(
+    Object.entries(files).flatMap(([file, contents]) =>
+      file.endsWith('.swift') ? swiftImportNames(contents) : [],
+    ),
   )
+  if (imported.has('SceneKit')) return [...GAME_FAMILY]
+  return imported.has('SpriteKit') ? ['SpriteKit'] : []
+}
+const gameProduct = (name: string) =>
+  `.product(name: "${name}", package: "sootsim-swift")`
+const GAME_REACH: Record<string, string[]> = {
+  SpriteKit: ['SpriteKit', 'PeachBox2D', 'simd', 'GLKit'],
+  SceneKit: ['SceneKit'],
+}
 // every iOS source sees through Foundation what darwin's Foundation exports:
 // PeachObjC supplies the ObjectiveC module's selectors, Dispatch Foundation's
 // Darwin queue exports, and FoundationNetworking (re-exporting PeachFoundation)
@@ -1672,6 +1687,7 @@ export function swiftArtifactHash(
   hash.update(`swift-compile\n${release}\n`)
   hash.update(compilerSourceDigest)
   if (input.oneModule) hash.update('one-module\n')
+  if (KEEP_WASM_NAMES) hash.update('names\n')
   hash.update(swiftModuleDigest(moduleRoot))
   if (input.optimize) hash.update(`optimize\n${WASM_OPTIMIZE_IDENTITY}\n`)
   for (const file of Object.keys(input.files).sort()) {
@@ -1853,12 +1869,13 @@ export function emitSwiftPackageManifest(args: {
   nativeFlags?: Map<string, string[]>
   nativeImportFlags?: Map<string, string[]>
   nativeHeaderFlags?: string[]
+  nativeSwiftHeaderMaps?: ReadonlyMap<string, string>
   nativeHeaderDeclarations?: Readonly<Record<string, readonly string[]>>
   objcImplementationModules?: Set<string>
   siblings: Map<string, string[]>
   moduleRoot: string
   oneModule?: boolean
-  spriteKit?: boolean
+  gameProducts?: string[]
   /** link the prebuilt distribution at moduleRoot instead of its sources. */
   distribution?: SwiftDistributionManifest
   /** prebuilt interfaces owned by local source or system-library targets. */
@@ -1883,7 +1900,14 @@ export function emitSwiftPackageManifest(args: {
   /** the development region SwiftPM needs as defaultLocalization beside localized resources. */
   defaultLocalization?: string
 }): string {
-  const { targets, siblings, moduleRoot, oneModule, spriteKit, distribution } = args
+  const {
+    targets,
+    siblings,
+    moduleRoot,
+    oneModule,
+    gameProducts = [],
+    distribution,
+  } = args
   const prebuilt = args.prebuilt
   // a distribution and a separately built framework package both link objects
   // instead of compiling the framework sources into this package's scratch.
@@ -1930,9 +1954,8 @@ export function emitSwiftPackageManifest(args: {
   for (const name of [...siblings.values()].flat())
     if (OPTIONAL_FRAMEWORKS.has(name) && !targets.some((target) => target.name === name))
       reach(name)
-  if (spriteKit) {
-    for (const name of ['SpriteKit', 'PeachBox2D', 'simd', 'GLKit']) reach(name)
-  }
+  for (const product of gameProducts)
+    for (const name of GAME_REACH[product] ?? []) reach(name)
   // the distribution builder names each object lib/<target>-<file>.o.
   // preserve link order; only reached framework registrants link eagerly.
   // the list is named by its content: SwiftPM relinks when the linker
@@ -1968,7 +1991,7 @@ export function emitSwiftPackageManifest(args: {
     const objects = available.filter(
       (object) =>
         !targets.some((target) => object.startsWith(`lib/${target.name}-`)) &&
-        [...OPTIONAL_FRAMEWORKS, 'SpriteKit', 'PeachBox2D'].every(
+        [...OPTIONAL_FRAMEWORKS, ...GAME_FAMILY, 'PeachBox2D'].every(
           (name) => !object.startsWith(`lib/${name}-`) || reachedFrameworks.has(name),
         ),
     )
@@ -2163,6 +2186,11 @@ export function emitSwiftPackageManifest(args: {
       includeImportContext(dependency)
     const importedNativeFlags = [
       ...(args.nativeImportFlags?.get(target.name) ?? []),
+      ...[...importContext].flatMap((name) => {
+        const map =
+          name === target.name ? undefined : args.nativeSwiftHeaderMaps?.get(name)
+        return map ? ['-fmodule-map-file=' + map] : []
+      }),
       ...[...importContext].flatMap((name) => args.native?.get(name)?.importFlags ?? []),
       ...[...importContext].flatMap((name) => {
         const flags = targets.find((target) => target.name === name)?.swiftFlags ?? []
@@ -2239,7 +2267,7 @@ export function emitSwiftPackageManifest(args: {
           : [
               '.product(name: "SwiftUI", package: "sootsim-swift")',
               ...(oneModule ? [ONE_PRODUCT] : []),
-              ...(spriteKit ? [SPRITEKIT_PRODUCT] : []),
+              ...gameProducts.map(gameProduct),
             ]),
         ...(siblings.get(target.name) ?? []).flatMap((dependency) =>
           clang &&
@@ -2293,7 +2321,7 @@ export function emitSwiftPackageManifest(args: {
         .unsafeFlags(${flagArray(`[
           ${REACTOR_FLAG}${executableLinkFlags(args.root)}          "-Xlinker", "--export-if-defined=__main_argc_argv"${library},
         ]`)}),
-        .unsafeFlags(["-Xlinker", "--strip-all"], .when(configuration: .release)),
+        ${KEEP_WASM_NAMES ? '' : '.unsafeFlags(["-Xlinker", "--strip-all"], .when(configuration: .release)),'}
       ]`
       : librarySettings.length > 0
         ? `,
@@ -3010,8 +3038,6 @@ const FOUNDATION_OVERLAY_GLOBALS = new Set([
   'NSURLProtectionSpaceHTTPS',
   'NSURLProtectionSpaceHTTPSProxy',
   'NSURLProtectionSpaceSOCKSProxy',
-  'NSURLSessionDownloadTaskResumeData',
-  'NSURLSessionTransferSizeUnknown',
   'NSURLSessionUploadTaskResumeData',
   'NSUTF16BigEndianStringEncoding',
   'NSUTF16LittleEndianStringEncoding',
@@ -4610,6 +4636,7 @@ export function writeSwiftProject(
   // declarations are imported before swift can emit the header that native
   // implementations consume. give those implementations a downstream target.
   const importModuleMaps = new Map<string, string>()
+  const sourceModuleMaps = new Map<string, { path: string; contents: string }>()
   const generatedModuleMaps: { output: string; module: string; published: string }[] = []
   for (const target of targets) {
     const prefix = target.path === '.' ? '' : `${target.path}/`
@@ -4938,6 +4965,10 @@ export function writeSwiftProject(
         stageTargetFile(target.name, path.join(layout.root, modulemap), moduleContents, {
           allowExisting: true,
         })
+        sourceModuleMaps.set(swiftTargetModuleName(target.name), {
+          path: path.join(layout.root, modulemap),
+          contents: moduleContents.toString(),
+        })
         // clang resolves a framework map loaded through extern module against
         // the map directory, not the framework root, so mirror every header
         // the map names there. clang looks in Headers/ and PrivateHeaders/ for
@@ -5272,6 +5303,7 @@ export function writeSwiftProject(
       ? ['-ivfsoverlay', headerSearch.files[0]!]
       : []
   const nativeHeaderFlags: string[] = [...headerAliasFlags]
+  const nativeSwiftHeaderMaps = new Map<string, string>()
   const originalMaps = new Map<string, string>()
   for (const target of input.nativeTargets ?? []) {
     for (const flag of [...target.flags, ...target.cxxFlags]) {
@@ -5304,9 +5336,14 @@ export function writeSwiftProject(
     )
     const moduleName = swiftTargetModuleName(name)
     const originalMap = originalMaps.get(moduleName)
-    const originalTokens = originalMap ? moduleMapTokens(input.files[originalMap]!) : []
+    const stagedMap = sourceModuleMaps.get(moduleName)
+    const originalPath = originalMap
+      ? path.join(layout.root, originalMap)
+      : stagedMap?.path
+    const originalContents = originalMap ? input.files[originalMap]! : stagedMap?.contents
+    const originalTokens = originalContents ? moduleMapTokens(originalContents) : []
     if (
-      originalMap &&
+      originalPath &&
       originalTokens.some(
         (token, index) =>
           token === 'module' &&
@@ -5314,26 +5351,26 @@ export function writeSwiftProject(
             originalTokens[index + 1] === `${moduleName}.Swift`),
       )
     ) {
-      nativeHeaderFlags.push('-fmodule-map-file=' + path.join(layout.root, originalMap))
+      nativeHeaderFlags.push('-fmodule-map-file=' + originalPath)
+      nativeSwiftHeaderMaps.set(name, originalPath)
       continue
     }
     files.set(
       modulemap,
-      originalMap
-        ? `extern module ${moduleName} ${JSON.stringify(path.join(layout.root, originalMap))}\nmodule ${moduleName}.Swift {\n  header ${JSON.stringify(path.join(headerDirectory, name + '-Swift.h'))}\n  requires objc\n}\n`
+      originalPath
+        ? `extern module ${moduleName} ${JSON.stringify(originalPath)}\nmodule ${moduleName}.Swift {\n  header ${JSON.stringify(path.join(headerDirectory, name + '-Swift.h'))}\n  requires objc\n}\n`
         : swiftObjCModuleMap(
             moduleName,
-            [
-              ...(
-                input.nativeTargets?.find((target) => target.name === name)
-                  ?.publicHeaders ?? []
-              ).map((header) => path.join(layout.root, header)),
-              path.join(headerDirectory, name + '-Swift.h'),
-            ],
+            (
+              input.nativeTargets?.find((target) => target.name === name)
+                ?.publicHeaders ?? []
+            ).map((header) => path.join(layout.root, header)),
             submoduleImports.get(moduleName),
+            path.join(headerDirectory, name + '-Swift.h'),
           ),
     )
     nativeHeaderFlags.push('-fmodule-map-file=' + modulemap)
+    nativeSwiftHeaderMaps.set(name, modulemap)
   }
   // swiftpm plans a build root's build once and reuses the plan until a
   // manifest changes, so a file added to the module would never compile
@@ -5632,13 +5669,17 @@ export function writeSwiftProject(
         .replace(product, `${product}\n        ${ONE_PRODUCT},`)
         .replace(flags, `${flags}${ONE_IMPLICIT_FLAGS}`)
     }
-    if (importsSpriteKit(input.files)) {
+    const games = gameProducts(input.files)
+    if (games.length > 0) {
       const anchor = '.product(name: "CoreLocation", package: "sootsim-swift"),'
       if (!manifest.includes(anchor))
         throw new Error(
-          'scripts/contrast-app-Package.swift lost the line the SpriteKit product links at',
+          'scripts/contrast-app-Package.swift lost the line the game products link at',
         )
-      manifest = manifest.replace(anchor, `${anchor}\n        ${SPRITEKIT_PRODUCT},`)
+      manifest = manifest.replace(
+        anchor,
+        [anchor, ...games.map((name) => `${gameProduct(name)},`)].join('\n        '),
+      )
     }
     files.set(path.join(layout.root, 'Package.swift'), manifest + moduleFiles)
   } else {
@@ -5788,6 +5829,7 @@ export function writeSwiftProject(
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets
@@ -5807,7 +5849,7 @@ export function writeSwiftProject(
         siblings: moduleSiblings,
         moduleRoot,
         oneModule: input.oneModule,
-        spriteKit: importsSpriteKit(input.files),
+        gameProducts: gameProducts(input.files),
         distribution: distribution ?? undefined,
         moduleExcludes,
         deferDarwinOverlay:
@@ -5974,31 +6016,30 @@ export function writeSwiftProject(
       ),
     ]),
   )
+  const producerSet = new Set([...Object.keys(nativeHeaderDeclarations), ...producers])
+  const orderedProducers: string[] = []
   const included = new Set<string>()
   const include = (name: string): void => {
     if (included.has(name)) return
     included.add(name)
     for (const dependency of dependencies.get(name) ?? []) include(dependency)
+    if (producerSet.has(name)) orderedProducers.push(name)
   }
-  for (const producer of producers)
+  for (const producer of producerSet)
     for (const dependency of dependencies.get(producer) ?? []) include(dependency)
-  // building a producer also emits its dependency producers' headers.
+  const needsHeaderStages = [...producerSet].some((name) => included.has(name))
+  for (const producer of producerSet) include(producer)
   return {
     nativeBuildTargets: [...native].flatMap(([name, plan]) => [
       ...(!plan.mixed && plan.sources.length > 0 ? [name] : []),
       ...(plan.groups?.map((group) => group.name) ?? (plan.late ? [plan.late.name] : [])),
     ]),
-    headerProducers: [
-      ...new Set([
-        ...Object.keys(nativeHeaderDeclarations),
-        ...producers.filter((name) => !included.has(name)),
-      ]),
-    ],
+    headerProducers: orderedProducers,
     emittedHeaderProducers: [
       ...new Set([...Object.keys(nativeHeaderDeclarations), ...producers]),
     ],
     nativeHeaderDeclarations,
-    headerProductTarget,
+    headerProductTarget: needsHeaderStages ? undefined : headerProductTarget,
     targetFailures,
     generatedOwners,
     targetToolset,
@@ -6332,14 +6373,9 @@ function linkedFrameworkTargets(
     ))
       reach(match[1]!)
   }
-  if (importsSpriteKit(input.files))
-    for (const name of ['SpriteKit', 'PeachBox2D', 'simd', 'GLKit']) reach(name)
-  const wanted = [
-    'PeachApp',
-    ...(input.oneModule ? ['One'] : []),
-    ...(importsSpriteKit(input.files) ? ['SpriteKit'] : []),
-    ...reached,
-  ]
+  const games = gameProducts(input.files)
+  for (const product of games) for (const name of GAME_REACH[product] ?? []) reach(name)
+  const wanted = ['PeachApp', ...(input.oneModule ? ['One'] : []), ...games, ...reached]
   const linked = [...new Set(wanted)].filter((name) => libraries.has(name))
   if (!linked.includes('PeachApp'))
     throw new Error('swift-compile: the framework package declares no PeachApp library')

package/src/swift-coverage/xcode-assets.ts

@@ -139,20 +139,22 @@ export function planAssetSymbols(
   // xcode 27.1 resolves an unset TARGETED_DEVICE_FAMILY to 1 for an iOS target
   // (xcodebuild -showBuildSettings on an application target that never sets it)
   const families = (settings.TARGETED_DEVICE_FAMILY || '1').split(',').sort().join(',')
-  // families 6 and 7 change neither the devices nor symbols for the iOS slice
+  // families 3, 6 and 7 change neither the devices nor symbols for the iOS
+  // slice (3: actool output identical for 1,3,7 and 1,7, xcode 27.1)
   const devices: AssetDevice[] | undefined = (
     {
       '1': ['iphone'],
       '2': ['ipad'],
       '1,2': ['iphone', 'ipad'],
       '1,7': ['iphone'],
+      '1,3,7': ['iphone'],
       '1,2,6': ['iphone', 'ipad'],
       '1,2,7': ['iphone', 'ipad'],
     } satisfies Record<string, AssetDevice[]>
   )[families]
   if (!devices)
     return unknown(
-      `Generated asset symbols are proven only for TARGETED_DEVICE_FAMILY 1, 2, 1,2, 1,7, 1,2,6 or 1,2,7; this target resolves to "${families}".`,
+      `Generated asset symbols are proven only for TARGETED_DEVICE_FAMILY 1, 2, 1,2, 1,7, 1,3,7, 1,2,6 or 1,2,7; this target resolves to "${families}".`,
     )
   const plan: SwiftAssetPlan = {
     catalogs: catalogs.map((path) => ({

package/src/swift-host.ts

@@ -1773,6 +1773,33 @@ export function sourceFiles(root: string): string[] {
 }
 
 // project files and the xcconfigs their settings read are build inputs, never resources
+// the app target's resources Xcode copies to the bundle root: a folder
+// reference keeps its tree and a catalog compiles, so neither is flat
+function xcodeFlatResources(
+  app: Pick<XcodeModuleTarget, 'resources' | 'resourceNames'> | undefined,
+): ReadonlySet<string> {
+  if (!app) return new Set()
+  return new Set(
+    app.resources.filter(
+      (file) =>
+        !Object.hasOwn(app.resourceNames, file) &&
+        !file.split(path.sep).some((segment) => segment.endsWith('.xcassets')),
+    ),
+  )
+}
+
+// an xcode target declares its resources independently of their source
+// directory; the bundle file and image enumerators use Resources as their root marker.
+function bundleResourcePath(
+  flatResources: ReadonlySet<string>,
+  disk: string,
+  file: string,
+): string {
+  return flatResources.has(disk) && !file.split('/').includes('Resources')
+    ? `Resources/${file}`
+    : file
+}
+
 function resourceCandidateFiles(root: string): string[] {
   return packageFiles(root, false).filter(
     (file) =>
@@ -1941,12 +1968,24 @@ export function buildSwiftResourceTable(
     const disk = byRelative.get(file)
     return !disk || !layout?.targetDirs.get(disk)?.startsWith(`${XCODE_FRAMEWORKS_DIR}/`)
   })
-  const found = enumerateBundleImages(relative, readContents, (file) => {
-    const disk = byRelative.get(file)
-    if (!disk) throw new Error(`image source ${file} has no input file`)
-    const key = layout ? xcodeInputKey(layout, disk, file) : file
-    return swiftResourceBundleForFile(bundles, key)?.path ?? '.'
-  })
+  const flatResources = xcodeFlatResources(layout?.app)
+  const bundled = new Map(
+    relative.map((file) => [
+      bundleResourcePath(flatResources, byRelative.get(file)!, file),
+      file,
+    ]),
+  )
+  const found = enumerateBundleImages(
+    [...bundled.keys()],
+    (file) => readContents(bundled.get(file) ?? file),
+    (marked) => {
+      const file = bundled.get(marked) ?? marked
+      const disk = byRelative.get(file)
+      if (!disk) throw new Error(`image source ${file} has no input file`)
+      const key = layout ? xcodeInputKey(layout, disk, file) : file
+      return swiftResourceBundleForFile(bundles, key)?.path ?? '.'
+    },
+  ).map((image) => ({ ...image, file: bundled.get(image.file) ?? image.file }))
   const colors = enumerateBundleColors(catalogFiles, readContents)
   const symbols = enumerateBundleSymbols(catalogFiles, readContents, (file) => {
     const disk = byRelative.get(file)
@@ -2180,20 +2219,20 @@ export function buildSwiftBundleFiles(
     }
   }
   const groups = new Map<string, Map<string, string>>()
-  const appResources = new Set(xcode?.app.resources ?? [])
+  const flatResources = xcodeFlatResources(xcode?.app)
   for (const file of relative) {
     const disk = path.join(packagePath, ...file.split('/'))
+    const folderName = xcode?.app.resourceNames[disk]
+    if (folderName) {
+      watched.push(file)
+      addFile(folderName, readPackageFile(packagePath, disk, limits.resourceBytes))
+      continue
+    }
     const key = xcode ? xcodeInputKey(xcode, disk, file) : file
     const bundle = swiftResourceBundleForFile(bundles, key)
     const bundlePath = bundle?.path ?? '.'
     const group = groups.get(bundlePath) ?? new Map<string, string>()
-    // an xcode target declares its resources independently of their source
-    // directory; the bundle enumerator uses Resources as its root marker.
-    const resource =
-      appResources.has(disk) && !file.split('/').includes('Resources')
-        ? `Resources/${file}`
-        : file
-    group.set(resource, disk)
+    group.set(bundleResourcePath(flatResources, disk, file), disk)
     groups.set(bundlePath, group)
   }
   for (const bundle of bundles) {

package/src/swift-objc-import.ts

@@ -49,6 +49,7 @@ export function swiftObjCModuleMap(
   module: string,
   headers: readonly string[],
   submodules: ReadonlySet<string> = new Set(),
+  swiftHeader?: string,
 ): string {
   const header = (file: string) => `header ${JSON.stringify(file)}`
   const stem = (file: string) =>
@@ -60,6 +61,9 @@ export function swiftObjCModuleMap(
         ? `  module ${stem(file)} { ${header(file)} export * }`
         : `  ${header(file)}`,
     ),
+    ...(swiftHeader
+      ? ['  module Swift {', `    ${header(swiftHeader)}`, '    requires objc', '  }']
+      : []),
     '  export *',
     '}',
     '',