Skip to content

Commit 6368606

Browse files
kateinoigakukunkateinoigakukun
committed
./Utilities/format.swift
1 parent 9f7e86c commit 6368606

File tree

63 files changed

+1359
-904
lines changed

Some content is hidden

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

63 files changed

+1359
-904
lines changed

Diff for: ‎Examples/ActorOnWebWorker/Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let package = Package(
66
name: "Example",
77
platforms: [.macOS("15"), .iOS("18"), .watchOS("11"), .tvOS("18"), .visionOS("2")],
88
dependencies: [
9-
.package(path: "../../"),
9+
.package(path: "../../")
1010
],
1111
targets: [
1212
.executableTarget(
@@ -15,6 +15,6 @@ let package = Package(
1515
.product(name: "JavaScriptKit", package: "JavaScriptKit"),
1616
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1717
]
18-
),
18+
)
1919
]
2020
)

Diff for: ‎Examples/ActorOnWebWorker/Sources/MyApp.swift

+31-26
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,21 @@ final class App {
144144
}
145145

146146
private func setupEventHandlers() {
147-
indexButton.onclick = .object(JSClosure { [weak self] _ in
148-
guard let self else { return .undefined }
149-
self.performIndex()
150-
return .undefined
151-
})
152-
153-
searchButton.onclick = .object(JSClosure { [weak self] _ in
154-
guard let self else { return .undefined }
155-
self.performSearch()
156-
return .undefined
157-
})
147+
indexButton.onclick = .object(
148+
JSClosure { [weak self] _ in
149+
guard let self else { return .undefined }
150+
self.performIndex()
151+
return .undefined
152+
}
153+
)
154+
155+
searchButton.onclick = .object(
156+
JSClosure { [weak self] _ in
157+
guard let self else { return .undefined }
158+
self.performSearch()
159+
return .undefined
160+
}
161+
)
158162
}
159163

160164
private func performIndex() {
@@ -221,7 +225,8 @@ final class App {
221225
"padding: 10px; margin: 5px 0; background: #f5f5f5; border-left: 3px solid blue;"
222226
)
223227
resultItem.innerHTML = .string(
224-
"<strong>Result \(index + 1):</strong> \(result.context)")
228+
"<strong>Result \(index + 1):</strong> \(result.context)"
229+
)
225230
_ = resultsElement.appendChild(resultItem)
226231
}
227232
}
@@ -245,18 +250,18 @@ final class App {
245250
}
246251

247252
#if canImport(wasi_pthread)
248-
import wasi_pthread
249-
import WASILibc
250-
251-
/// Trick to avoid blocking the main thread. pthread_mutex_lock function is used by
252-
/// the Swift concurrency runtime.
253-
@_cdecl("pthread_mutex_lock")
254-
func pthread_mutex_lock(_ mutex: UnsafeMutablePointer<pthread_mutex_t>) -> Int32 {
255-
// DO NOT BLOCK MAIN THREAD
256-
var ret: Int32
257-
repeat {
258-
ret = pthread_mutex_trylock(mutex)
259-
} while ret == EBUSY
260-
return ret
261-
}
253+
import wasi_pthread
254+
import WASILibc
255+
256+
/// Trick to avoid blocking the main thread. pthread_mutex_lock function is used by
257+
/// the Swift concurrency runtime.
258+
@_cdecl("pthread_mutex_lock")
259+
func pthread_mutex_lock(_ mutex: UnsafeMutablePointer<pthread_mutex_t>) -> Int32 {
260+
// DO NOT BLOCK MAIN THREAD
261+
var ret: Int32
262+
repeat {
263+
ret = pthread_mutex_trylock(mutex)
264+
} while ret == EBUSY
265+
return ret
266+
}
262267
#endif

Diff for: ‎Examples/Basic/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
name: "Basic",
1414
dependencies: [
1515
"JavaScriptKit",
16-
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit")
16+
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1717
]
1818
)
1919
],

Diff for: ‎Examples/Basic/Sources/main.swift

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import JavaScriptKit
21
import JavaScriptEventLoop
2+
import JavaScriptKit
33

44
let alert = JSObject.global.alert.function!
55
let document = JSObject.global.document
@@ -10,10 +10,12 @@ _ = document.body.appendChild(divElement)
1010

1111
var buttonElement = document.createElement("button")
1212
buttonElement.innerText = "Alert demo"
13-
buttonElement.onclick = .object(JSClosure { _ in
14-
alert("Swift is running on browser!")
15-
return .undefined
16-
})
13+
buttonElement.onclick = .object(
14+
JSClosure { _ in
15+
alert("Swift is running on browser!")
16+
return .undefined
17+
}
18+
)
1719

