Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krodak merged 1 commit into from
Feb 27, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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))
)
}

Expand All @@ -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))
)
}

Expand Down
6 changes: 5 additions & 1 deletion Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 12 additions & 0 deletions ...geJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,19 @@
"Utils"
],
"properties" : [
{
"isReadonly" : false,
"isStatic" : false,
"name" : "precision",
"namespace" : [
"Utils"
],
"type" : {
"int" : {

}
}
}
],
"swiftCallName" : "Utils.Converter"
},
Expand Down
21 changes: 21 additions & 0 deletions ...eJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 12 additions & 0 deletions ...ns/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,19 @@
"Utils"
],
"properties" : [
{
"isReadonly" : false,
"isStatic" : false,
"name" : "precision",
"namespace" : [
"Utils"
],
"type" : {
"int" : {

}
}
}
],
"swiftCallName" : "Utils.Converter"
},
Expand Down
21 changes: 21 additions & 0 deletions ...s/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions ...ridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions .../BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 5 additions & 1 deletion Tests/BridgeJSRuntimeTests/ExportAPITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
21 changes: 21 additions & 0 deletions Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6947,6 +6947,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 {
Expand Down
12 changes: 12 additions & 0 deletions Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,19 @@
"Utils"
],
"properties" : [
{
"isReadonly" : false,
"isStatic" : false,
"name" : "precision",
"namespace" : [
"Utils"
],
"type" : {
"int" : {

}
}
}
],
"swiftCallName" : "Utils.Converter"
},
Expand Down
3 changes: 3 additions & 0 deletions Tests/prelude.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,9 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
assert.equal(exports.roundtripInternalSupportedMethod(exports.Networking.APIV2.Internal.SupportedMethod.Get), exports.Networking.APIV2.Internal.SupportedMethod.Get);

const converter = new exports.Utils.Converter();
assert.equal(converter.precision, 2);
converter.precision = 5;
assert.equal(converter.precision, 5);
assert.equal(converter.toString(42), "42");
assert.equal(converter.toString(123), "123");
converter.release();
Expand Down