peachsim 0.1.936 → 0.1.937

package/src/swift-host.ts

@@ -29,6 +29,7 @@ import { swiftImplicitResourcePaths, type SwiftPackageTarget } from './swift-pac
 import {
   REMOTE_CHECKOUTS,
   resolveSwiftPackages,
+  type SwiftPackageBinary,
   type SwiftPackageGap,
   type SwiftPackages,
 } from './swift-packages'
@@ -202,6 +203,8 @@ interface XcodeProjectEntry {
     standinKey: string
     packages: SwiftPackages
     standins: SwiftStandin[]
+    /** why a framework the project vendors got no stand-in, by name. */
+    projectGaps: Map<string, string>
   }
 }
 
@@ -233,7 +236,11 @@ export function openXcodeProject(
 function swiftPackages(
   entry: XcodeProjectEntry,
   app: XcodeAppTarget,
-): { packages: SwiftPackages; standins: SwiftStandin[] } {
+): {
+  packages: SwiftPackages
+  standins: SwiftStandin[]
+  projectGaps: Map<string, string>
+} {
   const stamp = (file: string | null) =>
     file && fs.existsSync(file) ? fs.statSync(file).mtimeMs : 0
   const key = JSON.stringify([
@@ -261,6 +268,7 @@ function swiftPackages(
         provided: entry.provided,
       }),
       standins: [],
+      projectGaps: new Map(),
     }
     entry.packages = cached
   }
@@ -269,7 +277,22 @@ function swiftPackages(
   // their reason with why no stand-in was built. surfaces peach already
   // ships are skipped up front, so no generated target overrides a shipped
   // module.
-  const reached = cached.packages.binaries.filter((binary) => binary.reached)
+  // a framework the project vendors links straight into its target, so it
+  // stands in the same way a package's binary target does.
+  const vendored = app.binaryFrameworks.map(
+    ({ name, path: dir }): SwiftPackageBinary => ({
+      target: name,
+      source: 'the project',
+      url: null,
+      checksum: null,
+      dir,
+      reached: true,
+    }),
+  )
+  const reached = [
+    ...cached.packages.binaries.filter((binary) => binary.reached),
+    ...vendored,
+  ]
   if (entry.moduleRoot && entry.provided && reached.length > 0) {
     const resolved = swiftModuleToolchain(entry.moduleRoot)
     const toolchain = {
@@ -292,6 +315,12 @@ function swiftPackages(
         binaryGaps: built.gaps,
       })
       cached.standins = built.standins
+      cached.projectGaps = new Map(
+        vendored.flatMap(({ target }) => {
+          const gap = built.gaps.get(target)
+          return gap ? [[target, gap] as const] : []
+        }),
+      )
       cached.standinKey = generation
     }
   }
@@ -328,6 +357,8 @@ interface XcodeLayout {
   targets: (SwiftPackageTarget & { exclude: string[] })[]
   packages: SwiftPackages
   standins: SwiftStandin[]
+  /** why a framework the project vendors got no stand-in, by name. */
+  projectGaps: Map<string, string>
   /** the input directory each app and framework source compiles under. */
   targetDirs: Map<string, string>
   files: string[]
@@ -358,7 +389,7 @@ function xcodeLayout(root: string): XcodeLayout | null {
       mainActorIsolation: framework.mainActorIsolation,
     })
   }
