Skip to content

Commit fc672e7

Browse files
krodakkrodak
authored
BridgeJS: Add JSTypedArray as a recognized BridgeJS type (#746)
BridgeJS: Add JSTypedArray convenience typealiases as recognized types Add JSInt8Array, JSUint8Array, JSInt16Array, JSUint16Array, JSInt32Array, JSUint32Array, JSFloat32Array, JSFloat64Array typealiases and pre-seed them in SwiftToSkeleton so BridgeJS recognizes them in @js signatures. Users can now write: @js func processData(_ data: JSUint8Array) -> JSUint8Array Generated TypeScript uses native typed array names: processData(data: Uint8Array): Uint8Array Bridging is reference-based (passes JSObject ID, no data copying). Follows the existing JSPromise pre-seeding pattern.
1 parent 0aeed7b commit fc672e7

15 files changed

Lines changed: 1144 additions & 0 deletions

File tree

‎Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ public final class SwiftToSkeleton {
4242
self.typeDeclResolver.addSourceFile(
4343
"""
4444
@JSClass struct JSPromise {}
45+
@JSClass struct JSInt8Array {}
46+
@JSClass struct JSUint8Array {}
47+
@JSClass struct JSInt16Array {}
48+
@JSClass struct JSUint16Array {}
49+
@JSClass struct JSInt32Array {}
50+
@JSClass struct JSUint32Array {}
51+
@JSClass struct JSFloat32Array {}
52+
@JSClass struct JSFloat64Array {}
4553
"""
4654
)
4755
}
@@ -128,11 +136,35 @@ public final class SwiftToSkeleton {
128136
)
129137
}
130138

139+
private static let jsTypedArrayTypealiasNames: [String: String] = [
140+
"Int8": "JSInt8Array",
141+
"UInt8": "JSUint8Array",
142+
"Int16": "JSInt16Array",
143+
"UInt16": "JSUint16Array",
144+
"Int32": "JSInt32Array",
145+
"UInt32": "JSUint32Array",
146+
"Float": "JSFloat32Array",
147+
"Float32": "JSFloat32Array",
148+
"Double": "JSFloat64Array",
149+
"Float64": "JSFloat64Array",
150+
]
151+
131152
func lookupType(for type: TypeSyntax, errors: inout [DiagnosticError]) -> BridgeType? {
132153
if let attributedType = type.as(AttributedTypeSyntax.self) {
133154
return lookupType(for: attributedType.baseType, errors: &errors)
134155
}
135156

157+
// JSTypedArray<T>
158+
if let identifierType = type.as(IdentifierTypeSyntax.self),
159+
identifierType.name.text == "JSTypedArray",
160+
let genericArgs = identifierType.genericArgumentClause?.arguments,
161+
genericArgs.count == 1,
162+
let elementName = genericArgs.first?.argument.as(IdentifierTypeSyntax.self)?.name.text,
163+
let typealiasName = Self.jsTypedArrayTypealiasNames[elementName]
164+
{
165+
return .jsObject(typealiasName)
166+
}
167+
136168
if let identifierType = type.as(IdentifierTypeSyntax.self),
137169
identifierType.name.text == "JSTypedClosure",
138170
let genericArgs = identifierType.genericArgumentClause?.arguments,

‎Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3632,6 +3632,9 @@ extension BridgeType {
36323632
case .bool:
36333633
return "boolean"
36343634
case .jsObject(let name):
3635+
if let name, let tsName = Self.jsTypedArrayTSNames[name] {
3636+
return tsName
3637+
}
36353638
return name ?? "any"
36363639
case .jsValue:
36373640
return "any"
@@ -3668,6 +3671,18 @@ extension BridgeType {
36683671
return "Record<string, \(valueType.tsType)>"
36693672
}
36703673
}
3674+
3675+
/// Maps JSTypedArray Swift typealias names to their JavaScript TypedArray constructor names.
3676+
private static let jsTypedArrayTSNames: [String: String] = [
3677+
"JSInt8Array": "Int8Array",
3678+
"JSUint8Array": "Uint8Array",
3679+
"JSInt16Array": "Int16Array",
3680+
"JSUint16Array": "Uint16Array",
3681+
"JSInt32Array": "Int32Array",
3682+
"JSUint32Array": "Uint32Array",
3683+
"JSFloat32Array": "Float32Array",
3684+
"JSFloat64Array": "Float64Array",
3685+
]
36713686
}
36723687

