isolate more and get tests passing

extensions/protokt-extensions-lite/build.gradle.kts

@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+import com.google.protobuf.gradle.proto
 import protokt.v1.gradle.protokt
 import protokt.v1.gradle.protoktExtensions
 
@@ -57,6 +58,14 @@ kotlin {
  }
 }
 
+sourceSets {
+ main {
+ proto {
+ srcDir("src/extensions-proto")
+ }
+ }
+}
+
 dependencies {
  protoktExtensions(project(":extensions:protokt-extensions-simple"))
 }

extensions/protokt-extensions/build.gradle.kts

@@ -54,6 +54,7 @@ sourceSets {
  main {
  proto {
  srcDir("../protokt-extensions-lite/src/main/proto")
+ srcDir("../protokt-extensions-lite/src/extensions-proto")
  }
  }
 }

protokt-codegen/build.gradle.kts

@@ -86,7 +86,7 @@ sourceSets {
  srcDir("../buildSrc/src/shared/codegen")
  }
  proto {
- srcDir("../extensions/protokt-extensions-lite/src/main/proto")
+ srcDir("../extensions/protokt-extensions-lite/src/extensions-proto")
  }
  }
 }

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

@@ -31,7 +31,6 @@ import protokt.v1.UnknownFieldSet
 import protokt.v1.codegen.generate.CodeGenerator.Context
 import protokt.v1.codegen.generate.Wrapper.interceptRead
 import protokt.v1.codegen.generate.Wrapper.wrapField
-import protokt.v1.codegen.generate.Wrapper.wrapper
 import protokt.v1.codegen.util.KotlinPlugin
 import protokt.v1.codegen.util.Message
 import protokt.v1.codegen.util.Oneof
