More updates

j-f1 · Aug 4, 2020 · 000fe5b · 000fe5b
1 parent fca7080
commit 000fe5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Sources/JavaScriptKit/JSValueConvertible.swift b/Sources/JavaScriptKit/JSValueConvertible.swift
@@ -29,17 +29,19 @@ public protocol JSValueDecodable {
 
 public typealias JSValueCodable = JSValueEncodable & JSValueDecodable
 
-extension JSBridgedType {
-    public static func canDecode(from jsValue: JSValue) -> Bool {
-        jsValue.isInstanceOf(Self.classRef)
-    }
-
+extension JSAbstractBridgedType {
     public init(jsValue: JSValue) {
         self.init(objectRef: jsValue.object!)
     }
 
     public func jsValue() -> JSValue {
-        return JSValue.object(objectRef)
+        .object(objectRef)
+    }
+}
+
+extension JSBridgedType {
+    public static func canDecode(from jsValue: JSValue) -> Bool {
+        jsValue.isInstanceOf(Self.classRef)
     }
 }
 

diff --git a/Sources/JavaScriptKit/Support.swift b/Sources/JavaScriptKit/Support.swift
@@ -217,7 +217,7 @@ public struct AnyJSValueCodable: JSValueCodable, ExpressibleByNilLiteral {
     }
 }
 
-public func staticCast<Type: JSBridgedType>(_ ref: JSBridgedType) -> Type {
+public func staticCast<Type: JSAbstractBridgedType>(_ ref: JSAbstractBridgedType) -> Type {
     return Type(objectRef: ref.objectRef)
 }