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
Switch back to JSFunctionRef.new()
  • Loading branch information
@j-f1
j-f1 committed Aug 4, 2020
commit 009d45172b48b4258174c517e230c1c72e845ecb
2 changes: 1 addition & 1 deletion IntegrationTests/TestSuites/Sources/BenchmarkTests/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions IntegrationTests/TestSuites/Sources/PrimaryTests/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -255,7 +255,7 @@ 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
Expand Down
14 changes: 7 additions & 7 deletions Sources/JavaScriptKit/JSFunction.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import _CJavaScriptKit

public enum _JSFunctionConstructorSymbol {
case new
}

public class JSFunctionRef: JSObjectRef {
@discardableResult
func callAsFunction(this: JSObjectRef? = nil, args: [JSValueConvertible]) -> JSValue {
Comment thread
j-f1 marked this conversation as resolved.
Outdated
Expand Down Expand Up @@ -33,11 +29,15 @@ public class JSFunctionRef: JSObjectRef {
self(this: this, args: args)
}

public func callAsFunction(new args: JSValueConvertible...) -> JSObjectRef {
self(.new, args: args)
public func new(_ args: JSValueConvertible...) -> JSObjectRef {
self.new(args: args)
}

public func callAsFunction(_: _JSFunctionConstructorSymbol, args: [JSValueConvertible] = []) -> JSObjectRef {
// 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 {
Comment thread
j-f1 marked this conversation as resolved.
Outdated
args.withRawJSValues { rawValues in
rawValues.withUnsafeBufferPointer { bufferPointer in
let argv = bufferPointer.baseAddress
Expand Down
4 changes: 2 additions & 2 deletions Sources/JavaScriptKit/JSValueConvertible.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand Down