peachsim 0.1.672 → 0.1.674

package/src/kotlin-app.ts

@@ -56,6 +56,7 @@ export interface AndroidPins {
   material3: string
   navigation: string
   activity: string
+  materialIcons: string
 }
 
 const ANDROID_NS = 'android:'
@@ -70,7 +71,10 @@ const PLUGINS = new Set([
 // match their Android pins (Peach's activity actuals are that version's); the
 // lifecycle and savedstate artifacts are Peach's platform actuals.
 const PLATFORM_GROUPS = new Set(['androidx.lifecycle', 'androidx.savedstate'])
+// pinned by group, or by group and artifact where a group's artifacts version
+// apart (material-icons-core stopped at 1.7, beside material-ripple)
 const ANDROID_PIN: Record<string, keyof AndroidPins> = {
+  'androidx.compose.material:material-icons-core': 'materialIcons',
   'androidx.compose.ui': 'ui',
   'androidx.compose.foundation': 'foundation',
   'androidx.compose.runtime': 'runtime',
@@ -167,7 +171,7 @@ function checkModuleGradle(gradle: { file: string; text: string }, pins: Android
       if (!coordinate)
         throw new Error(`${where}: ${value} is not a literal group:artifact:version`)
       const [, group = '', artifact, version] = coordinate
-      const pin = ANDROID_PIN[group]
+      const pin = ANDROID_PIN[`${group}:${artifact}`] ?? ANDROID_PIN[group]
       if (pin) {
         if (version !== pins[pin])
           throw new Error(

package/src/swift-compile.ts

@@ -229,10 +229,11 @@ export function swiftArtifactHash(
   moduleRoot: string,
 ): string {
   const hash = createHash('sha256')
+  // v7: runtime class lookup uses the same objc class registry as messages
   // v6: app and scene delegate classes compile final
   // (v5: a target declaring resources gets SwiftPM's Bundle.module accessor;
   // v4: sources compile through swiftSourceAsIOS)
-  hash.update(`swift-compile/v6\n${release}\n`)
+  hash.update(`swift-compile/v7\n${release}\n`)
   if (input.oneModule) hash.update('one-module\n')
   hash.update(linkedModuleDigest(moduleRoot))
   for (const file of Object.keys(input.files).sort()) {
@@ -392,6 +393,17 @@ export function swiftSourceAsIOS(source: string): string {
   let copied = 0
   for (const at of tokens) {
     const rest = conditioned.slice(at, at + 400)
+    const imported = /^import\s+CoreImage\.CIFilterBuiltins\b/.exec(rest)
+    if (imported) {
+      out += conditioned.slice(copied, at) + 'import CoreImage'.padEnd(imported[0].length)
+      copied = at + imported[0].length
+      continue
+    }
+    if (/^NSClassFromString\b/.test(rest)) {
+      out += conditioned.slice(copied, at) + '_peachClassFromString'
+      copied = at + 'NSClassFromString'.length
+      continue
+    }
     if (rest.startsWith('class')) {
       const modifiers = conditioned.slice(conditioned.lastIndexOf('\n', at - 1) + 1, at)
       if (DELEGATE_CLASS.test(rest) && !/\b(?:final|open)\b/.test(modifiers)) {
@@ -504,16 +516,25 @@ function swiftCodeScan(source: string): { lineStarts: Set<number>; tokens: numbe
       if (top.parens === 0 && stack.length > 1) stack.pop()
       else top.parens--
       i++
-    } else if (
-      source.startsWith('class', i) &&
-      !/[\w$]/.test(source[i - 1] ?? '') &&
-      !/[\w$]/.test(source[i + 5] ?? '')
-    ) {
-      tokens.push(i)
-      i += 5
     } else {
-      if (char === '@') tokens.push(i)
-      i++
+      const keyword = source.startsWith('class', i)
+        ? 'class'
+        : source.startsWith('import', i)
+          ? 'import'
+          : source.startsWith('NSClassFromString', i)
+            ? 'NSClassFromString'
+            : null
+      if (
+        keyword &&
+        !/[\w$]/.test(source[i - 1] ?? '') &&
+        !/[\w$]/.test(source[i + keyword.length] ?? '')
+      ) {
+        tokens.push(i)
+        i += keyword.length
+      } else {
+        if (char === '@') tokens.push(i)
+        i++
+      }
     }
   }
   return { lineStarts: starts, tokens }

package/src/swift-host.ts

@@ -5,6 +5,7 @@ import { createHash } from 'node:crypto'
 import fs from 'node:fs'
 import os from 'node:os'
 import path from 'node:path'
+import { swiftToolchainBin } from '../../../src/compile/swiftToolchain'
 import {
   enumerateBundleColors,
   enumerateBundleSymbols,
@@ -642,10 +643,7 @@ export function localSwiftToolchain(
   if (typeof release !== 'string') {
     throw new Error(`swift toolchain manifest at ${moduleRoot} has no release`)
   }
-  const toolchainBin = path.join(
-    os.homedir(),
-    `Library/Developer/Toolchains/${release}.xctoolchain/usr/bin`,
-  )
+  const toolchainBin = swiftToolchainBin(release)
   return fs.existsSync(path.join(toolchainBin, 'swift'))
     ? { release, toolchainBin }
     : null