Move & rename JS*BridgedType

Author: j-f1

Sources/JavaScriptKit/JSBridgedType.swift

@@ -0,0 +1,46 @@
+// Use this protocol when your type has no single JavaScript class.
+// For example, a union type of multiple classes.
+public protocol JSBridgedType: JSValueCodable, CustomStringConvertible {
+    var objectRef: JSObject { get }
+    init?(objectRef: JSObject)
+    static func canDecode(_ object: JSObject) -> Bool
+}
+
+extension JSBridgedType {
+    public static func construct(from value: JSValue) -> Self? {
+        guard let object = value.object, canDecode(object) else {
+            return nil
+        }
+        return Self.init(objectRef: object)
+    }
+
+    public func jsValue() -> JSValue {
+        .object(objectRef)
+    }
+
+    public var description: String {
+        return objectRef.toString!().fromJSValue()!
+    }
+}
+
+
+public protocol JSBridgedClass: JSBridgedType {
+    static var classRef: JSFunction { get }
+}
+
+extension JSBridgedClass {
+    public static func canDecode(from jsValue: JSValue) -> Bool {
+        jsValue.isInstanceOf(Self.classRef)
+    }
+}
+
+public func staticCast<Type: JSBridgedType>(_ ref: JSBridgedType) -> Type? {
+    return Type(objectRef: ref.objectRef)
+}
+
+public func dynamicCast<Type: JSBridgedClass>(_ ref: JSBridgedClass) -> Type? {
+    guard ref.objectRef.isInstanceOf(Type.classRef) else {
+        return nil
+    }
+    return staticCast(ref)
+}

Sources/JavaScriptKit/JSValueConvertible.swift

@@ -1,44 +1,11 @@
 import _CJavaScriptKit
 
-// Use this protocol when your type has no single JavaScript class.
-// For example, a union type of multiple classes.
-public protocol JSAbstractBridgedType: JSValueCodable, CustomStringConvertible {
-    var objectRef: JSObject { get }
-    init(objectRef: JSObject)
-}
-
-extension JSAbstractBridgedType {
-    public var description: String {
-        return objectRef.toString!().fromJSValue()!
-    }
-}
-
-public protocol JSBridgedType: JSAbstractBridgedType {
-    static var classRef: JSFunction { get }
-}
-
 public protocol JSValueConvertible {
     func jsValue() -> JSValue
 }
 
 public typealias JSValueCodable = JSValueConvertible & JSValueConstructible
 
-extension JSAbstractBridgedType {
-    public init(jsValue: JSValue) {
-        self.init(objectRef: jsValue.object!)
-    }
-
-    public func jsValue() -> JSValue {
-        .object(objectRef)
-    }
-}
-
-extension JSBridgedType {
-    public static func canDecode(from jsValue: JSValue) -> Bool {
-        jsValue.isInstanceOf(Self.classRef)
-    }
-}
-
 extension JSValue: JSValueCodable {
     public static func construct(from value: JSValue) -> Self? {
         return value

Sources/JavaScriptKit/Support.swift

@@ -44,14 +44,3 @@ public struct AnyJSValueCodable: JSValueCodable, ExpressibleByNilLiteral {
         self.jsValue().fromJSValue()
     }
 }
-
-public func staticCast<Type: JSAbstractBridgedType>(_ ref: JSAbstractBridgedType) -> Type {
-    return Type(objectRef: ref.objectRef)
-}
-
-public func dynamicCast<Type: JSBridgedType>(_ ref: JSBridgedType) -> Type? {
-    guard ref.objectRef.isInstanceOf(Type.classRef) else {
-        return nil
-    }
-    return staticCast(ref)
-}