peachsim 0.1.2225 → 0.1.2228

package/sdk/ios/usr/include/ObjectiveC.apinotes

@@ -135,17 +135,390 @@ Protocols:
 Tags:
 - Name: _NSZone
   SwiftName: _NSZone
-Functions:
-- Name: sel_registerName
-  NullabilityOfRet: N
-  Nullability: [N]
-- Name: sel_getUid
-  NullabilityOfRet: N
-  Nullability: [N]
 
 
 # Runtime functions did not yet have nullability in Swift 3.
 
+Functions:
+  - Name: sel_getName
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: sel_registerName
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: object_getClassName
+    Nullability: [ O ]
+    NullabilityOfRet: N
+  - Name: object_getIndexedIvars
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: sel_isMapped
+    Nullability: [ N ]
+  - Name: sel_getUid
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: objc_retainedObject
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: objc_unretainedObject
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: objc_unretainedPointer
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: object_copy
+    Nullability: [ O, S ]
+    NullabilityOfRet: O
+  - Name: object_dispose
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: object_getClass
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: object_setClass
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: object_isClass
+    Nullability: [ O ]
+  - Name: object_getIvar
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: object_setIvar
+    Nullability: [ O, N, O ]
+  - Name: object_setIvarWithStrongDefault
+    Nullability: [ O, N, O ]
+  - Name: object_setInstanceVariable
+    Nullability: [ O, N, O ]
+    NullabilityOfRet: O
+  - Name: object_setInstanceVariableWithStrongDefault
+    Nullability: [ O, N, O ]
+    NullabilityOfRet: O
+  - Name: object_getInstanceVariable
+    Nullability: [ O, N, O ]
+    Parameters:
+      - Position: 2
+        Type: "void * _Nullable * _Nullable"
+    NullabilityOfRet: O
+  - Name: objc_getClass
+    Nullability: [ N ]
+  - Name: objc_getMetaClass
+    Nullability: [ N ]
+  - Name: objc_lookUpClass
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: objc_getRequiredClass
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: objc_getClassList
+    Nullability: [ O, S ]
+    Parameters:
+      - Position: 0
+        Type: "Class _Nonnull * _Nullable"
+  - Name: objc_copyClassList
+    Nullability: [ O ]
+    NullabilityOfRet: O
+    ResultType: "Class _Nonnull * _Nullable"
+  - Name: objc_enumerateClasses
+    Nullability: [ O, O, O, O, S ]
+    Parameters:
+      - Position: 4
+        Type: "void (^)(Class _Nonnull, BOOL * _Nonnull)"
+        NoEscape: true
+  - Name: class_getName
+    Nullability: [ O ]
+    NullabilityOfRet: N
+  - Name: class_isMetaClass
+    Nullability: [ O ]
+  - Name: class_getSuperclass
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: class_setSuperclass
+    Nullability: [ N, N ]
+    NullabilityOfRet: N
+  - Name: class_getVersion
+    Nullability: [ O ]
+  - Name: class_setVersion
+    Nullability: [ O, S ]
+  - Name: class_getInstanceSize
+    Nullability: [ O ]
+  - Name: class_getInstanceVariable
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_getClassVariable
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_copyIvarList
+    Nullability: [ O, O ]
+    NullabilityOfRet: O
+    ResultType: "Ivar _Nonnull * _Nullable"
+  - Name: class_getInstanceMethod
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_getClassMethod
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_getMethodImplementation
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_getMethodImplementation_stret
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_respondsToSelector
+    Nullability: [ O, N ]
+  - Name: class_copyMethodList
+    Nullability: [ O, O ]
+    NullabilityOfRet: O
+    ResultType: "Method _Nonnull * _Nullable"
+  - Name: class_conformsToProtocol
+    Nullability: [ O, O ]
+  - Name: class_copyProtocolList
+    Nullability: [ O, O ]
+    NullabilityOfRet: O
+    ResultType: "Protocol * _Nonnull * _Nullable"
+  - Name: class_getProperty
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_copyPropertyList
+    Nullability: [ O, O ]
+    NullabilityOfRet: O
+    ResultType: "objc_property_t _Nonnull * _Nullable"
+  - Name: class_getIvarLayout
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: class_getWeakIvarLayout
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: class_addMethod
+    Nullability: [ O, N, N, O ]
+  - Name: class_replaceMethod
+    Nullability: [ O, N, N, O ]
+    NullabilityOfRet: O
+  - Name: class_addIvar
+    Nullability: [ O, N, S, S, O ]
+  - Name: class_addProtocol
+    Nullability: [ O, N ]
+  - Name: class_addProperty
+    Nullability: [ O, N, O, S ]
+  - Name: class_replaceProperty
+    Nullability: [ O, N, O, S ]
+  - Name: class_setIvarLayout
+    Nullability: [ O, O ]
+  - Name: class_setWeakIvarLayout
+    Nullability: [ O, O ]
+  - Name: objc_getFutureClass
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: class_createInstance
+    Nullability: [ O, S ]
+    NullabilityOfRet: O
+  - Name: objc_constructInstance
+    Nullability: [ O, O ]
+    NullabilityOfRet: O
+  - Name: objc_destructInstance
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: objc_allocateClassPair
+    Nullability: [ O, N, S ]
+    NullabilityOfRet: O
+  - Name: objc_registerClassPair
+    Nullability: [ N ]
+  - Name: objc_duplicateClass
+    Nullability: [ N, N, S ]
+    NullabilityOfRet: N
+  - Name: objc_disposeClassPair
+    Nullability: [ N ]
+  - Name: method_getName
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: method_getImplementation
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: method_getTypeEncoding
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: method_getNumberOfArguments
+    Nullability: [ N ]
+  - Name: method_copyReturnType
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: method_copyArgumentType
+    Nullability: [ N, S ]
+    NullabilityOfRet: O
+  - Name: method_getReturnType
+    Nullability: [ N, N, S ]
+  - Name: method_getArgumentType
+    Nullability: [ N, S, O, S ]
+  - Name: method_getDescription
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: method_setImplementation
+    Nullability: [ N, N ]
+    NullabilityOfRet: N
+  - Name: method_exchangeImplementations
+    Nullability: [ N, N ]
+  - Name: ivar_getName
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: ivar_getTypeEncoding
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: ivar_getOffset
+    Nullability: [ N ]
+  - Name: property_getName
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: property_getAttributes
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: property_copyAttributeList
+    Nullability: [ N, O ]
+    NullabilityOfRet: O
+  - Name: property_copyAttributeValue
+    Nullability: [ N, N ]
+    NullabilityOfRet: O
+  - Name: objc_getProtocol
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: objc_copyProtocolList
+    Nullability: [ O ]
+    NullabilityOfRet: O
+    ResultType: "Protocol * _Nonnull * _Nullable"
+  - Name: protocol_conformsToProtocol
+    Nullability: [ O, O ]
+  - Name: protocol_isEqual
+    Nullability: [ O, O ]
+  - Name: protocol_getName
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: protocol_getMethodDescription
+    Nullability: [ N, N, S, S ]
+  - Name: protocol_copyMethodDescriptionList
+    Nullability: [ N, S, S, O ]
+    NullabilityOfRet: O
+  - Name: protocol_getProperty
+    Nullability: [ N, N, S, S ]
+    NullabilityOfRet: O
+  - Name: protocol_copyPropertyList
+    Nullability: [ N, O ]
+    NullabilityOfRet: O
+    ResultType: "objc_property_t _Nonnull * _Nullable"
+  - Name: protocol_copyPropertyList2
+    Nullability: [ N, O, S, S ]
+    NullabilityOfRet: O
+    ResultType: "objc_property_t _Nonnull * _Nullable"
+  - Name: protocol_copyProtocolList
+    Nullability: [ N, O ]
+    NullabilityOfRet: O
+    ResultType: "Protocol * _Nonnull * _Nullable"
+  - Name: objc_allocateProtocol
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: objc_registerProtocol
+    Nullability: [ N ]
+  - Name: protocol_addMethodDescription
+    Nullability: [ N, N, O, S, S ]
+  - Name: protocol_addProtocol
+    Nullability: [ N, N ]
+  - Name: protocol_addProperty
+    Nullability: [ N, N, O, S, S, S ]
+  - Name: objc_copyImageNames
+    Nullability: [ O ]
+    NullabilityOfRet: N
+    ResultType: "const char * _Nonnull * _Nonnull"
+  - Name: objc_copyImageHeaders
+    Nullability: [ O ]
+    NullabilityOfRet: N
+    ResultType: "const struct mach_header * _Nonnull * _Nonnull"
+  - Name: class_getImageName
+    Nullability: [ O ]
+    NullabilityOfRet: O
+  - Name: objc_copyClassNamesForImage
+    Nullability: [ N, O ]
+    NullabilityOfRet: O
+    ResultType: "const char * _Nonnull * _Nullable"
+  - Name: sel_isEqual
+    Nullability: [ N, N ]
+  - Name: objc_enumerationMutation
+    Nullability: [ N ]
+  - Name: objc_setEnumerationMutationHandler
+    Nullability: [ S ]
+    Parameters:
+      - Position: 0
+        Type: "void ( * _Nullable)(id _Nonnull)"
+  - Name: objc_setForwardHandler
+    Nullability: [ N, N ]
+  - Name: imp_implementationWithBlock
+    Nullability: [ N ]
+    NullabilityOfRet: N
+  - Name: imp_getBlock
+    Nullability: [ N ]
+    NullabilityOfRet: O
+  - Name: imp_removeBlock
+    Nullability: [ N ]
+  - Name: objc_loadWeak
+    Nullability: [ N ]
+    Parameters:
+      - Position: 0
+        Type: "id _Nullable * _Nonnull"
+    NullabilityOfRet: O
+  - Name: objc_storeWeak
+    Nullability: [ N, O ]
+    Parameters:
+      - Position: 0
+        Type: "id _Nullable * _Nonnull"
+    NullabilityOfRet: O
+  - Name: objc_setAssociatedObject
+    Nullability: [ N, N, O, S ]
+  - Name: objc_getAssociatedObject
+    Nullability: [ N, N ]
+    NullabilityOfRet: O
+  - Name: objc_removeAssociatedObjects
+    Nullability: [ N ]
+  - Name: objc_setHook_getImageName
+    Nullability: [ N, N ]
+    Parameters:
+      - Position: 1
+        Type: "objc_hook_getImageName _Nullable * _Nonnull"
+  - Name: objc_setHook_getClass
+    Nullability: [ N, N ]
+    Parameters:
+      - Position: 1
+        Type: "objc_hook_getClass _Nullable * _Nonnull"
+  - Name: objc_addLoadImageFunc
+    Nullability: [ N ]
+  - Name: objc_setHook_lazyClassNamer
+    Nullability: [ N, N ]
+    Parameters:
+      - Position: 1
+        Type: "objc_hook_lazyClassNamer _Nonnull * _Nonnull"
+  - Name: _objc_realizeClassFromSwift
+    Nullability: [ O, O ]
+    NullabilityOfRet: O
+  - Name: _objc_flush_caches
+    Nullability: [ O ]
+  - Name: class_lookupMethod
+    Nullability: [ O, N ]
+    NullabilityOfRet: O
+  - Name: class_respondsToMethod
+    Nullability: [ O, N ]
+  - Name: object_copyFromZone
+    Nullability: [ O, S, S ]
+    NullabilityOfRet: O
+  - Name: class_createInstanceFromZone
+    Nullability: [ O, S, S ]
+    NullabilityOfRet: O
+  - Name: objc_msgSend
+  - Name: objc_msgSendSuper
+  - Name: objc_msgSend_stret
+  - Name: objc_msgSendSuper_stret
+  - Name: method_invoke
+  - Name: method_invoke_stret
+  - Name: _objc_msgForward
+  - Name: _objc_msgForward_stret
+  - Name: objc_sync_enter
+    Nullability: [ N ]
+  - Name: objc_sync_exit
+    Nullability: [ N ]
 SwiftVersions:
 - Version: 3
   Functions:

