map value well known wrapper types do not work correctly

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.reflect.inferClassName
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction1
 
@@ -87,12 +88,4 @@ fun CodeBlock.Builder.endControlFlowWithoutNewline() {
 
 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) }

protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/OneofGenerator.kt

@@ -44,7 +44,7 @@ private class OneofGenerator(
  val implements =
  oneof.options.protokt.implements
  .takeIf { it.isNotEmpty() }
- ?.let { inferClassName(it, ctx.info.kotlinPackage) }
+ ?.let { inferClassName(it, ctx) }
 
  TypeSpec.classBuilder(oneof.name)
  .addModifiers(KModifier.SEALED)

protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/Wrapper.kt

@@ -31,6 +31,7 @@ import protokt.v1.codegen.util.StandardField
 import protokt.v1.reflect.ClassLookup
 import protokt.v1.reflect.ConverterDetails
 import protokt.v1.reflect.FieldType
+import protokt.v1.reflect.inferClassName
 import kotlin.reflect.KFunction2
 
 internal object Wrapper {
@@ -56,8 +57,9 @@ internal object Wrapper {
  className.canonicalName,
  type,
  fieldName
- ).let(ClassName::bestGuess),
- inferClassName(wrap, ctx.kotlinPackage),
+ ),
+ inferClassName(wrap, ctx.kotlinPackage)
+ .let { (pkg, names) -> ClassName(pkg, names).canonicalName },
  ctx
  )
  )
@@ -184,6 +186,6 @@ internal object Wrapper {
  ifWrapped
  )
 
- private fun converter(protoClassName: ClassName, kotlinClassName: ClassName, ctx: GeneratorContext) =
- ctx.classLookup.converter(protoClassName.canonicalName, kotlinClassName.canonicalName)
+ private fun converter(protoClassName: String, kotlinClassName: String, ctx: GeneratorContext) =
+ ctx.classLookup.converter(protoClassName, kotlinClassName)
 }

protokt-codegen/src/main/kotlin/protokt/v1/codegen/util/PackageResolution.kt

@@ -17,6 +17,7 @@ package protokt.v1.codegen.util
 
 import com.google.protobuf.DescriptorProtos.FileDescriptorProto
 import protokt.v1.reflect.PROTOKT_V1
+import protokt.v1.reflect.resolvePackage
 
 const val DOT_GOOGLE_PROTOBUF = ".google.protobuf"
 val PROTOKT_V1_GOOGLE_PROTO = PROTOKT_V1 + DOT_GOOGLE_PROTOBUF
@@ -25,8 +26,4 @@ fun packagesByFileName(protoFileList: List<FileDescriptorProto>) =
  protoFileList.associate { it.name to resolvePackage(it) }
 
 fun resolvePackage(fdp: FileDescriptorProto) =
- if (fdp.`package`.startsWith(PROTOKT_V1)) {
- fdp.`package`
- } else {
- "$PROTOKT_V1." + fdp.`package`
- }
+ resolvePackage(fdp.`package`)

protokt-reflect/src/jvmMain/kotlin/protokt/v1/google/protobuf/KtMessages.kt

@@ -37,6 +37,8 @@ import protokt.v1.KtGeneratedMessage
 import protokt.v1.KtMessage
 import protokt.v1.reflect.ClassLookup
 import protokt.v1.reflect.FieldType
+import protokt.v1.reflect.inferClassName
+import protokt.v1.reflect.resolvePackage
 import protokt.v1.reflect.typeName
 import kotlin.Any
 import kotlin.reflect.KClass
@@ -64,7 +66,7 @@ class RuntimeContext internal constructor(
  else -> value
  }
 
