Remove importresolver package

buildSrc/src/main/kotlin/Dependencies.kt

@@ -26,7 +26,6 @@ object versions {
  const val kotlinxCoroutines = "1.3.9"
  const val protobuf = DEFAULT_PROTOBUF_VERSION
  const val protobufPlugin = "0.8.17"
- const val stringTemplate = "4.3.1"
 
  // Test
  const val jackson = "2.13.0"
@@ -68,8 +67,6 @@ object libraries {
  const val protobufLite = "com.google.protobuf:protobuf-javalite:${versions.protobuf}"
  const val protoc = "com.google.protobuf:protoc:${versions.protobuf}"
 
- const val stringTemplate = "org.antlr:ST4:${versions.stringTemplate}"
-
  // Test
  const val jackson = "com.fasterxml.jackson.module:jackson-module-kotlin:${versions.jackson}"
  const val junit = "org.junit.jupiter:junit-jupiter:${versions.junit}"

protokt-codegen/build.gradle.kts

@@ -46,7 +46,6 @@ dependencies {
  implementation(libraries.kotlinReflect)
  implementation(libraries.kotlinxCoroutinesCore)
  implementation(libraries.protobufJava)
- implementation(libraries.stringTemplate)
 
  testImplementation(project(":testing:testing-util"))
 

protokt-codegen/src/main/kotlin/com/toasttab/protokt/Main.kt

@@ -20,9 +20,8 @@ import com.google.protobuf.ExtensionRegistry
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse.Feature
+import com.toasttab.protokt.codegen.descriptor.FileDescriptorResolver
 import com.toasttab.protokt.codegen.impl.Accumulator
-import com.toasttab.protokt.codegen.impl.FileDescriptorResolver
-import com.toasttab.protokt.codegen.impl.ImportResolver
 import com.toasttab.protokt.codegen.impl.resolvePackage
 import com.toasttab.protokt.codegen.protoc.ProtocolContext
 import com.toasttab.protokt.codegen.protoc.fileName
@@ -79,7 +78,6 @@ private fun generate(
 
  return Accumulator.buildFile(
  protocol,
- ImportResolver.resolveImports(protocol),
  FileDescriptorResolver.resolveFileDescriptor(protocol)
  )?.toString()?.let(::tidy)
 }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/Annotator.kt → protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/Annotator.kt

@@ -13,12 +13,13 @@
  * limitations under the License.
  */
 
-package com.toasttab.protokt.codegen.impl
+package com.toasttab.protokt.codegen.annotators
 
 import com.github.andrewoma.dexx.kollection.immutableListOf
 import com.squareup.kotlinpoet.TypeSpec
-import com.toasttab.protokt.codegen.impl.MessageAnnotator.Companion.annotateMessage
-import com.toasttab.protokt.codegen.impl.ServiceAnnotator.annotateService
+import com.toasttab.protokt.codegen.annotators.MessageAnnotator.Companion.annotateMessage
+import com.toasttab.protokt.codegen.annotators.ServiceAnnotator.annotateService
+import com.toasttab.protokt.codegen.impl.EnumBuilder
 import com.toasttab.protokt.codegen.model.PPackage
 import com.toasttab.protokt.codegen.protoc.AnnotatedType
 import com.toasttab.protokt.codegen.protoc.Enum

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/AnnotatorUtils.kt → protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/AnnotatorUtils.kt

@@ -13,21 +13,21 @@
  * limitations under the License.
  */
 
-package com.toasttab.protokt.codegen.impl
+package com.toasttab.protokt.codegen.annotators
 
-import arrow.core.None
-import arrow.core.Some
 import com.squareup.kotlinpoet.TypeName
-import com.toasttab.protokt.codegen.impl.Annotator.Context
+import com.toasttab.protokt.codegen.annotators.Annotator.Context
 import com.toasttab.protokt.codegen.impl.Wrapper.interceptMapKeyTypeName
 import com.toasttab.protokt.codegen.impl.Wrapper.interceptMapValueTypeName
+import com.toasttab.protokt.codegen.impl.resolvePackage
+import com.toasttab.protokt.codegen.impl.stripEnclosingMessageNamePrefix
+import com.toasttab.protokt.codegen.impl.stripRootMessageNamePrefix
 import com.toasttab.protokt.codegen.protoc.FileDesc
 import com.toasttab.protokt.codegen.protoc.MapEntry
 import com.toasttab.protokt.codegen.protoc.Message
 import com.toasttab.protokt.codegen.protoc.Oneof
 import com.toasttab.protokt.codegen.protoc.Protocol
 import com.toasttab.protokt.codegen.protoc.StandardField
-import com.toasttab.protokt.codegen.template.Renderers.ConcatWithScope
 
 fun resolveMapEntry(m: Message) =
  MapEntry(
@@ -50,21 +50,9 @@ class MapTypeParams(
 
 fun oneOfScope(f: Oneof, type: String, ctx: Context) =
  ctx.stripEnclosingMessageNamePrefix(
- ctx.stripRootMessageNamePrefix(
- ConcatWithScope.render(
- scope = type,
- value = f.name
- )
- )
+ ctx.stripRootMessageNamePrefix("$type.${f.name}")
  )
 
-fun String.emptyToNone() =
- if (isEmpty()) {
- None
- } else {
- Some(this)
- }
-
 fun kotlinPackage(protocol: Protocol) =
  kotlinPackage(protocol.desc)
 

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/ContextExt.kt → protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/ContextExt.kt

@@ -18,7 +18,7 @@ package com.toasttab.protokt.codegen.impl
 import arrow.core.Option
 import arrow.core.firstOrNone
 import arrow.core.toOption
-import com.toasttab.protokt.codegen.impl.Annotator.Context
+import com.toasttab.protokt.codegen.annotators.Annotator.Context
 import com.toasttab.protokt.codegen.protoc.Message
 
 internal fun Context.stripRootMessageNamePrefix(s: String) =

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

@@ -13,29 +13,33 @@
  * limitations under the License.
  */
 
-package com.toasttab.protokt.codegen.impl
+package com.toasttab.protokt.codegen.annotators
 
 import arrow.core.None
 import arrow.core.Option
 import arrow.core.Some
 import arrow.core.getOrElse
+import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.LambdaTypeName
 import com.squareup.kotlinpoet.ParameterSpec
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.asTypeName
-import com.toasttab.protokt.codegen.impl.Annotator.Context
-import com.toasttab.protokt.codegen.impl.MessageAnnotator.Companion.IDEAL_MAX_WIDTH
-import com.toasttab.protokt.codegen.impl.PropertyAnnotator.Companion.annotateProperties
+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
 import com.toasttab.protokt.codegen.impl.Wrapper.interceptReadFn
 import com.toasttab.protokt.codegen.impl.Wrapper.keyWrapped
 import com.toasttab.protokt.codegen.impl.Wrapper.mapKeyConverter
 import com.toasttab.protokt.codegen.impl.Wrapper.mapValueConverter
 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
@@ -44,18 +48,22 @@ import com.toasttab.protokt.codegen.protoc.Tag
 import com.toasttab.protokt.codegen.template.Message.Message.DeserializerInfo
 import com.toasttab.protokt.codegen.template.Message.Message.DeserializerInfo.Assignment
 import com.toasttab.protokt.codegen.template.Message.Message.PropertyInfo
-import com.toasttab.protokt.codegen.template.Renderers.Deserialize
-import com.toasttab.protokt.codegen.template.Renderers.Deserialize.Options
-import com.toasttab.protokt.codegen.template.Renderers.Read
 import com.toasttab.protokt.rt.KtDeserializer
 import com.toasttab.protokt.rt.KtMessageDeserializer
-import com.toasttab.protokt.codegen.template.Oneof as OneofTemplate
+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)
@@ -82,36 +90,24 @@ private constructor(
  )
  )
  .addFunction(
- FunSpec.builder("deserialize")
- .addModifiers(KModifier.OVERRIDE)
- .addParameter("deserializer", KtMessageDeserializer::class)
- .returns(msg.typeName)
- .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()
+ buildFunSpec("deserialize") {
+
+ addModifiers(KModifier.OVERRIDE)
+ addParameter("deserializer", KtMessageDeserializer::class)
+ returns(msg.typeName)
+
+ 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) }
+ addStatement("else -> unknownFields = (unknownFields ?: %T.Builder()).also·{it.add(deserializer.readUnknown()) }", UnknownFieldSet::class)
+ endControlFlow()
+ endControlFlow()
+ }
  )
  .addFunction(
  FunSpec.builder("invoke")
@@ -125,29 +121,16 @@ private constructor(
  Unit::class.asTypeName()
  )
  )
- .addCode("return ${msg.name}Dsl().apply(dsl).build()")
+ .addStatement("return %T().apply(dsl).build()", msg.dslTypeName)
  .build()
  )
  .build()
  }
 
