Skip to content

NFC: BridgeJS: Refactor JSGlueGen with compositional optional handling and helper consolidation #656

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 2 commits into from
Feb 19, 2026
Merged

NFC: BridgeJS: Refactor JSGlueGen with compositional optional handling and helper consolidation #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ad419b
NFC: BridgeJS: Refactor JSGlueGen with compositional optional handlin…
krodak Feb 18, 2026
834b59a
BridgeJS: Register parameter names in scope instead of reserveNames
krodak Feb 19, 2026
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
11 changes: 6 additions & 5 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ public struct BridgeJSLink {
for skeleton in skeletons.compactMap(\.exported) {
for enumDef in skeleton.enums where enumDef.enumType == .associatedValue {
printer.write(
"const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()();"
"const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers();"
)
printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;")
printer.nextLine()
Expand All @@ -1064,7 +1064,7 @@ public struct BridgeJSLink {
for skeleton in skeletons.compactMap(\.exported) {
for structDef in skeleton.structs {
printer.write(
"const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()();"
"const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers();"
)
printer.write(
"\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name) = \(structDef.name)Helpers;"
Expand Down Expand Up @@ -1219,7 +1219,8 @@ public struct BridgeJSLink {
loweringFragment.parameters.count == 1,
"Lowering fragment should have exactly one parameter to lower"
)
let loweredValues = try loweringFragment.printCode([param.name], context)
let paramName = scope.variable(param.name)
let loweredValues = try loweringFragment.printCode([paramName], context)
parameterForwardings.append(contentsOf: loweredValues)
}

Expand Down Expand Up @@ -1513,15 +1514,15 @@ public struct BridgeJSLink {

switch enumDefinition.enumType {
case .simple:
let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition)
let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition)
_ = try fragment.printCode([enumValuesName], context)
jsTopLevelLines.append(contentsOf: printer.lines)
case .rawValue:
guard enumDefinition.rawType != nil else {
throw BridgeJSLinkError(message: "Raw value enum \(enumDefinition.name) is missing rawType")
}

let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition)
let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition)
_ = try fragment.printCode([enumValuesName], context)
jsTopLevelLines.append(contentsOf: printer.lines)
case .associatedValue:
Expand Down
Loading