Skip to content

Commit f63bc56

Browse files
wfltaylorwfltaylor
committed
BridgeJS: Use @JS types from other modules in the same package
1 parent 8d279a0 commit f63bc56

84 files changed

Lines changed: 1386 additions & 176 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Benchmarks/Sources/Generated/JavaScript/BridgeJS.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3415,5 +3415,8 @@
34153415
}
34163416
]
34173417
},
3418-
"moduleName" : "Benchmarks"
3418+
"moduleName" : "Benchmarks",
3419+
"usedExternalModules" : [
3420+
3421+
]
34193422
}

‎Examples/MultiModule/Package.swift‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// swift-tools-version:6.0
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "MultiModule",
7+
platforms: [
8+
.macOS(.v14)
9+
],
10+
dependencies: [.package(name: "JavaScriptKit", path: "../../")],
11+
targets: [
12+
.target(
13+
name: "Core",
14+
dependencies: [
15+
"JavaScriptKit"
16+
],
17+
swiftSettings: [
18+
.enableExperimentalFeature("Extern")
19+
],
20+
plugins: [
21+
.plugin(name: "BridgeJS", package: "JavaScriptKit")
22+
]
23+
),
24+
.executableTarget(
25+
name: "MultiModule",
26+
dependencies: [
27+
"Core",
28+
"JavaScriptKit",
29+
],
30+
swiftSettings: [
31+
.enableExperimentalFeature("Extern")
32+
],
33+
plugins: [
34+
.plugin(name: "BridgeJS", package: "JavaScriptKit")
35+
]
36+
),
37+
]
38+
)

‎Examples/MultiModule/README.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# MultiModule Example
2+
3+
This example demonstrates using `@JS` types defined in one module (`Core`) from another module (`App`) within the same Swift package.
4+
5+
## Building and Running
6+
7+
1. Build the project:
8+
```sh
9+
swift package --swift-sdk $SWIFT_SDK_ID js --use-cdn
10+
```
11+
12+
2. Serve the files:
13+
```sh
14+
npx serve
15+
```
16+
17+
Then open your browser to `http://localhost:3000`.

‎Examples/MultiModule/Sources/Core/Vector3D.swift‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import JavaScriptKit
2+
3+
@JS public struct Vector3D {
4+
public let x: Double
5+
public let y: Double
6+
public let z: Double
7+
8+
@JS public init(x: Double, y: Double, z: Double) {
9+
self.x = x
10+
self.y = y
11+
self.z = z
12+
}
13+
14+
@JS public func magnitude() -> Double {
15+
(x * x + y * y + z * z).squareRoot()
16+
}
17+
}

‎Examples/MultiModule/Sources/Core/bridge-js.config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

‎Examples/MultiModule/Sources/MultiModule/main.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import Core
2+
import JavaScriptKit
3+
4+
@JS public func currentVelocity() -> Vector3D {
5+
Vector3D(x: 0.1, y: 0.2, z: 0.3)
6+
}

‎Examples/MultiModule/index.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<title>MultiModule Example</title>
6+
</head>
7+
8+
<body>
9+
<script type="module" src="index.js"></script>
10+
</body>
11+
12+
</html>

‎Examples/MultiModule/index.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { init } from "./.build/plugins/PackageToJS/outputs/Package/index.js";
2+
const { exports } = await init({});
3+
4+
const velocity = exports.currentVelocity();
5+
6+
const output = document.createElement("pre");
7+
output.innerText =
8+
`currentVelocity() = (${velocity.x}, ${velocity.y}, ${velocity.z})\n`
9+
+ `magnitude = ${velocity.magnitude()}`;
10+
document.body.appendChild(output);

‎Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/JavaScript/BridgeJS.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,5 +300,8 @@
300300
}
301301
]
302302
},
303-
"moduleName" : "PlayBridgeJS"
303+
"moduleName" : "PlayBridgeJS",
304+
"usedExternalModules" : [
305+
306+
]
304307
}

‎Examples/PlayBridgeJS/Sources/PlayBridgeJS/main.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ import class Foundation.JSONDecoder
4545
func _update(swiftSource: String, dtsSource: String) throws -> PlayBridgeJSOutput {
4646
let moduleName = "Playground"
4747

48-
let swiftToSkeleton = SwiftToSkeleton(progress: .silent, moduleName: moduleName, exposeToGlobal: false)
48+
let swiftToSkeleton = SwiftToSkeleton(
49+
progress: .silent,
50+
moduleName: moduleName,
51+
exposeToGlobal: false,
52+
externalModuleIndex: .empty
53+
)
4954
swiftToSkeleton.addSourceFile(Parser.parse(source: swiftSource), inputFilePath: "Playground.swift")
5055

5156
let ts2swift = try createTS2Swift()

0 commit comments

Comments
 (0)