peachsim 0.1.2208 → 0.1.2210

package/src/swift-standins.ts

@@ -52,6 +52,7 @@ import {
 } from './swift-package'
 import { swiftBinaryOnDisk, type SwiftPackageBinary } from './swift-packages'
 import { swiftSharedSdkRoot } from './swift-shared-sdk'
+import { withBuiltinStandinBehavior } from './swift-standin-builtin-behavior'
 import { STANDIN_SOURCE_DIGEST, standinSourceDigest } from './swift-standin-digest'
 import {
   STANDIN_IMPORTS,
@@ -1239,7 +1240,7 @@ function interfaceEnumValues(
       const declarations = [
         ...interfaceText.matchAll(
           new RegExp(
-            `^([ \\t]*)(?:@[\\w.]+(?:\\([^)]*\\))?\\s+)*(?:nonisolated\\s+)?(?:public|open)\\s+enum\\s+${name}\\s*:\\s*(?:Swift\\.)?U?Int(?:8|16|32|64)?\\b[^{]*\\{[ \\t]*$`,
+            `^([ \\t]*)(?:@[\\w.]+(?:\\([^)]*\\))?\\s+)*(?:nonisolated\\s+)?(?:public|open)\\s+enum\\s+${name}\\s*:\\s*(?:Swift\\.)?(?:U?Int(?:8|16|32|64)?|IntegerLiteralType)\\b[^{]*\\{[ \\t]*$`,
             'gm',
           ),
         ),
@@ -1363,9 +1364,34 @@ function mixedStandin(
     null,
     view.inheritedConformances,
     interfaceProjections(view.graphs, interfaceText),
+    [],
+    externalConformances(surface.module, interfaceText),
   )
 }
 
+// an outside type's conformance to the module's own protocol (`extension Swift.String : Module.P {}`):
+// the symbol graph keeps an extension's members and drops the conformance it declares, so the
+// interface is the only record. a constrained extension stays out. a type of another module is
+// spelled by its own name, as the emitted members are.
+function externalConformances(module: string, interfaceText: string): string {
+  const lines = new Set<string>()
+  for (const match of interfaceText.matchAll(
+    /^(?:@\w+\s+)*extension\s+([\w.]+)\s*:\s*([^{\n]+?)\s*\{/gm,
+  )) {
+    const [, extended, conformances] = match
+    if (extended!.startsWith(`${module}.`) || /\bwhere\b/.test(conformances!)) continue
+    const own = conformances!
+      .split(',')
+      .map((name) => name.trim())
+      .filter((name) => name.startsWith(`${module}.`))
+    const type = extended!.startsWith('Swift.')
+      ? extended!
+      : extended!.split('.').slice(1).join('.')
+    if (own.length > 0 && type) lines.add(`extension ${type} : ${own.join(', ')} {}\n`)
+  }
+  return lines.size > 0 ? `\n${[...lines].join('')}` : ''
+}
+
 // the sdk toolset passes this to every swiftc compile; raw swiftc does not read the toolset,
 // and emitting a module aborts without it when the source reaches the wasm exception model.
 // swift-symbolgraph-extract has no -Xllvm.
@@ -1495,7 +1521,7 @@ function graphStandin(
   toolchain: Toolchain,
   work: string,
   requiredInits: ReadonlySet<string>,
-  behavior: ReadonlyMap<string, StandinBehavior>,
+  declared: ReadonlyMap<string, StandinBehavior>,
   imports: string[] = [],
   requireSwift = false,
   objcProperties: ReadonlyMap<string, { getter: string; setter?: string }> = new Map(),
@@ -1505,12 +1531,19 @@ function graphStandin(
   inheritedConformances: ReadonlyMap<string, ReadonlySet<string>> = new Map(),
   projections: ReadonlyMap<string, string> = new Map(),
   dependencyGraphs: SymbolGraph[] = [],
+  // declarations the symbol graphs cannot carry, appended after the emitted ones
+  trailer = '',
 ): SwiftStandin {
   const paths = new Set(
     graphs.flatMap((graph) =>
       graph.symbols.map((symbol) => symbol.pathComponents.join('.')),
     ),
   )
+  // built-in behavior written against one framework version skips a declaration
+  // another version lacks; a configured entry naming one is an error
+  const behavior = new Map(
+    [...declared].filter(([name, entry]) => !entry.builtin || paths.has(name)),
+  )
   const swiftPaths = new Set(
     requireSwift
       ? graphs.flatMap((graph) =>
@@ -1550,6 +1583,8 @@ function graphStandin(
   const plain = new Set<string>()
   const unobjc = new Set<string>()
   const trapped = new Set<string>()
+  const forced = new Set<string>()
+  const nonfailable = new Set<string>()
   const unconformed = new Map<string, Set<string>>()
   const objcProtocols = new Set(
     graphs.flatMap((graph) =>
@@ -1569,7 +1604,7 @@ function graphStandin(
   // like a binary framework's.
   const inert =
     binary.placeholder !== undefined ||
-    (binary.publicHeaders !== undefined && binary.assemblySources === undefined)
+    (binary.publicHeaders !== undefined && binary.unloweredSources === undefined)
   for (;;) {
     const { source, owners, skipped } = emitSwiftStandin(graphs, {
       module,
@@ -1582,6 +1617,8 @@ function graphStandin(
       unobjc,
       unconformed,
       trapped,
+      forcedOverride: forced,
+      coderNonfailable: nonfailable,
       inert,
       imports: [...(placeholder?.peachImports ?? []), ...imports],
       family: [...imports, ...(placeholder?.peachImports ?? [])],
@@ -1603,7 +1640,7 @@ function graphStandin(
           `Configured Swift behavior ${module}.${entry.path} was not emitted: ${entry.reason}`,
         )
     }
-    fs.writeFileSync(file, source)
+    fs.writeFileSync(file, source + trailer)
     const check = spawnSync(
       path.join(toolchain.toolchainBin, 'swiftc'),
       // emitting the module runs the diagnostics a typecheck skips, such as
@@ -1627,10 +1664,17 @@ function graphStandin(
       return {
         module,
         target: binary.target,
-        files: { [`${module}.swift`]: source },
+        files: { [`${module}.swift`]: source + trailer },
         ...(imports.length ? { dependencies: imports } : {}),
       }
-    const before = omit.size + plain.size + unobjc.size + trapped.size + unconformed.size
+    const before =
+      omit.size +
+      plain.size +
+      unobjc.size +
+      trapped.size +
+      unconformed.size +
+      forced.size +
+      nonfailable.size
     const elsewhere: string[] = []
     for (const match of check.stderr.matchAll(/^(\S+?):(\d+):\d+: error: (.*)$/gm)) {
       const owner = match[1] === file ? owners[Number(match[2]) - 1] : undefined
@@ -1657,15 +1701,44 @@ function graphStandin(
         throw new Error(
           `Configured Swift behavior ${module}.${owner} does not typecheck: ${match[3]}`,
         )
-      if (owner && /does not override any|overrides nothing/.test(match[3]!))
+      if (
+        owner &&
+        /does not override any|overrides nothing|does not override a designated initializer/.test(
+          match[3]!,
+        )
+      )
         plain.add(owner)
+      else if (
+        owner &&
+        /failable initializer 'init\(coder:\)' cannot override a non-failable/.test(
+          match[3]!,
+        ) &&
+        !nonfailable.has(owner)
+      )
+        nonfailable.add(owner)
+      // the guest's superclass declares the member the vendor's graph names only as new
+      else if (
+        owner &&
+        /requires an 'override' keyword/.test(match[3]!) &&
+        !forced.has(owner)
+      )
+        forced.add(owner)
       // an inert value the declaration's type cannot build: its body traps
       else if (owner && inert && INERT_VALUE.test(match[3]!) && !trapped.has(owner))
         trapped.add(owner)
       else if (owner) omit.set(owner, `rejected by swiftc: ${match[3]}`)
       else elsewhere.push(match[3]!)
     }
-    if (omit.size + plain.size + unobjc.size + trapped.size + unconformed.size === before)
+    if (
+      omit.size +
+        plain.size +
+        unobjc.size +
+        trapped.size +
+        unconformed.size +
+        forced.size +
+        nonfailable.size ===
+      before
+    )
       throw new Error(
         `its generated source does not typecheck: ${elsewhere.slice(0, 3).join('; ') || check.stderr.trim().slice(0, 400)}`,
       )
@@ -2603,9 +2676,10 @@ const built = new Map<string, SwiftStandin[] | string>()
 export function standinGenerationInputs(
   binaries: readonly SwiftPackageBinary[],
   toolchain: Pick<Toolchain, 'moduleRoot' | 'release'>,
-  behavior: SwiftStandinBehaviors = {},
+  configuredBehavior: SwiftStandinBehaviors = {},
   sourceDir?: string,
 ): string {
+  const behavior = withBuiltinStandinBehavior(configuredBehavior)
   const { moduleRoot, release } = toolchain
   const sdk = swiftModuleSdk(moduleRoot)
   const digest =
@@ -2688,7 +2762,7 @@ export function standinGenerationInputs(
                 (dependency) =>
                   `${swiftTargetModuleName(dependency.module)}\0${treeDigest(path.join(binary.dir, dependency.path))}`,
               ),
-              ...(binary.assemblySources ?? []),
+              ...(binary.unloweredSources ?? []),
             ].join('\0')
           : swiftBinaryFramework(binary).digest,
       )
@@ -2950,10 +3024,15 @@ export async function swiftStandins(
   binaries: readonly SwiftPackageBinary[],
   toolchain: Toolchain,
   provided: ReadonlySet<string> = new Set(),
-  behavior: SwiftStandinBehaviors = {},
+  configuredBehavior: SwiftStandinBehaviors = {},
   options: { nativeSlices?: boolean } = {},
 ): Promise<SwiftStandins> {
-  const built = await buildStandins(binaries, toolchain, provided, behavior)
+  const built = await buildStandins(
+    binaries,
+    toolchain,
+    provided,
+    withBuiltinStandinBehavior(configuredBehavior),
+  )
   return {
     standins:
       options.nativeSlices === false
@@ -2965,7 +3044,7 @@ export async function swiftStandins(
                   standin,
                   toolchain.moduleRoot,
                   STANDIN_SOURCE_DIGEST,
-                  Object.keys(behavior[standin.module] ?? {}).length > 0,
+                  Object.keys(configuredBehavior[standin.module] ?? {}).length > 0,
                   () => swiftBinaryFramework(binary).dir,
                 )
               : standin

package/src/turbo-runtime.lock.json

@@ -12,7 +12,7 @@
     "checksum": "764c16e7e34156bf90d6c3372a2b77b98b9d8c3470235520d0f9619f90f33456"
   },
   "framework": {
-    "distribution": "87fc4d2ff9d5d588",
+    "distribution": "e7ae8fdb51086f73",
     "wireAbi": "246b8412514b644113e6a26252c8ebd6de49ab4156ac5f5c98bb9e4c2ff2568b"
   },
   "archives": [
@@ -20,70 +20,70 @@
       "headers": {
         "reactNativeJsi": "0f8c2defbca69a27a848a81ae72363073bf9602fd316e57a75811be1a0528358"
       },
-      "sha256": "6f416d065d88a6f592f0c34dca2d898f2c1adadeeacc07c2f8f4de453715f298",
-      "size": 25393
+      "sha256": "e48499ac95604409b5da4b0f113e8ec3d3e7de9bd170f2f401513c4a45c234dc",
+      "size": 25392
     },
     {
       "headers": {
         "reactNativeJsi": "21a624ea24fd17d56bf26832d496fc1177067f89640414c20e6486c7984dfb0a"
       },
-      "sha256": "0c68d14139a733fa990e55fa23224589fe9a74ce82db0ce5b9b52da51211390e",
-      "size": 26139
+      "sha256": "bf331e9b3d141240d9fda77dc67e1d4b584513bdc455b0c37ae6aeb1a89038ed",
+      "size": 26137
     },
     {
       "headers": {
         "reactNativeJsi": "324aefd8591d9ce688bce7589c4c2b516cd33ecb95d35c47239a87a8fcf6a8da"
       },
-      "sha256": "adba5b074a4fc2d6c367de74f24aa4b6273363f8b39c9ad9d15be2775f08a2e1",
-      "size": 25394
+      "sha256": "181c4fef940e164d52f0e8a6284990cfa23a19c42afb445f6945cd959f708bf9",
+      "size": 25392
     },
     {
       "headers": {
         "reactNativeJsi": "33596664ee7d7a6623f0796a6feb429543316c3a41b211150acda6e1d835286c"
       },
-      "sha256": "778f943ad7fcfba7060e2f29d2bf9d3d7365c60d09b8e2fcccfe11f95920b321",
-      "size": 25165
+      "sha256": "44ac75e98b6badd32e32556bfd04beab8728bbce58cf32f31528a7e17b6b3665",
+      "size": 25166
     },
     {
       "headers": {
         "reactNativeJsi": "66b2cd5a38511195207f6c8a76aba735f9b9cc66a52a0d00780ffe5d331623f7"
       },
-      "sha256": "06cdf08b6f177a54dbf734f76f23ff192c4eb50238fae5207e923fa8e0cfb4bd",
+      "sha256": "dab069c53f92c911f1f84c7c037077c6e73df2fbd1673cb9dbbff0c6014fb9ac",
       "size": 25398
     },
     {
       "headers": {
         "reactNativeJsi": "96db4e758dd53e9320cef7cad485e00aa06e7a982cefd920f17007de8a5bd9f9"
       },
-      "sha256": "62920d91d1805ae0df3ad0f672f6405575c04df4e66948ea37b4e165f39f8eb5",
-      "size": 26141
+      "sha256": "6612544a0287c8cc231436ad31e9a45f4d824fbbc5e7da7460ac11728568c353",
+      "size": 26139
     },
     {
       "headers": {
         "reactNativeJsi": "aeab590ddd1218df963462242d3954ce467b0fa88f70e91429e4ffc74d230893"
       },
-      "sha256": "fab02f584e10cee2197c10b5c488873d5203313e10f07b2940283bee3ae12a57",
+      "sha256": "c73fb45ff0e2037bf21c6a0e019e80c645ff141e80052b750c7d14570a4f7e72",
       "size": 26138
     },
     {
       "headers": {
         "reactNativeJsi": "b5fb260522384dd7ab07d740cdc534b529922446fcec798341c7817d9eaa49f4"
       },
-      "sha256": "72bbd117ff2d4495f46fceecd0959e8bd2a0647fdf514bf2e2e95922514bcb66",
+      "sha256": "997372e6c03141640cfc3aab115b8afe9b04f6f6e806721f14f4fc0dc871d271",
       "size": 25267
     },
     {
       "headers": {
         "reactNativeJsi": "c6b391a1e870ccf7cdd534be63582862840f8245b99ebd253317deece1e6ffd5"
       },
-      "sha256": "10e28d5ce3eb41c695bef897fa974f8919559558a2b847963047f13ce06dc6a0",
-      "size": 26144
+      "sha256": "60f8e1e7da90a20ee5b112b950e264f93329014bfabdcbcd5aa1281945f2725b",
+      "size": 26143
     },
     {
       "headers": {
         "reactNativeJsi": "c8270f1315745ecc204c4209a4f50f58ff6f14b4a385ad6820a69800270b53c6"
       },
-      "sha256": "52226df9610d8b5f9b47fee6bedbdbaa04df7f2f562213bd8b433a5f998d8aa3",
+      "sha256": "47269b8662bf147cbf9ccc011de79f0faffc30aa6b09344ad4f95dbdfae656c9",
       "size": 25105
     }
   ]