peachsim 0.1.634 → 0.1.636

package/src/skills/builtin/compat-check.ts

@@ -4,14 +4,14 @@ import type { RNXSkill } from '../types'
 
 export const skill: RNXSkill = {
   name: 'compat-check',
-  description: 'Check package compatibility with peach',
+  description: 'Check package compatibility with Peach',
   type: 'review',
   version: '1.0.0',
   triggers: ['compatibility', 'compat', 'check package', 'supported packages'],
   tools: [
     {
       name: 'check_compatibility',
-      description: 'Scan project dependencies for peach compatibility',
+      description: 'Scan project dependencies for Peach compatibility',
       parameters: {
         packageName: {
           type: 'string',

package/src/swift-compile.ts

@@ -224,7 +224,8 @@ export function swiftArtifactHash(
   moduleRoot: string,
 ): string {
   const hash = createHash('sha256')
-  hash.update(`swift-compile/v1\n${release}\n`)
+  // v2: sources compile with os(iOS) true (swiftSourceAsIOS)
+  hash.update(`swift-compile/v2\n${release}\n`)
   if (input.oneModule) hash.update('one-module\n')
   hash.update(linkedModuleDigest(moduleRoot))
   for (const file of Object.keys(input.files).sort()) {
@@ -342,6 +343,24 @@ function syncSwiftTree(base: string, files: Map<string, string>): void {
   }
 }
 
+// the app runs as iOS, but it compiles for wasm, where `os(iOS)` is false and
+// every iOS branch of the app would compile out. a condition line names iOS
+// as `true` padded to the same length, so diagnostics keep their columns;
+// os(WASI) still holds for code written for wasm. only `#if` and `#elseif`
+// lines change, and the artifact hash stays over the original text.
+const CONDITION_LINE = /^([ \t]*#(?:if|elseif)\b)(.*)$/gm
+const OS_IOS = /\bos\(\s*iOS\s*\)/g
+export function swiftSourceAsIOS(source: string): string {
+  return source.replace(
+    CONDITION_LINE,
+    (_, directive: string, condition: string) =>
+      directive + condition.replace(OS_IOS, (match) => 'true'.padEnd(match.length)),
+  )
+}
+
+const compiledSource = (file: string, contents: string) =>
+  file.endsWith('.swift') ? swiftSourceAsIOS(contents) : contents
+
 export function writeSwiftProject(
   layout: SwiftProjectLayout,
   input: SwiftCompileInput,
@@ -352,7 +371,7 @@ export function writeSwiftProject(
   if (targets.length === 0) {
     for (const [file, contents] of Object.entries(input.files)) {
       if (file === 'Package.swift') continue
-      files.set(path.join(layout.sources, file), contents)
+      files.set(path.join(layout.sources, file), compiledSource(file, contents))
     }
     let manifest = readFileSync(
       path.join(moduleRoot, 'scripts/contrast-app-Package.swift'),
@@ -376,7 +395,7 @@ export function writeSwiftProject(
   } else {
     for (const [file, contents] of Object.entries(input.files)) {
       if (file === 'Package.swift') continue
-      files.set(path.join(layout.root, file), contents)
+      files.set(path.join(layout.root, file), compiledSource(file, contents))
     }
     files.set(
       path.join(layout.root, 'Package.swift'),