Add fast-path for ConstructibleFromJSValue.Type

kateinoigakukun · kateinoigakukun · commit ec37bdfe2275 · 2023-02-04T17:04:14.000+09:00
diff --git a/Sources/JavaScriptKit/JSValueDecoder.swift b/Sources/JavaScriptKit/JSValueDecoder.swift
@@ -118,7 +118,12 @@ private struct _KeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerPr
     }
 
     func decode<T>(_: T.Type, forKey key: Key) throws -> T where T: Decodable {
-        return try T(from: _decoder(forKey: key))
+        let jsValue = try _decode(forKey: key)
+        if let jsType = T.self as? ConstructibleFromJSValue.Type {
+            let maybeValue = jsType.construct(from: jsValue)
+            if let value = maybeValue { return value as! T }
+        }
+        return try T(from: _decoder(forKey: key, value: jsValue))
     }
 
     func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type, forKey key: Key) throws -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {
@@ -139,6 +144,10 @@ private struct _KeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerPr
 
     func _decoder(forKey key: CodingKey) throws -> Decoder {
         let value = try _decode(forKey: key)
+        return _decoder(forKey: key, value: value)
+    }
+
+    func _decoder(forKey key: CodingKey, value: JSValue) -> Decoder {
         return decoder.decoder(referencing: value, with: key)
     }
 }
@@ -182,7 +191,12 @@ private struct _UnkeyedDecodingContainer: UnkeyedDecodingContainer {
     }
 
     mutating func decode<T>(_: T.Type) throws -> T where T: Decodable {
-        return try T(from: _decoder())
+        let jsValue = _currentValue()
+        if let jsType = T.self as? ConstructibleFromJSValue.Type {
+            let maybeValue = jsType.construct(from: jsValue)
+            if let value = maybeValue { return value as! T }
+        }
+        return try T(from: _decoder(value: jsValue))
     }
 
     mutating func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type) throws -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {
@@ -198,7 +212,11 @@ private struct _UnkeyedDecodingContainer: UnkeyedDecodingContainer {
     }
 
     mutating func _decoder() -> Decoder {
-        decoder.decoder(referencing: _currentValue(), with: currentKey)
+        _decoder(value: _currentValue())
+    }
+
+    func _decoder(value: JSValue) -> Decoder {
+        decoder.decoder(referencing: value, with: currentKey)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,12 @@ private struct _KeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerPr`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func decode<T>(_: T.Type, forKey key: Key) throws -> T where T: Decodable {`
`121`		`- return try T(from: _decoder(forKey: key))`
	`121`	`+ let jsValue = try _decode(forKey: key)`
	`122`	`+ if let jsType = T.self as? ConstructibleFromJSValue.Type {`
	`123`	`+ let maybeValue = jsType.construct(from: jsValue)`
	`124`	`+ if let value = maybeValue { return value as! T }`
	`125`	`+ }`
	`126`	`+ return try T(from: _decoder(forKey: key, value: jsValue))`
`122`	`127`	`}`
`123`	`128`
`124`	`129`	`func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type, forKey key: Key) throws -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {`
`@@ -139,6 +144,10 @@ private struct _KeyedDecodingContainer<Key: CodingKey>: KeyedDecodingContainerPr`
`139`	`144`
`140`	`145`	`func _decoder(forKey key: CodingKey) throws -> Decoder {`
`141`	`146`	`let value = try _decode(forKey: key)`
	`147`	`+ return _decoder(forKey: key, value: value)`
	`148`	`+ }`
	`149`	`+`
	`150`	`+ func _decoder(forKey key: CodingKey, value: JSValue) -> Decoder {`
`142`	`151`	`return decoder.decoder(referencing: value, with: key)`
`143`	`152`	`}`
`144`	`153`	`}`
`@@ -182,7 +191,12 @@ private struct _UnkeyedDecodingContainer: UnkeyedDecodingContainer {`
`182`	`191`	`}`
`183`	`192`
`184`	`193`	`mutating func decode<T>(_: T.Type) throws -> T where T: Decodable {`
`185`		`- return try T(from: _decoder())`
	`194`	`+ let jsValue = _currentValue()`
	`195`	`+ if let jsType = T.self as? ConstructibleFromJSValue.Type {`
	`196`	`+ let maybeValue = jsType.construct(from: jsValue)`
	`197`	`+ if let value = maybeValue { return value as! T }`
	`198`	`+ }`
	`199`	`+ return try T(from: _decoder(value: jsValue))`
`186`	`200`	`}`
`187`	`201`
`188`	`202`	`mutating func nestedContainer<NestedKey>(keyedBy _: NestedKey.Type) throws -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {`
`@@ -198,7 +212,11 @@ private struct _UnkeyedDecodingContainer: UnkeyedDecodingContainer {`
`198`	`212`	`}`
`199`	`213`
`200`	`214`	`mutating func _decoder() -> Decoder {`
`201`		`- decoder.decoder(referencing: _currentValue(), with: currentKey)`
	`215`	`+ _decoder(value: _currentValue())`
	`216`	`+ }`
	`217`	`+`
	`218`	`+ func _decoder(value: JSValue) -> Decoder {`
	`219`	`+ decoder.decoder(referencing: value, with: currentKey)`
`202`	`220`	`}`
`203`	`221`	`}`
`204`	`222`