refactor: CloneMessageVT returns a common CloneMessage interface

Signed-off-by: Christian Stewart <[email protected]>

compiler/protogen/protogen.go

@@ -46,6 +46,8 @@ var typesPackage = "github.com/aperturerobotics/protobuf-go-lite/types/"
 
 var trimTypesPrefix = "google.golang.org/protobuf/types/"
 
+var ProtobufGoLitePackage = GoImportPath("github.com/aperturerobotics/protobuf-go-lite")
+
 func fixTypesPrefix(impPath GoImportPath) GoImportPath {
 	if strings.HasPrefix(string(impPath), trimTypesPrefix) {
 		impPath = GoImportPath(typesPackage + strings.TrimPrefix(string(impPath), trimTypesPrefix))

features/clone/clone.go

@@ -138,7 +138,7 @@ func (p *clone) generateCloneMethodsForMessage(proto3 bool, message *protogen.Me
 	p.P(`}`)
 	p.P()
 
-	p.P(`func (m *`, ccTypeName, `) `, cloneMessageName, `() any {`)
+	p.P(`func (m *`, ccTypeName, `) `, cloneMessageName, `() `, p.QualifiedGoIdent(protogen.ProtobufGoLitePackage.Ident("CloneMessage")), ` {`)
 	p.P(`return m.`, cloneName, `()`)
 	p.P(`}`)
 	p.P()

protobuf-go-lite.go

@@ -26,9 +26,19 @@ type Message interface {
 	Reset()
 }
 
+// CloneMessage is a message with a CloneMessage function.
+type CloneMessage interface {
+	// Message extends the base message type.
+	Message
+	// CloneMessageVT clones the object.
+	CloneMessageVT() CloneMessage
+}
+
 // CloneVT is a message with a CloneVT function (VTProtobuf).
 type CloneVT[T comparable] interface {
 	comparable
+	// CloneMessage is the non-generic clone interface.
+	CloneMessage
 	// CloneVT clones the object.
 	CloneVT() T
 }