Keep protobuf value types distinct from object refs

src/codegen-ts-runtime.ts

@@ -58,12 +58,12 @@ const tsTypeForTypeRef = (
   type: TypeRef,
   root?: protobuf.Root,
 ): string => {
-  if (type.symbol) {
-    return `ObjectRef<${stringLiteral(symbolId(type.symbol))}>`;
-  }
   if (type.enumValues && type.enumValues.length > 0) {
     return type.enumValues.map(stringLiteral).join(" | ");
   }
+  if (type.symbol) {
+    return `ObjectRef<${stringLiteral(symbolId(type.symbol))}>`;
+  }
   const protoType = normalizedProtoType(type.protoType);
   switch (protoType) {
     case "string":

src/schema-compiler.ts

@@ -366,9 +366,8 @@ const protoSymbolFromReflection = (
 
 const typeRefForField = (
   field: protobuf.Field,
-  schemaVersion: string,
+  _schemaVersion: string,
 ): TypeRef => {
-  const symbol = protoSymbolFromReflection(field.resolvedType, schemaVersion);
   const enumValues =
     field.resolvedType instanceof protobuf.Enum
       ? Object.entries(field.resolvedType.values)
@@ -377,7 +376,6 @@ const typeRefForField = (
       : undefined;
   return {
     protoType: field.type,
-    ...(symbol ? { symbol } : {}),
     ...(enumValues ? { enumValues } : {}),
   };
 };