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
Subscript-based JSValue conversion
  • Loading branch information
@j-f1
j-f1 committed Aug 3, 2020
commit 4373e953e3ef72f71efbaf965c4caed41f7b754f
10 changes: 4 additions & 6 deletions Sources/JavaScriptKit/JSFunction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class JSFunctionRef: JSObjectRef {
return result
}
}
return result.jsValue()
return JSValue(from: result)
}

public func apply(this: JSObjectRef, arguments: JSValueConvertible...) -> JSValue {
Expand All @@ -35,7 +35,7 @@ public class JSFunctionRef: JSObjectRef {
return result
}
}
return result.jsValue()
return JSValue(from: result)
}

public func new(_ arguments: JSValueConvertible...) -> JSObjectRef {
Expand All @@ -58,7 +58,7 @@ public class JSFunctionRef: JSObjectRef {
fatalError("unavailable")
}

override public func jsValue() -> JSValue {
public override subscript(jsValue _: ()) -> JSValue {
.function(self)
}
}
Expand Down Expand Up @@ -106,9 +106,7 @@ 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 {
$0.jsValue()
}
let args = UnsafeBufferPointer(start: argv, count: Int(argc)).map(JSValue.init(from:))
let result = hostFunc(args)
let callbackFuncRef = JSFunctionRef(id: callbackFuncRef)
_ = callbackFuncRef(result)
Expand Down
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 @@ -43,7 +43,7 @@ public class JSObjectRef: Equatable {
return lhs.id == rhs.id
}

public func jsValue() -> JSValue {
public subscript(jsValue _: ()) -> JSValue {
.object(self)
}
}
4 changes: 2 additions & 2 deletions Sources/JavaScriptKit/JSValue.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public func getJSValue(this: JSObjectRef, name: String) -> JSValue {
_get_prop(this.id, name, Int32(name.count),
&rawValue.kind,
&rawValue.payload1, &rawValue.payload2, &rawValue.payload3)
return rawValue.jsValue()
return JSValue(from: rawValue)
}

public func setJSValue(this: JSObjectRef, name: String, value: JSValue) {
Expand All @@ -88,7 +88,7 @@ public func getJSValue(this: JSObjectRef, index: Int32) -> JSValue {
_get_subscript(this.id, index,
&rawValue.kind,
&rawValue.payload1, &rawValue.payload2, &rawValue.payload3)
return rawValue.jsValue()
return JSValue(from: rawValue)
}

public func setJSValue(this: JSObjectRef, index: Int32, value: JSValue) {
Expand Down
49 changes: 26 additions & 23 deletions Sources/JavaScriptKit/JSValueConvertible.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,58 @@
import _CJavaScriptKit

public protocol JSValueConvertible {
func jsValue() -> JSValue
subscript(jsValue _: ()) -> JSValue { get }
}

extension JSValue: JSValueConvertible {
public func jsValue() -> JSValue { self }
public init(from convertible: JSValueConvertible) {
self = convertible[jsValue: ()]
}
public subscript(jsValue _: ()) -> JSValue { self }
}

extension Bool: JSValueConvertible {
public func jsValue() -> JSValue { .boolean(self) }
public subscript(jsValue _: ()) -> JSValue { .boolean(self) }
}

extension Int: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension Int8: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension Int16: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension Int32: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension UInt: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension UInt8: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension UInt16: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension Float: JSValueConvertible {
public func jsValue() -> JSValue { .number(Double(self)) }
public subscript(jsValue _: ()) -> JSValue { .number(Double(self)) }
}

extension Double: JSValueConvertible {
public func jsValue() -> JSValue { .number(self) }
public subscript(jsValue _: ()) -> JSValue { .number(self) }
}

extension String: JSValueConvertible {
public func jsValue() -> JSValue { .string(self) }
public subscript(jsValue _: ()) -> JSValue { .string(self) }
}

extension JSObjectRef: JSValueConvertible {
Expand All @@ -60,16 +63,16 @@ extension JSObjectRef: JSValueConvertible {
private let Object = JSObjectRef.global.Object.function!

extension Dictionary where Value: JSValueConvertible, Key == String {
public func jsValue() -> JSValue {
Swift.Dictionary<Key, JSValueConvertible>.jsValue(self)()
public subscript(jsValue _: ()) -> JSValue {
JSValue(from: self as Dictionary<Key, JSValueConvertible>)
}
}

extension Dictionary: JSValueConvertible where Value == JSValueConvertible, Key == String {
public func jsValue() -> JSValue {
public subscript(jsValue _: ()) -> JSValue {
let object = Object.new()
for (key, value) in self {
object[key] = value.jsValue()
object[key] = JSValue(from: value)
}
return .object(object)
}
Expand All @@ -78,23 +81,23 @@ extension Dictionary: JSValueConvertible where Value == JSValueConvertible, Key
private let Array = JSObjectRef.global.Array.function!

extension Array where Element: JSValueConvertible {
public func jsValue() -> JSValue {
Swift.Array<JSValueConvertible>.jsValue(self)()
public subscript(jsValue _: ()) -> JSValue {
JSValue(from: self as Swift.Array<JSValueConvertible>)
}
}

extension Array: JSValueConvertible where Element == JSValueConvertible {
public func jsValue() -> JSValue {
public subscript(jsValue _: ()) -> JSValue {
let array = Array.new(count)
for (index, element) in enumerated() {
array[index] = element.jsValue()
array[index] = JSValue(from: element)
}
return .object(array)
}
}

extension RawJSValue: JSValueConvertible {
public func jsValue() -> JSValue {
public subscript(jsValue _: ()) -> JSValue {
switch kind {
case .invalid:
fatalError()
Expand Down Expand Up @@ -176,7 +179,7 @@ extension Array where Element == JSValueConvertible {
_ results: inout [RawJSValue], _ body: ([RawJSValue]) -> T
) -> T {
if index == values.count { return body(results) }
return values[index].jsValue().withRawJSValue { (rawValue) -> T in
return JSValue(from: values[index]).withRawJSValue { (rawValue) -> T in
results.append(rawValue)
return _withRawJSValues(values, index + 1, &results, body)
}
Expand Down