Finish the JSON serialization refactor #423
Conversation
| writer.rustBlock("") { | ||
| write("let mut ret = #T::new();", RustType.HashMap.RuntimeType) | ||
| data.members.forEach { (k, v) -> | ||
| withBlock("ret.insert(${k.value.dq()}.to_string()$lowercase,", ");") { | ||
| withBlock("ret.insert(", ");") { |
There was a problem hiding this comment.
you should actually just be able to use renderMember(this, shape.key, k, ctx)
There was a problem hiding this comment.
Great suggestion. Fixed.
| @@ -321,7 +324,12 @@ class JsonSerializerGenerator(protocolConfig: ProtocolConfig) : StructuredDataSe | |||
| val keyName = safeName("key") | |||
| val valueName = safeName("value") | |||
| rustBlock("for ($keyName, $valueName) in ${context.valueExpression.asRef()}") { | |||
| serializeMember(MemberContext.mapMember(context, keyName, valueName)) | |||
| val keyTarget = model.expectShape(context.shape.key.target) | |||
There was a problem hiding this comment.
not that it totally matters, but you can probably avoid this by going through the memberSerializer for key rather than hard coding it. Then you could even have a blob key or something really crazy and it would work fine.
There was a problem hiding this comment.
That sounds ideal, but things are more muddy than that since serializeMember generates code to exercise the JsonValueWriter, which we definitely wouldn't want for the key. If I split serializeMember into two pieces: one dealing only in values, and one dealing with JsonValueWriter, then this could work. Not sure if it's worth the effort though.
This finishes the serialization part of #161.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.