fix: cleanup xgenny runner to avoid duplicated generators (#4863)

* FIX: xgenny runner cleanup to avoid duplicated generators

* add changelog

* fix ts tests

* rollback ts files

Author: Pantani

changelog.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- [#4735](https://github.com/ignite/cli/issues/4735) Cleanup `xgenny` runner to avoid duplicated generators.
+
 ## [`v29.7.0`](https://github.com/ignite/cli/releases/tag/v29.7.0)
 
 ## Changes

ignite/pkg/xgenny/runner.go

@@ -19,6 +19,7 @@ type Runner struct {
 	tracer  *placeholder.Tracer
 	results []genny.File
 	tmpPath string
+	root    string
 }
 
 // NewRunner is a xgenny Runner with a logger.
@@ -34,11 +35,21 @@ func NewRunner(ctx context.Context, root string) *Runner {
 		tmpPath: tmpPath,
 		tracer:  placeholder.New(),
 		results: make([]genny.File, 0),
+		root:    root,
 	}
 	runner.FileFn = wetFileFn(r)
 	return r
 }
 
+// cleanup clears the underlying genny runner state so previously executed
+// generators are not re-run on subsequent calls.
+func (r *Runner) cleanup() {
+	runner := genny.WetRunner(r.ctx)
+	runner.Root = r.root
+	runner.FileFn = wetFileFn(r)
+	r.Runner = runner
+}
+
 func (r *Runner) Tracer() *placeholder.Tracer {
 	return r.tracer
 }
@@ -139,16 +150,24 @@ func (r *Runner) RunAndApply(gens *genny.Generator, options ...ApplyOption) (Sou
 
 // Run all generators into a temp folder for we can apply the modifications later.
 func (r *Runner) Run(gens ...*genny.Generator) error {
-	// execute the modification with a wet runner
+	// ensure the underlying genny runner starts clean to avoid re-running previous generators
+	r.cleanup()
+
 	for _, gen := range gens {
 		if err := r.Runner.With(gen); err != nil {
 			return err
 		}
-		if err := r.Runner.Run(); err != nil {
-			return err
-		}
 	}
+
+	if err := r.Runner.Run(); err != nil {
+		return err
+	}
+
 	r.results = append(r.results, r.Results().Files...)
+
+	// reset again so a future Run call starts fresh
+	r.cleanup()
+
 	return r.tracer.Err()
 }
 

ignite/pkg/xgenny/runner_test.go

@@ -0,0 +1,35 @@
+package xgenny_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/gobuffalo/genny/v2"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ignite/cli/v29/ignite/pkg/xgenny"
+)
+
+func TestMultipleGen(t *testing.T) {
+	var (
+		runner         = xgenny.NewRunner(context.Background(), t.TempDir())
+		firstGen       = genny.New()
+		secondGen      = genny.New()
+		firstRunCount  int
+		secondRunCount int
+	)
+
+	firstGen.RunFn(func(_ *genny.Runner) error {
+		firstRunCount++
+		return nil
+	})
+
+	secondGen.RunFn(func(_ *genny.Runner) error {
+		secondRunCount++
+		return nil
+	})
+
+	require.NoError(t, runner.Run(firstGen, secondGen))
+	require.Equal(t, 1, firstRunCount, "first generator should run only once")
+	require.Equal(t, 1, secondRunCount, "second generator should run only once")
+}