Remove JSFunctionRef.apply and JSFunctionRef.new

swiftwasm · kateinoigakukun · Aug 10, 2020 · Aug 3, 2020 · Aug 3, 2020 · Aug 3, 2020
commit 39b15f4c1a9aaaf23c5aaeee20e4640d590611d9
diff --git a/IntegrationTests/TestSuites/Sources/BenchmarkTests/main.swift b/IntegrationTests/TestSuites/Sources/BenchmarkTests/main.swift
@@ -25,7 +25,7 @@ let objectHeap = Benchmark("Object heap")
 
 let global = JSObjectRef.global
 let Object = global.Object.function!
-global.objectHeapDummy = .object(Object.new())
+global.objectHeapDummy = .object(Object(.new))
 objectHeap.testSuite("Increment and decrement RC") {
     for _ in 0 ..< 100 {
         _ = global.objectHeapDummy

diff --git a/IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift b/IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift
@@ -225,15 +225,15 @@ New_Object_Construction: do {
     // }
     // ```
     let objectConstructor = try expectFunction(getJSValue(this: .global, name: "Animal"))
-    let cat1 = objectConstructor.new("Tama", 3, true)
+    let cat1 = objectConstructor(new: "Tama", 3, true)
     try expectEqual(getJSValue(this: cat1, name: "name"), .string("Tama"))
     try expectEqual(getJSValue(this: cat1, name: "age"), .number(3))
     try expectEqual(JSObjectRef.instanceof(cat1, constructor: objectConstructor), true)
     try expectEqual(JSObjectRef.instanceof(cat1, constructor: try expectFunction(getJSValue(this: .global, name: "Array"))), false)
     let cat1Bark = try expectFunction(getJSValue(this: cat1, name: "bark"))
     try expectEqual(cat1Bark(), .string("nyan"))
 
-    let dog1 = objectConstructor.new("Pochi", 3, false)
+    let dog1 = objectConstructor(new: "Pochi", 3, false)
     let dog1Bark = try expectFunction(getJSValue(this: dog1, name: "bark"))
     try expectEqual(dog1Bark(), .string("wan"))
 } catch {
@@ -255,14 +255,14 @@ Call_Function_With_This: do {
     // }
     // ```
     let objectConstructor = try expectFunction(getJSValue(this: .global, name: "Animal"))
-    let cat1 = objectConstructor.new("Tama", 3, true)
+    let cat1 = objectConstructor(new: "Tama", 3, true)
     let getIsCat = try expectFunction(getJSValue(this: cat1, name: "getIsCat"))
 
     // Direct call without this
     try expectEqual(getIsCat(), .undefined)
 
     // Call with this
-    let gotIsCat = getIsCat.apply(this: cat1)
+    let gotIsCat = getIsCat(this: cat1)
     try expectEqual(gotIsCat, .boolean(true))
 
 } catch {

diff --git a/Sources/JavaScriptKit/JSFunction.swift b/Sources/JavaScriptKit/JSFunction.swift
@@ -1,45 +1,40 @@
 import _CJavaScriptKit
 
-@dynamicCallable
+public enum _JSFunctionConstructorSymbol {
+    case new
+}
+
 public class JSFunctionRef: JSObjectRef {
     @discardableResult
-    public func dynamicallyCall(withArguments arguments: [JSValueConvertible]) -> JSValue {
-        let result = arguments.withRawJSValues { rawValues -> RawJSValue in
+    public func callAsFunction(this: JSObjectRef? = nil, _ arguments: [JSValueConvertible]) -> JSValue {
+        let result = arguments.withRawJSValues { rawValues in
             rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
                 let argv = bufferPointer.baseAddress
                 let argc = bufferPointer.count
                 var result = RawJSValue()
-                _call_function(
-                    self.id, argv, Int32(argc),
-                    &result.kind, &result.payload1, &result.payload2, &result.payload3
-                )
+                if let thisId = this?.id {
+                    _call_function_with_this(thisId,
+                                             self.id, argv, Int32(argc),
+                                             &result.kind, &result.payload1, &result.payload2, &result.payload3)
+                } else {
+                    _call_function(
+                        self.id, argv, Int32(argc),
+                        &result.kind, &result.payload1, &result.payload2, &result.payload3
+                    )
+                }
                 return result
             }
         }
         return JSValue(from: result)
     }
 
-    public func apply(this: JSObjectRef, arguments: JSValueConvertible...) -> JSValue {
-        apply(this: this, argumentList: arguments)
-    }
-
-    public func apply(this: JSObjectRef, argumentList: [JSValueConvertible]) -> JSValue {
-        let result = argumentList.withRawJSValues { rawValues in
-            rawValues.withUnsafeBufferPointer { bufferPointer -> RawJSValue in
-                let argv = bufferPointer.baseAddress
-                let argc = bufferPointer.count
-                var result = RawJSValue()
-                _call_function_with_this(this.id,
-                                         self.id, argv, Int32(argc),
-                                         &result.kind, &result.payload1, &result.payload2, &result.payload3)
-                return result
-            }
-        }
-        return JSValue(from: result)
+    @discardableResult
+    public func callAsFunction(this: JSObjectRef? = nil, _ arguments: JSValueConvertible...) -> JSValue {
+        self(this: this, arguments)
     }
 
-    public func new(_ arguments: JSValueConvertible...) -> JSObjectRef {
-        return arguments.withRawJSValues { rawValues in
+    public func callAsFunction(new arguments: JSValueConvertible...) -> JSObjectRef {
+        arguments.withRawJSValues { rawValues in
             rawValues.withUnsafeBufferPointer { bufferPointer in
                 let argv = bufferPointer.baseAddress
                 let argc = bufferPointer.count
@@ -52,6 +47,11 @@ public class JSFunctionRef: JSObjectRef {
             }
         }
     }
+    public func callAsFunction(_: _JSFunctionConstructorSymbol) -> JSObjectRef {
+        var resultObj = JavaScriptObjectRef()
+        _call_new(self.id, nil, 0, &resultObj)
+        return JSObjectRef(id: resultObj)
+    }
 
     @available(*, unavailable, message: "Please use JSClosure instead")
     public static func from(_: @escaping ([JSValue]) -> JSValue) -> JSFunctionRef {

diff --git a/Sources/JavaScriptKit/JSObject.swift b/Sources/JavaScriptKit/JSObject.swift
@@ -11,7 +11,7 @@ public class JSObjectRef: Equatable {
     public subscript(dynamicMember name: String) -> ((JSValueConvertible...) -> JSValue)? {
         guard let function = self[name].function else { return nil }
         return { (arguments: JSValueConvertible...) in
-            function.apply(this: self, argumentList: arguments)
+            function(this: self, arguments)
         }
     }
 

diff --git a/Sources/JavaScriptKit/JSValueConvertible.swift b/Sources/JavaScriptKit/JSValueConvertible.swift
@@ -70,7 +70,7 @@ extension Dictionary where Value: JSValueConvertible, Key == String {
 
 extension Dictionary: JSValueConvertible where Value == JSValueConvertible, Key == String {
     public subscript(jsValue _: ()) -> JSValue {
-        let object = Object.new()
+        let object = Object(.new)
         for (key, value) in self {
             object[key] = JSValue(from: value)
         }
@@ -88,7 +88,7 @@ extension Array where Element: JSValueConvertible {
 
 extension Array: JSValueConvertible where Element == JSValueConvertible {
     public subscript(jsValue _: ()) -> JSValue {
-        let array = Array.new(count)
+        let array = Array(new: count)
         for (index, element) in enumerated() {
             array[index] = JSValue(from: element)
         }