Make JS{Array,Date,Error} conform to JSBridgedClass

Author: j-f1

Sources/JavaScriptKit/BasicObjects/JSArray.swift

@@ -1,48 +1,56 @@
-public class JSArray {
-    static let classObject = JSObject.global.Array.function!
+public class JSArray: JSBridgedClass {
+    public static let constructor = JSObject.global.Array.function!
 
     static func isArray(_ object: JSObject) -> Bool {
-        classObject.isArray!(object).boolean!
+        constructor.isArray!(object).boolean!
     }
 
-    let ref: JSObject
+    public let jsObject: JSObject
 
-    public init?(_ ref: JSObject) {
-        guard Self.isArray(ref) else { return nil }
-        self.ref = ref
+    public required convenience init?(from value: JSValue) {
+        guard let object = value.object else { return nil }
+        self.init(object)
+    }
+
+    public convenience init?(_ jsObject: JSObject) {
+        guard Self.isArray(jsObject) else { return nil }
+        self.init(withCompatibleObject: jsObject)
+    }
+    public required init(withCompatibleObject jsObject: JSObject) {
+        self.jsObject = jsObject
     }
 }
 
 extension JSArray: RandomAccessCollection {
     public typealias Element = JSValue
 
     public func makeIterator() -> Iterator {
-        Iterator(ref: ref)
+        Iterator(jsObject: jsObject)
     }
 
     public class Iterator: IteratorProtocol {
-        let ref: JSObject
+        let jsObject: JSObject
         var index = 0
-        init(ref: JSObject) {
-            self.ref = ref
+        init(jsObject: JSObject) {
+            self.jsObject = jsObject
         }
 
         public func next() -> Element? {
             let currentIndex = index
-            guard currentIndex < Int(ref.length.number!) else {
+            guard currentIndex < Int(jsObject.length.number!) else {
                 return nil
             }
             index += 1
-            guard ref.hasOwnProperty!(currentIndex).boolean! else {
+            guard jsObject.hasOwnProperty!(currentIndex).boolean! else {
                 return next()
             }
-            let value = ref[currentIndex]
+            let value = jsObject[currentIndex]
             return value
         }
     }
 
     public subscript(position: Int) -> JSValue {
-        ref[position]
+        jsObject[position]
     }
 
     public var startIndex: Int { 0 }
@@ -62,14 +70,14 @@ extension JSArray: RandomAccessCollection {
     /// array.count  // 2
     /// ```
     public var length: Int {
-        return Int(ref.length.number!)
+        Int(jsObject.length.number!)
     }
 
     /// The number of elements in that array **not** including empty hole.
     /// Note that `count` syncs with the number that `Iterator` can iterate.
     /// See also: `JSArray.length`
     public var count: Int {
-        return getObjectValuesLength(ref)
+        getObjectValuesLength(jsObject)
     }
 }
 

Sources/JavaScriptKit/BasicObjects/JSDate.swift

@@ -6,9 +6,9 @@ in the naming. Parts of the JavaScript `Date` API that are not consistent across
 implementations are not exposed in a type-safe manner, you should access the underlying `jsObject`
 property if you need those.
 */
-public final class JSDate {
+public final class JSDate: JSBridgedClass {
     /// The constructor function used to create new `Date` objects.
-    private static let constructor = JSObject.global.Date.function!
+    public static let constructor = JSObject.global.Date.function!
 
     /// The underlying JavaScript `Date` object.
     public let jsObject: JSObject
@@ -39,6 +39,10 @@ public final class JSDate {
         jsObject = Self.constructor.new(year, monthIndex, day, hours, minutes, seconds, milliseconds)
     }
 
+    public init(withCompatibleObject jsObject: JSObject) {
+        self.jsObject = jsObject
+    }
+
     /// Year of this date in local time zone.
     public var fullYear: Int {
         get {

Sources/JavaScriptKit/BasicObjects/JSError.swift

@@ -2,9 +2,9 @@
 class](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error) that
 exposes its properties in a type-safe way.
 */
-public final class JSError: Error {
+public final class JSError: Error, JSBridgedClass {
     /// The constructor function used to create new `Error` objects.
-    private static let constructor = JSObject.global.Error.function!
+    public static let constructor = JSObject.global.Error.function!
 
     /// The underlying JavaScript `Error` object.
     public let jsObject: JSObject
@@ -14,6 +14,10 @@ public final class JSError: Error {
         jsObject = Self.constructor.new([message])
     }
 
+    public init(withCompatibleObject jsObject: JSObject) {
+        self.jsObject = jsObject
+    }
+
     /// The error message of the underlying `Error` object.
     public var message: String {
         jsObject.message.string!

Sources/JavaScriptKit/BasicObjects/JSTypedArray.swift

@@ -10,23 +10,23 @@ public protocol TypedArrayElement: JSValueConvertible, JSValueConstructible {
 }
 
 public class JSTypedArray<Element>: JSBridgedClass, ExpressibleByArrayLiteral where Element: TypedArrayElement {
-    public static var classRef: JSFunction { Element.typedArrayClass }
-    public var objectRef: JSObject
+    public static var constructor: JSFunction { Element.typedArrayClass }
+    public var jsObject: JSObject
     public subscript(_ index: Int) -> Element {
         get {
-            return Element.construct(from: objectRef[index])!
+            return Element.construct(from: jsObject[index])!
         }
         set {
-            self.objectRef[index] = newValue.jsValue()
+            self.jsObject[index] = newValue.jsValue()
         }
     }
 
     public init(length: Int) {
-        objectRef = Element.typedArrayClass.new(length)
+        jsObject = Element.typedArrayClass.new(length)
     }
 
     required public init(withCompatibleObject jsObject: JSObject) {
-        objectRef = jsObject
+        self.jsObject = jsObject
     }
 
     required public convenience init(arrayLiteral elements: Element...) {

Sources/JavaScriptKit/JSBridgedType.swift

@@ -17,15 +17,15 @@ extension JSBridgedType {
 
 
 public protocol JSBridgedClass: JSBridgedType {
-    static var classRef: JSFunction { get }
-    var objectRef: JSObject { get }
-    init(withCompatibleObject objectRef: JSObject)
+    static var constructor: JSFunction { get }
+    var jsObject: JSObject { get }
+    init(withCompatibleObject jsObject: JSObject)
 }
 
 extension JSBridgedClass {
-    public var value: JSValue { objectRef.jsValue() }
+    public var value: JSValue { jsObject.jsValue() }
     public init?(from value: JSValue) {
-        guard let object = value.object, object.isInstanceOf(Self.classRef) else { return nil }
+        guard let object = value.object, object.isInstanceOf(Self.constructor) else { return nil }
         self.init(withCompatibleObject: object)
     }
 }

Sources/JavaScriptKit/Support.swift

@@ -50,7 +50,7 @@ public func staticCast<Type: JSBridgedType>(_ ref: JSBridgedType) -> Type? {
 }
 
 public func dynamicCast<Type: JSBridgedClass>(_ ref: JSBridgedClass) -> Type? {
-    guard ref.objectRef.isInstanceOf(Type.classRef) else {
+    guard ref.jsObject.isInstanceOf(Type.constructor) else {
         return nil
     }
     return staticCast(ref)