peachsim 0.1.939 → 0.1.1399

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.939 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! peach v0.1.1399 | (c) 2026 Tamagui LLC | Proprietary; see LICENSE */
 
 // src/swift-compile.ts
 import { execFile as execFile2, execFileSync } from "node:child_process";
@@ -175,7 +175,10 @@ var MANIFEST_DECLARATIONS = [
 function manifestCalls(manifest, kinds) {
   const code = manifest.replace(/\/\*[\s\S]*?\*\//g, "").replace(/(^|[^:"])\/\/[^\n]*/g, "$1");
   const calls = [];
-  const pattern = new RegExp(`\\.(${MANIFEST_DECLARATIONS.join("|")})\\s*\\(`, "g");
+  const pattern = new RegExp(
+    `(?:\\.(${MANIFEST_DECLARATIONS.join("|")})|\\b(Package))\\s*\\(`,
+    "g"
+  );
   let match;
   while ((match = pattern.exec(code)) !== null) {
     let depth = 1;
@@ -205,19 +208,56 @@ function manifestCalls(manifest, kinds) {
       }
       i++;
     }
-    if (kinds.includes(match[1]))
-      calls.push({ kind: match[1], flat, call: code.slice(start, i) });
+    const kind = match[1] ?? match[2];
+    if (kinds.includes(kind)) calls.push({ kind, flat, call: code.slice(start, i) });
+    else if (kind === "Package") {
+      calls.push(...manifestCalls(code.slice(start, i - 1), kinds));
+    }
     pattern.lastIndex = i;
   }
   return calls;
 }
+function splitManifestArguments(source) {
+  const arguments_ = [];
+  let start = 0;
+  let parentheses = 0;
+  let brackets = 0;
+  let braces = 0;
+  let inString = false;
+  let escaped = false;
+  for (let index = 0; index < source.length; index++) {
+    const character = source[index];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (character === "\\") escaped = true;
+      else if (character === '"') inString = false;
+    } else if (character === '"') inString = true;
+    else if (character === "(") parentheses++;
+    else if (character === ")") parentheses--;
+    else if (character === "[") brackets++;
+    else if (character === "]") brackets--;
+    else if (character === "{") braces++;
+    else if (character === "}") braces--;
+    else if (character === "," && parentheses === 0 && brackets === 0 && braces === 0) {
+      arguments_.push(source.slice(start, index).trim());
+      start = index + 1;
+    }
+  }
+  const final = source.slice(start).trim();
+  if (final) arguments_.push(final);
+  return arguments_;
+}
 function swiftManifestTargets(manifest, resourcePaths = []) {
   const implicitResources = swiftImplicitResourcePaths(resourcePaths);
   const targets = [];
-  for (const { kind, flat, call } of manifestCalls(manifest, [
-    "executableTarget",
-    "target"
-  ])) {
+  const declarations = manifestCalls(manifest, ["executableTarget", "target"]);
+  const targetNames = new Set(
+    declarations.flatMap(({ flat }) => {
+      const name = /\bname\s*:\s*"([^"]+)"/.exec(flat)?.[1];
+      return name ? [name] : [];
+    })
+  );
+  for (const { kind, flat, call } of declarations) {
     const executable = kind === "executableTarget";
     const name = /\bname\s*:\s*"([^"]+)"/.exec(flat)?.[1];
     if (!name) continue;
@@ -227,6 +267,12 @@ function swiftManifestTargets(manifest, resourcePaths = []) {
       /\.swiftLanguageMode\(\s*\.v(\d+)\s*\)/.exec(call)?.[1] ?? "5"
     );
     const mainActorIsolation = /\.defaultIsolation\(\s*MainActor\.self\s*\)/.test(call);
