Skip to content
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

Gracefully handle unavailable APIs #41

Merged
merged 3 commits into from
May 21, 2022
Merged

Gracefully handle unavailable APIs #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a5e1c7
Gracefully handle unavailable APIs
MaxDesiatov May 4, 2022
ccb3373
Update `Package.resolved`
MaxDesiatov May 12, 2022
4781cb3
Use JSKit 0.15.0
MaxDesiatov May 19, 2022
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
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/swiftwasm/JavaScriptKit.git",
"state": {
"branch": null,
"revision": "95d0c4cd78b48ffc7e19c618d57c3244917be09a",
"version": null
"revision": "2d7bc960eed438dce7355710ece43fa004bbb3ac",
"version": "0.15.0"
}
}
]
Expand Down
9 changes: 7 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let package = Package(
dependencies: [
.package(
url: "https://github.com/swiftwasm/JavaScriptKit.git",
.revision("95d0c4cd78b48ffc7e19c618d57c3244917be09a")
from: "0.15.0"
),
],
targets: [
Expand All @@ -30,7 +30,12 @@ let package = Package(
),
.target(
name: "WebAPIKit",
dependencies: ["ECMAScript", "JavaScriptKit", .product(name: "JavaScriptEventLoop", package: "JavaScriptKit")]
dependencies: [
"ECMAScript",
"JavaScriptKit",
.product(name: "JavaScriptEventLoop", package: "JavaScriptKit"),
.product(name: "JavaScriptBigIntSupport", package: "JavaScriptKit"),
]
),
// This support library should be moved to JavaScriptKit
.target(name: "ECMAScript", dependencies: [
Expand Down
20 changes: 11 additions & 9 deletions Sources/ECMAScript/ArrayBuffer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public typealias Float32Array = JSTypedArray<Float32>
public typealias Float64Array = JSTypedArray<Float64>

public class ArrayBuffer: JSBridgedClass {
public class var constructor: JSFunction { JSObject.global.ArrayBuffer.function! }
public class var constructor: JSFunction? { JSObject.global.ArrayBuffer.function }

public let jsObject: JSObject

Expand All @@ -24,32 +24,34 @@ public class ArrayBuffer: JSBridgedClass {
}

public convenience init(length: Int) {
self.init(unsafelyWrapping: Self.constructor.new(length))
self.init(unsafelyWrapping: Self.constructor!.new(length))
}

@inlinable
public static func isView(_ object: JSValueCompatible) -> Bool {
JSObject.global.ArrayBuffer.object!.isView!(object).fromJSValue()!
}
}

public extension JSTypedArray {
convenience init(_ arrayBuffer: ArrayBuffer) {
self.init(unsafelyWrapping: Self.constructor.new(arrayBuffer))
self.init(unsafelyWrapping: Self.constructor!.new(arrayBuffer))
}

@inlinable
var buffer: ArrayBuffer {
ArrayBuffer(unsafelyWrapping: jsObject.buffer.object!)
}
}

#if canImport(Foundation)
import Foundation
import Foundation

public extension Data {
init(_ arrayBuffer: ArrayBuffer) {
self = JSTypedArray<UInt8>(arrayBuffer).withUnsafeBytes {
Data(buffer: $0)
public extension Data {
init(_ arrayBuffer: ArrayBuffer) {
self = JSTypedArray<UInt8>(arrayBuffer).withUnsafeBytes {
Data(buffer: $0)
}
}
}
}
#endif
8 changes: 4 additions & 4 deletions Sources/ECMAScript/DataView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import JavaScriptKit

public class DataView: JSBridgedClass {
public class var constructor: JSFunction { JSObject.global.DataView.function! }
public class var constructor: JSFunction? { JSObject.global.DataView.function }

public let jsObject: JSObject

Expand All @@ -17,15 +17,15 @@ public class DataView: JSBridgedClass {
}

public convenience init(buffer: ArrayBuffer) {
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue))
self.init(unsafelyWrapping: DataView.constructor!.new(buffer.jsValue))
}

public convenience init(buffer: ArrayBuffer, byteOffset: UInt32) {
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue, byteOffset.jsValue))
self.init(unsafelyWrapping: DataView.constructor!.new(buffer.jsValue, byteOffset.jsValue))
}

public convenience init(buffer: ArrayBuffer, byteOffset: UInt32, byteLength: UInt32) {
self.init(unsafelyWrapping: DataView.constructor.new(buffer.jsValue, byteOffset.jsValue, byteLength.jsValue))
self.init(unsafelyWrapping: DataView.constructor!.new(buffer.jsValue, byteOffset.jsValue, byteLength.jsValue))
}

@ReadonlyAttribute
Expand Down
Loading