Convert JSObjectRef.get() and JSObjectRef.set() to subscripts

swiftwasm · kateinoigakukun · Aug 10, 2020 · Aug 3, 2020 · Aug 3, 2020 · Aug 3, 2020
commit 671a02e2ab86c1ae305708ffe56de54167ed6071
diff --git a/Sources/JavaScriptKit/JSArrayRef.swift b/Sources/JavaScriptKit/JSArrayRef.swift
@@ -33,7 +33,7 @@ extension JSArrayRef: Sequence {
             guard index < Int(ref.length.number!) else {
                 return nil
             }
-            let value = ref.get(index)
+            let value = ref[index]
             return value.isNull ? nil : value
         }
     }

diff --git a/Sources/JavaScriptKit/JSObject.swift b/Sources/JavaScriptKit/JSObject.swift
@@ -9,42 +9,31 @@ public class JSObjectRef: Equatable {
 
     @_disfavoredOverload
     public subscript(dynamicMember name: String) -> ((JSValueConvertible...) -> JSValue)? {
-        guard let function = self[dynamicMember: name].function else { return nil }
+        guard let function = self[name].function else { return nil }
         return { (arguments: JSValueConvertible...) in
             function.apply(this: self, argumentList: arguments)
         }
     }
 
     public subscript(dynamicMember name: String) -> JSValue {
-        get { get(name) }
-        set { set(name, newValue) }
+        get { self[name] }
+        set { self[name] = newValue }
     }
 
-    public func get(_ name: String) -> JSValue {
-        getJSValue(this: self, name: name)
+    public subscript(_ name: String) -> JSValue {
+        get { getJSValue(this: self, name: name) }
+        set { setJSValue(this: self, name: name, value: newValue) }
     }
 
-    public func set(_ name: String, _ value: JSValue) {
-        setJSValue(this: self, name: name, value: value)
-    }
-
-    public func get(_ index: Int) -> JSValue {
-        getJSValue(this: self, index: Int32(index))
+    public subscript(_ index: Int) -> JSValue {
+        get { getJSValue(this: self, index: Int32(index)) }
+        set { setJSValue(this: self, index: Int32(index), value: newValue) }
     }
 
     public func instanceof(_ constructor: JSFunctionRef) -> Bool {
         _instanceof(self.id, constructor.id)
     }
 
-    public subscript(_ index: Int) -> JSValue {
-        get { get(index) }
-        set { set(index, newValue) }
-    }
-
-    public func set(_ index: Int, _ value: JSValue) {
-        setJSValue(this: self, index: Int32(index), value: value)
-    }
-
     static let _JS_Predef_Value_Global: UInt32 = 0
     public static let global = JSObjectRef(id: _JS_Predef_Value_Global)
 

diff --git a/Sources/JavaScriptKit/JSValueConvertible.swift b/Sources/JavaScriptKit/JSValueConvertible.swift
@@ -69,7 +69,7 @@ extension Dictionary: JSValueConvertible where Value == JSValueConvertible, Key
     public func jsValue() -> JSValue {
         let object = Object.new()
         for (key, value) in self {
-            object.set(key, value.jsValue())
+            object[key] = value.jsValue()
         }
         return .object(object)
     }

diff --git a/Sources/JavaScriptKit/JSValueDecoder.swift b/Sources/JavaScriptKit/JSValueDecoder.swift
@@ -34,7 +34,7 @@ private struct _Decoder: Decoder {
 }
 
 private enum Object {
-    static let ref = JSObjectRef.global.get("Object").object!
+    static let ref = JSObjectRef.global.Object.object!
     static func keys(_ object: JSObjectRef) -> [String] {
         let keys = ref.keys!(object).array!
         return keys.map { $0.string! }
@@ -90,7 +90,7 @@ private struct _KeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerPr
     }
 
     func _decode(forKey key: CodingKey) throws -> JSValue {
-        let result = ref.get(key.stringValue)
+        let result = ref[key.stringValue]
         guard !result.isUndefined else {
             throw _keyNotFound(at: codingPath, key)
         }
@@ -106,7 +106,7 @@ private struct _KeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerPr
     }
 
     func contains(_ key: Key) -> Bool {
-        !ref.get(key.stringValue).isUndefined
+        !ref[key.stringValue].isUndefined
     }
 
     func decodeNil(forKey key: Key) throws -> Bool {
@@ -162,7 +162,7 @@ private struct _UnkeyedDecodingContainer: UnkeyedDecodingContainer {
 
     mutating func _currentValue() -> JSValue {
         defer { currentIndex += 1 }
-        return ref.get(currentIndex)
+        return ref[currentIndex]
     }
 
     mutating func _throwTypeMismatchIfNil<T>(_ transform: (JSValue) -> T?) throws -> T {