peachsim 0.1.871 → 0.1.873

package/src/swift-distribution.lock.json

@@ -1,22 +1,22 @@
 {
-  "id": "8a53b074b33eb8b5",
+  "id": "cf49b84963eae4ec",
   "release": "swift-6.3-RELEASE",
   "wasmSdkId": "swift-6.3-RELEASE_wasm-peach-41921598-peach-edd95e37",
   "wasmSdkUrl": "https://r2.rnxsim.com/swift-wasm-sdk/swift-6.3-RELEASE_wasm-peach-41921598-peach-edd95e37.artifactbundle.tar.gz",
   "wasmSdkChecksum": "e8b76a6b78c21e9e16a6943a691ea001aeb0a18518d775a26130520303eb5c6d",
-  "source": "882ff4ff4b262e108926af9d13985fba69132c1a",
+  "source": "7b29f31b65a02aea2d28fd0518e0118f2337f2b7",
   "hosts": {
     "darwin-arm64": {
-      "sha256": "6199b51b4d4f963db72bff2fc7174d7944bbf7c6f0379b58fc9fe1db81081dd7",
-      "size": 39773614
+      "sha256": "c120569e34e16edb81fe0fabe92a9d7c4c5f64b06363726b466f996cdb05588b",
+      "size": 43318901
     },
     "linux-x64": {
-      "sha256": "dd414d2c73175b5ea4e142f414615e2648102f827a998b8a80edf3c0a8acbb0f",
-      "size": 39779064
+      "sha256": "d8a65a3f77d7302ed3547f525c4274a6c7aa2bdccdf9a41f4864ad305d0ae643",
+      "size": 43324299
     },
     "linux-arm64": {
-      "sha256": "67396e3baa888a4463ecfdeb9f14996e8f5ee397c181e64cf0e82868b27d3463",
-      "size": 39778119
+      "sha256": "d47964d033ac59af2417939703335148993ea2d3e931a7db048a8080780c5de6",
+      "size": 43323284
     }
   }
 }

package/src/swift-host.ts

@@ -479,6 +479,71 @@ function resourceCandidateFiles(root: string): string[] {
   )
 }
 
+// discovery reads only the app target's catalog, before the first compile.
+export function swiftProjectAppInfo(packagePath: string): {
+  name: string
+  icon: { bytes: Buffer; contentType: string } | null
+} {
+  const registered = xcodeProjects.get(packagePath)
+  const app = registered
+    ? readXcodeAppTarget(registered.xcodeproj, registered.target)
+    : null
+  const files = app?.resources ?? resourceCandidateFiles(packagePath)
+  const catalogs = files.filter(
+    (file) =>
+      file.endsWith('.appiconset/Contents.json') &&
+      (!app?.appIconName ||
+        path.basename(path.dirname(file)) === `${app.appIconName}.appiconset`),
+  )
+  let icon: { bytes: Buffer; contentType: string } | null = null
+  for (const contents of catalogs) {
+    const value: unknown = JSON.parse(fs.readFileSync(contents, 'utf8'))
+    if (
+      !value ||
+      typeof value !== 'object' ||
+      !('images' in value) ||
+      !Array.isArray(value.images)
+    )
+      continue
+    const images: { filename: string; pixels: number }[] = []
+    const entries: readonly unknown[] = value.images
+    for (const image of entries) {
+      if (
+        !image ||
+        typeof image !== 'object' ||
+        !('filename' in image) ||
+        typeof image.filename !== 'string' ||
+        path.basename(image.filename) !== image.filename ||
+        !/\.(png|jpe?g|webp)$/i.test(image.filename)
+      )
+        continue
+      if (
+        'idiom' in image &&
+        (typeof image.idiom !== 'string' ||
+          !['iphone', 'ios-marketing', 'universal'].includes(image.idiom))
+      )
+        continue
+      if ('appearances' in image) continue
+      const size =
+        'size' in image && typeof image.size === 'string' ? parseFloat(image.size) : 0
+      const scale =
+        'scale' in image && typeof image.scale === 'string' ? parseFloat(image.scale) : 1
+      images.push({ filename: image.filename, pixels: size * scale })
+    }
+    const picked = images.sort((a, b) => b.pixels - a.pixels)[0]
+    if (!picked) continue
+    const file = path.join(path.dirname(contents), picked.filename)
+    if (!files.includes(file)) continue
+    icon = {
+      bytes: fs.readFileSync(file),
+      contentType:
+        RESOURCE_CONTENT_TYPES[path.extname(file).toLowerCase()] ?? 'image/png',
+    }
+    break
+  }
+  return { name: app?.name ?? path.basename(packagePath), icon }
+}
+
 // the hosted compile service caps what a project sends it; a local compile
 // reads the author's own files, so nothing caps them there.
 const HOSTED_LIMITS = {

package/src/swiftDiscoveryContract.ts

@@ -0,0 +1,32 @@
+// the foreground swift host's signature, shared by its server and scanner.
+export const SWIFT_DISCOVERY_PATH = '/__peach/swift-host'
+export const SWIFT_GUEST_PATH = '/__peach/swift-guest.js'
+export const SWIFT_ICON_PATH = '/__peach/swift-icon'
+
+export interface SwiftHostDiscovery {
+  framework: 'swift'
+  projectName: string
+  status: 'compiling' | 'ready' | 'error'
+  iconPath?: typeof SWIFT_ICON_PATH
+}
+
+export function parseSwiftHostDiscovery(value: unknown): SwiftHostDiscovery | null {
+  if (!value || typeof value !== 'object') return null
+  if (
+    !('framework' in value) ||
+    value.framework !== 'swift' ||
+    !('projectName' in value) ||
+    typeof value.projectName !== 'string' ||
+    !('status' in value) ||
+    (value.status !== 'compiling' && value.status !== 'ready' && value.status !== 'error')
+  )
+    return null
+  return {
+    framework: value.framework,
+    projectName: value.projectName,
+    status: value.status,
+    ...('iconPath' in value && value.iconPath === SWIFT_ICON_PATH
+      ? { iconPath: SWIFT_ICON_PATH }
+      : {}),
+  }
+}

package/src/xcode-project.ts

@@ -141,6 +141,7 @@ export interface XcodeAppTarget extends XcodeModuleTarget {
   /** the target's processed launch plist, including generated build settings. */
   infoPlist: string
   infoPlistFile: string | null
+  appIconName: string
   /** the target's compiled sources in every language, swift or not. */
   allSources: string[]
   /**
@@ -966,6 +967,7 @@ export function readXcodeAppTarget(input: string, targetName?: string): XcodeApp
       ].map((dir) => fs.realpathSync(dir)),
     ),
     projectFiles: [...new Set(used.map((project) => project.projectFile))].sort(),
+    appIconName: settings('ASSETCATALOG_COMPILER_APPICON_NAME'),
     infoPlist: plist.build(info),
     infoPlistFile,
     frameworks,