Update to JavaScriptKit 0.9, add Global helpers

Author: MaxDesiatov

Package.resolved

@@ -6,14 +6,24 @@ import PackageDescription
 let package = Package(
     name: "DOMKit",
     products: [
+        .executable(
+            name: "DOMKitDemo",
+            targets: ["DOMKitDemo"]),
         .library(
             name: "DOMKit",
             targets: ["DOMKit"]),
     ],
     dependencies: [
-        .package(name: "JavaScriptKit", url: "https://github.com/j-f1/forked-JavaScriptKit.git", .revision("4429d88")),
+        .package(
+            name: "JavaScriptKit",
+            url: "https://github.com/swiftwasm/JavaScriptKit.git",
+            .upToNextMinor(from: "0.9.0")),
     ],
     targets: [
+        .target(
+            name: "DOMKitDemo",
+            dependencies: ["DOMKit"]
+        ),
         .target(
             name: "DOMKit",
             dependencies: ["JavaScriptKit"]),

Package.swift

@@ -29,7 +29,7 @@ public class ArrayBuffer: JSBridgedClass {
         self.init(unsafelyWrapping: Self.constructor.new( length))
     }
 
-    public static func isView(_ object: JSValueCodable) -> Bool {
-        return JSObject.global.ArrayBuffer.object!.isView!(object).fromJSValue()!
+    public static func isView(_ object: JSValueCompatible) -> Bool {
+        JSObject.global.ArrayBuffer.object!.isView!(object).fromJSValue()!
     }
 }

Sources/DOMKit/ECMAScript/ArrayBuffer.swift

@@ -4,18 +4,29 @@
 
 import JavaScriptKit
 
-public class Promise<Type>: JSBridgedClass {
+public class Global {
+    public let jsObject = JSObject.global
+    public let document: Document
 
-    public static var constructor: JSFunction { JSObject.global.Promise.function! }
-
-    public let jsObject: JSObject
+    init() {
+         document = Document(unsafelyWrapping: jsObject.document.object!)
+    }
+}
 
-    public required init(unsafelyWrapping jsObject: JSObject) {
+public extension Document {
+    var body: HTMLElement {
+        .init(unsafelyWrapping: jsObject.body.object!)
+    }
+}
 
-        self.jsObject = jsObject
+public extension HTMLElement {
+    convenience init?(from element: Element) {
+        self.init(from: .object(element.jsObject))
     }
 }
 
+public let global = Global()
+
 public class ReadableStream: JSBridgedClass {
 
     public static var constructor: JSFunction { JSObject.global.ReadableStream.function! }
@@ -32,7 +43,7 @@ public class ReadableStream: JSBridgedClass {
     }
 }
 
-@propertyWrapper public struct ClosureHandler<ArgumentType: JSValueCodable, ReturnType: JSValueCodable> {
+@propertyWrapper public struct ClosureHandler<ArgumentType: JSValueCompatible, ReturnType: JSValueCompatible> {
 
     let jsObject: JSObject
     let name: String
@@ -52,7 +63,7 @@ public class ReadableStream: JSBridgedClass {
     }
 }
 
-@propertyWrapper public struct OptionalClosureHandler<ArgumentType: JSValueCodable, ReturnType: JSValueCodable> {
+@propertyWrapper public struct OptionalClosureHandler<ArgumentType: JSValueCompatible, ReturnType: JSValueCompatible> {
 
     let jsObject: JSObject
     let name: String
@@ -79,7 +90,7 @@ public class ReadableStream: JSBridgedClass {
     }
 }
 
-@propertyWrapper public struct ReadWriteAttribute<Wrapped: JSValueCodable> {
+@propertyWrapper public struct ReadWriteAttribute<Wrapped: JSValueCompatible> {
 
     let jsObject: JSObject
     let name: String
@@ -99,7 +110,7 @@ public class ReadableStream: JSBridgedClass {
     }
 }
 
-@propertyWrapper public struct ReadonlyAttribute<Wrapped: JSValueConstructible> {
+@propertyWrapper public struct ReadonlyAttribute<Wrapped: ConstructibleFromJSValue> {
 
     let jsObject: JSObject
     let name: String
@@ -116,7 +127,7 @@ public class ReadableStream: JSBridgedClass {
     }
 }
 
-public class ValueIterableIterator<SequenceType: JSBridgedClass & Sequence>: IteratorProtocol where SequenceType.Element: JSValueConstructible {
+public class ValueIterableIterator<SequenceType: JSBridgedClass & Sequence>: IteratorProtocol where SequenceType.Element: ConstructibleFromJSValue {
 
     private var index: Int = 0
     private let sequence: SequenceType
@@ -142,7 +153,7 @@ public protocol KeyValueSequence: Sequence where Element == (String, Value) {
     associatedtype Value
 }
 
-public class PairIterableIterator<SequenceType: JSBridgedClass & KeyValueSequence>: IteratorProtocol where SequenceType.Value: JSValueConstructible {
+public class PairIterableIterator<SequenceType: JSBridgedClass & KeyValueSequence>: IteratorProtocol where SequenceType.Value: ConstructibleFromJSValue {
 
     private let iterator: JSObject
     private let sequence: SequenceType

Sources/DOMKit/ECMAScript/Support.swift

@@ -50,11 +50,11 @@ public class Blob: JSBridgedClass {
         return jsObject.stream!().fromJSValue()!
     }
 
-    public func text() -> Promise<String> {
+    public func text() -> JSPromise<String, JSError> {
         return jsObject.text!().fromJSValue()!
     }
 
-    public func arrayBuffer() -> Promise<ArrayBuffer> {
+    public func arrayBuffer() -> JSPromise<ArrayBuffer, JSError> {
         return jsObject.arrayBuffer!().fromJSValue()!
     }
 }

Sources/DOMKit/WebIDL/Blob.swift

@@ -0,0 +1,10 @@
+import JavaScriptKit
+import DOMKit
+
+let document = global.document
+
+let header = HTMLElement(from: document.createElement(localName: "h1"))!
+header.innerText = "Hello World!"
+_ = document.body.appendChild(node: header)
+
+console.log(data: "Hello, world!")