runtime polish

benchmarks/protokt-benchmarks/src/main/kotlin/protokt/v1/benchmarks/FixtureGenerator.kt

@@ -91,7 +91,7 @@ class FixtureGenerator(private val weight: Int) {
             Boolean::class -> random.nextInt() % 2 == 0
             Float::class -> random.nextFloat()
             Double::class -> random.nextDouble()
-            Bytes::class -> Bytes(ByteArray(randomSize()).also { random.nextBytes(it) })
+            Bytes::class -> Bytes.from(ByteArray(randomSize()).also { random.nextBytes(it) })
             String::class -> String(ByteArray(randomSize()).also { random.nextBytes(it) })
             else -> throw IllegalArgumentException("unknown $cls")
         }
@@ -102,9 +102,7 @@ class FixtureGenerator(private val weight: Int) {
         BenchmarkDataset {
             this.name = name
             messageName = msg.qualifiedName!!
-            payload = (0..size).map {
-                Bytes(randomMessageValue(msg).serialize())
-            }
+            payload = (0..size).map { Bytes.from(randomMessageValue(msg)) }
         }
 }
 

buildSrc/src/main/kotlin/protokt.multiplatform-conventions.gradle.kts

@@ -24,12 +24,16 @@ kotlin {
     }
 
     js(IR) {
-        browser {}
-        nodejs {}
-        useCommonJs()
+        configureJsTests()
     }
 
     sourceSets {
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+
         val jvmTest by getting {
             dependencies {
                 implementation(libs.junit.jupiter)

examples/grpc-node/build.gradle.kts

@@ -69,8 +69,9 @@ fun GradleBuild.setUp(service: String, mode: String, vararg extra: Pair<String,
     startParameter.projectProperties =
         mapOf(
             "service" to service,
-            "mode" to mode
-        ) + extra.toMap()
+            "mode" to mode,
+            *extra
+        )
 }
 
 tasks.register<GradleBuild>("HelloWorldServer") {

extensions/protokt-jvm-extensions-lite/api/protokt-jvm-extensions-lite.api

@@ -62,24 +62,19 @@ public final class protokt/v1/InetSocketAddress : protokt/v1/AbstractKtMessage {
 	public static final field Deserializer Lprotokt/v1/InetSocketAddress$Deserializer;
 	public synthetic fun <init> (Ljava/net/InetAddress;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 ()Ljava/net/InetAddress;
 	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$Deserializer : protokt/v1/AbstractKtDeserializer {
-	public synthetic fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lcom/toasttab/protokt/rt/KtMessage;
-	public fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lprotokt/v1/InetSocketAddress;
-	public synthetic fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lprotokt/v1/KtMessage;
-	public final synthetic fun invoke (Lkotlin/jvm/functions/Function1;)Lprotokt/v1/InetSocketAddress;
-}
-
-public final class protokt/v1/InetSocketAddress$InetSocketAddressDsl {
+public final class protokt/v1/InetSocketAddress$Builder {
 	public fun <init> ()V
 	public final fun build ()Lprotokt/v1/InetSocketAddress;
 	public final fun getAddress ()Ljava/net/InetAddress;
@@ -90,6 +85,13 @@ public final class protokt/v1/InetSocketAddress$InetSocketAddressDsl {
 	public final fun setUnknownFields (Lprotokt/v1/UnknownFieldSet;)V
 }
 
+public final class protokt/v1/InetSocketAddress$Deserializer : protokt/v1/AbstractKtDeserializer {
+	public synthetic fun deserialize (Lprotokt/v1/KtMessageDeserializer;)Lcom/toasttab/protokt/rt/KtMessage;
+	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/InetSocketAddressConverter : protokt/v1/Converter {
 	public static final field INSTANCE Lprotokt/v1/InetSocketAddressConverter;
 	public fun getWrapped ()Lkotlin/reflect/KClass;
@@ -100,7 +102,3 @@ public final class protokt/v1/InetSocketAddressConverter : protokt/v1/Converter
 	public fun wrap (Lprotokt/v1/InetSocketAddress;)Ljava/net/InetSocketAddress;
 }
 
-public final class protokt/v1/Inet_socket_addressKt {
-	public static final fun InetSocketAddress (Lkotlin/jvm/functions/Function1;)Lprotokt/v1/InetSocketAddress;
-}
-

extensions/protokt-jvm-extensions-simple/src/main/kotlin/protokt/v1/InetAddressBytesConverter.kt

@@ -32,5 +32,5 @@ object InetAddressBytesConverter : Converter<InetAddress, Bytes> {
     }
 
     override fun unwrap(wrapped: InetAddress): Bytes =
-        Bytes(wrapped.address)
+        Bytes.from(wrapped.address)
 }

extensions/protokt-jvm-extensions-simple/src/main/kotlin/protokt/v1/UuidBytesConverter.kt

@@ -16,6 +16,8 @@
 package protokt.v1
 
 import com.google.auto.service.AutoService
+import protokt.v1.JvmBytes.asReadOnlyBuffer
+import protokt.v1.SizeCodecs.sizeOf
 import java.nio.ByteBuffer
 import java.util.UUID
 
@@ -41,7 +43,7 @@ object UuidBytesConverter : OptimizedSizeOfConverter<UUID, Bytes> {
     }
 
     override fun unwrap(wrapped: UUID): Bytes =
-        Bytes(
+        Bytes.from(
             ByteBuffer.allocate(16)
                 .putLong(wrapped.mostSignificantBits)
                 .putLong(wrapped.leastSignificantBits)

extensions/protokt-jvm-extensions-simple/src/main/kotlin/protokt/v1/UuidBytesValueConverter.kt

@@ -16,6 +16,7 @@
 package protokt.v1
 
 import com.google.auto.service.AutoService
+import protokt.v1.SizeCodecs.sizeOf
 import protokt.v1.google.protobuf.BytesValue
 import java.util.UUID
 
@@ -26,7 +27,7 @@ object UuidBytesValueConverter : OptimizedSizeOfConverter<UUID, BytesValue> {
     override val wrapped = BytesValue::class
 
     private val sizeOfProxy =
-        BytesValue { value = Bytes(ByteArray(16)) }
+        BytesValue { value = Bytes.from(ByteArray(16)) }
 
     override fun sizeOf(wrapped: UUID) =
         sizeOf(sizeOfProxy)

gradle-plugin-integration-test/semantic-build-versioning.gradle

@@ -0,0 +1 @@
+../semantic-build-versioning.gradle

gradle-plugin-integration-test/wrapper-types/src/main/kotlin/protokt/v1/testing/Id.kt

@@ -31,5 +31,5 @@ object IdConverter : Converter<Id, Bytes> {
         Id(String(unwrapped.bytes))
 
     override fun unwrap(wrapped: Id) =
-        Bytes(wrapped.value.toByteArray())
+        Bytes.from(wrapped.value.toByteArray())
 }

gradle/libs.versions.toml

@@ -13,13 +13,13 @@
 
 [versions]
 autoService = "1.0.1"
-grpc-java = "1.56.1"
-grpc-kotlin = "1.3.0"
+grpc-java = "1.58.0"
+grpc-kotlin = "1.4.0"
 kotlinLogging = "5.1.0"
 kotlinPoet = "1.14.2"
 kotlinx-coroutines = "1.6.0"
 kotlinx-serialization = "1.5.1"
-ktlint = "0.50.0"
+ktlint = "1.0.0"
 protobuf-java = "3.21.7"
 protobuf-js = "6.11.3"
 protobufGradlePlugin = "0.9.4"

protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/DslGenerator.kt → protokt-codegen/src/main/kotlin/protokt/v1/codegen/generate/BuilderGenerator.kt

@@ -23,64 +23,65 @@ import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.buildCodeBlock
 import com.squareup.kotlinpoet.withIndent
-import protokt.v1.KtDsl
+import protokt.v1.KtBuilderDsl
 import protokt.v1.UnknownFieldSet
 import protokt.v1.codegen.generate.Deprecation.handleDeprecation
+import protokt.v1.codegen.util.BUILDER
 import protokt.v1.codegen.util.FieldType
 import protokt.v1.codegen.util.Message
 
-internal fun TypeSpec.Builder.handleDsl(msg: Message, properties: List<PropertyInfo>) =
-    apply { DslGenerator(msg, properties).addDsl(this) }
+internal fun TypeSpec.Builder.handleBuilder(msg: Message, properties: List<PropertyInfo>) =
+    apply { BuilderGenerator(msg, properties).addBuilder(this) }
 
-private class DslGenerator(
+private class BuilderGenerator(
     private val msg: Message,
     private val properties: List<PropertyInfo>
 ) {
-    fun addDsl(builder: TypeSpec.Builder) {
+    fun addBuilder(builder: TypeSpec.Builder) {
         builder.addFunction(
             FunSpec.builder("copy")
                 .returns(msg.className)
                 .addParameter(
-                    "dsl",
+                    "builder",
                     LambdaTypeName.get(
-                        msg.dslClassName,
+                        msg.builderClassName,
                         emptyList(),
                         Unit::class.asTypeName()
                     )
                 )
                 .addCode(
                     buildCodeBlock {
-                        beginControlFlow("return %T().apply", msg.dslClassName)
-                        dslLines().forEach { add("%L\n", it) }
+                        beginControlFlow("return %T().apply", msg.builderClassName)
+                        builderLines().forEach { add("%L\n", it) }
                         addStatement("unknownFields = this@%L.unknownFields", msg.className.simpleName)
-                        addStatement("dsl()")
+                        addStatement("builder()")
                         endControlFlowWithoutNewline()
                         add(".build()")
                     }
                 )
                 .build()
         )
         builder.addType(
-            TypeSpec.classBuilder(msg.dslClassName)
-                .addAnnotation(KtDsl::class)
+            TypeSpec.classBuilder(msg.builderClassName)
+                .addAnnotation(KtBuilderDsl::class)
                 .addProperties(
                     properties.map {
-                        PropertySpec.builder(it.name, it.dslPropertyType)
+                        PropertySpec.builder(it.name, it.builderPropertyType)
                             .mutable(true)
                             .handleDeprecation(it.deprecation)
                             .apply {
                                 if (it.map) {
                                     setter(
                                         FunSpec.setterBuilder()
                                             .addParameter("newValue", Map::class)
-                                            .addCode("field = %M(newValue)", runtimeFunction("copyMap"))
+                                            .addCode("field = %M(newValue)", copyMap)
                                             .build()
                                     )
                                 } else if (it.repeated) {
                                     setter(
                                         FunSpec.setterBuilder()
                                             .addParameter("newValue", List::class)
-                                            .addCode("field = %M(newValue)", runtimeFunction("copyList"))
+                                            .addCode("field = %M(newValue)", copyList)
                                             .build()
                                     )
                                 }
@@ -127,7 +128,7 @@ private class DslGenerator(
         )
     }
 
-    private fun dslLines() =
+    private fun builderLines() =
         properties.map {
             CodeBlock.of(
                 "%N = this@%L.%N",
@@ -137,3 +138,6 @@ private class DslGenerator(
             )
         }
 }
+
+val Message.builderClassName
+    get() = className.nestedClass(BUILDER)

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

@@ -15,16 +15,13 @@
 
 package protokt.v1.codegen.generate
 
-import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.CodeBlock
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.LambdaTypeName
-import com.squareup.kotlinpoet.MemberName
 import com.squareup.kotlinpoet.ParameterizedTypeName
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.TypeSpec
-import com.squareup.kotlinpoet.asClassName
 import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.buildCodeBlock
 import com.squareup.kotlinpoet.withIndent
@@ -45,6 +42,7 @@ import protokt.v1.codegen.util.FieldType.SInt32
 import protokt.v1.codegen.util.FieldType.SInt64
 import protokt.v1.codegen.util.FieldType.UInt32
 import protokt.v1.codegen.util.FieldType.UInt64
+import protokt.v1.codegen.util.KotlinPlugin
 import protokt.v1.codegen.util.Message
 import protokt.v1.codegen.util.Oneof
 import protokt.v1.codegen.util.StandardField
@@ -70,6 +68,9 @@ private class DeserializerGenerator(
             .addFunction(
                 buildFunSpec("deserialize") {
                     addModifiers(KModifier.OVERRIDE)
+                    if (ctx.info.context.appliedKotlinPlugin != KotlinPlugin.JS) {
+                        addAnnotation(JvmStatic::class) // can't put this here generally until JS code is actually common code in a multiplatform module
+                    }
                     addParameter("deserializer", KtMessageDeserializer::class)
                     returns(msg.className)
                     if (properties.isNotEmpty()) {
@@ -109,35 +110,22 @@ private class DeserializerGenerator(
                     endControlFlow()
                 }
             )
-            .apply {
-                msg.nestedTypes
-                    .filterIsInstance<Message>()
-                    .filterNot { it.mapEntry }
-                    .forEach { addConstructorFunction(it, ::addFunction) }
-            }
             .addFunction(
                 buildFunSpec("invoke") {
+                    if (ctx.info.context.appliedKotlinPlugin != KotlinPlugin.JS) {
+                        addAnnotation(JvmStatic::class) // todo: remove when JS code is common in multiplatform
+                    }
+                    addModifiers(KModifier.OPERATOR)
                     returns(msg.className)
-                    addAnnotation(
-                        AnnotationSpec.builder(Deprecated::class)
-                            .addMember("for ABI backwards compatibility only".embed())
-                            .addMember(
-                                CodeBlock.of(
-                                    "level = %M",
-                                    MemberName(DeprecationLevel::class.asClassName(), DeprecationLevel.HIDDEN.name)
-                                )
-                            )
-                            .build()
-                    )
                     addParameter(
                         "dsl",
                         LambdaTypeName.get(
-                            msg.dslClassName,
+                            msg.builderClassName,
                             emptyList(),
                             Unit::class.asTypeName()
                         )
                     )
-                    addStatement("return %T().apply(dsl).build()", msg.dslClassName)
+                    addStatement("return %T().apply(dsl).build()", msg.builderClassName)
                     build()
                 }
             )

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

@@ -46,9 +46,9 @@ fun wrapDeserializedValueForConstructor(p: PropertyInfo) =
         }
     } else {
         if (p.map) {
-            CodeBlock.of("%M(%N)", runtimeFunction("finishMap"), p.name)
+            CodeBlock.of("%M(%N)", unmodifiableMap, p.name)
         } else if (p.repeated) {
-            CodeBlock.of("%M(%N)", runtimeFunction("finishList"), p.name)
+            CodeBlock.of("%M(%N)", unmodifiableList, p.name)
         } else {
             buildCodeBlock {
                 add("%N", p.name)