Rename unsafe fuctions to no_catch and simplify invokeNonThrowingJSFunction implementation

pedrovgs · pedrovgs · commit d7e8747b9da8 · 2022-03-31T08:57:10.000+02:00
diff --git a/Runtime/src/index.ts b/Runtime/src/index.ts
@@ -226,7 +226,7 @@ export class SwiftRuntime {
                 this.memory
             );
         },
-        swjs_call_function_unsafe: (
+        swjs_call_function_no_catch: (
             ref: ref,
             argv: pointer,
             argc: number,
@@ -304,7 +304,7 @@ export class SwiftRuntime {
             );
         },
 
-        swjs_call_function_with_this_unsafe: (
+        swjs_call_function_with_this_no_catch: (
             obj_ref: ref,
             func_ref: ref,
             argv: pointer,
diff --git a/Runtime/src/types.ts b/Runtime/src/types.ts
@@ -58,7 +58,7 @@ export interface ImportedFunctions {
         payload1_ptr: pointer,
         payload2_ptr: pointer
     ): void;
-    swjs_call_function_unsafe(
+    swjs_call_function_no_catch(
         ref: number,
         argv: pointer,
         argc: number,
@@ -75,7 +75,7 @@ export interface ImportedFunctions {
         payload1_ptr: pointer,
         payload2_ptr: pointer
     ): void;
-    swjs_call_function_with_this_unsafe(
+    swjs_call_function_with_this_no_catch(
         obj_ref: ref,
         func_ref: ref,
         argv: pointer,
diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSFunction.swift b/Sources/JavaScriptKit/FundamentalObjects/JSFunction.swift
@@ -19,7 +19,7 @@ public class JSFunction: JSObject {
     /// - Returns: The result of this call.
     @discardableResult
     public func callAsFunction(this: JSObject? = nil, arguments: [ConvertibleToJSValue]) -> JSValue {
-        try! invokeNonThrowingJSFunction(self, arguments: arguments, this: this)
+        invokeNonThrowingJSFunction(self, arguments: arguments, this: this)
     }
 
     /// A variadic arguments version of `callAsFunction`.
@@ -84,31 +84,27 @@ public class JSFunction: JSObject {
     }
 }
 
-private func invokeNonThrowingJSFunction(_ jsFunc: JSFunction, arguments: [ConvertibleToJSValue], this: JSObject?) throws -> JSValue {
-    let (result, isException) = arguments.withRawJSValues { rawValues in
-        rawValues.withUnsafeBufferPointer { bufferPointer -> (JSValue, Bool) in
+private func invokeNonThrowingJSFunction(_ jsFunc: JSFunction, arguments: [ConvertibleToJSValue], this: JSObject?) -> JSValue {
+    arguments.withRawJSValues { rawValues in
+        rawValues.withUnsafeBufferPointer { bufferPointer -> (JSValue) in
             let argv = bufferPointer.baseAddress
             let argc = bufferPointer.count
             var kindAndFlags = JavaScriptValueKindAndFlags()
             var payload1 = JavaScriptPayload1()
             var payload2 = JavaScriptPayload2()
             if let thisId = this?.id {
-                _call_function_with_this_unsafe(thisId,
+                _call_function_with_this_no_catch(thisId,
                                          jsFunc.id, argv, Int32(argc),
                                          &kindAndFlags, &payload1, &payload2)
             } else {
-                _call_function_unsafe(
+                _call_function_no_catch(
                     jsFunc.id, argv, Int32(argc),
                     &kindAndFlags, &payload1, &payload2
                 )
             }
             assert(!kindAndFlags.isException)
             let result = RawJSValue(kind: kindAndFlags.kind, payload1: payload1, payload2: payload2)
-            return (result.jsValue(), kindAndFlags.isException)
+            return result.jsValue()
         }
     }
-    if isException {
-        throw result
-    }
-    return result
 }
diff --git a/Sources/JavaScriptKit/XcodeSupport.swift b/Sources/JavaScriptKit/XcodeSupport.swift
@@ -53,7 +53,7 @@ import _CJavaScriptKit
         _: UnsafeMutablePointer<JavaScriptPayload1>!,
         _: UnsafeMutablePointer<JavaScriptPayload2>!
     ) { fatalError() }
-    func _call_function_unsafe(
+    func _call_function_no_catch(
         _: JavaScriptObjectRef,
         _: UnsafePointer<RawJSValue>!, _: Int32,
         _: UnsafeMutablePointer<JavaScriptValueKindAndFlags>!,
@@ -68,7 +68,7 @@ import _CJavaScriptKit
         _: UnsafeMutablePointer<JavaScriptPayload1>!,
         _: UnsafeMutablePointer<JavaScriptPayload2>!
     ) { fatalError() }
-    func _call_function_with_this_unsafe(
+    func _call_function_with_this_no_catch(
         _: JavaScriptObjectRef,
         _: JavaScriptObjectRef,
         _: UnsafePointer<RawJSValue>!, _: Int32,
diff --git a/Sources/_CJavaScriptKit/include/_CJavaScriptKit.h b/Sources/_CJavaScriptKit/include/_CJavaScriptKit.h
@@ -179,8 +179,8 @@ extern void _call_function(const JavaScriptObjectRef ref, const RawJSValue *argv
 /// @param result_payload1 A result pointer of first payload of JavaScript value of returned result or thrown exception.
 /// @param result_payload2 A result pointer of second payload of JavaScript value of returned result or thrown exception.
 __attribute__((__import_module__("javascript_kit"),
-               __import_name__("swjs_call_function_unsafe")))
-extern void _call_function_unsafe(const JavaScriptObjectRef ref, const RawJSValue *argv,
+               __import_name__("swjs_call_function_no_catch")))
+extern void _call_function_no_catch(const JavaScriptObjectRef ref, const RawJSValue *argv,
                            const int argc, JavaScriptValueKindAndFlags *result_kind,
                            JavaScriptPayload1 *result_payload1,
                            JavaScriptPayload2 *result_payload2);
@@ -213,8 +213,8 @@ extern void _call_function_with_this(const JavaScriptObjectRef _this,
 /// @param result_payload1 A result pointer of first payload of JavaScript value of returned result or thrown exception.
 /// @param result_payload2 A result pointer of second payload of JavaScript value of returned result or thrown exception.
 __attribute__((__import_module__("javascript_kit"),
-               __import_name__("swjs_call_function_with_this_unsafe")))
-extern void _call_function_with_this_unsafe(const JavaScriptObjectRef _this,
+               __import_name__("swjs_call_function_with_this_no_catch")))
+extern void _call_function_with_this_no_catch(const JavaScriptObjectRef _this,
                                      const JavaScriptObjectRef func_ref,
                                      const RawJSValue *argv, const int argc,
                                      JavaScriptValueKindAndFlags *result_kind,

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class JSFunction: JSObject {`
`19`	`19`	`/// - Returns: The result of this call.`
`20`	`20`	`@discardableResult`
`21`	`21`	`public func callAsFunction(this: JSObject? = nil, arguments: [ConvertibleToJSValue]) -> JSValue {`
`22`		`- try! invokeNonThrowingJSFunction(self, arguments: arguments, this: this)`
	`22`	`+ invokeNonThrowingJSFunction(self, arguments: arguments, this: this)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	/// A variadic arguments version of `callAsFunction`.
`@@ -84,31 +84,27 @@ public class JSFunction: JSObject {`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`		`-private func invokeNonThrowingJSFunction(_ jsFunc: JSFunction, arguments: [ConvertibleToJSValue], this: JSObject?) throws -> JSValue {`
`88`		`- let (result, isException) = arguments.withRawJSValues { rawValues in`
`89`		`- rawValues.withUnsafeBufferPointer { bufferPointer -> (JSValue, Bool) in`
	`87`	`+private func invokeNonThrowingJSFunction(_ jsFunc: JSFunction, arguments: [ConvertibleToJSValue], this: JSObject?) -> JSValue {`
	`88`	`+ arguments.withRawJSValues { rawValues in`
	`89`	`+ rawValues.withUnsafeBufferPointer { bufferPointer -> (JSValue) in`
`90`	`90`	`let argv = bufferPointer.baseAddress`
`91`	`91`	`let argc = bufferPointer.count`
`92`	`92`	`var kindAndFlags = JavaScriptValueKindAndFlags()`
`93`	`93`	`var payload1 = JavaScriptPayload1()`
`94`	`94`	`var payload2 = JavaScriptPayload2()`
`95`	`95`	`if let thisId = this?.id {`
`96`		`- _call_function_with_this_unsafe(thisId,`
	`96`	`+ _call_function_with_this_no_catch(thisId,`
`97`	`97`	`jsFunc.id, argv, Int32(argc),`
`98`	`98`	`&kindAndFlags, &payload1, &payload2)`
`99`	`99`	`} else {`
`100`		`- _call_function_unsafe(`
	`100`	`+ _call_function_no_catch(`
`101`	`101`	`jsFunc.id, argv, Int32(argc),`
`102`	`102`	`&kindAndFlags, &payload1, &payload2`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`	`assert(!kindAndFlags.isException)`
`106`	`106`	`let result = RawJSValue(kind: kindAndFlags.kind, payload1: payload1, payload2: payload2)`
`107`		`- return (result.jsValue(), kindAndFlags.isException)`
	`107`	`+ return result.jsValue()`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`- if isException {`
`111`		`- throw result`
`112`		`- }`
`113`		`- return result`
`114`	`110`	`}`