package/src/metro-production-bundle.ts

@@ -394,7 +394,14 @@ export async function validateRNXMetroModulePaths(
   source: string,
   modulePaths: RNXMetroModulePathMap,
 ): Promise<void> {
-  const layout = await readRNXMetroBundleLayout(source)
+  checkRNXMetroModulePaths(await readRNXMetroBundleLayout(source), modulePaths)
+}
+
+/** the identity contract against a layout the caller already read. */
+export function checkRNXMetroModulePaths(
+  layout: RNXMetroBundleLayout,
+  modulePaths: RNXMetroModulePathMap,
+): void {
   if (layout.moduleIdFailures > 0) {
     throw new Error(
       `Metro module identity could not read ${layout.moduleIdFailures} module IDs`,
@@ -431,8 +438,14 @@ export async function validateRNXMetroModulePaths(
 
 export async function validateRNXMetroModuleIdentity(
   identity: RNXMetroModuleIdentity,
+  // the layout of the bundle this identity was read from. its footers follow
+  // the graph and register nothing, so its defines are the identity source's.
+  layout?: RNXMetroBundleLayout,
 ): Promise<void> {
-  await validateRNXMetroModulePaths(identity.source, identity.modulePaths)
+  checkRNXMetroModulePaths(
+    layout ?? (await readRNXMetroBundleLayout(identity.source)),
+    identity.modulePaths,
+  )
   for (const moduleId of Object.keys(identity.logicalSpecifiers)) {
     if (!Object.prototype.hasOwnProperty.call(identity.modulePaths, moduleId)) {
       throw new Error(

package/src/swift-compile.ts

@@ -437,6 +437,26 @@ const clangInterfaceHeader = (header: string): string =>
     .replace(/\b_TtC10Foundation\d+(NS\w+)\b/g, '$1')
     .replace(/\b__attribute__\(\(objc_subclassing_restricted\)\)\s*/g, '')
 
+export function swiftHeaderWithSuperclassImports(
+  header: string,
+  interfaceFor: (name: string) => { file: string; header: string } | null,
+): string {
+  const superclasses = new Set(
+    [...header.matchAll(/@interface\s+\w+\s*:\s*(\w+)/g)].map((match) => match[1]!),
+  )
+  return header.replace(/^@import (\w+);$/gm, (statement, name: string) => {
+    const dependency = interfaceFor(name)
+    if (
+      !dependency ||
+      ![...swiftInterfaceDeclarations(dependency.header)].some((name) =>
+        superclasses.has(name),
+      )
+    )
+      return statement
+    return `${statement}\n#import ${JSON.stringify(dependency.file)}`
+  })
+}
+
 /** the Objective-C protocols and classes a generated interface header defines. */
 export const swiftInterfaceDeclarations = (header: string): Set<string> =>
   new Set([
@@ -908,7 +928,7 @@ export function swiftOptionalFramework(name: string): boolean {
 // an import may carry attributes (`@_exported`, `@preconcurrency`) and a
 // declaration kind (`import struct Nuke.ImageRequest`).
 const SWIFT_IMPORT =
-  /^\s*(?:@\w+(?:\([^)]*\))?\s+)*import\s+(?:(?:typealias|struct|class|enum|protocol|let|var|func)\s+)?([A-Za-z_][A-Za-z0-9_]*)/
+  /^\s*(?:@\w+(?:\([^)]*\))?\s+|(?:public|package|internal|fileprivate|private)\s+)*import\s+(?:(?:typealias|struct|class|enum|protocol|let|var|func)\s+)?([A-Za-z_][A-Za-z0-9_]*)/
 
 // three-valued (kleene) logic shared by the swift and c condition
 // evaluators: an undecided operand only decides when the other forces the
@@ -7437,6 +7457,58 @@ function compileSwiftProjectOnce(
             if (existsSync(linked) && statSync(linked).size <= 8)
               rmSync(linked, { force: true })
             report('compiling and linking Swift modules')
+            const frameworkInterfaces = new Map<
+              string,
+              { file: string; header: string } | null
+            >()
+            const frameworkInterface = (
+              name: string,
+            ): { file: string; header: string } | null => {
+              if (frameworkInterfaces.has(name)) return frameworkInterfaces.get(name)!
+              const source = distribution
+                ? path.join(frameworkRoot, 'modules', `${name}-Swift.h`)
+                : path.join(
+                    prebuilt!.modules,
+                    '..',
+                    `${name}.build/include/${name}-Swift.h`,
+                  )
+              if (!existsSync(source)) {
+                frameworkInterfaces.set(name, null)
+                return null
+              }
+              const headers = path.join(
+                swiftSdkPaths(frameworkRoot, options.toolchainBin).darwin,
+                `System/Library/Frameworks/${name}.framework/Headers`,
+              )
+              const declared = new Set<string>()
+              if (existsSync(headers))
+                for (const file of readdirSync(headers, {
+                  recursive: true,
+                  encoding: 'utf8',
+                }))
+                  if (file.endsWith('.h'))
+                    for (const name of swiftInterfaceDeclarations(
+                      readFileSync(path.join(headers, file), 'utf8'),
+                    ))
+                      declared.add(name)
+              const header = withoutSwiftDeclarations(
+                clangInterfaceHeader(readFileSync(source, 'utf8')),
+                declared,
+                `#import <${name}/${name}.h>`,
+              )
+              const value = {
+                file: path.join(root, '.build/peach-framework-objc', `${name}-Swift.h`),
+                header,
+              }
+              frameworkInterfaces.set(name, value)
+              writeBuildFile(
+                value.file,
+                (existsSync(path.join(headers, `${name}.h`))
+                  ? `#import <${name}/${name}.h>\n`
+                  : '') + swiftHeaderWithSuperclassImports(header, frameworkInterface),
+              )
+              return value
+            }
             try {
               // clang consumes the real emitted headers after swift finishes.
               // swiftpm's transitive swift module maps are not C declarations:
@@ -7475,7 +7547,10 @@ function compileSwiftProjectOnce(
                     writeBuildFile(
                       emitted,
                       withoutSwiftDeclarations(
-                        clangInterfaceHeader(readFileSync(original, 'utf8')),
+                        swiftHeaderWithSuperclassImports(
+                          clangInterfaceHeader(readFileSync(original, 'utf8')),
+                          frameworkInterface,
+                        ),
                         new Set(preparation.nativeHeaderDeclarations[producer]),
                         `#import <${producer}/${producer}.h>`,
                       ),

package/src/swift-standin-emit.ts

@@ -1529,6 +1529,7 @@ export function emitSwiftStandin(
                   ].includes(name)
                 ) &&
                 !(name === nsObjectProtocol && externalRoot(id) === nsObject) &&
+                !options.unconformed?.get(path)?.has(name.split(/::|\./).pop()!) &&
                 !options.unconformed?.get(path)?.has(name),
             ),
           ].filter((name, at, all) => all.indexOf(name) === at)

package/src/swift-standins.ts

@@ -1703,6 +1703,14 @@ function graphStandin(
         unconformed.set(owner, new Set([...(unconformed.get(owner) ?? []), conformance]))
         continue
       }
+      // a superclass another module declares already brings this conformance
+      const redundant = /^redundant conformance of '\w+' to protocol '(\w+)'$/.exec(
+        match[3]!,
+      )?.[1]
+      if (owner && redundant) {
+        unconformed.set(owner, new Set([...(unconformed.get(owner) ?? []), redundant]))
+        continue
+      }
       if (owner && swiftPaths.has(owner))
         throw new Error(
           `Swift declaration ${module}.${owner} does not typecheck: ${match[3]}`,