feat: ask before overwriting a xgenny file

changelog.md

@@ -11,6 +11,10 @@
 
 - [#4691](https://github.com/ignite/cli/pull/4691), [#4706](https://github.com/ignite/cli/pull/4706), [#4725](https://github.com/ignite/cli/pull/4725) Fix ts-client query template and solely Go template for `ts-client` generation.
 
+### Features
+
+- [#4728](https://github.com/ignite/cli/pull/4728) Ask before overwriting a `xgenny` file.
+
 ## [`v29.0.0`](https://github.com/ignite/cli/releases/tag/v29.0.0)
 
 ### Features

ignite/cmd/chain.go

@@ -104,7 +104,7 @@ chain.
 }
 
 func preRunHandler(cmd *cobra.Command, _ []string) error {
-	session := cliui.New()
+	session := cliui.New(cliui.WithoutUserInteraction(getYes(cmd)))
 	defer session.End()
 
 	appPath, err := goModulePath(cmd)

ignite/cmd/chain_debug.go

@@ -66,7 +66,10 @@ The debug server stops automatically when the client connection is closed.
 func chainDebugHandler(cmd *cobra.Command, _ []string) error {
 	// Prepare session options.
 	// Events are ignored by the session when the debug server UI is used.
-	options := []cliui.Option{cliui.StartSpinnerWithText("Initializing...")}
+	options := []cliui.Option{
+		cliui.StartSpinnerWithText("Initializing..."),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	}
 	server, _ := cmd.Flags().GetBool(flagServer)
 	if server {
 		options = append(options, cliui.IgnoreEvents())

ignite/cmd/chain_init.go

@@ -98,6 +98,7 @@ func chainInitHandler(cmd *cobra.Command, _ []string) error {
 	session := cliui.New(
 		cliui.WithVerbosity(getVerbosity(cmd)),
 		cliui.StartSpinner(),
+		cliui.WithoutUserInteraction(getYes(cmd)),
 	)
 	defer session.End()
 

ignite/cmd/chain_lint.go

@@ -15,7 +15,10 @@ func NewChainLint() *cobra.Command {
 		Long:  "The lint command runs the golangci-lint tool to lint the codebase.",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			session := cliui.New(cliui.StartSpinnerWithText("Linting..."))
+			session := cliui.New(
+				cliui.StartSpinnerWithText("Linting..."),
+				cliui.WithoutUserInteraction(getYes(cmd)),
+			)
 			defer session.End()
 
 			chainOption := []chain.Option{

ignite/cmd/chain_serve.go

@@ -83,7 +83,7 @@ production, you may want to run "appd start" manually.
 }
 
 func chainServeHandler(cmd *cobra.Command, _ []string) error {
-	var options []cliui.Option
+	options := []cliui.Option{cliui.WithoutUserInteraction(getYes(cmd))}
 
 	// Session must not handle events when the verbosity is the default
 	// to allow render of the UI and events using bubbletea. The custom

ignite/cmd/doctor.go

@@ -14,7 +14,9 @@ func NewDoctor() *cobra.Command {
 		Short:  "Fix chain configuration",
 		Hidden: true,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			session := cliui.New()
+			session := cliui.New(
+				cliui.WithoutUserInteraction(getYes(cmd)),
+			)
 			defer session.End()
 			appPath := flagGetPath(cmd)
 

ignite/cmd/generate_composables.go

@@ -22,7 +22,10 @@ func NewGenerateComposables() *cobra.Command {
 }
 
 func generateComposablesHandler(cmd *cobra.Command, _ []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusGenerating),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	c, err := chain.NewWithHomeFlags(

ignite/cmd/generate_go.go

@@ -21,7 +21,10 @@ func NewGenerateGo() *cobra.Command {
 }
 
 func generateGoHandler(cmd *cobra.Command, _ []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusGenerating),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	c, err := chain.NewWithHomeFlags(

ignite/cmd/generate_hooks.go

@@ -22,7 +22,10 @@ func NewGenerateHooks() *cobra.Command {
 }
 
 func generateHooksHandler(cmd *cobra.Command, _ []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusGenerating),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	c, err := chain.NewWithHomeFlags(

ignite/cmd/generate_openapi.go

@@ -21,7 +21,10 @@ func NewGenerateOpenAPI() *cobra.Command {
 }
 
 func generateOpenAPIHandler(cmd *cobra.Command, _ []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusGenerating),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	c, err := chain.NewWithHomeFlags(

ignite/cmd/generate_typescript_client.go

@@ -47,7 +47,10 @@ changes when the blockchain is started with a flag:
 }
 
 func generateTSClientHandler(cmd *cobra.Command, _ []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusGenerating))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusGenerating),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	if !getYes(cmd) {

ignite/cmd/plugin.go

@@ -448,7 +448,10 @@ Respects key value pairs declared after the app path to be added to the generate
 		Example: "ignite app install github.com/org/my-app/ foo=bar baz=qux",
 		Args:    cobra.MinimumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			session := cliui.New(cliui.WithStdout(os.Stdout))
+			session := cliui.New(
+				cliui.WithStdout(os.Stdout),
+				cliui.WithoutUserInteraction(getYes(cmd)),
+			)
 			defer session.End()
 
 			var (
@@ -601,15 +604,18 @@ A git repository will be created with the given module name, unless the current
 		Example: "ignite app scaffold github.com/org/my-app/",
 		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+			session := cliui.New(
+				cliui.StartSpinnerWithText(statusScaffolding),
+				cliui.WithoutUserInteraction(getYes(cmd)),
+			)
 			defer session.End()
 
 			wd, err := os.Getwd()
 			if err != nil {
 				return err
 			}
 			moduleName := args[0]
-			path, err := plugin.Scaffold(cmd.Context(), wd, moduleName, false)
+			path, err := plugin.Scaffold(cmd.Context(), session, wd, moduleName, false)
 			if err != nil {
 				return err
 			}

ignite/cmd/plugin_default.go

@@ -79,7 +79,7 @@ func newPluginInstallCmd(dp defaultPlugin) *cobra.Command {
 				return err
 			}
 
-			session := cliui.New()
+			session := cliui.New(cliui.WithoutUserInteraction(getYes(cmd)))
 			defer session.End()
 
 			// load and link the plugin

ignite/cmd/scaffold.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ignite/cli/v29/ignite/pkg/env"
 	"github.com/ignite/cli/v29/ignite/pkg/errors"
 	"github.com/ignite/cli/v29/ignite/pkg/gocmd"
+	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v29/ignite/pkg/xgit"
 	"github.com/ignite/cli/v29/ignite/services/scaffolder"
 	"github.com/ignite/cli/v29/ignite/version"
@@ -149,7 +150,7 @@ func migrationPreRunHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	session := cliui.New()
+	session := cliui.New(cliui.WithoutUserInteraction(getYes(cmd)))
 	defer session.End()
 
 	appPath, err := goModulePath(cmd)
@@ -212,7 +213,10 @@ func scaffoldType(
 		}
 	}
 
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	cfg, _, err := getChainConfig(cmd)
@@ -235,7 +239,7 @@ func scaffoldType(
 		return err
 	}
 
-	sm, err := sc.ApplyModifications()
+	sm, err := sc.ApplyModifications(xgenny.ApplyPreRun(scaffolder.AskOverwriteFiles(session)))
 	if err != nil {
 		return err
 	}
@@ -262,7 +266,7 @@ func gitChangesConfirmPreRunHandler(cmd *cobra.Command, _ []string) error {
 	}
 
 	appPath := flagGetPath(cmd)
-	session := cliui.New()
+	session := cliui.New(cliui.WithoutUserInteraction(getYes(cmd)))
 
 	defer session.End()
 

ignite/cmd/scaffold_chain.go

@@ -8,7 +8,6 @@ import (
 	"github.com/ignite/cli/v29/ignite/pkg/env"
 	"github.com/ignite/cli/v29/ignite/pkg/errors"
 	"github.com/ignite/cli/v29/ignite/pkg/xfilepath"
-	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v29/ignite/pkg/xgit"
 	"github.com/ignite/cli/v29/ignite/services/scaffolder"
 )
@@ -107,7 +106,10 @@ about Cosmos SDK on https://docs.cosmos.network
 }
 
 func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	var (
@@ -144,10 +146,8 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	runner := xgenny.NewRunner(cmd.Context(), appPath)
 	appDir, goModule, err := scaffolder.Init(
 		cmd.Context(),
-		runner,
 		appPath,
 		name,
 		addressPrefix,
@@ -168,10 +168,6 @@ func scaffoldChainHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if _, err := runner.ApplyModifications(); err != nil {
-		return err
-	}
-
 	if err := scaffolder.PostScaffold(cmd.Context(), cacheStorage, appDir, protoDir, goModule, skipProto); err != nil {
 		return err
 	}

ignite/cmd/scaffold_chain_registry.go

@@ -36,7 +36,10 @@ Read more about the assets.json at https://github.com/cosmos/chain-registry?tab=
 }
 
 func scaffoldChainRegistryFiles(cmd *cobra.Command, _ []string) error {
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	cfg, _, err := getChainConfig(cmd)

ignite/cmd/scaffold_configs.go

@@ -6,6 +6,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/v29/ignite/pkg/cliui"
+	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v29/ignite/services/scaffolder"
 )
 
@@ -48,7 +49,10 @@ func scaffoldConfigsHandler(cmd *cobra.Command, args []string) error {
 		moduleName = flagGetModule(cmd)
 	)
 
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	cfg, _, err := getChainConfig(cmd)
@@ -71,7 +75,7 @@ func scaffoldConfigsHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	sm, err := sc.ApplyModifications()
+	sm, err := sc.ApplyModifications(xgenny.ApplyPreRun(scaffolder.AskOverwriteFiles(session)))
 	if err != nil {
 		return err
 	}

ignite/cmd/scaffold_message.go

@@ -4,6 +4,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/v29/ignite/pkg/cliui"
+	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v29/ignite/services/scaffolder"
 )
 
@@ -88,7 +89,10 @@ func messageHandler(cmd *cobra.Command, args []string) error {
 		withoutSimulation = flagGetNoSimulation(cmd)
 	)
 
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	cfg, _, err := getChainConfig(cmd)
@@ -128,7 +132,7 @@ func messageHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	sm, err := sc.ApplyModifications()
+	sm, err := sc.ApplyModifications(xgenny.ApplyPreRun(scaffolder.AskOverwriteFiles(session)))
 	if err != nil {
 		return err
 	}

ignite/cmd/scaffold_module.go

@@ -11,6 +11,7 @@ import (
 	"github.com/ignite/cli/v29/ignite/pkg/cliui"
 	"github.com/ignite/cli/v29/ignite/pkg/errors"
 	"github.com/ignite/cli/v29/ignite/pkg/validation"
+	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v29/ignite/services/scaffolder"
 	modulecreate "github.com/ignite/cli/v29/ignite/templates/module/create"
 )
@@ -114,7 +115,10 @@ func scaffoldModuleHandler(cmd *cobra.Command, args []string) error {
 		appPath = flagGetPath(cmd)
 	)
 
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	cfg, _, err := getChainConfig(cmd)
@@ -187,7 +191,7 @@ func scaffoldModuleHandler(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	sm, err := sc.ApplyModifications()
+	sm, err := sc.ApplyModifications(xgenny.ApplyPreRun(scaffolder.AskOverwriteFiles(session)))
 	if err != nil {
 		return err
 	}

ignite/cmd/scaffold_packet.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/ignite/cli/v29/ignite/pkg/cliui"
 	"github.com/ignite/cli/v29/ignite/pkg/errors"
+	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
 	"github.com/ignite/cli/v29/ignite/services/scaffolder"
 )
 
@@ -43,7 +44,10 @@ func createPacketHandler(cmd *cobra.Command, args []string) error {
 		appPath      = flagGetPath(cmd)
 	)
 
-	session := cliui.New(cliui.StartSpinnerWithText(statusScaffolding))
+	session := cliui.New(
+		cliui.StartSpinnerWithText(statusScaffolding),
+		cliui.WithoutUserInteraction(getYes(cmd)),
+	)
 	defer session.End()
 
 	cfg, _, err := getChainConfig(cmd)
@@ -81,7 +85,7 @@ func createPacketHandler(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	sm, err := sc.ApplyModifications()
+	sm, err := sc.ApplyModifications(xgenny.ApplyPreRun(scaffolder.AskOverwriteFiles(session)))
 	if err != nil {
 		return err
 	}