peachsim 0.1.1640 → 0.1.1641

package/src/swift-submit.ts

@@ -154,8 +154,10 @@ export type SwiftCompileOutcome =
    * the build is running; poll the same source set again. One build is tens of
    * seconds and a service-binding request is cancelled at about four, so the
    * container answers this before the connection dies and the caller polls.
+   * `stage` is the latest stage the compiler reported for this build, absent
+   * before it reports one.
    */
-  | { status: 'compiling'; hash: string }
+  | { status: 'compiling'; hash: string; stage?: string }
   /** refused before any work: no entry, too many files, over a cap, over a rate limit. */
   | { status: 'refused'; detail: string }
   /** the compiler ran and failed; detail carries its diagnostic verbatim. */
@@ -333,7 +335,11 @@ function isSwiftCompileOutcome(value: unknown): value is SwiftCompileOutcome {
         (value.native === undefined || isSwiftNativeModules(value.native))
       )
     case 'compiling':
-      return typeof value.hash === 'string' && /^[a-f0-9]{64}$/.test(value.hash)
+      return (
+        typeof value.hash === 'string' &&
+        /^[a-f0-9]{64}$/.test(value.hash) &&
+        (value.stage === undefined || typeof value.stage === 'string')
+      )
     case 'refused':
     case 'failed':
       return typeof value.detail === 'string'
@@ -405,7 +411,10 @@ export async function compileSwiftProject(
   },
   origin: string,
   signal?: AbortSignal,
+  /** called when a poll reports a compiler stage the previous poll did not. */
+  onStage?: (stage: string) => void,
 ): Promise<SwiftModuleAddress> {
+  let lastStage: string | undefined
   while (true) {
     signal?.throwIfAborted()
     const outcome = await submit(work)
@@ -431,6 +440,10 @@ export async function compileSwiftProject(
           ...(outcome.native === undefined ? {} : { native: outcome.native }),
         }
       case 'compiling':
+        if (outcome.stage !== undefined && outcome.stage !== lastStage) {
+          lastStage = outcome.stage
+          onStage?.(outcome.stage)
+        }
         await new Promise<void>((resolve, reject) => {
           const finish = () => {
             signal?.removeEventListener('abort', abort)

package/src/swiftContract.ts

@@ -17,6 +17,18 @@ export interface SwiftResourceBundle {
   path: string
 }
 
+export interface SwiftObjCPeerClass {
+  name: string
+  header: string
+}
+
+export interface SwiftObjCImplementationPreparation {
+  receipt: string
+  objects: { target: string; source: string; file: string }[]
+  metadata?: string
+  registration?: string
+}
+
 export interface SwiftMetalLibrarySource extends SwiftMetalSource {
   bundlePath: string
 }

package/src/xcode-project.ts

@@ -399,15 +399,22 @@ function targetSettings(
     if (!config) return []
     const name = str(config.name) ?? configuration
     const base = str(config.baseConfigurationReference)
+    const anchor = str(config.baseConfigurationReferenceAnchor)
+    const relative = str(config.baseConfigurationReferenceRelativePath)
     const own = isDict(config.buildSettings) ? config.buildSettings : {}
-    const baseFile = base ? project.resolvePath(base) : null
+    const directory = anchor ? project.resolvePath(anchor) : null
+    const baseFile = base
+      ? project.resolvePath(base)
+      : directory && relative
+        ? path.resolve(directory, relative)
+        : null
     if (
       options.requireSources !== false &&
-      base &&
+      (base || anchor || relative) &&
       (!baseFile || !fs.existsSync(baseFile))
     )
       throw new Error(
-        `Unable to open base configuration reference file '${baseFile ?? base}'`,
+        `Unable to open base configuration reference file '${baseFile ?? base ?? relative ?? anchor}'`,
       )
     const read: string[] = []
     const fromFile = baseFile ? readXcconfig(baseFile, read) : {}