GoodNotes
diff --git a/‎Sources/JavaScriptKit/JSFunction.swift‎
Lines changed: 5 additions & 10 deletions b/‎Sources/JavaScriptKit/JSFunction.swift‎
Lines changed: 5 additions & 10 deletions
diff --git a/‎Sources/JavaScriptKit/JSObject.swift‎
Lines changed: 4 additions & 0 deletions b/‎Sources/JavaScriptKit/JSObject.swift‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎Sources/JavaScriptKit/JSValueConvertible.swift‎
Lines changed: 2 additions & 5 deletions b/‎Sources/JavaScriptKit/JSValueConvertible.swift‎
Lines changed: 2 additions & 5 deletions
@@ -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)
+    }
 }
 
 
 
@@ -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)
+    }
 }
@@ -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!
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,8 @@ public class JSObjectRef: Equatable {`
`49`	`49`	`public static func == (lhs: JSObjectRef, rhs: JSObjectRef) -> Bool {`
`50`	`50`	`return lhs.id == rhs.id`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ public func jsValue() -> JSValue {`
	`54`	`+ .object(self)`
	`55`	`+ }`
`52`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,8 @@ extension String: JSValueConvertible {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`extension JSObjectRef: JSValueConvertible {`
`24`		`- public func jsValue() -> JSValue { .object(self) }`
`25`		`-}`
`26`		`-`
`27`		`-extension JSFunctionRef: JSValueConvertible {`
`28`		`- public func jsValue() -> JSValue { .function(self) }`
	`24`	+ // `JSObjectRef.jsValue` is defined in JSObjectRef.swift to be able to overridden
	`25`	+ // from `JSFunctionRef`
`29`	`26`	`}`
`30`	`27`
`31`	`28`	`private let Object = JSObjectRef.global.Object.function!`