peachsim 0.1.2220 → 0.1.2222

package/src/wasm-optimize.ts

@@ -22,8 +22,11 @@ const FEATURES = [
   'sign-ext',
 ]
 
+// PEACH_SWIFT_NAMES=1 keeps the name section so a trap stack names its functions.
+export const KEEP_WASM_NAMES = process.env.PEACH_SWIFT_NAMES === '1'
+
 /** feeds the artifact hash: a new optimizer or flag set is a new artifact. */
-export const WASM_OPTIMIZE_IDENTITY = `wasm-opt ${BINARYEN_VERSION} -Oz ${FEATURES.join(',')}`
+export const WASM_OPTIMIZE_IDENTITY = `wasm-opt ${BINARYEN_VERSION} -Oz ${FEATURES.join(',')}${KEEP_WASM_NAMES ? ' -g' : ''}`
 
 // the sha256 of each Binaryen release archive wasm-opt resolves for its own platform
 // keys; update both when the wasm-opt package moves BINARYEN_VERSION.
@@ -73,6 +76,7 @@ async function runWasmOpt(
   const result = await wasmOpt(
     [
       '-Oz',
+      ...(KEEP_WASM_NAMES ? ['-g'] : []),
       ...skipPasses.flatMap((pass) => ['--skip-pass', pass]),
       ...FEATURES.map((feature) => `--enable-${feature}`),
       file,

package/src/xcode-project.ts

@@ -12,6 +12,7 @@ import { createHash } from 'node:crypto'
 import fs from 'node:fs'
 import path from 'node:path'
 import plist from 'plist'
+import iosSdk from './ios-sdk-frameworks.json' with { type: 'json' }
 import { isRecord } from './is-record'
 import { readKeychainAccessGroups } from './native-app-identity'
 import { preparedXcodePhase } from './prepared-xcode-phases'
@@ -93,6 +94,8 @@ export interface XcodeModuleTarget {
   allSources: string[]
   /** absolute paths of every resource file the target copies, bundles expanded. */
   resources: string[]
+  /** a folder reference's files by their path in the bundle, which keeps the folder. */
+  resourceNames: Record<string, string>
   /** files the target's shell phases copy with a plain `cp`, resolved from the phase's own assignments and the build settings. */
   copiedFiles: { from: string; to: string }[]
   /** a shell phase of the target generates its INFOPLIST_FILE, which exists only once prepared. */
@@ -1032,6 +1035,7 @@ function targetMembers(
 ): {
   sources: string[]
   resources: string[]
+  resourceNames: Record<string, string>
   copiedFiles: { from: string; to: string }[]
   generatedInfoPlist: boolean
   allSources: string[]
@@ -1043,6 +1047,7 @@ function targetMembers(
   const allSources = new Set<string>()
   const headers = new Set<string>()
   const resources = new Set<string>()
+  const resourceNames: Record<string, string> = {}
   const scriptForOutput = new Map<string, string>()
   const copiedFiles: { from: string; to: string }[] = []
   let generatedInfoPlist = false
@@ -1232,13 +1237,14 @@ function targetMembers(
     xcodePathResolver(project.objects, project.projectDir, path.join, settings),
     (file) => (isDirectory(file) ? walkFiles(file) : fs.existsSync(file) ? [file] : []),
     path.join,
-    (file, kind) => {
+    (file, kind, bundleName) => {
       if (kind === 'header') {
         headers.add(file)
         return
       }
       if (kind === 'resource') {
         resources.add(file)
+        if (bundleName) resourceNames[file] = bundleName
         return
       }
       if (!fs.existsSync(file)) {
@@ -1376,6 +1382,7 @@ function targetMembers(
   return {
     sources: [...sources].sort(),
     resources: [...resources].sort(),
+    resourceNames,
     copiedFiles,
     generatedInfoPlist,
     allSources: [...allSources].sort(),
@@ -3117,10 +3124,17 @@ export function readXcodeAppTarget(
         )
           continue
         const resolved = fileId ? project.resolvePath(fileId) : null
-        if (fileId && resolved !== null && !fs.existsSync(resolved))
-          throw new Error(
-            `${str(target.name) ?? 'target'}: linked framework ${name} (${fileId}) points at missing ${resolved} in ${project.projectFile}`,
-          )
+        // a reference to a file that is not there still links -framework
+        // <name> (xcode 27.1, iOS simulator): the sdk's framework answers it,
+        // and a name the sdk lacks fails the link
+        if (fileId && resolved !== null && !fs.existsSync(resolved)) {
+          if (!iosSdk.frameworks.includes(name))
+            throw new Error(
+              `${str(target.name) ?? 'target'}: linked framework ${name} (${fileId}) points at missing ${resolved} in ${project.projectFile}`,
+            )
+          sdkFrameworks.add(name)
+          continue
+        }
         if (!binaryFrameworks.get(name)) binaryFrameworks.set(name, resolved)
       }
     }
@@ -3234,6 +3248,13 @@ export function readXcodeAppTarget(
           source.kind === 'local' && fs.existsSync(source.dir) ? [source.dir] : [],
         ),
         ...new Set(podSourceDirs),
+        // a target's own files may sit beside the project, such as an asset
+        // catalog one folder up, and xcode builds them from there
+        ...new Set(
+          [...module.allSources, ...module.resources]
+            .filter((file) => fs.existsSync(file))
+            .map((file) => path.dirname(file)),
+        ),
       ].map((dir) => fs.realpathSync.native(dir)),
     ),
     projectFiles: [

package/src/xcode-target-members.ts

@@ -4,6 +4,8 @@ import { isDict, list, str, type PlistDict } from './openstep-plist'
 
 const NEVER_MEMBER =
   /(?:^|\/)(?:Info\.plist|[^/]+\.entitlements|[^/]+\.xcconfig|\.DS_Store)$/
+// a folder reference and a scenekit asset catalog copy as one directory of that name.
+const FOLDER_REFERENCE = /^(?:folder|wrapper\.scnassets)$/
 const BUNDLE_DIR =
   /\.(xcassets|bundle|lproj|xcdatamodeld|scnassets|spriteatlas|rcproject|storyboardc|icon)$/
 
@@ -71,7 +73,11 @@ export function xcodeTargetMemberVisitor(objects: PlistDict) {
     resolvePath: (id: string) => string | null,
     filesUnder: (path: string) => string[],
     join: (base: string, own: string) => string,
-    visit: (file: string, kind: 'source' | 'header' | 'resource') => void,
+    visit: (
+      file: string,
+      kind: 'source' | 'header' | 'resource',
+      bundleName?: string,
+    ) => void,
   ): void => {
     const target = objects[targetId]
     if (!isDict(target)) return
@@ -93,8 +99,24 @@ export function xcodeTargetMemberVisitor(objects: PlistDict) {
         for (const id of refs) {
           const file = resolvePath(id)
           if (file === null) continue
-          if (phase.isa === 'PBXSourcesBuildPhase') visit(file, 'source')
-          else for (const inner of filesUnder(file)) visit(inner, 'resource')
+          if (phase.isa === 'PBXSourcesBuildPhase') {
+            visit(file, 'source')
+            continue
+          }
+          const ref = objects[id]
+          const type = isDict(ref)
+            ? (str(ref.lastKnownFileType) ?? str(ref.explicitFileType) ?? '')
+            : ''
+          const root = file.replace(/[\\/]+$/, '')
+          const folder = FOLDER_REFERENCE.test(type)
+            ? root.split(/[\\/]/).pop()
+            : undefined
+          for (const inner of filesUnder(file))
+            visit(
+              inner,
+              'resource',
+              folder && `${folder}/${inner.slice(root.length + 1).replaceAll('\\', '/')}`,
+            )
         }
       }
     }