Skip to content

Commit ed9f8d4

Browse files
committed
Rename Object and Array constructors
1 parent c74e3d1 commit ed9f8d4

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: Sources/JavaScriptKit/JSValueConvertible.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ extension JSObject: JSValueCodable {
7777
// from `JSFunction`
7878
}
7979

80-
private let Object = JSObject.global.Object.function!
80+
private let objectConstructor = JSObject.global.Object.function!
81+
private let arrayConstructor = JSObject.global.Array.function!
8182

8283
extension Dictionary where Value: JSValueConvertible, Key == String {
8384
public func jsValue() -> JSValue {
@@ -87,20 +88,19 @@ extension Dictionary where Value: JSValueConvertible, Key == String {
8788

8889
extension Dictionary: JSValueConvertible where Value == JSValueConvertible, Key == String {
8990
public func jsValue() -> JSValue {
90-
let object = Object.new()
91+
let object = objectConstructor.new()
9192
for (key, value) in self {
9293
object[key] = value.jsValue()
9394
}
9495
return .object(object)
9596
}
9697
}
9798

98-
private let NativeJSArray = JSObject.global.Array.function!
9999
extension Dictionary: JSValueConstructible where Value: JSValueConstructible, Key == String {
100100
public static func construct(from value: JSValue) -> Self? {
101101
guard
102102
let objectRef = value.object,
103-
let keys: [String] = Object.keys!(objectRef.jsValue()).fromJSValue()
103+
let keys: [String] = objectConstructor.keys!(objectRef.jsValue()).fromJSValue()
104104
else { return nil }
105105

106106
var entries = [(String, Value)]()
@@ -143,7 +143,7 @@ extension Array where Element: JSValueConvertible {
143143

144144
extension Array: JSValueConvertible where Element == JSValueConvertible {
145145
public func jsValue() -> JSValue {
146-
let array = NativeJSArray.new(count)
146+
let array = arrayConstructor.new(count)
147147
for (index, element) in enumerated() {
148148
array[index] = element.jsValue()
149149
}

0 commit comments

Comments
 (0)