fix: imported by useless package with duplicate names

Bin-Huang · Aug 2, 2022 · bc82b54 · bc82b54
1 parent 523e67a
commit bc82b54
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 6 deletions.
diff --git a/generate.go b/generate.go
@@ -14,6 +14,16 @@ var templ = `// Code generated by github.com/Bin-Huang/make-constructor; DO NOT
 
 package {{.PkgName}}
 
+import (
+{{ range .Imports }}
+    {{ if .Name }}
+    {{.Name}} {{.Path}}
+    {{ else }}
+    {{.Path}}
+    {{ end }}
+{{ end }}
+)
+
 {{ range .Constructors }}
 // {{.Name}} Create a new {{.Struct}}
 func {{.Name}}({{.Params}}) *{{.Struct}} {
@@ -70,13 +80,20 @@ func generateCode(pkgName string, importResuts []ResultImport, results []Result)
 
 // FormatSource ...
 func FormatSource(source []byte) ([]byte, error) {
-	return imports.Process("", source, &imports.Options{
+	output, err := imports.Process("", source, &imports.Options{
 		AllErrors: true,
 		Comments:  true,
 		TabIndent: true,
 		TabWidth:  8,
 		Fragment:  true,
 	})
+	if err != nil {
+		return output, err
+	}
+	if bytes.Equal(source, output) {
+		return output, nil
+	}
+	return FormatSource(output)
 }
 
 // UniqueImports remove duplicate imports, return unqiue imports

diff --git a/test/pkg/errors/errors.go b/test/pkg/errors/errors.go
@@ -0,0 +1,9 @@
+package errors
+
+// NoFound ...
+type NoFound struct{}
+
+// String ...
+func (NoFound) String() string {
+	return "no found"
+}
diff --git a/test/repositories/constructor_gen.go b/test/repositories/constructor_gen.go
diff --git a/test/repositories/pro-repository.go b/test/repositories/pro-repository.go
@@ -1,6 +1,9 @@
 package repositories
 
-import "github.com/Bin-Huang/make-constructor/test/config"
+import (
+	"github.com/Bin-Huang/make-constructor/test/config"
+	"github.com/Bin-Huang/make-constructor/test/pkg/errors"
+)
 
 // ProRepository a repository for example
 //go:generate go run ../../../make-constructor
@@ -10,3 +13,8 @@ type ProRepository struct {
 	TableName string
 	version   int
 }
+
+// FindByID find something by id
+func (r *ProRepository) FindByID() errors.NoFound {
+	return errors.NoFound{}
+}
diff --git a/test/repositories/user-repository.go b/test/repositories/user-repository.go
@@ -1,15 +1,20 @@
 package repositories
 
-import "github.com/Bin-Huang/make-constructor/test/config2"
+import (
+	"errors"
+
+	config2 "github.com/Bin-Huang/make-constructor/test/config2"
+)
 
 // UserRepository the user repository for example
 //go:generate go run ../../../make-constructor
 type UserRepository struct {
-	conf      *config.Config
+	conf      *config2.Config
 	db        *database
 	TableName string
 }
 
 // FindByID find something by id
-func (r *UserRepository) FindByID() {
+func (r *UserRepository) FindByID() error {
+	return errors.New("no found")
 }