peachsim 0.1.2198 → 0.1.2200

package/src/swift-wasm-prune.ts

@@ -1070,6 +1070,32 @@ function getModulePrefix(file: string): string {
   return dash > 0 ? base.slice(0, dash) : base
 }
 
+// protocol descriptors of the SwiftUI protocols whose conformers declare @State, @Environment and other DynamicProperty fields
+const SWIFTUI_WRAPPER_HOST_PROTOCOLS = new Set(
+  [
+    'View',
+    'ViewModifier',
+    'App',
+    'Scene',
+    'Gesture',
+    'ToolbarContent',
+    'Commands',
+    'DynamicProperty',
+  ].map((name) => `$s7SwiftUI${name.length}${name}Mp`),
+)
+
+/** SwiftUI and Combine own the wrappers; any other object keeps its field descriptors when its conformance records reference a protocol whose conformers hold them. */
+export function keepsSwiftUIReflection(
+  file: string,
+  undefinedSymbols: Iterable<string>,
+): boolean {
+  if (/^(SwiftUI|Combine|_[A-Za-z0-9]+_SwiftUI)-/.test(path.basename(file))) return true
+  for (const name of undefinedSymbols) {
+    if (SWIFTUI_WRAPPER_HOST_PROTOCOLS.has(name)) return true
+  }
+  return false
+}
+
 export function pruneSwiftWasmLink(
   directory: string,
   toolchainBin: string,
@@ -1121,11 +1147,23 @@ export function pruneSwiftWasmLink(
   const distDir = path.join(moduleRoot, 'lib')
   // the app's own struct and class field descriptors stay: SwiftUI attaches
   // @State and @StateObject by reflecting the app's view structs.
-  // the shim reflects its own wrappers and views (State, ObservedObject, Published), so SwiftUI and Combine keep their descriptors.
-  // a framework's SwiftUI overlay (_StoreKit_SwiftUI) declares views whose @State and @Environment attach the same way.
+  // the shim reflects its own wrappers (State, ObservedObject, Published), so SwiftUI, Combine and framework SwiftUI overlays (_StoreKit_SwiftUI) keep their descriptors.
+  // any other object keeps them when it conforms to a SwiftUI protocol whose conformers hold property wrappers: its record references the protocol descriptor.
+  const keepsReflection = new Map<ParsedObject, boolean>()
+  const declaresSwiftUIConformers = (obj: ParsedObject) => {
+    let keeps = keepsReflection.get(obj)
+    if (keeps === undefined) {
+      keeps = keepsSwiftUIReflection(
+        obj.file,
+        obj.symNames.filter((n, i) => n && (obj.symFlags[i]! & 0x10) !== 0),
+      )
+      keepsReflection.set(obj, keeps)
+    }
+    return keeps
+  }
   const dropsReflection = (obj: ParsedObject, name: string | undefined) =>
     !!name &&
-    !/^(SwiftUI|Combine|_[A-Za-z0-9]+_SwiftUI)-/.test(path.basename(obj.file)) &&
+    !declaresSwiftUIConformers(obj) &&
     (name.startsWith('l__swift5_reflection_descriptor') ||
       (name.startsWith('$s') &&
         (name.endsWith('CMF') || name.endsWith('VMF')) &&

package/src/turbo-compile.ts

@@ -416,7 +416,8 @@ export async function compileTurboModule(options: {
   await options.prepareReactNativeCore?.(collection.coreMode, options.moduleRoot)
   linkReactNativeCore(
     collection,
-    prebuiltReactNativeCore(
+    await prebuiltReactNativeCore(
+      options.projectRoot,
       options.reactNativeRoot,
       options.moduleRoot,
       collection.coreMode,