support package

.gitignore

@@ -1,5 +1,6 @@
 /.idea/
 /dist/
+/gtag
 
 # Created by https://www.gitignore.io/api/go,intellij,visualstudiocode,vim,macos
 # Edit at https://www.gitignore.io/?templates=go,intellij,visualstudiocode,vim,macos
@@ -120,7 +121,7 @@ fabric.properties
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
 
 # Thumbnails
 ._*

cmd/gtag/main.go

@@ -5,20 +5,33 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/gochore/tag/internal/gtag"
 )
 
 var (
-	file = flag.String("file", "", "source file")
-	name = flag.String("name", "", "struct type name")
+	types = flag.String("types", "", "struct types")
 )
 
 func main() {
 	flag.Parse()
-	_, err := gtag.Generate(context.Background(), *file, *name)
+
+	args := flag.Args()
+	if *types == "" || len(args) != 1 {
+		printUsages()
+		return
+	}
+	dir := args[0]
+
+	_, err := gtag.Generate(context.Background(), dir, strings.Split(*types, ","))
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}
 }
+
+func printUsages() {
+	fmt.Println(`gtag -types A,B dir`)
+	flag.PrintDefaults()
+}

go.mod

@@ -1,3 +1,9 @@
 module github.com/gochore/tag
 
 go 1.14
+
+require (
+	github.com/gochore/uniq v1.0.0
+	github.com/pmezard/go-difflib v1.0.0
+	golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8
+)

go.sum

@@ -0,0 +1,23 @@
+github.com/gochore/uniq v1.0.0 h1:qBA8Jm9GhSojZ8vsCI2h5FJGonmItjY9NLBPUaciOYk=
+github.com/gochore/uniq v1.0.0/go.mod h1:zxZBO4/6PcgNuYMrlJCUKOEEpxSejbD6R53GUpSHelk=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8 h1:BMFHd4OFnFtWX46Xj4DN6vvT1btiBxyq+s0orYBqcQY=
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/gtag/gtag.go

@@ -10,20 +10,61 @@ import (
 	"io/ioutil"
 	"os"
 	"strings"
+
+	"github.com/gochore/uniq"
+	"golang.org/x/tools/go/packages"
 )
 
 type GenerateResult struct {
 	Content []byte
 	Output  string
 }
 
-func Generate(ctx context.Context, file, name string) (*GenerateResult, error) {
-	f, err := loadFile(file)
+func (r *GenerateResult) String() string {
+	return fmt.Sprintf("%s\n%s", r.Output, r.Content)
+}
+
+func Generate(ctx context.Context, dir string, types []string) ([]*GenerateResult, error) {
+	cmd := fmt.Sprintf("gtag -types %s %s", strings.Join(types, ","), dir)
+
+	types = types[:uniq.Strings(types)]
+
+	pkgs, err := packages.Load(&packages.Config{
+		Mode:    packages.NeedFiles,
+		Context: ctx,
+		Dir:     dir,
+		Env:     os.Environ(),
+		Fset:    token.NewFileSet(),
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	fields, err := parseStructField(f, name)
+	var files []string
+	for _, pkg := range pkgs {
+		files = append(files, pkg.GoFiles...)
+	}
+
+	var ret []*GenerateResult
+	for _, file := range files {
+		result, err := generateFile(ctx, cmd, file, types)
+		if err != nil {
+			return nil, err
+		}
+		if result != nil {
+			ret = append(ret, result)
+		}
+	}
+	for _, v := range ret {
+		if err := v.Commit(); err != nil {
+			return nil, err
+		}
+	}
+	return ret, nil
+}
+
+func generateFile(ctx context.Context, cmd, file string, types []string) (*GenerateResult, error) {
+	f, err := loadFile(file)
 	if err != nil {
 		return nil, err
 	}
@@ -33,10 +74,30 @@ func Generate(ctx context.Context, file, name string) (*GenerateResult, error) {
 	}
 	pkg := f.Name.Name
 
+	fieldM := map[string][]string{}
+	for _, typ := range types {
+		fields, ok := parseStructField(f, typ)
+		if ok {
+			fieldM[typ] = fields
+		}
+	}
+
+	if len(fieldM) == 0 {
+		return nil, nil
+	}
+
 	data := templateData{
 		Package: pkg,
-		Type:    name,
-		Fields:  fields,
+		Command: cmd,
+	}
+
+	for _, typ := range types {
+		if fields, ok := fieldM[typ]; ok {
+			data.Types = append(data.Types, templateDataType{
+				Name:   typ,
+				Fields: fields,
+			})
+		}
 	}
 
 	src, err := format.Source(execute(data))
@@ -49,10 +110,6 @@ func Generate(ctx context.Context, file, name string) (*GenerateResult, error) {
 		Output:  strings.TrimSuffix(file, ".go") + "_tag.go",
 	}
 
-	if err := ret.Commit(); err != nil {
-		return nil, err
-	}
-
 	return ret, nil
 }
 
@@ -73,7 +130,7 @@ func loadFile(name string) (*ast.File, error) {
 	return parser.ParseFile(token.NewFileSet(), name, f, 0)
 }
 
-func parseStructField(f *ast.File, name string) ([]string, error) {
+func parseStructField(f *ast.File, name string) ([]string, bool) {
 	var fields []*ast.Field
 	found := false
 
@@ -96,7 +153,7 @@ func parseStructField(f *ast.File, name string) ([]string, error) {
 	})
 
 	if !found {
-		return nil, fmt.Errorf("can not find struct %q", name)
+		return nil, found
 	}
 
 	var ret []string
@@ -106,5 +163,5 @@ func parseStructField(f *ast.File, name string) ([]string, error) {
 		}
 	}
 
-	return ret, nil
+	return ret, found
 }

internal/gtag/gtag_test.go

@@ -9,50 +9,39 @@ const testDir = "../../test/internal/"
 
 func TestGenerate(t *testing.T) {
 	type args struct {
-		ctx  context.Context
-		file string
-		name string
+		ctx   context.Context
+		dir   string
+		types []string
 	}
 	tests := []struct {
 		name    string
 		args    args
-		want    []byte
+		want    []*GenerateResult
 		wantErr bool
 	}{
 		{
-			name: "regular",
+			name: "reguler",
 			args: args{
-				ctx:  context.Background(),
-				file: testDir + "regular/user.go",
-				name: "User",
-			},
-			want:    nil,
-			wantErr: false,
-		},
-		{
-			name: "empty",
-			args: args{
-				ctx:  context.Background(),
-				file: testDir + "regular/empty.go",
-				name: "Empty",
+				ctx:   context.Background(),
+				dir:   testDir + "regular/",
+				types: []string{"User", "Empty", "UserName", "UserName"},
 			},
 			want:    nil,
 			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := Generate(tt.args.ctx, tt.args.file, tt.args.name)
+			got, err := Generate(tt.args.ctx, tt.args.dir, tt.args.types)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Generate() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			//if !reflect.DeepEqual(got, tt.want) {
-			//	t.Errorf("Generate() got = %s, want %s", got, tt.want)
+			//	t.Errorf("Generate() got = %v, want %v", got, tt.want)
 			//}
-			t.Logf("%s", got)
-			if err := got.Commit(); err != nil {
-				t.Error(err)
+			for _, result := range got {
+				t.Log(result)
 			}
 		})
 	}