+    const cxxInterop = /\.interoperabilityMode\(\s*\.Cxx\s*\)/.test(
+      call.replace(/"(?:\\.|[^"\\])*"/g, "")
+    );
+    const defines = [
+      ...call.matchAll(/\.define\(\s*"([A-Za-z_][A-Za-z0-9_]*)"\s*\)/g)
+    ].map((match) => match[1]);
     const excluded = [
       ...(/\bexclude\s*:\s*\[([^\]]*)\]/.exec(flat)?.[1] ?? "").matchAll(/"([^"]+)"/g)
     ].map((match) => match[1].replace(/^\.\//, "").replace(/\/+$/, ""));
@@ -240,20 +286,60 @@ function swiftManifestTargets(manifest, resourcePaths = []) {
         return false;
       return true;
     });
+    const targetArguments = splitManifestArguments(call.slice(0, -1));
+    const dependencyArgument = targetArguments.find(
+      (argument) => /^dependencies\s*:/.test(argument)
+    );
+    const dependencyList = dependencyArgument?.replace(/^dependencies\s*:\s*/, "").trim();
+    const dependencyNames = /* @__PURE__ */ new Set();
+    if (dependencyList?.startsWith("[") && dependencyList.endsWith("]")) {
+      for (const dependency of splitManifestArguments(dependencyList.slice(1, -1))) {
+        const dependencyName = /^"([^"]+)"$/.exec(dependency)?.[1] ?? /^\.(?:target|byName)\s*\(\s*name\s*:\s*"([^"]+)"/.exec(dependency)?.[1];
+        if (dependencyName && targetNames.has(dependencyName))
+          dependencyNames.add(dependencyName);
+      }
+    }
+    const dependencies = [...dependencyNames].map((name2) => ({
+      kind: "target",
+      name: name2
+    }));
     targets.push({
       name,
       path: targetPath,
       executable,
       languageMode,
       mainActorIsolation,
-      resources
+      ...cxxInterop ? { cxxInterop: true } : {},
+      ...defines.length === 0 ? {} : { defines },
+      resources,
+      ...dependencies.length === 0 ? {} : { dependencies },
+      ...excluded.length === 0 ? {} : { exclude: excluded }
     });
   }
   return targets;
 }
+function swiftManifestCxxLanguageStandard(manifest) {
+  const declaration = manifestCalls(manifest, ["Package"])[0];
+  if (!declaration) return void 0;
+  const code = declaration.flat.replace(/"(?:\\.|[^"\\])*"/g, "");
+  return /\bcxxLanguageStandard\s*:\s*\.(\w+)/.exec(code)?.[1];
+}
 function swiftPackagePartition(manifest, resourcePaths = []) {
   const targets = swiftManifestTargets(manifest, resourcePaths);
-  return targets.length === 1 && targets[0].executable && targets[0].path === "." ? [] : targets;
+  return targets.length === 1 && targets[0].executable && targets[0].path === "." && targets[0].languageMode === 5 && !targets[0].mainActorIsolation && !targets[0].defines?.length && !targets[0].cxxInterop && !swiftManifestCxxLanguageStandard(manifest) ? [] : targets;
+}
+
+// src/swiftContract.ts
+function isSwiftResourcePath(value) {
+  return typeof value === "string" && value.length <= 4096 && !value.startsWith("/") && !value.includes("\\") && !value.includes("\0") && value.split("/").every((part) => part !== "" && part !== "." && part !== "..");
+}
+function isSwiftBundlePath(value) {
+  return typeof value === "string" && (value === "." || isSwiftResourcePath(value) && /\.(bundle|framework)$/.test(value));
+}
+function isSwiftResourceBundles(value) {
+  return Array.isArray(value) && value.length <= 128 && value.every(
+    (bundle) => typeof bundle === "object" && bundle !== null && typeof bundle.target === "string" && /^[A-Za-z_][A-Za-z0-9_-]*$/.test(bundle.target) && (bundle.sourcePath === "." || isSwiftResourcePath(bundle.sourcePath)) && isSwiftBundlePath(bundle.path)
+  ) && new Set(value.map((bundle) => bundle.target)).size === value.length && new Set(value.map((bundle) => bundle.path)).size === value.length;
 }
 
 // src/swift-compile.ts
