Skip to content

Commit 459d1e9

Browse files
authoredOct 14, 2024
Merge pull request #263 from sliemeobn/swift-embedded
Support for Embedded Swift (v2)
2 parents 6d4a114 + 69c58dd commit 459d1e9

29 files changed

+1675
-80
lines changed
 

Diff for: ‎Examples/Basic/Package.swift

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import PackageDescription
44

55
let package = Package(
66
name: "Basic",
7+
platforms: [
8+
.macOS(.v14)
9+
],
710
dependencies: [.package(name: "JavaScriptKit", path: "../../")],
811
targets: [
912
.executableTarget(

Diff for: ‎Examples/Basic/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
swift build --swift-sdk DEVELOPMENT-SNAPSHOT-2024-07-09-a-wasm32-unknown-wasi -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv
1+
swift build --swift-sdk DEVELOPMENT-SNAPSHOT-2024-09-20-a-wasm32-unknown-wasi -Xswiftc -Xclang-linker -Xswiftc -mexec-model=reactor -Xlinker --export=__main_argc_argv

Diff for: ‎Examples/Embedded/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.DS_Store
2+
/.build
3+
/Packages
4+
/*.xcodeproj
5+
xcuserdata/
6+
Package.resolved

Diff for: ‎Examples/Embedded/Package.swift

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// swift-tools-version:5.10
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "Embedded",
7+
dependencies: [
8+
.package(name: "JavaScriptKit", path: "../../"),
9+
.package(url: "https://github.com/swifweb/EmbeddedFoundation", branch: "0.1.0")
10+
],
11+
targets: [
12+
.executableTarget(
13+
name: "EmbeddedApp",
14+
dependencies: [
15+
"JavaScriptKit",
16+
.product(name: "Foundation", package: "EmbeddedFoundation")
17+
]
18+
)
19+
]
20+
)

Diff for: ‎Examples/Embedded/README.md

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Embedded example
2+
3+
Requires a recent DEVELOPMENT-SNAPSHOT toolchain. (tested with swift-DEVELOPMENT-SNAPSHOT-2024-09-25-a)
4+
5+
```sh
6+
$ ./build.sh
7+
$ npx serve
8+
```
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import JavaScriptKit
2+
3+
// NOTE: it seems the embedded tree shaker gets rid of these exports if they are not used somewhere
4+
func _i_need_to_be_here_for_wasm_exports_to_work() {
5+
_ = _swjs_library_features
6+
_ = _swjs_call_host_function
7+
_ = _swjs_free_host_function
8+
}
9+
10+
// TODO: why do I need this? and surely this is not ideal... figure this out, or at least have this come from a C lib
11+
@_cdecl("strlen")
12+
func strlen(_ s: UnsafePointer<Int8>) -> Int {
13+
var p = s
14+
while p.pointee != 0 {
15+
p += 1
16+
}
17+
return p - s
18+
}
19+
20+
// TODO: why do I need this? and surely this is not ideal... figure this out, or at least have this come from a C lib
21+
@_cdecl("memmove")
22+
func memmove(_ dest: UnsafeMutableRawPointer, _ src: UnsafeRawPointer, _ n: Int) -> UnsafeMutableRawPointer {
23+
let d = dest.assumingMemoryBound(to: UInt8.self)
24+
let s = src.assumingMemoryBound(to: UInt8.self)
25+
for i in 0..<n {
26+
d[i] = s[i]
27+
}
28+
return dest
29+
}

Diff for: ‎Examples/Embedded/Sources/EmbeddedApp/main.swift

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import JavaScriptKit
2+
3+
let alert = JSObject.global.alert.function!
4+
let document = JSObject.global.document
5+
6+
print("Hello from WASM, document title: \(document.title.string ?? "")")
7+
8+
var count = 0
9+
10+
var divElement = document.createElement("div")
11+
divElement.innerText = .string("Count \(count)")
12+
_ = document.body.appendChild(divElement)
13+
14+
var buttonElement = document.createElement("button")
15+
buttonElement.innerText = "Click me"
16+
buttonElement.onclick = JSValue.object(JSClosure { _ in
17+
count += 1
18+
divElement.innerText = .string("Count \(count)")
19+
return .undefined
20+
})
21+
22+
_ = document.body.appendChild(buttonElement)
23+
24+
func print(_ message: String) {
25+
_ = JSObject.global.console.log(message)
26+
}

Diff for: ‎Examples/Embedded/_Runtime/_bundling_does_not_work_with_embedded

Whitespace-only changes.

0 commit comments

Comments
 (0)