Make JSFunctionRef inherit JSObjectRef

Author: kateinoigakukun

Diff for: Sources/JavaScriptKit/JSFunction.swift

@@ -1,16 +1,7 @@
 import _CJavaScriptKit
 
 @dynamicCallable
-public class JSFunctionRef: Equatable {
-    let id: UInt32
-
-    init(id: UInt32) {
-        self.id = id
-    }
-
-    public static func == (lhs: JSFunctionRef, rhs: JSFunctionRef) -> Bool {
-        return lhs.id == rhs.id
-    }
+public class JSFunctionRef: JSObjectRef {
 
     @discardableResult
     public func dynamicallyCall(withArguments arguments: [JSValueConvertible]) -> JSValue {
@@ -72,6 +63,10 @@ public class JSFunctionRef: Equatable {
 
         return JSFunctionRef(id: funcRef)
     }
+
+    public override func jsValue() -> JSValue {
+        .function(self)
+    }
 }
 
 

Diff for: Sources/JavaScriptKit/JSObject.swift

@@ -49,4 +49,8 @@ public class JSObjectRef: Equatable {
     public static func == (lhs: JSObjectRef, rhs: JSObjectRef) -> Bool {
         return lhs.id == rhs.id
     }
+
+    public func jsValue() -> JSValue {
+        .object(self)
+    }
 }

Diff for: Sources/JavaScriptKit/JSValueConvertible.swift

@@ -21,11 +21,8 @@ extension String: JSValueConvertible {
 }
 
 extension JSObjectRef: JSValueConvertible {
-    public func jsValue() -> JSValue { .object(self) }
-}
-
-extension JSFunctionRef: JSValueConvertible {
-    public func jsValue() -> JSValue { .function(self) }
+    // `JSObjectRef.jsValue` is defined in JSObjectRef.swift to be able to overridden
+    // from `JSFunctionRef`
 }
 
 private let Object = JSObjectRef.global.Object.function!