Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Clean up the JSObjectRef API #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kateinoigakukun merged 22 commits into from
Aug 10, 2020
Merged

Clean up the JSObjectRef API #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
34af077
Add xcworkspaces
j-f1 Aug 3, 2020
671a02e
Convert JSObjectRef.get() and JSObjectRef.set() to subscripts
j-f1 Aug 3, 2020
959379f
Make instanceof static
j-f1 Aug 3, 2020
c4d2e12
[not working] attempt at new JSValueConvertible with no instance methods
j-f1 Aug 3, 2020
4b70a6a
Revert "[not working] attempt at new JSValueConvertible with no insta…
j-f1 Aug 3, 2020
4373e95
Subscript-based JSValue conversion
j-f1 Aug 3, 2020
f11fc32
Partially fix tests
j-f1 Aug 3, 2020
39b15f4
Remove JSFunctionRef.apply and JSFunctionRef.new
j-f1 Aug 3, 2020
ec9a29a
Comment out failing tests
j-f1 Aug 3, 2020
3a4ccee
Update function call signature
j-f1 Aug 3, 2020
db421db
Last change to functions, hopefully
j-f1 Aug 3, 2020
922cbb5
Remove unnecessary .function
j-f1 Aug 3, 2020
aac7833
Ignore .swiftpm
j-f1 Aug 4, 2020
009d451
Switch back to JSFunctionRef.new()
j-f1 Aug 4, 2020
0f240c3
Switch instanceof to JSObjectRef.isInstanceOf
j-f1 Aug 4, 2020
774b08b
Revert "Subscript-based JSValue conversion"
j-f1 Aug 4, 2020
3c33a92
Merge remote-tracking branch 'upstream/master' into no-jsobject-methods
j-f1 Aug 4, 2020
b3574a0
Fix error
j-f1 Aug 4, 2020
2465f84
Run swiftformat
j-f1 Aug 4, 2020
8a50971
Uncomment tests, fix bug
j-f1 Aug 8, 2020
f655aab
args → arguments
j-f1 Aug 10, 2020
3881e64
Mark callAsFunction(this:, arguments:) as public
j-f1 Aug 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
args → arguments
  • Loading branch information
@j-f1
j-f1 committed Aug 10, 2020
commit f655aabae96fce7c931370fa27c89d88ee2f8bcb
20 changes: 10 additions & 10 deletions Sources/JavaScriptKit/JSFunction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import _CJavaScriptKit

public class JSFunctionRef: JSObjectRef {
@discardableResult
func callAsFunction(this: JSObjectRef? = nil, args: [JSValueConvertible]) -> JSValue {
let result = args.withRawJSValues { rawValues in
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
Expand All @@ -25,20 +25,20 @@ public class JSFunctionRef: JSObjectRef {
}

@discardableResult
public func callAsFunction(this: JSObjectRef? = nil, _ args: JSValueConvertible...) -> JSValue {
self(this: this, args: args)
public func callAsFunction(this: JSObjectRef? = nil, _ arguments: JSValueConvertible...) -> JSValue {
self(this: this, arguments: arguments)
}

public func new(_ args: JSValueConvertible...) -> JSObjectRef {
new(args: args)
public func new(_ arguments: JSValueConvertible...) -> JSObjectRef {
new(arguments: arguments)
}

// Guaranteed to return an object because either:
// a) the constructor explicitly returns an object, or
// b) the constructor returns nothing, which causes JS to return the `this` value, or
// c) the constructor returns undefined, null or a non-object, in which case JS also returns `this`.
public func new(args: [JSValueConvertible]) -> JSObjectRef {
args.withRawJSValues { rawValues in
public func new(arguments: [JSValueConvertible]) -> JSObjectRef {
arguments.withRawJSValues { rawValues in
rawValues.withUnsafeBufferPointer { bufferPointer in
let argv = bufferPointer.baseAddress
let argc = bufferPointer.count
Expand Down Expand Up @@ -105,10 +105,10 @@ public func _call_host_function(
guard let hostFunc = JSClosure.sharedFunctions[hostFuncRef] else {
fatalError("The function was already released")
}
let args = UnsafeBufferPointer(start: argv, count: Int(argc)).map {
let arguments = UnsafeBufferPointer(start: argv, count: Int(argc)).map {
$0.jsValue()
}
let result = hostFunc(args)
let result = hostFunc(arguments)
let callbackFuncRef = JSFunctionRef(id: callbackFuncRef)
_ = callbackFuncRef(result)
}
2 changes: 1 addition & 1 deletion Sources/JavaScriptKit/JSObject.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(this: self, args: arguments)
function(this: self, arguments: arguments)
}
}

Expand Down