1820
_ = document.body.appendChild(buttonElement)
1921

@@ -30,19 +32,21 @@ struct Response: Decodable {
3032

3133
var asyncButtonElement = document.createElement("button")
3234
asyncButtonElement.innerText = "Fetch UUID demo"
33-
asyncButtonElement.onclick = .object(JSClosure { _ in
34-
Task {
35-
do {
36-
let response = try await fetch("https://httpbin.org/uuid").value
37-
let json = try await JSPromise(response.json().object!)!.value
38-
let parsedResponse = try JSValueDecoder().decode(Response.self, from: json)
39-
alert(parsedResponse.uuid)
40-
} catch {
41-
print(error)
35+
asyncButtonElement.onclick = .object(
36+
JSClosure { _ in
37+
Task {
38+
do {
39+
let response = try await fetch("https://httpbin.org/uuid").value
40+
let json = try await JSPromise(response.json().object!)!.value
41+
let parsedResponse = try JSValueDecoder().decode(Response.self, from: json)
42+
alert(parsedResponse.uuid)
43+
} catch {
44+
print(error)
45+
}
4246
}
43-
}
4447

45-
return .undefined
46-
})
48+
return .undefined
49+
}
50+
)
4751

4852
_ = document.body.appendChild(asyncButtonElement)

Diff for: ‎Examples/Embedded/Package.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ let package = Package(
66
name: "Embedded",
77
dependencies: [
88
.package(name: "JavaScriptKit", path: "../../"),
9-
.package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0")
9+
.package(url: "https://github.com/swiftwasm/swift-dlmalloc", branch: "0.1.0"),
1010
],
1111
targets: [
1212
.executableTarget(
1313
name: "EmbeddedApp",
1414
dependencies: [
1515
"JavaScriptKit",
16-
.product(name: "dlmalloc", package: "swift-dlmalloc")
16+
.product(name: "dlmalloc", package: "swift-dlmalloc"),
1717
],
1818
cSettings: [.unsafeFlags(["-fdeclspec"])],
1919
swiftSettings: [
@@ -28,7 +28,7 @@ let package = Package(
2828
.unsafeFlags([
2929
"-Xclang-linker", "-nostdlib",
3030
"-Xlinker", "--no-entry",
31-
"-Xlinker", "--export-if-defined=__main_argc_argv"
31+
"-Xlinker", "--export-if-defined=__main_argc_argv",
3232
])
3333
]
3434
)

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ _ = document.body.appendChild(divElement)
1313

1414
var buttonElement = document.createElement("button")
1515
buttonElement.innerText = "Click me"
16-
buttonElement.onclick = JSValue.object(JSClosure { _ in
17-
count += 1
18-
divElement.innerText = .string("Count \(count)")
19-
return .undefined
20-
})
16+
buttonElement.onclick = JSValue.object(
17+
JSClosure { _ in
18+
count += 1
19+
divElement.innerText = .string("Count \(count)")
20+
return .undefined
21+
}
22+
)
2123

2224
_ = document.body.appendChild(buttonElement)
2325

Diff for: ‎Examples/Multithreading/Package.swift

+5-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ let package = Package(
77
platforms: [.macOS("15"), .iOS("18"), .watchOS("11"), .tvOS("18"), .visionOS("2")],
88
dependencies: [
99
.package(path: "../../"),
10-
.package(url: "https://github.com/kateinoigakukun/chibi-ray", revision: "c8cab621a3338dd2f8e817d3785362409d3b8cf1"),
10+
.package(
11+
url: "https://github.com/kateinoigakukun/chibi-ray",
12+
revision: "c8cab621a3338dd2f8e817d3785362409d3b8cf1"
13+
),
1114
],
1215
targets: [
1316
.executableTarget(
@@ -17,6 +20,6 @@ let package = Package(
1720
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1821
.product(name: "ChibiRay", package: "chibi-ray"),
1922
]
20-
),
23+
)
2124
]
2225
)

Diff for: ‎Examples/Multithreading/Sources/MyApp/Scene.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func createDemoScene(size: Int) -> Scene {
6060
surface: .diffuse
6161
)
6262
)
63-
)
63+
),
6464
],
6565
lights: [
6666
.spherical(
@@ -83,7 +83,7 @@ func createDemoScene(size: Int) -> Scene {
8383
color: Color(red: 0.8, green: 0.8, blue: 0.8),
8484
intensity: 0.2
8585
)
86-
)
86+
),
8787
],
8888
shadowBias: 1e-13,
8989
maxRecursionDepth: 10

Diff for: ‎Examples/Multithreading/Sources/MyApp/main.swift

