Commit ab414d7

committed

Make dyamicMember return a JSFunctionRef in the disfavoredOverload

1 parent 9b47115 commit ab414d7Copy full SHA for ab414d7

File tree

-11

lines changed

-11

lines changed

Lines changed: 4 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,14 @@ public class JSObjectRef: Equatable {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`@_disfavoredOverload`
`11`		`- public subscript(_ name: String) -> ((JSValueEncodable...)->JSValue)? {`
	`11`	`+ public subscript(_ name: String) -> JSFunctionRef? {`
`12`	`12`	`guard let function = self[name].function else { return nil }`
`13`		`- return { (arguments: JSValueEncodable...) in`
`14`		`- function(this: self, args: arguments)`
`15`		`- }`
	`13`	`+ return function`
`16`	`14`	`}`
`17`	`15`
`18`	`16`	`@_disfavoredOverload`
`19`		`- public subscript(dynamicMember name: String) -> ((JSValueEncodable...) -> JSValue)? {`
`20`		`- guard let function = self[name].function else { return nil }`
`21`		`- return { (arguments: JSValueEncodable...) in`
`22`		`- function(this: self, args: arguments)`
`23`		`- }`
	`17`	`+ public subscript(dynamicMember name: String) -> JSFunctionRef? {`
	`18`	`+ self[name]`
`24`	`19`	`}`
`25`	`20`
`26`	`21`	`public subscript(dynamicMember name: String) -> JSValue {`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,10 +155,9 @@ extension Dictionary: JSValueDecodable where Value: JSValueDecodable, Key == Str`
`155`	`155`
`156`	`156`	`public init(jsValue: JSValue) {`
`157`	`157`	`let objectRef: JSObjectRef = jsValue.object!`
`158`		`-`
`159`	`158`	`let keys: [String] = JSObject.keys!(objectRef.jsValue()).fromJSValue()`
`160`	`159`	`self = Dictionary(uniqueKeysWithValues: keys.map {`
`161`		`- (0ドル, objectRef[dynamicMember:0ドル].fromJSValue())`
	`160`	`+ (0ドル, objectRef[0ドル].fromJSValue())`
`162`	`161`	`})`
`163`	`162`	`}`
`164`	`163`	`}`

Comments

(0)