- private fun constructorLines(properties: List<PropertyInfo>) =
- properties.joinToString("") {
- deserializeWrapper(it) + ",\n "
- } + "UnknownFieldSet.from(unknownFields)"
-
- 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 constructorLines(properties: List<PropertyInfo>) = buildCodeBlock {
+ properties.forEach() { add("%L,\n", deserializeWrapper(it)) }
+ add("%T.from(unknownFields)", UnknownFieldSet::class)
+ }
 
  private fun annotateDeserializerOld(): List<DeserializerInfo> =
  msg.flattenedSortedFields().flatMap { (field, oneOf) ->
@@ -193,7 +176,7 @@ private constructor(
  4 + // when (...)
  field.tag.toString().length +
  4 + // ` -> `
- field.name.length +
+ field.fieldName.length +
  3 // ` = `
 
  val spaceLeft = IDEAL_MAX_WIDTH - spaceTaken
@@ -217,32 +200,58 @@ private constructor(
  )
 
  private fun oneofDes(f: Oneof, ff: StandardField) =
- OneofTemplate.Deserialize.render(
- oneof = f.name,
- name = f.fieldTypeNames.getValue(ff.name),
- read = deserializeString(ff, ctx, false)
- )
+ "${f.name}.${f.fieldTypeNames.getValue(ff.fieldName)}(${deserializeString(ff, ctx, false)})"
 
  companion object {
  fun annotateDeserializer(msg: Message, ctx: Context) =
  DeserializerAnnotator(msg, ctx).annotateDeserializer()
  }
 }
 
-fun deserializeString(f: StandardField, ctx: Context, packed: Boolean) =
- Deserialize.render(
- field = f,
- read = interceptReadFn(f, f.readFn()),
- lhs = f.fieldName,
- packed = packed,
- options = deserializeOptions(f, ctx)
- )
+fun deserializeString(f: StandardField, ctx: Context, packed: Boolean): String {
+ val options = deserializeOptions(f, ctx)
+ val read = CodeBlock.of("deserializer.%L", interceptReadFn(f, f.readFn()))
+ val wrappedRead = options?.let { wrapField(it.wrapName, read, it.type, it.oneof) } ?: read.toString()
+ return when {
+ f.map -> deserializeMap(f, options, read)
+ f.repeated -> """
+ |(${f.fieldName} ?: mutableListOf()).apply·{
+ | deserializer.readRepeated($packed)·{
+ | add($wrappedRead)
+ | }
+ | }
+ """.trimMargin()
+ else -> wrappedRead.toString()
+ }
+}
+
+fun deserializeMap(f: StandardField, options: Options?, read: CodeBlock): String {
+ val key = options?.keyWrap?.let { wrapField(it, CodeBlock.of("it.key"), options.type, options.oneof) } ?: CodeBlock.of("it.key")
+ val value = options?.valueWrap?.let { wrapField(it, CodeBlock.of("it.value"), options.valueType, options.oneof) } ?: CodeBlock.of("it.value")
+ return """
+ |(${f.fieldName} ?: mutableMapOf()).apply·{
+ | deserializer.readRepeated(false)·{
+ | $read
+ | .let { put(
+ | $key,
+ | $value
+ | ) }
+ | }
+ | }
+ """.trimMargin()
+}
 
 private fun StandardField.readFn() =
- Read.render(
- type = type,
- builder = readFnBuilder(type)
- )
+ when (type) {
+ FieldType.SFIXED32 -> "readSFixed32()"
+ FieldType.SFIXED64 -> "readSFixed64()"
+ FieldType.SINT32 -> "readSInt32()"
+ FieldType.SINT64 -> "readSInt64()"
+ FieldType.UINT32 -> "readUInt32()"
+ FieldType.UINT64 -> "readUInt64()"
+ // by default for DOUBLE we get readDouble, for BOOL we get readBool(), etc.
+ else -> "read${type.name.toLowerCase().capitalize()}(${readFnBuilder(type)})"
+ }
 
 private fun StandardField.readFnBuilder(type: FieldType) =
  when (type) {
@@ -257,9 +266,18 @@ private fun deserializeOptions(f: StandardField, ctx: Context) =
  keyWrap = mapKeyConverter(f, ctx)?.toString(),
  valueWrap = mapValueConverter(f, ctx)?.toString(),
  valueType = f.mapEntry?.value?.type,
- type = f.type.toString(),
+ type = f.type,
  oneof = true
  )
  } else {
  null
  }
+
+class Options(
+ val wrapName: String,
+ val keyWrap: String?,
+ val valueWrap: String?,
+ val valueType: FieldType?,
+ val type: FieldType,
+ val oneof: Boolean
+)