Revert "BridgeJS: Correctly emit @js methods in extensions" (#703)

Revert of #694. Required to unblock CI on #702.

Author: MaxDesiatov

Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift

@@ -43,14 +43,12 @@ public final class SwiftToSkeleton {
         var perSourceErrors: [(inputFilePath: String, errors: [DiagnosticError])] = []
         var importedFiles: [ImportedFileSkeleton] = []
         var exported = ExportedSkeleton(functions: [], classes: [], enums: [], exposeToGlobal: exposeToGlobal)
-        var exportCollectors: [ExportSwiftAPICollector] = []
 
         for (sourceFile, inputFilePath) in sourceFiles {
             progress.print("Processing \(inputFilePath)")
 
             let exportCollector = ExportSwiftAPICollector(parent: self)
             exportCollector.walk(sourceFile)
-            exportCollectors.append(exportCollector)
 
             let typeNameCollector = ImportSwiftMacrosJSImportTypeNameCollector(viewMode: .sourceAccurate)
             typeNameCollector.walk(sourceFile)
@@ -76,15 +74,7 @@ public final class SwiftToSkeleton {
             if !importedFile.isEmpty {
                 importedFiles.append(importedFile)
             }
-        }
-
-        // Resolve extensions against all collectors. This needs to happen at this point so we can resolve both same file and cross file extensions.
-        for source in exportCollectors {
-            source.resolveDeferredExtensions(against: exportCollectors)
-        }
-
-        for collector in exportCollectors {
-            collector.finalize(&exported)
+            exportCollector.finalize(&exported)
         }
 
         if !perSourceErrors.isEmpty {
@@ -496,8 +486,6 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
     var exportedStructNames: [String] = []
     var exportedStructByName: [String: ExportedStruct] = [:]
     var errors: [DiagnosticError] = []
-    /// Extensions collected during the walk, to be resolved after all files have been walked
-    var deferredExtensions: [ExtensionDeclSyntax] = []
 
     func finalize(_ result: inout ExportedSkeleton) {
         result.functions.append(contentsOf: exportedFunctions)
@@ -1400,64 +1388,6 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         }
     }
 
-    override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind {
-        // Defer until all type declarations in the module have been collected.
-        deferredExtensions.append(node)
-        return .skipChildren
-    }
-
-    func resolveDeferredExtensions(against collectors: [ExportSwiftAPICollector]) {
-        for ext in deferredExtensions {
-            var resolved = false
-            for collector in collectors {
-                if collector.resolveExtension(ext) {
-                    resolved = true
-                    break
-                }
-            }
-            if !resolved {
-                diagnose(
-                    node: ext.extendedType,
-                    message: "Unsupported type '\(ext.extendedType.trimmedDescription)'.",
-                    hint: "You can only extend `@JS` annotated types defined in the same module"
-                )
-            }
-        }
-    }
-
-    /// Walks extension members under the matching type’s state, returning whether the type was found.
-    ///
-    /// Note: The lookup scans dictionaries keyed by `makeKey(name:namespace:)`, matching only by
-    /// plain name. If two types share a name but differ by namespace, `.first(where:)` picks
-    /// whichever comes first. This is acceptable today since namespace collisions are unlikely,
-    /// but may need refinement if namespace-qualified extension resolution is added.
-    func resolveExtension(_ ext: ExtensionDeclSyntax) -> Bool {
-        let name = ext.extendedType.trimmedDescription
-        let state: State
-        if let entry = exportedClassByName.first(where: { $0.value.name == name }) {
-            state = .classBody(name: name, key: entry.key)
-        } else if let entry = exportedStructByName.first(where: { $0.value.name == name }) {
-            state = .structBody(name: name, key: entry.key)
-        } else if let entry = exportedEnumByName.first(where: { $0.value.name == name }) {
-            state = .enumBody(name: name, key: entry.key)
-        } else if exportedProtocolByName.values.contains(where: { $0.name == name }) {
-            diagnose(
-                node: ext.extendedType,
-                message: "Protocol extensions are not supported by BridgeJS.",
-                hint: "You cannot extend `@JS` protocol '\(name)' with additional members"
-            )
-            return true
-        } else {
-            return false
-        }
-        stateStack.push(state: state)
-        for member in ext.memberBlock.members {
-            walk(member)
-        }
-        stateStack.pop()
-        return true
-    }
-
     override func visit(_ node: EnumDeclSyntax) -> SyntaxVisitorContinueKind {
         guard let jsAttribute = node.attributes.firstJSAttribute else {
             return .skipChildren

Plugins/BridgeJS/Tests/BridgeJSToolTests/BridgeJSCodegenTests.swift

@@ -167,23 +167,6 @@ import Testing
         try snapshotCodegen(skeleton: skeleton, name: "CrossFileFunctionTypes.ReverseOrder")
     }
 
-    @Test
-    func codegenCrossFileExtension() throws {
-        let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false)
-        let classURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileExtensionClass.swift")
-        swiftAPI.addSourceFile(
-            Parser.parse(source: try String(contentsOf: classURL, encoding: .utf8)),
-            inputFilePath: "CrossFileExtensionClass.swift"
-        )
-        let extensionURL = Self.multifileInputsDirectory.appendingPathComponent("CrossFileExtension.swift")
-        swiftAPI.addSourceFile(
-            Parser.parse(source: try String(contentsOf: extensionURL, encoding: .utf8)),
-            inputFilePath: "CrossFileExtension.swift"
-        )
-        let skeleton = try swiftAPI.finalize()
-        try snapshotCodegen(skeleton: skeleton, name: "CrossFileExtension")
-    }
-
     @Test
     func codegenSkipsEmptySkeletons() throws {
         let swiftAPI = SwiftToSkeleton(progress: .silent, moduleName: "TestModule", exposeToGlobal: false)

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtension.swift

@@ -38,19 +38,3 @@ enum APIResult {
         }
     }
 }
-
-extension MathUtils {
-    @JS static func divide(a: Int, b: Int) -> Int {
-        return a / b
-    }
-
-    @JS static var pi: Double { 3.14159 }
-}
-
-extension Calculator {
-    @JS static func cube(value: Int) -> Int {
-        return value * value * value
-    }
-
-    @JS static var version: String { "1.0" }
-}

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Multifile/CrossFileExtensionClass.swift

@@ -12,20 +12,6 @@
     }
 }
 
-extension Greeter {
-    @JS func greetEnthusiastically() -> String {
-        return "Hey, " + self.name + "!!!"
-    }
-
-    @JS var nameCount: Int { name.count }
-
-    @JS static func greetAnonymously() -> String {
-        return "Hello."
-    }
-
-    @JS static var defaultGreeting: String { "Hello, world!" }
-}
-
 @JS func takeGreeter(greeter: Greeter) {
     print(greeter.greet())
 }

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/StaticFunctions.swift

@@ -60,26 +60,3 @@
 }
 
 @JS func roundtripContainer(_ container: Container) -> Container
-
-@JS struct Vector2D {
-    var dx: Double
-    var dy: Double
-}
-
-extension Vector2D {
-    @JS func magnitude() -> Double {
-        return (dx * dx + dy * dy).squareRoot()
-    }
-
-    @JS func scaled(by factor: Double) -> Vector2D {
-        return Vector2D(dx: dx * factor, dy: dy * factor)
-    }
-}
-
-extension DataPoint {
-    @JS static func origin() -> DataPoint {
-        return DataPoint(x: 0, y: 0, label: "origin", optCount: nil, optFlag: nil)
-    }
-
-    @JS static var dimensions: Int { 2 }
-}