Stable output: Add some more names to anonymous Method classes

pkg/codegen/model.go

@@ -100,7 +100,7 @@ func (p *Package) Generate(out *Emitter) {
 	sort.Slice(sorted, func(i, j int) bool {
 		if a, ok := sorted[i].(Named); ok {
 			if b, ok := sorted[j].(Named); ok {
-				return a.GetName() < b.GetName()
+				return schemas.CleanNameForSorting(a.GetName()) < schemas.CleanNameForSorting(b.GetName())
 			}
 		}
 
@@ -168,6 +168,11 @@ func (f Fragment) Generate(out *Emitter) {
 // Method defines a method and how to generate it.
 type Method struct {
 	Impl func(*Emitter)
+	Name string
+}
+
+func (m *Method) GetName() string {
+	return m.Name
 }
 
 func (m *Method) Generate(out *Emitter) {

pkg/generator/schema_generator.go

@@ -273,6 +273,7 @@ func (g *schemaGenerator) generateDeclaredType(
 
 				g.output.file.Package.AddDecl(&codegen.Method{
 					Impl: formatter.generate(decl, validators),
+					Name: decl.GetName() + "_validator",
 				})
 			}
 		}
@@ -742,7 +743,7 @@ func (g *schemaGenerator) generateEnumType(
 
 	if !g.config.OnlyModels {
 		valueConstant := &codegen.Var{
-			Name:  "enumValues_" + enumDecl.Name,
+			Name:  schemas.PrefixEnumValue + enumDecl.Name,
 			Value: t.Enum,
 		}
 		g.output.file.Package.AddDecl(valueConstant)
@@ -758,11 +759,13 @@ func (g *schemaGenerator) generateEnumType(
 			if wrapInStruct {
 				g.output.file.Package.AddDecl(&codegen.Method{
 					Impl: formatter.enumMarshal(enumDecl),
+					Name: enumDecl.GetName() + "_enum",
 				})
 			}
 
 			g.output.file.Package.AddDecl(&codegen.Method{
 				Impl: formatter.enumUnmarshal(enumDecl, enumType, valueConstant, wrapInStruct),
+				Name: enumDecl.GetName() + "_enum_unmarshal",
 			})
 		}
 	}

pkg/schemas/types.go

@@ -1,5 +1,7 @@
 package schemas
 
+import "strings"
+
 const (
 	TypeNameString  = "string"
 	TypeNameArray   = "array"
@@ -8,6 +10,7 @@ const (
 	TypeNameObject  = "object"
 	TypeNameBoolean = "boolean"
 	TypeNameNull    = "null"
+	PrefixEnumValue = "enumValues_"
 )
 
 func IsPrimitiveType(t string) bool {
@@ -19,3 +22,11 @@ func IsPrimitiveType(t string) bool {
 		return false
 	}
 }
+
+func CleanNameForSorting(name string) string {
+	if strings.HasPrefix(name, PrefixEnumValue) {
+		return strings.TrimPrefix(name, PrefixEnumValue) + "_enumValues" // Append a string for sorting properly.
+	}
+
+	return name
+}