peachsim 0.1.2220 → 0.1.2222

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2220 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2222 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/swift-compile.ts
 import {
@@ -10209,7 +10209,8 @@ var FEATURES = [
   "reference-types",
   "sign-ext"
 ];
-var WASM_OPTIMIZE_IDENTITY = `wasm-opt ${BINARYEN_VERSION} -Oz ${FEATURES.join(",")}`;
+var KEEP_WASM_NAMES = process.env.PEACH_SWIFT_NAMES === "1";
+var WASM_OPTIMIZE_IDENTITY = `wasm-opt ${BINARYEN_VERSION} -Oz ${FEATURES.join(",")}${KEEP_WASM_NAMES ? " -g" : ""}`;
 var PINNED_BINARYEN_VERSION = "132";
 var BINARYEN_RELEASES = /* @__PURE__ */ new Map([
   [
@@ -10245,6 +10246,7 @@ async function runWasmOpt(file, output, skipPasses, binary) {
   const result = await wasmOpt(
     [
       "-Oz",
+      ...KEEP_WASM_NAMES ? ["-g"] : [],
       ...skipPasses.flatMap((pass) => ["--skip-pass", pass]),
       ...FEATURES.map((feature) => `--enable-${feature}`),
       file,
@@ -11022,7 +11024,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 +11032,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 +11749,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(
@@ -12043,7 +12049,8 @@ var OPTIONAL_FRAMEWORK_DEPENDENCIES = {
   PeachCFNetwork: [],
   JavaScriptCore: ["PeachJavaScriptCore"],
   PeachJavaScriptCore: [],
-  GameplayKit: [],
+  // GameplayKit names SpriteKit and SceneKit nodes, as on iOS
+  GameplayKit: ["SpriteKit", "SceneKit", "PeachBox2D", "simd", "GLKit"],
   simd: [],
   ModelIO: ["simd"],
   GLKit: ["ModelIO"],
@@ -12554,10 +12561,21 @@ function swiftTargetDependencies(files, targets, frameworks = OPTIONAL_FRAMEWORK
   return siblings;
 }
 var ONE_PRODUCT = '.product(name: "One", package: "sootsim-swift")';
-var SPRITEKIT_PRODUCT = '.product(name: "SpriteKit", package: "sootsim-swift")';
-var importsSpriteKit = (files) => Object.entries(files).some(
-  ([file, contents]) => file.endsWith(".swift") && swiftImportNames(contents).includes("SpriteKit")
-);
+var GAME_FAMILY = ["SpriteKit", "SceneKit"];
+var gameProducts = (files) => {
+  const imported = new Set(
+    Object.entries(files).flatMap(
+      ([file, contents]) => file.endsWith(".swift") ? swiftImportNames(contents) : []
+    )
+  );
+  if (imported.has("SceneKit")) return [...GAME_FAMILY];
+  return imported.has("SpriteKit") ? ["SpriteKit"] : [];
+};
+var gameProduct = (name2) => `.product(name: "${name2}", package: "sootsim-swift")`;
+var GAME_REACH = {
+  SpriteKit: ["SpriteKit", "PeachBox2D", "simd", "GLKit"],
+  SceneKit: ["SceneKit"]
+};
 var FOUNDATION_IMPLICIT_MODULES = [
   "PeachObjC",
   "Dispatch",
@@ -12584,7 +12602,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 ? "eba60b7a2e9485f928a6ec2e544e10d84b2b33430be66b9e069c9797a927af86" : swiftCompilerSourceDigest(import.meta.dirname);
 function swiftArtifactHash(input, release, moduleRoot) {
   const hash = createHash13("sha256");
   hash.update(`swift-compile
@@ -12592,6 +12610,7 @@ ${release}
 `);
   hash.update(compilerSourceDigest);
   if (input.oneModule) hash.update("one-module\n");
+  if (KEEP_WASM_NAMES) hash.update("names\n");
   hash.update(swiftModuleDigest(moduleRoot));
   if (input.optimize) hash.update(`optimize
 ${WASM_OPTIMIZE_IDENTITY}
@@ -12706,7 +12725,14 @@ function toolsetOrdersLibcxxBeforeDarwinOverlay(options) {
   return libcxx >= 0 && overlay > libcxx;
 }
 function emitSwiftPackageManifest(args) {
-  const { targets, siblings, moduleRoot, oneModule, spriteKit, distribution } = args;
+  const {
+    targets,
+    siblings,
+    moduleRoot,
+    oneModule,
+    gameProducts: gameProducts2 = [],
+    distribution
+  } = args;
   const prebuilt = args.prebuilt;
   const linkedObjects = Boolean(distribution || prebuilt);
   const cxxFlagsFor = (flags) => args.deferDarwinOverlay ? withoutWasmOverlayIsystem(flags) : flags;
@@ -12735,9 +12761,8 @@ function emitSwiftPackageManifest(args) {
   for (const name2 of [...siblings.values()].flat())
     if (OPTIONAL_FRAMEWORKS.has(name2) && !targets.some((target) => target.name === name2))
       reach(name2);
-  if (spriteKit) {
-    for (const name2 of ["SpriteKit", "PeachBox2D", "simd", "GLKit"]) reach(name2);
-  }
+  for (const product of gameProducts2)
+    for (const name2 of GAME_REACH[product] ?? []) reach(name2);
   let distributionLinkPath;
   const distributionLink = args.distributionLink;
   if (distribution && distributionLink) {
@@ -12760,7 +12785,7 @@ function emitSwiftPackageManifest(args) {
       (object3) => !isProvider(object3) && !replacedObjects.has(object3)
     );
     const objects = available.filter(
-      (object3) => !targets.some((target) => object3.startsWith(`lib/${target.name}-`)) && [...OPTIONAL_FRAMEWORKS, "SpriteKit", "PeachBox2D"].every(
+      (object3) => !targets.some((target) => object3.startsWith(`lib/${target.name}-`)) && [...OPTIONAL_FRAMEWORKS, ...GAME_FAMILY, "PeachBox2D"].every(
         (name2) => !object3.startsWith(`lib/${name2}-`) || reachedFrameworks.has(name2)
       )
     );
@@ -12877,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 ?? [];
@@ -12919,7 +12948,7 @@ function emitSwiftPackageManifest(args) {
         ...linkedObjects || clang && !target.executable ? [] : [
           '.product(name: "SwiftUI", package: "sootsim-swift")',
           ...oneModule ? [ONE_PRODUCT] : [],
-          ...spriteKit ? [SPRITEKIT_PRODUCT] : []
+          ...gameProducts2.map(gameProduct)
         ],
         ...(siblings.get(target.name) ?? []).flatMap(
           (dependency) => clang && // textual native headers can include one another without imposing
@@ -12951,7 +12980,7 @@ function emitSwiftPackageManifest(args) {
         .unsafeFlags(${flagArray(`[
           ${REACTOR_FLAG}${executableLinkFlags(args.root)}          "-Xlinker", "--export-if-defined=__main_argc_argv"${library},
         ]`)}),
-        .unsafeFlags(["-Xlinker", "--strip-all"], .when(configuration: .release)),
+        ${KEEP_WASM_NAMES ? "" : '.unsafeFlags(["-Xlinker", "--strip-all"], .when(configuration: .release)),'}
       ]` : librarySettings.length > 0 ? `,
       linkerSettings: [${librarySettings.join(", ")}]` : "";
     const cDefines = macroSettings(target.cDefines);
@@ -13556,8 +13585,6 @@ var FOUNDATION_OVERLAY_GLOBALS = /* @__PURE__ */ new Set([
   "NSURLProtectionSpaceHTTPS",
   "NSURLProtectionSpaceHTTPSProxy",
   "NSURLProtectionSpaceSOCKSProxy",
-  "NSURLSessionDownloadTaskResumeData",
-  "NSURLSessionTransferSizeUnknown",
   "NSURLSessionUploadTaskResumeData",
   "NSUTF16BigEndianStringEncoding",
   "NSUTF16LittleEndianStringEncoding",
@@ -14741,6 +14768,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 +15003,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 +15281,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 +15312,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")
@@ -15553,14 +15589,17 @@ module ${moduleName}.Swift {
       manifest = manifest.replace(product, `${product}
         ${ONE_PRODUCT},`).replace(flags, `${flags}${ONE_IMPLICIT_FLAGS}`);
     }
-    if (importsSpriteKit(input.files)) {
+    const games = gameProducts(input.files);
+    if (games.length > 0) {
       const anchor = '.product(name: "CoreLocation", package: "sootsim-swift"),';
       if (!manifest.includes(anchor))
         throw new Error(
-          "scripts/contrast-app-Package.swift lost the line the SpriteKit product links at"
+          "scripts/contrast-app-Package.swift lost the line the game products link at"
         );
-      manifest = manifest.replace(anchor, `${anchor}
-        ${SPRITEKIT_PRODUCT},`);
+      manifest = manifest.replace(
+        anchor,
+        [anchor, ...games.map((name2) => `${gameProduct(name2)},`)].join("\n        ")
+      );
     }
     files.set(path27.join(layout2.root, "Package.swift"), manifest + moduleFiles);
   } else {
@@ -15659,6 +15698,7 @@ module ${moduleName}.Swift {
         nativeFlags,
         nativeImportFlags,
         nativeHeaderFlags,
+        nativeSwiftHeaderMaps,
         nativeHeaderDeclarations,
         objcImplementationModules: new Set(
           targets.filter(
@@ -15674,7 +15714,7 @@ module ${moduleName}.Swift {
         siblings: moduleSiblings,
         moduleRoot,
         oneModule: input.oneModule,
-        spriteKit: importsSpriteKit(input.files),
+        gameProducts: gameProducts(input.files),
         distribution: distribution ?? void 0,
         moduleExcludes,
         deferDarwinOverlay: native.size > 0 && toolsetOrdersLibcxxBeforeDarwinOverlay(
@@ -15816,30 +15856,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
@@ -16081,14 +16121,9 @@ function linkedFrameworkTargets(moduleRoot, input) {
     ))
       reach(match[1]);
   }
-  if (importsSpriteKit(input.files))
-    for (const name2 of ["SpriteKit", "PeachBox2D", "simd", "GLKit"]) reach(name2);
-  const wanted = [
-    "PeachApp",
-    ...input.oneModule ? ["One"] : [],
-    ...importsSpriteKit(input.files) ? ["SpriteKit"] : [],
-    ...reached
-  ];
+  const games = gameProducts(input.files);
+  for (const product of games) for (const name2 of GAME_REACH[product] ?? []) reach(name2);
+  const wanted = ["PeachApp", ...input.oneModule ? ["One"] : [], ...games, ...reached];
   const linked = [...new Set(wanted)].filter((name2) => libraries.has(name2));
   if (!linked.includes("PeachApp"))
     throw new Error("swift-compile: the framework package declares no PeachApp library");

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! peach v0.1.2220 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
+/*! peach v0.1.2222 | (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.2222 | (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.2222 | (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.2222 | (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.2222 | (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.2222 | (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;