36733688
extension WasmCoreType {

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/JSTypedArrayTypes.swift‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import JavaScriptKit
2+
3+
// Using typealiases
4+
@JS func processBytes(_ data: JSUint8Array) -> JSUint8Array {
5+
return data
6+
}
7+
8+
@JS func processFloats(_ data: JSFloat32Array) -> JSFloat32Array {
9+
return data
10+
}
11+
12+
// Using generic form directly
13+
@JS func processGenericDoubles(_ data: JSTypedArray<Double>) -> JSTypedArray<Double> {
14+
return data
15+
}
16+
17+
@JS func processGenericInts(_ data: JSTypedArray<Int32>) -> JSTypedArray<Int32> {
18+
return data
19+
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.json‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
{
2+
"exported" : {
3+
"classes" : [
4+
5+
],
6+
"enums" : [
7+
8+
],
9+
"exposeToGlobal" : false,
10+
"functions" : [
11+
{
12+
"abiName" : "bjs_processBytes",
13+
"effects" : {
14+
"isAsync" : false,
15+
"isStatic" : false,
16+
"isThrows" : false
17+
},
18+
"name" : "processBytes",
19+
"parameters" : [
20+
{
21+
"label" : "_",
22+
"name" : "data",
23+
"type" : {
24+
"jsObject" : {
25+
"_0" : "JSUint8Array"
26+
}
27+
}
28+
}
29+
],
30+
"returnType" : {
31+
"jsObject" : {
32+
"_0" : "JSUint8Array"
33+
}
34+
}
35+
},
36+
{
37+
"abiName" : "bjs_processFloats",
38+
"effects" : {
39+
"isAsync" : false,
40+
"isStatic" : false,
41+
"isThrows" : false
42+
},
43+
"name" : "processFloats",
44+
"parameters" : [
45+
{
46+
"label" : "_",
47+
"name" : "data",
48+
"type" : {
49+
"jsObject" : {
50+
"_0" : "JSFloat32Array"
51+
}
52+
}
53+
}
54+
],
55+
"returnType" : {
56+
"jsObject" : {
57+
"_0" : "JSFloat32Array"
58+
}
59+
}
60+
},
61+
{
62+
"abiName" : "bjs_processGenericDoubles",
63+
"effects" : {
64+
"isAsync" : false,
65+
"isStatic" : false,
66+
"isThrows" : false
67+
},
68+
"name" : "processGenericDoubles",
69+
"parameters" : [
70+
{
71+
"label" : "_",
72+
"name" : "data",
73+
"type" : {
74+
"jsObject" : {
75+
"_0" : "JSFloat64Array"
76+
}
77+
}
78+
}
79+
],
80+
"returnType" : {
81+
"jsObject" : {
82+
"_0" : "JSFloat64Array"
83+
}
84+
}
85+
},
86+
{
87+
"abiName" : "bjs_processGenericInts",
88+
"effects" : {
89+
"isAsync" : false,
90+
"isStatic" : false,
91+
"isThrows" : false
92+
},
93+
"name" : "processGenericInts",
94+
"parameters" : [
95+
{
96+
"label" : "_",
97+
"name" : "data",
98+
"type" : {
99+
"jsObject" : {
100+
"_0" : "JSInt32Array"
101+
}
102+
}
103+
}
104+
],
105+
"returnType" : {
106+
"jsObject" : {
107+
"_0" : "JSInt32Array"
108+
}
109+
}
110+
}
111+
],
112+
"protocols" : [
113+
114+
],
115+
"structs" : [
116+
117+
]
118+
},
119+
"moduleName" : "TestModule",
120+
"usedExternalModules" : [
121+
122+
]
123+
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/JSTypedArrayTypes.swift‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
@_expose(wasm, "bjs_processBytes")
2+
@_cdecl("bjs_processBytes")
3+
public func _bjs_processBytes(_ data: Int32) -> Int32 {
4+
#if arch(wasm32)
5+
let ret = processBytes(_: JSUint8Array.bridgeJSLiftParameter(data))
6+
return ret.bridgeJSLowerReturn()
7+
#else
8+
fatalError("Only available on WebAssembly")
9+
#endif
10+
}
11+
12+
@_expose(wasm, "bjs_processFloats")
13+
@_cdecl("bjs_processFloats")
14+
public func _bjs_processFloats(_ data: Int32) -> Int32 {
15+
#if arch(wasm32)
16+
let ret = processFloats(_: JSFloat32Array.bridgeJSLiftParameter(data))
17+
return ret.bridgeJSLowerReturn()
18+
#else
19+
fatalError("Only available on WebAssembly")
20+
#endif
21+
}
22+
23+
@_expose(wasm, "bjs_processGenericDoubles")
24+
@_cdecl("bjs_processGenericDoubles")
25+
public func _bjs_processGenericDoubles(_ data: Int32) -> Int32 {
26+
#if arch(wasm32)
27+
let ret = processGenericDoubles(_: JSFloat64Array.bridgeJSLiftParameter(data))
28+
return ret.bridgeJSLowerReturn()
29+
#else
30+
fatalError("Only available on WebAssembly")
31+
#endif
32+
}
33+
34+
@_expose(wasm, "bjs_processGenericInts")
35+
@_cdecl("bjs_processGenericInts")
36+
public func _bjs_processGenericInts(_ data: Int32) -> Int32 {
37+
#if arch(wasm32)
38+
let ret = processGenericInts(_: JSInt32Array.bridgeJSLiftParameter(data))
39+
return ret.bridgeJSLowerReturn()
40+
#else
41+
fatalError("Only available on WebAssembly")
42+
#endif
43+
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/JSTypedArrayTypes.d.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// NOTICE: This is auto-generated code by BridgeJS from JavaScriptKit,
2+
// DO NOT EDIT.
3+
//
4+
// To update this file, just rebuild your project or run
5+
// `swift package bridge-js`.
6+
7+
export type Exports = {
8+
processBytes(data: Uint8Array): Uint8Array;
9+
processFloats(data: Float32Array): Float32Array;
10+
processGenericDoubles(data: Float64Array): Float64Array;
11+
processGenericInts(data: Int32Array): Int32Array;
12+
}
13+
export type Imports = {
14+
}
15+
export function createInstantiator(options: {
16+
imports: Imports;
17+
}, swift: any): Promise<{
18+
addImports: (importObject: WebAssembly.Imports) => void;
19+
setInstance: (instance: WebAssembly.Instance) => void;
20+
createExports: (instance: WebAssembly.Instance) => Exports;
21+
}>;

0 commit comments

Comments
 (0)