-  const { packages, standins } = swiftPackages(registered, app)
+  const { packages, standins, projectGaps } = swiftPackages(registered, app)
   for (const standin of standins)
     targets.push({
       name: standin.module,
@@ -401,6 +432,7 @@ function xcodeLayout(root: string): XcodeLayout | null {
     targets,
     packages,
     standins,
+    projectGaps,
     targetDirs,
     files: [...files].sort(),
   }
@@ -1052,10 +1084,16 @@ async function missingModulesMessage(
 ): Promise<string> {
   const layout = xcodeLayout(packagePath)
   const gaps = new Map<string, SwiftPackageGap>([
-    ...(layout?.app.binaryFrameworks ?? []).map(
-      (name) =>
-        [name, { source: 'the project', reason: 'a vendored binary framework' }] as const,
-    ),
+    ...(layout?.app.binaryFrameworks ?? []).map(({ name }) => {
+      const gap = layout?.projectGaps.get(name)
+      return [
+        name,
+        {
+          source: 'the project',
+          reason: `a vendored binary framework${gap ? `; no stand-in: ${gap}` : ''}`,
+        },
+      ] as const
+    }),
     ...[...missing.keys()].flatMap((name) =>
       UNPROVIDED_PLATFORM_MODULES[name]
         ? [

package/src/swift-standins.ts

@@ -294,7 +294,21 @@ function peachModuleDirs(toolchain: Toolchain, imports: string[]): string[] {
       ],
       moduleRoot,
     )
-  return [path.join(moduleRoot, '.build', TRIPLE, 'release', 'Modules')]
+  // a c target's module map sits in its own build directory, where swiftpm
+  // generated it; a peach module re-exporting one fails to load without it
+  const release = path.join(moduleRoot, '.build', TRIPLE, 'release')
+  return [
+    path.join(release, 'Modules'),
+    ...fs
+      .readdirSync(release)
+      .filter(
+        (name) =>
+          name.endsWith('.build') &&
+          fs.existsSync(path.join(release, name, 'module.modulemap')),
+      )
+      .sort()
+      .map((name) => path.join(release, name)),
+  ]
 }
 
 // an iOS interface read for wasm: its own flags target wasm, and objective-c
@@ -735,6 +749,9 @@ function binaryStandins(
   provided: ReadonlySet<string>,
 ): SwiftStandin[] | string {
   if (provided.has(binary.target)) return []
+  // a local artifact a build step writes is absent from a fresh checkout
+  if (!binary.url && !fs.existsSync(binary.dir))
+    return `${path.basename(binary.dir)} is not on disk; build or fetch it, then run again`
   let all: Surface[]
   let digest: string
   try {

package/src/xcode-project.ts

@@ -154,8 +154,8 @@ export interface XcodeAppTarget extends XcodeModuleTarget {
   linkedProducts: SwiftLinkedProduct[]
   /** local package directories the workspace or a project references. */
   localPackageDirs: string[]
-  /** prebuilt frameworks and xcframeworks the projects vendor and link, by name. */
-  binaryFrameworks: string[]
+  /** prebuilt frameworks and xcframeworks the projects vendor and link. */
+  binaryFrameworks: { name: string; path: string }[]
   /** the Package.resolved pinning the remote packages' revisions, when resolved. */
   packageResolved: string | null
   /** every application target in the workspace, for a chooser. */
@@ -911,7 +911,7 @@ export function readXcodeAppTarget(input: string, targetName?: string): XcodeApp
     ),
   ]
   const linkedProducts: SwiftLinkedProduct[] = []
-  const binaryFrameworks = new Set<string>()
+  const binaryFrameworks = new Map<string, string>()
   for (const { project, target } of order) {
     const productDependencies = [
       ...list(target.packageProductDependencies),
@@ -963,7 +963,8 @@ export function readXcodeAppTarget(input: string, targetName?: string): XcodeApp
           tree === 'DEVELOPER_DIR'
         )
           continue
-        binaryFrameworks.add(name)
+        const resolved = fileId ? project.resolvePath(fileId) : null
+        if (resolved && !binaryFrameworks.has(name)) binaryFrameworks.set(name, resolved)
       }
     }
   }
@@ -999,7 +1000,9 @@ export function readXcodeAppTarget(input: string, targetName?: string): XcodeApp
     localPackageDirs: [
       ...new Set(localPackageDirs.map((dir) => fs.realpathSync(dir))),
     ].sort(),
-    binaryFrameworks: [...binaryFrameworks].sort(),
+    binaryFrameworks: [...binaryFrameworks]
+      .map(([name, file]) => ({ name, path: file }))
+      .sort((left, right) => left.name.localeCompare(right.name)),
     packageResolved: fs.existsSync(resolvedFile) ? resolvedFile : null,
     appTargets: appTargetNames,
   }