Skip to content

Handle two-value assignments in locals and helper migrations #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ReneWerner87 merged 1 commit into from
Aug 23, 2025
Merged

Handle two-value assignments in locals and helper migrations #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cmd/internal/migrations/v3/generic_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,21 @@ import (
)

func MigrateGenericHelpers(cmd *cobra.Command, cwd string, _, _ *semver.Version) error {
reParamsIntAssign := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*(\w+)\.ParamsInt\(([^)]*)\)`)
reQueryIntAssign := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*(\w+)\.QueryInt\(([^)]*)\)`)
reQueryFloatAssign := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*(\w+)\.QueryFloat\(([^)]*)\)`)
reQueryBoolAssign := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*(\w+)\.QueryBool\(([^)]*)\)`)

reParamsInt := regexp.MustCompile(`(\w+)\.ParamsInt\(`)
reQueryInt := regexp.MustCompile(`(\w+)\.QueryInt\(`)
reQueryFloat := regexp.MustCompile(`(\w+)\.QueryFloat\(`)
reQueryBool := regexp.MustCompile(`(\w+)\.QueryBool\(`)
changed, err := internal.ChangeFileContent(cwd, func(content string) string {
content = reParamsIntAssign.ReplaceAllString(content, "$1, $2 := fiber.Params[int]($3, $4), nil")
content = reQueryIntAssign.ReplaceAllString(content, "$1, $2 := fiber.Query[int]($3, $4), nil")
content = reQueryFloatAssign.ReplaceAllString(content, "$1, $2 := fiber.Query[float64]($3, $4), nil")
content = reQueryBoolAssign.ReplaceAllString(content, "$1, $2 := fiber.Query[bool]($3, $4), nil")

content = reParamsInt.ReplaceAllString(content, "fiber.Params[int]($1, ")
content = reQueryInt.ReplaceAllString(content, "fiber.Query[int]($1, ")
content = reQueryFloat.ReplaceAllString(content, "fiber.Query[float64]($1, ")
Expand Down
12 changes: 10 additions & 2 deletions cmd/internal/migrations/v3/generic_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,16 @@ func Test_MigrateGenericHelpers(t *testing.T) {
file := writeTempFile(t, dir, `package main
import "github.com/gofiber/fiber/v2"
func handler(c fiber.Ctx) error {
targetedUserID, err := c.ParamsInt("userID")
targetedAge, err2 := c.QueryInt("age")
_ = c.ParamsInt("id", 0)
_ = c.QueryInt("age", 0)
_ = c.QueryInt("level", 0)
_ = c.QueryFloat("score", 0.5)
_ = c.QueryBool("ok", true)
_ = targetedUserID
_ = targetedAge
_ = err
_ = err2
return nil
}
`)
Expand All @@ -34,8 +40,10 @@ func handler(c fiber.Ctx) error {
require.NoError(t, v3.MigrateGenericHelpers(cmd, dir, nil, nil))

content := readFile(t, file)
assert.Contains(t, content, "targetedUserID, err := fiber.Params[int](c, \"userID\"), nil")
assert.Contains(t, content, "targetedAge, err2 := fiber.Query[int](c, \"age\"), nil")
assert.Contains(t, content, "fiber.Params[int](c, \"id\"")
assert.Contains(t, content, "fiber.Query[int](c, \"age\"")
assert.Contains(t, content, "fiber.Query[int](c, \"level\"")
assert.Contains(t, content, "fiber.Query[float64](c, \"score\"")
assert.Contains(t, content, "fiber.Query[bool](c, \"ok\"")
assert.Contains(t, buf.String(), "Migrating generic helpers")
Expand Down
4 changes: 2 additions & 2 deletions cmd/internal/migrations/v3/middleware_locals.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ func MigrateMiddlewareLocals(cmd *cobra.Command, cwd string, _, _ *semver.Versio
reTypeAssert := regexp.MustCompile(`([\w\.]+FromContext\([^\)]+\))\.\([^\)]+\)`)
content = reTypeAssert.ReplaceAllString(content, "$1")

reComma := regexp.MustCompile(`(\w+)\s*,\s*\w+\s*:=\s*([\w\.]+FromContext\([^\)]+\))`)
content = reComma.ReplaceAllString(content, "$1 := $2")
reComma := regexp.MustCompile(`(\w+)\s*,\s*(\w+)\s*:=\s*([\w\.]+FromContext\([^\)]+\))`)
content = reComma.ReplaceAllString(content, "$1, $2 := $3, true")

reCtxKey := regexp.MustCompile(`\s*ContextKey:\s*[^,}\n]+,?`)
content = reCtxKey.ReplaceAllString(content, "")
Expand Down
5 changes: 3 additions & 2 deletions cmd/internal/migrations/v3/middleware_locals_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ func Test_MigrateMiddlewareLocals(t *testing.T) {
import "github.com/gofiber/fiber/v2"
func handler(c fiber.Ctx) error {
id := c.Locals("requestid").(string)
csrfToken, _ := c.Locals("csrf").(string)
csrfToken, ok := c.Locals("csrf").(string)
token := c.Locals("token").(string)
_ = id
_ = csrfToken
_ = token
_ = ok
return nil
}`)

Expand All @@ -36,7 +37,7 @@ func handler(c fiber.Ctx) error {

content := readFile(t, file)
assert.Contains(t, content, `id := requestid.FromContext(c)`)
assert.Contains(t, content, `csrfToken := csrf.TokenFromContext(c)`)
assert.Contains(t, content, `csrfToken, ok := csrf.TokenFromContext(c), true`)
assert.Contains(t, content, `token := keyauth.TokenFromContext(c)`)
assert.Contains(t, buf.String(), "Migrating middleware locals")
}
Expand Down
Loading