Merge remote-tracking branch 'origin/main' into gradle-kotlin-bumps

open-toast · Mar 10, 2024 · 92099cd · 92099cd
2 parents 3a1ec95 + d74dc53
commit 92099cd
Show file tree

Hide file tree

Showing 55 changed files with 688 additions and 422 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -42,3 +42,12 @@ dependencies {
  implementation(kotlin("gradle-plugin-api"))
  implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
+
+sourceSets {
+ main {
+ java {
+ srcDir("../shared-src/codegen")
+ srcDir("../shared-src/gradle-plugin")
+ }
+ }
+}
diff --git a/buildSrc/src/main/kotlin/LocalProtoktBuild.kt b/buildSrc/src/main/kotlin/LocalProtoktBuild.kt
@@ -15,10 +15,8 @@
 
 import com.google.protobuf.gradle.GenerateProtoTask
 import org.gradle.api.Project
-import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.the
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import protokt.v1.gradle.CODEGEN_NAME
@@ -37,13 +35,6 @@ fun Project.localProtokt() {
  }
 }
 
-fun Project.includeBuildSrc(vararg filePatterns: String) {
- the<SourceSetContainer>()["main"].java {
- srcDir(rootProject.file("buildSrc/src/main/kotlin"))
- filePatterns.forEach { include(it) }
- }
-}
-
 fun Project.pureKotlin() {
  tasks.withType<JavaCompile> {
  enabled = false

diff --git a/buildSrc/src/main/kotlin/protokt.spotless-conventions.gradle.kts b/buildSrc/src/main/kotlin/protokt.spotless-conventions.gradle.kts
@@ -78,7 +78,10 @@ allprojects {
  "examples/protos/src/main/proto/io/grpc/examples/route_guide.proto",
  "testing/conformance/driver/src/main/proto/conformance/conformance.proto",
  "testing/conformance/driver/src/main/proto/proto3/test_messages_proto3.proto",
- "testing/interop/src/main/proto/tutorial/addressbook.proto"
+ "testing/interop/src/main/proto/tutorial/addressbook.proto",
+ "testing/interop/src/main/proto/google/protobuf/unittest_import.proto",
+ "testing/interop/src/main/proto/google/protobuf/unittest_import_public.proto",
+ "testing/interop/src/main/proto/google/protobuf/unittest_proto3.proto",
  ).map(rootProject::file) +
  "node_modules/**" +
  "**/build/extracted-include-protos/**" +

diff --git a/examples/grpc-java-lite/build.gradle.kts b/examples/grpc-java-lite/build.gradle.kts
@@ -36,8 +36,6 @@ dependencies {
  implementation(libs.jackson)
 
  runtimeOnly(libs.protobuf.lite)
-
- testImplementation(project(":protokt-util"))
 }
 
 sourceSets {
@@ -51,6 +49,7 @@ sourceSets {
  test {
  java {
  srcDir(liteOptionTestSourceDir())
+ srcDir(rootProject.file("shared-src/lite-util"))
  }
  }
 }
diff --git a/examples/grpc-kotlin-lite/build.gradle.kts b/examples/grpc-kotlin-lite/build.gradle.kts
@@ -43,7 +43,6 @@ dependencies {
 
  testImplementation(kotlin("test-junit"))
  testImplementation(libs.grpc.testing)
- testImplementation(project(":protokt-util"))
 }
 
 sourceSets {
@@ -60,6 +59,7 @@ sourceSets {
  java {
  srcDir("../grpc-kotlin/src/test/kotlin")
  srcDir(liteOptionTestSourceDir())
+ srcDir(rootProject.file("shared-src/lite-util"))
  }
  }
 }
diff --git a/gradle-plugin-integration-test/jvm-lite/build.gradle.kts b/gradle-plugin-integration-test/jvm-lite/build.gradle.kts
@@ -36,7 +36,6 @@ dependencies {
  testImplementation(kotlin("test-junit5"))
  testImplementation(libs.junit.jupiter)
  testImplementation(libs.protobuf.java)
- testImplementation("com.toasttab.protokt:protokt-util:$version")
 }
 
 sourceSets {
@@ -53,6 +52,8 @@ sourceSets {
  check(file(lite).exists())
  srcDir(common)
  srcDir(lite)
+
+ srcDir(rootProject.file("../shared-src/lite-util"))
  }
  }
 }

diff --git a/protokt-codegen/build.gradle.kts b/protokt-codegen/build.gradle.kts
@@ -81,6 +81,9 @@ tasks.withType<Test> {
 
 sourceSets {
  main {
+ java {
+ srcDir("../shared-src/codegen")
+ }
  proto {
  srcDir("../extensions/protokt-extensions-lite/src/main/proto")
  }
@@ -93,8 +96,3 @@ buildConfig {
  buildConfigField("String", "DEFAULT_PROTOBUF_VERSION", "\"${libs.versions.protobuf.java.get()}\"")
  buildConfigField("String", "PROTOKT_VERSION", "\"$version\"")
 }
-
-includeBuildSrc(
- "protokt/v1/gradle/ProtoktExtension.kt",
- "**/*.java" // don't override the protobuf-gradle-plugin; todo: fix this function to not need this
-)
diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/BuilderGenerator.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/BuilderGenerator.kt
@@ -70,7 +70,7 @@ private class BuilderGenerator(
  .mutable(true)
  .handleDeprecation(it.deprecation)
  .apply {
- if (it.map) {
+ if (it.isMap) {
  setter(
  FunSpec.setterBuilder()
  .addParameter("newValue", Map::class)
@@ -88,7 +88,7 @@ private class BuilderGenerator(
  }
  .initializer(
  when {
- it.map -> CodeBlock.of("emptyMap()")
+ it.isMap -> CodeBlock.of("emptyMap()")
  it.repeated -> CodeBlock.of("emptyList()")
  it.fieldType == FieldType.Message || it.wrapped || it.nullable -> CodeBlock.of("null")
  else -> it.defaultValue

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/CodeGenerator.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/CodeGenerator.kt
@@ -35,11 +35,7 @@ object CodeGenerator {
 
  fun generate(contents: ProtoFileContents) =
  contents.types.flatMap {
- generate(
- it,
- Context(emptyList(), contents.info)
- )
- .map { type -> GeneratedType(it, type) }
+ generate(it, Context(emptyList(), contents.info)).map(::GeneratedType)
  }
 
  fun generate(type: TopLevelType, ctx: Context): Iterable<TypeSpec> =

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/DeserializerGenerator.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/DeserializerGenerator.kt
@@ -30,10 +30,7 @@ import protokt.v1.KtMessageDeserializer
 import protokt.v1.UnknownFieldSet
 import protokt.v1.codegen.generate.CodeGenerator.Context
 import protokt.v1.codegen.generate.Wrapper.interceptRead
-import protokt.v1.codegen.generate.Wrapper.mapKeyConverter
-import protokt.v1.codegen.generate.Wrapper.mapValueConverter
 import protokt.v1.codegen.generate.Wrapper.wrapField
-import protokt.v1.codegen.generate.Wrapper.wrapper
 import protokt.v1.codegen.util.FieldType
 import protokt.v1.codegen.util.FieldType.Enum
 import protokt.v1.codegen.util.FieldType.SFixed32
@@ -83,7 +80,7 @@ private class DeserializerGenerator(
  beginControlFlow("when (deserializer.readTag())")
  val constructor =
  buildCodeBlock {
- add("0·->·return·%T(\n", msg.className)
+ add("0u·->·return·%T(\n", msg.className)
  withIndent {
  constructorLines(properties).forEach(::add)
  }
@@ -92,7 +89,7 @@ private class DeserializerGenerator(
  addStatement("%L", constructor)
  deserializerInfo.forEach {
  addStatement(
- "%L -> %N = %L",
+ "%Lu -> %N = %L",
  it.tag,
  it.fieldName,
  it.value
@@ -142,7 +139,7 @@ private class DeserializerGenerator(
  }
 
  private fun deserializeType(p: PropertyInfo) =
- if (p.repeated || p.map) {
+ if (p.repeated || p.isMap) {
  p.deserializeType as ParameterizedTypeName
  ClassName(p.deserializeType.rawType.packageName, "Mutable" + p.deserializeType.rawType.simpleName)
  .parameterizedBy(p.deserializeType.typeArguments)
@@ -156,7 +153,7 @@ private class DeserializerGenerator(
  CodeBlock.of("%T.from(unknownFields)", UnknownFieldSet::class)
 
  private class DeserializerInfo(
- val tag: Int,
+ val tag: UInt,
  val fieldName: String,
  val value: CodeBlock
  )
@@ -217,10 +214,10 @@ private class DeserializerGenerator(
 
 fun deserialize(f: StandardField, ctx: Context, packed: Boolean = false): CodeBlock {
  val read = CodeBlock.of("deserializer.%L", interceptRead(f, f.readFn()))
- val wrappedRead = wrapper(f, ctx)?.let { wrapField(it, read) } ?: read
+ val wrappedRead = wrapField(f, ctx, read) ?: read
 
  return when {
- f.map -> deserializeMap(f, ctx, read)
+ f.isMap -> deserializeMap(f, read)
  f.repeated ->
  buildCodeBlock {
  add("\n(%N ?: mutableListOf())", f.fieldName)
@@ -234,24 +231,14 @@ fun deserialize(f: StandardField, ctx: Context, packed: Boolean = false): CodeBl
  }
 }
 
-private fun deserializeMap(f: StandardField, ctx: Context, read: CodeBlock): CodeBlock {
- val key =
- mapKeyConverter(f, ctx)
- ?.let { wrapField(it, CodeBlock.of("it.key")) }
- ?: CodeBlock.of("it.key")
-
- val value =
- mapValueConverter(f, ctx)
- ?.let { wrapField(it, CodeBlock.of("it.value")) }
- ?: CodeBlock.of("it.value")
-
+private fun deserializeMap(f: StandardField, read: CodeBlock): CodeBlock {
  return buildCodeBlock {
  add("\n(%N ?: mutableMapOf())", f.fieldName)
  beginControlFlow(".apply")
  beginControlFlow("deserializer.readRepeated(false)")
  add(read)
  beginControlFlow(".let")
- add("put(%L, %L)\n", key, value)
+ add("put(%L, %L)\n", CodeBlock.of("it.key"), CodeBlock.of("it.value"))
  endControlFlow()
  endControlFlow()
  endControlFlowWithoutNewline()

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/DeserializerSupport.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/DeserializerSupport.kt
@@ -21,10 +21,7 @@ import com.squareup.kotlinpoet.withIndent
 import protokt.v1.codegen.util.FieldType
 
 fun deserializeVarInitialState(p: PropertyInfo) =
- if (
- (p.repeated || p.wrapped || p.nullable || p.fieldType == FieldType.Message) &&
- !p.mapEntry
- ) {
+ if (p.repeated || p.wrapped || p.nullable || p.fieldType == FieldType.Message) {
  CodeBlock.of("null")
  } else {
  p.defaultValue
@@ -48,7 +45,7 @@ fun wrapDeserializedValueForConstructor(p: PropertyInfo) =
  endControlFlowWithoutNewline()
  }
  } else {
- if (p.map) {
+ if (p.isMap) {
  CodeBlock.of("%M(%N)", unmodifiableMap, p.name)
  } else if (p.repeated) {
  CodeBlock.of("%M(%N)", unmodifiableList, p.name)

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/Implements.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/Implements.kt
@@ -27,7 +27,7 @@ object Implements {
  msg: Message
  ) =
  msg.superInterface(ctx)
- ?.let { fieldName in ctx.info.context.classLookup.properties(it) }
+ ?.let { fieldName in ctx.info.context.classLookup.properties(it.canonicalName) }
  ?: false
 
  fun TypeSpec.Builder.handleSuperInterface(implements: ClassName?, v: OneofGeneratorInfo? = null) =
@@ -46,7 +46,6 @@ object Implements {
  if (msg.options.protokt.implements.isNotEmpty()) {
  if (msg.options.protokt.implements.delegates()) {
  addSuperinterface(
- // TODO: parameterize this by the ctx package?
  ClassName.bestGuess(msg.options.protokt.implements.substringBefore(" by ")),
  msg.options.protokt.implements.substringAfter(" by ")
  )

diff --git a/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/KotlinPoetUtil.kt b/protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/KotlinPoetUtil.kt
@@ -26,6 +26,7 @@ import com.squareup.kotlinpoet.asTypeName
 import protokt.v1.Collections
 import protokt.v1.SizeCodecs
 import protokt.v1.codegen.generate.CodeGenerator.Context
+import protokt.v1.codegen.util.inferClassName
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction1
 
@@ -85,14 +86,6 @@ fun CodeBlock.Builder.endControlFlowWithoutNewline() {
  add("}")
 }
 
-fun inferClassName(className: String, ctx: Context) =
+internal fun inferClassName(className: String, ctx: Context) =
  inferClassName(className, ctx.info.kotlinPackage)
-
-fun inferClassName(className: String, pkg: String): ClassName {
- val inferred = ClassName.bestGuess(className)
- return if (inferred.packageName == "") {
- ClassName(pkg, className.split("."))
- } else {
- inferred
- }
-}
+ .let { (pkg, names) -> ClassName(pkg, names) }