Rename constructor

j-f1 · Aug 4, 2020 · 0906080 · 0906080
1 parent 6896e3a
commit 0906080
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Sources/JavaScriptKit/JSValueConvertible.swift b/Sources/JavaScriptKit/JSValueConvertible.swift
@@ -1,7 +1,7 @@
 import _CJavaScriptKit
 
 public protocol JSBridgedType: JSValueCodable, CustomStringConvertible {
-    static var constructor: JSFunctionRef? { get }
+    static var classRef: JSFunctionRef { get }
 
     var objectRef: JSObjectRef { get }
     init(objectRef: JSObjectRef)
@@ -27,11 +27,7 @@ public typealias JSValueCodable = JSValueEncodable & JSValueDecodable
 
 extension JSBridgedType {
     public static func canDecode(from jsValue: JSValue) -> Bool {
-        if let constructor = Self.constructor {
-            return jsValue.isInstanceOf(constructor)
-        } else {
-            return jsValue.isObject
-        }
+        jsValue.isInstanceOf(Self.classRef)
     }
 
     public init(jsValue: JSValue) {

diff --git a/Sources/JavaScriptKit/Support.swift b/Sources/JavaScriptKit/Support.swift
@@ -222,7 +222,7 @@ public func staticCast<Type: JSBridgedType>(_ ref: JSBridgedType) -> Type {
 }
 
 public func dynamicCast<Type: JSBridgedType>(_ ref: JSBridgedType) -> Type? {
-    guard let constructor = Type.constructor, ref.objectRef.isInstanceOf(constructor) else {
+    guard ref.objectRef.isInstanceOf(Type.classRef) else {
         return nil
     }
     return staticCast(ref)