BridgeJS: Emit static methods and properties on namespaced class entries

krodak · krodak · commit 6d2c0703c97d · 2026-04-09T13:51:01.000+02:00
The TypeScript `.d.ts` namespace-entry builder for `@JS(namespace:)`
classes only emitted the constructor, silently dropping any
`@JS static func` or `@JS static var` declared on the class. The
equivalent path for non-namespaced classes
(`renderExportedClass` → `dtsExportEntryPrinter`) iterates
`klass.methods.filter(\.effects.isStatic)` and the static subset of
`klass.properties`, so the output mismatched between the two paths.

The generated JS class still carries the static members via
`declarationPrefixKeyword: "static"` in `renderExportedClass`, and the
namespace tree references it by symbol, so the JavaScript runtime
works. TypeScript consumers, however, see an incomplete type and cannot
call the static factory through `typeof MyNamespace.MyClass` without
a hand-written augmentation.

Mirror the non-namespaced path inside the `renderClassEntry` closure in
`generateTypeScript` so namespaced classes emit their static methods
and static properties alongside `new(...)`.

Extended `Namespaces.swift` to exercise the codepath by adding a
static factory and a static readonly property on the existing
`__Swift.Foundation.Greeter` class. The Namespaces snapshot set
captures the fixed output.
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -901,6 +901,19 @@ public struct BridgeJSLink {
                                 "new\(self.renderTSSignature(parameters: constructor.parameters, returnType: .swiftHeapObject(klass.name), effects: constructor.effects));"
                             )
                         }
+                        // Static methods and static properties belong on the namespace
+                        // entry alongside the constructor (same shape that
+                        // `renderExportedClass` produces for non-namespaced classes via
+                        // `dtsExportEntryPrinter`).
+                        for method in klass.methods where method.effects.isStatic {
+                            printer.write(
+                                "\(method.name)\(self.renderTSSignature(parameters: method.parameters, returnType: method.returnType, effects: method.effects));"
+                            )
+                        }
+                        for property in klass.properties where property.isStatic {
+                            let readonly = property.isReadonly ? "readonly " : ""
+                            printer.write("\(readonly)\(property.name): \(property.type.tsType);")
+                        }
                     }
                     printer.write("}")
                     return printer.lines
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/Namespaces.swift
@@ -16,6 +16,17 @@
     func changeName(name: String) {
         self.name = name
     }
+
+    // Static methods and properties on a namespaced class must land on the
+    // class's namespace entry (alongside `new`), not on the instance
+    // interface and not silently dropped. Regression test for the
+    // `@JS(namespace:)` + `@JS static func` bug where the hierarchical
+    // exports builder only emitted the constructor.
+    @JS static func makeDefault() -> Greeter {
+        return Greeter(name: "World")
+    }
+
+    @JS static var defaultGreeting: String { "Hello, world!" }
 }
 
 @JS(namespace: "Utils.Converters") class Converter {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
@@ -38,6 +38,28 @@
 
               }
             }
+          },
+          {
+            "abiName" : "bjs___Swift_Foundation_Greeter_static_makeDefault",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "makeDefault",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "__Swift_Foundation_Greeter"
+              }
+            }
           }
         ],
         "name" : "Greeter",
@@ -46,7 +68,21 @@
           "Foundation"
         ],
         "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "defaultGreeting",
+            "staticContext" : {
+              "className" : {
+                "_0" : "__Swift_Foundation_Greeter"
+              }
+            },
+            "type" : {
+              "string" : {
 
+              }
+            }
+          }
         ],
         "swiftCallName" : "Greeter"
       },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift
@@ -42,6 +42,28 @@ public func _bjs___Swift_Foundation_Greeter_greet(_ _self: UnsafeMutableRawPoint
     #endif
 }
 
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_static_makeDefault")
+@_cdecl("bjs___Swift_Foundation_Greeter_static_makeDefault")
+public func _bjs___Swift_Foundation_Greeter_static_makeDefault() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Greeter.makeDefault()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_static_defaultGreeting_get")
+@_cdecl("bjs___Swift_Foundation_Greeter_static_defaultGreeting_get")
+public func _bjs___Swift_Foundation_Greeter_static_defaultGreeting_get() -> Void {
+    #if arch(wasm32)
+    let ret = __Swift_Foundation_Greeter.defaultGreeting
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs___Swift_Foundation_Greeter_deinit")
 @_cdecl("bjs___Swift_Foundation_Greeter_deinit")
 public func _bjs___Swift_Foundation_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
@@ -38,6 +38,28 @@
 
               }
             }
