Skip to content

Commit 1ad419b

Browse files
committed
NFC: BridgeJS: Refactor JSGlueGen with compositional optional handling and helper consolidation
1 parent 8bbf832 commit 1ad419b

20 files changed

+2714
-2974
lines changed

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ public struct BridgeJSLink {
10481048
for skeleton in skeletons.compactMap(\.exported) {
10491049
for enumDef in skeleton.enums where enumDef.enumType == .associatedValue {
10501050
printer.write(
1051-
"const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers()();"
1051+
"const \(enumDef.name)Helpers = __bjs_create\(enumDef.valuesName)Helpers();"
10521052
)
10531053
printer.write("\(JSGlueVariableScope.reservedEnumHelpers).\(enumDef.name) = \(enumDef.name)Helpers;")
10541054
printer.nextLine()
@@ -1064,7 +1064,7 @@ public struct BridgeJSLink {
10641064
for skeleton in skeletons.compactMap(\.exported) {
10651065
for structDef in skeleton.structs {
10661066
printer.write(
1067-
"const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers()();"
1067+
"const \(structDef.name)Helpers = __bjs_create\(structDef.name)Helpers();"
10681068
)
10691069
printer.write(
10701070
"\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name) = \(structDef.name)Helpers;"
@@ -1513,15 +1513,15 @@ public struct BridgeJSLink {
15131513

15141514
switch enumDefinition.enumType {
15151515
case .simple:
1516-
let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition)
1516+
let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition)
15171517
_ = try fragment.printCode([enumValuesName], context)
15181518
jsTopLevelLines.append(contentsOf: printer.lines)
15191519
case .rawValue:
15201520
guard enumDefinition.rawType != nil else {
15211521
throw BridgeJSLinkError(message: "Raw value enum \(enumDefinition.name) is missing rawType")
15221522
}
15231523

1524-
let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition)
1524+
let fragment = IntrinsicJSFragment.caseEnumHelper(enumDefinition: enumDefinition)
15251525
_ = try fragment.printCode([enumValuesName], context)
15261526
jsTopLevelLines.append(contentsOf: printer.lines)
15271527
case .associatedValue:

0 commit comments

Comments
 (0)