feat(util): go mod parse

Author: pot-code

cmd/go_migrate.go

@@ -27,18 +27,13 @@ var AddGoMigration = command.InlineHandler(func(c *cli.Context, cfg interface{})
 		return errors.WithStack(err)
 	}
 
-	found := false
-	for _, r := range meta.Requires {
-		if r.Mod.Path == "entgo.io/ent" {
-			found = true
-			break
-		}
-	}
-
-	if !found {
+	if !meta.Contains("entgo.io/ent") {
 		return errors.New("ent is not used in the project")
 	}
 
+	author := meta.GetAuthor()
+	project := meta.GetProject()
+
 	return task.NewSequentialExecutor(
 		[]task.Task{
 			task.NewParallelExecutor(
@@ -48,11 +43,11 @@ var AddGoMigration = command.InlineHandler(func(c *cli.Context, cfg interface{})
 						AddNodes( // migrate
 							&task.FileGenerator{
 								Name: "migrate.go",
-								Data: bytes.NewBufferString(templates.GoMigrateMigration(meta.ProjectName, meta.Author)),
+								Data: bytes.NewBufferString(templates.GoMigrateMigration(project, author)),
 							},
 							&task.FileGenerator{
 								Name: "wire.go",
-								Data: bytes.NewBufferString(templates.GoMigrateWire(meta.ProjectName, meta.Author)),
+								Data: bytes.NewBufferString(templates.GoMigrateWire(project, author)),
 							},
 						).
 						Branch("config").
@@ -66,14 +61,14 @@ var AddGoMigration = command.InlineHandler(func(c *cli.Context, cfg interface{})
 						AddNodes( // cmd
 							&task.FileGenerator{
 								Name: "main.go",
-								Data: bytes.NewBufferString(templates.GoMigrateCmdMain(meta.ProjectName, meta.Author)),
+								Data: bytes.NewBufferString(templates.GoMigrateCmdMain(project, author)),
 							},
 						).Up().
 						Branch("pkg").Branch("db").
 						AddNodes( // pkg/db
 							&task.FileGenerator{
 								Name: "ent.go",
-								Data: bytes.NewBufferString(templates.GoMigratePkgEnt(meta.ProjectName, meta.Author)),
+								Data: bytes.NewBufferString(templates.GoMigratePkgEnt(project, author)),
 							},
 						).
 						Flatten(),

cmd/go_service.go

@@ -21,14 +21,11 @@ import (
 )
 
 type GoServiceConfig struct {
-	GenType string `flag:"type" alias:"t" usage:"api type" validate:"required,oneof=go"` // generation type
-	ArgName string `arg:"0" alias:"module_name" validate:"required,var"`                 // go pkg name
+	Module string `arg:"0" alias:"module_name" validate:"required,var"` // go pkg name
 }
 
 var GoServiceCmd = command.NewCliCommand("service", "add a go service",
-	&GoServiceConfig{
-		GenType: "go",
-	},
+	&GoServiceConfig{},
 	command.WithAlias([]string{"svc"}),
 	command.WithArgUsage("module_name"),
 ).AddHandlers(
@@ -38,23 +35,18 @@ var GoServiceCmd = command.NewCliCommand("service", "add a go service",
 ).BuildCommand()
 
 type GenerateGoSimpleService struct {
-	RegistryFile    string
-	PackageName     string
-	ProjectName     string
-	CamelModuleName string
-	AuthorName      string
-	Config          *GoServiceConfig
+	RegistryFile string
+	PackageName  string
+	ProjectName  string
+	DomainName   string
+	AuthorName   string
 }
 
 var _ command.CommandHandler = &GenerateGoSimpleService{}
 
-func (gga *GenerateGoSimpleService) Cond(c *cli.Context) bool {
-	return true
-}
-
 func (gga *GenerateGoSimpleService) Handle(c *cli.Context, cfg interface{}) error {
 	config := cfg.(*GoServiceConfig)
-	pkgName := strings.ReplaceAll(config.ArgName, "-", "_")
+	pkgName := strings.ReplaceAll(config.Module, "-", "_")
 	pkgName = strcase.ToSnake(pkgName)
 	gga.PackageName = pkgName
 
@@ -63,13 +55,12 @@ func (gga *GenerateGoSimpleService) Handle(c *cli.Context, cfg interface{}) erro
 		return errors.WithStack(err)
 	}
 
-	gga.CamelModuleName = strcase.ToCamel(pkgName)
-	gga.AuthorName = meta.Author
-	gga.ProjectName = meta.ProjectName
+	gga.DomainName = strcase.ToCamel(pkgName)
+	gga.AuthorName = meta.GetAuthor()
+	gga.ProjectName = meta.GetProject()
 
 	dir := gga.PackageName
-	_, err = os.Stat(dir)
-	if err == nil {
+	if util.Exists(dir) {
 		log.WithField("module", dir).Infof("module already exists")
 		return nil
 	}
@@ -82,7 +73,7 @@ func (gga *GenerateGoSimpleService) Handle(c *cli.Context, cfg interface{}) erro
 }
 
 func (gga *GenerateGoSimpleService) generateFiles() task.Task {
-	modelName := gga.CamelModuleName
+	modelName := gga.DomainName
 	pkgName := gga.PackageName
 	projectName := gga.ProjectName
 	authorName := gga.AuthorName

internal/command/extract.go

@@ -54,14 +54,15 @@ func (efv *extractFlagsVisitor) visitString(f *configField) {
 	cf := &cli.StringFlag{
 		Name: flag,
 	}
-	if isRequired(f) {
-		cf.Required = true
-	}
 
 	if f.hasDefault() {
 		cf.Value = f.value.String()
 	}
 
+	if isRequired(f) {
+		cf.Required = true
+	}
+
 	if u, err := getUsage(f); err == nil {
 		cf.Usage = u
 	}
@@ -87,14 +88,15 @@ func (efv *extractFlagsVisitor) visitBoolean(f *configField) {
 	cf := &cli.BoolFlag{
 		Name: flag,
 	}
-	if isRequired(f) {
-		cf.Required = true
-	}
 
 	if f.hasDefault() {
 		cf.Value = f.value.Bool()
 	}
 
+	if isRequired(f) {
+		cf.Required = true
+	}
+
 	if u, err := getUsage(f); err == nil {
 		cf.Usage = u
 	}
@@ -120,14 +122,15 @@ func (efv *extractFlagsVisitor) visitInt(f *configField) {
 	cf := &cli.IntFlag{
 		Name: flag,
 	}
-	if isRequired(f) {
-		cf.Required = true
-	}
 
 	if f.hasDefault() {
 		cf.Value = int(f.value.Int())
 	}
 
+	if isRequired(f) {
+		cf.Required = true
+	}
+
 	if u, err := getUsage(f); err == nil {
 		cf.Usage = u
 	}

internal/util/parse.go

@@ -15,9 +15,9 @@ var (
 )
 
 type GoModMeta struct {
-	Author      string
-	ProjectName string
-	Requires    []*modfile.Require
+	author  string
+	project string
+	mf      *modfile.File
 }
 
 func ParseGoMod(path string) (*GoModMeta, error) {
@@ -39,16 +39,31 @@ func ParseGoMod(path string) (*GoModMeta, error) {
 		return nil, errors.Wrap(err, "failed to parse mod file")
 	}
 
-	meta := new(GoModMeta)
-	meta.Requires = mp.Require
-
 	url := mp.Module.Mod.Path
 	parts := strings.Split(url, "/")
-	meta.Author = parts[len(parts)-2]
-	meta.ProjectName = parts[len(parts)-1]
+	author := parts[len(parts)-2]
+	project := parts[len(parts)-1]
+
+	return &GoModMeta{
+		mf:      mp,
+		author:  author,
+		project: project,
+	}, nil
+}
+
+func (gm *GoModMeta) GetAuthor() string {
+	return gm.author
+}
+
+func (gm *GoModMeta) GetProject() string {
+	return gm.project
+}
 
-	if meta.Author == "" || meta.ProjectName == "" {
-		return nil, errors.New("failed to extrace meta data from go.mod")
+func (gm *GoModMeta) Contains(module string) bool {
+	for _, r := range gm.mf.Require {
+		if r.Mod.Path == module {
+			return true
+		}
 	}
-	return meta, nil
+	return false
 }