SebastienMelki
diff --git a/‎.gitignore‎
Lines changed: 6 additions & 0 deletions b/‎.gitignore‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎CLAUDE.md‎
Lines changed: 6 additions & 2 deletions b/‎CLAUDE.md‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 2 deletions b/‎README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎cmd/protoc-gen-openapiv3/main.go‎
Lines changed: 64 additions & 16 deletions b/‎cmd/protoc-gen-openapiv3/main.go‎
Lines changed: 64 additions & 16 deletions
diff --git a/‎coverage/coverage-badge.svg‎
Lines changed: 1 addition & 0 deletions b/‎coverage/coverage-badge.svg‎
Lines changed: 1 addition & 0 deletions
@@ -10,6 +10,12 @@ bin/
 # Test binary, built with `go test -c`
 *.test
 
+# Test plugin binaries (should be cleaned up automatically)
+protoc-gen-*-test
+protoc-gen-*-golden*
+protoc-gen-*-regression*
+protoc-gen-*-integration*
+
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
 
@@ -30,7 +30,7 @@ The project follows a clean Go protoc plugin architecture with separated concern
 
 1. **Oneof Helper Generator** (`internal/oneofhelper/generator.go:27`): Creates convenience constructors for oneof fields containing message types
 2. **HTTP Handler Generator** (`internal/httpgen/generator.go:22`): Generates HTTP handlers, request binding, routing configuration, automatic body validation, and header validation middleware
-3. **OpenAPI Generator** (`internal/openapiv3/generator.go:53`): Creates comprehensive OpenAPI v3.1 specifications from protobuf definitions with full header parameter support
+3. **OpenAPI Generator** (`internal/openapiv3/generator.go:53`): Creates comprehensive OpenAPI v3.1 specifications from protobuf definitions with full header parameter support, generating one file per service for better organization
 4. **HTTP Annotations** (`proto/sebuf/http/annotations.proto`): Custom protobuf extensions for HTTP configuration
 5. **Header Validation** (`proto/sebuf/http/headers.proto`): Protobuf definitions for service and method-level header validation
 6. **Validation System**: Automatic request body validation via buf.validate/protovalidate and header validation middleware
@@ -63,9 +63,13 @@ type UserServiceServer interface {
 func RegisterUserServiceServer(server UserServiceServer, opts ...ServerOption) error
 ```
 
-**OpenAPI Specifications** - Comprehensive API documentation:
+**OpenAPI Specifications** - Comprehensive API documentation (one file per service):
 ```yaml
+# UserService.openapi.yaml
 openapi: 3.1.0
+info:
+  title: UserService API
+  version: 1.0.0
 paths:
   /api/v1/users:
     post:
 
@@ -33,7 +33,7 @@ This starts a working HTTP API with JSON endpoints, OpenAPI docs, and helper fun
 - **Mock server generation** with realistic field examples for rapid prototyping
 - **Automatic request validation** using protovalidate with buf.validate annotations
 - **HTTP header validation** with type checking and format validation (UUID, email, datetime)
-- **OpenAPI v3.1 docs** that stay in sync with your code, including header parameters and field examples
+- **OpenAPI v3.1 docs** that stay in sync with your code, one file per service for better organization
 - **Helper functions** that eliminate protobuf boilerplate
 - **Zero runtime dependencies** - works with any Go HTTP framework
 
@@ -95,7 +95,7 @@ req := api.NewCreateUserRequestToken("auth-token")
 // Validation happens automatically:
 // - Headers validated first (returns HTTP 400 for missing/invalid headers)
 // - Then request body validated (returns HTTP 400 for invalid requests)
-// OpenAPI docs (api.yaml) - includes validation rules, header parameters, and field examples
+// OpenAPI docs (UserService.openapi.yaml) - includes validation rules, headers, and examples
 ```
 
 ## Quick setup
 
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -13,7 +14,14 @@ import (
 )
 
 func main() {
-	// Read request from stdin
+	req := readRequest()
+	format := parseFormat(req)
+	plugin := createPlugin(req)
+	generateOpenAPIFiles(plugin, format)
+	writeResponse(plugin)
+}
+
+func readRequest() *pluginpb.CodeGeneratorRequest {
 	input, err := io.ReadAll(os.Stdin)
 	if err != nil {
 		panic(err)
@@ -23,8 +31,10 @@ func main() {
 	if unmarshalErr := proto.Unmarshal(input, &req); unmarshalErr != nil {
 		panic(unmarshalErr)
 	}
+	return &req
+}
 
-	// Parse parameters for output format
+func parseFormat(req *pluginpb.CodeGeneratorRequest) openapiv3.OutputFormat {
 	format := openapiv3.FormatYAML // default to YAML
 	if req.Parameter != nil {
 		params := parseParameters(req.GetParameter())
@@ -37,43 +47,81 @@ func main() {
 			}
 		}
 	}
+	return format
+}
 
-	// Process with protogen helper
+func createPlugin(req *pluginpb.CodeGeneratorRequest) *protogen.Plugin {
 	opts := protogen.Options{}
-	plugin, err := opts.New(&req)
+	plugin, err := opts.New(req)
 	if err != nil {
 		panic(err)
 	}
+	return plugin
+}
 
-	// Generate OpenAPI document for all proto files
-	generator := openapiv3.NewGenerator(format)
+func generateOpenAPIFiles(plugin *protogen.Plugin, format openapiv3.OutputFormat) {
 	for _, file := range plugin.Files {
 		if !file.Generate {
 			continue
 		}
-		generator.ProcessFile(file)
+		processFileServices(plugin, file, format)
 	}
+}
 
-	// Render the OpenAPI document
-	output, err := generator.Render()
-	if err != nil {
-		panic(err)
+func processFileServices(plugin *protogen.Plugin, file *protogen.File, format openapiv3.OutputFormat) {
+	for _, service := range file.Services {
+		generator := createServiceGenerator(file, service, format)
+		output := renderService(generator)
+		writeServiceFile(plugin, service, output, format)
 	}
+}
 
-	// Determine output filename based on format
-	filename := "openapi.yaml"
+func createServiceGenerator(
+	file *protogen.File,
+	service *protogen.Service,
+	format openapiv3.OutputFormat,
+) *openapiv3.Generator {
+	generator := openapiv3.NewGenerator(format)
+
+	// Process all messages from the file (needed for schemas)
+	for _, message := range file.Messages {
+		generator.ProcessMessage(message)
+	}
+
+	generator.ProcessService(service)
+	return generator
+}
+
+func renderService(generator *openapiv3.Generator) []byte {
+	output, renderErr := generator.Render()
+	if renderErr != nil {
+		panic(renderErr)
+	}
+	return output
+}
+
+func writeServiceFile(
+	plugin *protogen.Plugin,
+	service *protogen.Service,
+	output []byte,
+	format openapiv3.OutputFormat,
+) {
+	ext := "yaml"
 	if format == openapiv3.FormatJSON {
-		filename = "openapi.json"
+		ext = "json"
 	}
+	filename := fmt.Sprintf("%s.openapi.%s", service.Desc.Name(), ext)
 
-	// Write to generated file
 	generatedFile := plugin.NewGeneratedFile(filename, "")
 	if _, writeErr := generatedFile.Write(output); writeErr != nil {
 		panic(writeErr)
 	}
+}
 
-	// Write response to stdout
+func writeResponse(plugin *protogen.Plugin) {
 	resp := plugin.Response()
+	resp.SupportedFeatures = proto.Uint64(uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL))
+
 	respOutput, err := proto.Marshal(resp)
 	if err != nil {
 		panic(err)