peachsim 0.1.2190 → 0.1.2191

package/src/kotlin-host.ts

@@ -170,7 +170,7 @@ function entrySource(ids: string[]): string {
   ].join('\n')
 }
 
-const BUILD_FORMAT = 19
+const BUILD_FORMAT = 20
 const builds = new Map<string, Promise<KotlinArtifact>>()
 
 function buildsDir(): string {
@@ -1342,6 +1342,7 @@ async function compileKotlin(
         [
           ...common,
           '-nowarn',
+          '-Xpartial-linkage-loglevel=error',
           `-Xinclude=${path.join(work, 'klib')}`,
           '-Xir-produce-js',
           '-ir-output-dir',
@@ -1449,6 +1450,10 @@ async function compileKotlin(
           path.join(work, 'java-abi', `Spec${index}.kt`),
           spec.file,
         )
+      output = output.replace(
+        /^error: <app> @ (.+\.kt:\d+:\d+): (.*)$/gm,
+        '$1: error: $2',
+      )
       throw new Error(
         `kotlin compile failed:\n${output.trim() || (error instanceof Error ? error.message : String(error))}`,
       )

package/src/swift-compile.ts

@@ -2255,6 +2255,11 @@ export function emitSwiftPackageManifest(args: {
       ...(!native?.clang && target.publicHeadersPath !== undefined
         ? [`      publicHeadersPath: ${JSON.stringify(target.publicHeadersPath)},`]
         : []),
+      // swiftpm appends the root package's name after a target's own flags
+      // unless the target opts out of package access
+      ...(!clang && target.swiftFlags?.includes('-package-name')
+        ? ['      packageAccess: false,']
+        : []),
       // the native backend supplies dependency module maps without their
       // compiled modules. textual c++ includes keep those dependencies usable.
       `      ${clang ? nativeSettings : swiftSettings}${link}`,
@@ -2733,117 +2738,6 @@ const FOUNDATION_OVERLAY_GLOBALS = new Set([
   'NSFileErrorMinimum',
   'NSFormattingErrorMaximum',
   'NSFormattingErrorMinimum',
-  'NSFoundationVersionNumber',
-  'NSFoundationVersionNumber10_0',
-  'NSFoundationVersionNumber10_1',
-  'NSFoundationVersionNumber10_10',
-  'NSFoundationVersionNumber10_10_1',
-  'NSFoundationVersionNumber10_10_2',
-  'NSFoundationVersionNumber10_10_3',
-  'NSFoundationVersionNumber10_10_4',
-  'NSFoundationVersionNumber10_10_5',
-  'NSFoundationVersionNumber10_10_Max',
-  'NSFoundationVersionNumber10_11',
-  'NSFoundationVersionNumber10_11_1',
-  'NSFoundationVersionNumber10_11_2',
-  'NSFoundationVersionNumber10_11_3',
-  'NSFoundationVersionNumber10_11_4',
-  'NSFoundationVersionNumber10_11_Max',
-  'NSFoundationVersionNumber10_1_1',
-  'NSFoundationVersionNumber10_1_2',
-  'NSFoundationVersionNumber10_1_3',
-  'NSFoundationVersionNumber10_1_4',
-  'NSFoundationVersionNumber10_2',
-  'NSFoundationVersionNumber10_2_1',
-  'NSFoundationVersionNumber10_2_2',
-  'NSFoundationVersionNumber10_2_3',
-  'NSFoundationVersionNumber10_2_4',
-  'NSFoundationVersionNumber10_2_5',
-  'NSFoundationVersionNumber10_2_6',
-  'NSFoundationVersionNumber10_2_7',
-  'NSFoundationVersionNumber10_2_8',
-  'NSFoundationVersionNumber10_3',
-  'NSFoundationVersionNumber10_3_1',
-  'NSFoundationVersionNumber10_3_2',
-  'NSFoundationVersionNumber10_3_3',
-  'NSFoundationVersionNumber10_3_4',
-  'NSFoundationVersionNumber10_3_5',
-  'NSFoundationVersionNumber10_3_6',
-  'NSFoundationVersionNumber10_3_7',
-  'NSFoundationVersionNumber10_3_8',
-  'NSFoundationVersionNumber10_3_9',
-  'NSFoundationVersionNumber10_4',
-  'NSFoundationVersionNumber10_4_1',
-  'NSFoundationVersionNumber10_4_10',
-  'NSFoundationVersionNumber10_4_11',
-  'NSFoundationVersionNumber10_4_2',
-  'NSFoundationVersionNumber10_4_3',
-  'NSFoundationVersionNumber10_4_4_Intel',
-  'NSFoundationVersionNumber10_4_4_PowerPC',
-  'NSFoundationVersionNumber10_4_5',
-  'NSFoundationVersionNumber10_4_6',
-  'NSFoundationVersionNumber10_4_7',
-  'NSFoundationVersionNumber10_4_8',
-  'NSFoundationVersionNumber10_4_9',
-  'NSFoundationVersionNumber10_5',
-  'NSFoundationVersionNumber10_5_1',
-  'NSFoundationVersionNumber10_5_2',
-  'NSFoundationVersionNumber10_5_3',
-  'NSFoundationVersionNumber10_5_4',
-  'NSFoundationVersionNumber10_5_5',
-  'NSFoundationVersionNumber10_5_6',
-  'NSFoundationVersionNumber10_5_7',
-  'NSFoundationVersionNumber10_5_8',
-  'NSFoundationVersionNumber10_6',
-  'NSFoundationVersionNumber10_6_1',
-  'NSFoundationVersionNumber10_6_2',
-  'NSFoundationVersionNumber10_6_3',
-  'NSFoundationVersionNumber10_6_4',
-  'NSFoundationVersionNumber10_6_5',
-  'NSFoundationVersionNumber10_6_6',
-  'NSFoundationVersionNumber10_6_7',
-  'NSFoundationVersionNumber10_6_8',
-  'NSFoundationVersionNumber10_7',
-  'NSFoundationVersionNumber10_7_1',
-  'NSFoundationVersionNumber10_7_2',
-  'NSFoundationVersionNumber10_7_3',
-  'NSFoundationVersionNumber10_7_4',
-  'NSFoundationVersionNumber10_8',
-  'NSFoundationVersionNumber10_8_1',
-  'NSFoundationVersionNumber10_8_2',
-  'NSFoundationVersionNumber10_8_3',
-  'NSFoundationVersionNumber10_8_4',
-  'NSFoundationVersionNumber10_9',
-  'NSFoundationVersionNumber10_9_1',
-  'NSFoundationVersionNumber10_9_2',
-  'NSFoundationVersionNumber_iOS_4_0',
-  'NSFoundationVersionNumber_iOS_4_1',
-  'NSFoundationVersionNumber_iOS_4_2',
-  'NSFoundationVersionNumber_iOS_4_3',
-  'NSFoundationVersionNumber_iOS_5_0',
-  'NSFoundationVersionNumber_iOS_5_1',
-  'NSFoundationVersionNumber_iOS_6_0',
-  'NSFoundationVersionNumber_iOS_6_1',
-  'NSFoundationVersionNumber_iOS_7_0',
-  'NSFoundationVersionNumber_iOS_7_1',
-  'NSFoundationVersionNumber_iOS_8_0',
-  'NSFoundationVersionNumber_iOS_8_1',
-  'NSFoundationVersionNumber_iOS_8_2',
-  'NSFoundationVersionNumber_iOS_8_3',
-  'NSFoundationVersionNumber_iOS_8_4',
-  'NSFoundationVersionNumber_iOS_8_x_Max',
-  'NSFoundationVersionNumber_iOS_9_0',
-  'NSFoundationVersionNumber_iOS_9_1',
-  'NSFoundationVersionNumber_iOS_9_2',
-  'NSFoundationVersionNumber_iOS_9_3',
-  'NSFoundationVersionNumber_iOS_9_4',
-  'NSFoundationVersionNumber_iOS_9_x_Max',
-  'NSFoundationVersionNumber_iPhoneOS_2_0',
-  'NSFoundationVersionNumber_iPhoneOS_2_1',
-  'NSFoundationVersionNumber_iPhoneOS_2_2',
-  'NSFoundationVersionNumber_iPhoneOS_3_0',
-  'NSFoundationVersionNumber_iPhoneOS_3_1',
-  'NSFoundationVersionNumber_iPhoneOS_3_2',
   'NSFoundationVersionWithFileManagerResourceForkSupport',
   'NSFreeHashTable',
   'NSFreeMapTable',
@@ -4328,7 +4222,13 @@ export function writeSwiftProject(
   for (const file of Object.keys(input.files)) {
     if (!file.endsWith('.swift')) continue
     const target = bySourcePath.find(
-      (candidate) => candidate.path === '.' || file.startsWith(`${candidate.path}/`),
+      (candidate) =>
+        (candidate.path === '.' || file.startsWith(`${candidate.path}/`)) &&
+        (candidate.sources === undefined ||
+          candidate.sources.some((source) => {
+            const selected = path.posix.join(candidate.path, source)
+            return file === selected || file.startsWith(`${selected}/`)
+          })),
     )
     // swiftpm never compiles an excluded file (a prebuilt core's Swift)
     const excluded = target?.exclude?.some(
@@ -4401,9 +4301,17 @@ export function writeSwiftProject(
   }
   const targetEntries = (target: SwiftPackageTarget) => {
     const prefix = target.path === '.' ? '' : `${target.path}/`
+    // targets may share a directory and pick their compiled files with `sources`;
+    // swiftpm leaves every header on disk for relative includes
     return Object.entries(input.files).filter(
       ([file]) =>
         file.startsWith(prefix) &&
+        (target.sources === undefined ||
+          !(file.endsWith('.swift') || isSwiftNativeTranslationUnit(file)) ||
+          target.sources.some((source) => {
+            const selected = path.posix.join(prefix, source)
+            return file === selected || file.startsWith(`${selected}/`)
+          })) &&
         !target.exclude?.some(
           (excluded) =>
             file === `${prefix}${excluded}` || file.startsWith(`${prefix}${excluded}/`),
@@ -4615,8 +4523,7 @@ export function writeSwiftProject(
       )) {
         const include = match[1]!
         const producer = /(?:^|\/)([^/]+)-Swift\.h$/.exec(include)?.[1]
-        if (producer && targets.some((value) => value.name === producer))
-          producers.add(producer)
+        if (producer && swiftTargets.has(producer)) producers.add(producer)
         const local = [
           path.posix.join(path.posix.dirname(file), include),
           `${includes}${include}`,

package/src/swift-host.ts

@@ -1078,13 +1078,17 @@ async function buildXcodeLayout(root: string): Promise<XcodeLayout | null> {
             feature.configuration === packageConfiguration,
         )
         .map((feature) => feature.name),
-      swiftFlags: target.packageSwiftFlags
-        .filter(
-          (setting) =>
-            setting.configuration === null ||
-            setting.configuration === packageConfiguration,
-        )
-        .flatMap((setting) => setting.flags),
+      // the flat build gives every module one package; swiftpm names each
+      // module for its own package, which `@retroactive` and `package` read
+      swiftFlags: ['-package-name', swiftPackageIdentity(target.packageDir)].concat(
+        target.packageSwiftFlags
+          .filter(
+            (setting) =>
+              setting.configuration === null ||
+              setting.configuration === packageConfiguration,
+          )
+          .flatMap((setting) => setting.flags),
+      ),
       linkedLibraries: target.packageLibraries
         .filter(
           (library) =>
@@ -1575,7 +1579,7 @@ function xcodeManifest(layout: XcodeLayout): string {
     ...layout.targets.map((target) =>
       target.systemLibrary
         ? `  .systemLibrary(name: "${target.name}", path: "${target.path}"),`
-        : `  .target(name: "${target.name}", ${target.dependencies === undefined ? '' : `dependencies: [${dependencies(target)}], `}path: "${target.path}", ${target.exclude.length > 0 ? `exclude: ${JSON.stringify(target.exclude)}, ` : ''}${target.resources ? 'resources: [], ' : ''}${target.publicHeadersPath === undefined ? '' : `publicHeadersPath: ${JSON.stringify(target.publicHeadersPath)}, `}${clangSettings(target)}${swiftManifestSettings(target)}${libraries(target)}),`,
+        : `  .target(name: "${target.name}", ${target.dependencies === undefined ? '' : `dependencies: [${dependencies(target)}], `}path: "${target.path}", ${target.exclude.length > 0 ? `exclude: ${JSON.stringify(target.exclude)}, ` : ''}${target.sources === undefined ? '' : `sources: ${JSON.stringify(target.sources)}, `}${target.resources ? 'resources: [], ' : ''}${target.publicHeadersPath === undefined ? '' : `publicHeadersPath: ${JSON.stringify(target.publicHeadersPath)}, `}${clangSettings(target)}${swiftManifestSettings(target)}${libraries(target)}),`,
     ),
     '])',
     '',

package/src/swift-interface-bodies.ts

@@ -119,7 +119,13 @@ export function swiftInterfaceWithoutBodies(text: string, keepDefaults = false):
       continue
     }
     const char = text[i]!
-    if (char === '=' && parens > 0 && text[i - 1] === ' ' && text[i + 1] === ' ') {
+    if (
+      !keepDefaults &&
+      char === '=' &&
+      parens > 0 &&
+      text[i - 1] === ' ' &&
+      text[i + 1] === ' '
+    ) {
       out = out.trimEnd()
       i = skipExpression(text, i + 1)
       continue

package/src/swift-objc-standin.ts

@@ -800,10 +800,11 @@ export function objcView(
         '-module-cache-path',
         moduleCache,
         '-minimum-access-level',
-        // symbol graphs hide public underscored names at the public threshold.
-        // original clang headers remain the declaration boundary, and a swift
-        // overlay names its underscored and spi declarations.
-        original || surface.interface ? 'internal' : 'public',
+        // symbol graphs hide public underscored names at the public threshold,
+        // including a function with an underscored parameter. clang headers
+        // remain the declaration boundary, and a swift overlay names its
+        // underscored and spi declarations.
+        'internal',
         ...(surface.interface ? ['-include-spi-symbols'] : []),
         '-skip-synthesized-members',
         '-omit-extension-block-symbols',
@@ -928,6 +929,16 @@ export function objcView(
   // clang's builtin typedefs (stddef's size_t), which an apple sdk keeps in
   // their own builtin modules.
   const ownHeaders = new Set(headerFiles(headersDir).map((name) => path.basename(name)))
+  // the graph prints a c function pointer typedef as a plain function type,
+  // whose function-typed parameters swift treats as non-escaping; the importer
+  // gives every c function pointer @convention(c), which always escapes
+  const functionPointers = new Set(
+    [...originals.values()].flatMap((text) =>
+      [...text.matchAll(/\btypedef\b[^;{}]*?\(\s*\*\s*(\w+)\s*\)\s*\(/g)].map(
+        (match) => match[1]!,
+      ),
+    ),
+  )
   const graphs = fs
     .readdirSync(out)
     .filter((name) => name.endsWith('.symbols.json'))
@@ -936,10 +947,37 @@ export function objcView(
       const graph: SymbolGraph = JSON.parse(fs.readFileSync(path.join(out, name), 'utf8'))
       return {
         ...graph,
-        symbols: graph.symbols.filter((symbol) => {
-          const header = /^c:([^@]+\.h)@/.exec(symbol.identifier.precise)?.[1]
-          return !header || ownHeaders.has(header)
-        }),
+        symbols: graph.symbols
+          .filter((symbol) => {
+            const header = /^c:([^@]+\.h)@/.exec(symbol.identifier.precise)?.[1]
+            return !header || ownHeaders.has(header)
+          })
+          .map((symbol) => {
+            if (
+              symbol.kind.identifier !== 'swift.typealias' ||
+              !symbol.identifier.precise.startsWith('c:') ||
+              !functionPointers.has(symbol.pathComponents.at(-1) ?? '')
+            )
+              return symbol
+            const fragments = symbol.declarationFragments ?? []
+            const equals = fragments.findIndex((fragment) =>
+              fragment.spelling.includes('='),
+            )
+            const arrow = fragments.findLastIndex((fragment) =>
+              fragment.spelling.includes('->'),
+            )
+            return {
+              ...symbol,
+              declarationFragments: fragments.map((fragment, index) =>
+                index > equals &&
+                index < arrow &&
+                fragment.kind === 'typeIdentifier' &&
+                functionPointers.has(fragment.spelling)
+                  ? { ...fragment, spelling: `@escaping ${fragment.spelling}` }
+                  : fragment,
+              ),
+            }
+          }),
       }
     })
   inheritedDefaultInits(stagedSurface, graphs, toolchainBin, search, moduleCache, work)

package/src/swift-packages.ts

@@ -687,6 +687,7 @@ export function resolveSwiftPackages(options: {
         dir: target.dir,
         files,
         exclude: target.exclude,
+        ...(target.sources ? { sources: target.sources } : {}),
         packageDir: pkg.manifest.dir,
         remote: pkg.remote,
         iosDeployment: pkg.manifest.iosDeployment,

package/src/xcode-project.ts

@@ -1509,7 +1509,9 @@ function projectTargets(project: LoadedProject): TargetRef[] {
 }
 
 // an application target peach builds, for the iOS simulator like every
-// target here. one whose SDKROOT names another platform, such as a watchOS
+// target here. xcode builds a multiplatform target for an iOS destination
+// whenever its SUPPORTED_PLATFORMS lists one, whatever SDKROOT names; without
+// that list, a target whose SDKROOT names another platform, such as a watchOS
 // app beside the iOS one, is never the app peach runs.
 function isIosAppTarget(
   ref: TargetRef,
@@ -1524,10 +1526,10 @@ function isIosAppTarget(
     },
     options,
   )
+  const platforms = settingList(get('SUPPORTED_PLATFORMS'))
+  if (platforms.length > 0) return platforms.some(isIosPlatform)
   const sdk = get('SDKROOT')
-  return sdk === 'auto'
-    ? settingList(get('SUPPORTED_PLATFORMS')).some(isIosPlatform)
-    : sdk === '' || isIosPlatform(sdk)
+  return sdk === '' || isIosPlatform(sdk)
 }
 
 // the device or simulator sdk, bare or versioned such as iphonesimulator18.0.