+35-18
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import ChibiRay
2-
import JavaScriptKit
32
import JavaScriptEventLoop
3+
import JavaScriptKit
44

55
JavaScriptEventLoop.installGlobalExecutor()
66
WebWorkerTaskExecutor.installGlobalExecutor()
77

88
func renderInCanvas(ctx: JSObject, image: ImageView) {
99
let imageData = ctx.createImageData!(image.width, image.height).object!
1010
let data = imageData.data.object!
11-
11+
1212
for y in 0..<image.height {
1313
for x in 0..<image.width {
1414
let index = (y * image.width + x) * 4
1515
let pixel = image[x, y]
16-
data[index] = .number(Double(pixel.red * 255))
16+
data[index] = .number(Double(pixel.red * 255))
1717
data[index + 1] = .number(Double(pixel.green * 255))
1818
data[index + 2] = .number(Double(pixel.blue * 255))
1919
data[index + 3] = .number(Double(255))
@@ -57,7 +57,13 @@ struct Work: Sendable {
5757
}
5858
}
5959

60-
func render(scene: Scene, ctx: JSObject, renderTimeElement: JSObject, concurrency: Int, executor: (some TaskExecutor)?) async {
60+
func render(
61+
scene: Scene,
62+
ctx: JSObject,
63+
renderTimeElement: JSObject,
64+
concurrency: Int,
65+
executor: (some TaskExecutor)?
66+
) async {
6167

6268
let imageBuffer = UnsafeMutableBufferPointer<Color>.allocate(capacity: scene.width * scene.height)
6369
// Initialize the buffer with black color
@@ -73,12 +79,15 @@ func render(scene: Scene, ctx: JSObject, renderTimeElement: JSObject, concurrenc
7379
}
7480

7581
var checkTimer: JSValue?
76-
checkTimer = JSObject.global.setInterval!(JSClosure { _ in
77-
print("Checking thread work...")
78-
renderInCanvas(ctx: ctx, image: imageView)
79-
updateRenderTime()
80-
return .undefined
81-
}, 250)
82+
checkTimer = JSObject.global.setInterval!(
83+
JSClosure { _ in
84+
print("Checking thread work...")
85+
renderInCanvas(ctx: ctx, image: imageView)
86+
updateRenderTime()
87+
return .undefined
88+
},
89+
250
90+
)
8291

8392
await withTaskGroup(of: Void.self) { group in
8493
let yStride = scene.height / concurrency
@@ -117,10 +126,16 @@ func onClick() async throws {
117126

118127
let scene = createDemoScene(size: size)
119128
let executor = background ? try await WebWorkerTaskExecutor(numberOfThreads: concurrency) : nil
120-
canvasElement.width = .number(Double(scene.width))
129+
canvasElement.width = .number(Double(scene.width))
121130
canvasElement.height = .number(Double(scene.height))
122131

123-
await render(scene: scene, ctx: ctx, renderTimeElement: renderTimeElement, concurrency: concurrency, executor: executor)
132+
await render(
133+
scene: scene,
134+
ctx: ctx,
135+
renderTimeElement: renderTimeElement,
136+
concurrency: concurrency,
137+
executor: executor
138+
)
124139
executor?.terminate()
125140
print("Render done")
126141
}
@@ -130,19 +145,21 @@ func main() async throws {
130145
let concurrencyElement = JSObject.global.document.getElementById("concurrency").object!
131146
concurrencyElement.value = JSObject.global.navigator.hardwareConcurrency
132147

133-
_ = renderButtonElement.addEventListener!("click", JSClosure { _ in
134-
Task {
135-
try await onClick()
148+
_ = renderButtonElement.addEventListener!(
149+
"click",
150+
JSClosure { _ in
151+
Task {
152+
try await onClick()
153+
}
154+
return JSValue.undefined
136155
}
137-
return JSValue.undefined
138-
})
156+
)
139157
}
140158

141159
Task {
142160
try await main()
143161
}
144162

145-
146163
#if canImport(wasi_pthread)
147164
import wasi_pthread
148165
import WASILibc

Diff for: ‎Examples/OffscrenCanvas/Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let package = Package(
66
name: "Example",
77
platforms: [.macOS("15"), .iOS("18"), .watchOS("11"), .tvOS("18"), .visionOS("2")],
88
dependencies: [
9-
.package(path: "../../"),
9+
.package(path: "../../")
1010
],
1111
targets: [
1212
.executableTarget(
@@ -15,6 +15,6 @@ let package = Package(
1515
.product(name: "JavaScriptKit", package: "JavaScriptKit"),
1616
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
1717
]
18-
),
18+
)
1919
]
2020
)

0 commit comments

Comments
 (0)