BridgeJS: Remove support for static members in extensions

Author: kateinoigakukun

Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift

@@ -1856,8 +1856,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
     private let inputFilePath: String
     private var jsClassNames: Set<String>
     private let parent: SwiftToSkeleton
-    private var staticMethodsByType: [String: [ImportedFunctionSkeleton]] = [:]
-
     // MARK: - State Management
 
     enum State {
@@ -2118,21 +2116,19 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
 
     private func exitJSClass() {
         if case .jsClassBody(let typeName) = state, let type = currentType, type.name == typeName {
-            let externalStaticMethods = staticMethodsByType[type.name] ?? []
             importedTypes.append(
                 ImportedTypeSkeleton(
                     name: type.name,
                     jsName: type.jsName,
                     from: type.from,
                     constructor: type.constructor,
                     methods: type.methods,
-                    staticMethods: type.staticMethods + externalStaticMethods,
+                    staticMethods: type.staticMethods,
                     getters: type.getters,
                     setters: type.setters,
                     documentation: nil
                 )
             )
-            staticMethodsByType[type.name] = nil
             currentType = nil
         }
         stateStack.removeLast()
@@ -2172,12 +2168,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
 
     // MARK: - Visitor Methods
 
-    override func visit(_ node: ExtensionDeclSyntax) -> SyntaxVisitorContinueKind {
-        let typeName = node.extendedType.trimmedDescription
-        collectStaticMembers(in: node.memberBlock.members, typeName: typeName)
-        return .skipChildren
-    }
-
     override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
         switch state {
         case .topLevel:
@@ -2318,45 +2308,6 @@ private final class ImportSwiftMacrosAPICollector: SyntaxAnyVisitor {
         }
     }
 
-    // MARK: - Member Collection
-
-    private func collectStaticMembers(in members: MemberBlockItemListSyntax, typeName: String) {
-        for member in members {
-            if let function = member.decl.as(FunctionDeclSyntax.self) {
-                if let jsFunction = AttributeChecker.firstJSFunctionAttribute(function.attributes),
-                    let parsed = parseFunction(jsFunction, function) {
-                    if jsClassNames.contains(typeName) {
-                        if let index = importedTypes.firstIndex(where: { $0.name == typeName }) {
-                            importedTypes[index].staticMethods.append(parsed)
-                        } else {
-                            importedTypes.append(ImportedTypeSkeleton(name: typeName, staticMethods: [parsed]))
-                        }
-                    } else {
-                        importedFunctions.append(parsed)
-                    }
-                } else if AttributeChecker.hasJSSetterAttribute(function.attributes) {
-                    errors.append(
-                        DiagnosticError(
-                            node: function,
-                            message:
-                                "@JSSetter is not supported for static members. Use it only for instance members in @JSClass types."
-                        )
-                    )
-                }
-            } else if let variable = member.decl.as(VariableDeclSyntax.self),
-                AttributeChecker.hasJSGetterAttribute(variable.attributes)
-            {
-                errors.append(
-                    DiagnosticError(
-                        node: variable,
-                        message:
-                            "@JSGetter is not supported for static members. Use it only for instance members in @JSClass types."
-                    )
-                )
-            }
-        }
-    }
-
     // MARK: - Parsing Methods
 
     private func parseConstructor(

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

@@ -1,14 +1,8 @@
-extension StaticBox {
-    @JSFunction static func makeDefault() throws(JSException) -> StaticBox
-}
-
 @JSClass struct StaticBox {
     @JSFunction static func create(_ value: Double) throws(JSException) -> StaticBox
     @JSFunction func value() throws(JSException) -> Double
     @JSFunction static func value() throws(JSException) -> Double
-}
-
-extension StaticBox {
+    @JSFunction static func makeDefault() throws(JSException) -> StaticBox
     @JSFunction(jsName: "with-dashes") static func dashed() throws(JSException) -> StaticBox
 }
 

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.json

@@ -24,43 +24,6 @@
 
         ],
         "types" : [
-          {
-            "getters" : [
-
-            ],
-            "methods" : [
-
-            ],
-            "name" : "StaticBox",
-            "setters" : [
-
-            ],
-            "staticMethods" : [
-              {
-                "name" : "makeDefault",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "jsObject" : {
-                    "_0" : "StaticBox"
-                  }
-                }
-              },
-              {
-                "jsName" : "with-dashes",
-                "name" : "dashed",
-                "parameters" : [
-
-                ],
-                "returnType" : {
-                  "jsObject" : {
-                    "_0" : "StaticBox"
-                  }
-                }
-              }
-            ]
-          },
           {
             "getters" : [
 
@@ -111,6 +74,29 @@
 
                   }
                 }
+              },
+              {
+                "name" : "makeDefault",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "jsObject" : {
+                    "_0" : "StaticBox"
+                  }
+                }
+              },
+              {
+                "jsName" : "with-dashes",
+                "name" : "dashed",
+                "parameters" : [
+
+                ],
+                "returnType" : {
+                  "jsObject" : {
+                    "_0" : "StaticBox"
+                  }
+                }
               }
             ]
           },

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSClassStaticFunctions.swift

