BridgeJS: Fix property codegen using unqualified type name for namespace-nested classes

krodak · krodak · commit 4c869e0b7231 · 2026-02-26T16:46:59.000+01:00
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
@@ -395,6 +395,17 @@ public class ExportSwift {
             }
         }
 
+        var swiftCallName: String {
+            switch self {
+            case .enumStatic(let enumDef):
+                return enumDef.swiftCallName
+            case .classStatic(let klass), .classInstance(let klass):
+                return klass.swiftCallName
+            case .structStatic(let structDef):
+                return structDef.swiftCallName
+            }
+        }
+
         func callName(for property: ExportedProperty) -> String {
             switch self {
             case .enumStatic(let enumDef):
@@ -423,7 +434,7 @@ public class ExportSwift {
 
         if !isStatic {
             try getterBuilder.liftParameter(
-                param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(className))
+                param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(context.swiftCallName))
             )
         }
 
@@ -446,7 +457,7 @@ public class ExportSwift {
             if !isStatic {
                 // Instance properties need _self parameter
                 try setterBuilder.liftParameter(
-                    param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(className))
+                    param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(context.swiftCallName))
                 )
             }
 
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift
@@ -2,7 +2,11 @@
 
 @JS enum Utils {
     @JS class Converter {
-        @JS init() {}
+        @JS var precision: Int
+
+        @JS init() {
+            self.precision = 2
+        }
 
         @JS func toString(value: Int) -> String {
             return String(value)
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
@@ -48,7 +48,19 @@
           "Utils"
         ],
         "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "precision",
+            "namespace" : [
+              "Utils"
+            ],
+            "type" : {
+              "int" : {
 
+              }
+            }
+          }
         ],
         "swiftCallName" : "Utils.Converter"
       },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
@@ -151,6 +151,27 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
+@_expose(wasm, "bjs_Converter_precision_get")
+@_cdecl("bjs_Converter_precision_get")
+public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Converter_precision_set")
+@_cdecl("bjs_Converter_precision_set")
+public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_Converter_deinit")
 @_cdecl("bjs_Converter_deinit")
 public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
@@ -48,7 +48,19 @@
           "Utils"
         ],
         "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "precision",
+            "namespace" : [
+              "Utils"
+            ],
+            "type" : {
+              "int" : {
 
+              }
+            }
+          }
         ],
         "swiftCallName" : "Utils.Converter"
       },
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
@@ -151,6 +151,27 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
+@_expose(wasm, "bjs_Converter_precision_get")
+@_cdecl("bjs_Converter_precision_get")
+public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Converter_precision_set")
+@_cdecl("bjs_Converter_precision_set")
+public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_Converter_deinit")
 @_cdecl("bjs_Converter_deinit")
 public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
