[Add] EDN Named Type Overwrite

pkg/parsers/edntostruct/options.go

@@ -3,7 +3,8 @@ package edntostruct
 import "go/types"
 
 type options struct {
-	tagTypes map[string]TypeFn
+	tagTypes   map[string]TypeFn
+	namedTypes map[string]NamedTypeFn
 }
 
 func defaultOptions() *options {
@@ -16,6 +17,7 @@ func defaultOptions() *options {
 			"float64": genericTypeFn(types.Typ[types.Float64]),
 			"int64":   genericTypeFn(types.Typ[types.Int64]),
 		},
+		namedTypes: map[string]NamedTypeFn{},
 	}
 }
 
@@ -26,3 +28,9 @@ func WithTagTypeFn(tag string, fn TypeFn) Option {
 		opt.tagTypes[tag] = fn
 	}
 }
+
+func WithNamedTypeFn(name string, fn NamedTypeFn) Option {
+	return func(opt *options) {
+		opt.namedTypes[name] = fn
+	}
+}

pkg/parsers/edntostruct/packages.go

@@ -10,6 +10,9 @@ func addImportFixName(
 	destPackage *types.Package,
 	importPackage *types.Package,
 ) {
+	if destPackage == nil || importPackage == nil {
+		return
+	}
 	if destPackage.Path() == importPackage.Path() {
 		return
 	}

pkg/parsers/edntostruct/parser.go

@@ -94,19 +94,26 @@ func (p *Parser) parseEDNTypeToGolangStruct(
 
 	structs := make([]*types.Named, 0, len(byNamespace))
 	for namespace, fields := range byNamespace {
-		object := createStructOrderedFields(
-			destPackage,
-			prefix,
-			namespace,
-			fields,
-		)
+		name := fmt.Sprintf("%s%s", prefix, strcase.ToCamel(namespace))
+		var object *types.Named
+		if fn, ok := p.options.namedTypes[name]; ok {
+			var importPackage *types.Package
+			importPackage, object = fn()
+			addImportFixName(destPackage, importPackage)
+		} else {
+			object = createStructOrderedFields(
+				destPackage,
+				name,
+				fields,
+			)
+			existingObject := destPackage.Scope().Insert(object.Obj())
+			if existingObject != nil {
+				return nil, errors.New("unsuported mixed types")
+			}
+		}
 		structs = append(structs,
 			object,
 		)
-		existingObject := destPackage.Scope().Insert(object.Obj())
-		if existingObject != nil {
-			return nil, errors.New("unsuported mixed types")
-		}
 	}
 
 	var result types.Type
@@ -238,9 +245,7 @@ func (p *Parser) parseEDNTypeToGolangField(
 		}
 		var importPackage *types.Package
 		importPackage, fieldType = typeFn()
-		if importPackage != nil {
-			addImportFixName(destPackage, importPackage)
-		}
+		addImportFixName(destPackage, importPackage)
 	}
 	nameCamel := strcase.ToCamel(name)
 	if nameCamel == "Id" {

pkg/parsers/edntostruct/parser_test.go

@@ -282,6 +282,42 @@ import (
 type OverwriteSome struct {
 	Field decimal.Decimal "json:\"field\" edn:\"some/field\""
 }
+`,
+			},
+		},
+		{
+			name: "should be able to overwrite named types",
+			args: &args{
+				packagePath: "example.com/some/package/path",
+				prefix:      "OverwriteNamed",
+				options: []Option{
+					WithNamedTypeFn("OverwriteNamedSomeOther", func() (*types.Package, *types.Named) {
+						decimalPackage := types.NewPackage("github.com/some_org/repo/package", "potato")
+						return decimalPackage, types.NewNamed(
+							types.NewTypeName(
+								token.NoPos,
+								decimalPackage,
+								"MagicValue",
+								nil,
+							),
+							nil,
+							nil,
+						)
+					}),
+				},
+				ednContent: []byte(`{:some/field {:other/value 22}}`),
+			},
+			want: &want{
+				result: `// Code generated by endtostruct DO NOT EDIT
+package path
+
+import (
+	potato "github.com/some_org/repo/package"
+)
+
+type OverwriteNamedSome struct {
+	Field potato.MagicValue "json:\"field\" edn:\"some/field\""
+}
 `,
 			},
 		},

pkg/parsers/edntostruct/printer.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"go/types"
 	"regexp"
+	"slices"
+	"strings"
 
 	"mvdan.cc/gofumpt/format"
 )
@@ -26,13 +28,19 @@ func printPackage(
 	buffer := bytes.NewBufferString("// Code generated by endtostruct DO NOT EDIT\n")
 	buffer.WriteString(fmt.Sprintf("package %s", destPackage.Name()))
 	buffer.WriteString("\n\nimport (\n")
-	for _, importParckage := range destPackage.Imports() {
+	imports := destPackage.Imports()
+	slices.SortStableFunc(imports, func(a, b *types.Package) int {
+		return strings.Compare(a.Path(), b.Path())
+	})
+	for _, importParckage := range imports {
 		buffer.WriteString(fmt.Sprintf(`%s "%s"`, importParckage.Name(), importParckage.Path()))
 		buffer.WriteString("\n")
 	}
 	buffer.WriteString(")")
 	scope := destPackage.Scope()
-	for _, name := range scope.Names() {
+	names := scope.Names()
+	slices.Sort(names)
+	for _, name := range names {
 		buffer.WriteString("\n\n")
 		object := scope.Lookup(name)
 		unformatted := types.ObjectString(object, qualifier)

pkg/parsers/edntostruct/structs.go

@@ -1,13 +1,10 @@
 package edntostruct
 
 import (
-	"fmt"
 	"go/token"
 	"go/types"
 	"slices"
 	"strings"
-
-	"github.com/iancoleman/strcase"
 )
 
 type fieldTagPair struct {
@@ -17,7 +14,6 @@ type fieldTagPair struct {
 
 func createStructOrderedFields(
 	destPackage *types.Package,
-	prefix string,
 	name string,
 	fieldTagPairs []fieldTagPair,
 ) *types.Named {
@@ -34,7 +30,7 @@ func createStructOrderedFields(
 	typeName := types.NewTypeName(
 		token.NoPos,
 		destPackage,
-		fmt.Sprintf("%s%s", prefix, strcase.ToCamel(name)),
+		name,
 		structType,
 	)
 	object := types.NewNamed(

pkg/parsers/edntostruct/types.go

@@ -6,6 +6,7 @@ import (
 )
 
 type TypeFn func() (*types.Package, types.Type)
+type NamedTypeFn func() (*types.Package, *types.Named)
 
 type TypeExtraStringer interface {
 	ExtraString() string