Improve templates, some minor package restructure

Gopkg.toml

@@ -1,30 +1,3 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-
 [[constraint]]
   name = "github.com/Masterminds/sprig"
   version = "2.14.1"
@@ -41,10 +14,6 @@
   name = "github.com/pkg/errors"
   version = "0.8.0"
 
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.2.1"
-
 [[constraint]]
   name = "github.com/twitchtv/protogen"
   version = "0.1.0"

internal/gen/generator.go

@@ -9,7 +9,7 @@ import (
 	"github.com/golang/protobuf/proto"
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
 	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-	"github.com/twirphp/protoc-gen-twirp_php/php"
+	"github.com/twirphp/protoc-gen-twirp_php/internal/php"
 	"github.com/twitchtv/protogen/typemap"
 )
 

internal/gen/template.go

@@ -6,14 +6,16 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	"github.com/twirphp/protoc-gen-twirp_php/php"
+	"github.com/twirphp/protoc-gen-twirp_php/internal/php"
+	"github.com/twirphp/protoc-gen-twirp_php/internal/proto"
 )
 
 // TxtFuncMap wraps sprig.TxtFuncMap and adds some proto generation specific ones.
 func TxtFuncMap(ctx *generatorContext) template.FuncMap {
 	funcMap := sprig.TxtFuncMap()
 
-	funcMap["protoComment"] = ProtoComment
+	funcMap["protoComment"] = proto.Comment
+	funcMap["protoFullName"] = proto.FullName
 
 	funcMap["phpNamespace"] = php.Namespace
 	funcMap["phpServiceName"] = php.ServiceName

internal/gen/template_proto.go → internal/proto/comment.go

@@ -1,7 +1,6 @@
-package gen
+package proto
 
 import (
-	"fmt"
 	"strconv"
 	"strings"
 
@@ -10,29 +9,29 @@ import (
 	"github.com/twitchtv/protogen/typemap"
 )
 
-// ProtoComment is a template wrapper for protocol buffer descriptor comments.
-func ProtoComment(desc ...interface{}) (string, error) {
+// Comment is a template wrapper for protocol buffer descriptor comments.
+func Comment(desc ...interface{}) (string, error) {
 	switch  len(desc) {
 	case 2:
 		file := desc[0].(*descriptor.FileDescriptorProto)
 		svc := desc[1].(*descriptor.ServiceDescriptorProto)
 
-		return ProtoServiceComment(file, svc), nil
+		return ServiceComment(file, svc), nil
 
 	case 3:
 		file := desc[0].(*descriptor.FileDescriptorProto)
 		svc := desc[1].(*descriptor.ServiceDescriptorProto)
 		method := desc[2].(*descriptor.MethodDescriptorProto)
 
-		return ProtoMethodComment(file, svc, method), nil
+		return MethodComment(file, svc, method), nil
 
 	default:
 		return "", errors.New("unexpected amount of arguments (expected 2 or 3, got " + strconv.Itoa(len(desc)))
 	}
 }
 
-// ProtoServiceComment extracts comments for a service.
-func ProtoServiceComment(file *descriptor.FileDescriptorProto, svc *descriptor.ServiceDescriptorProto) string {
+// ServiceComment extracts comments for a service.
+func ServiceComment(file *descriptor.FileDescriptorProto, svc *descriptor.ServiceDescriptorProto) string {
 	reg := &typemap.Registry{}
 
 	comments, err := reg.ServiceComments(file, svc)
@@ -48,8 +47,8 @@ func ProtoServiceComment(file *descriptor.FileDescriptorProto, svc *descriptor.S
 	return text
 }
 
-// ProtoMethodComment extracts comments for a service method.
-func ProtoMethodComment(file *descriptor.FileDescriptorProto, svc *descriptor.ServiceDescriptorProto, method *descriptor.MethodDescriptorProto) string {
+// MethodComment extracts comments for a service method.
+func MethodComment(file *descriptor.FileDescriptorProto, svc *descriptor.ServiceDescriptorProto, method *descriptor.MethodDescriptorProto) string {
 	reg := &typemap.Registry{}
 
 	comments, err := reg.MethodComments(file, svc, method)
@@ -64,12 +63,3 @@ func ProtoMethodComment(file *descriptor.FileDescriptorProto, svc *descriptor.Se
 
 	return text
 }
-
-// ProtoRelativeToPackage returns a type that is relative to the current file.
-func ProtoRelativeToPackage(file *descriptor.FileDescriptorProto, typ string) string {
-	if file.Package == nil {
-		return typ
-	}
-
-	return strings.TrimPrefix(typ, fmt.Sprintf(".%s.", file.GetPackage()))
-}

internal/proto/name.go

@@ -0,0 +1,45 @@
+package proto
+
+import (
+	"errors"
+	"strconv"
+
+	"github.com/golang/protobuf/protoc-gen-go/descriptor"
+)
+
+// FullName is a template wrapper for protocol buffer descriptor names.
+func FullName(desc ...interface{}) (string, error) {
+	switch  len(desc) {
+	case 2:
+		file := desc[0].(*descriptor.FileDescriptorProto)
+		svc := desc[1].(*descriptor.ServiceDescriptorProto)
+
+		return ServiceFullName(file, svc), nil
+
+	case 3:
+		file := desc[0].(*descriptor.FileDescriptorProto)
+		svc := desc[1].(*descriptor.ServiceDescriptorProto)
+		method := desc[2].(*descriptor.MethodDescriptorProto)
+
+		return MethodFullName(file, svc, method), nil
+
+	default:
+		return "", errors.New("unexpected amount of arguments (expected 2 or 3, got " + strconv.Itoa(len(desc)))
+	}
+}
+
+// ServiceFullName creates a fully qualified name for the service.
+func ServiceFullName(file *descriptor.FileDescriptorProto, svc *descriptor.ServiceDescriptorProto) string {
+	prefix := ""
+
+	if pkg := file.GetPackage(); pkg != "" {
+		prefix = pkg + "."
+	}
+
+	return prefix + svc.GetName()
+}
+
+// MethodFullName creates a fully qualified name for the service.
+func MethodFullName(file *descriptor.FileDescriptorProto, svc *descriptor.ServiceDescriptorProto, method *descriptor.MethodDescriptorProto) string {
+	return ServiceFullName(file, svc) + "/" + method.GetName()
+}

main.go

@@ -49,8 +49,8 @@ func Main(in io.Reader, out io.Writer, templates string) error {
 	greq := &gen.Request{
 		CodeGeneratorRequest: req,
 		GlobalFiles: []string{
-			"global/Protocol.php",
 			"global/Server.php",
+			"global/TwirpServer.php",
 			"global/TwirpClient.php",
 		},
 		ServiceFiles: []string{