refactor(router): introduce Any method for multi-method route registration

juicycleff · juicycleff · commit 7b5cdefcc8a2 · 2026-01-09T15:12:51.000-06:00
- Added the `Any` method to the router interface, allowing registration of handlers for all HTTP methods at a specified path.
- Enhanced the `Mount` method to support wildcard paths and ensure proper registration of handlers for both exact and wildcard routes.
- Updated tests to validate the functionality of the new `Any` method, ensuring it works with various handler types and middleware.
- Improved documentation for the router methods to clarify usage and behavior.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -61,6 +61,12 @@ jobs:
           go test -v -short -race -timeout=10m -coverprofile=coverage.out $(go list ./... | grep -v '/bk/')
         continue-on-error: ${{ matrix.os == 'windows-latest' }}
 
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: coverage.out
+
       - name: Upload coverage
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ Forge™ is a backend framework, and Forge Cloud™ is its AI cloud offering, ma
 > Build scalable, maintainable, and observable Go applications with Forge—the modern framework that brings clean architecture, dependency injection, and powerful extensions to your production services.
 
 [![Go Version](https://img.shields.io/badge/Go-1.24+-00ADD8?style=flat&logo=go)](https://golang.org/)
+[![Go Report Card](https://goreportcard.com/badge/github.com/xraph/forge)](https://goreportcard.com/report/github.com/xraph/forge)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![GitHub Stars](https://img.shields.io/github/stars/xraph/forge)](https://github.com/xraph/forge)
 [![CI/CD](https://github.com/xraph/forge/workflows/CI/badge.svg)](https://github.com/xraph/forge/actions)
diff --git a/app.go b/app.go
@@ -121,9 +121,9 @@ func DefaultAppConfig() AppConfig {
 		ConfigBaseNames:           []string{"config.yaml", "config.yml"},
 		ConfigLocalNames:          []string{"config.local.yaml", "config.local.yml"},
 		// Environment variable source defaults
-		EnableEnvConfig:  true,        // Enabled by default
-		EnvSeparator:     "_",         // Standard separator
-		EnvOverridesFile: true,        // Env takes precedence over files by default
+		EnableEnvConfig:  true, // Enabled by default
+		EnvSeparator:     "_",  // Standard separator
+		EnvOverridesFile: true, // Env takes precedence over files by default
 	}
 }
 
diff --git a/cmd/forge/plugins/database_go_migrations.go b/cmd/forge/plugins/database_go_migrations.go
@@ -59,7 +59,7 @@ func (p *DatabasePlugin) runWithGoMigrations(ctx cli.CommandContext, command str
 	if ctx.Bool("verbose") {
 		migrationPath, _ := p.getMigrationPath()
 		ctx.Info(fmt.Sprintf("📁 Migration directory: %s", migrationPath))
-		
+
 		// Check if migrations.go exists
 		migrationsGoPath := filepath.Join(migrationPath, "migrations.go")
 		if _, err := os.Stat(migrationsGoPath); os.IsNotExist(err) {
diff --git a/examples/database-migration-docker/main.go b/examples/database-migration-docker/main.go
@@ -45,4 +45,3 @@ func main() {
 
 	log.Println("✅ Application stopped gracefully")
 }
-
diff --git a/extensions/database/migrate/migrations_test.go b/extensions/database/migrate/migrations_test.go
@@ -22,13 +22,13 @@ func TestMigrationsPackageInitialization(t *testing.T) {
 // collection even if discovery fails.
 func TestGetMigrations(t *testing.T) {
 	migrations, err := migrate.GetMigrations()
-	
+
 	// Even if discovery fails, we should get a migrations object
 	// (it just won't have filesystem-discovered migrations)
 	if migrations == nil {
 		t.Fatal("GetMigrations should never return nil")
 	}
-	
+
 	// Error is informational only - the function still returns the migrations
 	_ = err
 }
@@ -38,10 +38,9 @@ func TestEnsureDiscoveredIdempotent(t *testing.T) {
 	// Call GetMigrations multiple times
 	_, err1 := migrate.GetMigrations()
 	_, err2 := migrate.GetMigrations()
-	
+
 	// Errors should be identical (discovery only happens once)
 	if (err1 == nil) != (err2 == nil) {
 		t.Error("Multiple calls to GetMigrations should return the same error state")
 	}
 }
-
diff --git a/go.mod b/go.mod
@@ -2,6 +2,8 @@ module github.com/xraph/forge
 
 go 1.24.4
 
+replace github.com/xraph/forgeui => ../forgeui
+
 require (
 	github.com/BurntSushi/toml v1.5.0
 	github.com/Flagsmith/flagsmith-go-client/v3 v3.7.0
@@ -22,6 +24,7 @@ require (
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
 	github.com/grandcat/zeroconf v1.0.0
 	github.com/hashicorp/consul/api v1.32.1
+	github.com/joho/godotenv v1.5.1
 	github.com/json-iterator/go v1.1.12
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/launchdarkly/go-sdk-common/v3 v3.4.0
@@ -122,7 +125,6 @@ require (
 	github.com/hashicorp/serf v0.10.1 // indirect
 	github.com/itlightning/dateparse v0.2.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/launchdarkly/ccache v1.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -494,8 +494,6 @@ github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6
 github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
 github.com/xraph/farp v1.0.2 h1:xu9d5JB/4+F0s5TVe3MaXrQO98a/AEOgYN0p/8moZlU=
 github.com/xraph/farp v1.0.2/go.mod h1:Nlli8WUsxvQL5wXiJqcAn6OsUHBzKJxrl9JLJ9J6Wqo=
-github.com/xraph/forgeui v0.0.1 h1:ID5q06qrPXijiWzzIjDOsuOpU54fg4dx4UXgozDRueA=
-github.com/xraph/forgeui v0.0.1/go.mod h1:gh16NPVUF9F/+4P/nmibhs2uTpWO2iYVADrIunQGK1U=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/internal/config/sources/file_env_expand_test.go b/internal/config/sources/file_env_expand_test.go
@@ -493,4 +493,3 @@ database:
 		t.Errorf("name = %v, want testdb", db["name"])
 	}
 }
-
diff --git a/internal/config/sources/test_real_example.go b/internal/config/sources/test_real_example.go
@@ -77,12 +77,12 @@ func TestRealConfigExample_WithDefaults(t *testing.T) {
 		if ai["max_concurrency"] != "10" {
 			t.Errorf("ai.max_concurrency = %v, want 10", ai["max_concurrency"])
 		}
-		
+
 		if llm, ok := ai["llm"].(map[string]any); ok {
 			if llm["default_provider"] != "lmstudio" {
 				t.Errorf("ai.llm.default_provider = %v, want lmstudio", llm["default_provider"])
 			}
-			
+
 			if providers, ok := llm["providers"].(map[string]any); ok {
 				if lmstudio, ok := providers["lmstudio"].(map[string]any); ok {
 					if lmstudio["base_url"] != "http://localhost:1234/v1" {
@@ -106,7 +106,7 @@ func TestRealConfigExample_WithEnvOverrides(t *testing.T) {
 	os.Setenv("REDIS_DSN", "redis://:password@prod-redis:6379")
 	os.Setenv("AI_LLM_DEFAULT_PROVIDER", "openai")
 	os.Setenv("OLLAMA_BASE_URL", "http://ollama.prod:11434")
-	
+
 	defer func() {
 		os.Unsetenv("DATABASE_DSN")
 		os.Unsetenv("DATABASE_MAX_OPEN_CONNS")
@@ -166,7 +166,7 @@ func TestRealConfigExample_WithEnvOverrides(t *testing.T) {
 			if llm["default_provider"] != "openai" {
 				t.Errorf("ai.llm.default_provider = %v, want openai", llm["default_provider"])
 			}
-			
+
 			if providers, ok := llm["providers"].(map[string]any); ok {
 				if ollama, ok := providers["ollama"].(map[string]any); ok {
 					if ollama["base_url"] != "http://ollama.prod:11434" {
@@ -189,7 +189,7 @@ func TestRealConfigExample_MixedDefaults(t *testing.T) {
 	// DATABASE_MAX_OPEN_CONNS not set - should use default 25
 	os.Setenv("AI_LLM_DEFAULT_PROVIDER", "ollama")
 	// OLLAMA_BASE_URL not set - should use default http://localhost:11434
-	
+
 	defer func() {
 		os.Unsetenv("DATABASE_DSN")
 		os.Unsetenv("AI_LLM_DEFAULT_PROVIDER")
@@ -231,7 +231,7 @@ func TestRealConfigExample_MixedDefaults(t *testing.T) {
 			if llm["default_provider"] != "ollama" {
 				t.Errorf("ai.llm.default_provider = %v, want ollama", llm["default_provider"])
 			}
-			
+
 			if providers, ok := llm["providers"].(map[string]any); ok {
 				if ollama, ok := providers["ollama"].(map[string]any); ok {
 					// URL should use default
@@ -250,26 +250,25 @@ func TestRealConfigExample_MixedDefaults(t *testing.T) {
 
 func ExampleFileSource_expandEnvWithDefaults() {
 	// This example shows how the new bash-style default syntax works
-	
+
 	// Without environment variables set
 	result1 := expandEnvWithDefaults("${DATABASE_DSN:-postgres://localhost:5432/mydb}")
 	fmt.Println("Without env var:", result1)
-	
+
 	// With environment variable set
 	os.Setenv("DATABASE_DSN", "postgres://prod:5432/proddb")
 	result2 := expandEnvWithDefaults("${DATABASE_DSN:-postgres://localhost:5432/mydb}")
 	fmt.Println("With env var:", result2)
 	os.Unsetenv("DATABASE_DSN")
-	
+
 	// Complex example with multiple variables
 	os.Setenv("DB_HOST", "prod-server")
 	result3 := expandEnvWithDefaults("postgres://${DB_USER:-postgres}:${DB_PASS:-postgres}@${DB_HOST:-localhost}:${DB_PORT:-5432}/${DB_NAME:-mydb}")
 	fmt.Println("Complex example:", result3)
 	os.Unsetenv("DB_HOST")
-	
+
 	// Output:
 	// Without env var: postgres://localhost:5432/mydb
 	// With env var: postgres://prod:5432/proddb
 	// Complex example: postgres://postgres:postgres@prod-server:5432/mydb
 }
-
diff --git a/internal/router/bunrouter.go b/internal/router/bunrouter.go
@@ -63,10 +63,8 @@ func (a *BunRouterAdapter) Handle(method, path string, handler http.Handler) {
 
 // Mount registers a sub-handler.
 func (a *BunRouterAdapter) Mount(path string, handler http.Handler) {
-	// Ensure path ends with a named wildcard parameter for bunrouter
-	mountPath := strings.TrimSuffix(path, "/") + "/*filepath"
-
-	a.router.Handle("*", mountPath, func(w http.ResponseWriter, req bunrouter.Request) error {
+	// Create the handler function
+	handlerFunc := func(w http.ResponseWriter, req bunrouter.Request) error {
 		httpReq := req.Request
 
 		// Extract params from bunrouter for mounted routes
@@ -87,7 +85,39 @@ func (a *BunRouterAdapter) Mount(path string, handler http.Handler) {
 		handler.ServeHTTP(w, httpReq)
 
 		return nil
-	})
+	}
+
+	// Register for all HTTP methods
+	methods := []string{
+		http.MethodGet,
+		http.MethodPost,
+		http.MethodPut,
+		http.MethodDelete,
+		http.MethodPatch,
+		http.MethodOptions,
+		http.MethodHead,
+	}
+
+	// Determine the mount path
+	var mountPath string
+	if strings.HasSuffix(path, "/*") {
+		// Path already has wildcard, convert it to named wildcard
+		mountPath = path + "filepath"
+	} else {
+		// Path doesn't have wildcard - register both exact path and wildcard path
+		// This allows the handler to receive requests to both /path and /path/*
+		for _, method := range methods {
+			// Register exact path
+			a.router.Handle(method, path, handlerFunc)
+		}
+		// Also register wildcard path for sub-paths
+		mountPath = strings.TrimSuffix(path, "/") + "/*filepath"
+	}
+
+	// Register the wildcard path
+	for _, method := range methods {
+		a.router.Handle(method, mountPath, handlerFunc)
+	}
 }
 
 // UseGlobal registers global middleware that runs before routing.
diff --git a/internal/router/bunrouter_test.go b/internal/router/bunrouter_test.go
@@ -47,18 +47,52 @@ func TestBunRouterAdapter_PathParams(t *testing.T) {
 }
 
 func TestBunRouterAdapter_Mount(t *testing.T) {
-	t.Skip("BunRouter mount with wildcards is problematic, tested via main router")
-
 	adapter := NewBunRouterAdapter()
 
-	// Mount doesn't work properly with bunrouter wildcards
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("mounted"))
+		w.Write([]byte("mounted: " + r.URL.Path))
 	})
 
 	adapter.Mount("/api", handler)
-	assert.NotNil(t, adapter)
+
+	// Test exact path
+	req1 := httptest.NewRequest(http.MethodGet, "/api", nil)
+	rec1 := httptest.NewRecorder()
+	adapter.ServeHTTP(rec1, req1)
+	assert.Equal(t, 200, rec1.Code)
+	assert.Contains(t, rec1.Body.String(), "mounted")
+
+	// Test sub-path
+	req2 := httptest.NewRequest(http.MethodGet, "/api/users", nil)
+	rec2 := httptest.NewRecorder()
+	adapter.ServeHTTP(rec2, req2)
+	assert.Equal(t, 200, rec2.Code)
+	assert.Contains(t, rec2.Body.String(), "mounted")
+
+	// Test with POST method
+	req3 := httptest.NewRequest(http.MethodPost, "/api/data", nil)
+	rec3 := httptest.NewRecorder()
+	adapter.ServeHTTP(rec3, req3)
+	assert.Equal(t, 200, rec3.Code)
+}
+
+func TestBunRouterAdapter_MountWithWildcard(t *testing.T) {
+	adapter := NewBunRouterAdapter()
+
+	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("wildcard mounted"))
+	})
+
+	adapter.Mount("/files/*", handler)
+
+	// Test wildcard path
+	req := httptest.NewRequest(http.MethodGet, "/files/test.txt", nil)
+	rec := httptest.NewRecorder()
+	adapter.ServeHTTP(rec, req)
+	assert.Equal(t, 200, rec.Code)
+	assert.Contains(t, rec.Body.String(), "wildcard mounted")
 }
 
 func TestBunRouterAdapter_NotFound(t *testing.T) {
diff --git a/internal/router/openapi_generator_test.go b/internal/router/openapi_generator_test.go
diff --git a/internal/router/router.go b/internal/router/router.go
diff --git a/internal/router/router_impl.go b/internal/router/router_impl.go
diff --git a/internal/router/router_test.go b/internal/router/router_test.go

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,9 @@ func DefaultAppConfig() AppConfig {`
`121`	`121`	`ConfigBaseNames: []string{"config.yaml", "config.yml"},`
`122`	`122`	`ConfigLocalNames: []string{"config.local.yaml", "config.local.yml"},`
`123`	`123`	`// Environment variable source defaults`
`124`		`- EnableEnvConfig: true, // Enabled by default`
`125`		`- EnvSeparator: "_", // Standard separator`
`126`		`- EnvOverridesFile: true, // Env takes precedence over files by default`
	`124`	`+ EnableEnvConfig: true, // Enabled by default`
	`125`	`+ EnvSeparator: "_", // Standard separator`
	`126`	`+ EnvOverridesFile: true, // Env takes precedence over files by default`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,3 @@ func main() {`
`45`	`45`
`46`	`46`	`log.Println("✅ Application stopped gracefully")`
`47`	`47`	`}`
`48`		`-`
Original file line number	Diff line number	Diff line change
`@@ -493,4 +493,3 @@ database:`
`493`	`493`	`t.Errorf("name = %v, want testdb", db["name"])`
`494`	`494`	`}`
`495`	`495`	`}`
`496`		`-`