BridgeJS: Fix d.ts rendering of static methods

Author: kateinoigakukun

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -3144,6 +3144,25 @@ extension BridgeJSLink {
             importObjectBuilder.assignToImportObject(name: abiName, function: js)
             importObjectBuilder.appendDts(dts)
         }
+        if type.from == nil, type.constructor != nil || !type.staticMethods.isEmpty {
+            let dtsPrinter = CodeFragmentPrinter()
+            dtsPrinter.write("\(type.name): {")
+            dtsPrinter.indent {
+                if let constructor = type.constructor {
+                    let returnType = BridgeType.jsObject(type.name)
+                    dtsPrinter.write(
+                        "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));"
+                    )
+                }
+                for method in type.staticMethods {
+                    let methodName = method.jsName ?? method.name
+                    let signature = "\(renderTSPropertyName(methodName))\(renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: Effects(isAsync: false, isThrows: false)));"
+                    dtsPrinter.write(signature)
+                }
+            }
+            dtsPrinter.write("}")
+            importObjectBuilder.appendDts(dtsPrinter.lines)
+        }
         for method in type.methods {
             let (js, dts) = try renderImportedMethod(context: type, method: method)
             importObjectBuilder.assignToImportObject(name: method.abiName(context: type), function: js)
@@ -3174,19 +3193,6 @@ extension BridgeJSLink {
             returnType: returnType
         )
         importObjectBuilder.assignToImportObject(name: abiName, function: funcLines)
-
-        if type.from == nil {
-            let dtsPrinter = CodeFragmentPrinter()
-            dtsPrinter.write("\(type.name): {")
-            dtsPrinter.indent {
-                dtsPrinter.write(
-                    "new\(renderTSSignature(parameters: constructor.parameters, returnType: returnType, effects: Effects(isAsync: false, isThrows: false)));"
-                )
-            }
-            dtsPrinter.write("}")
-
-            importObjectBuilder.appendDts(dtsPrinter.lines)
-        }
     }
 
     func renderImportedGetter(

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

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

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

@@ -99,6 +99,50 @@
                 }
               }
             ]
+          },
+          {
+            "constructor" : {
+              "parameters" : [
+                {
+                  "name" : "value",
+                  "type" : {
+                    "double" : {
+
+                    }
+                  }
+                }
+              ]
+            },
+            "getters" : [
+
+            ],
+            "methods" : [
+
+            ],
+            "name" : "WithCtor",
+            "setters" : [
+
+            ],
+            "staticMethods" : [
+              {
+                "name" : "create",
+                "parameters" : [
+                  {
+                    "name" : "value",
+                    "type" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                ],
+                "returnType" : {
+                  "jsObject" : {
+                    "_0" : "WithCtor"
+                  }
+                }
+              }
+            ]
           }
         ]
       }

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

@@ -83,4 +83,40 @@ func _$StaticBox_value(_ self: JSObject) throws(JSException) -> Double {
         throw error
     }
     return Double.bridgeJSLiftReturn(ret)
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_WithCtor_init")
+fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32
+#else
+fileprivate func bjs_WithCtor_init(_ value: Float64) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_WithCtor_create_static")
+fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32
+#else
+fileprivate func bjs_WithCtor_create_static(_ value: Float64) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+
+func _$WithCtor_init(_ value: Double) throws(JSException) -> JSObject {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_WithCtor_init(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return JSObject.bridgeJSLiftReturn(ret)
+}
+
+func _$WithCtor_create(_ value: Double) throws(JSException) -> WithCtor {
+    let valueValue = value.bridgeJSLowerParameter()
+    let ret = bjs_WithCtor_create_static(valueValue)
+    if let error = _swift_js_take_exception() {
+        throw error
+    }
+    return WithCtor.bridgeJSLiftReturn(ret)
 }

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

@@ -0,0 +1,32 @@
+// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
+// DO NOT EDIT.
+//
+// To update this file, just rebuild your project or run
+// `swift package bridge-js`.
+
+export interface StaticBox {
+    value(): number;
+}
+export interface WithCtor {
+}
+export type Exports = {
+}
+export type Imports = {
+    StaticBox: {
+        create(value: number): StaticBox;
+        value(): number;
+        makeDefault(): StaticBox;
+        "with-dashes"(): StaticBox;
+    }
+    WithCtor: {
+        new(value: number): WithCtor;
+        create(value: number): WithCtor;
+    }
+}
+export function createInstantiator(options: {
+    imports: Imports;
+}, swift: any): Promise<{
+    addImports: (importObject: WebAssembly.Imports) => void;
+    setInstance: (instance: WebAssembly.Instance) => void;
+    createExports: (instance: WebAssembly.Instance) => Exports;
+}>;