Merge pull request #242 from gofiber/codex/2025-11-30-18-22-41

Author: ReneWerner87

cmd/internal/migrations/v3/redirect_methods.go

@@ -116,62 +116,22 @@ func transformRedirectCall(call *ast.CallExpr, ctx ast.Expr, method string, stat
 func wrapWithRedirectStatus(ctx, target, status ast.Expr, method string) ast.CallExpr {
 	redirectCall := &ast.CallExpr{Fun: &ast.SelectorExpr{X: ctx, Sel: ast.NewIdent("Redirect")}}
 
-	targetIdent := ast.NewIdent("__fiberRedirectTarget")
-	statusIdent := ast.NewIdent("__fiberRedirectStatus")
-
-	redirectStatus := &ast.CallExpr{
-		Fun:  &ast.SelectorExpr{X: redirectCall, Sel: ast.NewIdent("Status")},
-		Args: []ast.Expr{statusIdent},
-	}
-
-	redirectWithTarget := &ast.CallExpr{
-		Fun:  &ast.SelectorExpr{X: redirectStatus, Sel: ast.NewIdent(method)},
-		Args: []ast.Expr{targetIdent},
-	}
+	redirectStatus := &ast.CallExpr{Fun: &ast.SelectorExpr{X: redirectCall, Sel: ast.NewIdent("Status")}, Args: []ast.Expr{status}}
 
 	return ast.CallExpr{
-		Fun: &ast.FuncLit{
-			Type: &ast.FuncType{Params: &ast.FieldList{}},
-			Body: &ast.BlockStmt{List: []ast.Stmt{
-				&ast.AssignStmt{Lhs: []ast.Expr{targetIdent}, Tok: token.DEFINE, Rhs: []ast.Expr{target}},
-				&ast.AssignStmt{Lhs: []ast.Expr{statusIdent}, Tok: token.DEFINE, Rhs: []ast.Expr{status}},
-				&ast.ReturnStmt{Results: []ast.Expr{redirectWithTarget}},
-			}},
-		},
+		Fun:  &ast.SelectorExpr{X: redirectStatus, Sel: ast.NewIdent(method)},
+		Args: []ast.Expr{target},
 	}
 }
 
 func wrapRouteWithStatus(ctx ast.Expr, args []ast.Expr, status ast.Expr) ast.CallExpr {
 	redirectCall := &ast.CallExpr{Fun: &ast.SelectorExpr{X: ctx, Sel: ast.NewIdent("Redirect")}}
-	statusIdent := ast.NewIdent("__fiberRedirectStatus")
-
-	var routeArgIdents []ast.Expr
-	var stmts []ast.Stmt
-	for i, arg := range args {
-		ident := ast.NewIdent(fmt.Sprintf("__fiberRedirectRouteArg%d", i))
-		routeArgIdents = append(routeArgIdents, ident)
-		stmts = append(stmts, &ast.AssignStmt{Lhs: []ast.Expr{ident}, Tok: token.DEFINE, Rhs: []ast.Expr{arg}})
-	}
 
-	stmts = append(stmts, &ast.AssignStmt{Lhs: []ast.Expr{statusIdent}, Tok: token.DEFINE, Rhs: []ast.Expr{status}})
-
-	redirectStatus := &ast.CallExpr{
-		Fun:  &ast.SelectorExpr{X: redirectCall, Sel: ast.NewIdent("Status")},
-		Args: []ast.Expr{statusIdent},
-	}
-
-	redirectRoute := &ast.CallExpr{
-		Fun:  &ast.SelectorExpr{X: redirectStatus, Sel: ast.NewIdent("Route")},
-		Args: routeArgIdents,
-	}
-
-	stmts = append(stmts, &ast.ReturnStmt{Results: []ast.Expr{redirectRoute}})
+	redirectStatus := &ast.CallExpr{Fun: &ast.SelectorExpr{X: redirectCall, Sel: ast.NewIdent("Status")}, Args: []ast.Expr{status}}
 
 	return ast.CallExpr{
-		Fun: &ast.FuncLit{
-			Type: &ast.FuncType{Params: &ast.FieldList{}},
-			Body: &ast.BlockStmt{List: stmts},
-		},
+		Fun:  &ast.SelectorExpr{X: redirectStatus, Sel: ast.NewIdent("Route")},
+		Args: args,
 	}
 }
 

cmd/internal/migrations/v3/redirect_methods_test.go

@@ -38,21 +38,13 @@ func handler(c fiber.Ctx) error {
 	require.NoError(t, v3.MigrateRedirectMethods(cmd, dir, nil, nil))
 
 	content := readFile(t, file)
-	assert.Contains(t, content, ".Redirect().To(\"/foo\")")
-	assert.Contains(t, content, "__fiberRedirectTarget := \"/bar\"")
-	assert.Contains(t, content, "__fiberRedirectStatus := fiber.StatusPermanentRedirect")
-	assert.Contains(t, content, "return c.Redirect().Status(__fiberRedirectStatus).To(__fiberRedirectTarget)")
-	assert.Contains(t, content, ".Redirect().Back()")
-	assert.Contains(t, content, "__fiberRedirectTarget := \"/fallback\"")
-	assert.Contains(t, content, "__fiberRedirectStatus := 301")
-	assert.Contains(t, content, "return c.Redirect().Status(__fiberRedirectStatus).Back(__fiberRedirectTarget)")
-	assert.Contains(t, content, ".Redirect().Route(\"home\")")
-	assert.Contains(t, content, "__fiberRedirectRouteArg0 := \"home-redirect\"")
-	assert.Contains(t, content, "return c.Redirect().Status(__fiberRedirectStatus).Route(__fiberRedirectRouteArg0)")
-	assert.Contains(t, content, "__fiberRedirectRouteArg1 := fiber.Map{}")
-	assert.Contains(t, content, "return c.Redirect().Status(__fiberRedirectStatus).Route(__fiberRedirectRouteArg0, __fiberRedirectRouteArg1)")
-	assert.Contains(t, content, "__fiberRedirectRouteArg0 := \"dashboard\"")
-	assert.Contains(t, content, "__fiberRedirectStatus := 308")
+	assert.Contains(t, content, "c.Redirect().To(\"/foo\")")
+	assert.Contains(t, content, "c.Redirect().Status(fiber.StatusPermanentRedirect).To(\"/bar\")")
+	assert.Contains(t, content, "c.Redirect().Back()")
+	assert.Contains(t, content, "c.Redirect().Status(301).Back(\"/fallback\")")
+	assert.Contains(t, content, "c.Redirect().Route(\"home\")")
+	assert.Contains(t, content, "c.Redirect().Status(301).Route(\"home-redirect\")")
+	assert.Contains(t, content, "c.Redirect().Status(308).Route(\"dashboard\", fiber.Map{})")
 	assert.Contains(t, buf.String(), "Migrating redirect methods")
 }
 
@@ -79,6 +71,5 @@ func handler(c fiber.Ctx) error {
 	require.NoError(t, v3.MigrateRedirectMethods(cmd, dir, nil, nil))
 
 	content := readFile(t, file)
-	assert.Equal(t, 1, strings.Count(content, "__fiberRedirectStatus := 302"))
-	assert.Contains(t, content, "return c.Redirect().Status(__fiberRedirectStatus).To(__fiberRedirectTarget)")
+	assert.Equal(t, 1, strings.Count(content, "c.Redirect().Status(302).To(\"/foo\")"))
 }