@@ -84,6 +84,7 @@ export interface SwiftHeapObject {
 }
 export interface Converter extends SwiftHeapObject {
     toString(value: number): string;
+    precision: number;
 }
 export interface HTTPServer extends SwiftHeapObject {
     call(method: Networking.API.MethodTag): void;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
@@ -300,6 +300,13 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 }
+                get precision() {
+                    const ret = instance.exports.bjs_Converter_precision_get(this.pointer);
+                    return ret;
+                }
+                set precision(value) {
+                    instance.exports.bjs_Converter_precision_set(this.pointer, value);
+                }
             }
             class HTTPServer extends SwiftHeapObject {
                 static __construct(ptr) {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
@@ -56,6 +56,7 @@ export interface SwiftHeapObject {
 }
 export interface Converter extends SwiftHeapObject {
     toString(value: number): string;
+    precision: number;
 }
 export interface HTTPServer extends SwiftHeapObject {
     call(method: Networking.API.MethodTag): void;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
@@ -281,6 +281,13 @@ export async function createInstantiator(options, swift) {
                     tmpRetString = undefined;
                     return ret;
                 }
+                get precision() {
+                    const ret = instance.exports.bjs_Converter_precision_get(this.pointer);
+                    return ret;
+                }
+                set precision(value) {
+                    instance.exports.bjs_Converter_precision_set(this.pointer, value);
+                }
             }
             class HTTPServer extends SwiftHeapObject {
                 static __construct(ptr) {
diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
@@ -313,7 +313,11 @@ struct TestError: Error {
 
 @JS enum Utils {
     @JS class Converter {
-        @JS init() {}
+        @JS var precision: Int
+
+        @JS init() {
+            self.precision = 2
+        }
 
         @JS func toString(value: Int) -> String {
             return String(value)
diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
@@ -6936,6 +6936,27 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
+@_expose(wasm, "bjs_Converter_precision_get")
+@_cdecl("bjs_Converter_precision_get")
+public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Converter_precision_set")
+@_cdecl("bjs_Converter_precision_set")
+public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_Converter_toString")
 @_cdecl("bjs_Converter_toString")
 public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
@@ -714,7 +714,19 @@
           "Utils"
         ],
         "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "precision",
+            "namespace" : [
+              "Utils"
+            ],
+            "type" : {
+              "int" : {
 
+              }
+            }
+          }
         ],
         "swiftCallName" : "Utils.Converter"
       },
diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,17 @@ public class ExportSwift {`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`
	`398`	`+ var swiftCallName: String {`
	`399`	`+ switch self {`
	`400`	`+ case .enumStatic(let enumDef):`
	`401`	`+ return enumDef.swiftCallName`
	`402`	`+ case .classStatic(let klass), .classInstance(let klass):`
	`403`	`+ return klass.swiftCallName`
	`404`	`+ case .structStatic(let structDef):`
	`405`	`+ return structDef.swiftCallName`
	`406`	`+ }`
	`407`	`+ }`
	`408`	`+`
`398`	`409`	`func callName(for property: ExportedProperty) -> String {`
`399`	`410`	`switch self {`
`400`	`411`	`case .enumStatic(let enumDef):`
`@@ -423,7 +434,7 @@ public class ExportSwift {`
`423`	`434`
`424`	`435`	`if !isStatic {`
`425`	`436`	`try getterBuilder.liftParameter(`
`426`		`- param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(className))`
	`437`	`+ param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(context.swiftCallName))`
`427`	`438`	`)`
`428`	`439`	`}`
`429`	`440`
`@@ -446,7 +457,7 @@ public class ExportSwift {`
`446`	`457`	`if !isStatic {`
`447`	`458`	`// Instance properties need _self parameter`
`448`	`459`	`try setterBuilder.liftParameter(`
`449`		`- param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(className))`
	`460`	`+ param: Parameter(label: nil, name: "_self", type: .swiftHeapObject(context.swiftCallName))`
`450`	`461`	`)`
`451`	`462`	`}`
`452`	`463`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ export interface SwiftHeapObject {`
`84`	`84`	`}`
`85`	`85`	`export interface Converter extends SwiftHeapObject {`
`86`	`86`	`toString(value: number): string;`
	`87`	`+ precision: number;`
`87`	`88`	`}`
`88`	`89`	`export interface HTTPServer extends SwiftHeapObject {`
`89`	`90`	`call(method: Networking.API.MethodTag): void;`
Original file line number	Diff line number	Diff line change
`@@ -300,6 +300,13 @@ export async function createInstantiator(options, swift) {`
`300`	`300`	`tmpRetString = undefined;`
`301`	`301`	`return ret;`
`302`	`302`	`}`
	`303`	`+ get precision() {`
	`304`	`+ const ret = instance.exports.bjs_Converter_precision_get(this.pointer);`
	`305`	`+ return ret;`
	`306`	`+ }`
	`307`	`+ set precision(value) {`
	`308`	`+ instance.exports.bjs_Converter_precision_set(this.pointer, value);`
	`309`	`+ }`
`303`	`310`	`}`
`304`	`311`	`class HTTPServer extends SwiftHeapObject {`
`305`	`312`	`static __construct(ptr) {`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ export interface SwiftHeapObject {`
`56`	`56`	`}`
`57`	`57`	`export interface Converter extends SwiftHeapObject {`
`58`	`58`	`toString(value: number): string;`
	`59`	`+ precision: number;`
`59`	`60`	`}`
`60`	`61`	`export interface HTTPServer extends SwiftHeapObject {`
`61`	`62`	`call(method: Networking.API.MethodTag): void;`
Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,13 @@ export async function createInstantiator(options, swift) {`
`281`	`281`	`tmpRetString = undefined;`
`282`	`282`	`return ret;`
`283`	`283`	`}`
	`284`	`+ get precision() {`
	`285`	`+ const ret = instance.exports.bjs_Converter_precision_get(this.pointer);`
	`286`	`+ return ret;`
	`287`	`+ }`
	`288`	`+ set precision(value) {`
	`289`	`+ instance.exports.bjs_Converter_precision_set(this.pointer, value);`
	`290`	`+ }`
`284`	`291`	`}`
`285`	`292`	`class HTTPServer extends SwiftHeapObject {`
`286`	`293`	`static __construct(ptr) {`