chore(deps): update all

Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com>

.circleci/config.yml

@@ -0,0 +1,17 @@
+version: 2.1
+
+orbs:
+  moul: moul/build@1.14.0 # https://github.com/moul/build
+
+workflows:
+  main:
+    jobs:
+      - moul/golang-build:
+          gopkg: moul.io/protoc-gen-gotemplate
+      - moul/golang-build:
+          gopkg: moul.io/protoc-gen-gotemplate
+          tag: '1.12'
+      - moul/golang-build:
+          gopkg: moul.io/protoc-gen-gotemplate
+          tag: '1.11'
+      - moul/docker-build

.dockerignore

@@ -0,0 +1,3 @@
+Dockerfile
+*~
+.git/

.gitattributes

@@ -0,0 +1,15 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Collapse vendored and generated files on GitHub
+vendor/* linguist-vendored
+rules.mk linguist-vendored
+*/vendor/* linguist-vendored
+*.gen.* linguist-generated
+*.pb.go linguist-generated
+go.sum linguist-generated
+go.mod linguist-generated
+gen.sum linguist-generated
+
+# Reduce conflicts on markdown files
+*.md merge=union

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @moul

.github/FUNDING.yml

@@ -0,0 +1,6 @@
+#github: ["moul"]
+patreon: moul
+open_collective: moul
+custom:
+- "https://www.buymeacoffee.com/moul"
+- "https://manfred.life/donate"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG] "
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Type '....'
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots / Logs**
+If applicable, add screenshots or logs to help explain your problem.
+
+**Versions (please complete the following information, if relevant):**
+- Software version: [e.g. v1.2.3, latest, building from sources]
+- OS: [e.g. Ubuntu, Mac, iOS, ...]
+- Golang version [e.g. 1.13]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,8 @@
+---
+name: Custom
+about: 'Anything else: questions, discussions, thanks, ascii-arts, ...'
+title: ''
+labels: discussion
+assignees: moul
+
+---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[IDEA] "
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+<!--
+Thank you for your contribution to this repo!
+
+Before submitting a pull request, please check the following:
+- reference any related issue, PR, link
+- use the "WIP" title prefix if you need help or more time to finish your PR
+
+you can remove this markdown comment
+-->

.github/renovate.json

@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "groupName": "all"
+}

.github/workflows/release.yml

@@ -0,0 +1,13 @@
+name: Semantic Release
+
+on: push
+
+jobs:
+  semantic-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: codfish/semantic-release-action@v1
+        if: github.ref == 'refs/heads/master'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,26 +1,25 @@
-/protoc-gen-gotemplate
+# Temporary files
+*~
+*#
+.#*
+coverage.txt
 
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
+# Vendors
+package-lock.json
+node_modules/
+vendor/
 
+# Binaries for programs and plugins
+dist/
+gin-bin
 *.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
 *.test
-*.prof
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out

.golangci.yml

@@ -0,0 +1,34 @@
+run:
+  deadline: 1m
+  tests: false
+  #skip-files:
+  #  - ".*\\.gen\\.go"
+
+linters-settings:
+  golint:
+    min-confidence: 0
+  maligned:
+    suggest-new: true
+  goconst:
+    min-len: 5
+    min-occurrences: 4
+  misspell:
+    locale: US
+
+linters:
+  disable-all: true
+  enable:
+    - goconst
+    - misspell
+    - deadcode
+    - misspell
+    - structcheck
+    - errcheck
+    - unused
+    - varcheck
+    - staticcheck
+    - unconvert
+    - gofmt
+    - goimports
+    - golint
+    - ineffassign

.releaserc.js

@@ -0,0 +1,8 @@
+module.exports = {
+    branch: 'master',
+    plugins: [
+        '@semantic-release/commit-analyzer',
+        '@semantic-release/release-notes-generator',
+        '@semantic-release/github',
+    ],
+};

.travis.yml

@@ -1,14 +0,0 @@
-language: go
-go: 1.7.x
-install:
-- wget https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/.travis/install-protoc.sh && chmod +x install-protoc.sh && ./install-protoc.sh 3.1.0
-- go get github.com/gogo/protobuf/protoc-gen-gogo
-script:
-- make install
-- make test
-cache:
-  directories:
-  - $HOME/local
-env:
-  global:
-  - "PATH=$PATH:$HOME/local/bin"

AUTHORS

@@ -0,0 +1,28 @@
+# This file lists all individuals having contributed content to the repository.
+# For how it is generated, see 'https://github.com/moul/rules.mk'
+
+Alexandre Beslic <abeslic@abronan.com>
+Anastasia DERUELLE <anastasia.deruelle@gmail.com>
+Gero <geronimo@eclypsium.com>
+gfanton <guilhem.fanton@gmail.com>
+Guilhem Fanton <guilhem.fanton@gmail.com>
+Jan Weitz <jan@iosphere.de>
+jhayotte <julien.hayotte@gmail.com>
+Julien Hayotte <julien.hayotte@gmail.com>
+Manfred Touron <m@42.am>
+Mathieu Acthernoene <zoontek@gmail.com>
+Mike Lee <mike.lee@safeguardproperties.com>
+moul-bot <41326314+moul-bot@users.noreply.github.com>
+Pat Moroney <pat@pat.email>
+Pat Moroney <pmoroney@name.com>
+Peter Monko <piotrek.monko@gmail.com>
+Pierre Roullon <pierre.roullon@gmail.com>
+Quentin Perez <qperez@ocs.online.net>
+Renovate Bot <bot@renovateapp.com>
+Sacha Froment <sfroment42@gmail.com>
+Shogo Iwano <shiwano@gmail.com>
+Thomas KERAMBLOCH <tkerambloch@vente-privee.com>
+Tommy PAGEARD <tpageard@vente-privee.com>
+Valerio Gheri <valerio.gheri@gmail.com>
+Victor Login <batazor111@gmail.com>
+webii <michal.jaglewicz@gmail.com>

Dockerfile

@@ -1,5 +1,18 @@
-FROM znly/protoc
-RUN apk --update add make git go rsync
-COPY . /go/src/github.com/moul/protoc-gen-gotemplate
-WORKDIR /go/src/github.com/moul/protoc-gen-gotemplate
-RUN go install .
+# builder
+FROM    golang:1.14-alpine as builder
+RUN     apk --no-cache add make git go rsync libc-dev
+RUN     go get -u golang.org/x/tools/cmd/goimports
+RUN     go get -u github.com/gobuffalo/packr/v2/packr2
+COPY    . /go/src/moul.io/protoc-gen-gotemplate
+WORKDIR /go/src/moul.io/protoc-gen-gotemplate
+RUN     packr2
+RUN     go install -a -tags netgo -ldflags '-w -extldflags "-static"' . ./cmd/web-editor
+RUN     ls -la /go/bin
+
+# runtime
+FROM    znly/protoc:0.3.0
+COPY    --from=builder  /go/bin/web-editor            /go/bin/
+COPY    --from=builder  /go/bin/protoc-gen-gotemplate /go/bin/
+ENV     PATH=$PATH:/go/bin
+EXPOSE  8080
+ENTRYPOINT []

Makefile

@@ -1,20 +1,24 @@
-.PHONY: build
-build:
-	go build -o protoc-gen-gotemplate .
+GOPKG ?= moul.io/protoc-gen-gotemplate
+DOCKER_IMAGE ?= moul/protoc-gen-gotemplate
+GOBINS ?= . ./cmd/web-editor
+GOLIBS ?= .
 
-.PHONY: install
-install:
-	go install .
+all: test install
 
-.PHONY: test
-test:	build
+include rules.mk
+
+.PHONY: examples
+examples:	install
+	cd examples/time && make
+	cd examples/enum && make
+	cd examples/import && make
 	cd examples/dummy && make
 	cd examples/flow && make
-
-.PHONY: docker.build
-docker.build:
-	docker build --pull -t moul/protoc-gen-gotemplate .
-
-.PHONY: docker.push
-docker.push: docker.build
-	docker push moul/protoc-gen-gotemplate
+	cd examples/concat && make
+	cd examples/flow && make
+	cd examples/sitemap && make
+	cd examples/go-generate && make
+  #cd examples/single-package-mode && make
+	cd examples/helpers && make
+	cd examples/arithmetics && make
+  #cd examples/go-kit && make

README.md

@@ -1,19 +1,38 @@
 # `protoc-gen-gotemplate`
 :open_file_folder: protocol generator + golang text/template (protobuf)
 
-Generic protocol buffer generator backed by Golang's [text/template](https://golang.org/pkg/text/template).
+A generic **code**/script/data generator based on [Protobuf](https://developers.google.com/protocol-buffers/).
 
 ---
 
-This is a generator plugin for the Google Protocol Buffers compiler (`protoc`).
+This project is a generator plugin for the Google Protocol Buffers compiler (`protoc`).
 
-The plugin can generate files based on a template directory using the [Golang's `text/template`](https://golang.org/pkg/text/template/) engine.
+The plugin parses **protobuf** files, generates an **ast**, and walks a local **templates directory** to generate files using the [Golang's `text/template` engine](https://golang.org/pkg/text/template/).
+
+## Philosophy
+
+* protobuf-first
+* no built-in template, only user defined templates
+* kiss, *keep it stupid simple*
+
+## Under the hood
+
+1. the *user* `protobuf` files are parsed by [`protoc`](https://github.com/google/protobuf/releases)
+2. the `ast` is generated by [`protoc-gen-go` helpers](https://github.com/golang/protobuf/tree/master/protoc-gen-go)
+3. the `ast` is given to [Golang's `text/template` engine](https://golang.org/pkg/text/template/) for each *user* template files
+4. the *funcmap* enriching the template engine is based on [Masterminds/sprig](https://github.com/Masterminds/sprig), and contains type-manipulation, iteration and language-specific helpers
+
+## Web editor
+
+![Web editor screenshot](https://github.com/moul/protoc-gen-gotemplate/raw/master/assets/web-editor.jpg)
+
+[Demo server](http://protoc-gen-gotemplate.m.42.am/)
 
 ## Usage
 
 `protoc-gen-gotemplate` requires a **template_dir** directory *(by default `./templates`)*.
 
-Every files ending with `.tmpl` will be processed and written in the destination folder, following the file hierarchy of the `template_dir`, and removing the `.tmpl` extension.
+Every file ending with `.tmpl` will be processed and written to the destination folder, following the file hierarchy of the `template_dir`, and remove the `.tmpl` extension.
 
 ---
 
@@ -26,15 +45,27 @@ input.proto     templates/doc.txt.tmpl      templates/config.json.tmpl
 doc.txt         config.json
 ```
 
----
+### Options
 
-You can specify a custom `template_dir` or enable `debug`:
+You can specify custom options, as follow:
 
 ```console
 $> protoc --gotemplate_out=debug=true,template_dir=/path/to/template/directory:. input.proto
 ```
 
----
+| Option                | Default Value | Accepted Values           | Description
+|-----------------------|---------------|---------------------------|-----------------------
+| `template_dir`        | `./template`  | absolute or relative path | path to look for templates
+| `destination_dir`     | `.`           | absolute or relative path | base path to write output
+| `single-package-mode` | *false*       | `true` or `false`         | if *true*, `protoc` won't accept multiple packages to be compiled at once (*!= from `all`*), but will support `Message` lookup across the imported protobuf dependencies
+| `debug`               | *false*       | `true` or `false`         | if *true*, `protoc` will generate a more verbose output
+| `all`                 | *false*       | `true` or `false`         | if *true*, protobuf files without `Service` will also be parsed
+
+##### Hints
+
+Shipping the templates with your project is very smart and useful when contributing on git-based projects.
+
+Another workflow consists in having a dedicated repository for generic templates which is then versioned and vendored with multiple projects (npm package, golang vendor package, ...)
 
 See [examples](./examples).
 
@@ -45,10 +76,57 @@ This project uses [Masterminds/sprig](https://github.com/Masterminds/sprig) libr
 Non-exhaustive list of new helpers:
 
 * **all the functions from [sprig](https://github.com/Masterminds/sprig)**
-* `json`
-* `prettyjson`
+* `add`
+* `boolFieldExtension`
+* `camelCase`
+* `contains`
+* `divide`
+* `fieldMapKeyType`
+* `fieldMapValueType`
 * `first`
+* `getEnumValue`
+* `getMessageType`
+* `getProtoFile`
+* `goNormalize`
+* `goTypeWithPackage`
+* `goType`
+* `goZeroValue`
+* `haskellType`
+* `httpBody`
+* `httpPath`
+* `httpPathsAdditionalBindings`
+* `httpVerb`
+* `index`
+* `int64FieldExtension`
+* `isFieldMap`
+* `isFieldMessageTimeStamp`
+* `isFieldMessage`
+* `isFieldRepeated`
+* `jsSuffixReserved`
+* `jsType`
+* `json`
+* `kebabCase`
 * `last`
+* `leadingComment`
+* `leadingDetachedComments`
+* `lowerCamelCase`
+* `lowerFirst`
+* `lowerGoNormalize`
+* `multiply`
+* `namespacedFlowType`
+* `prettyjson`
+* `replaceDict`
+* `shortType`
+* `snakeCase`
+* `splitArray`
+* `stringFieldExtension`
+* `stringMethodOptionsExtension`
+* `string`
+* `subtract`
+* `trailingComment`
+* `trimstr`
+* `upperFirst`
+* `urlHasVarsFromMessage`
 
 See the project helpers for the complete list.
 
@@ -56,7 +134,18 @@ See the project helpers for the complete list.
 
 * Install the **Go** compiler and tools from https://golang.org/doc/install
 * Install **protobuf**: `go get -u github.com/golang/protobuf/{proto,protoc-gen-go}`
-* Install **protoc-gen-gotemplate**: `go get -u github.com/moul/protoc-gen-gotemplate`
+* Install **protoc-gen-gotemplate**: `go get -u moul.io/protoc-gen-gotemplate`
+
+## Docker
+
+* automated docker hub build: [https://hub.docker.com/r/moul/protoc-gen-gotemplate/](https://hub.docker.com/r/moul/protoc-gen-gotemplate/)
+* Based on [http://github.com/znly/protoc](http://github.com/znly/protoc)
+
+Usage:
+
+```console
+$> docker run --rm -v "$(pwd):$(pwd)" -w "$(pwd)" moul/protoc-gen-gotemplate -I. --gotemplate_out=./output/ ./*.proto
+```
 
 ## Projects using `protoc-gen-gotemplate`
 
@@ -64,6 +153,10 @@ See the project helpers for the complete list.
 * [translator](https://github.com/moul/translator): Translator Micro-service using Gettext and Go-Kit
 * [acl](https://github.com/moul/acl): ACL micro-service (gRPC/protobuf + http/json)
 
+## See also
+
+* [pbhbs](https://github.com/gponsinet/pbhbs): protobuf gen based on handlebarjs template
+
 ## License
 
 MIT

assets/assets

@@ -0,0 +1,6 @@
+  /Users/moul/go/src/moul.io/protoc-gen-gotemplate/assets:
+  total used in directory 552 available 9223372036849978910
+  drwxr-xr-x   4 moul  staff     128 Dec  9 11:31 .
+  lrwxr-xr-x   1 moul  staff      33 Dec  9 11:31 .#web-editor.jpg -> moul@manfred-spacegray.local.9471
+  drwxr-xr-x  21 moul  staff     672 Sep 13 18:05 ..
+  -rw-r--r--@  1 moul  staff  280357 Oct 26  2017 web-editor.jpg

cmd/web-editor/main.go

@@ -0,0 +1,121 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	packr "github.com/gobuffalo/packr/v2"
+	"github.com/gorilla/handlers"
+	"github.com/gorilla/mux"
+)
+
+func generate(w http.ResponseWriter, r *http.Request) {
+	// read input
+	decoder := json.NewDecoder(r.Body)
+	type Input struct {
+		Protobuf string `json:"protobuf"`
+		Template string `json:"template"`
+	}
+	var input Input
+	if err := decoder.Decode(&input); err != nil {
+		returnError(w, err)
+		return
+	}
+
+	// create workspace
+	dir, err := ioutil.TempDir("", "pggt")
+	if err != nil {
+		returnError(w, err)
+	}
+	// clean up
+	defer func() {
+		if err = os.RemoveAll(dir); err != nil {
+			log.Printf("error: failed to remove temporary directory: %v", err)
+		}
+	}()
+	if err = ioutil.WriteFile(filepath.Join(dir, "example.proto"), []byte(input.Protobuf), 0644); err != nil {
+		returnError(w, err)
+		return
+	}
+	if err = ioutil.WriteFile(filepath.Join(dir, "example.output.tmpl"), []byte(input.Template), 0644); err != nil {
+		returnError(w, err)
+		return
+	}
+
+	// generate
+	cmd := exec.Command("protoc", "-I"+dir, "--gotemplate_out=template_dir="+dir+",debug=true:"+dir, filepath.Join(dir, "example.proto")) // #nosec
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		returnError(w, errors.New(string(out)))
+		return
+	}
+
+	// read output
+	content, err := ioutil.ReadFile(filepath.Join(dir, "example.output")) // #nosec
+	if err != nil {
+		returnError(w, err)
+		return
+	}
+
+	returnContent(w, content)
+}
+
+func returnContent(w http.ResponseWriter, output interface{}) {
+	payload := map[string]interface{}{
+		"output": fmt.Sprintf("%s", output),
+	}
+	response, err := json.Marshal(payload)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	if _, err := w.Write(response); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}
+
+func returnError(w http.ResponseWriter, err error) {
+	payload := map[string]interface{}{
+		"error": fmt.Sprintf("%v", err),
+	}
+	response, err := json.Marshal(payload)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusInternalServerError)
+	if _, err := w.Write(response); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}
+
+func main() {
+	r := mux.NewRouter()
+
+	box := packr.New("static", "./static")
+
+	r.Handle("/", http.FileServer(box))
+	r.HandleFunc("/generate", generate)
+	addr := fmt.Sprintf(":%s", os.Getenv("PORT"))
+	if addr == ":" {
+		addr = ":8080"
+	}
+
+	fmt.Printf("Listening on %s...\n", addr)
+	h := handlers.LoggingHandler(os.Stderr, r)
+	h = handlers.CompressHandler(h)
+	h = handlers.RecoveryHandler()(h)
+	if err := http.ListenAndServe(addr, h); err != nil {
+		panic(err)
+	}
+}

cmd/web-editor/static/index.html

@@ -0,0 +1,138 @@
+<html>
+  <head>
+    <title>protoc-gen-gotemplate web editor</title>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.3/angular-animate.js"></script>
+    <script src="//angular-ui.github.io/bootstrap/ui-bootstrap-tpls-0.13.3.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.14.3/ui-bootstrap.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/ace.min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/mode-protobuf.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/mode-golang.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/theme-cobalt.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.4.12/worker-javascript.js"></script>
+    <script src="//angular-ui.github.io/ui-ace/dist/ui-ace.min.js"></script>
+
+    <script type="text/javascript">
+     var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="";var n,r,i,s,o,u,a;var f=0;e=Base64._utf8_encode(e);while(f<e.length){n=e.charCodeAt(f++);r=e.charCodeAt(f++);i=e.charCodeAt(f++);s=n>>2;o=(n&3)<<4|r>>4;u=(r&15)<<2|i>>6;a=i&63;if(isNaN(r)){u=a=64}else if(isNaN(i)){a=64}t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a)}return t},decode:function(e){var t="";var n,r,i;var s,o,u,a;var f=0;e=e.replace(/[^A-Za-z0-9+/=]/g,"");while(f<e.length){s=this._keyStr.indexOf(e.charAt(f++));o=this._keyStr.indexOf(e.charAt(f++));u=this._keyStr.indexOf(e.charAt(f++));a=this._keyStr.indexOf(e.charAt(f++));n=s<<2|o>>4;r=(o&15)<<4|u>>2;i=(u&3)<<6|a;t=t+String.fromCharCode(n);if(u!=64){t=t+String.fromCharCode(r)}if(a!=64){t=t+String.fromCharCode(i)}}t=Base64._utf8_decode(t);return t},_utf8_encode:function(e){e=e.replace(/rn/g,"n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r)}else if(r>127&&r<2048){t+=String.fromCharCode(r>>6|192);t+=String.fromCharCode(r&63|128)}else{t+=String.fromCharCode(r>>12|224);t+=String.fromCharCode(r>>6&63|128);t+=String.fromCharCode(r&63|128)}}return t},_utf8_decode:function(e){var t="";var n=0;var r=c1=c2=0;while(n<e.length){r=e.charCodeAt(n);if(r<128){t+=String.fromCharCode(r);n++}else if(r>191&&r<224){c2=e.charCodeAt(n+1);t+=String.fromCharCode((r&31)<<6|c2&63);n+=2}else{c2=e.charCodeAt(n+1);c3=e.charCodeAt(n+2);t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63);n+=3}}return t}}
+
+     angular.module("pggt", ['pggt.controllers','ngAnimate','ui.bootstrap', 'ui.ace']);
+     angular.module("pggt.controllers", [])
+            .controller('PggtCtrl', ['$scope', '$http', '$interval', function($scope, $http, $interval) {
+       $scope.requestType = 'post';
+       $scope.url = '/generate';
+       $scope.response = null;
+       $scope.errors = null;
+
+       $scope.inputHasChanged = false;
+
+       $scope.checkModel = {
+         optimize: false,
+         disableNetwork: false,
+         toArm: false,
+       };
+
+       $scope.$watchCollection('checkModel', function() {
+         $scope.sendRequest();
+       });
+
+       var cron = $interval(function() {
+         if ($scope.inputHasChanged) {
+           $scope.sendRequest();
+         }
+       }, 2000);
+
+       // b64encoded version of https://github.com/grpc/grpc-go/blob/master/examples/route_guide/routeguide/route_guide.proto
+       $scope.protobuf = Base64.decode("Ly8gQ29weXJpZ2h0IDIwMTUgZ1JQQyBhdXRob3JzLg0KLy8NCi8vIExpY2Vuc2VkIHVuZGVyIHRoZSBBcGFjaGUgTGljZW5zZSwgVmVyc2lvbiAyLjAgKHRoZSAiTGljZW5zZSIpOw0KLy8geW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLg0KLy8gWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0DQovLw0KLy8gICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMA0KLy8NCi8vIFVubGVzcyByZXF1aXJlZCBieSBhcHBsaWNhYmxlIGxhdyBvciBhZ3JlZWQgdG8gaW4gd3JpdGluZywgc29mdHdhcmUNCi8vIGRpc3RyaWJ1dGVkIHVuZGVyIHRoZSBMaWNlbnNlIGlzIGRpc3RyaWJ1dGVkIG9uIGFuICJBUyBJUyIgQkFTSVMsDQovLyBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC4NCi8vIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmQNCi8vIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLg0KDQpzeW50YXggPSAicHJvdG8zIjsNCg0Kb3B0aW9uIGphdmFfbXVsdGlwbGVfZmlsZXMgPSB0cnVlOw0Kb3B0aW9uIGphdmFfcGFja2FnZSA9ICJpby5ncnBjLmV4YW1wbGVzLnJvdXRlZ3VpZGUiOw0Kb3B0aW9uIGphdmFfb3V0ZXJfY2xhc3NuYW1lID0gIlJvdXRlR3VpZGVQcm90byI7DQoNCnBhY2thZ2Ugcm91dGVndWlkZTsNCg0KLy8gSW50ZXJmYWNlIGV4cG9ydGVkIGJ5IHRoZSBzZXJ2ZXIuDQpzZXJ2aWNlIFJvdXRlR3VpZGUgew0KICAvLyBBIHNpbXBsZSBSUEMuDQogIC8vDQogIC8vIE9idGFpbnMgdGhlIGZlYXR1cmUgYXQgYSBnaXZlbiBwb3NpdGlvbi4NCiAgLy8NCiAgLy8gQSBmZWF0dXJlIHdpdGggYW4gZW1wdHkgbmFtZSBpcyByZXR1cm5lZCBpZiB0aGVyZSdzIG5vIGZlYXR1cmUgYXQgdGhlIGdpdmVuDQogIC8vIHBvc2l0aW9uLg0KICBycGMgR2V0RmVhdHVyZShQb2ludCkgcmV0dXJucyAoRmVhdHVyZSkge30NCg0KICAvLyBBIHNlcnZlci10by1jbGllbnQgc3RyZWFtaW5nIFJQQy4NCiAgLy8NCiAgLy8gT2J0YWlucyB0aGUgRmVhdHVyZXMgYXZhaWxhYmxlIHdpdGhpbiB0aGUgZ2l2ZW4gUmVjdGFuZ2xlLiAgUmVzdWx0cyBhcmUNCiAgLy8gc3RyZWFtZWQgcmF0aGVyIHRoYW4gcmV0dXJuZWQgYXQgb25jZSAoZS5nLiBpbiBhIHJlc3BvbnNlIG1lc3NhZ2Ugd2l0aCBhDQogIC8vIHJlcGVhdGVkIGZpZWxkKSwgYXMgdGhlIHJlY3RhbmdsZSBtYXkgY292ZXIgYSBsYXJnZSBhcmVhIGFuZCBjb250YWluIGENCiAgLy8gaHVnZSBudW1iZXIgb2YgZmVhdHVyZXMuDQogIHJwYyBMaXN0RmVhdHVyZXMoUmVjdGFuZ2xlKSByZXR1cm5zIChzdHJlYW0gRmVhdHVyZSkge30NCg0KICAvLyBBIGNsaWVudC10by1zZXJ2ZXIgc3RyZWFtaW5nIFJQQy4NCiAgLy8NCiAgLy8gQWNjZXB0cyBhIHN0cmVhbSBvZiBQb2ludHMgb24gYSByb3V0ZSBiZWluZyB0cmF2ZXJzZWQsIHJldHVybmluZyBhDQogIC8vIFJvdXRlU3VtbWFyeSB3aGVuIHRyYXZlcnNhbCBpcyBjb21wbGV0ZWQuDQogIHJwYyBSZWNvcmRSb3V0ZShzdHJlYW0gUG9pbnQpIHJldHVybnMgKFJvdXRlU3VtbWFyeSkge30NCg0KICAvLyBBIEJpZGlyZWN0aW9uYWwgc3RyZWFtaW5nIFJQQy4NCiAgLy8NCiAgLy8gQWNjZXB0cyBhIHN0cmVhbSBvZiBSb3V0ZU5vdGVzIHNlbnQgd2hpbGUgYSByb3V0ZSBpcyBiZWluZyB0cmF2ZXJzZWQsDQogIC8vIHdoaWxlIHJlY2VpdmluZyBvdGhlciBSb3V0ZU5vdGVzIChlLmcuIGZyb20gb3RoZXIgdXNlcnMpLg0KICBycGMgUm91dGVDaGF0KHN0cmVhbSBSb3V0ZU5vdGUpIHJldHVybnMgKHN0cmVhbSBSb3V0ZU5vdGUpIHt9DQp9DQoNCi8vIFBvaW50cyBhcmUgcmVwcmVzZW50ZWQgYXMgbGF0aXR1ZGUtbG9uZ2l0dWRlIHBhaXJzIGluIHRoZSBFNyByZXByZXNlbnRhdGlvbg0KLy8gKGRlZ3JlZXMgbXVsdGlwbGllZCBieSAxMCoqNyBhbmQgcm91bmRlZCB0byB0aGUgbmVhcmVzdCBpbnRlZ2VyKS4NCi8vIExhdGl0dWRlcyBzaG91bGQgYmUgaW4gdGhlIHJhbmdlICsvLSA5MCBkZWdyZWVzIGFuZCBsb25naXR1ZGUgc2hvdWxkIGJlIGluDQovLyB0aGUgcmFuZ2UgKy8tIDE4MCBkZWdyZWVzIChpbmNsdXNpdmUpLg0KbWVzc2FnZSBQb2ludCB7DQogIGludDMyIGxhdGl0dWRlID0gMTsNCiAgaW50MzIgbG9uZ2l0dWRlID0gMjsNCn0NCg0KLy8gQSBsYXRpdHVkZS1sb25naXR1ZGUgcmVjdGFuZ2xlLCByZXByZXNlbnRlZCBhcyB0d28gZGlhZ29uYWxseSBvcHBvc2l0ZQ0KLy8gcG9pbnRzICJsbyIgYW5kICJoaSIuDQptZXNzYWdlIFJlY3RhbmdsZSB7DQogIC8vIE9uZSBjb3JuZXIgb2YgdGhlIHJlY3RhbmdsZS4NCiAgUG9pbnQgbG8gPSAxOw0KDQogIC8vIFRoZSBvdGhlciBjb3JuZXIgb2YgdGhlIHJlY3RhbmdsZS4NCiAgUG9pbnQgaGkgPSAyOw0KfQ0KDQovLyBBIGZlYXR1cmUgbmFtZXMgc29tZXRoaW5nIGF0IGEgZ2l2ZW4gcG9pbnQuDQovLw0KLy8gSWYgYSBmZWF0dXJlIGNvdWxkIG5vdCBiZSBuYW1lZCwgdGhlIG5hbWUgaXMgZW1wdHkuDQptZXNzYWdlIEZlYXR1cmUgew0KICAvLyBUaGUgbmFtZSBvZiB0aGUgZmVhdHVyZS4NCiAgc3RyaW5nIG5hbWUgPSAxOw0KDQogIC8vIFRoZSBwb2ludCB3aGVyZSB0aGUgZmVhdHVyZSBpcyBkZXRlY3RlZC4NCiAgUG9pbnQgbG9jYXRpb24gPSAyOw0KfQ0KDQovLyBBIFJvdXRlTm90ZSBpcyBhIG1lc3NhZ2Ugc2VudCB3aGlsZSBhdCBhIGdpdmVuIHBvaW50Lg0KbWVzc2FnZSBSb3V0ZU5vdGUgew0KICAvLyBUaGUgbG9jYXRpb24gZnJvbSB3aGljaCB0aGUgbWVzc2FnZSBpcyBzZW50Lg0KICBQb2ludCBsb2NhdGlvbiA9IDE7DQoNCiAgLy8gVGhlIG1lc3NhZ2UgdG8gYmUgc2VudC4NCiAgc3RyaW5nIG1lc3NhZ2UgPSAyOw0KfQ0KDQovLyBBIFJvdXRlU3VtbWFyeSBpcyByZWNlaXZlZCBpbiByZXNwb25zZSB0byBhIFJlY29yZFJvdXRlIHJwYy4NCi8vDQovLyBJdCBjb250YWlucyB0aGUgbnVtYmVyIG9mIGluZGl2aWR1YWwgcG9pbnRzIHJlY2VpdmVkLCB0aGUgbnVtYmVyIG9mDQovLyBkZXRlY3RlZCBmZWF0dXJlcywgYW5kIHRoZSB0b3RhbCBkaXN0YW5jZSBjb3ZlcmVkIGFzIHRoZSBjdW11bGF0aXZlIHN1bSBvZg0KLy8gdGhlIGRpc3RhbmNlIGJldHdlZW4gZWFjaCBwb2ludC4NCm1lc3NhZ2UgUm91dGVTdW1tYXJ5IHsNCiAgLy8gVGhlIG51bWJlciBvZiBwb2ludHMgcmVjZWl2ZWQuDQogIGludDMyIHBvaW50X2NvdW50ID0gMTsNCg0KICAvLyBUaGUgbnVtYmVyIG9mIGtub3duIGZlYXR1cmVzIHBhc3NlZCB3aGlsZSB0cmF2ZXJzaW5nIHRoZSByb3V0ZS4NCiAgaW50MzIgZmVhdHVyZV9jb3VudCA9IDI7DQoNCiAgLy8gVGhlIGRpc3RhbmNlIGNvdmVyZWQgaW4gbWV0cmVzLg0KICBpbnQzMiBkaXN0YW5jZSA9IDM7DQoNCiAgLy8gVGhlIGR1cmF0aW9uIG9mIHRoZSB0cmF2ZXJzYWwgaW4gc2Vjb25kcy4NCiAgaW50MzIgZWxhcHNlZF90aW1lID0gNDsNCn0=");
+       $scope.template = Base64.decode("Ly8gQ29kZSBnZW5lcmF0ZWQgYnkgcHJvdG9jLWdlbi1nb3RlbXBsYXRlDQpwYWNrYWdlIHt7LlNlcnZpY2UuTmFtZX19cGINCg0KaW1wb3J0ICgNCiAgImdvbGFuZy5vcmcveC9uZXQvY29udGV4dCINCikNCg0KdHlwZSBTZXJ2aWNlIGludGVyZmFjZSB7DQp7ey0gcmFuZ2UgLlNlcnZpY2UuTWV0aG9kfX0NCnt7LSBpZiBhbmQgKG5vdCAuU2VydmVyU3RyZWFtaW5nKSAobm90IC5DbGllbnRTdHJlYW1pbmcpfX0NCiAge3suTmFtZX19KGNvbnRleHQuQ29udGV4dCwgKnt7Lk5hbWV9fVJlcXVlc3QpICgqe3suTmFtZX19UmVzcG9uc2UsIGVycm9yKQ0Ke3stIGVsc2UgaWYgYW5kIC5TZXJ2ZXJTdHJlYW1pbmcgKG5vdCAuQ2xpZW50U3RyZWFtaW5nKX19DQoge3suTmFtZX19KGNvbnRleHQuQ29udGV4dCwgKnt7Lk5hbWV9fVJlcXVlc3QsIGNoYW4gc3RydWN0e30pIChjaGFuICp7ey5OYW1lfX1SZXNwb25zZSwgZXJyb3IpDQp7ey0gZWxzZSBpZiBhbmQgKG5vdCAuU2VydmVyU3RyZWFtaW5nKSAuQ2xpZW50U3RyZWFtaW5nfX0NCiAge3suTmFtZX19KGNvbnRleHQuQ29udGV4dCwgY2hhbiAqe3suTmFtZX19UmVxdWVzdCkgKCp7ey5OYW1lfX1SZXNwb25zZSwgZXJyb3IpDQp7ey0gZWxzZSBpZiBhbmQgKC5TZXJ2ZXJTdHJlYW1pbmcpICguQ2xpZW50U3RyZWFtaW5nKX19DQogIHt7Lk5hbWV9fShjb250ZXh0LkNvbnRleHQsIGNoYW4gKnt7Lk5hbWV9fVJlcXVlc3QpIChjaGFuICp7ey5OYW1lfX1SZXNwb25zZSwgZXJyb3IpDQp7ey0gZW5kfX0ge3svKiBzdHJlYW1pbmcgaWZzKi99fQ0Ke3stIGVuZH19IHt7LypyYW5nZSBNZXRob2QqL319DQp9DQoNCi8vIE1ldGhvZHMNCi8vIC0tLS0tLS0NCnt7LSByYW5nZSAuU2VydmljZS5NZXRob2R9fQ0KLy8gKiB7ey5OYW1lfX0NCnt7LSBlbmR9fQ0KLy8NCi8vIE1lc3NhZ2UgdHlwZXMNCi8vIC0tLS0tLS0tLS0tLS0NCnt7LSByYW5nZSAuRmlsZS5NZXNzYWdlVHlwZX19DQovLyAqIHt7Lk5hbWV9fQ0Ke3stIGVuZH19");
+
+       $scope.inputLoaded = function(_editor) {
+         $scope.inputEditor = _editor;
+       };
+       $scope.outputLoaded = function(_editor) {
+         $scope.outputEditor = _editor;
+       };
+       $scope.inputChanged = function(e) {
+         $scope.inputHasChanged = true;
+       };
+
+       $scope.sendRequest = function(){
+         $scope.inputHasChanged = false;
+         var data = {
+           protobuf: $scope.protobuf,
+           template: $scope.template,
+         };
+         $http.post($scope.url, data)
+              .success(function(data,status,headers,config) {
+           $scope.errors = {};
+           $scope.response = {};
+           $scope.response.data = data;
+           $scope.response.status = status;
+           $scope.response.headers = headers;
+           $scope.response.config = config;
+           $scope.outputEditor.setValue(data['output'], 1);
+         })
+              .error(function(data,status,headers,config) {
+           $scope.errors = {};
+           $scope.response = {};
+           $scope.errors.data = data;
+           $scope.errors.status = status;
+           $scope.errors.headers = headers;
+           $scope.errors.config = config;
+           $scope.outputEditor.setValue(data['error'], 1);
+         });
+       };
+     }]);
+    </script>
+
+    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/styles/github.min.css">
+    <style>.ace_editor { height: 80%; min-height: 500px; }</style>
+  </head>
+  <body ng-app="pggt">
+    <div class="container-fluid" ng-controller="PggtCtrl">
+      <div class="row">
+        <div class="col-md-8">
+          <form name="dpform" ng-submit="sendRequest()" class="well">
+            <fieldset>
+              <legend>`protoc-gen-gotemplate`: input</legend>
+              <div class="row">
+                <div class="col-md-6">
+                  <label for="protobuf">./example.proto</label>
+                  <div ng-model="protobuf" name="protobuf" id="protobuf" language="protobuf"
+                       ui-ace="{mode:'protobuf',theme:'cobalt',onChange:inputChanged,onLoad:inputLoaded,useWrapMode:true}">
+                  </div>
+                </div>
+                <div class="col-md-6">
+                  <label for="template">./example.txt.tmpl</label>
+                  <div ng-model="template" name="template" id="template" language="text"
+                       ui-ace="{mode:'text',theme:'cobalt',onChange:inputChanged,onLoad:inputLoaded,useWrapMode:true}">
+                  </div>
+                </div>
+              </div>
+            </fieldset>
+          </form>
+        </div>
+        <div class="col-md-4">
+          <div class="well">
+            <fieldset>
+              <legend>Output</legend>
+              <label>./example.txt</label>
+              <div ui-ace="{mode:'text',theme:'cobalt',onLoad:outputLoaded,useWrapMode:true}" readonly></div>
+            </fieldset>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <div>Command: <code>protoc --gotemplate_out=template_dir=.:. example.proto</code></div>
+          <div>Powered by <a href="https://moul.io/protoc-gen-gotemplate">protoc-gen-gotemplate</a></div>
+        </div>
+      </div>
+    </div>
+    <a href="https://moul.io/protoc-gen-gotemplate"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
+  </body>
+</html>

encoder.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"log"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
@@ -10,13 +11,16 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/golang/protobuf/protoc-gen-go/plugin"
+	plugin_go "github.com/golang/protobuf/protoc-gen-go/plugin"
+
+	pgghelpers "moul.io/protoc-gen-gotemplate/helpers"
 )
 
 type GenericTemplateBasedEncoder struct {
 	templateDir    string
 	service        *descriptor.ServiceDescriptorProto
 	file           *descriptor.FileDescriptorProto
+	enum           []*descriptor.EnumDescriptorProto
 	debug          bool
 	destinationDir string
 }
@@ -34,21 +38,39 @@ type Ast struct {
 	Filename       string                             `json:"filename"`
 	TemplateDir    string                             `json:"template-dir"`
 	Service        *descriptor.ServiceDescriptorProto `json:"service"`
-	Environment    []string                           `json:"environment"`
+	Enum           []*descriptor.EnumDescriptorProto  `json:"enum"`
 }
 
-func NewGenericTemplateBasedEncoder(templateDir string, service *descriptor.ServiceDescriptorProto, file *descriptor.FileDescriptorProto, debug bool, destinationDir string) (e *GenericTemplateBasedEncoder) {
+func NewGenericServiceTemplateBasedEncoder(templateDir string, service *descriptor.ServiceDescriptorProto, file *descriptor.FileDescriptorProto, debug bool, destinationDir string) (e *GenericTemplateBasedEncoder) {
 	e = &GenericTemplateBasedEncoder{
 		service:        service,
 		file:           file,
 		templateDir:    templateDir,
 		debug:          debug,
 		destinationDir: destinationDir,
+		enum:           file.GetEnumType(),
 	}
-
 	if debug {
 		log.Printf("new encoder: file=%q service=%q template-dir=%q", file.GetName(), service.GetName(), templateDir)
 	}
+	pgghelpers.InitPathMap(file)
+
+	return
+}
+
+func NewGenericTemplateBasedEncoder(templateDir string, file *descriptor.FileDescriptorProto, debug bool, destinationDir string) (e *GenericTemplateBasedEncoder) {
+	e = &GenericTemplateBasedEncoder{
+		service:        nil,
+		file:           file,
+		templateDir:    templateDir,
+		enum:           file.GetEnumType(),
+		debug:          debug,
+		destinationDir: destinationDir,
+	}
+	if debug {
+		log.Printf("new encoder: file=%q template-dir=%q", file.GetName(), templateDir)
+	}
+	pgghelpers.InitPathMap(file)
 
 	return
 }
@@ -73,6 +95,7 @@ func (e *GenericTemplateBasedEncoder) templates() ([]string, error) {
 		if e.debug {
 			log.Printf("new template: %q", rel)
 		}
+
 		filenames = append(filenames, rel)
 		return nil
 	})
@@ -81,11 +104,20 @@ func (e *GenericTemplateBasedEncoder) templates() ([]string, error) {
 
 func (e *GenericTemplateBasedEncoder) genAst(templateFilename string) (*Ast, error) {
 	// prepare the ast passed to the template engine
-	hostname, _ := os.Hostname()
-	pwd, _ := os.Getwd()
+	hostname, err := os.Hostname()
+	if err != nil {
+		return nil, err
+	}
+	pwd, err := os.Getwd()
+	if err != nil {
+		return nil, err
+	}
 	goPwd := ""
 	if os.Getenv("GOPATH") != "" {
-		goPwd, _ = filepath.Rel(os.Getenv("GOPATH")+"/src", pwd)
+		goPwd, err = filepath.Rel(os.Getenv("GOPATH")+"/src", pwd)
+		if err != nil {
+			return nil, err
+		}
 		if strings.Contains(goPwd, "../") {
 			goPwd = ""
 		}
@@ -101,11 +133,19 @@ func (e *GenericTemplateBasedEncoder) genAst(templateFilename string) (*Ast, err
 		DestinationDir: e.destinationDir,
 		RawFilename:    templateFilename,
 		Filename:       "",
-		Environment:    os.Environ(),
 		Service:        e.service,
+		Enum:           e.enum,
 	}
 	buffer := new(bytes.Buffer)
-	tmpl, err := template.New("").Funcs(ProtoHelpersFuncMap).Parse(templateFilename)
+
+	unescaped, err := url.QueryUnescape(templateFilename)
+	if err != nil {
+		log.Printf("failed to unescape filepath %q: %v", templateFilename, err)
+	} else {
+		templateFilename = unescaped
+	}
+
+	tmpl, err := template.New("").Funcs(pgghelpers.ProtoHelpersFuncMap).Parse(templateFilename)
 	if err != nil {
 		return nil, err
 	}
@@ -120,7 +160,7 @@ func (e *GenericTemplateBasedEncoder) buildContent(templateFilename string) (str
 	// initialize template engine
 	fullPath := filepath.Join(e.templateDir, templateFilename)
 	templateName := filepath.Base(fullPath)
-	tmpl, err := template.New(templateName).Funcs(ProtoHelpersFuncMap).ParseFiles(fullPath)
+	tmpl, err := template.New(templateName).Funcs(pgghelpers.ProtoHelpersFuncMap).ParseFiles(fullPath)
 	if err != nil {
 		return "", "", err
 	}
@@ -151,7 +191,8 @@ func (e *GenericTemplateBasedEncoder) Files() []*plugin_go.CodeGeneratorResponse
 	resultChan := make(chan *plugin_go.CodeGeneratorResponse_File, length)
 	for _, templateFilename := range templates {
 		go func(tmpl string) {
-			content, translatedFilename, err := e.buildContent(tmpl)
+			var translatedFilename, content string
+			content, translatedFilename, err = e.buildContent(tmpl)
 			if err != nil {
 				errChan <- err
 				return
@@ -169,10 +210,8 @@ func (e *GenericTemplateBasedEncoder) Files() []*plugin_go.CodeGeneratorResponse
 		case f := <-resultChan:
 			files = append(files, f)
 		case err = <-errChan:
+			panic(err)
 		}
 	}
-	if err != nil {
-		panic(err)
-	}
 	return files
 }

examples/arithmetics/Makefile

@@ -0,0 +1,13 @@
+.PHONY: build
+build:
+	mkdir -p output
+	protoc -I. --gotemplate_out=template_dir=templates,debug=true,all=true:output proto/*.proto
+
+
+.PHONY: re
+re: clean build
+
+
+.PHONY: clean
+clean:
+	rm -rf output

examples/arithmetics/output/arithmetics

@@ -0,0 +1,5 @@
+
+add(1,2) = 3
+subtract(1,2) = -1
+multiply(1,2) = 2
+divide(2,1) = 2

examples/arithmetics/proto/arithmetics.proto

@@ -0,0 +1,2 @@
+syntax = "proto3";
+package Arithmetics;

examples/arithmetics/templates/arithmetics.tmpl

@@ -0,0 +1,6 @@
+{{with $a := 1}}{{with $b := 2}}
+add(1,2) = {{add $a $b}}
+subtract(1,2) = {{subtract $a $b}}
+multiply(1,2) = {{multiply $a $b}}
+divide(2,1) = {{divide $b $a}}
+{{end}}{{end}}

examples/concat/Makefile

@@ -0,0 +1,13 @@
+.PHONY: build
+build:
+	mkdir -p output
+	protoc -I. --gotemplate_out=template_dir=templates,debug=true,all=true:output proto/*.proto
+
+
+.PHONY: re
+re: clean build
+
+
+.PHONY: clean
+clean:
+	rm -rf output

examples/concat/output/concat.txt

@@ -0,0 +1,3 @@
+I'm Eric
+I'm Francis
+I'm Arnold

examples/concat/output/static.txt

@@ -0,0 +1 @@
+This is static text.This is static text.This is static text.

examples/concat/proto/Eric.proto

@@ -0,0 +1,2 @@
+syntax = "proto3";
+package Eric;

examples/concat/proto/Francis.proto

@@ -0,0 +1,2 @@
+syntax = "proto3";
+package Francis;

examples/concat/proto/arnold.proto

@@ -0,0 +1,2 @@
+syntax = "proto3";
+package Arnold;

examples/concat/templates/concat.txt.tmpl

@@ -0,0 +1 @@
+I'm {{.File.Package}}

examples/concat/templates/static.txt.tmpl

@@ -0,0 +1 @@
+This is static text.

examples/dummy/output/export.json

@@ -1,9 +1,8 @@
 {
-  "build-date": "2016-12-20T11:30:36.474403064+01:00",
-  "build-hostname": "Zoon-MacBook.local",
-  "build-user": "zoon",
-  "go-pwd": "github.com/protoc-gen-gotemplate/examples/dummy",
-  "pwd": "/Users/zoon/Projects/gopath/src/github.com/protoc-gen-gotemplate/examples/dummy",
+  "build-date": "2017-05-19T20:09:45.954357761+02:00",
+  "build-hostname": "manfred-spacegray.aircard",
+  "build-user": "moul",
+  "pwd": "/Users/moul/Git/moul/protoc-gen-gotemplate/examples/dummy",
   "debug": false,
   "destination-dir": ".",
   "file": {
@@ -841,41 +840,5 @@
       }
     ]
   },
-  "environment": [
-    "TERM_PROGRAM=iTerm.app",
-    "ANDROID_HOME=/usr/local/opt/android-sdk",
-    "TERM=xterm-256color",
-    "SHELL=/bin/zsh",
-    "MAKEFLAGS=",
-    "TMPDIR=/var/folders/sq/wlptrlpn4v52xv7xpsgw0fc80000gn/T/",
-    "Apple_PubSub_Socket_Render=/private/tmp/com.apple.launchd.q9vxeee00S/Render",
-    "TERM_PROGRAM_VERSION=3.0.12",
-    "TERM_SESSION_ID=w0t0p0:6D29EB08-1B96-41B8-8672-0B035605AEE5",
-    "ZSH=/Users/zoon/.oh-my-zsh",
-    "USER=zoon",
-    "SSH_AUTH_SOCK=/private/tmp/com.apple.launchd.5ZcNGIwTRZ/Listeners",
-    "__CF_USER_TEXT_ENCODING=0x1F5:0x0:0x0",
-    "MAKELEVEL=2",
-    "PAGER=less",
-    "MFLAGS=",
-    "LSCOLORS=Gxfxcxdxbxegedabagacad",
-    "PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/zoon/Projects/gopath/bin",
-    "_=/usr/local/bin/protoc",
-    "PWD=/Users/zoon/Projects/gopath/src/github.com/protoc-gen-gotemplate/examples/dummy",
-    "JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_112.jdk/Contents/Home",
-    "EDITOR=micro",
-    "LANG=en_US.UTF-8",
-    "ANDROID_SDK=/usr/local/opt/android-sdk",
-    "ITERM_PROFILE=Default",
-    "XPC_FLAGS=0x0",
-    "XPC_SERVICE_NAME=0",
-    "COLORFGBG=15;0",
-    "SHLVL=3",
-    "HOME=/Users/zoon",
-    "ITERM_SESSION_ID=w0t0p0:6D29EB08-1B96-41B8-8672-0B035605AEE5",
-    "LESS=-R",
-    "LOGNAME=zoon",
-    "LC_CTYPE=UTF-8",
-    "GOPATH=/Users/zoon/Projects/gopath"
-  ]
+  "enum": null
 }

examples/enum/Makefile

@@ -0,0 +1,13 @@
+.PHONY: build
+build:
+	mkdir -p output
+	protoc -I. --gotemplate_out=template_dir=templates,debug=true,all=true:output proto/*.proto
+
+
+.PHONY: re
+re: clean build
+
+
+.PHONY: clean
+clean:
+	rm -rf output

examples/enum/output/enum.txt

@@ -0,0 +1,9 @@
+-red
+-blue
+-black
+-yellow
+-green
+-dark
+-white
+-gray
+-orange

examples/enum/proto/sample.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+package Sample;
+
+enum Colors {
+    red = 0;
+    blue = 1;
+    black = 2;
+    yellow = 3;
+    green = 4;
+    dark = 5;
+    white = 6;
+    gray = 7;
+    orange = 8;
+}

examples/enum/templates/enum.txt.tmpl

@@ -0,0 +1,2 @@
+{{range $m := "colors" | getEnumValue .Enum }}-{{$m.Name}}
+{{end}}

examples/flow/output/test/test_grpc_js.js

@@ -1,204 +1,311 @@
 // @flow
 // GENERATED CODE -- DO NOT EDIT!
 
-import grpc from 'grpc'
-import pbFile from './pbFile.js'
+import base64 from 'base64-js'
+import test_pb from './test_pb'
 
-export type TestEnum = 
-  | 'ELEMENT_A'
-  | 'ELEMENT_B'
-;
 
-export type TestMessage = {|
-  a?: string;
-  b?: number;
-  c?: number;
-  d?: number;
-  e?: number;
-  n?: Array<string>;
-  o?: Array<number>;
-  p?: Array<number>;
-  q?: Array<number>;
-  r?: Array<number>;
-  s?:
-    | 'ELEMENT_C'
-    | 'ELEMENT_D'
-  ;
-|};
-
-export type TestNoStreamRequest = {|
-  message?: TestMessage;
-|};
-
-export type TestNoStreamReply = {|
-  message?: TestMessage;
-  err_msg?: string;
-|};
-
-export type TestStreamRequestRequest = {|
-  message?: TestMessage;
-|};
-
-export type TestStreamRequestReply = {|
-  message?: TestMessage;
-  err_msg?: string;
-|};
-
-export type TestStreamReplyRequest = {|
-  message?: TestMessage;
-|};
-
-export type TestStreamReplyReply = {|
-  message?: TestMessage;
-  err_msg?: string;
-|};
-
-export type TestStreamBothRequest = {|
-  message?: TestMessage;
-|};
-
-export type TestStreamBothReply = {|
-  message?: TestMessage;
-  err_msg?: string;
+export type TestEnum = {|
+    ELEMENT_A?: 0;
+    ELEMENT_B?: 1;
 |};
 
 
-function serialize_test_TestNoStreamRequest(arg: TestNoStreamRequest) {
-  if (!(arg instanceof pbFile.TestNoStreamRequest)) {
+export type TestMessage$TestNestedEnum = {|
+    ELEMENT_C?: 0;
+    ELEMENT_D?: 1;
+|};
+
+
+export type TestMessage$TestNestedMessage = {
+    getS?: () => string;
+    setS?: (s: string) => void;
+    getT?: () => number;
+    setT?: (t: number) => void;
+};
+
+export type TestMessage = {
+    getA?: () => string;
+    setA?: (a: string) => void;
+    getB?: () => number;
+    setB?: (b: number) => void;
+    getC?: () => number;
+    setC?: (c: number) => void;
+    getD?: () => number;
+    setD?: (d: number) => void;
+    getE?: () => number;
+    setE?: (e: number) => void;
+    getNList?: () => Array<string>;
+    setNList?: (n: Array<string>) => void;
+    addN?: (n: string) => void;
+    clearNList?: () => void;
+    getOList?: () => Array<number>;
+    setOList?: (o: Array<number>) => void;
+    addO?: (o: number) => void;
+    clearOList?: () => void;
+    getPList?: () => Array<number>;
+    setPList?: (p: Array<number>) => void;
+    addP?: (p: number) => void;
+    clearPList?: () => void;
+    getQList?: () => Array<number>;
+    setQList?: (q: Array<number>) => void;
+    addQ?: (q: number) => void;
+    clearQList?: () => void;
+    getRList?: () => Array<number>;
+    setRList?: (r: Array<number>) => void;
+    addR?: (r: number) => void;
+    clearRList?: () => void;
+    getU?: () => test$TestEnum;
+    setU?: (u: test$TestEnum) => void;
+    getV?: () => test$TestMessage$TestNestedEnum;
+    setV?: (v: test$TestMessage$TestNestedEnum) => void;
+    getWList?: () => Array<test$TestMessage$TestNestedMessage>;
+    setWList?: (w: Array<test$TestMessage$TestNestedMessage>) => void;
+    addW?: (w: test$TestMessage$TestNestedMessage) => void;
+    clearWList?: () => void;
+};
+
+
+
+
+
+export type TestNoStreamRequest = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+};
+
+
+
+
+
+export type TestNoStreamReply = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+    getErrMsg?: () => string;
+    setErrMsg?: (err_msg: string) => void;
+};
+
+
+
+
+
+export type TestStreamRequestRequest = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+};
+
+
+
+
+
+export type TestStreamRequestReply = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+    getErrMsg?: () => string;
+    setErrMsg?: (err_msg: string) => void;
+};
+
+
+
+
+
+export type TestStreamReplyRequest = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+};
+
+
+
+
+
+export type TestStreamReplyReply = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+    getErrMsg?: () => string;
+    setErrMsg?: (err_msg: string) => void;
+};
+
+
+
+
+
+export type TestStreamBothRequest = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+};
+
+
+
+
+
+export type TestStreamBothReply = {
+    getMessage?: () => test$TestMessage;
+    setMessage?: (message: test$TestMessage) => void;
+    clearMessage?: () => void;
+    hasMessage?: () => boolean;
+    getErrMsg?: () => string;
+    setErrMsg?: (err_msg: string) => void;
+};
+
+const serializeToBase64 = (byteArray: Uint8Array): string => base64.fromByteArray(byteArray)
+const deserializeFromBase64 = (base64Encoded: string): Uint8Array => new Uint8Array(base64.toByteArray(base64Encoded))
+
+
+function serialize_test_TestNoStreamRequest(arg : TestNoStreamRequest): string {
+  if (!(arg instanceof test_pb.TestNoStreamRequest)) {
     throw new Error('Expected argument of type TestNoStreamRequest')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestNoStreamRequest(buffer_arg: Array<number>) {
-  return pbFile.TestNoStreamRequest.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestNoStreamRequest(base64Encoded: string): TestNoStreamRequest {
+  return test_pb.TestNoStreamRequest.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestNoStreamReply(arg: TestNoStreamReply) {
-  if (!(arg instanceof pbFile.TestNoStreamReply)) {
+function serialize_test_TestNoStreamReply(arg : TestNoStreamReply): string {
+  if (!(arg instanceof test_pb.TestNoStreamReply)) {
     throw new Error('Expected argument of type TestNoStreamReply')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestNoStreamReply(buffer_arg: Array<number>) {
-  return pbFile.TestNoStreamReply.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestNoStreamReply(base64Encoded: string): TestNoStreamReply {
+  return test_pb.TestNoStreamReply.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestStreamRequestRequest(arg: TestStreamRequestRequest) {
-  if (!(arg instanceof pbFile.TestStreamRequestRequest)) {
+
+function serialize_test_TestStreamRequestRequest(arg : TestStreamRequestRequest): string {
+  if (!(arg instanceof test_pb.TestStreamRequestRequest)) {
     throw new Error('Expected argument of type TestStreamRequestRequest')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestStreamRequestRequest(buffer_arg: Array<number>) {
-  return pbFile.TestStreamRequestRequest.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestStreamRequestRequest(base64Encoded: string): TestStreamRequestRequest {
+  return test_pb.TestStreamRequestRequest.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestStreamRequestReply(arg: TestStreamRequestReply) {
-  if (!(arg instanceof pbFile.TestStreamRequestReply)) {
+function serialize_test_TestStreamRequestReply(arg : TestStreamRequestReply): string {
+  if (!(arg instanceof test_pb.TestStreamRequestReply)) {
     throw new Error('Expected argument of type TestStreamRequestReply')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestStreamRequestReply(buffer_arg: Array<number>) {
-  return pbFile.TestStreamRequestReply.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestStreamRequestReply(base64Encoded: string): TestStreamRequestReply {
+  return test_pb.TestStreamRequestReply.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestStreamReplyRequest(arg: TestStreamReplyRequest) {
-  if (!(arg instanceof pbFile.TestStreamReplyRequest)) {
+
+function serialize_test_TestStreamReplyRequest(arg : TestStreamReplyRequest): string {
+  if (!(arg instanceof test_pb.TestStreamReplyRequest)) {
     throw new Error('Expected argument of type TestStreamReplyRequest')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestStreamReplyRequest(buffer_arg: Array<number>) {
-  return pbFile.TestStreamReplyRequest.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestStreamReplyRequest(base64Encoded: string): TestStreamReplyRequest {
+  return test_pb.TestStreamReplyRequest.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestStreamReplyReply(arg: TestStreamReplyReply) {
-  if (!(arg instanceof pbFile.TestStreamReplyReply)) {
+function serialize_test_TestStreamReplyReply(arg : TestStreamReplyReply): string {
+  if (!(arg instanceof test_pb.TestStreamReplyReply)) {
     throw new Error('Expected argument of type TestStreamReplyReply')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestStreamReplyReply(buffer_arg: Array<number>) {
-  return pbFile.TestStreamReplyReply.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestStreamReplyReply(base64Encoded: string): TestStreamReplyReply {
+  return test_pb.TestStreamReplyReply.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestStreamBothRequest(arg: TestStreamBothRequest) {
-  if (!(arg instanceof pbFile.TestStreamBothRequest)) {
+
+function serialize_test_TestStreamBothRequest(arg : TestStreamBothRequest): string {
+  if (!(arg instanceof test_pb.TestStreamBothRequest)) {
     throw new Error('Expected argument of type TestStreamBothRequest')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestStreamBothRequest(buffer_arg: Array<number>) {
-  return pbFile.TestStreamBothRequest.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestStreamBothRequest(base64Encoded: string): TestStreamBothRequest {
+  return test_pb.TestStreamBothRequest.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
-function serialize_test_TestStreamBothReply(arg: TestStreamBothReply) {
-  if (!(arg instanceof pbFile.TestStreamBothReply)) {
+function serialize_test_TestStreamBothReply(arg : TestStreamBothReply): string {
+  if (!(arg instanceof test_pb.TestStreamBothReply)) {
     throw new Error('Expected argument of type TestStreamBothReply')
   }
-  return new Buffer(arg.serializeBinary())
+  return serializeToBase64(arg.serializeBinary())
 }
 
-function deserialize_test_TestStreamBothReply(buffer_arg: Array<number>) {
-  return pbFile.TestStreamBothReply.deserializeBinary(new Uint8Array(buffer_arg))
+function deserialize_test_TestStreamBothReply(base64Encoded: string): TestStreamBothReply {
+  return test_pb.TestStreamBothReply.deserializeBinary(deserializeFromBase64(base64Encoded))
 }
 
 
-export const TestServiceService = {
+export default {
   
-  testNoStream: {
-    path: '/test.TestService/TestNoStream',
-    requestStream: false,
-    responseStream: false,
-    requestType: pbFile.TestNoStreamRequest,
-    responseType: pbFile.TestNoStreamReply,
-    requestSerialize: serialize_test_TestNoStreamRequest,
-    requestDeserialize: deserialize_test_TestNoStreamRequest,
-    responseSerialize: serialize_test_TestNoStreamReply,
-    responseDeserialize: deserialize_test_TestNoStreamReply,
-  },
-  testStreamRequest: {
-    path: '/test.TestService/TestStreamRequest',
-    requestStream: true,
-    responseStream: false,
-    requestType: pbFile.TestStreamRequestRequest,
-    responseType: pbFile.TestStreamRequestReply,
-    requestSerialize: serialize_test_TestStreamRequestRequest,
-    requestDeserialize: deserialize_test_TestStreamRequestRequest,
-    responseSerialize: serialize_test_TestStreamRequestReply,
-    responseDeserialize: deserialize_test_TestStreamRequestReply,
-  },
-  testStreamReply: {
-    path: '/test.TestService/TestStreamReply',
-    requestStream: false,
-    responseStream: true,
-    requestType: pbFile.TestStreamReplyRequest,
-    responseType: pbFile.TestStreamReplyReply,
-    requestSerialize: serialize_test_TestStreamReplyRequest,
-    requestDeserialize: deserialize_test_TestStreamReplyRequest,
-    responseSerialize: serialize_test_TestStreamReplyReply,
-    responseDeserialize: deserialize_test_TestStreamReplyReply,
-  },
-  testStreamBoth: {
-    path: '/test.TestService/TestStreamBoth',
-    requestStream: true,
-    responseStream: true,
-    requestType: pbFile.TestStreamBothRequest,
-    responseType: pbFile.TestStreamBothReply,
-    requestSerialize: serialize_test_TestStreamBothRequest,
-    requestDeserialize: deserialize_test_TestStreamBothRequest,
-    responseSerialize: serialize_test_TestStreamBothReply,
-    responseDeserialize: deserialize_test_TestStreamBothReply,
-  },
+  TestService: {
+  
+    testNoStream: {
+      path: '/test.TestService/TestNoStream',
+      requestStream: false,
+      responseStream: false,
+      requestType: test_pb.TestNoStreamRequest,
+      responseType: test_pb.TestNoStreamReply,
+      requestSerialize: serialize_test_TestNoStreamRequest,
+      requestDeserialize: deserialize_test_TestNoStreamRequest,
+      responseSerialize: serialize_test_TestNoStreamReply,
+      responseDeserialize: deserialize_test_TestNoStreamReply,
+    },
+    testStreamRequest: {
+      path: '/test.TestService/TestStreamRequest',
+      requestStream: true,
+      responseStream: false,
+      requestType: test_pb.TestStreamRequestRequest,
+      responseType: test_pb.TestStreamRequestReply,
+      requestSerialize: serialize_test_TestStreamRequestRequest,
+      requestDeserialize: deserialize_test_TestStreamRequestRequest,
+      responseSerialize: serialize_test_TestStreamRequestReply,
+      responseDeserialize: deserialize_test_TestStreamRequestReply,
+    },
+    testStreamReply: {
+      path: '/test.TestService/TestStreamReply',
+      requestStream: false,
+      responseStream: true,
+      requestType: test_pb.TestStreamReplyRequest,
+      responseType: test_pb.TestStreamReplyReply,
+      requestSerialize: serialize_test_TestStreamReplyRequest,
+      requestDeserialize: deserialize_test_TestStreamReplyRequest,
+      responseSerialize: serialize_test_TestStreamReplyReply,
+      responseDeserialize: deserialize_test_TestStreamReplyReply,
+    },
+    testStreamBoth: {
+      path: '/test.TestService/TestStreamBoth',
+      requestStream: true,
+      responseStream: true,
+      requestType: test_pb.TestStreamBothRequest,
+      responseType: test_pb.TestStreamBothReply,
+      requestSerialize: serialize_test_TestStreamBothRequest,
+      requestDeserialize: deserialize_test_TestStreamBothRequest,
+      responseSerialize: serialize_test_TestStreamBothReply,
+      responseDeserialize: deserialize_test_TestStreamBothReply,
+    },
+    
+  }
   
 }
-
-export const TestServiceClient = grpc.makeGenericClientConstructor(TestServiceService)

examples/flow/protos/test.proto

@@ -27,10 +27,19 @@ message TestMessage {
   repeated int64 p = 16;
   repeated float q = 17;
   repeated double r = 18;
-  enum s {
+
+  message TestNestedMessage {
+    string s = 1;
+    int32 t = 2;
+  }
+  enum TestNestedEnum {
     ELEMENT_C = 0;
     ELEMENT_D = 1;
   }
+
+  TestEnum u = 19;
+  TestNestedEnum v = 20;
+  repeated TestNestedMessage w = 21;
 }
 
 message TestNoStreamRequest { TestMessage message = 1; }

examples/flow/templates/%7B%7B.File.Package%7D%7D/%7B%7B.File.Package%7D%7D_grpc_js.js.tmpl

@@ -0,0 +1,110 @@
+// @flow
+// GENERATED CODE -- DO NOT EDIT!
+
+{{- $Package:=.File.Package}}
+
+import base64 from 'base64-js'
+import {{$Package}}_pb from './{{$Package}}_pb'
+
+{{- range .File.Dependency}}
+import {{. | replace "/" "_" | trimSuffix ".proto" }}_pb from '../{{. | trimSuffix ".proto" }}_pb'
+{{- end}}
+
+{{- define "fieldMethods"}}
+  {{- if isFieldRepeated .}}
+    get{{.Name | camelCase}}List?: () => {{. | jsType}};
+    set{{.Name | camelCase}}List?: ({{.Name}}: {{. | jsType}}) => void;
+    add{{.Name | camelCase}}?: ({{.Name}}: {{. | jsType | trimPrefix "Array<" | trimSuffix ">"}}) => void;
+    clear{{.Name | camelCase}}List?: () => void;
+  {{- else}}
+    get{{.Name | camelCase}}?: () => {{. | jsType}};
+    set{{.Name | camelCase}}?: ({{.Name}}: {{. | jsType}}) => void;
+
+    {{- if isFieldMessage .}}
+    clear{{.Name | camelCase}}?: () => void;
+    has{{.Name | camelCase}}?: () => boolean;
+    {{- end}}
+  {{- end}}
+{{- end}}
+
+{{range .File.EnumType}}
+export type {{.Name}} = {|
+  {{- range .Value}}
+    {{.Name}}?: {{.Number}};
+  {{- end}}
+|};
+{{- end}}
+
+{{- range .File.MessageType}}
+{{- $MessageType := .Name}}
+
+{{range .EnumType}}
+export type {{$MessageType}}${{.Name}} = {|
+  {{- range .Value}}
+    {{.Name}}?: {{.Number}};
+  {{- end}}
+|};
+{{- end}}
+
+{{range .NestedType}}
+export type {{$MessageType}}${{.Name}} = {
+  {{- range .Field}}
+    {{- template "fieldMethods" .}}
+  {{- end}}
+};
+{{- end}}
+
+export type {{.Name}} = {
+  {{- range .Field}}
+    {{- template "fieldMethods" .}}
+  {{- end}}
+};
+
+{{- end}}
+
+const serializeToBase64 = (byteArray: Uint8Array): string => base64.fromByteArray(byteArray)
+const deserializeFromBase64 = (base64Encoded: string): Uint8Array => new Uint8Array(base64.toByteArray(base64Encoded))
+
+{{range .File.Service}}{{range .Method}}
+function serialize_{{$Package}}_{{.InputType | shortType}}(arg : {{.InputType | shortType}}): string {
+  if (!(arg instanceof {{$Package}}_pb.{{.InputType | shortType}})) {
+    throw new Error('Expected argument of type {{.InputType | shortType}}')
+  }
+  return serializeToBase64(arg.serializeBinary())
+}
+
+function deserialize_{{$Package}}_{{.InputType | shortType}}(base64Encoded: string): {{.InputType | shortType}} {
+  return {{$Package}}_pb.{{.InputType | shortType}}.deserializeBinary(deserializeFromBase64(base64Encoded))
+}
+
+function serialize_{{$Package}}_{{.OutputType | shortType}}(arg : {{.OutputType | shortType}}): string {
+  if (!(arg instanceof {{$Package}}_pb.{{.OutputType | shortType}})) {
+    throw new Error('Expected argument of type {{.OutputType | shortType}}')
+  }
+  return serializeToBase64(arg.serializeBinary())
+}
+
+function deserialize_{{$Package}}_{{.OutputType | shortType}}(base64Encoded: string): {{.OutputType | shortType}} {
+  return {{$Package}}_pb.{{.OutputType | shortType}}.deserializeBinary(deserializeFromBase64(base64Encoded))
+}
+
+{{end}}{{end}}
+export default {
+  {{range .File.Service}}
+  {{.Name}}: {
+  {{$serviceName:=.Name}}
+    {{range .Method}}{{.Name | lowerCamelCase}}: {
+      path: '/{{$Package}}.{{$serviceName}}/{{.Name}}',
+      requestStream: {{.ClientStreaming | default "false"}},
+      responseStream: {{.ServerStreaming | default "false"}},
+      requestType: {{$Package}}_pb.{{.InputType | shortType}},
+      responseType: {{$Package}}_pb.{{.OutputType | shortType}},
+      requestSerialize: serialize_{{$Package}}_{{.InputType | shortType}},
+      requestDeserialize: deserialize_{{$Package}}_{{.InputType | shortType}},
+      responseSerialize: serialize_{{$Package}}_{{.OutputType | shortType}},
+      responseDeserialize: deserialize_{{$Package}}_{{.OutputType | shortType}},
+    },
+    {{end}}
+  }
+  {{end}}
+}

examples/flow/templates/{{.File.Package}}/{{.File.Package}}_grpc_js.js.tmpl

@@ -1,58 +0,0 @@
-// @flow
-// GENERATED CODE -- DO NOT EDIT!
-{{$Package:=.File.Package}}
-import grpc from 'grpc'
-import pbFile from './pbFile.js'
-{{range .File.EnumType}}
-export type {{.Name}} = {{range .Value}}
-  | '{{.Name}}'{{end}}
-;{{end}}
-{{range .File.MessageType}}
-export type {{.Name}} = {|{{range .Field}}
-  {{.Name}}?: {{. | jsType}};{{end}}{{range .EnumType}}
-  {{.Name}}?:{{range .Value}}
-    | '{{.Name}}'{{end}}
-  ;{{end}}
-|};
-{{end}}
-{{range .File.Service}}{{range .Method}}
-function serialize_{{$Package}}_{{.InputType | shortType}}(arg: {{.InputType | shortType}}) {
-  if (!(arg instanceof pbFile.{{.InputType | shortType}})) {
-    throw new Error('Expected argument of type {{.InputType | shortType}}')
-  }
-  return new Buffer(arg.serializeBinary())
-}
-
-function deserialize_{{$Package}}_{{.InputType | shortType}}(buffer_arg: Array<number>) {
-  return pbFile.{{.InputType | shortType}}.deserializeBinary(new Uint8Array(buffer_arg))
-}
-
-function serialize_{{$Package}}_{{.OutputType | shortType}}(arg: {{.OutputType | shortType}}) {
-  if (!(arg instanceof pbFile.{{.OutputType | shortType}})) {
-    throw new Error('Expected argument of type {{.OutputType | shortType}}')
-  }
-  return new Buffer(arg.serializeBinary())
-}
-
-function deserialize_{{$Package}}_{{.OutputType | shortType}}(buffer_arg: Array<number>) {
-  return pbFile.{{.OutputType | shortType}}.deserializeBinary(new Uint8Array(buffer_arg))
-}
-{{end}}{{end}}
-{{range .File.Service}}
-export const {{.Name}}Service = {
-  {{$serviceName:=.Name}}
-  {{range .Method}}{{.Name | lowerCamelCase}}: {
-    path: '/{{$Package}}.{{$serviceName}}/{{.Name}}',
-    requestStream: {{.ClientStreaming | default "false"}},
-    responseStream: {{.ServerStreaming | default "false"}},
-    requestType: pbFile.{{.InputType | shortType}},
-    responseType: pbFile.{{.OutputType | shortType}},
-    requestSerialize: serialize_{{$Package}}_{{.InputType | shortType}},
-    requestDeserialize: deserialize_{{$Package}}_{{.InputType | shortType}},
-    responseSerialize: serialize_{{$Package}}_{{.OutputType | shortType}},
-    responseDeserialize: deserialize_{{$Package}}_{{.OutputType | shortType}},
-  },
-  {{end}}
-}
-
-export const {{.Name}}Client = grpc.makeGenericClientConstructor({{.Name}}Service){{end}}

examples/go-generate/Makefile

@@ -0,0 +1,2 @@
+all:
+	go generate

examples/go-generate/example.go

@@ -0,0 +1,4 @@
+package example
+
+//go:generate protoc --go_out=./gen/         example.proto
+//go:generate protoc --gotemplate_out=./gen/ example.proto

examples/go-generate/example.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package example;
+
+service Sum {
+  rpc Sum(SumRequest) returns (SumReply) {};
+}
+
+message SumRequest {
+  int32 a = 1;
+  int32 b = 2;
+}
+
+message SumReply {
+  int32 c = 1;
+}

examples/go-generate/gen/doc.gen.go

@@ -0,0 +1,11 @@
+// Code generated by protoc-gen-gotemplate
+package example
+
+// Methods
+// -------
+// * Sum
+//
+// Message types
+// -------------
+// * SumRequest
+// * SumReply

examples/go-generate/gen/example.pb.go

@@ -0,0 +1,89 @@
+// Code generated by protoc-gen-go.
+// source: example.proto
+// DO NOT EDIT!
+
+/*
+Package example is a generated protocol buffer package.
+
+It is generated from these files:
+	example.proto
+
+It has these top-level messages:
+	SumRequest
+	SumReply
+*/
+package example
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type SumRequest struct {
+	A int32 `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
+	B int32 `protobuf:"varint,2,opt,name=b" json:"b,omitempty"`
+}
+
+func (m *SumRequest) Reset()                    { *m = SumRequest{} }
+func (m *SumRequest) String() string            { return proto.CompactTextString(m) }
+func (*SumRequest) ProtoMessage()               {}
+func (*SumRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *SumRequest) GetA() int32 {
+	if m != nil {
+		return m.A
+	}
+	return 0
+}
+
+func (m *SumRequest) GetB() int32 {
+	if m != nil {
+		return m.B
+	}
+	return 0
+}
+
+type SumReply struct {
+	C int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
+}
+
+func (m *SumReply) Reset()                    { *m = SumReply{} }
+func (m *SumReply) String() string            { return proto.CompactTextString(m) }
+func (*SumReply) ProtoMessage()               {}
+func (*SumReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *SumReply) GetC() int32 {
+	if m != nil {
+		return m.C
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterType((*SumRequest)(nil), "example.SumRequest")
+	proto.RegisterType((*SumReply)(nil), "example.SumReply")
+}
+
+func init() { proto.RegisterFile("example.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 124 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4d, 0xad, 0x48, 0xcc,
+	0x2d, 0xc8, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x72, 0x95, 0x34, 0xb8,
+	0xb8, 0x82, 0x4b, 0x73, 0x83, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0x84, 0x78, 0xb8, 0x18, 0x13,
+	0x25, 0x18, 0x15, 0x18, 0x35, 0x58, 0x83, 0x18, 0x13, 0x41, 0xbc, 0x24, 0x09, 0x26, 0x08, 0x2f,
+	0x49, 0x49, 0x82, 0x8b, 0x03, 0xac, 0xb2, 0x20, 0xa7, 0x12, 0x24, 0x93, 0x0c, 0x53, 0x97, 0x6c,
+	0x64, 0xc6, 0xc5, 0x1c, 0x5c, 0x9a, 0x2b, 0xa4, 0x0f, 0xa1, 0x84, 0xf5, 0x60, 0x56, 0x21, 0x0c,
+	0x96, 0x12, 0x44, 0x15, 0x2c, 0xc8, 0xa9, 0x54, 0x62, 0x48, 0x62, 0x03, 0xbb, 0xc5, 0x18, 0x10,
+	0x00, 0x00, 0xff, 0xff, 0x2b, 0xf1, 0xe9, 0x56, 0x9c, 0x00, 0x00, 0x00,
+}

examples/go-generate/templates/doc.gen.go.tmpl

@@ -0,0 +1,14 @@
+// Code generated by protoc-gen-gotemplate
+package {{.File.Package}}
+
+// Methods
+// -------
+{{- range .Service.Method}}
+// * {{.Name}}
+{{- end}}
+//
+// Message types
+// -------------
+{{- range .File.MessageType}}
+// * {{.Name}}
+{{- end}}

examples/go-kit/.gitignore

@@ -1 +1,2 @@
+/vendor/
 /server

examples/go-kit/Makefile

@@ -9,10 +9,11 @@ service_name =	$(word 2,$(subst /, ,$1))
 build: server
 
 server: $(TARGETS_GO) $(TARGETS_TMPL)
+	glide install
 	go build -o server .
 
 $(TARGETS_GO): %_go:
-	protoc --gogo_out=plugins=grpc:. "$*"
+	protoc --go_out=plugins=grpc:. "$*"
 	@mkdir -p services/$(call service_name,$*)/gen/pb
 	@mv ./services/$(call service_name,$*)/$(call service_name,$*).pb.go ./services/$(call service_name,$*)/gen/pb/pb.go
 

examples/go-kit/glide.lock

@@ -0,0 +1,48 @@
+hash: e225ab17b49f8d6601b2bd813d43ad34ee04380d29c278c11919efd454c7b2d7
+updated: 2017-03-16T17:03:34.437968115+01:00
+imports:
+- name: github.com/dgrijalva/jwt-go
+  version: 2268707a8f0843315e2004ee4f1d021dc08baedf
+- name: github.com/go-kit/kit
+  version: fadad6fffe0466b19df9efd9acde5c9a52df5fa4
+  subpackages:
+  - auth/jwt
+  - endpoint
+  - log
+  - transport/grpc
+  - transport/http
+- name: github.com/go-logfmt/logfmt
+  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
+- name: github.com/go-stack/stack
+  version: 100eb0c0a9c5b306ca2fb4f165df21d80ada4b82
+- name: github.com/golang/protobuf
+  version: c9c7427a2a70d2eb3bafa0ab2dc163e45f143317
+  subpackages:
+  - proto
+- name: github.com/gorilla/handlers
+  version: 3a5767ca75ece5f7f1440b1d16975247f8d8b221
+- name: github.com/kr/logfmt
+  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
+- name: golang.org/x/net
+  version: a6577fac2d73be281a500b310739095313165611
+  subpackages:
+  - context
+  - context/ctxhttp
+  - http2
+  - http2/hpack
+  - idna
+  - internal/timeseries
+  - lex/httplex
+  - trace
+- name: google.golang.org/grpc
+  version: 777daa17ff9b5daef1cfdf915088a2ada3332bf0
+  subpackages:
+  - codes
+  - credentials
+  - grpclog
+  - internal
+  - metadata
+  - naming
+  - peer
+  - transport
+testImports: []

examples/go-kit/glide.yaml

@@ -0,0 +1,20 @@
+package: moul.io/protoc-gen-gotemplate/examples/go-kit
+import:
+- package: github.com/go-kit/kit
+  subpackages:
+  - auth/jwt
+  - endpoint
+  - log
+  - transport/grpc
+  - transport/http
+- package: github.com/golang/protobuf
+  subpackages:
+  - proto
+  version: c9c7427a2a70d2eb3bafa0ab2dc163e45f143317
+- package: github.com/gorilla/handlers
+- package: golang.org/x/net
+  subpackages:
+  - context
+  - http2
+  version: a6577fac2d73be281a500b310739095313165611
+- package: google.golang.org/grpc

examples/go-kit/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"net"
 	"net/http"
@@ -13,58 +12,57 @@ import (
 	"github.com/gorilla/handlers"
 	"google.golang.org/grpc"
 
-	session_svc "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session"
-	session_endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
-	session_pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
-	session_grpctransport "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/transports/grpc"
-	session_httptransport "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/transports/http"
+	session_svc "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session"
+	session_endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
+	session_pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
+	session_grpctransport "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/transports/grpc"
+	session_httptransport "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/transports/http"
 
-	sprint_svc "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint"
-	sprint_endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
-	sprint_pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
-	sprint_grpctransport "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/transports/grpc"
-	sprint_httptransport "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/transports/http"
+	sprint_svc "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint"
+	sprint_endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
+	sprint_pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
+	sprint_grpctransport "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/transports/grpc"
+	sprint_httptransport "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/transports/http"
 
-	user_svc "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user"
-	user_endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
-	user_pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
-	user_grpctransport "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/transports/grpc"
-	user_httptransport "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/transports/http"
+	user_svc "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user"
+	user_endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
+	user_pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
+	user_grpctransport "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/transports/grpc"
+	user_httptransport "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/transports/http"
 )
 
 func main() {
 	mux := http.NewServeMux()
-	ctx := context.Background()
 	errc := make(chan error)
 	s := grpc.NewServer()
 	var logger log.Logger
 	{
 		logger = log.NewLogfmtLogger(os.Stdout)
-		logger = log.NewContext(logger).With("ts", log.DefaultTimestampUTC)
-		logger = log.NewContext(logger).With("caller", log.DefaultCaller)
+		logger = log.With(logger, "ts", log.DefaultTimestampUTC)
+		logger = log.With(logger, "caller", log.DefaultCaller)
 	}
 
 	// initialize services
 	{
 		svc := session_svc.New()
 		endpoints := session_endpoints.MakeEndpoints(svc)
-		srv := session_grpctransport.MakeGRPCServer(ctx, endpoints)
+		srv := session_grpctransport.MakeGRPCServer(endpoints)
 		session_pb.RegisterSessionServiceServer(s, srv)
-		session_httptransport.RegisterHandlers(ctx, svc, mux, endpoints)
+		session_httptransport.RegisterHandlers(svc, mux, endpoints)
 	}
 	{
 		svc := sprint_svc.New()
 		endpoints := sprint_endpoints.MakeEndpoints(svc)
-		srv := sprint_grpctransport.MakeGRPCServer(ctx, endpoints)
+		srv := sprint_grpctransport.MakeGRPCServer(endpoints)
 		sprint_pb.RegisterSprintServiceServer(s, srv)
-		sprint_httptransport.RegisterHandlers(ctx, svc, mux, endpoints)
+		sprint_httptransport.RegisterHandlers(svc, mux, endpoints)
 	}
 	{
 		svc := user_svc.New()
 		endpoints := user_endpoints.MakeEndpoints(svc)
-		srv := user_grpctransport.MakeGRPCServer(ctx, endpoints)
+		srv := user_grpctransport.MakeGRPCServer(endpoints)
 		user_pb.RegisterUserServiceServer(s, srv)
-		user_httptransport.RegisterHandlers(ctx, svc, mux, endpoints)
+		user_httptransport.RegisterHandlers(svc, mux, endpoints)
 	}
 
 	// start servers
@@ -75,13 +73,13 @@ func main() {
 	}()
 
 	go func() {
-		logger := log.NewContext(logger).With("transport", "HTTP")
+		logger := log.With(logger, "transport", "HTTP")
 		logger.Log("addr", ":8000")
 		errc <- http.ListenAndServe(":8000", handlers.LoggingHandler(os.Stderr, mux))
 	}()
 
 	go func() {
-		logger := log.NewContext(logger).With("transport", "gRPC")
+		logger := log.With(logger, "transport", "gRPC")
 		ln, err := net.Listen("tcp", ":9000")
 		if err != nil {
 			errc <- err

examples/go-kit/services/session/gen/client/grpc/client.go

@@ -1,15 +1,16 @@
 package session_clientgrpc
 
 import (
+	context "context"
+
 	jwt "github.com/go-kit/kit/auth/jwt"
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log"
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	context "golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
 )
 
 func New(conn *grpc.ClientConn, logger log.Logger) pb.SessionServiceServer {

examples/go-kit/services/session/gen/endpoints/endpoints.go

@@ -1,14 +1,17 @@
 package session_endpoints
 
 import (
+	context "context"
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
 )
 
+var _ = endpoint.Chain
 var _ = fmt.Errorf
+var _ = context.Background
 
 type StreamEndpoint func(server interface{}, req interface{}) (err error)
 
@@ -16,7 +19,7 @@ type Endpoints struct {
 	LoginEndpoint endpoint.Endpoint
 }
 
-func (e *Endpoints) Login(ctx context.Context, in *pb.LoginRequest) (*pb.LoginResponse, error) {
+func (e *Endpoints) Login(ctx oldcontext.Context, in *pb.LoginRequest) (*pb.LoginResponse, error) {
 	out, err := e.LoginEndpoint(ctx, in)
 	if err != nil {
 		return &pb.LoginResponse{ErrMsg: err.Error()}, err

examples/go-kit/services/session/gen/pb/pb.go

@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-go.
 // source: services/session/session.proto
 // DO NOT EDIT!
 
@@ -14,7 +14,7 @@ It has these top-level messages:
 */
 package session
 
-import proto "github.com/gogo/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
@@ -32,17 +32,17 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type LoginRequest struct {
-	Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"`
-	Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"`
+	Username string `protobuf:"bytes,1,opt,name=username" json:"username,omitempty"`
+	Password string `protobuf:"bytes,2,opt,name=password" json:"password,omitempty"`
 }
 
 func (m *LoginRequest) Reset()                    { *m = LoginRequest{} }
 func (m *LoginRequest) String() string            { return proto.CompactTextString(m) }
 func (*LoginRequest) ProtoMessage()               {}
-func (*LoginRequest) Descriptor() ([]byte, []int) { return fileDescriptorSession, []int{0} }
+func (*LoginRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 func (m *LoginRequest) GetUsername() string {
 	if m != nil {
@@ -59,14 +59,14 @@ func (m *LoginRequest) GetPassword() string {
 }
 
 type LoginResponse struct {
-	Token  string `protobuf:"bytes,1,opt,name=token,proto3" json:"token,omitempty"`
-	ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
+	Token  string `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"`
+	ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"`
 }
 
 func (m *LoginResponse) Reset()                    { *m = LoginResponse{} }
 func (m *LoginResponse) String() string            { return proto.CompactTextString(m) }
 func (*LoginResponse) ProtoMessage()               {}
-func (*LoginResponse) Descriptor() ([]byte, []int) { return fileDescriptorSession, []int{1} }
+func (*LoginResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 func (m *LoginResponse) GetToken() string {
 	if m != nil {
@@ -159,9 +159,9 @@ var _SessionService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "services/session/session.proto",
 }
 
-func init() { proto.RegisterFile("services/session/session.proto", fileDescriptorSession) }
+func init() { proto.RegisterFile("services/session/session.proto", fileDescriptor0) }
 
-var fileDescriptorSession = []byte{
+var fileDescriptor0 = []byte{
 	// 188 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x2d, 0x2a,
 	0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x4e, 0x2d, 0x2e, 0xce, 0xcc, 0xcf, 0x83, 0xd1, 0x7a, 0x05,

examples/go-kit/services/session/gen/transports/grpc/grpc.go

@@ -1,24 +1,25 @@
 package session_grpctransport
 
 import (
+	context "context"
 	"fmt"
 
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
 
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
 )
 
 // avoid import errors
 var _ = fmt.Errorf
 
-func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SessionServiceServer {
-	options := []grpctransport.ServerOption{}
+func MakeGRPCServer(endpoints endpoints.Endpoints) pb.SessionServiceServer {
+	var options []grpctransport.ServerOption
+	_ = options
 	return &grpcServer{
 
 		login: grpctransport.NewServer(
-			ctx,
 			endpoints.LoginEndpoint,
 			decodeRequest,
 			encodeLoginResponse,
@@ -31,7 +32,7 @@ type grpcServer struct {
 	login grpctransport.Handler
 }
 
-func (s *grpcServer) Login(ctx context.Context, req *pb.LoginRequest) (*pb.LoginResponse, error) {
+func (s *grpcServer) Login(ctx oldcontext.Context, req *pb.LoginRequest) (*pb.LoginResponse, error) {
 	_, rep, err := s.login.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err

examples/go-kit/services/session/gen/transports/http/http.go

@@ -1,20 +1,23 @@
 package session_httptransport
 
 import (
+	"context"
 	"encoding/json"
-	context "golang.org/x/net/context"
 	"log"
 	"net/http"
 
 	gokit_endpoint "github.com/go-kit/kit/endpoint"
 	httptransport "github.com/go-kit/kit/transport/http"
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
 )
 
-func MakeLoginHandler(ctx context.Context, svc pb.SessionServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+var _ = log.Printf
+var _ = gokit_endpoint.Chain
+var _ = httptransport.NewClient
+
+func MakeLoginHandler(svc pb.SessionServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 	return httptransport.NewServer(
-		ctx,
 		endpoint,
 		decodeLoginRequest,
 		encodeResponse,
@@ -34,10 +37,10 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
 	return json.NewEncoder(w).Encode(response)
 }
 
-func RegisterHandlers(ctx context.Context, svc pb.SessionServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
+func RegisterHandlers(svc pb.SessionServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
 
 	log.Println("new HTTP endpoint: \"/Login\" (service=Session)")
-	mux.Handle("/Login", MakeLoginHandler(ctx, svc, endpoints.LoginEndpoint))
+	mux.Handle("/Login", MakeLoginHandler(svc, endpoints.LoginEndpoint))
 
 	return nil
 }

examples/go-kit/services/session/service.go

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/session/gen/pb"
 )
 
 type Service struct{}

examples/go-kit/services/sprint/gen/client/grpc/client.go

@@ -1,15 +1,16 @@
 package sprint_clientgrpc
 
 import (
+	context "context"
+
 	jwt "github.com/go-kit/kit/auth/jwt"
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log"
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	context "golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
 )
 
 func New(conn *grpc.ClientConn, logger log.Logger) pb.SprintServiceServer {

examples/go-kit/services/sprint/gen/endpoints/endpoints.go

@@ -1,14 +1,17 @@
 package sprint_endpoints
 
 import (
+	context "context"
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
 )
 
+var _ = endpoint.Chain
 var _ = fmt.Errorf
+var _ = context.Background
 
 type StreamEndpoint func(server interface{}, req interface{}) (err error)
 
@@ -20,7 +23,7 @@ type Endpoints struct {
 	GetSprintEndpoint endpoint.Endpoint
 }
 
-func (e *Endpoints) AddSprint(ctx context.Context, in *pb.AddSprintRequest) (*pb.AddSprintResponse, error) {
+func (e *Endpoints) AddSprint(ctx oldcontext.Context, in *pb.AddSprintRequest) (*pb.AddSprintResponse, error) {
 	out, err := e.AddSprintEndpoint(ctx, in)
 	if err != nil {
 		return &pb.AddSprintResponse{ErrMsg: err.Error()}, err
@@ -28,7 +31,7 @@ func (e *Endpoints) AddSprint(ctx context.Context, in *pb.AddSprintRequest) (*pb
 	return out.(*pb.AddSprintResponse), err
 }
 
-func (e *Endpoints) CloseSprint(ctx context.Context, in *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) {
+func (e *Endpoints) CloseSprint(ctx oldcontext.Context, in *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) {
 	out, err := e.CloseSprintEndpoint(ctx, in)
 	if err != nil {
 		return &pb.CloseSprintResponse{ErrMsg: err.Error()}, err
@@ -36,7 +39,7 @@ func (e *Endpoints) CloseSprint(ctx context.Context, in *pb.CloseSprintRequest)
 	return out.(*pb.CloseSprintResponse), err
 }
 
-func (e *Endpoints) GetSprint(ctx context.Context, in *pb.GetSprintRequest) (*pb.GetSprintResponse, error) {
+func (e *Endpoints) GetSprint(ctx oldcontext.Context, in *pb.GetSprintRequest) (*pb.GetSprintResponse, error) {
 	out, err := e.GetSprintEndpoint(ctx, in)
 	if err != nil {
 		return &pb.GetSprintResponse{ErrMsg: err.Error()}, err

examples/go-kit/services/sprint/gen/pb/pb.go

@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-go.
 // source: services/sprint/sprint.proto
 // DO NOT EDIT!
 
@@ -19,7 +19,7 @@ It has these top-level messages:
 */
 package sprint
 
-import proto "github.com/gogo/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
@@ -37,16 +37,16 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type AddSprintRequest struct {
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 }
 
 func (m *AddSprintRequest) Reset()                    { *m = AddSprintRequest{} }
 func (m *AddSprintRequest) String() string            { return proto.CompactTextString(m) }
 func (*AddSprintRequest) ProtoMessage()               {}
-func (*AddSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{0} }
+func (*AddSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 func (m *AddSprintRequest) GetName() string {
 	if m != nil {
@@ -57,13 +57,13 @@ func (m *AddSprintRequest) GetName() string {
 
 type AddSprintResponse struct {
 	Sprint *Sprint `protobuf:"bytes,1,opt,name=sprint" json:"sprint,omitempty"`
-	ErrMsg string  `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
+	ErrMsg string  `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"`
 }
 
 func (m *AddSprintResponse) Reset()                    { *m = AddSprintResponse{} }
 func (m *AddSprintResponse) String() string            { return proto.CompactTextString(m) }
 func (*AddSprintResponse) ProtoMessage()               {}
-func (*AddSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{1} }
+func (*AddSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 func (m *AddSprintResponse) GetSprint() *Sprint {
 	if m != nil {
@@ -80,13 +80,13 @@ func (m *AddSprintResponse) GetErrMsg() string {
 }
 
 type CloseSprintRequest struct {
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 }
 
 func (m *CloseSprintRequest) Reset()                    { *m = CloseSprintRequest{} }
 func (m *CloseSprintRequest) String() string            { return proto.CompactTextString(m) }
 func (*CloseSprintRequest) ProtoMessage()               {}
-func (*CloseSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{2} }
+func (*CloseSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
 func (m *CloseSprintRequest) GetId() string {
 	if m != nil {
@@ -96,13 +96,13 @@ func (m *CloseSprintRequest) GetId() string {
 }
 
 type CloseSprintResponse struct {
-	ErrMsg string `protobuf:"bytes,1,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
+	ErrMsg string `protobuf:"bytes,1,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"`
 }
 
 func (m *CloseSprintResponse) Reset()                    { *m = CloseSprintResponse{} }
 func (m *CloseSprintResponse) String() string            { return proto.CompactTextString(m) }
 func (*CloseSprintResponse) ProtoMessage()               {}
-func (*CloseSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{3} }
+func (*CloseSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
 func (m *CloseSprintResponse) GetErrMsg() string {
 	if m != nil {
@@ -112,13 +112,13 @@ func (m *CloseSprintResponse) GetErrMsg() string {
 }
 
 type GetSprintRequest struct {
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 }
 
 func (m *GetSprintRequest) Reset()                    { *m = GetSprintRequest{} }
 func (m *GetSprintRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetSprintRequest) ProtoMessage()               {}
-func (*GetSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{4} }
+func (*GetSprintRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
 
 func (m *GetSprintRequest) GetId() string {
 	if m != nil {
@@ -129,13 +129,13 @@ func (m *GetSprintRequest) GetId() string {
 
 type GetSprintResponse struct {
 	Sprint *Sprint `protobuf:"bytes,1,opt,name=sprint" json:"sprint,omitempty"`
-	ErrMsg string  `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
+	ErrMsg string  `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"`
 }
 
 func (m *GetSprintResponse) Reset()                    { *m = GetSprintResponse{} }
 func (m *GetSprintResponse) String() string            { return proto.CompactTextString(m) }
 func (*GetSprintResponse) ProtoMessage()               {}
-func (*GetSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{5} }
+func (*GetSprintResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
 
 func (m *GetSprintResponse) GetSprint() *Sprint {
 	if m != nil {
@@ -152,15 +152,15 @@ func (m *GetSprintResponse) GetErrMsg() string {
 }
 
 type Sprint struct {
-	Id        string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	CreatedAt uint32 `protobuf:"varint,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
-	Name      string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	Id        string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	CreatedAt uint32 `protobuf:"varint,2,opt,name=created_at,json=createdAt" json:"created_at,omitempty"`
+	Name      string `protobuf:"bytes,3,opt,name=name" json:"name,omitempty"`
 }
 
 func (m *Sprint) Reset()                    { *m = Sprint{} }
 func (m *Sprint) String() string            { return proto.CompactTextString(m) }
 func (*Sprint) ProtoMessage()               {}
-func (*Sprint) Descriptor() ([]byte, []int) { return fileDescriptorSprint, []int{6} }
+func (*Sprint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
 
 func (m *Sprint) GetId() string {
 	if m != nil {
@@ -331,9 +331,9 @@ var _SprintService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "services/sprint/sprint.proto",
 }
 
-func init() { proto.RegisterFile("services/sprint/sprint.proto", fileDescriptorSprint) }
+func init() { proto.RegisterFile("services/sprint/sprint.proto", fileDescriptor0) }
 
-var fileDescriptorSprint = []byte{
+var fileDescriptor0 = []byte{
 	// 290 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x52, 0x4d, 0x4b, 0xc3, 0x40,
 	0x10, 0x6d, 0xaa, 0x44, 0x32, 0xa5, 0xa5, 0x1d, 0x0f, 0xc6, 0xa8, 0x20, 0x8b, 0x14, 0x4f, 0x11,

examples/go-kit/services/sprint/gen/transports/grpc/grpc.go

@@ -1,24 +1,25 @@
 package sprint_grpctransport
 
 import (
+	context "context"
 	"fmt"
 
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
 
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
 )
 
 // avoid import errors
 var _ = fmt.Errorf
 
-func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.SprintServiceServer {
-	options := []grpctransport.ServerOption{}
+func MakeGRPCServer(endpoints endpoints.Endpoints) pb.SprintServiceServer {
+	var options []grpctransport.ServerOption
+	_ = options
 	return &grpcServer{
 
 		addsprint: grpctransport.NewServer(
-			ctx,
 			endpoints.AddSprintEndpoint,
 			decodeRequest,
 			encodeAddSprintResponse,
@@ -26,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin
 		),
 
 		closesprint: grpctransport.NewServer(
-			ctx,
 			endpoints.CloseSprintEndpoint,
 			decodeRequest,
 			encodeCloseSprintResponse,
@@ -34,7 +34,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.Sprin
 		),
 
 		getsprint: grpctransport.NewServer(
-			ctx,
 			endpoints.GetSprintEndpoint,
 			decodeRequest,
 			encodeGetSprintResponse,
@@ -51,7 +50,7 @@ type grpcServer struct {
 	getsprint grpctransport.Handler
 }
 
-func (s *grpcServer) AddSprint(ctx context.Context, req *pb.AddSprintRequest) (*pb.AddSprintResponse, error) {
+func (s *grpcServer) AddSprint(ctx oldcontext.Context, req *pb.AddSprintRequest) (*pb.AddSprintResponse, error) {
 	_, rep, err := s.addsprint.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err
@@ -64,7 +63,7 @@ func encodeAddSprintResponse(ctx context.Context, response interface{}) (interfa
 	return resp, nil
 }
 
-func (s *grpcServer) CloseSprint(ctx context.Context, req *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) {
+func (s *grpcServer) CloseSprint(ctx oldcontext.Context, req *pb.CloseSprintRequest) (*pb.CloseSprintResponse, error) {
 	_, rep, err := s.closesprint.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err
@@ -77,7 +76,7 @@ func encodeCloseSprintResponse(ctx context.Context, response interface{}) (inter
 	return resp, nil
 }
 
-func (s *grpcServer) GetSprint(ctx context.Context, req *pb.GetSprintRequest) (*pb.GetSprintResponse, error) {
+func (s *grpcServer) GetSprint(ctx oldcontext.Context, req *pb.GetSprintRequest) (*pb.GetSprintResponse, error) {
 	_, rep, err := s.getsprint.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err

examples/go-kit/services/sprint/gen/transports/http/http.go

@@ -1,20 +1,23 @@
 package sprint_httptransport
 
 import (
+	"context"
 	"encoding/json"
-	context "golang.org/x/net/context"
 	"log"
 	"net/http"
 
 	gokit_endpoint "github.com/go-kit/kit/endpoint"
 	httptransport "github.com/go-kit/kit/transport/http"
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
 )
 
-func MakeAddSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+var _ = log.Printf
+var _ = gokit_endpoint.Chain
+var _ = httptransport.NewClient
+
+func MakeAddSprintHandler(svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 	return httptransport.NewServer(
-		ctx,
 		endpoint,
 		decodeAddSprintRequest,
 		encodeResponse,
@@ -30,9 +33,8 @@ func decodeAddSprintRequest(ctx context.Context, r *http.Request) (interface{},
 	return &req, nil
 }
 
-func MakeCloseSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+func MakeCloseSprintHandler(svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 	return httptransport.NewServer(
-		ctx,
 		endpoint,
 		decodeCloseSprintRequest,
 		encodeResponse,
@@ -48,9 +50,8 @@ func decodeCloseSprintRequest(ctx context.Context, r *http.Request) (interface{}
 	return &req, nil
 }
 
-func MakeGetSprintHandler(ctx context.Context, svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+func MakeGetSprintHandler(svc pb.SprintServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 	return httptransport.NewServer(
-		ctx,
 		endpoint,
 		decodeGetSprintRequest,
 		encodeResponse,
@@ -70,16 +71,16 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
 	return json.NewEncoder(w).Encode(response)
 }
 
-func RegisterHandlers(ctx context.Context, svc pb.SprintServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
+func RegisterHandlers(svc pb.SprintServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
 
 	log.Println("new HTTP endpoint: \"/AddSprint\" (service=Sprint)")
-	mux.Handle("/AddSprint", MakeAddSprintHandler(ctx, svc, endpoints.AddSprintEndpoint))
+	mux.Handle("/AddSprint", MakeAddSprintHandler(svc, endpoints.AddSprintEndpoint))
 
 	log.Println("new HTTP endpoint: \"/CloseSprint\" (service=Sprint)")
-	mux.Handle("/CloseSprint", MakeCloseSprintHandler(ctx, svc, endpoints.CloseSprintEndpoint))
+	mux.Handle("/CloseSprint", MakeCloseSprintHandler(svc, endpoints.CloseSprintEndpoint))
 
 	log.Println("new HTTP endpoint: \"/GetSprint\" (service=Sprint)")
-	mux.Handle("/GetSprint", MakeGetSprintHandler(ctx, svc, endpoints.GetSprintEndpoint))
+	mux.Handle("/GetSprint", MakeGetSprintHandler(svc, endpoints.GetSprintEndpoint))
 
 	return nil
 }

examples/go-kit/services/sprint/service.go

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/sprint/gen/pb"
 )
 
 type Service struct{}

examples/go-kit/services/user/gen/client/grpc/client.go

@@ -1,15 +1,16 @@
 package user_clientgrpc
 
 import (
+	context "context"
+
 	jwt "github.com/go-kit/kit/auth/jwt"
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log"
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	context "golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
 )
 
 func New(conn *grpc.ClientConn, logger log.Logger) pb.UserServiceServer {

examples/go-kit/services/user/gen/endpoints/endpoints.go

@@ -1,14 +1,17 @@
 package user_endpoints
 
 import (
+	context "context"
 	"fmt"
 
 	"github.com/go-kit/kit/endpoint"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
 )
 
+var _ = endpoint.Chain
 var _ = fmt.Errorf
+var _ = context.Background
 
 type StreamEndpoint func(server interface{}, req interface{}) (err error)
 
@@ -18,7 +21,7 @@ type Endpoints struct {
 	GetUserEndpoint endpoint.Endpoint
 }
 
-func (e *Endpoints) CreateUser(ctx context.Context, in *pb.CreateUserRequest) (*pb.CreateUserResponse, error) {
+func (e *Endpoints) CreateUser(ctx oldcontext.Context, in *pb.CreateUserRequest) (*pb.CreateUserResponse, error) {
 	out, err := e.CreateUserEndpoint(ctx, in)
 	if err != nil {
 		return &pb.CreateUserResponse{ErrMsg: err.Error()}, err
@@ -26,7 +29,7 @@ func (e *Endpoints) CreateUser(ctx context.Context, in *pb.CreateUserRequest) (*
 	return out.(*pb.CreateUserResponse), err
 }
 
-func (e *Endpoints) GetUser(ctx context.Context, in *pb.GetUserRequest) (*pb.GetUserResponse, error) {
+func (e *Endpoints) GetUser(ctx oldcontext.Context, in *pb.GetUserRequest) (*pb.GetUserResponse, error) {
 	out, err := e.GetUserEndpoint(ctx, in)
 	if err != nil {
 		return &pb.GetUserResponse{ErrMsg: err.Error()}, err

examples/go-kit/services/user/gen/pb/pb.go

@@ -1,4 +1,4 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-go.
 // source: services/user/user.proto
 // DO NOT EDIT!
 
@@ -17,7 +17,7 @@ It has these top-level messages:
 */
 package user
 
-import proto "github.com/gogo/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
@@ -35,16 +35,16 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
 
 type CreateUserRequest struct {
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
 }
 
 func (m *CreateUserRequest) Reset()                    { *m = CreateUserRequest{} }
 func (m *CreateUserRequest) String() string            { return proto.CompactTextString(m) }
 func (*CreateUserRequest) ProtoMessage()               {}
-func (*CreateUserRequest) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{0} }
+func (*CreateUserRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
 
 func (m *CreateUserRequest) GetName() string {
 	if m != nil {
@@ -55,13 +55,13 @@ func (m *CreateUserRequest) GetName() string {
 
 type CreateUserResponse struct {
 	User   *User  `protobuf:"bytes,1,opt,name=user" json:"user,omitempty"`
-	ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
+	ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"`
 }
 
 func (m *CreateUserResponse) Reset()                    { *m = CreateUserResponse{} }
 func (m *CreateUserResponse) String() string            { return proto.CompactTextString(m) }
 func (*CreateUserResponse) ProtoMessage()               {}
-func (*CreateUserResponse) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{1} }
+func (*CreateUserResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
 
 func (m *CreateUserResponse) GetUser() *User {
 	if m != nil {
@@ -78,13 +78,13 @@ func (m *CreateUserResponse) GetErrMsg() string {
 }
 
 type GetUserRequest struct {
-	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 }
 
 func (m *GetUserRequest) Reset()                    { *m = GetUserRequest{} }
 func (m *GetUserRequest) String() string            { return proto.CompactTextString(m) }
 func (*GetUserRequest) ProtoMessage()               {}
-func (*GetUserRequest) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{2} }
+func (*GetUserRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
 func (m *GetUserRequest) GetId() string {
 	if m != nil {
@@ -95,13 +95,13 @@ func (m *GetUserRequest) GetId() string {
 
 type GetUserResponse struct {
 	User   *User  `protobuf:"bytes,1,opt,name=user" json:"user,omitempty"`
-	ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg,proto3" json:"err_msg,omitempty"`
+	ErrMsg string `protobuf:"bytes,2,opt,name=err_msg,json=errMsg" json:"err_msg,omitempty"`
 }
 
 func (m *GetUserResponse) Reset()                    { *m = GetUserResponse{} }
 func (m *GetUserResponse) String() string            { return proto.CompactTextString(m) }
 func (*GetUserResponse) ProtoMessage()               {}
-func (*GetUserResponse) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{3} }
+func (*GetUserResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
 func (m *GetUserResponse) GetUser() *User {
 	if m != nil {
@@ -118,14 +118,14 @@ func (m *GetUserResponse) GetErrMsg() string {
 }
 
 type User struct {
-	Id   string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
-	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	Id   string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
 }
 
 func (m *User) Reset()                    { *m = User{} }
 func (m *User) String() string            { return proto.CompactTextString(m) }
 func (*User) ProtoMessage()               {}
-func (*User) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{4} }
+func (*User) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
 
 func (m *User) GetId() string {
 	if m != nil {
@@ -254,9 +254,9 @@ var _UserService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "services/user/user.proto",
 }
 
-func init() { proto.RegisterFile("services/user/user.proto", fileDescriptorUser) }
+func init() { proto.RegisterFile("services/user/user.proto", fileDescriptor0) }
 
-var fileDescriptorUser = []byte{
+var fileDescriptor0 = []byte{
 	// 236 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4e, 0x2d, 0x2a,
 	0xcb, 0x4c, 0x4e, 0x2d, 0xd6, 0x2f, 0x2d, 0x4e, 0x2d, 0x02, 0x13, 0x7a, 0x05, 0x45, 0xf9, 0x25,

examples/go-kit/services/user/gen/transports/grpc/grpc.go

@@ -1,24 +1,25 @@
 package user_grpctransport
 
 import (
+	context "context"
 	"fmt"
 
 	grpctransport "github.com/go-kit/kit/transport/grpc"
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
 
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
 )
 
 // avoid import errors
 var _ = fmt.Errorf
 
-func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserServiceServer {
-	options := []grpctransport.ServerOption{}
+func MakeGRPCServer(endpoints endpoints.Endpoints) pb.UserServiceServer {
+	var options []grpctransport.ServerOption
+	_ = options
 	return &grpcServer{
 
 		createuser: grpctransport.NewServer(
-			ctx,
 			endpoints.CreateUserEndpoint,
 			decodeRequest,
 			encodeCreateUserResponse,
@@ -26,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.UserS
 		),
 
 		getuser: grpctransport.NewServer(
-			ctx,
 			endpoints.GetUserEndpoint,
 			decodeRequest,
 			encodeGetUserResponse,
@@ -41,7 +41,7 @@ type grpcServer struct {
 	getuser grpctransport.Handler
 }
 
-func (s *grpcServer) CreateUser(ctx context.Context, req *pb.CreateUserRequest) (*pb.CreateUserResponse, error) {
+func (s *grpcServer) CreateUser(ctx oldcontext.Context, req *pb.CreateUserRequest) (*pb.CreateUserResponse, error) {
 	_, rep, err := s.createuser.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err
@@ -54,7 +54,7 @@ func encodeCreateUserResponse(ctx context.Context, response interface{}) (interf
 	return resp, nil
 }
 
-func (s *grpcServer) GetUser(ctx context.Context, req *pb.GetUserRequest) (*pb.GetUserResponse, error) {
+func (s *grpcServer) GetUser(ctx oldcontext.Context, req *pb.GetUserRequest) (*pb.GetUserResponse, error) {
 	_, rep, err := s.getuser.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err

examples/go-kit/services/user/gen/transports/http/http.go

@@ -1,20 +1,23 @@
 package user_httptransport
 
 import (
+	"context"
 	"encoding/json"
-	context "golang.org/x/net/context"
 	"log"
 	"net/http"
 
 	gokit_endpoint "github.com/go-kit/kit/endpoint"
 	httptransport "github.com/go-kit/kit/transport/http"
-	endpoints "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
+	endpoints "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/endpoints"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
 )
 
-func MakeCreateUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+var _ = log.Printf
+var _ = gokit_endpoint.Chain
+var _ = httptransport.NewClient
+
+func MakeCreateUserHandler(svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 	return httptransport.NewServer(
-		ctx,
 		endpoint,
 		decodeCreateUserRequest,
 		encodeResponse,
@@ -30,9 +33,8 @@ func decodeCreateUserRequest(ctx context.Context, r *http.Request) (interface{},
 	return &req, nil
 }
 
-func MakeGetUserHandler(ctx context.Context, svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+func MakeGetUserHandler(svc pb.UserServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 	return httptransport.NewServer(
-		ctx,
 		endpoint,
 		decodeGetUserRequest,
 		encodeResponse,
@@ -52,13 +54,13 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
 	return json.NewEncoder(w).Encode(response)
 }
 
-func RegisterHandlers(ctx context.Context, svc pb.UserServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
+func RegisterHandlers(svc pb.UserServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
 
 	log.Println("new HTTP endpoint: \"/CreateUser\" (service=User)")
-	mux.Handle("/CreateUser", MakeCreateUserHandler(ctx, svc, endpoints.CreateUserEndpoint))
+	mux.Handle("/CreateUser", MakeCreateUserHandler(svc, endpoints.CreateUserEndpoint))
 
 	log.Println("new HTTP endpoint: \"/GetUser\" (service=User)")
-	mux.Handle("/GetUser", MakeGetUserHandler(ctx, svc, endpoints.GetUserEndpoint))
+	mux.Handle("/GetUser", MakeGetUserHandler(svc, endpoints.GetUserEndpoint))
 
 	return nil
 }

examples/go-kit/services/user/service.go

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	pb "github.com/moul/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
+	pb "moul.io/protoc-gen-gotemplate/examples/go-kit/services/user/gen/pb"
 )
 
 type Service struct{}

examples/go-kit/templates/{{.File.Package}}/gen/client/grpc/client.go.tmpl

@@ -1,8 +1,9 @@
 package {{.File.Package}}_clientgrpc
 
 import (
-	"github.com/go-kit/kit/log"
-	context "golang.org/x/net/context"
+	context "context"
+
+        "github.com/go-kit/kit/log"
         "google.golang.org/grpc"
         grpctransport "github.com/go-kit/kit/transport/grpc"
         "github.com/go-kit/kit/endpoint"

examples/go-kit/templates/{{.File.Package}}/gen/endpoints/endpoints.go.tmpl

@@ -3,9 +3,10 @@ package {{.File.Package}}_endpoints
 {{$file := .File}}
 
 import (
+	context "context"
 	"fmt"
 
-	context "golang.org/x/net/context"
+	oldcontext "golang.org/x/net/context"
         pb "{{cat .GoPWD "/" .DestinationDir | nospace | clean}}/pb"
 	"github.com/go-kit/kit/endpoint"
 )
@@ -43,7 +44,7 @@ type Endpoints struct {
 				return fmt.Errorf("not implemented")
 			}
 		{{else}}
-			func (e *Endpoints){{.Name}}(ctx context.Context, in *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) {
+			func (e *Endpoints){{.Name}}(ctx oldcontext.Context, in *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) {
 				out, err := e.{{.Name}}Endpoint(ctx, in)
 				if err != nil {
 					return &pb.{{.OutputType | splitArray "." | last}}{ErrMsg: err.Error()}, err

examples/go-kit/templates/{{.File.Package}}/gen/transports/grpc/grpc.go.tmpl

@@ -3,9 +3,10 @@ package {{.File.Package}}_grpctransport
 {{$file := .File}}
 
 import (
+	context "context"
         "fmt"
 
-	context "golang.org/x/net/context"
+        oldcontext "golang.org/x/net/context"
 	grpctransport "github.com/go-kit/kit/transport/grpc"
 
         pb "{{cat .GoPWD "/" .DestinationDir | nospace | clean}}/pb"
@@ -15,7 +16,7 @@ import (
 // avoid import errors
 var _ = fmt.Errorf
 
-func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.{{.File.Package | title}}ServiceServer {
+func MakeGRPCServer(endpoints endpoints.Endpoints) pb.{{.File.Package | title}}ServiceServer {
      	var options []grpctransport.ServerOption
         _ = options
 	return &grpcServer{
@@ -26,7 +27,6 @@ func MakeGRPCServer(ctx context.Context, endpoints endpoints.Endpoints) pb.{{.Fi
 				},
 			{{else}}
 				{{.Name | lower}}: grpctransport.NewServer(
-					ctx,
 					endpoints.{{.Name}}Endpoint,
 					decodeRequest,
 					encode{{.Name}}Response,
@@ -57,7 +57,7 @@ type grpcServer struct {
 		        return s.{{.Name | lower}}.Do(server, req)
 		}
 	{{else}}
-		func (s *grpcServer) {{.Name}}(ctx context.Context, req *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) {
+		func (s *grpcServer) {{.Name}}(ctx oldcontext.Context, req *pb.{{.InputType | splitArray "." | last}}) (*pb.{{.OutputType | splitArray "." | last}}, error) {
 		_, rep, err := s.{{.Name | lower}}.ServeGRPC(ctx, req)
 			if err != nil {
 				return nil, err

examples/go-kit/templates/{{.File.Package}}/gen/transports/http/http.go.tmpl

@@ -6,7 +6,7 @@ import (
        "log"
 	"net/http"
 	"encoding/json"
-	context "golang.org/x/net/context"
+	"context"
 
         pb "{{cat .GoPWD "/" .DestinationDir | nospace | clean}}/pb"
         gokit_endpoint "github.com/go-kit/kit/endpoint"
@@ -21,9 +21,8 @@ var _ = httptransport.NewClient
 
 {{range .Service.Method}}
 	{{if and (not .ServerStreaming) (not .ClientStreaming)}}
-		func Make{{.Name}}Handler(ctx context.Context, svc pb.{{$file.Package | title}}ServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
+		func Make{{.Name}}Handler(svc pb.{{$file.Package | title}}ServiceServer, endpoint gokit_endpoint.Endpoint) *httptransport.Server {
 			return httptransport.NewServer(
-				ctx,
 				endpoint,
 				decode{{.Name}}Request,
 				encodeResponse,
@@ -45,11 +44,11 @@ func encodeResponse(ctx context.Context, w http.ResponseWriter, response interfa
 	return json.NewEncoder(w).Encode(response)
 }
 
-func RegisterHandlers(ctx context.Context, svc pb.{{$file.Package | title}}ServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
+func RegisterHandlers(svc pb.{{$file.Package | title}}ServiceServer, mux *http.ServeMux, endpoints endpoints.Endpoints) error {
 	{{range .Service.Method}}
 		{{if and (not .ServerStreaming) (not .ClientStreaming)}}
 			log.Println("new HTTP endpoint: \"/{{.Name}}\" (service={{$file.Package | title}})")
-			mux.Handle("/{{.Name}}", Make{{.Name}}Handler(ctx, svc, endpoints.{{.Name}}Endpoint))
+			mux.Handle("/{{.Name}}", Make{{.Name}}Handler(svc, endpoints.{{.Name}}Endpoint))
 		{{end}}
 	{{end}}
 	return nil

examples/helpers/Makefile

@@ -0,0 +1,13 @@
+.PHONY: build
+build:
+	mkdir -p output
+	protoc -I. --gotemplate_out=template_dir=.,debug=true:. *.proto
+
+
+.PHONY: re
+re: clean build
+
+
+.PHONY: clean
+clean:
+	rm -rf output

examples/helpers/example.txt

@@ -0,0 +1,58 @@
+# Common variables
+{{.File.Name}}:                                                                           helpers.proto
+{{.File.Name | upper}}:                                                                   HELPERS.PROTO
+{{.File.Package | base | replace "." "-"}}                                                dummy
+{{$packageDir := .File.Name | dir}}{{$packageDir}}                                        .
+{{$packageName := .File.Name | base | replace ".proto" ""}}{{$packageName}}               helpers
+{{$packageImport := .File.Package | replace "." "_"}}{{$packageImport}}                   dummy
+{{$namespacedPackage := .File.Package}}{{$namespacedPackage}}                             dummy
+{{$currentFile := .File.Name | getProtoFile}}{{$currentFile}}                             <nil>
+{{- /*{{- $currentPackageName := $currentFile.GoPkg.Name}}{{$currentPackageName}}*/}}
+# TODO: more variables
+
+# Sprig: strings
+{{trim "   hello    "}}:                                                            hello
+{{trimAll "$" "$5.00"}}:                                                            5.00
+{{trimSuffix "-" "hello-"}}:                                                        hello
+{{upper "hello"}}:                                                                  HELLO
+{{lower "HELLO"}}:                                                                  hello
+{{title "hello world"}}:                                                            Hello World
+{{untitle "Hello World"}}:                                                          hello world
+{{repeat 3 "hello"}}:                                                               hellohellohello
+{{substr 0 5 "hello world"}}:                                                       hello
+{{nospace "hello w o r l d"}}:                                                      helloworld
+{{trunc 5 "hello world"}}:                                                          hello
+{{abbrev 5 "hello world"}}:                                                         he...
+{{abbrevboth 5 10 "1234 5678 9123"}}:                                               ...5678...
+{{initials "First Try"}}:                                                           FT
+{{randNumeric 3}}:                                                                  528
+{{- /*{{wrap 80 $someText}}*/}}:
+{{wrapWith 5 "\t" "Hello World"}}:                                                  Hello	World
+{{contains "cat" "catch"}}:                                                         true
+{{hasPrefix "cat" "catch"}}:                                                        true
+{{cat "hello" "beautiful" "world"}}:                                                hello beautiful world
+{{- /*{{indent 4 $lots_of_text}}*/}}:
+{{- /*{{indent 4 $lots_of_text}}*/}}:
+{{"I Am Henry VIII" | replace " " "-"}}:                                            I-Am-Henry-VIII
+{{len .Service.Method | plural "one anchovy" "many anchovies"}}:                    many anchovies
+{{snakecase "FirstName"}}:                                                          first_name
+{{camelcase "http_server"}}:                                                        HttpServer
+{{shuffle "hello"}}:                                                                holle
+{{regexMatch "[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}" "test@acme.com"}}:   true
+{{- /*{{regexFindAll "[2,4,6,8]" "123456789"}}*/}}:
+{{regexFind "[a-zA-Z][1-9]" "abcd1234"}}:                                           d1
+{{regexReplaceAll "a(x*)b" "-ab-axxb-" "${1}W"}}:                                   -W-xxW-
+{{regexReplaceAllLiteral "a(x*)b" "-ab-axxb-" "${1}"}}:                             -${1}-${1}-
+{{regexSplit "z+" "pizza" -1}}:                                                     [pi a]
+
+# Get one specific method on array method using index
+{{ index .Service.Method 1 }}:                                                      name:"Iii" input_type:".dummy.Dummy2" output_type:".dummy.Dummy1" options:<> 
+
+# Sprig: advanced
+{{if contains "cat" "catch"}}yes{{else}}no{{end}}:   yes
+{{1 | plural "one anchovy" "many anchovies"}}:       one anchovy
+{{2 | plural "one anchovy" "many anchovies"}}:       many anchovies
+{{3 | plural "one anchovy" "many anchovies"}}:       many anchovies
+
+# TODO: more sprig examples
+# TODO: all built-in examples

examples/helpers/example.txt.tmpl

@@ -0,0 +1,59 @@
+# Common variables
+{{`{{.File.Name}}`}}:                                                                           {{.File.Name}}
+{{`{{.File.Name | upper}}`}}:                                                                   {{.File.Name | upper}}
+{{`{{.File.Package | base | replace "." "-"}}`}}                                                {{.File.Package | base | replace "." "-"}}
+{{- /*{{`{{$file := .File}}{{$file}}`}}                                                               {{$file := .File}}{{$file}}*/}}
+{{`{{$packageDir := .File.Name | dir}}{{$packageDir}}`}}                                        {{$packageDir := .File.Name | dir}}{{$packageDir}}
+{{`{{$packageName := .File.Name | base | replace ".proto" ""}}{{$packageName}}`}}               {{$packageName := .File.Name | base | replace ".proto" ""}}{{$packageName}}
+{{`{{$packageImport := .File.Package | replace "." "_"}}{{$packageImport}}`}}                   {{$packageImport := .File.Package | replace "." "_"}}{{$packageImport}}
+{{`{{$namespacedPackage := .File.Package}}{{$namespacedPackage}}`}}                             {{$namespacedPackage := .File.Package}}{{$namespacedPackage}}
+{{`{{$currentFile := .File.Name | getProtoFile}}{{$currentFile}}`}}                             {{$currentFile := .File.Name | getProtoFile}}{{$currentFile}}
+{{`{{- /*{{- $currentPackageName := $currentFile.GoPkg.Name}}{{$currentPackageName}}*/}}`}}     {{- /*{{- $currentPackageName := $currentFile.GoPkg.Name}}{{$currentPackageName}}*/}}
+# TODO: more variables
+
+# Sprig: strings
+{{`{{trim "   hello    "}}`}}:                                                            {{trim "   hello    "}}
+{{`{{trimAll "$" "$5.00"}}`}}:                                                            {{trimAll "$" "$5.00"}}
+{{`{{trimSuffix "-" "hello-"}}`}}:                                                        {{trimSuffix "-" "hello-"}}
+{{`{{upper "hello"}}`}}:                                                                  {{upper "hello"}}
+{{`{{lower "HELLO"}}`}}:                                                                  {{lower "HELLO"}}
+{{`{{title "hello world"}}`}}:                                                            {{title "hello world"}}
+{{`{{untitle "Hello World"}}`}}:                                                          {{untitle "Hello World"}}
+{{`{{repeat 3 "hello"}}`}}:                                                               {{repeat 3 "hello"}}
+{{`{{substr 0 5 "hello world"}}`}}:                                                       {{substr 0 5 "hello world"}}
+{{`{{nospace "hello w o r l d"}}`}}:                                                      {{nospace "hello w o r l d"}}
+{{`{{trunc 5 "hello world"}}`}}:                                                          {{trunc 5 "hello world"}}
+{{`{{abbrev 5 "hello world"}}`}}:                                                         {{abbrev 5 "hello world"}}
+{{`{{abbrevboth 5 10 "1234 5678 9123"}}`}}:                                               {{abbrevboth 5 10 "1234 5678 9123"}}
+{{`{{initials "First Try"}}`}}:                                                           {{initials "First Try"}}
+{{`{{randNumeric 3}}`}}:                                                                  {{randNumeric 3}}
+{{`{{- /*{{wrap 80 $someText}}*/}}`}}:                                                    {{- /*{{wrap 80 $someText}}*/}}
+{{`{{wrapWith 5 "\t" "Hello World"}}`}}:                                                  {{wrapWith 5 "\t" "Hello World"}}
+{{`{{contains "cat" "catch"}}`}}:                                                         {{contains "cat" "catch"}}
+{{`{{hasPrefix "cat" "catch"}}`}}:                                                        {{hasPrefix "cat" "catch"}}
+{{`{{cat "hello" "beautiful" "world"}}`}}:                                                {{cat "hello" "beautiful" "world"}}
+{{`{{- /*{{indent 4 $lots_of_text}}*/}}`}}:                                               {{- /*{{indent 4 $lots_of_text}}*/}}
+{{`{{- /*{{indent 4 $lots_of_text}}*/}}`}}:                                               {{- /*{{indent 4 $lots_of_text}}*/}}
+{{`{{"I Am Henry VIII" | replace " " "-"}}`}}:                                            {{"I Am Henry VIII" | replace " " "-"}}
+{{`{{len .Service.Method | plural "one anchovy" "many anchovies"}}`}}:                    {{len .Service.Method | plural "one anchovy" "many anchovies"}}
+{{`{{snakecase "FirstName"}}`}}:                                                          {{snakecase "FirstName"}}
+{{`{{camelcase "http_server"}}`}}:                                                        {{camelcase "http_server"}}
+{{`{{shuffle "hello"}}`}}:                                                                {{shuffle "hello"}}
+{{`{{regexMatch "[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}" "test@acme.com"}}`}}:   {{regexMatch "[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}" "test@acme.com"}}
+{{`{{- /*{{regexFindAll "[2,4,6,8]" "123456789"}}*/}}`}}:                                 {{- /*{{regexFindAll "[2,4,6,8]" "123456789"}}*/}}
+{{`{{regexFind "[a-zA-Z][1-9]" "abcd1234"}}`}}:                                           {{regexFind "[a-zA-Z][1-9]" "abcd1234"}}
+{{`{{regexReplaceAll "a(x*)b" "-ab-axxb-" "${1}W"}}`}}:                                   {{regexReplaceAll "a(x*)b" "-ab-axxb-" "${1}W"}}
+{{`{{regexReplaceAllLiteral "a(x*)b" "-ab-axxb-" "${1}"}}`}}:                             {{regexReplaceAllLiteral "a(x*)b" "-ab-axxb-" "${1}"}}
+{{`{{regexSplit "z+" "pizza" -1}}`}}:                                                     {{regexSplit "z+" "pizza" -1}}
+
+# Get one specific method on array method using index
+{{`{{ index .Service.Method 1 }}`}}:                                                      {{ index .Service.Method 1 }}
+
+# Sprig: advanced
+{{`{{if contains "cat" "catch"}}yes{{else}}no{{end}}`}}:   {{if contains "cat" "catch"}}yes{{else}}no{{end}}
+{{`{{1 | plural "one anchovy" "many anchovies"}}`}}:       {{1 | plural "one anchovy" "many anchovies"}}
+{{`{{2 | plural "one anchovy" "many anchovies"}}`}}:       {{2 | plural "one anchovy" "many anchovies"}}
+{{`{{3 | plural "one anchovy" "many anchovies"}}`}}:       {{3 | plural "one anchovy" "many anchovies"}}
+
+# TODO: more sprig examples
+# TODO: all built-in examples

examples/helpers/helpers.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package dummy;
+
+option go_package = "moul.io/protoc-gen-gotemplate/examples/helpers";
+
+message Dummy1 {
+  float aaa = 1;
+  string bbb = 2;
+  int32 ccc = 3;
+  int64 ddd = 4;
+  repeated string eee = 5;
+}
+
+message Dummy2 {
+  float fff = 1;
+  Dummy1 ggg = 2;
+}
+
+message Dummy3 {}
+
+service DummyService {
+  rpc Hhh(Dummy1) returns (Dummy2) {}
+  rpc Iii(Dummy2) returns (Dummy1) {}
+}

examples/import/Makefile

@@ -0,0 +1,18 @@
+.PHONY: build
+build:
+	mkdir -p output
+
+	# generate pb.go inluding imported proto
+	protoc --go_out=Mproto/common.proto=moul.io/protoc-gen-gotemplate/examples/import/output/models/common:./output proto/article.proto
+	protoc --go_out=,plugins=grpc:./output proto/common.proto
+
+	# build our go file based on our template
+	protoc -I. --gotemplate_out=template_dir=templates,debug=true:output proto/article.proto
+
+.PHONY: re
+re: clean build
+
+
+.PHONY: clean
+clean:
+	rm -rf output

examples/import/output/models/article/article.pb.go

@@ -0,0 +1,141 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: proto/article.proto
+
+/*
+Package article is a generated protocol buffer package.
+
+It is generated from these files:
+	proto/article.proto
+
+It has these top-level messages:
+	GetArticleRequest
+	GetArticleResponse
+	Article
+*/
+package article
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import common "moul.io/protoc-gen-gotemplate/examples/import/output/models/common"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type GetArticleRequest struct {
+	Getarticle *common.GetArticle `protobuf:"bytes,1,opt,name=getarticle" json:"getarticle,omitempty"`
+}
+
+func (m *GetArticleRequest) Reset()                    { *m = GetArticleRequest{} }
+func (m *GetArticleRequest) String() string            { return proto.CompactTextString(m) }
+func (*GetArticleRequest) ProtoMessage()               {}
+func (*GetArticleRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *GetArticleRequest) GetGetarticle() *common.GetArticle {
+	if m != nil {
+		return m.Getarticle
+	}
+	return nil
+}
+
+type GetArticleResponse struct {
+	Article *Article `protobuf:"bytes,1,opt,name=article" json:"article,omitempty"`
+	// The generated output should write []*GetArticleResponse_Storage.Storage for this field.
+	Storages []*GetArticleResponse_Storage `protobuf:"bytes,2,rep,name=storages" json:"storages,omitempty"`
+}
+
+func (m *GetArticleResponse) Reset()                    { *m = GetArticleResponse{} }
+func (m *GetArticleResponse) String() string            { return proto.CompactTextString(m) }
+func (*GetArticleResponse) ProtoMessage()               {}
+func (*GetArticleResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *GetArticleResponse) GetArticle() *Article {
+	if m != nil {
+		return m.Article
+	}
+	return nil
+}
+
+func (m *GetArticleResponse) GetStorages() []*GetArticleResponse_Storage {
+	if m != nil {
+		return m.Storages
+	}
+	return nil
+}
+
+type GetArticleResponse_Storage struct {
+	Code string `protobuf:"bytes,1,opt,name=code" json:"code,omitempty"`
+}
+
+func (m *GetArticleResponse_Storage) Reset()                    { *m = GetArticleResponse_Storage{} }
+func (m *GetArticleResponse_Storage) String() string            { return proto.CompactTextString(m) }
+func (*GetArticleResponse_Storage) ProtoMessage()               {}
+func (*GetArticleResponse_Storage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} }
+
+func (m *GetArticleResponse_Storage) GetCode() string {
+	if m != nil {
+		return m.Code
+	}
+	return ""
+}
+
+type Article struct {
+	Id   string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Name string `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
+}
+
+func (m *Article) Reset()                    { *m = Article{} }
+func (m *Article) String() string            { return proto.CompactTextString(m) }
+func (*Article) ProtoMessage()               {}
+func (*Article) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *Article) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *Article) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*GetArticleRequest)(nil), "company.GetArticleRequest")
+	proto.RegisterType((*GetArticleResponse)(nil), "company.GetArticleResponse")
+	proto.RegisterType((*GetArticleResponse_Storage)(nil), "company.GetArticleResponse.Storage")
+	proto.RegisterType((*Article)(nil), "company.Article")
+}
+
+func init() { proto.RegisterFile("proto/article.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 256 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4b, 0xc4, 0x30,
+	0x10, 0x85, 0x6d, 0x15, 0xab, 0xb3, 0x20, 0x3a, 0x82, 0x94, 0x8a, 0xb0, 0xd4, 0xcb, 0x22, 0x18,
+	0xa1, 0x1e, 0x3d, 0x88, 0x5e, 0x7a, 0xaf, 0x78, 0xf1, 0x56, 0xd3, 0x61, 0x29, 0x6c, 0x3a, 0xb5,
+	0x89, 0x82, 0xff, 0xc6, 0x9f, 0x2a, 0x9b, 0x4c, 0xd7, 0x8a, 0xb2, 0xa7, 0x4e, 0xf3, 0xbe, 0xf7,
+	0xf2, 0xc8, 0xc0, 0x69, 0x3f, 0xb0, 0xe3, 0x9b, 0x7a, 0x70, 0xad, 0x5e, 0x91, 0xf2, 0x7f, 0x98,
+	0x68, 0x36, 0x7d, 0xdd, 0x7d, 0x66, 0x18, 0x54, 0xcd, 0xc6, 0x70, 0x17, 0xc4, 0xbc, 0x84, 0x93,
+	0x92, 0xdc, 0x43, 0x30, 0x54, 0xf4, 0xf6, 0x4e, 0xd6, 0x61, 0x01, 0xb0, 0x24, 0x27, 0x29, 0x69,
+	0x34, 0x8f, 0x16, 0xb3, 0x02, 0x95, 0xf8, 0x26, 0xf8, 0x84, 0xca, 0xbf, 0x22, 0xc0, 0x69, 0x92,
+	0xed, 0xb9, 0xb3, 0x84, 0x57, 0x90, 0xfc, 0xce, 0x39, 0x56, 0x52, 0x47, 0x8d, 0xe8, 0x08, 0xe0,
+	0x3d, 0x1c, 0x58, 0xc7, 0x43, 0xbd, 0x24, 0x9b, 0xc6, 0xf3, 0xdd, 0xc5, 0xac, 0xb8, 0xdc, 0xc0,
+	0x7f, 0xa3, 0xd5, 0x53, 0x60, 0xab, 0x8d, 0x29, 0xbb, 0x80, 0x44, 0x0e, 0x11, 0x61, 0x4f, 0x73,
+	0x13, 0x2e, 0x3d, 0xac, 0xfc, 0x9c, 0x5f, 0x43, 0x22, 0x19, 0x78, 0x04, 0x71, 0xdb, 0x88, 0x18,
+	0xb7, 0xcd, 0x1a, 0xef, 0x6a, 0x43, 0x69, 0x1c, 0xf0, 0xf5, 0x5c, 0x3c, 0x03, 0x48, 0x33, 0xfb,
+	0xa1, 0xb1, 0x04, 0xf8, 0xe9, 0x80, 0xd9, 0xbf, 0xc5, 0xfc, 0xeb, 0x65, 0xe7, 0x5b, 0x4a, 0xe7,
+	0x3b, 0x8f, 0xe9, 0xcb, 0x99, 0xe1, 0x86, 0x56, 0x76, 0x5c, 0xd3, 0x9d, 0x7c, 0x5f, 0xf7, 0xfd,
+	0x4a, 0x6e, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x93, 0xb5, 0x4a, 0x95, 0xc6, 0x01, 0x00, 0x00,
+}

examples/import/output/models/common/common.pb.go

@@ -0,0 +1,69 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: proto/common.proto
+
+/*
+Package common is a generated protocol buffer package.
+
+It is generated from these files:
+	proto/common.proto
+
+It has these top-level messages:
+	GetArticle
+*/
+package common
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type GetArticle struct {
+	Id     string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
+	Tenant string `protobuf:"bytes,2,opt,name=tenant" json:"tenant,omitempty"`
+}
+
+func (m *GetArticle) Reset()                    { *m = GetArticle{} }
+func (m *GetArticle) String() string            { return proto.CompactTextString(m) }
+func (*GetArticle) ProtoMessage()               {}
+func (*GetArticle) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *GetArticle) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+func (m *GetArticle) GetTenant() string {
+	if m != nil {
+		return m.Tenant
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*GetArticle)(nil), "common.GetArticle")
+}
+
+func init() { proto.RegisterFile("proto/common.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 110 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x28, 0xca, 0x2f,
+	0xc9, 0xd7, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0xcf, 0xd3, 0x03, 0x73, 0x84, 0xd8, 0x20, 0x3c, 0x25,
+	0x13, 0x2e, 0x2e, 0xf7, 0xd4, 0x12, 0xc7, 0xa2, 0x92, 0xcc, 0xe4, 0x9c, 0x54, 0x21, 0x3e, 0x2e,
+	0xa6, 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0xa6, 0xcc, 0x14, 0x21, 0x31, 0x2e,
+	0xb6, 0x92, 0xd4, 0xbc, 0xc4, 0xbc, 0x12, 0x09, 0x26, 0xb0, 0x18, 0x94, 0xe7, 0x24, 0x16, 0x25,
+	0x92, 0x9b, 0x9f, 0x92, 0x9a, 0x53, 0x0c, 0x35, 0xd4, 0x1a, 0x42, 0x25, 0xb1, 0x81, 0x0d, 0x37,
+	0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x89, 0x5a, 0x1d, 0x73, 0x72, 0x00, 0x00, 0x00,
+}

examples/import/output/output.go

@@ -0,0 +1,26 @@
+// Code generated by protoc-gen-gotemplate
+package company
+
+import (
+	"context"
+
+	"moul.io/protoc-gen-gotemplate/examples/import/output/models/article"
+	"moul.io/protoc-gen-gotemplate/examples/import/output/models/common"
+)
+
+type Repository interface {
+	GetArticle(getarticle *common.GetArticle) (*company.Article, []*company.Storage, error)
+}
+
+// ------------------------- Public SDK -----------------------------
+
+// GetArticle : proto: missing extension proto: missing extension
+func (sdk *Sdk) GetArticle(ctx context.Context,
+	getarticle *article.GetArticle, token, requestID string) (article *article.Article, storages []*article.GetArticleResponse_Storage, err error) {
+
+	out := &pb.GetArticleResponse{}
+	_ = out
+
+	return out.Article, out.Storages, nil
+
+}

examples/import/proto/article.proto

@@ -0,0 +1,31 @@
+syntax = "proto3";
+
+package company;
+
+option go_package = "models/article;article";
+
+import "proto/common.proto";
+
+message GetArticleRequest {  
+  common.GetArticle getarticle = 1;
+}
+
+
+message GetArticleResponse {  
+  Article article = 1;
+  
+  message Storage {
+		string code = 1;
+  }
+  // The generated output should write []*GetArticleResponse_Storage.Storage for this field.
+  repeated Storage storages = 2;
+}
+
+message Article{
+  string id = 1;
+  string name = 2;
+}
+
+service articlesvc {
+  rpc GetArticle (GetArticleRequest) returns (GetArticleResponse){}
+}

examples/import/proto/common.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package common;
+
+option go_package = "models/common;common";
+
+message GetArticle{
+  string id = 1;
+  string tenant = 2;
+}

examples/import/templates/output.go.tmpl

@@ -0,0 +1,41 @@
+// Code generated by protoc-gen-gotemplate
+{{- $file := .File}}
+package {{.File.Package}}
+
+import (
+	"moul.io/protoc-gen-gotemplate/examples/import/output/models/article"
+    "moul.io/protoc-gen-gotemplate/examples/import/output/models/common"
+)
+
+type Repository interface {
+    {{range $m := .Service.Method}}{{with $t := $m.InputType | getMessageType $.File}} {{$m.Name}}({{range $f := $t.Field}}{{$f.Name|lowerCamelCase}} {{$f| goTypeWithPackage }} {{end}}) ({{with $out := $m.OutputType | getMessageType $.File}}{{range $f := $out.Field}}{{$f | goTypeWithPackage}}, {{end}}{{end}} error){{end}}{{end}}
+}
+
+
+
+
+
+
+
+// ------------------------- Public SDK -----------------------------
+{{$pkg := "pb"}}
+
+
+{{range $m := .Service.Method}}
+{{with $t := $m.InputType | getMessageType $.File}}
+{{if and (not $m.ServerStreaming) (not $m.ClientStreaming)}}
+{{/* ----------------------------- nominal case ---------------------------- */}}
+// {{$m.Name}} : {{$m | httpVerb}} {{$m | httpPath}}
+func (sdk *Sdk) {{$m.Name}}(ctx context.Context, {{if $t.OneofDecl}} req *{{$pkg}}.{{$m.Name}}Request,{{else}}{{range $f := $t.Field}}
+  {{$f.Name|lowerCamelCase}} {{$f| goTypeWithGoPackage $.File}},{{end}}{{end}} token, requestID string)({{with $out := $m.OutputType | getMessageType $.File}}{{range $f := $out.Field}}{{$f.Name|lowerCamelCase}} {{$f | goTypeWithGoPackage $.File}}, {{end}}{{end}}err error) {
+
+  out := &{{$pkg}}.{{$m.Name}}Response{}
+	_ = out
+
+{{with $out := $m.OutputType | getMessageType $.File}}
+  return {{range $f := $out.Field}}out.{{$f.Name|camelCase}}, {{end}}nil
+{{end}} {{/* with */}}
+}
+
+{{end}} {{/* streaming ifs */}}
+{{end}}{{end}} {{/* range with */}}

examples/single-package-mode/Makefile

@@ -0,0 +1,26 @@
+.PHONY: re
+re: clean build test
+
+.PHONY: build
+build:
+	@mkdir -p output
+
+	@# proto-gen-go
+	protoc -I./proto --go_out=plugins=grpc:output proto/aaa/aaa.proto
+	protoc -I./proto --go_out=plugins=grpc:output proto/bbb/bbb.proto
+	@rm -rf output/aaa output/bbb
+	@mv output/moul.io/protoc-gen-gotemplate/examples/single-package-mode/output/* output/
+	@rm -rf output/github.com
+
+	@# protoc-gen-gotemplate
+	protoc -I./proto --gotemplate_out=template_dir=templates,single-package-mode=true:output proto/bbb/bbb.proto
+	gofmt -w .
+
+.PHONY: test
+test:
+	go test -i ./output/...
+	go test -v ./output/...
+
+.PHONY: clean
+clean:
+	rm -rf output

examples/single-package-mode/output/aaa/aaa.pb.go

@@ -0,0 +1,84 @@
+// Code generated by protoc-gen-go.
+// source: aaa/aaa.proto
+// DO NOT EDIT!
+
+/*
+Package aaa is a generated protocol buffer package.
+
+It is generated from these files:
+	aaa/aaa.proto
+
+It has these top-level messages:
+	AaaRequest
+	AaaReply
+*/
+package aaa
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type AaaRequest struct {
+	Blah string `protobuf:"bytes,1,opt,name=blah" json:"blah,omitempty"`
+}
+
+func (m *AaaRequest) Reset()                    { *m = AaaRequest{} }
+func (m *AaaRequest) String() string            { return proto.CompactTextString(m) }
+func (*AaaRequest) ProtoMessage()               {}
+func (*AaaRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *AaaRequest) GetBlah() string {
+	if m != nil {
+		return m.Blah
+	}
+	return ""
+}
+
+type AaaReply struct {
+	Error string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
+}
+
+func (m *AaaReply) Reset()                    { *m = AaaReply{} }
+func (m *AaaReply) String() string            { return proto.CompactTextString(m) }
+func (*AaaReply) ProtoMessage()               {}
+func (*AaaReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *AaaReply) GetError() string {
+	if m != nil {
+		return m.Error
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*AaaRequest)(nil), "the.aaa.package.AaaRequest")
+	proto.RegisterType((*AaaReply)(nil), "the.aaa.package.AaaReply")
+}
+
+func init() { proto.RegisterFile("aaa/aaa.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 172 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x2c, 0x8e, 0x31, 0x0b, 0xc2, 0x30,
+	0x10, 0x46, 0x29, 0xa8, 0x68, 0x40, 0x84, 0xe0, 0xe0, 0x58, 0x3a, 0xb9, 0xa4, 0x19, 0xfc, 0x05,
+	0xba, 0x8b, 0xd0, 0xd1, 0xed, 0x5a, 0x8f, 0xb4, 0x78, 0xe9, 0xc5, 0xf4, 0x02, 0xfa, 0xef, 0xc5,
+	0xd8, 0xed, 0x1e, 0xbc, 0xe3, 0x7b, 0x6a, 0x0b, 0x00, 0x16, 0x00, 0xea, 0x10, 0x59, 0x58, 0xef,
+	0xa4, 0xc7, 0x3a, 0x23, 0x74, 0x4f, 0x70, 0x58, 0x95, 0x4a, 0x9d, 0x01, 0x1a, 0x7c, 0x25, 0x9c,
+	0x44, 0x6b, 0xb5, 0x68, 0x09, 0xfa, 0x43, 0x51, 0x16, 0xc7, 0x4d, 0x93, 0xef, 0xaa, 0x54, 0xeb,
+	0x6c, 0x04, 0xfa, 0xe8, 0xbd, 0x5a, 0x62, 0x8c, 0x1c, 0x67, 0xe1, 0x0f, 0x97, 0xdb, 0xfd, 0xea,
+	0x06, 0xe9, 0x53, 0x5b, 0x77, 0xec, 0xad, 0xe7, 0x44, 0x36, 0xaf, 0x75, 0xc6, 0xe1, 0x68, 0x1c,
+	0x0b, 0xfa, 0x40, 0x20, 0x68, 0xf1, 0x0d, 0x3e, 0x10, 0x4e, 0x76, 0x1a, 0x46, 0x47, 0x68, 0xe6,
+	0x08, 0xe3, 0xf9, 0x81, 0x96, 0x93, 0x84, 0x24, 0xbf, 0xd6, 0x76, 0x95, 0xdf, 0x4f, 0xdf, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x93, 0x24, 0x48, 0x9c, 0xbd, 0x00, 0x00, 0x00,
+}

examples/single-package-mode/output/bbb/bbb.pb.go

@@ -0,0 +1,200 @@
+// Code generated by protoc-gen-go.
+// source: bbb/bbb.proto
+// DO NOT EDIT!
+
+/*
+Package bbb is a generated protocol buffer package.
+
+It is generated from these files:
+	bbb/bbb.proto
+
+It has these top-level messages:
+	BbbRequest
+	BbbReply
+*/
+package bbb
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+import the_aaa_package "moul.io/protoc-gen-gotemplate/examples/single-package-mode/output/aaa"
+
+import (
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type BbbRequest struct {
+	Enable bool `protobuf:"varint,1,opt,name=enable" json:"enable,omitempty"`
+}
+
+func (m *BbbRequest) Reset()                    { *m = BbbRequest{} }
+func (m *BbbRequest) String() string            { return proto.CompactTextString(m) }
+func (*BbbRequest) ProtoMessage()               {}
+func (*BbbRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+func (m *BbbRequest) GetEnable() bool {
+	if m != nil {
+		return m.Enable
+	}
+	return false
+}
+
+type BbbReply struct {
+	Done bool `protobuf:"varint,1,opt,name=done" json:"done,omitempty"`
+}
+
+func (m *BbbReply) Reset()                    { *m = BbbReply{} }
+func (m *BbbReply) String() string            { return proto.CompactTextString(m) }
+func (*BbbReply) ProtoMessage()               {}
+func (*BbbReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *BbbReply) GetDone() bool {
+	if m != nil {
+		return m.Done
+	}
+	return false
+}
+
+func init() {
+	proto.RegisterType((*BbbRequest)(nil), "the.bbb.package.BbbRequest")
+	proto.RegisterType((*BbbReply)(nil), "the.bbb.package.BbbReply")
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// Client API for BbbService service
+
+type BbbServiceClient interface {
+	Aaa(ctx context.Context, in *the_aaa_package.AaaRequest, opts ...grpc.CallOption) (*the_aaa_package.AaaReply, error)
+	Bbb(ctx context.Context, in *BbbRequest, opts ...grpc.CallOption) (*BbbReply, error)
+}
+
+type bbbServiceClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewBbbServiceClient(cc *grpc.ClientConn) BbbServiceClient {
+	return &bbbServiceClient{cc}
+}
+
+func (c *bbbServiceClient) Aaa(ctx context.Context, in *the_aaa_package.AaaRequest, opts ...grpc.CallOption) (*the_aaa_package.AaaReply, error) {
+	out := new(the_aaa_package.AaaReply)
+	err := grpc.Invoke(ctx, "/the.bbb.package.BbbService/Aaa", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *bbbServiceClient) Bbb(ctx context.Context, in *BbbRequest, opts ...grpc.CallOption) (*BbbReply, error) {
+	out := new(BbbReply)
+	err := grpc.Invoke(ctx, "/the.bbb.package.BbbService/Bbb", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for BbbService service
+
+type BbbServiceServer interface {
+	Aaa(context.Context, *the_aaa_package.AaaRequest) (*the_aaa_package.AaaReply, error)
+	Bbb(context.Context, *BbbRequest) (*BbbReply, error)
+}
+
+func RegisterBbbServiceServer(s *grpc.Server, srv BbbServiceServer) {
+	s.RegisterService(&_BbbService_serviceDesc, srv)
+}
+
+func _BbbService_Aaa_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(the_aaa_package.AaaRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BbbServiceServer).Aaa(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/the.bbb.package.BbbService/Aaa",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BbbServiceServer).Aaa(ctx, req.(*the_aaa_package.AaaRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _BbbService_Bbb_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(BbbRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(BbbServiceServer).Bbb(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/the.bbb.package.BbbService/Bbb",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(BbbServiceServer).Bbb(ctx, req.(*BbbRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _BbbService_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "the.bbb.package.BbbService",
+	HandlerType: (*BbbServiceServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Aaa",
+			Handler:    _BbbService_Aaa_Handler,
+		},
+		{
+			MethodName: "Bbb",
+			Handler:    _BbbService_Bbb_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "bbb/bbb.proto",
+}
+
+func init() { proto.RegisterFile("bbb/bbb.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 242 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x41, 0x4b, 0x03, 0x31,
+	0x10, 0x85, 0x59, 0x2a, 0xa5, 0x04, 0x8a, 0x90, 0x83, 0x68, 0x05, 0x91, 0xe2, 0xc1, 0xcb, 0x26,
+	0xa0, 0xe7, 0x1e, 0xba, 0x77, 0x11, 0xea, 0xcd, 0xdb, 0xcc, 0x76, 0x48, 0x17, 0x93, 0x9d, 0xd8,
+	0x9d, 0x88, 0xfd, 0x0b, 0xfe, 0x6a, 0xd9, 0x34, 0xa2, 0x60, 0x6f, 0x19, 0xde, 0xbc, 0xf7, 0xbd,
+	0x8c, 0x9a, 0x23, 0xa2, 0x45, 0x44, 0x13, 0xf7, 0x2c, 0xac, 0xcf, 0x65, 0x47, 0x26, 0x8f, 0xd0,
+	0xbe, 0x81, 0xa3, 0xc5, 0x1c, 0x00, 0x2c, 0x00, 0x1c, 0xf5, 0xe5, 0x9d, 0x52, 0x0d, 0xe2, 0x86,
+	0xde, 0x13, 0x0d, 0xa2, 0x2f, 0xd4, 0x94, 0x7a, 0x40, 0x4f, 0x97, 0xd5, 0x6d, 0x75, 0x3f, 0xdb,
+	0x94, 0x69, 0x79, 0xa3, 0x66, 0x79, 0x2b, 0xfa, 0x83, 0xd6, 0xea, 0x6c, 0xcb, 0xfd, 0xcf, 0x46,
+	0x7e, 0x3f, 0x7c, 0x55, 0x39, 0xe6, 0x85, 0xf6, 0x1f, 0x5d, 0x4b, 0x7a, 0xa5, 0x26, 0x6b, 0x00,
+	0x7d, 0x6d, 0x46, 0x78, 0x66, 0x1d, 0xe1, 0x66, 0x0d, 0x50, 0x50, 0x8b, 0xab, 0xd3, 0xe2, 0x48,
+	0x58, 0xa9, 0x49, 0x83, 0x58, 0xec, 0x7f, 0xba, 0x9b, 0xdf, 0xa6, 0xc5, 0xfe, 0x4f, 0x8c, 0xfe,
+	0xd0, 0x3c, 0xbf, 0x3e, 0xb9, 0x4e, 0x76, 0x09, 0x4d, 0xcb, 0xc1, 0x06, 0x4e, 0xde, 0xe6, 0xbf,
+	0xb6, 0xb5, 0xa3, 0xbe, 0x76, 0x2c, 0x14, 0xa2, 0x07, 0x21, 0x4b, 0x9f, 0x10, 0xa2, 0xa7, 0xc1,
+	0x0e, 0x5d, 0xef, 0x3c, 0xd5, 0x25, 0xa9, 0x0e, 0xbc, 0x25, 0xcb, 0x49, 0x62, 0x92, 0xf1, 0x92,
+	0x38, 0xcd, 0xf6, 0xc7, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xe1, 0x26, 0xcb, 0x5b, 0x01,
+	0x00, 0x00,
+}

examples/single-package-mode/output/bbb/service.go

@@ -0,0 +1,19 @@
+// file generated with protoc-gen-gotemplate
+package bbb
+
+import (
+	"fmt"
+
+	"golang.org/x/net/context"
+	"moul.io/protoc-gen-gotemplate/examples/single-package-mode/output/aaa"
+)
+
+type Service struct{}
+
+func (service Service) Aaa(ctx context.Context, input *aaa.AaaRequest) (*aaa.AaaReply, error) {
+	return nil, fmt.Errorf("method not implemented")
+}
+
+func (service Service) Bbb(ctx context.Context, input *BbbRequest) (*BbbReply, error) {
+	return nil, fmt.Errorf("method not implemented")
+}

examples/single-package-mode/proto/aaa/aaa.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+option go_package = "moul.io/protoc-gen-gotemplate/examples/single-package-mode/output/aaa";
+
+package the.aaa.package;
+
+message AaaRequest {
+  string blah = 1;
+}
+message AaaReply {
+  string error = 1;
+}

examples/single-package-mode/proto/bbb/bbb.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+
+package the.bbb.package;
+
+option go_package = "moul.io/protoc-gen-gotemplate/examples/single-package-mode/output/bbb";
+
+import "aaa/aaa.proto";
+
+service BbbService {
+  rpc Aaa(the.aaa.package.AaaRequest) returns (the.aaa.package.AaaReply);
+  rpc Bbb(BbbRequest) returns (BbbReply);
+}
+
+message BbbRequest {
+  bool enable = 1;
+}
+message BbbReply {
+  bool done = 1;
+}

examples/single-package-mode/templates/%7B%7B.File.Name%7Cdir%7D%7D/service.go.tmpl

@@ -0,0 +1,26 @@
+// file generated with protoc-gen-gotemplate
+package {{.File.Name | dir}}
+
+{{- $file := .File}}
+{{- $currentFile := $file.Name | getProtoFile}}
+
+import (
+	"fmt"
+
+	"golang.org/x/net/context"
+
+	{{- range .File.Dependency}}
+	{{- $dependency := . | getProtoFile}}
+	{{$dependency.GoPkg}}
+	{{end}}
+)
+
+type Service struct {}
+
+{{- range .Service.Method}}
+{{- $in := .InputType | getMessageType $file}}
+{{- $out := .OutputType | getMessageType $file}}
+func (service Service) {{.Name}}(ctx context.Context, input *{{$in.GoType $currentFile.GoPkg.Path}}) (*{{$out.GoType $currentFile.GoPkg.Path}}, error) {
+	return nil, fmt.Errorf("method not implemented")
+}
+{{end}}

examples/sitemap/Makefile

@@ -0,0 +1,3 @@
+.PHONY: build
+build:
+	protoc -I. --gotemplate_out=template_dir=.:. sitemap.proto

examples/sitemap/sitemap.proto

@@ -0,0 +1,12 @@
+syntax = "proto3";
+
+package sitemap;
+
+service DummyService {
+  rpc Posts(Request) returns (Response) {}
+  rpc Authors(Request) returns (Response) {}
+  rpc Comments(Request) returns (Response) {}
+}
+
+message Request {}
+message Response {}

examples/sitemap/sitemap.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>/posts</loc>
+    <priority>0.5</priority>
+    <changefreq>monthly</changefreq>
+    <lastmod>2017-05-19</lastmod>
+  </url>
+  <url>
+    <loc>/authors</loc>
+    <priority>0.5</priority>
+    <changefreq>monthly</changefreq>
+    <lastmod>2017-05-19</lastmod>
+  </url>
+  <url>
+    <loc>/comments</loc>
+    <priority>0.5</priority>
+    <changefreq>monthly</changefreq>
+    <lastmod>2017-05-19</lastmod>
+  </url>
+</urlset>