Convert deserializer to use kotlinpoet

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/DeserializerAnnotator.kt

@@ -27,6 +27,7 @@ import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.asTypeName
+import com.squareup.kotlinpoet.buildCodeBlock
 import com.toasttab.protokt.codegen.annotators.Annotator.Context
 import com.toasttab.protokt.codegen.annotators.MessageAnnotator.Companion.IDEAL_MAX_WIDTH
 import com.toasttab.protokt.codegen.annotators.PropertyAnnotator.Companion.annotateProperties
@@ -38,6 +39,7 @@ import com.toasttab.protokt.codegen.impl.Wrapper.valueWrapped
 import com.toasttab.protokt.codegen.impl.Wrapper.wrapField
 import com.toasttab.protokt.codegen.impl.Wrapper.wrapped
 import com.toasttab.protokt.codegen.impl.Wrapper.wrapperName
+import com.toasttab.protokt.codegen.impl.buildFunSpec
 import com.toasttab.protokt.codegen.model.FieldType
 import com.toasttab.protokt.codegen.protoc.Message
 import com.toasttab.protokt.codegen.protoc.Oneof
@@ -48,22 +50,32 @@ import com.toasttab.protokt.codegen.template.Message.Message.DeserializerInfo.As
 import com.toasttab.protokt.codegen.template.Message.Message.PropertyInfo
 import com.toasttab.protokt.rt.KtDeserializer
 import com.toasttab.protokt.rt.KtMessageDeserializer
+import com.toasttab.protokt.rt.UnknownFieldSet
 
 internal class DeserializerAnnotator
 private constructor(
  private val msg: Message,
  private val ctx: Context
 ) {
+ /** Creates a {@see KtDeserializer<T>} companion object, where T is the Kotlin type for this Message.
+ *
+ * Contains functions:
+ * - deserialize(deserializer : KTMessageDeserializer) : T
+ * - invoke(dsl: ApiDsl.() -> Unit): Api
+ *
+ * */
  private fun annotateDeserializer(): TypeSpec {
  val deserializerInfo = annotateDeserializerOld()
  val properties = annotateProperties(msg, ctx)
 
  return TypeSpec.companionObjectBuilder("Deserializer")
+ // KtDeserializer<MessageType>
  .addSuperinterface(
  KtDeserializer::class
  .asTypeName()
  .parameterizedBy(TypeVariableName(msg.name))
  )
+ // (MessageTypeDsl.() -> Unit) -> Message
  .addSuperinterface(
  LambdaTypeName.get(
  null,
@@ -79,38 +91,27 @@ private constructor(
  TypeVariableName(msg.name)
  )
  )
- .addFunction(
- FunSpec.builder("deserialize")
- .addModifiers(KModifier.OVERRIDE)
- .addParameter("deserializer", KtMessageDeserializer::class)
- .returns(TypeVariableName(msg.name))
- .addCode(
- if (properties.isNotEmpty()) {
- properties.joinToString("\n") { "var " + deserializeVar(it) } + "\n"
- } else {
- ""
- } +
- """
- |var unknownFields: UnknownFieldSet.Builder? = null
- |
- |while (true) {
- | when (deserializer.readTag()) {
- | 0 ->
- | return ${msg.name}(
- | ${constructorLines(properties)}
- | )
- |${assignmentLines(deserializerInfo)}
- | else ->
- | unknownFields =
- | (unknownFields ?: UnknownFieldSet.Builder()).also {
- | it.add(deserializer.readUnknown())
- | }
- | }
- |}
- """.trimMargin()
- )
- .build()
- )
+ .addFunction( buildFunSpec("deserialize") {
+
+ addModifiers(KModifier.OVERRIDE)
+ addParameter("deserializer", KtMessageDeserializer::class)
+ returns(TypeVariableName(msg.name))
+
+
+ if (properties.isNotEmpty()) {
+ properties.forEach {addStatement("var %L", deserializeVar(it))}
+ }
+ addStatement("var unknownFields: %T? = null", UnknownFieldSet.Builder::class )
+ beginControlFlow("while (true)")
+ beginControlFlow("when(deserializer.readTag())")
+ addStatement("0 -> return %N(%L)", msg.name, constructorLines(properties))
+ deserializerInfo.forEach() { addStatement("%L -> %L = %L", it.tag, it.assignment.fieldName, it.assignment.value)}
+ // We need to do this statement as two addStatements because otherwise it wraps the line after also, which is invalid Kotlin.
+ addStatement("else -> unknownFields = (unknownFields ?: %T.Builder()).also {", UnknownFieldSet::class)
+ addStatement("it.add(deserializer.readUnknown()) }")
+ endControlFlow()
+ endControlFlow()
+ } )
  .addFunction(
  FunSpec.builder("invoke")
  .addModifiers(KModifier.OVERRIDE)
@@ -123,29 +124,17 @@ private constructor(
  Unit::class.asTypeName()
  )
  )
- .addCode("return ${msg.name}Dsl().apply(dsl).build()")
+ .addStatement("return ${msg.name}Dsl().apply(dsl).build()")
  .build()
  )
  .build()
  }
 
- private fun constructorLines(properties: List<PropertyInfo>) =
- properties.joinToString("") {
-  deserializeWrapper(it) + ",\n "
-  } + "UnknownFieldSet.from(unknownFields)"
+ private fun constructorLines(properties: List<PropertyInfo>) = buildCodeBlock {
+ properties.forEach() {add("%L,\n", deserializeWrapper(it))}
+ add("%T.from(unknownFields)", UnknownFieldSet::class)
+ }
 
- private fun assignmentLines(deserializerInfo: List<DeserializerInfo>) =
- deserializerInfo.joinToString("\n") {
- if (it.repeated) {
- """
- | ${it.tag} ->
- | ${it.assignment.fieldName} =
- | ${it.assignment.value}
- """.trimMargin()
- } else {
- " ${it.tag} -> ${it.assignment.fieldName} = ${it.assignment.value}"
- }
- }
 
  private fun annotateDeserializerOld(): List<DeserializerInfo> =
  msg.flattenedSortedFields().flatMap { (field, oneOf) ->
@@ -191,7 +180,7 @@ private constructor(
  4 + // when (...)
  field.tag.toString().length +
  4 + // ` -> `
- field.name.length +
+ field.fieldName.length +
  3 // ` = `
 
  val spaceLeft = IDEAL_MAX_WIDTH - spaceTaken
@@ -215,7 +204,7 @@ private constructor(
  )
 
  private fun oneofDes(f: Oneof, ff: StandardField) =
- "${f.name}.${f.fieldTypeNames.getValue(ff.name)}(${deserializeString(ff, ctx, false)})"
+ "${f.name}.${f.fieldTypeNames.getValue(ff.fieldName)}(${deserializeString(ff, ctx, false)})"
 
  companion object {
  fun annotateDeserializer(msg: Message, ctx: Context) =
@@ -235,7 +224,7 @@ fun deserializeString(f: StandardField, ctx: Context, packed: Boolean): String {
  | add($wrappedRead)
  | }
  | }
- """.trimIndent()
+ """.trimMargin()
  else -> wrappedRead
  }
 }
@@ -253,7 +242,7 @@ fun deserializeMap(f: StandardField, options: Options?, read: String): String {
  | ) }
  | }
  | }
