peachsim 0.1.2220 → 0.1.2221

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2220 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2221 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __create = Object.create;
@@ -16073,7 +16073,7 @@ function swiftSubmoduleImports(sources) {
     }
   return imports2;
 }
-function swiftObjCModuleMap(module2, headers, submodules = /* @__PURE__ */ new Set()) {
+function swiftObjCModuleMap(module2, headers, submodules = /* @__PURE__ */ new Set(), swiftHeader) {
   const header = (file) => `header ${JSON.stringify(file)}`;
   const stem = (file) => file.slice(file.lastIndexOf("/") + 1).replace(/\.[^.]*$/, "");
   return [
@@ -16081,6 +16081,7 @@ function swiftObjCModuleMap(module2, headers, submodules = /* @__PURE__ */ new S
     ...headers.map(
       (file) => submodules.has(stem(file)) ? `  module ${stem(file)} { ${header(file)} export * }` : `  ${header(file)}`
     ),
+    ...swiftHeader ? ["  module Swift {", `    ${header(swiftHeader)}`, "    requires objc", "  }"] : [],
     "  export *",
     "}",
     ""
@@ -16625,7 +16626,10 @@ function swiftModuleInterface(moduleRoot, name3, interfaceRoot) {
   if (declared.size === 0) return null;
   return { declared, header: clangInterfaceHeader((0, import_node_fs27.readFileSync)(built2, "utf8")) };
 }
-var clangInterfaceHeader = (header) => header.replace(/^@import (?:UIKitCore|UIKitText);$/gm, "@import UIKit;").replace(/^@import CoreFoundation;$/gm, "@import Foundation;").replace(/\b_TtC10Foundation\d+(NS\w+)\b/g, "$1").replace(/\b__attribute__\(\(objc_subclassing_restricted\)\)\s*/g, "");
+var clangInterfaceHeader = (header) => header.replace(/^@import (?:UIKitCore|UIKitText);$/gm, "@import UIKit;").replace(
+  /^@import (?:CoreFoundation|FoundationNetworking);$/gm,
+  "@import Foundation;"
+).replace(/\b_TtC10Foundation\d+(NS\w+)\b/g, "$1").replace(/\b__attribute__\(\(objc_subclassing_restricted\)\)\s*/g, "");
 var swiftInterfaceDeclarations = (header) => /* @__PURE__ */ new Set([
   ...[
     ...header.matchAll(
@@ -17459,7 +17463,7 @@ var darwinRecordsRegion = (quoted) => quoted.length ? ["-Wl,--start-lib", ...quo
 var REACTOR_FLAG = '"-Xclang-linker", "-mexec-model=reactor",\n';
 var MULTI_MANIFEST_VERSION = 68;
 var SWIFT_HEADER_PRODUCTS_TARGET = "PeachHeaderProducts";
-var compilerSourceDigest = true ? "0a0bc1c871aee83ea273120655f55a43ddccde646478a452b4c73d2daefd58c3" : swiftCompilerSourceDigest(__sootsim_import_meta_dirname);
+var compilerSourceDigest = true ? "2e9f321a97a408a1b3b8b7d85bbcfb108f0761ed9726b832a3c6c2cc52102806" : swiftCompilerSourceDigest(__sootsim_import_meta_dirname);
 function swiftArtifactHash(input, release, moduleRoot) {
   const hash = (0, import_node_crypto13.createHash)("sha256");
   hash.update(`swift-compile
@@ -17752,6 +17756,10 @@ function emitSwiftPackageManifest(args) {
       includeImportContext(dependency);
     const importedNativeFlags = [
       ...args.nativeImportFlags?.get(target.name) ?? [],
+      ...[...importContext].flatMap((name3) => {
+        const map = name3 === target.name ? void 0 : args.nativeSwiftHeaderMaps?.get(name3);
+        return map ? ["-fmodule-map-file=" + map] : [];
+      }),
       ...[...importContext].flatMap((name3) => args.native?.get(name3)?.importFlags ?? []),
       ...[...importContext].flatMap((name3) => {
         const flags = targets.find((target2) => target2.name === name3)?.swiftFlags ?? [];
@@ -19523,6 +19531,7 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
     )
   );
   const importModuleMaps = /* @__PURE__ */ new Map();
+  const sourceModuleMaps = /* @__PURE__ */ new Map();
   const generatedModuleMaps = [];
   for (const target of targets) {
     const prefix = target.path === "." ? "" : `${target.path}/`;
@@ -19757,6 +19766,10 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
         stageTargetFile(target.name, import_node_path27.default.join(layout2.root, modulemap), moduleContents, {
           allowExisting: true
         });
+        sourceModuleMaps.set(swiftTargetModuleName(target.name), {
+          path: import_node_path27.default.join(layout2.root, modulemap),
+          contents: moduleContents.toString()
+        });
         if (modulemap.endsWith("/Modules/module.modulemap")) {
           const framework = import_node_path27.default.posix.dirname(import_node_path27.default.posix.dirname(modulemap));
           for (const [, header] of moduleContents.toString().matchAll(/\bheader\s+"([^"]+)"/g))
@@ -20031,6 +20044,7 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
   if (native.size > 0) (0, import_node_fs27.mkdirSync)(headerDirectory, { recursive: true });
   const headerAliasFlags = Object.keys(input.headerAliases ?? {}).length > 0 ? ["-ivfsoverlay", headerSearch.files[0]] : [];
   const nativeHeaderFlags = [...headerAliasFlags];
+  const nativeSwiftHeaderMaps = /* @__PURE__ */ new Map();
   const originalMaps = /* @__PURE__ */ new Map();
   for (const target of input.nativeTargets ?? []) {
     for (const flag of [...target.flags, ...target.cxxFlags]) {
@@ -20061,30 +20075,33 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
     );
     const moduleName = swiftTargetModuleName(name3);
     const originalMap = originalMaps.get(moduleName);
-    const originalTokens = originalMap ? moduleMapTokens(input.files[originalMap]) : [];
-    if (originalMap && originalTokens.some(
+    const stagedMap = sourceModuleMaps.get(moduleName);
+    const originalPath = originalMap ? import_node_path27.default.join(layout2.root, originalMap) : stagedMap?.path;
+    const originalContents = originalMap ? input.files[originalMap] : stagedMap?.contents;
+    const originalTokens = originalContents ? moduleMapTokens(originalContents) : [];
+    if (originalPath && originalTokens.some(
       (token, index) => token === "module" && (originalTokens[index + 1] === "Swift" || originalTokens[index + 1] === `${moduleName}.Swift`)
     )) {
-      nativeHeaderFlags.push("-fmodule-map-file=" + import_node_path27.default.join(layout2.root, originalMap));
+      nativeHeaderFlags.push("-fmodule-map-file=" + originalPath);
+      nativeSwiftHeaderMaps.set(name3, originalPath);
       continue;
     }
     files2.set(
       modulemap,
-      originalMap ? `extern module ${moduleName} ${JSON.stringify(import_node_path27.default.join(layout2.root, originalMap))}
+      originalPath ? `extern module ${moduleName} ${JSON.stringify(originalPath)}
 module ${moduleName}.Swift {
   header ${JSON.stringify(import_node_path27.default.join(headerDirectory, name3 + "-Swift.h"))}
   requires objc
 }
 ` : swiftObjCModuleMap(
         moduleName,
-        [
-          ...(input.nativeTargets?.find((target) => target.name === name3)?.publicHeaders ?? []).map((header) => import_node_path27.default.join(layout2.root, header)),
-          import_node_path27.default.join(headerDirectory, name3 + "-Swift.h")
-        ],
-        submoduleImports.get(moduleName)
+        (input.nativeTargets?.find((target) => target.name === name3)?.publicHeaders ?? []).map((header) => import_node_path27.default.join(layout2.root, header)),
+        submoduleImports.get(moduleName),
+        import_node_path27.default.join(headerDirectory, name3 + "-Swift.h")
       )
     );
     nativeHeaderFlags.push("-fmodule-map-file=" + modulemap);
+    nativeSwiftHeaderMaps.set(name3, modulemap);
   }
   const modulePlan = (0, import_node_crypto13.createHash)("sha256").update(
     swiftModuleInputFiles(moduleRoot).join("\n")
@@ -20441,6 +20458,7 @@ module ${moduleName}.Swift {
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets.filter(
@@ -20598,30 +20616,30 @@ module ${moduleName}.Swift {
       )
     ])
   );
+  const producerSet = /* @__PURE__ */ new Set([...Object.keys(nativeHeaderDeclarations), ...producers]);
+  const orderedProducers = [];
   const included = /* @__PURE__ */ new Set();
   const include = (name3) => {
     if (included.has(name3)) return;
     included.add(name3);
     for (const dependency of dependencies.get(name3) ?? []) include(dependency);
+    if (producerSet.has(name3)) orderedProducers.push(name3);
   };
-  for (const producer of producers)
+  for (const producer of producerSet)
     for (const dependency of dependencies.get(producer) ?? []) include(dependency);
+  const needsHeaderStages = [...producerSet].some((name3) => included.has(name3));
+  for (const producer of producerSet) include(producer);
   return {
     nativeBuildTargets: [...native].flatMap(([name3, plan]) => [
       ...!plan.mixed && plan.sources.length > 0 ? [name3] : [],
       ...plan.groups?.map((group) => group.name) ?? (plan.late ? [plan.late.name] : [])
     ]),
-    headerProducers: [
-      .../* @__PURE__ */ new Set([
-        ...Object.keys(nativeHeaderDeclarations),
-        ...producers.filter((name3) => !included.has(name3))
-      ])
-    ],
+    headerProducers: orderedProducers,
     emittedHeaderProducers: [
       .../* @__PURE__ */ new Set([...Object.keys(nativeHeaderDeclarations), ...producers])
     ],
     nativeHeaderDeclarations,
-    headerProductTarget,
+    headerProductTarget: needsHeaderStages ? void 0 : headerProductTarget,
     targetFailures,
     generatedOwners,
     targetToolset
@@ -30876,7 +30894,7 @@ function sourceClosureDigest(srcDir, entrypoints) {
   return hash.digest("hex");
 }
 var standinSourceDigest = (srcDir = __sootsim_import_meta_dirname) => sourceClosureDigest(srcDir, STANDIN_DIGEST_ENTRYPOINTS);
-var STANDIN_SOURCE_DIGEST = true ? "c0f609da62368c513c186d23bc8aa8e450d27efae5b8c2e7cdf50d34fa734ff0" : standinSourceDigest();
+var STANDIN_SOURCE_DIGEST = true ? "70b9e9f32fde5739daaee933df31b2584f9ef3289c322a0f5b03f1eaac947880" : standinSourceDigest();
 
 // src/swift-standins.ts
 init_define_SWIFT_COVERAGE_SOURCE_DIGESTS();

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2220 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2221 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __create = Object.create;
@@ -2923,7 +2923,7 @@ function readIosSdkTree(root) {
 
 // src/swift-standin-digest.ts
 init_define_SWIFT_COVERAGE_SOURCE_DIGESTS();
-var STANDIN_SOURCE_DIGEST = true ? "c0f609da62368c513c186d23bc8aa8e450d27efae5b8c2e7cdf50d34fa734ff0" : standinSourceDigest();
+var STANDIN_SOURCE_DIGEST = true ? "70b9e9f32fde5739daaee933df31b2584f9ef3289c322a0f5b03f1eaac947880" : standinSourceDigest();
 
 // src/expo-native-workspace.ts
 init_define_SWIFT_COVERAGE_SOURCE_DIGESTS();
@@ -6417,7 +6417,7 @@ var FOUNDATION_IMPLICIT_MODULES = [
 var FOUNDATION_IMPLICIT_FLAGS = FOUNDATION_IMPLICIT_MODULES.map(
   (module2) => `, "-Xfrontend", "-import-module", "-Xfrontend", "${module2}"`
 ).join("");
-var compilerSourceDigest = true ? "0a0bc1c871aee83ea273120655f55a43ddccde646478a452b4c73d2daefd58c3" : swiftCompilerSourceDigest2(__sootsim_import_meta_dirname);
+var compilerSourceDigest = true ? "2e9f321a97a408a1b3b8b7d85bbcfb108f0761ed9726b832a3c6c2cc52102806" : swiftCompilerSourceDigest2(__sootsim_import_meta_dirname);
 var CORE_FOUNDATION_HANDLE_IMPORTS = [
   "CFAllocator",
   "CFArray",

package/dist-lib/worklet-executable.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2220 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2221 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = '', __sootsim_import_meta_filename = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; __sootsim_import_meta_filename = __filename; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/worklet-executable.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2220 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2221 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/worklet-executable.ts
 import { parse } from "acorn";

package/dist-types/packages/peach-engine/src/render-worker/compositor-protocol.d.ts

@@ -772,6 +772,7 @@ export interface CompositorStats {
         immediateDemand: boolean;
         pendingDemandBackingEpoch: number | null;
         nativeFrameArmed: boolean;
+        holds: Readonly<Record<string, number>>;
     };
     demandPaintsSuperseded: number;
     entryEvals: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.2220",
+  "version": "0.1.2221",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/sdk/ios/System/Library/Frameworks/UIKit.framework/Headers/NSLayoutConstraint.h

@@ -9,19 +9,12 @@
 #import <Foundation/NSObject.h>
 #import <UIKit/UIGeometry.h>
 #import <UIKit/UIKitDefines.h>
+#import <UIKitTypes/UILayoutPriority.h>
 
 NS_HEADER_AUDIT_BEGIN(nullability, sendability)
 
 @class NSArray, NSDictionary, NSLayoutAnchor;
 
-typedef float UILayoutPriority NS_TYPED_EXTENSIBLE_ENUM API_UNAVAILABLE(watchos);
-static const UILayoutPriority UILayoutPriorityRequired API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 1000; // A required constraint.  Do not exceed this.
-static const UILayoutPriority UILayoutPriorityDefaultHigh API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 750; // This is the priority level with which a button resists compressing its content.
-static const UILayoutPriority UILayoutPriorityDragThatCanResizeScene API_AVAILABLE(macCatalyst(13.0)) API_UNAVAILABLE(watchos) = 510; // This is the appropriate priority level for a drag that may end up resizing the window's scene.
-static const UILayoutPriority UILayoutPrioritySceneSizeStayPut API_AVAILABLE(macCatalyst(13.0)) API_UNAVAILABLE(watchos) = 500; // This is the priority level at which the window's scene prefers to stay the same size.  It's generally not appropriate to make a constraint at exactly this priority. You want to be higher or lower.
-static const UILayoutPriority UILayoutPriorityDragThatCannotResizeScene API_AVAILABLE(macCatalyst(13.0)) API_UNAVAILABLE(watchos) = 490; // This is the priority level at which a split view divider, say, is dragged.  It won't resize the window's scene.
-static const UILayoutPriority UILayoutPriorityDefaultLow API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 250; // This is the priority level at which a button hugs its contents horizontally.
-static const UILayoutPriority UILayoutPriorityFittingSizeLevel API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 50; // When you send -[UIView systemLayoutSizeFittingSize:], the size fitting most closely to the target size (the argument) is computed.  UILayoutPriorityFittingSizeLevel is the priority level with which the view wants to conform to the target size in that computation.  It's quite low.  It is generally not appropriate to make a constraint at exactly this priority.  You want to be higher or lower.
 
 #if !TARGET_OS_IPHONE
 typedef float NSLayoutPriority NS_TYPED_EXTENSIBLE_ENUM;

package/sdk/ios/System/Library/Frameworks/UIKit.framework/Modules/module.modulemap

@@ -19,6 +19,7 @@ framework module UIKit [system] {
     header "UIGestureRecognizerSubclass.h"
     export *
   }
+  module * { export * }
   export UIKitText
   export *
 }

package/sdk/ios/System/Library/Frameworks/UIKitTypes.framework/Headers/UIKitTypes.h

@@ -4,6 +4,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKitAnimationOptions/UIViewAnimationOptions.h>
 #import <UIKitTypes/UIWindowLevel.h>
+#import <UIKitTypes/UILayoutPriority.h>
 
 typedef NS_ENUM(NSInteger, UIPointerEffectTintMode) {
     UIPointerEffectTintModeNone = 0,

package/sdk/ios/System/Library/Frameworks/UIKitTypes.framework/Headers/UILayoutPriority.h

@@ -0,0 +1,11 @@
+#pragma once
+#import <Foundation/Foundation.h>
+
+typedef float UILayoutPriority NS_TYPED_EXTENSIBLE_ENUM API_UNAVAILABLE(watchos);
+static const UILayoutPriority UILayoutPriorityRequired API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 1000; // A required constraint.  Do not exceed this.
+static const UILayoutPriority UILayoutPriorityDefaultHigh API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 750; // This is the priority level with which a button resists compressing its content.
+static const UILayoutPriority UILayoutPriorityDragThatCanResizeScene API_AVAILABLE(macCatalyst(13.0)) API_UNAVAILABLE(watchos) = 510; // This is the appropriate priority level for a drag that may end up resizing the window's scene.
+static const UILayoutPriority UILayoutPrioritySceneSizeStayPut API_AVAILABLE(macCatalyst(13.0)) API_UNAVAILABLE(watchos) = 500; // This is the priority level at which the window's scene prefers to stay the same size.  It's generally not appropriate to make a constraint at exactly this priority. You want to be higher or lower.
+static const UILayoutPriority UILayoutPriorityDragThatCannotResizeScene API_AVAILABLE(macCatalyst(13.0)) API_UNAVAILABLE(watchos) = 490; // This is the priority level at which a split view divider, say, is dragged.  It won't resize the window's scene.
+static const UILayoutPriority UILayoutPriorityDefaultLow API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 250; // This is the priority level at which a button hugs its contents horizontally.
+static const UILayoutPriority UILayoutPriorityFittingSizeLevel API_AVAILABLE(ios(6.0)) API_UNAVAILABLE(watchos) = 50; // When you send -[UIView systemLayoutSizeFittingSize:], the size fitting most closely to the target size (the argument) is computed.  UILayoutPriorityFittingSizeLevel is the priority level with which the view wants to conform to the target size in that computation.  It's quite low.  It is generally not appropriate to make a constraint at exactly this priority.  You want to be higher or lower.

package/src/swift-compile.ts

@@ -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, '')
 
@@ -1853,6 +1856,7 @@ 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[]>
@@ -2163,6 +2167,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 ?? []
@@ -4610,6 +4619,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 +4948,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 +5286,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 +5319,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 +5334,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
@@ -5788,6 +5808,7 @@ export function writeSwiftProject(
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets
@@ -5974,31 +5995,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,

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 *',
     '}',
     '',