peachsim 0.1.2220 → 0.1.2221

package/dist-lib/sdk.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 */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);

package/dist-lib/skills.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;
@@ -53223,7 +53223,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 [
@@ -53231,6 +53231,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 *",
     "}",
     ""
@@ -54788,6 +54789,10 @@ function emitSwiftPackageManifest(args) {
       includeImportContext(dependency);
     const importedNativeFlags = [
       ...args.nativeImportFlags?.get(target.name) ?? [],
+      ...[...importContext].flatMap((name3) => {
+        const map2 = name3 === target.name ? void 0 : args.nativeSwiftHeaderMaps?.get(name3);
+        return map2 ? ["-fmodule-map-file=" + map2] : [];
+      }),
       ...[...importContext].flatMap((name3) => args.native?.get(name3)?.importFlags ?? []),
       ...[...importContext].flatMap((name3) => {
         const flags = targets.find((target2) => target2.name === name3)?.swiftFlags ?? [];
@@ -56068,6 +56073,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}/`;
@@ -56302,6 +56308,10 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
         stageTargetFile(target.name, import_node_path51.default.join(layout2.root, modulemap), moduleContents, {
           allowExisting: true
         });
+        sourceModuleMaps.set(swiftTargetModuleName(target.name), {
+          path: import_node_path51.default.join(layout2.root, modulemap),
+          contents: moduleContents.toString()
+        });
         if (modulemap.endsWith("/Modules/module.modulemap")) {
           const framework = import_node_path51.default.posix.dirname(import_node_path51.default.posix.dirname(modulemap));
           for (const [, header] of moduleContents.toString().matchAll(/\bheader\s+"([^"]+)"/g))
@@ -56576,6 +56586,7 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
   if (native.size > 0) (0, import_node_fs54.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]) {
@@ -56606,30 +56617,33 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
     );
     const moduleName2 = swiftTargetModuleName(name3);
     const originalMap = originalMaps.get(moduleName2);
-    const originalTokens = originalMap ? moduleMapTokens(input.files[originalMap]) : [];
-    if (originalMap && originalTokens.some(
+    const stagedMap = sourceModuleMaps.get(moduleName2);
+    const originalPath = originalMap ? import_node_path51.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] === `${moduleName2}.Swift`)
     )) {
-      nativeHeaderFlags.push("-fmodule-map-file=" + import_node_path51.default.join(layout2.root, originalMap));
+      nativeHeaderFlags.push("-fmodule-map-file=" + originalPath);
+      nativeSwiftHeaderMaps.set(name3, originalPath);
       continue;
     }
     files2.set(
       modulemap,
-      originalMap ? `extern module ${moduleName2} ${JSON.stringify(import_node_path51.default.join(layout2.root, originalMap))}
+      originalPath ? `extern module ${moduleName2} ${JSON.stringify(originalPath)}
 module ${moduleName2}.Swift {
   header ${JSON.stringify(import_node_path51.default.join(headerDirectory, name3 + "-Swift.h"))}
   requires objc
 }
 ` : swiftObjCModuleMap(
         moduleName2,
-        [
-          ...(input.nativeTargets?.find((target) => target.name === name3)?.publicHeaders ?? []).map((header) => import_node_path51.default.join(layout2.root, header)),
-          import_node_path51.default.join(headerDirectory, name3 + "-Swift.h")
-        ],
-        submoduleImports.get(moduleName2)
+        (input.nativeTargets?.find((target) => target.name === name3)?.publicHeaders ?? []).map((header) => import_node_path51.default.join(layout2.root, header)),
+        submoduleImports.get(moduleName2),
+        import_node_path51.default.join(headerDirectory, name3 + "-Swift.h")
       )
     );
     nativeHeaderFlags.push("-fmodule-map-file=" + modulemap);
+    nativeSwiftHeaderMaps.set(name3, modulemap);
   }
   const modulePlan = (0, import_node_crypto25.createHash)("sha256").update(
     swiftModuleInputFiles(moduleRoot).join("\n")
@@ -56986,6 +57000,7 @@ module ${moduleName2}.Swift {
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets.filter(
@@ -57143,30 +57158,30 @@ module ${moduleName2}.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
@@ -58354,7 +58369,10 @@ var init_swift_compile = __esm({
     SWIFTPM_NOISE = /^(?:\[\d+\/\d+\] |Building for production\.\.\.$|warning: '--build-system native' has been deprecated)/;
     SWIFT_BUILDER_TRANSPORT_MARGIN_MS = 3e5;
     SWIFT_BUILDER_DEFAULT_COMPILE_MS = 18e5;
-    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, "");
+    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, "");
     swiftInterfaceDeclarations = (header) => /* @__PURE__ */ new Set([
       ...[
         ...header.matchAll(
@@ -58524,7 +58542,7 @@ int EXUpdatesApplyBSDiffPatch(const char * _Nonnull oldFilePath,
     REACTOR_FLAG = '"-Xclang-linker", "-mexec-model=reactor",\n';
     MULTI_MANIFEST_VERSION = 68;
     SWIFT_HEADER_PRODUCTS_TARGET = "PeachHeaderProducts";
-    compilerSourceDigest = true ? "0a0bc1c871aee83ea273120655f55a43ddccde646478a452b4c73d2daefd58c3" : swiftCompilerSourceDigest(__sootsim_import_meta_dirname);
+    compilerSourceDigest = true ? "2e9f321a97a408a1b3b8b7d85bbcfb108f0761ed9726b832a3c6c2cc52102806" : swiftCompilerSourceDigest(__sootsim_import_meta_dirname);
     nativeCxxCompilerFlags = ["-fno-cxx-modules"];
     cFlagArray = (flags) => JSON.stringify(withoutGlogModuleMap(flags));
     cxxFlagArray = (flags) => JSON.stringify([...nativeCxxCompilerFlags, ...withoutGlogModuleMap(flags)]);
@@ -64991,7 +65009,7 @@ var init_swift_standin_digest = __esm({
     STANDIN_DIGEST_ENTRYPOINTS = ["swift-standins.ts", "swift-objc-compile.ts"];
     SPECIFIER = /from\s*['"]([^'"]+)['"]|import\s*\(\s*['"]([^'"]+)['"]\s*\)/g;
     standinSourceDigest = (srcDir = __sootsim_import_meta_dirname) => sourceClosureDigest(srcDir, STANDIN_DIGEST_ENTRYPOINTS);
-    STANDIN_SOURCE_DIGEST = true ? "c0f609da62368c513c186d23bc8aa8e450d27efae5b8c2e7cdf50d34fa734ff0" : standinSourceDigest();
+    STANDIN_SOURCE_DIGEST = true ? "70b9e9f32fde5739daaee933df31b2584f9ef3289c322a0f5b03f1eaac947880" : standinSourceDigest();
   }
 });
 
@@ -65452,7 +65470,7 @@ var init_package_tree_digest = __esm({
 
 // src/expo-native-prebuilt.ts
 function expoNativeCompilerDigestValue() {
-  return true ? "8e765b5dfd0ec93d9027f9d10365ed11f7d85a195d0a888dd1fb76b99195ff2e" : expoNativeCompilerDigest(__sootsim_import_meta_dirname);
+  return true ? "7667f1dce279c8074ed9dd97de1e3b293077ae012cacf08fd6572978f8ef7dc0" : expoNativeCompilerDigest(__sootsim_import_meta_dirname);
 }
 function readSources(value) {
   const sources = isRecord(value) ? value.sources : null;
@@ -86397,7 +86415,7 @@ var init_nitro_superset = __esm({
     init_nitroContract();
     init_swift_standin_digest();
     NITRO_SUPERSET_ENTRY_NAME = "superset";
-    NITRO_COMPILER_DIGEST = true ? "a16afc2e6e3c68812b9d48ad1c7be8c9d89cfebcf46e269779f2890053244d70" : nitroCompilerSourceDigest(__sootsim_import_meta_dirname, STANDIN_SOURCE_DIGEST2);
+    NITRO_COMPILER_DIGEST = true ? "5586d24405a8b94499b182fe067e8af8be656d9b36558aa6ccbd8c7f9e4150dd" : nitroCompilerSourceDigest(__sootsim_import_meta_dirname, STANDIN_SOURCE_DIGEST2);
     nitroSupersetLock = parseLock(nitro_superset_lock_default);
     nitroSupersetKey = (inputs) => nativeEntryKey({ ...inputs, compiler: NITRO_COMPILER_DIGEST });
     published2 = /* @__PURE__ */ new Map();

package/dist-lib/swift-compile.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;
@@ -11061,7 +11061,7 @@ function swiftSubmoduleImports(sources) {
     }
   return imports;
 }
-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 [
@@ -11069,6 +11069,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 *",
     "}",
     ""
@@ -11767,7 +11768,10 @@ function swiftModuleInterface(moduleRoot, name2, interfaceRoot) {
   if (declared.size === 0) return null;
   return { declared, header: clangInterfaceHeader((0, import_node_fs25.readFileSync)(built, "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(
@@ -12605,7 +12609,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
@@ -12898,6 +12902,10 @@ function emitSwiftPackageManifest(args) {
       includeImportContext(dependency);
     const importedNativeFlags = [
       ...args.nativeImportFlags?.get(target.name) ?? [],
+      ...[...importContext].flatMap((name2) => {
+        const map = name2 === target.name ? void 0 : args.nativeSwiftHeaderMaps?.get(name2);
+        return map ? ["-fmodule-map-file=" + map] : [];
+      }),
       ...[...importContext].flatMap((name2) => args.native?.get(name2)?.importFlags ?? []),
       ...[...importContext].flatMap((name2) => {
         const flags = targets.find((target2) => target2.name === name2)?.swiftFlags ?? [];
@@ -14762,6 +14770,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}/`;
@@ -14996,6 +15005,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))
@@ -15270,6 +15283,7 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
   if (native.size > 0) (0, import_node_fs25.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]) {
@@ -15300,30 +15314,33 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
     );
     const moduleName = swiftTargetModuleName(name2);
     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(name2, originalPath);
       continue;
     }
     files.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, name2 + "-Swift.h"))}
   requires objc
 }
 ` : swiftObjCModuleMap(
         moduleName,
-        [
-          ...(input.nativeTargets?.find((target) => target.name === name2)?.publicHeaders ?? []).map((header) => import_node_path27.default.join(layout2.root, header)),
-          import_node_path27.default.join(headerDirectory, name2 + "-Swift.h")
-        ],
-        submoduleImports.get(moduleName)
+        (input.nativeTargets?.find((target) => target.name === name2)?.publicHeaders ?? []).map((header) => import_node_path27.default.join(layout2.root, header)),
+        submoduleImports.get(moduleName),
+        import_node_path27.default.join(headerDirectory, name2 + "-Swift.h")
       )
     );
     nativeHeaderFlags.push("-fmodule-map-file=" + modulemap);
+    nativeSwiftHeaderMaps.set(name2, modulemap);
   }
   const modulePlan = (0, import_node_crypto13.createHash)("sha256").update(
     swiftModuleInputFiles(moduleRoot).join("\n")
@@ -15680,6 +15697,7 @@ module ${moduleName}.Swift {
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets.filter(
@@ -15837,30 +15855,30 @@ module ${moduleName}.Swift {
       )
     ])
   );
+  const producerSet = /* @__PURE__ */ new Set([...Object.keys(nativeHeaderDeclarations), ...producers]);
+  const orderedProducers = [];
   const included = /* @__PURE__ */ new Set();
   const include = (name2) => {
     if (included.has(name2)) return;
     included.add(name2);
     for (const dependency of dependencies.get(name2) ?? []) include(dependency);
+    if (producerSet.has(name2)) orderedProducers.push(name2);
   };
-  for (const producer of producers)
+  for (const producer of producerSet)
     for (const dependency of dependencies.get(producer) ?? []) include(dependency);
+  const needsHeaderStages = [...producerSet].some((name2) => included.has(name2));
+  for (const producer of producerSet) include(producer);
   return {
     nativeBuildTargets: [...native].flatMap(([name2, plan]) => [
       ...!plan.mixed && plan.sources.length > 0 ? [name2] : [],
       ...plan.groups?.map((group) => group.name) ?? (plan.late ? [plan.late.name] : [])
     ]),
-    headerProducers: [
-      .../* @__PURE__ */ new Set([
-        ...Object.keys(nativeHeaderDeclarations),
-        ...producers.filter((name2) => !included.has(name2))
-      ])
-    ],
+    headerProducers: orderedProducers,
     emittedHeaderProducers: [
       .../* @__PURE__ */ new Set([...Object.keys(nativeHeaderDeclarations), ...producers])
     ],
     nativeHeaderDeclarations,
-    headerProductTarget,
+    headerProductTarget: needsHeaderStages ? void 0 : headerProductTarget,
     targetFailures,
     generatedOwners,
     targetToolset

package/dist-lib/swift-compile.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/swift-compile.ts
 import {
@@ -11022,7 +11022,7 @@ function swiftSubmoduleImports(sources) {
     }
   return imports;
 }
-function swiftObjCModuleMap(module, headers, submodules = /* @__PURE__ */ new Set()) {
+function swiftObjCModuleMap(module, headers, submodules = /* @__PURE__ */ new Set(), swiftHeader) {
   const header = (file) => `header ${JSON.stringify(file)}`;
   const stem = (file) => file.slice(file.lastIndexOf("/") + 1).replace(/\.[^.]*$/, "");
   return [
@@ -11030,6 +11030,7 @@ function swiftObjCModuleMap(module, headers, submodules = /* @__PURE__ */ new Se
     ...headers.map(
       (file) => submodules.has(stem(file)) ? `  module ${stem(file)} { ${header(file)} export * }` : `  ${header(file)}`
     ),
+    ...swiftHeader ? ["  module Swift {", `    ${header(swiftHeader)}`, "    requires objc", "  }"] : [],
     "  export *",
     "}",
     ""
@@ -11746,7 +11747,10 @@ function swiftModuleInterface(moduleRoot, name2, interfaceRoot) {
   if (declared.size === 0) return null;
   return { declared, header: clangInterfaceHeader(readFileSync16(built, "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(
@@ -12584,7 +12588,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(import.meta.dirname);
+var compilerSourceDigest = true ? "2e9f321a97a408a1b3b8b7d85bbcfb108f0761ed9726b832a3c6c2cc52102806" : swiftCompilerSourceDigest(import.meta.dirname);
 function swiftArtifactHash(input, release, moduleRoot) {
   const hash = createHash13("sha256");
   hash.update(`swift-compile
@@ -12877,6 +12881,10 @@ function emitSwiftPackageManifest(args) {
       includeImportContext(dependency);
     const importedNativeFlags = [
       ...args.nativeImportFlags?.get(target.name) ?? [],
+      ...[...importContext].flatMap((name2) => {
+        const map = name2 === target.name ? void 0 : args.nativeSwiftHeaderMaps?.get(name2);
+        return map ? ["-fmodule-map-file=" + map] : [];
+      }),
       ...[...importContext].flatMap((name2) => args.native?.get(name2)?.importFlags ?? []),
       ...[...importContext].flatMap((name2) => {
         const flags = targets.find((target2) => target2.name === name2)?.swiftFlags ?? [];
@@ -14741,6 +14749,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}/`;
@@ -14975,6 +14984,10 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
         stageTargetFile(target.name, path27.join(layout2.root, modulemap), moduleContents, {
           allowExisting: true
         });
+        sourceModuleMaps.set(swiftTargetModuleName(target.name), {
+          path: path27.join(layout2.root, modulemap),
+          contents: moduleContents.toString()
+        });
         if (modulemap.endsWith("/Modules/module.modulemap")) {
           const framework = path27.posix.dirname(path27.posix.dirname(modulemap));
           for (const [, header] of moduleContents.toString().matchAll(/\bheader\s+"([^"]+)"/g))
@@ -15249,6 +15262,7 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
   if (native.size > 0) mkdirSync6(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]) {
@@ -15279,30 +15293,33 @@ ${swiftProjectFilesProblems(input.projectFiles).join("\n")}`
     );
     const moduleName = swiftTargetModuleName(name2);
     const originalMap = originalMaps.get(moduleName);
-    const originalTokens = originalMap ? moduleMapTokens(input.files[originalMap]) : [];
-    if (originalMap && originalTokens.some(
+    const stagedMap = sourceModuleMaps.get(moduleName);
+    const originalPath = originalMap ? path27.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=" + path27.join(layout2.root, originalMap));
+      nativeHeaderFlags.push("-fmodule-map-file=" + originalPath);
+      nativeSwiftHeaderMaps.set(name2, originalPath);
       continue;
     }
     files.set(
       modulemap,
-      originalMap ? `extern module ${moduleName} ${JSON.stringify(path27.join(layout2.root, originalMap))}
+      originalPath ? `extern module ${moduleName} ${JSON.stringify(originalPath)}
 module ${moduleName}.Swift {
   header ${JSON.stringify(path27.join(headerDirectory, name2 + "-Swift.h"))}
   requires objc
 }
 ` : swiftObjCModuleMap(
         moduleName,
-        [
-          ...(input.nativeTargets?.find((target) => target.name === name2)?.publicHeaders ?? []).map((header) => path27.join(layout2.root, header)),
-          path27.join(headerDirectory, name2 + "-Swift.h")
-        ],
-        submoduleImports.get(moduleName)
+        (input.nativeTargets?.find((target) => target.name === name2)?.publicHeaders ?? []).map((header) => path27.join(layout2.root, header)),
+        submoduleImports.get(moduleName),
+        path27.join(headerDirectory, name2 + "-Swift.h")
       )
     );
     nativeHeaderFlags.push("-fmodule-map-file=" + modulemap);
+    nativeSwiftHeaderMaps.set(name2, modulemap);
   }
   const modulePlan = createHash13("sha256").update(
     swiftModuleInputFiles(moduleRoot).join("\n")
@@ -15659,6 +15676,7 @@ module ${moduleName}.Swift {
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets.filter(
@@ -15816,30 +15834,30 @@ module ${moduleName}.Swift {
       )
     ])
   );
+  const producerSet = /* @__PURE__ */ new Set([...Object.keys(nativeHeaderDeclarations), ...producers]);
+  const orderedProducers = [];
   const included = /* @__PURE__ */ new Set();
   const include = (name2) => {
     if (included.has(name2)) return;
     included.add(name2);
     for (const dependency of dependencies.get(name2) ?? []) include(dependency);
+    if (producerSet.has(name2)) orderedProducers.push(name2);
   };
-  for (const producer of producers)
+  for (const producer of producerSet)
     for (const dependency of dependencies.get(producer) ?? []) include(dependency);
+  const needsHeaderStages = [...producerSet].some((name2) => included.has(name2));
+  for (const producer of producerSet) include(producer);
   return {
     nativeBuildTargets: [...native].flatMap(([name2, plan]) => [
       ...!plan.mixed && plan.sources.length > 0 ? [name2] : [],
       ...plan.groups?.map((group) => group.name) ?? (plan.late ? [plan.late.name] : [])
     ]),
-    headerProducers: [
-      .../* @__PURE__ */ new Set([
-        ...Object.keys(nativeHeaderDeclarations),
-        ...producers.filter((name2) => !included.has(name2))
-      ])
-    ],
+    headerProducers: orderedProducers,
     emittedHeaderProducers: [
       .../* @__PURE__ */ new Set([...Object.keys(nativeHeaderDeclarations), ...producers])
     ],
     nativeHeaderDeclarations,
-    headerProductTarget,
+    headerProductTarget: needsHeaderStages ? void 0 : headerProductTarget,
     targetFailures,
     generatedOwners,
     targetToolset

package/dist-lib/swift-package.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/swift-package.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/swift-package.ts
 function swiftManifestSettings(target) {

package/dist-lib/swift-submit.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/swift-submit.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/is-record.ts
 function isRecord(value) {

package/dist-lib/swift-toolchain.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;

package/dist-lib/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 __defProp = Object.defineProperty;