@@ -215,7 +214,7 @@ private class DeserializerGenerator(
 
 internal 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.isMap -> deserializeMap(f, read)

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

@@ -32,6 +32,7 @@ import protokt.v1.codegen.generate.CodeGenerator.Context
 import protokt.v1.codegen.generate.Nullability.nullable
 import protokt.v1.codegen.generate.Wrapper.interceptDefaultValue
 import protokt.v1.codegen.generate.Wrapper.interceptTypeName
+import protokt.v1.codegen.generate.Wrapper.wrapField
 import protokt.v1.codegen.util.DESERIALIZER
 import protokt.v1.codegen.util.Message
 import protokt.v1.codegen.util.SizeFn
@@ -184,11 +185,24 @@ private class MapEntryGenerator(
  add("?: %L", keyPropInfo.defaultValue)
  }
  add(", value")
- if (value.type == FieldType.Message && !valPropInfo.wrapped) {
- add("?: %T {}", value.className)
- } else if (valPropInfo.nullable || valPropInfo.wrapped) {
- // todo: add a test verifying absent message wrapped value type uses the default
- add("?: %L", interceptDefaultValue(value, CodeBlock.of("%T {}", value.className), ctx))
+ if (valPropInfo.nullable) {
+ if (valPropInfo.wrapped) {
+ if (value.type == FieldType.Message) {
+ add("?: %L", wrapField(value, ctx, CodeBlock.of("%T {}", value.className)))
+ } else {
+ add("?: %L", valPropInfo.defaultValue)
+ }
+ } else {
+ if (value.type == FieldType.Message) {
+ add("?: %T {}", value.className)
+ } else {
+ add("?: %L", interceptDefaultValue(value, valPropInfo.defaultValue, ctx))
+ }
+ }
+ } else {
+ if (valPropInfo.wrapped) {
+ add("?: %L", valPropInfo.defaultValue)
+ }
  }
  add(")")
  }

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

@@ -107,9 +107,6 @@ internal object Wrapper {
  callConverterMethod(Converter<Any, Any>::unwrap, it, accessValue)
  } ?: accessValue
 
- fun wrapField(wrapName: TypeName, arg: CodeBlock) =
- CodeBlock.of("%T.%L(%L)", wrapName, Converter<Any, Any>::wrap.name, arg)
-
  private fun callConverterMethod(
  method: KFunction2<*, *, *>,
  converterDetails: ConverterDetails,
@@ -134,10 +131,16 @@ internal object Wrapper {
  if (f.type == FieldType.Message && !f.repeated) {
  defaultValue
  } else {
- wrapper(f, ctx)?.let { wrapField(it, defaultValue) } ?: defaultValue
+ wrapField(f, ctx, defaultValue) ?: defaultValue
  }
  }
 
+ fun wrapField(f: StandardField, ctx: Context, argToConverter: CodeBlock) =
+ wrapper(f, ctx)?.let { wrapField(it, argToConverter) }
+
+ private fun wrapField(wrapName: TypeName, arg: CodeBlock) =
+ CodeBlock.of("%T.%L(%L)", wrapName, Converter<Any, Any>::wrap.name, arg)
+
  fun StandardField.interceptTypeName(ctx: Context) =
  if (bytesSlice) {
  BytesSlice::class.asTypeName()

protokt-reflect/api/protokt-reflect.api

@@ -1,119 +1,3 @@
-public final class com/toasttab/protokt/v1/InetSocketAddressProto {
- public static fun getDescriptor ()Lcom/google/protobuf/Descriptors$FileDescriptor;
- public static fun registerAllExtensions (Lcom/google/protobuf/ExtensionRegistry;)V
- public static fun registerAllExtensions (Lcom/google/protobuf/ExtensionRegistryLite;)V
-}
-
-public final class com/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress : com/google/protobuf/GeneratedMessageV3, com/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddressOrBuilder {
- public static final field ADDRESS_FIELD_NUMBER I
- public static final field PORT_FIELD_NUMBER I
- public fun equals (Ljava/lang/Object;)Z
- public fun getAddress ()Lcom/google/protobuf/ByteString;
- public static fun getDefaultInstance ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public synthetic fun getDefaultInstanceForType ()Lcom/google/protobuf/Message;
- public synthetic fun getDefaultInstanceForType ()Lcom/google/protobuf/MessageLite;
- public fun getDefaultInstanceForType ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static final fun getDescriptor ()Lcom/google/protobuf/Descriptors$Descriptor;
- public fun getParserForType ()Lcom/google/protobuf/Parser;
- public fun getPort ()I
- public fun getSerializedSize ()I
- public final fun getUnknownFields ()Lcom/google/protobuf/UnknownFieldSet;
- public fun hashCode ()I
- public final fun isInitialized ()Z
- public static fun newBuilder ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public static fun newBuilder (Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun newBuilderForType ()Lcom/google/protobuf/Message$Builder;
- public synthetic fun newBuilderForType ()Lcom/google/protobuf/MessageLite$Builder;
- public fun newBuilderForType ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public static fun parseDelimitedFrom (Ljava/io/InputStream;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseDelimitedFrom (Ljava/io/InputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Lcom/google/protobuf/ByteString;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Lcom/google/protobuf/ByteString;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Lcom/google/protobuf/CodedInputStream;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Lcom/google/protobuf/CodedInputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Ljava/io/InputStream;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Ljava/io/InputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Ljava/nio/ByteBuffer;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom (Ljava/nio/ByteBuffer;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom ([B)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parseFrom ([BLcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static fun parser ()Lcom/google/protobuf/Parser;
- public synthetic fun toBuilder ()Lcom/google/protobuf/Message$Builder;
- public synthetic fun toBuilder ()Lcom/google/protobuf/MessageLite$Builder;
- public fun toBuilder ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public fun writeTo (Lcom/google/protobuf/CodedOutputStream;)V
-}
-
-public final class com/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder : com/google/protobuf/GeneratedMessageV3$Builder, com/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddressOrBuilder {
- public synthetic fun addRepeatedField (Lcom/google/protobuf/Descriptors$FieldDescriptor;Ljava/lang/Object;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun addRepeatedField (Lcom/google/protobuf/Descriptors$FieldDescriptor;Ljava/lang/Object;)Lcom/google/protobuf/Message$Builder;
- public fun addRepeatedField (Lcom/google/protobuf/Descriptors$FieldDescriptor;Ljava/lang/Object;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun build ()Lcom/google/protobuf/Message;
- public synthetic fun build ()Lcom/google/protobuf/MessageLite;
- public fun build ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public synthetic fun buildPartial ()Lcom/google/protobuf/Message;
- public synthetic fun buildPartial ()Lcom/google/protobuf/MessageLite;
- public fun buildPartial ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public synthetic fun clear ()Lcom/google/protobuf/AbstractMessage$Builder;
- public synthetic fun clear ()Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun clear ()Lcom/google/protobuf/Message$Builder;
- public synthetic fun clear ()Lcom/google/protobuf/MessageLite$Builder;
- public fun clear ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public fun clearAddress ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun clearField (Lcom/google/protobuf/Descriptors$FieldDescriptor;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun clearField (Lcom/google/protobuf/Descriptors$FieldDescriptor;)Lcom/google/protobuf/Message$Builder;
- public fun clearField (Lcom/google/protobuf/Descriptors$FieldDescriptor;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun clearOneof (Lcom/google/protobuf/Descriptors$OneofDescriptor;)Lcom/google/protobuf/AbstractMessage$Builder;
- public synthetic fun clearOneof (Lcom/google/protobuf/Descriptors$OneofDescriptor;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun clearOneof (Lcom/google/protobuf/Descriptors$OneofDescriptor;)Lcom/google/protobuf/Message$Builder;
- public fun clearOneof (Lcom/google/protobuf/Descriptors$OneofDescriptor;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public fun clearPort ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun clone ()Lcom/google/protobuf/AbstractMessage$Builder;
- public synthetic fun clone ()Lcom/google/protobuf/AbstractMessageLite$Builder;
- public synthetic fun clone ()Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun clone ()Lcom/google/protobuf/Message$Builder;
- public synthetic fun clone ()Lcom/google/protobuf/MessageLite$Builder;
- public fun clone ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun clone ()Ljava/lang/Object;
- public fun getAddress ()Lcom/google/protobuf/ByteString;
- public synthetic fun getDefaultInstanceForType ()Lcom/google/protobuf/Message;
- public synthetic fun getDefaultInstanceForType ()Lcom/google/protobuf/MessageLite;
- public fun getDefaultInstanceForType ()Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;
- public static final fun getDescriptor ()Lcom/google/protobuf/Descriptors$Descriptor;
- public fun getDescriptorForType ()Lcom/google/protobuf/Descriptors$Descriptor;
- public fun getPort ()I
- public final fun isInitialized ()Z
- public synthetic fun mergeFrom (Lcom/google/protobuf/CodedInputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/google/protobuf/AbstractMessage$Builder;
- public synthetic fun mergeFrom (Lcom/google/protobuf/CodedInputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/google/protobuf/AbstractMessageLite$Builder;
- public synthetic fun mergeFrom (Lcom/google/protobuf/CodedInputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/google/protobuf/Message$Builder;
- public synthetic fun mergeFrom (Lcom/google/protobuf/CodedInputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/google/protobuf/MessageLite$Builder;
- public fun mergeFrom (Lcom/google/protobuf/CodedInputStream;Lcom/google/protobuf/ExtensionRegistryLite;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun mergeFrom (Lcom/google/protobuf/Message;)Lcom/google/protobuf/AbstractMessage$Builder;
- public synthetic fun mergeFrom (Lcom/google/protobuf/Message;)Lcom/google/protobuf/Message$Builder;
- public fun mergeFrom (Lcom/google/protobuf/Message;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public fun mergeFrom (Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun mergeUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/google/protobuf/AbstractMessage$Builder;
- public synthetic fun mergeUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun mergeUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/google/protobuf/Message$Builder;
- public final fun mergeUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public fun setAddress (Lcom/google/protobuf/ByteString;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun setField (Lcom/google/protobuf/Descriptors$FieldDescriptor;Ljava/lang/Object;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun setField (Lcom/google/protobuf/Descriptors$FieldDescriptor;Ljava/lang/Object;)Lcom/google/protobuf/Message$Builder;
- public fun setField (Lcom/google/protobuf/Descriptors$FieldDescriptor;Ljava/lang/Object;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public fun setPort (I)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun setRepeatedField (Lcom/google/protobuf/Descriptors$FieldDescriptor;ILjava/lang/Object;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun setRepeatedField (Lcom/google/protobuf/Descriptors$FieldDescriptor;ILjava/lang/Object;)Lcom/google/protobuf/Message$Builder;
- public fun setRepeatedField (Lcom/google/protobuf/Descriptors$FieldDescriptor;ILjava/lang/Object;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
- public synthetic fun setUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/google/protobuf/GeneratedMessageV3$Builder;
- public synthetic fun setUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/google/protobuf/Message$Builder;
- public final fun setUnknownFields (Lcom/google/protobuf/UnknownFieldSet;)Lcom/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddress$Builder;
-}
-
-public abstract interface class com/toasttab/protokt/v1/InetSocketAddressProto$InetSocketAddressOrBuilder : com/google/protobuf/MessageOrBuilder {
- public abstract fun getAddress ()Lcom/google/protobuf/ByteString;
- public abstract fun getPort ()I
-}
-
 public final class com/toasttab/protokt/v1/ProtoktProtos {
  public static final field CLASS_FIELD_NUMBER I
  public static final field ENUM_FIELD_NUMBER I
@@ -1203,48 +1087,6 @@ public final class protokt/v1/FileOptions$Deserializer : protokt/v1/AbstractKtDe
  public final fun invoke (Lkotlin/jvm/functions/Function1;)Lprotokt/v1/FileOptions;
 }
 
-public final class protokt/v1/InetSocketAddress : protokt/v1/AbstractKtMessage {
- public static final field Deserializer Lprotokt/v1/InetSocketAddress$Deserializer;
- public synthetic fun <init> (Lprotokt/v1/Bytes;ILprotokt/v1/UnknownFieldSet;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
- public final fun copy (Lkotlin/jvm/functions/Function1;)Lprotokt/v1/InetSocketAddress;
- public static fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lprotokt/v1/InetSocketAddress;
- public fun equals (Ljava/lang/Object;)Z
- public final fun getAddress ()Lprotokt/v1/Bytes;
- public fun getMessageSize ()I
- public final fun getPort ()I
- public final fun getUnknownFields ()Lprotokt/v1/UnknownFieldSet;
- public fun hashCode ()I
- public static final fun invoke (Lkotlin/jvm/functions/Function1;)Lprotokt/v1/InetSocketAddress;
- public fun serialize (Lprotokt/v1/KtMessageSerializer;)V
- public fun toString ()Ljava/lang/String;
-}
-
-public final class protokt/v1/InetSocketAddress$Builder {
- public fun <init> ()V
- public final fun build ()Lprotokt/v1/InetSocketAddress;
- public final fun getAddress ()Lprotokt/v1/Bytes;
- public final fun getPort ()I
- public final fun getUnknownFields ()Lprotokt/v1/UnknownFieldSet;
- public final fun setAddress (Lprotokt/v1/Bytes;)V
- public final fun setPort (I)V
- public final fun setUnknownFields (Lprotokt/v1/UnknownFieldSet;)V
-}
-
-public final class protokt/v1/InetSocketAddress$Deserializer : protokt/v1/AbstractKtDeserializer {
- public fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lprotokt/v1/InetSocketAddress;
- public synthetic fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lprotokt/v1/KtMessage;
- public final fun invoke (Lkotlin/jvm/functions/Function1;)Lprotokt/v1/InetSocketAddress;
-}
-
-public final class protokt/v1/InetSocketAddressProto {
- public static final field INSTANCE Lprotokt/v1/InetSocketAddressProto;
- public final fun getDescriptor ()Lprotokt/v1/google/protobuf/FileDescriptor;
-}
-
-public final class protokt/v1/Inet_socket_addressKt {
- public static final fun getDescriptor (Lprotokt/v1/InetSocketAddress$Deserializer;)Lprotokt/v1/google/protobuf/Descriptor;
-}
-
 public final class protokt/v1/MessageOptions : protokt/v1/AbstractKtMessage {
  public static final field Deserializer Lprotokt/v1/MessageOptions$Deserializer;
  public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lprotokt/v1/UnknownFieldSet;Lkotlin/jvm/internal/DefaultConstructorMarker;)V

protokt-reflect/build.gradle.kts

@@ -63,7 +63,9 @@ sourceSets {
  srcDir("../unpublished/src/reflect")
  }
  proto {
- srcDir("../extensions/protokt-extensions-lite/src/main/proto")
+ srcDirs(
+ "../extensions/protokt-extensions-lite/src/extensions-proto"
+ )
  }
  }
 }