refactor(core): update NewTaskComposer args

Author: pot-code

cmd/add_air.go

@@ -19,7 +19,7 @@ var addGoAirCmd = &cli.Command{
 }
 
 func addGoAir() core.Runner {
-	return util.NewTaskComposer("",
+	return util.NewTaskComposer("").AddFile(
 		&core.FileDesc{
 			Path: "air.toml",
 			Data: func() []byte {

cmd/add_cp.go

@@ -33,7 +33,7 @@ var addPriceUpdateConfigCmd = &cli.Command{
 }
 
 func addPriceUpdateEntry(name string) core.Runner {
-	return util.NewTaskComposer(name,
+	return util.NewTaskComposer(name).AddFile(
 		&core.FileDesc{
 			Path: "provider.yml",
 			Data: func() []byte {

cmd/add_react.go

@@ -80,7 +80,7 @@ var addReactCmd = &cli.Command{
 }
 
 func addReactEmotion() core.Runner {
-	return util.NewTaskComposer("",
+	return util.NewTaskComposer("").AddFile(
 		&core.FileDesc{
 			Path: ".babelrc",
 			Data: func() []byte {
@@ -149,5 +149,5 @@ func addReactComponent(name, dir string, scss, story bool) core.Runner {
 			},
 		})
 
-	return util.NewTaskComposer(dir, desc...)
+	return util.NewTaskComposer(dir).AddFile(desc...)
 }

cmd/add_typescript.go

@@ -47,7 +47,7 @@ var addTypescriptCmd = &cli.Command{
 }
 
 func addTypescriptToNode() core.Runner {
-	return util.NewTaskComposer("",
+	return util.NewTaskComposer("").AddFile(
 		&core.FileDesc{
 			Path: ".eslintrc.js",
 			Data: func() []byte {
@@ -83,7 +83,7 @@ func addTypescriptToNode() core.Runner {
 }
 
 func addTypescriptToReact() core.Runner {
-	return util.NewTaskComposer("",
+	return util.NewTaskComposer("").AddFile(
 		&core.FileDesc{
 			Path: ".eslintrc.js",
 			Data: func() []byte {

cmd/add_viper_tag.go

@@ -47,13 +47,14 @@ var addViperTagCmd = &cli.Command{
 func addViperFlag(config *addViperTagConfig) (core.Runner, error) {
 	var outData bytes.Buffer
 
-	return util.NewTaskComposer("", &core.FileDesc{
-		Path:      config.ConfigPath,
-		Overwrite: true,
-		Data: func() []byte {
-			return outData.Bytes()
-		},
-	}).AddCommand(&core.Command{
+	return util.NewTaskComposer("").AddFile(
+		&core.FileDesc{
+			Path:      config.ConfigPath,
+			Overwrite: true,
+			Data: func() []byte {
+				return outData.Bytes()
+			},
+		}).AddCommand(&core.Command{
 		Bin:    "gomodifytags",
 		Before: true,
 		Args: []string{

cmd/gen_api.go

@@ -78,7 +78,7 @@ var genAPICmd = &cli.Command{
 }
 
 func generateGoApi(config *genApiConfig) core.Runner {
-	return util.NewTaskComposer("",
+	return util.NewTaskComposer("").AddFile(
 		&core.FileDesc{
 			Path: fmt.Sprintf("%s/%s_handler.go", "server", config.PackagePath),
 			Data: func() []byte {

cmd/gen_backend.go

@@ -71,8 +71,7 @@ var generateBECmd = &cli.Command{
 }
 
 func newGolangBackendGenerator(config *genBEConfig) core.Runner {
-	return util.NewTaskComposer(
-		config.ProjectName,
+	return util.NewTaskComposer(config.ProjectName).AddFile(
 		&core.FileDesc{
 			Path: "cmd/web.go",
 			Data: func() []byte {

cmd/gen_flags.go

@@ -69,21 +69,22 @@ func generateFlagsFile(config *genFlagsConfig) (core.Runner, error) {
 
 	pkg := visitor.pkg
 	fileName := config.FileName + constants.GoSuffix
-	return util.NewTaskComposer(pkg, &core.FileDesc{
-		Path:      fileName,
-		Overwrite: true,
-		Data: func() []byte {
-			var buf bytes.Buffer
+	return util.NewTaskComposer(pkg).AddFile(
+		&core.FileDesc{
+			Path:      fileName,
+			Overwrite: true,
+			Data: func() []byte {
+				var buf bytes.Buffer
 
-			templates.WriteGoGenPflags(&buf, pkg, fm)
-			data, err := format.Source(buf.Bytes())
-			if err != nil {
-				log.WithField("err", err).Error("failed to format code")
-				return buf.Bytes()
-			}
-			return data
-		},
-	}).AddCommand(&core.Command{
+				templates.WriteGoGenPflags(&buf, pkg, fm)
+				data, err := format.Source(buf.Bytes())
+				if err != nil {
+					log.WithField("err", err).Error("failed to format code")
+					return buf.Bytes()
+				}
+				return data
+			},
+		}).AddCommand(&core.Command{
 		Bin:  "goimports",
 		Args: []string{"-w", path.Join(pkg, fileName)},
 	}).AddCommand(&core.Command{

pkg/util/composer.go

@@ -13,33 +13,29 @@ type TaskComposer struct {
 	root     string // generation root
 	files    []*core.FileDesc
 	commands []*core.Command
-	runner   core.Runner
-	cleaned  bool
 }
 
 var _ core.Runner = &TaskComposer{}
 
-func NewTaskComposer(root string, files ...*core.FileDesc) *TaskComposer {
-	return &TaskComposer{root: root, files: files, cleaned: false}
+func NewTaskComposer(root string) *TaskComposer {
+	return &TaskComposer{root: root}
 }
 
 // AddFile add file task
-func (tc *TaskComposer) AddFile(fd *core.FileDesc) *TaskComposer {
-	tc.files = append(tc.files, fd)
+func (tc *TaskComposer) AddFile(fds ...*core.FileDesc) *TaskComposer {
+	tc.files = append(tc.files, fds...)
 	return tc
 }
 
 // AddCommand add command
-func (tc *TaskComposer) AddCommand(cmd *core.Command) *TaskComposer {
-	tc.commands = append(tc.commands, cmd)
+func (tc *TaskComposer) AddCommand(cmds ...*core.Command) *TaskComposer {
+	tc.commands = append(tc.commands, cmds...)
 	return tc
 }
 
 func (tc *TaskComposer) Run() error {
 	log.Debugf("generation tree:\n%s", tc.getGenerationTree())
 	runner := tc.makeRunner()
-	tc.runner = runner
-
 	return runner.Run()
 }
 

templates/add_air.qtpl

@@ -8,7 +8,7 @@ cmd = "go build -o ./tmp/main ."
 # Binary file yields from `cmd`.
 bin = "tmp/main"
 # Watch these filename extensions.
-include_ext = ["go", "yaml"]
+include_ext = ["go", "yml"]
 # Ignore these filename extensions or directories.
 exclude_dir = ["assets", "tmp", "vendor"]
 # Watch these directories if you specified.