Remove sizeof stringtemplates.

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

@@ -29,9 +29,6 @@ import com.toasttab.protokt.codegen.protoc.Oneof
 import com.toasttab.protokt.codegen.protoc.StandardField
 import com.toasttab.protokt.codegen.template.ConditionalParams
 import com.toasttab.protokt.codegen.template.Message.Message.SizeofInfo
-import com.toasttab.protokt.codegen.template.Renderers.IterationVar
-import com.toasttab.protokt.codegen.template.Renderers.Sizeof
-import com.toasttab.protokt.codegen.template.Renderers.Sizeof.Options
 
 internal class MessageSizeAnnotator
 private constructor(
@@ -158,18 +155,29 @@ private constructor(
  } else {
  interceptSizeof(f, f.fieldName, ctx)
  }
- return Sizeof.render(
- name = name,
- field = f,
- type = f.unqualifiedNestedTypeName(ctx),
- options = Options(
- fieldSizeof = interceptFieldSizeof(f, name, ctx),
- fieldAccess = interceptValueAccess(f, ctx, IterationVar.render()),
- keyAccess = mapKeyConverter(f, ctx),
- valueAccess = mapValueConverter(f, ctx),
- valueType = f.mapEntry?.value?.type
- )
- )
+
+ return when {
+ f.map -> sizeOfMap(f, name)
+ f.repeated && f.packed -> """
+ |sizeof(Tag(${f.number})) + 
+ | $name
+ | .sumOf { sizeof(${f.box("it")}) }
+ | .let { it + sizeof(UInt32(it)) }
+ """.trimMargin()
+ f.repeated ->
+ "(sizeof(Tag(${f.number})) * $name.size) + " +
+ "$name.sumOf { sizeof(${f.box(interceptValueAccess(f, ctx, "it"))}) }"
+ else -> "sizeof(Tag(${f.number})) + ${interceptFieldSizeof(f, name, ctx)}"
+ }
+ }
+
+ private fun sizeOfMap(f: StandardField, name: String): String {
+ val key = mapKeyConverter(f, ctx)?.let { "$it.unwrap(k)" } ?: "k"
+ val value = mapValueConverter(f, ctx)?.let { "$it.unwrap(v)" }?.let { f.maybeConstructBytes(it) } ?: "v"
+ return """
+ |sizeofMap($name, Tag(${f.number})) { k, v ->
+ | ${f.unqualifiedNestedTypeName(ctx)}.sizeof($key, $value)
+ |}""".trimMargin()
  }
 
  private fun oneofSize(f: Oneof, type: String) =

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

@@ -84,7 +84,7 @@ internal fun StandardField.boxMap(ctx: Context): String {
  return "${unqualifiedNestedTypeName(ctx)}($keyParam, $valParam)"
 }
 
-private fun StandardField.maybeConstructBytes(arg: String) = when (mapEntry!!.value.type) {
+internal fun StandardField.maybeConstructBytes(arg: String) = when (mapEntry!!.value.type) {
  FieldType.BYTES -> "Bytes($arg)"
  else -> arg
 }

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

@@ -20,6 +20,7 @@ import arrow.core.Option
 import arrow.core.Some
 import arrow.core.memoize
 import com.toasttab.protokt.codegen.annotators.Annotator.Context
+import com.toasttab.protokt.codegen.annotators.box
 import com.toasttab.protokt.codegen.impl.ClassLookup.converters
 import com.toasttab.protokt.codegen.impl.ClassLookup.getClass
 import com.toasttab.protokt.codegen.impl.WellKnownTypes.wrapWithWellKnownInterception
@@ -35,7 +36,6 @@ import com.toasttab.protokt.codegen.template.Options.DefaultBytesSlice
 import com.toasttab.protokt.codegen.template.Options.ReadBytesSlice
 import com.toasttab.protokt.codegen.template.Options.Sizeof
 import com.toasttab.protokt.codegen.template.Options.WrapField
-import com.toasttab.protokt.codegen.template.Renderers.FieldSizeof
 import com.toasttab.protokt.ext.OptimizedSizeofConverter
 import kotlin.reflect.KClass
 
@@ -122,10 +122,7 @@ object Wrapper {
  f.foldFieldWrap(
  ctx,
  {
- FieldSizeof.render(
- field = f,
- name = s
- )
+ "sizeof(${f.box(s)})"
  },
  { wrapper, wrapped ->
  if (
@@ -134,10 +131,7 @@ object Wrapper {
  ) {
  "${unqualifiedConverterWrap(wrapper, wrapped, ctx)}.${Sizeof.render(arg = s)}"
  } else {
- FieldSizeof.render(
- field = f,
- name = s
- )
+ "sizeof(${f.box(s)})"
  }
  }
  )

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

@@ -22,7 +22,6 @@ abstract class RenderersTemplate : StTemplate(StGroup.Renderers)
 
 object Renderers {
 
-
  object IterationVar : NoParamStTemplate(StGroup.Renderers)
 
  object Serialize : RenderersTemplate() {

protokt-codegen/src/main/resources/renderers.stg

@@ -170,6 +170,8 @@ deserialize(field, read, lhs, options, packed) ::= <%
  <endif>
 %>
 
+box(type, def) ::= "<if (type.boxed)><type.boxer>(<def>)<else><def><endif>"
+
 deserializeMap() ::= <%
  (<lhs> ?: mutableMapOf()).apply {<\n>
  <\ ><\ ><t()><t()>deserializer.readRepeated(false) {<\n>