- """.trimIndent()
+ """.trimMargin()
 }
 
 private fun StandardField.readFn(ctx: Context) =

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/MessageAnnotator.kt

@@ -40,7 +40,6 @@ import com.toasttab.protokt.codegen.impl.Deprecation.hasDeprecation
 import com.toasttab.protokt.codegen.impl.Deprecation.renderOptions
 import com.toasttab.protokt.codegen.impl.Implements.doesImplement
 import com.toasttab.protokt.codegen.impl.Implements.implements
-import com.toasttab.protokt.codegen.model.PPackage
 import com.toasttab.protokt.codegen.protoc.Message
 import com.toasttab.protokt.codegen.template.Message.Message.MessageInfo
 import com.toasttab.protokt.codegen.template.Message.Message.PropertyInfo

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/MessageSizeAnnotator.kt

@@ -101,7 +101,7 @@ private constructor(
  }
 
  private fun condition(f: Oneof, ff: StandardField, type: String) =
- "${oneOfScope(f, type, ctx)}.${f.fieldTypeNames.getValue(ff.name)}"
+ "${oneOfScope(f, type, ctx)}.${f.fieldTypeNames.getValue(ff.fieldName)}"
 
  private fun oneofSizeOfString(o: Oneof, f: StandardField) =
  if (!o.hasNonNullOption) {
@@ -183,7 +183,7 @@ private constructor(
  private fun oneofSize(f: Oneof, type: String) =
  f.fields.map {
  ConditionalParams(
- "${oneOfScope(f, type, ctx)}.${f.fieldTypeNames.getValue(it.name)}",
+ "${oneOfScope(f, type, ctx)}.${f.fieldTypeNames.getValue(it.fieldName)}",
  sizeOfString(
  it,
  interceptSizeof(

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/OneofAnnotator.kt

@@ -102,7 +102,7 @@ private constructor(
  }
 
  private fun oneof(f: Oneof, ff: StandardField) =
- f.fieldTypeNames.getValue(ff.name).let { oneofFieldTypeName ->
+ f.fieldTypeNames.getValue(ff.fieldName).let { oneofFieldTypeName ->
  oneofFieldTypeName to info(ff, oneofFieldTypeName)
  }
 
@@ -111,7 +111,7 @@ private constructor(
  oneofFieldTypeName: String
  ) =
  Info(
- fieldName = f.name,
+ fieldName = f.fieldName,
  type = qualifyWrapperType(
  f,
  PClass.fromName(oneofFieldTypeName),

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/Renderers.kt

@@ -1,6 +1,7 @@
 package com.toasttab.protokt.codegen.annotators
 
 import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.ParameterizedTypeName
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.toasttab.protokt.codegen.template.Message.Message.PropertyInfo
@@ -23,13 +24,11 @@ fun deserializeValue(p: PropertyInfo) =
  }
 
 fun deserializeVar(p: PropertyInfo) =
- p.name +
- if (p.fieldType == "MESSAGE" || p.repeated || p.oneof || p.nullable || p.wrapped) {
- ": " + deserializeType(p)
- } else {
- ""
- } +
- " = " + deserializeValue(p)
+ if (p.fieldType == "MESSAGE" || p.repeated || p.oneof || p.nullable || p.wrapped) {
+ CodeBlock.of("%L : %T = %L", p.name, deserializeType(p), deserializeValue(p))
+ } else {
+ CodeBlock.of("%L = %L", p.name, deserializeValue(p))
+ }
 
 fun deserializeWrapper(p: PropertyInfo) =
  if (p.nonNullOption) {

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/SerializerAnnotator.kt

@@ -154,7 +154,7 @@ private constructor(
 
  private fun oneOfSer(f: Oneof, ff: StandardField, type: String) =
  ConditionalParams(
- "${oneOfScope(f, type, ctx)}.${f.fieldTypeNames.getValue(ff.name)}",
+ "${oneOfScope(f, type, ctx)}.${f.fieldTypeNames.getValue(ff.fieldName)}",
  serializeString(ff, Some(f.fieldName))
  )
 

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/DuplicateNameInOneofImportFilterer.kt

@@ -46,5 +46,5 @@ private fun typeNames(m: Message): Sequence<String> =
 
 private fun typeNames(o: Oneof) =
  o.fields.asSequence()
- .map { o.fieldTypeNames.getValue(it.name) }
+ .map { o.fieldTypeNames.getValue(it.fieldName) }
  .map { PClass.fromName(it).simpleName }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/KotlinPoetUtil.kt

@@ -15,6 +15,7 @@
 
 package com.toasttab.protokt.codegen.impl
 
+import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeName
@@ -44,3 +45,7 @@ fun constructorProperty(name: String, type: TypeName, override: Boolean = false)
  addModifiers(KModifier.OVERRIDE)
  }
  }.build()
+
+fun buildFunSpec(name : String, funSpecBuilder: FunSpec.Builder.() -> Unit): FunSpec {
+ return FunSpec.builder(name).apply(funSpecBuilder).build()
+}

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/Wrapper.kt

@@ -66,7 +66,7 @@ object Wrapper {
  // Protobuf primitives have no typeName
  requireNotNull(type.kotlinRepresentation) {
  "no kotlin representation for type of " +
- "$name: $type"
+ "$fieldName: $type"
  }
  },
  { getClass(typePClass, ctx) }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/protoc/Protocol.kt

@@ -316,7 +316,6 @@ private fun toStandard(
  toFieldType(fdp.type).let { type ->
  StandardField(
  number = fdp.number,
- name = newFieldName(fdp.name, usedFieldNames),
  type = type,
  repeated = fdp.label == LABEL_REPEATED,
  optional = optional(alwaysRequired, fdp, ctx),

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/protoc/Types.kt

@@ -101,7 +101,6 @@ sealed class Field {
 
 class StandardField(
  val number: Int,
- val name: String,
  override val fieldName: String,
  val type: FieldType,
  val typePClass: PClass,
@@ -117,6 +116,15 @@ class StandardField(
  get() = mapEntry != null
 }
 
+class Oneof(
+ val name: String,
+ override val fieldName: String,
+ val fields: List<StandardField>,
+ val fieldTypeNames: Map<String, String>,
+ val options: OneofOptions,
+ val index: Int
+) : Field()
+
 class MapEntry(
  val key: StandardField,
  val value: StandardField
@@ -127,14 +135,6 @@ class FieldOptions(
  val protokt: Protokt.ProtoktFieldOptions
 )
 
-class Oneof(
- val name: String,
- override val fieldName: String,
- val fields: List<StandardField>,
- val fieldTypeNames: Map<String, String>,
- val options: OneofOptions,
- val index: Int
-) : Field()
 
 class OneofOptions(
  val default: DescriptorProtos.OneofOptions,