- internal fun unwrap(value: Any, field: FieldDescriptor): Any {
+ internal fun unwrap(value: Any, field: FieldDescriptor, wrap: String): Any {
  val proto = field.toProto()
  val type = FieldType.from(proto.type)
  val converterDetails =
@@ -75,8 +77,8 @@ class RuntimeContext internal constructor(
  type,
  field.name
  ),
- // todo: ths is not right; have to infer kotlin name like we do in codegen
- value::class.qualifiedName!!
+ inferClassName(wrap, resolvePackage(field.file.`package`))
+  .let { (pkg, names) -> pkg + "." + names.joinToString(".") }
  )
 
  @Suppress("UNCHECKED_CAST")
@@ -138,6 +140,8 @@ private fun toDynamicMessage(
  .apply {
  descriptor.fields.forEach { field ->
  ProtoktReflect.getField(message, field)?.let { value ->
+ val wrap = wrap(field)
+
  setField(
  field,
  when {
@@ -154,10 +158,16 @@ private fun toDynamicMessage(
 
  // todo: unwrap elements if wrapped
  field.isRepeated ->
- (value as List<*>).map(context::convertValue)
+ (value as List<*>).map {
+ if (isWrapped(field, wrap)) {
+ context.convertValue(context.unwrap(it!!, field, wrap!!))
+ } else {
+ context.convertValue(it)
+ }
+ }
 
- isWrapped(field) ->
- context.convertValue(context.unwrap(value, field))
+ isWrapped(field, wrap) ->
+ context.convertValue(context.unwrap(value, field, wrap!!))
 
  else -> context.convertValue(value)
  },
@@ -182,11 +192,19 @@ private val WRAPPER_TYPE_NAMES =
  "google.protobuf.BytesValue"
  )
 
-private fun isWrapped(field: FieldDescriptor): Boolean {
+private fun isWrapped(field: FieldDescriptor, wrap: String?): Boolean {
  if (field.type == FieldDescriptor.Type.MESSAGE && field.messageType.fullName in WRAPPER_TYPE_NAMES) {
  return true
  }
 
+ return wrap != null
+}
+
+private fun wrap(field: FieldDescriptor): String? {
+ if (field.type == FieldDescriptor.Type.MESSAGE && field.messageType.fullName in WRAPPER_TYPE_NAMES) {
+ return field.messageType.fullName
+ }
+
  val options = field.toProto().options
 
  val propertyOptions =
@@ -199,12 +217,12 @@ private fun isWrapped(field: FieldDescriptor): Boolean {
  .last()
  )
  } else {
- return false
+ return null
  }
 
- return propertyOptions.wrap.isNotEmpty() ||
- propertyOptions.keyWrap.isNotEmpty() ||
- propertyOptions.valueWrap.isNotEmpty()
+ return propertyOptions.wrap.takeIf { it.isNotEmpty() }
+ ?: propertyOptions.keyWrap.takeIf { it.isNotEmpty() }
+ ?: propertyOptions.valueWrap.takeIf { it.isNotEmpty() }
 }
 
 private fun convertMap(

protokt-reflect/src/jvmTest/kotlin/protokt/v1/google/protobuf/DynamicMessageTest.kt

@@ -34,7 +34,7 @@ class DynamicMessageTest {
  fun `dynamic message serialization`() {
  val message = getAllTypesAllSet()
 
- ; verifyMessage(message)
+ verifyMessage(message)
  }
 
  @Test
@@ -52,6 +52,7 @@ class DynamicMessageTest {
  optionalUuid = UUID.randomUUID()
  // optionalIpAddress = InetAddress.getByName("127.0.0.2")
  optionalLocalDate = LocalDate.now().minusDays(2)
+ optionalString = "foo"
  }
 
  verifyMessage(message)
@@ -70,7 +71,7 @@ class DynamicMessageTest {
  verifyMessage(message2)
 
  val message3 =
- OneofWrappers { wrappedOneof = OneofWrappers.WrappedOneof.SocketAddressOneof(InetSocketAddress.createUnresolved("127.0.0.1", 2319)) }
+ OneofWrappers { wrappedOneof = OneofWrappers.WrappedOneof.SocketAddressOneof(InetSocketAddress("127.0.0.1", 2319)) }
 
  verifyMessage(message3)
 
@@ -98,6 +99,11 @@ class DynamicMessageTest {
  OneofWrappers { wrappedOneof = OneofWrappers.WrappedOneof.NullableLocalDateOneof(LocalDate.now()) }
 
  verifyMessage(message8)
+
+ val message9 =
+ OneofWrappers { wrappedOneof = OneofWrappers.WrappedOneof.OptionalString("foo") }
+
+ verifyMessage(message9)
  }
 
  @Test
@@ -106,6 +112,7 @@ class DynamicMessageTest {
  RepeatedWrappers {
  uuids = listOf(UUID.randomUUID(), UUID.randomUUID())
  uuidsWrapped = listOf(UUID.randomUUID(), UUID.randomUUID())
+ strings = listOf("foo")
  }
 
  verifyMessage(message)
@@ -126,6 +133,10 @@ class DynamicMessageTest {
  LocalDate.now() to InetSocketAddress.createUnresolved("127.0.0.1", 2319),
  LocalDate.now().minusDays(1) to InetSocketAddress.createUnresolved("127.0.0.1", 2320)
  )
+
+ // todo: this needs to wrap properly
+ mapStringStringValue =
+ mapOf("foo" to StringValue { value = "bar" })
  }
 
  verifyMessage(message)

protokt-reflect/src/test/proto/protokt/v1/testing/wrappers_dynamic.proto

@@ -69,6 +69,8 @@ message Wrappers {
  optional string optional_local_date = 14 [
  (.protokt.v1.property).wrap = "java.time.LocalDate"
  ];
+
+ google.protobuf.StringValue optional_string = 15;
 }
 
 message OneofWrappers {
@@ -106,6 +108,8 @@ message OneofWrappers {
  google.protobuf.StringValue nullable_local_date_oneof = 10 [
  (.protokt.v1.property).wrap = "java.time.LocalDate"
  ];
+
+ google.protobuf.StringValue optional_string = 11;
  }
 }
 
@@ -117,6 +121,8 @@ message RepeatedWrappers {
  repeated google.protobuf.BytesValue uuids_wrapped = 2 [
  (.protokt.v1.property).wrap = "java.util.UUID"
  ];
+
+ repeated google.protobuf.StringValue strings = 3;
 }
 
 message MapWrappers {
@@ -129,4 +135,6 @@ message MapWrappers {
  (.protokt.v1.property).key_wrap = "java.time.LocalDate",
  (.protokt.v1.property).value_wrap = "java.net.InetSocketAddress"
  ];
+
+ map<string, google.protobuf.StringValue> map_string_string_value = 9;
 }

unpublished/src/reflect/protokt/v1/reflect/ClassLookup.kt

@@ -153,7 +153,7 @@ private fun <T : Any> tryDeserializeDefaultValue(converter: Converter<T, *>): Th
  return if (protoDefault == null) null else tryWrap(protoDefault as T)
 }
 
-class ConverterDetails(
+internal class ConverterDetails(
  val converter: Converter<*, *>,
  val kotlinCanonicalClassName: String,
  val optimizedSizeof: Boolean,

unpublished/src/reflect/protokt/v1/reflect/ClassNames.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 Toast, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package protokt.v1.reflect
+
+internal fun inferClassName(className: String, pkg: String): Pair<String, List<String>> {
+ val inferred = bestGuessPackageName(className)
+ return if (inferred == null) {
+ pkg to className.split(".")
+ } else {
+ inferred to className.substringAfter("$inferred.").split(".")
+ }
+}
+
+private fun bestGuessPackageName(classNameString: String): String? {
+ var p = 0
+ while (p < classNameString.length && Character.isLowerCase(classNameString.codePointAt(p))) {
+ p = classNameString.indexOf('.', p) + 1
+ require(p != 0) { "couldn't make a guess for $classNameString" }
+ }
+ return if (p != 0) {
+ classNameString.substring(0, p - 1)
+ } else {
+ null
+ }
+}

unpublished/src/reflect/protokt/v1/reflect/PackageNames.kt

@@ -40,3 +40,10 @@ internal fun requalifyProtoType(typeName: String) =
  } else {
  "$PROTOKT_V1." + typeName.removePrefix(".")
  }
+
+internal fun resolvePackage(pkg: String) =
+ if (pkg.startsWith(PROTOKT_V1)) {
+ pkg
+ } else {
+ "$PROTOKT_V1.$pkg"
+ }