Update to new JSKit API, add support for callback interfaces

Author: j-f1

Package.resolved

@@ -11,7 +11,7 @@ let package = Package(
             targets: ["DOMKit"]),
     ],
     dependencies: [
-        .package(name: "JavaScriptKit", url: "https://github.com/j-f1/forked-JavaScriptKit.git", .revision("fa1a06d")),
+        .package(name: "JavaScriptKit", url: "https://github.com/j-f1/forked-JavaScriptKit.git", .revision("745bb00")),
     ],
     targets: [
         .target(

Package.swift

@@ -3,23 +3,33 @@
 //
 
 import JavaScriptKit
+import _CJavaScriptKit
 
-public class ArrayBuffer: JSBridgedType {
+public typealias Int8Array = JSTypedArray<Int8>
+public typealias Int16Array = JSTypedArray<Int16>
+public typealias Int32Array = JSTypedArray<Int32>
+public typealias Uint8Array = JSTypedArray<UInt8>
+public typealias Uint16Array = JSTypedArray<UInt16>
+public typealias Uint32Array = JSTypedArray<UInt32>
+//public typealias Uint8ClampedArray = JSTypedArray<Uint8Clamped>
+public typealias Float32Array = JSTypedArray<Float32>
+public typealias Float64Array = JSTypedArray<Float64>
+
+public class ArrayBuffer: JSBridgedClass {
 
     public class var classRef: JSFunctionRef { JSObjectRef.global.ArrayBuffer.function! }
 
     public let objectRef: JSObjectRef
 
-    public required init(objectRef: JSObjectRef) {
+    public required init(withCompatibleObject objectRef: JSObjectRef) {
         self.objectRef = objectRef
     }
 
     public convenience init(length: Int) {
-
-        self.init(objectRef: Self.classRef(new: length))
+        self.init(withCompatibleObject: Self.classRef.new( length))
     }
 
     public static func isView(_ object: AnyJSValueCodable) -> Bool {
-        return JSObjectRef.global.ArrayBuffer.object!.isView!(object).fromJSValue()
+        return JSObjectRef.global.ArrayBuffer.object!.isView!(object).fromJSValue()!
     }
 }

Sources/DOMKit/ECMAScript/ArrayBuffer.swift

@@ -4,13 +4,13 @@
 
 import JavaScriptKit
 
-public class DataView: JSBridgedType {
+public class DataView: JSBridgedClass {
 
     public class var classRef: JSFunctionRef { JSObjectRef.global.DataView.function! }
 
     public let objectRef: JSObjectRef
 
-    public required init(objectRef: JSObjectRef) {
+    public required init(withCompatibleObject objectRef: JSObjectRef) {
         _buffer = ReadonlyAttribute(objectRef: objectRef, name: "buffer")
         _byteOffset = ReadonlyAttribute(objectRef: objectRef, name: "byteOffset")
         _byteLength = ReadonlyAttribute(objectRef: objectRef, name: "byteLength")
@@ -19,17 +19,17 @@ public class DataView: JSBridgedType {
 
     public convenience init(buffer: ArrayBuffer) {
 
-        self.init(objectRef: DataView.classRef(new: JSValue(from: buffer)))
+        self.init(withCompatibleObject: DataView.classRef.new(buffer.jsValue()))
     }
 
     public convenience init(buffer: ArrayBuffer, byteOffset: UInt32) {
 
-        self.init(objectRef: DataView.classRef(new: JSValue(from: buffer), JSValue(from: byteOffset)))
+        self.init(withCompatibleObject: DataView.classRef.new(buffer.jsValue(), byteOffset.jsValue()))
     }
 
     public convenience init(buffer: ArrayBuffer, byteOffset: UInt32, byteLength: UInt32) {
 
-        self.init(objectRef: DataView.classRef(new: JSValue(from: buffer), JSValue(from: byteOffset), JSValue(from: byteLength)))
+        self.init(withCompatibleObject: DataView.classRef.new(buffer.jsValue(), byteOffset.jsValue(), byteLength.jsValue()))
     }
 
     @ReadonlyAttribute
@@ -44,128 +44,128 @@ public class DataView: JSBridgedType {
 
     public func getFloat32(byteOffset: UInt32) -> Float {
 
-        return objectRef.getFloat32!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getFloat32!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getFloat32(byteOffset: UInt32, littleEndian: Bool) -> Float {
 
-        return objectRef.getFloat32!(JSValue(from: byteOffset), JSValue(from: littleEndian)).fromJSValue()
+        return objectRef.getFloat32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
     }
 
     public func getFloat64(byteOffset: UInt32) -> Double {
 
-        return objectRef.getFloat64!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getFloat64!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getFloat64(byteOffset: UInt32, littleEndian: Bool) -> Double {
 
-        return objectRef.getFloat64!(JSValue(from: byteOffset), JSValue(from: littleEndian)).fromJSValue()
+        return objectRef.getFloat64!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
     }
 
     public func getUint8(byteOffset: UInt32) -> UInt8 {
 
-        return objectRef.getUint8!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getUint8!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getUint16(byteOffset: UInt32) -> UInt16 {
 
-        return objectRef.getUint16!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getUint16!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getUint16(byteOffset: UInt32, littleEndian: Bool) -> UInt16 {
 
-        return objectRef.getUint16!(JSValue(from: byteOffset), JSValue(from: littleEndian)).fromJSValue()
+        return objectRef.getUint16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
     }
 
     public func getUint32(byteOffset: UInt32) -> UInt32 {
 
-        return objectRef.getUint32!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getUint32!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getUint32(byteOffset: UInt32, littleEndian: Bool) -> UInt32 {
 
-        return objectRef.getUint32!(JSValue(from: byteOffset), JSValue(from: littleEndian)).fromJSValue()
+        return objectRef.getUint32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
     }
 
     public func getInt8(byteOffset: UInt32) -> Int8 {
 
-        return objectRef.getInt8!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getInt8!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getInt16(byteOffset: UInt32) -> Int16 {
 
-        return objectRef.getInt16!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getInt16!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getInt16(byteOffset: UInt32, littleEndian: Bool) -> Int16 {
 
-        return objectRef.getInt16!(JSValue(from: byteOffset), JSValue(from: littleEndian)).fromJSValue()
+        return objectRef.getInt16!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
     }
 
     public func getInt32(byteOffset: UInt32) -> Int32 {
 
-        return objectRef.getInt32!(JSValue(from: byteOffset)).fromJSValue()
+        return objectRef.getInt32!(byteOffset.jsValue()).fromJSValue()!
     }
 
     public func getInt32(byteOffset: UInt32, littleEndian: Bool) -> Int32 {
 
-        return objectRef.getInt32!(JSValue(from: byteOffset), JSValue(from: littleEndian)).fromJSValue()
+        return objectRef.getInt32!(byteOffset.jsValue(), littleEndian.jsValue()).fromJSValue()!
     }
 
     public func setUint8(byteOffset: UInt32, value: UInt8) {
-        _ = objectRef.setUint8!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setUint8!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setUint16(byteOffset: UInt32, value: UInt16) {
-        _ = objectRef.setUint16!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setUint16!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setUint16(byteOffset: UInt32, value: UInt16, littleEndian: Bool) {
-        _ = objectRef.setUint16!(JSValue(from: byteOffset), JSValue(from: value), JSValue(from: littleEndian))
+        _ = objectRef.setUint16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
     }
 
     public func setUint32(byteOffset: UInt32, value: UInt32) {
-        _ = objectRef.setUint32!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setUint32!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setUint32(byteOffset: UInt32, value: UInt32, littleEndian: Bool) {
-        _ = objectRef.setUint32!(JSValue(from: byteOffset), JSValue(from: value), JSValue(from: littleEndian))
+        _ = objectRef.setUint32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
     }
 
     public func setInt8(byteOffset: UInt32, value: Int8) {
-        _ = objectRef.setUint8!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setUint8!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setInt16(byteOffset: UInt32, value: Int16) {
-        _ = objectRef.setInt16!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setInt16!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setInt16(byteOffset: UInt32, value: Int16, littleEndian: Bool) {
-        _ = objectRef.setInt16!(JSValue(from: byteOffset), JSValue(from: value), JSValue(from: littleEndian))
+        _ = objectRef.setInt16!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
     }
 
     public func setInt32(byteOffset: UInt32, value: Int32) {
-        _ = objectRef.setInt32!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setInt32!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setInt32(byteOffset: UInt32, value: Int32, littleEndian: Bool) {
-        _ = objectRef.setInt32!(JSValue(from: byteOffset), JSValue(from: value), JSValue(from: littleEndian))
+        _ = objectRef.setInt32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
     }
 
     public func setFloat32(byteOffset: UInt32, value: Float) {
-        _ = objectRef.setFloat32!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setFloat32!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setFloat32(byteOffset: UInt32, value: Float, littleEndian: Bool) {
-        _ = objectRef.setFloat32!(JSValue(from: byteOffset), JSValue(from: value), JSValue(from: littleEndian))
+        _ = objectRef.setFloat32!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
     }
 
     public func setFloat64(byteOffset: UInt32, value: Double) {
-        _ = objectRef.setFloat64!(JSValue(from: byteOffset), JSValue(from: value))
+        _ = objectRef.setFloat64!(byteOffset.jsValue(), value.jsValue())
     }
 
     public func setFloat64(byteOffset: UInt32, value: Double, littleEndian: Bool) {
-        _ = objectRef.setFloat64!(JSValue(from: byteOffset), JSValue(from: value), JSValue(from: littleEndian))
+        _ = objectRef.setFloat64!(byteOffset.jsValue(), value.jsValue(), littleEndian.jsValue())
     }
 }
 

Sources/DOMKit/ECMAScript/DataView.swift

@@ -4,25 +4,25 @@
 
 import JavaScriptKit
 
-public class Date: JSBridgedType {
+public class Date: JSBridgedClass {
 
     public class var classRef: JSFunctionRef { JSObjectRef.global.Date.function! }
 
     public let objectRef: JSObjectRef
 
-    public required init(objectRef: JSObjectRef) {
+    public required init(withCompatibleObject objectRef: JSObjectRef) {
         self.objectRef = objectRef
     }
 
     public convenience init() {
-        self.init(objectRef: Date.classRef(.new))
+        self.init(withCompatibleObject: Date.classRef.new())
     }
 
     public func toDateString() -> String {
-        return objectRef.toDateString!().fromJSValue()
+        return objectRef.toDateString!().fromJSValue()!
     }
 
     public func getTime() -> Double {
-        return objectRef.getTime!().fromJSValue()
+        return objectRef.getTime!().fromJSValue()!
     }
 }