@@ -286,6 +372,7 @@ function swiftModuleInputFiles(root) {
     "Package.swift",
     "scripts/contrast-app-Package.swift",
     "scripts/build-distribution.ts",
+    "scripts/distribution-clang.ts",
     "scripts/build-distribution-plugins.sh",
     "scripts/build-preview-plugin.sh",
     "toolchain.json"
@@ -310,6 +397,10 @@ function swiftMacroPlugins(moduleRoot) {
       stale: false
     };
   const dir = path2.join(moduleRoot, ".build/host/RnxPreviewMacros");
+  const release = JSON.parse(
+    readFileSync2(path2.join(moduleRoot, "toolchain.json"), "utf8")
+  ).release;
+  const compilerStamp = path2.join(dir, "compiler-release");
   const ext = process.platform === "darwin" ? "dylib" : "so";
   const plugins = [
     {
@@ -323,12 +414,12 @@ function swiftMacroPlugins(moduleRoot) {
   ];
   return {
     libraries: plugins.map(({ library }) => library),
-    stale: plugins.some(
+    stale: !existsSync(compilerStamp) || readFileSync2(compilerStamp, "utf8").trim() !== release || plugins.some(
       ({ library, source }) => !existsSync(library) || statSync(source).mtimeMs > statSync(library).mtimeMs
     )
   };
 }
-async function ensureMacroPlugins(moduleRoot, toolchainBin) {
+async function ensureMacroPlugins(moduleRoot, toolchainBin, release) {
   const { libraries, stale } = swiftMacroPlugins(moduleRoot);
   if (stale) {
     await run2("sh", [
@@ -336,6 +427,11 @@ async function ensureMacroPlugins(moduleRoot, toolchainBin) {
       toolchainBin,
       libraries[0]
     ]);
+    writeFileSync(
+      path2.join(path2.dirname(libraries[0]), "compiler-release"),
+      `${release}
+`
+    );
   }
   return libraries;
 }
@@ -401,6 +497,7 @@ var OPTIONAL_FRAMEWORK_DEPENDENCIES = {
   TikTokBusinessSDK: [],
   nSure: [],
   Statsig: [],
+  TOCropViewController: [],
   RiveRuntime: ["MetalKit"],
   MetalKit: [],
   DatadogCore: [],
@@ -415,6 +512,7 @@ var OPTIONAL_FRAMEWORK_DEPENDENCIES = {
   Intercom: [],
   FirebaseCore: [],
   FirebaseSharedSwift: ["FirebaseCore"],
+  FirebaseRemoteConfig: ["FirebaseCore", "FirebaseSharedSwift"],
   FirebaseFirestoreInternal: ["FirebaseCore"],
   FirebaseAnalytics: ["FirebaseCore"],
   FirebaseAppCheck: ["FirebaseCore"],
@@ -422,6 +520,7 @@ var OPTIONAL_FRAMEWORK_DEPENDENCIES = {
   FirebaseCrashlytics: ["FirebaseCore"],
   FirebaseFirestore: ["FirebaseCore", "FirebaseSharedSwift", "FirebaseFirestoreInternal"],
   FirebaseStorage: ["FirebaseCore"],
+  GoogleMobileAds: [],
   FBAudienceNetwork: []
 };
 var OPTIONAL_FRAMEWORKS = new Set(Object.keys(OPTIONAL_FRAMEWORK_DEPENDENCIES));
@@ -565,7 +664,11 @@ function swiftTargetDependencies(files, targets) {
   const siblings = /* @__PURE__ */ new Map();
   for (const target of targets) {
     const prefix = target.path === "." ? "" : `${target.path}/`;
-    const deps = /* @__PURE__ */ new Set();
+    const deps = new Set(
+      (target.dependencies ?? []).flatMap(
+        (dependency) => dependency.kind === "target" && dependency.name !== target.name && names.has(dependency.name) ? [dependency.name] : []
+      )
+    );
     for (const [file, contents] of Object.entries(files)) {
       if (file === "Package.swift" || !file.startsWith(prefix)) continue;
       if (targets.some(
@@ -589,17 +692,17 @@ var FOUNDATION_IMPLICIT_MODULES = [
   "PeachObjC",
   "Dispatch",
   "FoundationNetworking",
-  "WASILibc",
-  "wasi_pthread"
+  "PeachFoundationCombine",
+  "Darwin"
 ];
 var FOUNDATION_IMPLICIT_FLAGS = FOUNDATION_IMPLICIT_MODULES.map(
   (module) => `, "-Xfrontend", "-import-module", "-Xfrontend", "${module}"`
 ).join("");
 var ONE_IMPLICIT_FLAGS = ', "-Xfrontend", "-import-module", "-Xfrontend", "One"';
-var MULTI_MANIFEST_VERSION = 12;
+var MULTI_MANIFEST_VERSION = 18;
 function swiftArtifactHash(input, release, moduleRoot) {
   const hash = createHash2("sha256");
-  hash.update(`swift-compile/v20
+  hash.update(`swift-compile/v23
 ${release}
 `);
   if (input.oneModule) hash.update("one-module\n");
@@ -608,6 +711,13 @@ ${release}
     hash.update(createHash2("sha256").update(file).digest());
     hash.update(createHash2("sha256").update(input.files[file]).digest());
   }
+  for (const file of Object.keys(input.metalSources ?? {}).sort()) {
+    hash.update("metal-source\n");
+    hash.update(createHash2("sha256").update(file).digest());
+    hash.update(
+      createHash2("sha256").update(input.metalSources?.[file] ?? "").digest()
+    );
+  }
   for (const base of Object.keys(input.resources ?? {}).sort()) {
     hash.update(createHash2("sha256").update(base).digest());
     hash.update(
@@ -625,6 +735,19 @@ ${release}
     hash.update("resource-path\n");
     hash.update(createHash2("sha256").update(file).digest());
   }
+  hash.update(
+    JSON.stringify(
+      [...input.resourceBundles ?? []].sort((a, b) => a.target.localeCompare(b.target))
+    )
+  );
+  for (const target of Object.keys(input.libraries ?? {}).sort()) {
+    hash.update(`library
+${target}
+`);
+    hash.update(
+      createHash2("sha256").update(input.libraries?.[target] ?? "").digest()
+    );
+  }
   const targets = compileTargets(input);
   if (targets.length > 0) {
     hash.update(`swift-multi/v${MULTI_MANIFEST_VERSION}
@@ -660,10 +783,22 @@ function emitSwiftPackageManifest(args) {
   if (!executable) throw new Error("swift-compile: no executable target to emit");
   const stanza = (target) => {
     const isolation = target.mainActorIsolation ? " .defaultIsolation(MainActor.self)," : "";
+    const interoperability = target.cxxInterop ? " .interoperabilityMode(.Cxx)," : "";
+    const defines = (target.defines ?? []).map((name) => ` .define(${JSON.stringify(name)}),`).join("");
     const imports = distribution ? `, "-I", ${JSON.stringify(path2.join(moduleRoot, "modules"))}` : "";
-    const swiftSettings = `swiftSettings: [.swiftLanguageMode(.v${target.languageMode}),${isolation} .unsafeFlags(["-Osize"${FOUNDATION_IMPLICIT_FLAGS}${oneModule ? ONE_IMPLICIT_FLAGS : ""}${imports}])]`;
+    const native = args.native?.get(target.name);
+    const nativeImports = (siblings.get(target.name) ?? []).filter((name) => args.native?.has(name)).map(
+      (name) => `, "-Xfrontend", "-import-module", "-Xfrontend", ${JSON.stringify(name)}`
+    ).join("");
+    const header = args.headerDirectory && [...args.native?.values() ?? []].some(
+      (value) => value.late.producers.includes(target.name)
+    ) ? `, "-emit-objc-header-path", ${JSON.stringify(path2.join(args.headerDirectory, `${target.name}-Swift.h`))}` : "";
+    const swiftSettings = `swiftSettings: [.swiftLanguageMode(.v${target.languageMode}),${isolation}${interoperability}${defines} .unsafeFlags(["-Osize"${FOUNDATION_IMPLICIT_FLAGS}${oneModule ? ONE_IMPLICIT_FLAGS : ""}${imports}${nativeImports}${header}])]`;
     const deps = [
-      ...distribution ? [] : [
+      ...target.executable ? [...args.native?.values() ?? []].map(
+        (value) => JSON.stringify(value.late.name)
+      ) : [],
+      ...distribution || native ? [] : [
         '.product(name: "SwiftUI", package: "sootsim-swift")',
         ...oneModule ? [ONE_PRODUCT] : [],
         ...spriteKit ? [SPRITEKIT_PRODUCT] : []
@@ -684,13 +819,15 @@ function emitSwiftPackageManifest(args) {
           "-Xlinker", "--export-if-defined=__main_argc_argv"${library},
         ]),
         .unsafeFlags(["-Xlinker", "--strip-all"], .when(configuration: .release)),
-      ]` : "";
+      ]` : args.libraries?.has(target.name) ? `,
+      linkerSettings: [.unsafeFlags([${JSON.stringify(args.libraries.get(target.name))}])]` : "";
     return [
       `    ${kind}(`,
       `      name: "${target.name}",`,
       `      dependencies: [${deps}],`,
       `      path: "${target.path}",`,
-      `      ${swiftSettings}${link}`,
+      ...native ? [`      exclude: ${JSON.stringify(native.lateSources)},`] : [],
+      `      ${native ? "cxxSettings: []" : swiftSettings}${link}`,
       `    ),`
     ].join("\n");
   };
@@ -705,7 +842,16 @@ function emitSwiftPackageManifest(args) {
     `  dependencies: [${distribution ? "" : `.package(path: "${moduleRoot}")`}],`,
     "  targets: [",
     ...targets.map(stanza),
-    "  ]",
+    ...[...args.native?.entries() ?? []].flatMap(([name, native]) => [
+      `    .target(name: ${JSON.stringify(native.late.name)},`,
+      `      dependencies: ${JSON.stringify([name, ...native.late.producers])},`,
+      `      path: ${JSON.stringify(native.path)},`,
+      `      sources: ${JSON.stringify(native.lateSources)},`,
+      `      publicHeadersPath: "include",`,
+      `      cxxSettings: [.unsafeFlags(["-fno-cxx-modules", "-I", ${JSON.stringify(native.includeDirectory)}, "-I", ${JSON.stringify(args.headerDirectory)}])]),`
+    ]),
+    args.cxxLanguageStandard ? `  ],
+  cxxLanguageStandard: .${args.cxxLanguageStandard}` : "  ]",
     ")",
     ""
   ].join("\n");
@@ -722,9 +868,10 @@ function syncSwiftTree(base, files) {
   };
   walk(base);
   for (const [full, contents] of files) {
-    if (existsSync(full) && readFileSync2(full, "utf8") === contents) continue;
+    if (existsSync(full) && (typeof contents === "string" ? readFileSync2(full, "utf8") === contents : readFileSync2(full).equals(contents)))
+      continue;
     mkdirSync(path2.dirname(full), { recursive: true });
-    writeFileSync(full, contents, "utf8");
+    writeFileSync(full, contents);
   }
 }
 var DIRECTIVE = /^[ \t]*#(?:if|elseif)\b/;
@@ -1842,6 +1989,8 @@ function prepareSwiftDependency(source, destination) {
   copy(source, destination, true);
 }
 function writeSwiftProject(layout, input, moduleRoot) {
+  if (input.resourceBundles !== void 0 && !isSwiftResourceBundles(input.resourceBundles))
+    throw new Error("swift compile input has invalid target bundle assignments");
   const resourceTargets = swiftManifestTargets(
     input.files["Package.swift"] ?? "",
     input.resourcePaths
@@ -1858,6 +2007,80 @@ function writeSwiftProject(layout, input, moduleRoot) {
     }
   ] : compileTargets(input);
   const files = /* @__PURE__ */ new Map();
+  const native = /* @__PURE__ */ new Map();
+  const headerDirectory = path2.join(layout.root, ".build", "peach-cxx-headers");
+  for (const target of targets) {
+    const prefix = target.path === "." ? "" : `${target.path}/`;
+    const entries = Object.entries(input.files).filter(
+      ([file]) => file.startsWith(prefix) && !targets.some(
+        (candidate) => candidate.name !== target.name && candidate.path !== "." && candidate.path.startsWith(prefix) && file.startsWith(`${candidate.path}/`)
+      )
+    );
+    if (entries.some(([file]) => file.endsWith(".swift"))) continue;
+    const units = entries.filter(([file]) => /\.(?:c|cc|cpp|cxx|m|mm)$/.test(file));
+    if (units.length === 0) continue;
+    const includes = `${prefix}include/`;
+    const consumers = /* @__PURE__ */ new Map();
+    const reverse = /* @__PURE__ */ new Map();
+    for (const [file, contents] of entries) {
+      const producers = /* @__PURE__ */ new Set();
+      const source = contents.replace(/\/\*[\s\S]*?\*\//g, "");
+      for (const match of source.matchAll(/^\s*#\s*include\s*[<"]([^>"]+)[>"]/gm)) {
+        const include = match[1];
+        const producer = /(?:^|\/)([^/]+)-Swift\.h$/.exec(include)?.[1];
+        if (producer && targets.some((value) => value.name === producer))
+          producers.add(producer);
+        const local = [
+          path2.posix.join(path2.posix.dirname(file), include),
+          `${includes}${include}`
+        ].find((candidate) => input.files[candidate] !== void 0);
+        if (local) {
+          reverse.set(local, [...reverse.get(local) ?? [], file]);
+        }
+      }
+      consumers.set(file, producers);
+    }
+    const queue = [...consumers.keys()].filter((file) => consumers.get(file).size > 0);
+    for (let index = 0; index < queue.length; index++) {
+      const file = queue[index];
+      for (const parent of reverse.get(file) ?? []) {
+        const inherited = consumers.get(parent);
+        const before = inherited.size;
+        for (const producer of consumers.get(file)) inherited.add(producer);
+        if (before !== inherited.size) queue.push(parent);
+      }
+    }
+    const late = units.filter(([file]) => consumers.get(file).size > 0);
+    if (late.length === 0) continue;
+    native.set(target.name, {
+      path: target.path,
+      includeDirectory: path2.join(layout.root, includes),
+      lateSources: late.map(([file]) => file.slice(prefix.length)),
+      late: {
+        name: `${target.name}SwiftImplementation`,
+        producers: [
+          ...new Set(late.flatMap(([file]) => [...consumers.get(file)]))
+        ].sort()
+      }
+    });
+    if (input.files[`${includes}module.modulemap`] !== void 0) continue;
+    const roots = entries.filter(
+      ([file]) => file.startsWith(includes) && /\.(?:h|hpp|hh|hxx)$/.test(file) && consumers.get(file).size === 0
+    );
+    files.set(
+      path2.join(layout.root, includes, "module.modulemap"),
+      [
+        `module ${target.name} {`,
+        ...roots.map(
+          ([file]) => `  header ${JSON.stringify(file.slice(includes.length))}`
+        ),
+        "  export *",
+        "}",
+        ""
+      ].join("\n")
+    );
+  }
+  if (native.size > 0) mkdirSync(headerDirectory, { recursive: true });
   const modulePlan = createHash2("sha256").update(
     swiftModuleInputFiles(moduleRoot).join("\n")
   );
@@ -1866,7 +2089,11 @@ function writeSwiftProject(layout, input, moduleRoot) {
   }
   const resourcePlan = createHash2("sha256").update(
     JSON.stringify(
-      resourceTargets.filter((target) => target.resources).map((target) => [target.name, target.path])
+      resourceTargets.filter((target) => target.resources).map((target) => [
+        target.name,
+        target.path,
+        input.resourceBundles?.find((bundle) => bundle.target === target.name)?.path
+      ])
     )
   ).digest("hex").slice(0, 16);
   const moduleFiles = `
@@ -1926,6 +2153,12 @@ function writeSwiftProject(layout, input, moduleRoot) {
     files.set(path2.join(layout.root, "Package.swift"), manifest + moduleFiles);
   } else {
     const base = layout.multi ? layout.root : layout.sources;
+    const libraries = /* @__PURE__ */ new Map();
+    for (const [target, data] of Object.entries(input.libraries ?? {})) {
+      const file = path2.join(layout.root, ".peach-libraries", `lib${target}.a`);
+      files.set(file, Buffer.from(data, "base64"));
+      libraries.set(target, file);
+    }
     for (const [file, contents] of Object.entries(input.files)) {
       if (file === "Package.swift") continue;
       files.set(
@@ -1937,6 +2170,11 @@ function writeSwiftProject(layout, input, moduleRoot) {
       path2.join(layout.root, "Package.swift"),
       emitSwiftPackageManifest({
         targets,
+        native,
+        headerDirectory: native.size > 0 ? headerDirectory : void 0,
+        cxxLanguageStandard: swiftManifestCxxLanguageStandard(
+          input.files["Package.swift"] ?? ""
+        ),
         siblings: swiftTargetDependencies(
           input.files,
           layout.multi ? targets : targets.map((target) => ({ ...target, path: "." }))
@@ -1944,12 +2182,20 @@ function writeSwiftProject(layout, input, moduleRoot) {
         moduleRoot,
         oneModule: input.oneModule,
         spriteKit: importsSpriteKit(input.files),
-        distribution: distribution ?? void 0
+        distribution: distribution ?? void 0,
+        libraries
       }) + moduleFiles
     );
   }
   for (const target of resourceTargets) {
     if (!target.resources) continue;
+    const bundle = input.resourceBundles?.find(
+      (candidate) => candidate.target === target.name
+    );
+    if (!bundle || bundle.sourcePath !== target.path)
+      throw new Error(
+        `swift resource target ${target.name} has no matching bundle assignment`
+      );
     const directory = layout.multi ? path2.join(layout.root, target.path) : layout.sources;
     files.set(
       path2.join(directory, "ResourceBundleAccessor.generated.swift"),
@@ -1957,7 +2203,11 @@ function writeSwiftProject(layout, input, moduleRoot) {
         "import Foundation",
         "",
         "extension Foundation.Bundle {",
-        "  static let module: Bundle = Bundle.main",
+        bundle.path === "." ? "  static let module: Bundle = Bundle.main" : `  static let module: Bundle = {
+    let url = Bundle.main.bundleURL.appendingPathComponent(${JSON.stringify(bundle.path)})
+    guard let bundle = Bundle(url: url) else { fatalError("resource bundle is missing: ${bundle.target}") }
+    return bundle
+  }()`,
         "}",
         ""
       ].join("\n")
@@ -2025,7 +2275,7 @@ function compileSwiftProjectUnit(input, options) {
   };
   const hash = swiftArtifactHash(input, options.release, moduleRoot);
   return serialize(root, async () => {
-    if (process.platform === "darwin" && process.env.TM_SESSION && process.env.CI !== "true" && process.env.CONTRAST_HEAVY_ADMITTED !== "1" && moduleRoot === path2.resolve(import.meta.dirname, "../../sootsim-swift") && !swiftDistributionAt(moduleRoot)) {
+    if (process.platform === "darwin" && process.env.TM_SESSION && process.env.CI !== "true" && moduleRoot === path2.resolve(import.meta.dirname, "../../sootsim-swift") && !swiftDistributionAt(moduleRoot)) {
       const requestRoot = mkdtempSync(path2.join(root, ".builder-request-"));
       const output = path2.join(requestRoot, "output");
       const request = path2.join(requestRoot, "request.json");
@@ -2050,7 +2300,11 @@ function compileSwiftProjectUnit(input, options) {
             "--output",
             output
           ],
-          { cwd: repo, timeout: options.timeoutMs, maxBuffer: 64 * 1024 * 1024 }
+          {
+            cwd: repo,
+            timeout: options.timeoutMs,
+            maxBuffer: 64 * 1024 * 1024
+          }
         );
         pending.child.stdout?.on("data", (bytes2) => process.stdout.write(bytes2));
         pending.child.stderr?.on("data", (bytes2) => process.stderr.write(bytes2));
@@ -2082,7 +2336,11 @@ function compileSwiftProjectUnit(input, options) {
         `swift-compile: no swift.org toolchain at ${options.toolchainBin}; install ${options.release} and its matching wasm sdk`
       );
     }
-    const macroPlugins = await ensureMacroPlugins(moduleRoot, options.toolchainBin);
+    const macroPlugins = await ensureMacroPlugins(
+      moduleRoot,
+      options.toolchainBin,
+      options.release
+    );
     const sdk = swiftModuleSdk(moduleRoot).wasmSdkId;
     const icu = swiftIcuAsset(options.toolchainBin, sdk);
     try {
@@ -2090,6 +2348,8 @@ function compileSwiftProjectUnit(input, options) {
         swift,
         [
           "build",
+          "--build-system",
+          "native",
           "-j",
           BUILD_JOBS,
           "--package-path",