Skip to content

BridgeJS: expand integer and raw-value enum support #701

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
Mar 13, 2026
+6,088 −1,095
Merged

BridgeJS: expand integer and raw-value enum support #701

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
231 changes: 165 additions & 66 deletions Benchmarks/Sources/Generated/JavaScript/BridgeJS.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 20 additions & 8 deletions Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,11 @@
"isStatic" : false,
"name" : "startLine",
"type" : {
"int" : {

"integer" : {
"_0" : {
"isSigned" : true,
"width" : "word"
}
}
}
},
Expand All @@ -157,8 +160,11 @@
"isStatic" : false,
"name" : "startColumn",
"type" : {
"int" : {

"integer" : {
"_0" : {
"isSigned" : true,
"width" : "word"
}
}
}
},
Expand All @@ -167,8 +173,11 @@
"isStatic" : false,
"name" : "endLine",
"type" : {
"int" : {

"integer" : {
"_0" : {
"isSigned" : true,
"width" : "word"
}
}
}
},
Expand All @@ -177,8 +186,11 @@
"isStatic" : false,
"name" : "endColumn",
"type" : {
"int" : {

"integer" : {
"_0" : {
"isSigned" : true,
"width" : "word"
}
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ struct StackCodegen {
/// - Returns: An ExprSyntax representing the lift expression
func liftExpression(for type: BridgeType) -> ExprSyntax {
switch type {
case .string, .int, .uint, .bool, .float, .double,
case .string, .integer, .bool, .float, .double,
.jsObject(nil), .jsValue, .swiftStruct, .swiftHeapObject, .unsafePointer,
.swiftProtocol, .caseEnum, .associatedValueEnum, .rawValueEnum, .array, .dictionary:
return "\(raw: type.swiftType).bridgeJSStackPop()"
Expand All @@ -766,7 +766,7 @@ struct StackCodegen {
private func liftNullableExpression(wrappedType: BridgeType, kind: JSOptionalKind) -> ExprSyntax {
let typeName = kind == .null ? "Optional" : "JSUndefinedOr"
switch wrappedType {
case .string, .int, .uint, .bool, .float, .double, .jsObject(nil), .jsValue,
case .string, .integer, .bool, .float, .double, .jsObject(nil), .jsValue,
.swiftStruct, .swiftHeapObject, .caseEnum, .associatedValueEnum, .rawValueEnum,
.array, .dictionary:
return "\(raw: typeName)<\(raw: wrappedType.swiftType)>.bridgeJSStackPop()"
Expand All @@ -789,7 +789,7 @@ struct StackCodegen {
varPrefix: String
) -> [CodeBlockItemSyntax] {
switch type {
case .string, .int, .uint, .bool, .float, .double, .jsValue,
case .string, .integer, .bool, .float, .double, .jsValue,
.jsObject(nil), .swiftHeapObject, .unsafePointer, .closure,
.caseEnum, .rawValueEnum, .associatedValueEnum, .swiftStruct, .nullable:
return ["\(raw: accessor).bridgeJSStackPush()"]
Expand Down Expand Up @@ -1425,8 +1425,7 @@ extension BridgeType {
var swiftType: String {
switch self {
case .bool: return "Bool"
case .int: return "Int"
case .uint: return "UInt"
case .integer(let t): return t.swiftTypeName
case .float: return "Float"
case .double: return "Double"
case .string: return "String"
Expand Down Expand Up @@ -1502,7 +1501,7 @@ extension BridgeType {
func liftParameterInfo() throws -> LiftingIntrinsicInfo {
switch self {
case .bool: return .bool
case .int, .uint: return .int
case .integer(let t): return LiftingIntrinsicInfo(parameters: [("value", t.wasmCoreType)])
case .float: return .float
case .double: return .double
case .string: return .string
Expand Down Expand Up @@ -1560,7 +1559,7 @@ extension BridgeType {
func loweringReturnInfo() throws -> LoweringIntrinsicInfo {
switch self {
case .bool: return .bool
case .int, .uint: return .int
case .integer(let t): return LoweringIntrinsicInfo(returnType: t.wasmCoreType)
case .float: return .float
case .double: return .double
case .string: return .string
Expand Down Expand Up @@ -1592,7 +1591,8 @@ extension SwiftEnumRawType {
var liftingIntrinsicInfo: BridgeType.LiftingIntrinsicInfo {
switch self {
case .bool: return .bool
case .int, .int32, .int64, .uint, .uint32, .uint64: return .int
case .integer(let integerType):
return .init(parameters: [("value", integerType.wasmCoreType)])
case .float: return .float
case .double: return .double
case .string: return .string
Expand All @@ -1602,7 +1602,8 @@ extension SwiftEnumRawType {
var loweringIntrinsicInfo: BridgeType.LoweringIntrinsicInfo {
switch self {
case .bool: return .bool
case .int, .int32, .int64, .uint, .uint32, .uint64: return .int
case .integer(let integerType):
return .init(returnType: integerType.wasmCoreType)
case .float: return .float
case .double: return .double
case .string: return .string
Expand Down
4 changes: 2 additions & 2 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ extension BridgeType {
func loweringParameterInfo(context: BridgeContext = .importTS) throws -> LoweringParameterInfo {
switch self {
case .bool: return .bool
case .int, .uint: return .int
case .integer(let t): return LoweringParameterInfo(loweredParameters: [("value", t.wasmCoreType)])
case .float: return .float
case .double: return .double
case .string: return .string
Expand Down Expand Up @@ -901,7 +901,7 @@ extension BridgeType {
) throws -> LiftingReturnInfo {
switch self {
case .bool: return .bool
case .int, .uint: return .int
case .integer(let t): return LiftingReturnInfo(valueToLift: t.wasmCoreType)
case .float: return .float
case .double: return .double
case .string: return .string
Expand Down
8 changes: 4 additions & 4 deletions Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ public final class SwiftToSkeleton {
}

private enum ExportSwiftConstants {
static let supportedRawTypes = SwiftEnumRawType.allCases.map { $0.rawValue }
static let supportedRawTypes = SwiftEnumRawType.supportedTypeNames
}

extension AttributeSyntax {
Expand Down Expand Up @@ -828,7 +828,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
let intValue = Int(intLiteral.literal.text)
{
let value = DefaultValue.int(isNegative ? -intValue : intValue)
if let type = type, !type.isCompatibleWith(.int) {
if let type = type, !type.isCompatibleWith(.integer(.int)) {
return nil
}
return value
Expand Down Expand Up @@ -1489,12 +1489,12 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
for enumCase in exportedEnum.cases {
for associatedValue in enumCase.associatedValues {
switch associatedValue.type {
case .string, .int, .float, .double, .bool, .caseEnum, .rawValueEnum,
case .string, .integer, .float, .double, .bool, .caseEnum, .rawValueEnum,
.swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array:
break
case .nullable(let wrappedType, _):
switch wrappedType {
case .string, .int, .float, .double, .bool, .caseEnum, .rawValueEnum,
case .string, .integer, .float, .double, .bool, .caseEnum, .rawValueEnum,
.swiftStruct, .swiftHeapObject, .jsObject, .associatedValueEnum, .array:
break
default:
Expand Down
15 changes: 13 additions & 2 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ public struct BridgeJSLink {
"let \(JSGlueVariableScope.reservedStorageToReturnOptionalHeapObject);",
"let \(JSGlueVariableScope.reservedStringStack) = [];",
"let \(JSGlueVariableScope.reservedI32Stack) = [];",
"let \(JSGlueVariableScope.reservedI64Stack) = [];",
"let \(JSGlueVariableScope.reservedF32Stack) = [];",
"let \(JSGlueVariableScope.reservedF64Stack) = [];",
"let \(JSGlueVariableScope.reservedPointerStack) = [];",
Expand Down Expand Up @@ -437,6 +438,16 @@ public struct BridgeJSLink {
printer.write("return \(JSGlueVariableScope.reservedPointerStack).pop();")
}
printer.write("}")
printer.write("bjs[\"swift_js_push_i64\"] = function(v) {")
printer.indent {
printer.write("\(JSGlueVariableScope.reservedI64Stack).push(v);")
}
printer.write("}")
printer.write("bjs[\"swift_js_pop_i64\"] = function() {")
printer.indent {
printer.write("return \(JSGlueVariableScope.reservedI64Stack).pop();")
}
printer.write("}")
if !allStructs.isEmpty {
for structDef in allStructs {
printer.write("bjs[\"swift_js_struct_lower_\(structDef.abiName)\"] = function(objectId) {")
Expand Down Expand Up @@ -3508,8 +3519,8 @@ extension BridgeType {
return "void"
case .string:
return "string"
case .int, .uint:
return "number"
case .integer(let t):
return t.tsTypeName
case .float:
return "number"
case .double:
Expand Down
Loading
Loading