Skip to content

BridgeJS: Remove unnecessary helper enums for struct bridging #532

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
kateinoigakukun merged 1 commit into from
Jan 27, 2026
Merged

BridgeJS: Remove unnecessary helper enums for struct bridging #532

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
48 changes: 4 additions & 44 deletions Benchmarks/Sources/Generated/BridgeJS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ extension SimpleStruct: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _SimpleStructHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -279,16 +279,6 @@ extension SimpleStruct: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _SimpleStructHelpers.raise()
}
}

fileprivate enum _SimpleStructHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_SimpleStruct(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_SimpleStruct()))
}
}
Expand Down Expand Up @@ -332,7 +322,7 @@ extension Address: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _AddressHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -342,16 +332,6 @@ extension Address: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _AddressHelpers.raise()
}
}

fileprivate enum _AddressHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address()))
}
}
Expand Down Expand Up @@ -401,7 +381,7 @@ extension Person: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _PersonHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -411,16 +391,6 @@ extension Person: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _PersonHelpers.raise()
}
}

fileprivate enum _PersonHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person()))
}
}
Expand Down Expand Up @@ -473,7 +443,7 @@ extension ComplexStruct: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _ComplexStructHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -483,16 +453,6 @@ extension ComplexStruct: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _ComplexStructHelpers.raise()
}
}

fileprivate enum _ComplexStructHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_ComplexStruct(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ComplexStruct()))
}
}
Expand Down
17 changes: 2 additions & 15 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,6 @@ struct StructCodegen {
let lowerCode = generateStructLowerCode(structDef: structDef)
let accessControl = structDef.explicitAccessControl.map { "\($0) " } ?? ""

let helpersTypeName = "_\(structDef.name)Helpers"
let lowerExternName = "swift_js_struct_lower_\(structDef.name)"
let raiseExternName = "swift_js_struct_raise_\(structDef.name)"
let lowerFunctionName = "_bjs_struct_lower_\(structDef.name)"
Expand All @@ -1174,26 +1173,14 @@ struct StructCodegen {
}

\(raw: accessControl)init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = \(raw: helpersTypeName).lower(jsObject)
let __bjs_cleanupId = \(raw: lowerFunctionName)(jsObject.bridgeJSLowerParameter())
defer { _swift_js_struct_cleanup(__bjs_cleanupId) }
self = Self.bridgeJSLiftParameter()
}

\(raw: accessControl)func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return \(raw: helpersTypeName).raise()
}
}
"""

let helpersType: DeclSyntax = """
fileprivate enum \(raw: helpersTypeName) {
static func lower(_ jsObject: JSObject) -> Int32 {
return \(raw: lowerFunctionName)(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: \(raw: raiseFunctionName)()))
}
}
Expand All @@ -1216,7 +1203,7 @@ struct StructCodegen {
)
)

return [bridgedStructExtension, helpersType, lowerExternDecl, raiseExternDecl]
return [bridgedStructExtension, lowerExternDecl, raiseExternDecl]
}

private static func renderStructExtern(
Expand Down
24 changes: 2 additions & 22 deletions ...s/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/DefaultParameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ extension Config: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _ConfigHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -65,16 +65,6 @@ extension Config: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _ConfigHelpers.raise()
}
}

fileprivate enum _ConfigHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_Config(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Config()))
}
}
Expand Down Expand Up @@ -108,7 +98,7 @@ extension MathOperations: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _MathOperationsHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -118,16 +108,6 @@ extension MathOperations: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _MathOperationsHelpers.raise()
}
}

fileprivate enum _MathOperationsHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_MathOperations(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_MathOperations()))
}
}
Expand Down
60 changes: 5 additions & 55 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/SwiftStruct.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extension DataPoint: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _DataPointHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -38,16 +38,6 @@ extension DataPoint: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _DataPointHelpers.raise()
}
}

fileprivate enum _DataPointHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_DataPoint(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_DataPoint()))
}
}
Expand Down Expand Up @@ -106,7 +96,7 @@ extension Address: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _AddressHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -116,16 +106,6 @@ extension Address: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _AddressHelpers.raise()
}
}

fileprivate enum _AddressHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_Address(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Address()))
}
}
Expand Down Expand Up @@ -175,7 +155,7 @@ extension Person: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _PersonHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -185,16 +165,6 @@ extension Person: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _PersonHelpers.raise()
}
}

fileprivate enum _PersonHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_Person(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Person()))
}
}
Expand Down Expand Up @@ -230,7 +200,7 @@ extension Session: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _SessionHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -240,16 +210,6 @@ extension Session: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _SessionHelpers.raise()
}
}

fileprivate enum _SessionHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_Session(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_Session()))
}
}
Expand Down Expand Up @@ -282,7 +242,7 @@ extension ConfigStruct: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _ConfigStructHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -292,16 +252,6 @@ extension ConfigStruct: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _ConfigStructHelpers.raise()
}
}

fileprivate enum _ConfigStructHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_ConfigStruct(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_ConfigStruct()))
}
}
Expand Down
12 changes: 1 addition & 11 deletions Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/UnsafePointer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extension PointerFields: _BridgedSwiftStruct {
}

init(unsafelyCopying jsObject: JSObject) {
let __bjs_cleanupId = _PointerFieldsHelpers.lower(jsObject)
let __bjs_cleanupId = _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter())
defer {
_swift_js_struct_cleanup(__bjs_cleanupId)
}
Expand All @@ -27,16 +27,6 @@ extension PointerFields: _BridgedSwiftStruct {
func toJSObject() -> JSObject {
var __bjs_self = self
__bjs_self.bridgeJSLowerReturn()
return _PointerFieldsHelpers.raise()
}
}

fileprivate enum _PointerFieldsHelpers {
static func lower(_ jsObject: JSObject) -> Int32 {
return _bjs_struct_lower_PointerFields(jsObject.bridgeJSLowerParameter())
}

static func raise() -> JSObject {
return JSObject(id: UInt32(bitPattern: _bjs_struct_raise_PointerFields()))
}
}
Expand Down
Loading