fix tags in codegen for large field numbers

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/**" +

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> =

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

@@ -83,7 +83,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 +92,7 @@ private class DeserializerGenerator(
                     addStatement("%L", constructor)
                     deserializerInfo.forEach {
                         addStatement(
-                            "%L -> %N = %L",
+                            "%Lu -> %N = %L",
                             it.tag,
                             it.fieldName,
                             it.value
@@ -156,7 +156,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
     )

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

@@ -135,11 +135,11 @@ private class MapEntryGenerator(
                         beginControlFlow("when (deserializer.readTag())")
                         addStatement("%L", constructOnZero(value))
                         addStatement(
-                            "${key.tag.value} -> key = %L",
+                            "${key.tag.value}u -> key = %L",
                             deserialize(key, ctx)
                         )
                         addStatement(
-                            "${value.tag.value} -> value = %L",
+                            "${value.tag.value}u -> value = %L",
                             deserialize(value, ctx)
                         )
                         endControlFlow()
@@ -170,7 +170,7 @@ private class MapEntryGenerator(
 
     private fun constructOnZero(f: StandardField) =
         buildCodeBlock {
-            add("0 -> return %T(key, value", msg.className)
+            add("0u -> return %T(key, value", msg.className)
             if (f.type == FieldType.Message) {
                 add(" ?: %T{}", value.className)
             }

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

@@ -166,11 +166,10 @@ class ProtoFileContents(
 )
 
 class GeneratedType(
-    val rawType: TopLevelType,
     val typeSpec: TypeSpec
 )
 
-sealed class Tag(val value: Int) : Comparable<Tag> {
+sealed class Tag(val value: UInt) : Comparable<Tag> {
     class Packed(
         number: Int
     ) : Tag(computeTag(number, 2))
@@ -188,4 +187,4 @@ sealed class Tag(val value: Int) : Comparable<Tag> {
 }
 
 private fun computeTag(fieldNumber: Int, wireType: Int) =
-    (fieldNumber shl 3) or wireType
+    (fieldNumber shl 3).toUInt() or wireType.toUInt()

protokt-runtime/api/protokt-runtime.api

@@ -595,7 +595,7 @@ public abstract interface class protokt/v1/KtMessageDeserializer {
 	public abstract fun readSInt32 ()I
 	public abstract fun readSInt64 ()J
 	public abstract fun readString ()Ljava/lang/String;
-	public abstract fun readTag ()I
+	public abstract fun readTag-pVg5ArA ()I
 	public fun readUInt32-pVg5ArA ()I
 	public abstract fun readUInt64-s-VKNKU ()J
 	public abstract fun readUnknown ()Lprotokt/v1/UnknownField;

protokt-runtime/src/commonMain/kotlin/protokt/v1/KtMessageDeserializer.kt

@@ -29,7 +29,7 @@ interface KtMessageDeserializer {
     fun readSInt64(): Long
     fun readString(): String
     fun readUInt64(): ULong
-    fun readTag(): Int
+    fun readTag(): UInt
     fun readUnknown(): UnknownField
     fun readRepeated(packed: Boolean, acc: KtMessageDeserializer.() -> Unit)
     fun <T : KtMessage> readMessage(m: KtDeserializer<T>): T

protokt-runtime/src/jsMain/kotlin/protokt/v1/JsKtMessageDeserializer.kt

@@ -17,7 +17,7 @@ package protokt.v1
 
 internal fun deserializer(reader: Reader): KtMessageDeserializer {
     return object : KtMessageDeserializer {
-        var lastTag = 0
+        var lastTag = 0u
         var endPosition = reader.len
 
         override fun readDouble() =
@@ -53,14 +53,14 @@ internal fun deserializer(reader: Reader): KtMessageDeserializer {
         override fun readUInt64() =
             Long.fromProtobufJsLong(reader.uint64()).toULong()
 
-        override fun readTag(): Int {
+        override fun readTag(): UInt {
             lastTag =
                 if (reader.pos == endPosition) {
-                    0
+                    0u
                 } else {
                     val tag = readInt32()
                     check(tag ushr 3 != 0) { "Invalid tag" }
-                    tag
+                    tag.toUInt()
                 }
             return lastTag
         }
@@ -73,7 +73,7 @@ internal fun deserializer(reader: Reader): KtMessageDeserializer {
             readBytes().toBytesSlice()
 
         override fun readUnknown(): UnknownField {
-            val fieldNumber = (lastTag ushr 3).toUInt()
+            val fieldNumber = (lastTag.toInt() ushr 3).toUInt()
 
             return when (tagWireType(lastTag)) {
                 0 -> UnknownField.varint(fieldNumber, readInt64())
@@ -115,5 +115,5 @@ internal fun deserializer(reader: Reader): KtMessageDeserializer {
     }
 }
 
-private fun tagWireType(tag: Int) =
-    tag and ((1 shl 3) - 1)
+private fun tagWireType(tag: UInt) =
+    tag.toInt() and ((1 shl 3) - 1)

protokt-runtime/src/jvmMain/kotlin/com/toasttab/protokt/rt/KtGeneratedMessage.kt

@@ -15,6 +15,7 @@
 
 package com.toasttab.protokt.rt
 
+@Deprecated("use v1")
 @Target(AnnotationTarget.CLASS)
 annotation class KtGeneratedMessage(
     /**

protokt-runtime/src/jvmMain/kotlin/protokt/v1/JvmKtMessageDeserializer.kt

@@ -58,7 +58,7 @@ internal fun deserializer(
             stream.readUInt64().toULong()
 
         override fun readTag() =
-            stream.readTag()
+            stream.readTag().toUInt()
 
         override fun readBytes() =
             Bytes(stream.readByteArray())

testing/interop/src/main/proto/google/protobuf/unittest_import.proto

@@ -0,0 +1,49 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+// Author: kenton@google.com (Kenton Varda)
+//  Based on original Protocol Buffers design by
+//  Sanjay Ghemawat, Jeff Dean, and others.
+//
+// A proto file which is imported by unittest.proto to test importing.
+
+syntax = "proto2";
+
+// We don't put this in a package within proto2 because we need to make sure
+// that the generated code doesn't depend on being in the proto2 namespace.
+// In test_util.h we do
+// "using namespace unittest_import = protobuf_unittest_import".
+package protobuf_unittest_import;
+
+option optimize_for = SPEED;
+option cc_enable_arenas = true;
+
+// Exercise the java_package option.
+option java_package = "com.google.protobuf.test";
+
+// Do not set a java_outer_classname here to verify that Proto2 works without
+// one.
+
+// Test public import
+import public "google/protobuf/unittest_import_public.proto";
+
+message ImportMessage {
+  optional int32 d = 1;
+}
+
+enum ImportEnum {
+  IMPORT_FOO = 7;
+  IMPORT_BAR = 8;
+  IMPORT_BAZ = 9;
+}
+
+// To use an enum in a map, it must has the first value as 0.
+enum ImportEnumForMap {
+  UNKNOWN = 0;
+  FOO = 1;
+  BAR = 2;
+}

testing/interop/src/main/proto/google/protobuf/unittest_import_public.proto

@@ -0,0 +1,18 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+// Author: liujisi@google.com (Pherl Liu)
+
+syntax = "proto2";
+
+package protobuf_unittest_import;
+
+option java_package = "com.google.protobuf.test";
+
+message PublicImportMessage {
+  optional int32 e = 1;
+}