@@ -1,51 +1,35 @@
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static")
-fileprivate func bjs_StaticBox_makeDefault_static() -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static")
+fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32
 #else
-fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 {
+fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static")
-fileprivate func bjs_StaticBox_dashed_static() -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static")
+fileprivate func bjs_StaticBox_value_static() -> Float64
 #else
-fileprivate func bjs_StaticBox_dashed_static() -> Int32 {
+fileprivate func bjs_StaticBox_value_static() -> Float64 {
     fatalError("Only available on WebAssembly")
 }
 #endif
 
-func _$StaticBox_makeDefault() throws(JSException) -> StaticBox {
-    let ret = bjs_StaticBox_makeDefault_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return StaticBox.bridgeJSLiftReturn(ret)
-}
-
-func _$StaticBox_dashed() throws(JSException) -> StaticBox {
-    let ret = bjs_StaticBox_dashed_static()
-    if let error = _swift_js_take_exception() {
-        throw error
-    }
-    return StaticBox.bridgeJSLiftReturn(ret)
-}
-
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_create_static")
-fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_makeDefault_static")
+fileprivate func bjs_StaticBox_makeDefault_static() -> Int32
 #else
-fileprivate func bjs_StaticBox_create_static(_ value: Float64) -> Int32 {
+fileprivate func bjs_StaticBox_makeDefault_static() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_value_static")
-fileprivate func bjs_StaticBox_value_static() -> Float64
+@_extern(wasm, module: "TestModule", name: "bjs_StaticBox_dashed_static")
+fileprivate func bjs_StaticBox_dashed_static() -> Int32
 #else
-fileprivate func bjs_StaticBox_value_static() -> Float64 {
+fileprivate func bjs_StaticBox_dashed_static() -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
@@ -76,6 +60,22 @@ func _$StaticBox_value() throws(JSException) -> Double {
     return Double.bridgeJSLiftReturn(ret)
 }
 
+func _$StaticBox_makeDefault() throws(JSException) -> StaticBox {
+    let ret = bjs_StaticBox_makeDefault_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return StaticBox.bridgeJSLiftReturn(ret)
+}
+
+func _$StaticBox_dashed() throws(JSException) -> StaticBox {
+    let ret = bjs_StaticBox_dashed_static()
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return StaticBox.bridgeJSLiftReturn(ret)
+}
+
 func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double {
     let selfValue = self.bridgeJSLowerParameter()
     let ret = bjs_StaticBox_value(selfValue)

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.d.ts

@@ -4,8 +4,6 @@
 // To update this file, just rebuild your project or run
 // `swift package bridge-js`.
 
-export interface StaticBox {
-}
 export interface StaticBox {
     value(): number;
 }
@@ -14,13 +12,11 @@ export interface WithCtor {
 export type Exports = {
 }
 export type Imports = {
-    StaticBox: {
-        makeDefault(): StaticBox;
-        "with-dashes"(): StaticBox;
-    }
     StaticBox: {
         create(value: number): StaticBox;
         value(): number;
+        makeDefault(): StaticBox;
+        "with-dashes"(): StaticBox;
     }
     WithCtor: {
         new(value: number): WithCtor;

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSClassStaticFunctions.js

@@ -203,37 +203,37 @@ export async function createInstantiator(options, swift) {
                 return pointer || 0;
             }
             const TestModule = importObject["TestModule"] = importObject["TestModule"] || {};
-            TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() {
+            TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) {
                 try {
-                    let ret = imports.StaticBox.makeDefault();
+                    let ret = imports.StaticBox.create(value);
                     return swift.memory.retain(ret);
                 } catch (error) {
                     setException(error);
                     return 0
                 }
             }
-            TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() {
+            TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() {
                 try {
-                    let ret = imports.StaticBox["with-dashes"]();
-                    return swift.memory.retain(ret);
+                    let ret = imports.StaticBox.value();
+                    return ret;
                 } catch (error) {
                     setException(error);
                     return 0
                 }
             }
-            TestModule["bjs_StaticBox_create_static"] = function bjs_StaticBox_create_static(value) {
+            TestModule["bjs_StaticBox_makeDefault_static"] = function bjs_StaticBox_makeDefault_static() {
                 try {
-                    let ret = imports.StaticBox.create(value);
+                    let ret = imports.StaticBox.makeDefault();
                     return swift.memory.retain(ret);
                 } catch (error) {
                     setException(error);
                     return 0
                 }
             }
-            TestModule["bjs_StaticBox_value_static"] = function bjs_StaticBox_value_static() {
+            TestModule["bjs_StaticBox_dashed_static"] = function bjs_StaticBox_dashed_static() {
                 try {
-                    let ret = imports.StaticBox.value();
-                    return ret;
+                    let ret = imports.StaticBox["with-dashes"]();
+                    return swift.memory.retain(ret);
                 } catch (error) {
                     setException(error);
                     return 0