+          },
+          {
+            "abiName" : "bjs___Swift_Foundation_Greeter_static_makeDefault",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : true,
+              "isThrows" : false
+            },
+            "name" : "makeDefault",
+            "parameters" : [
+
+            ],
+            "returnType" : {
+              "swiftHeapObject" : {
+                "_0" : "Greeter"
+              }
+            },
+            "staticContext" : {
+              "className" : {
+                "_0" : "__Swift_Foundation_Greeter"
+              }
+            }
           }
         ],
         "name" : "Greeter",
@@ -46,7 +68,21 @@
           "Foundation"
         ],
         "properties" : [
+          {
+            "isReadonly" : true,
+            "isStatic" : true,
+            "name" : "defaultGreeting",
+            "staticContext" : {
+              "className" : {
+                "_0" : "__Swift_Foundation_Greeter"
+              }
+            },
+            "type" : {
+              "string" : {
 
+              }
+            }
+          }
         ],
         "swiftCallName" : "Greeter"
       },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift
@@ -42,6 +42,28 @@ public func _bjs___Swift_Foundation_Greeter_greet(_ _self: UnsafeMutableRawPoint
     #endif
 }
 
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_static_makeDefault")
+@_cdecl("bjs___Swift_Foundation_Greeter_static_makeDefault")
+public func _bjs___Swift_Foundation_Greeter_static_makeDefault() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Greeter.makeDefault()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_static_defaultGreeting_get")
+@_cdecl("bjs___Swift_Foundation_Greeter_static_defaultGreeting_get")
+public func _bjs___Swift_Foundation_Greeter_static_defaultGreeting_get() -> Void {
+    #if arch(wasm32)
+    let ret = __Swift_Foundation_Greeter.defaultGreeting
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs___Swift_Foundation_Greeter_deinit")
 @_cdecl("bjs___Swift_Foundation_Greeter_deinit")
 public func _bjs___Swift_Foundation_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts
@@ -34,6 +34,7 @@ declare global {
             class Greeter {
                 constructor(name: string);
                 greet(): string;
+                makeDefault(): Greeter;
                 release(): void;
             }
             class UUID {
@@ -87,6 +88,8 @@ export type Exports = {
         Foundation: {
             Greeter: {
                 new(name: string): Greeter;
+                makeDefault(): Greeter;
+                readonly defaultGreeting: string;
             }
             UUID: {
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
@@ -268,6 +268,16 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 }
+                static makeDefault() {
+                    const ret = instance.exports.bjs___Swift_Foundation_Greeter_static_makeDefault();
+                    return Greeter.__construct(ret);
+                }
+                static get defaultGreeting() {
+                    instance.exports.bjs___Swift_Foundation_Greeter_static_defaultGreeting_get();
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.d.ts
@@ -47,6 +47,8 @@ export type Exports = {
         Foundation: {
             Greeter: {
                 new(name: string): Greeter;
+                makeDefault(): Greeter;
+                readonly defaultGreeting: string;
             }
             UUID: {
             }
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
@@ -268,6 +268,16 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 }
+                static makeDefault() {
+                    const ret = instance.exports.bjs___Swift_Foundation_Greeter_static_makeDefault();
+                    return Greeter.__construct(ret);
+                }
+                static get defaultGreeting() {
+                    instance.exports.bjs___Swift_Foundation_Greeter_static_defaultGreeting_get();
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
+                }
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ declare global {`
`34`	`34`	`class Greeter {`
`35`	`35`	`constructor(name: string);`
`36`	`36`	`greet(): string;`
	`37`	`+ makeDefault(): Greeter;`
`37`	`38`	`release(): void;`
`38`	`39`	`}`
`39`	`40`	`class UUID {`
`@@ -87,6 +88,8 @@ export type Exports = {`
`87`	`88`	`Foundation: {`
`88`	`89`	`Greeter: {`
`89`	`90`	`new(name: string): Greeter;`
	`91`	`+ makeDefault(): Greeter;`
	`92`	`+ readonly defaultGreeting: string;`
`90`	`93`	`}`
`91`	`94`	`UUID: {`
`92`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ export type Exports = {`
`47`	`47`	`Foundation: {`
`48`	`48`	`Greeter: {`
`49`	`49`	`new(name: string): Greeter;`
	`50`	`+ makeDefault(): Greeter;`
	`51`	`+ readonly defaultGreeting: string;`
`50`	`52`	`}`
`51`	`53`	`UUID: {`
`52`	`54`	`}`