Fix invalid paths in Plugin/Templates

timburks · timburks · commit 2423458b6190 · 2017-04-28T14:52:52.000-07:00
diff --git a/Plugin/Sources/protoc-gen-swiftgrpc/templates.swift b/Plugin/Sources/protoc-gen-swiftgrpc/templates.swift
@@ -37,9 +37,9 @@
 func loadTemplates() -> [String:String] {
   var templates : [String:String] = [:]
 
-  templates["client-call-bidistreaming.swift"] = "Ly8vIHt7IG1ldGhvZC5uYW1lIH19IChCaWRpcmVjdGlvbmFsIFN0cmVhbWluZykKcHVibGljIGNsYXNzIHt7IC58Y2FsbDpmaWxlLHNlcnZpY2UsbWV0aG9kIH19IHsKICBwcml2YXRlIHZhciBjYWxsIDogQ2FsbAoKICAvLy8gQ3JlYXRlIGEgY2FsbC4KICBmaWxlcHJpdmF0ZSBpbml0KF8gY2hhbm5lbDogQ2hhbm5lbCkgewogICAgc2VsZi5jYWxsID0gY2hhbm5lbC5tYWtlQ2FsbCgie3sgLnxwYXRoOmZpbGUsc2VydmljZSxtZXRob2QgfX0iKQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byBzdGFydCBhIGNhbGwuIE5vbmJsb2NraW5nLgogIGZpbGVwcml2YXRlIGZ1bmMgc3RhcnQobWV0YWRhdGE6TWV0YWRhdGEsIGNvbXBsZXRpb246QGVzY2FwaW5nIChDYWxsUmVzdWx0KS0+KCkpCiAgICB0aHJvd3MgLT4ge3sgLnxjYWxsOmZpbGUsc2VydmljZSxtZXRob2QgfX0gewogICAgICB0cnkgc2VsZi5jYWxsLnN0YXJ0KC5iaWRpU3RyZWFtaW5nLCBtZXRhZGF0YTptZXRhZGF0YSwgY29tcGxldGlvbjpjb21wbGV0aW9uKQogICAgICByZXR1cm4gc2VsZgogIH0KCiAgLy8vIENhbGwgdGhpcyB0byB3YWl0IGZvciBhIHJlc3VsdC4gQmxvY2tpbmcuCiAgcHVibGljIGZ1bmMgcmVjZWl2ZSgpIHRocm93cyAtPiB7eyBtZXRob2R8b3V0cHV0IH19IHsKICAgIHZhciByZXR1cm5FcnJvciA6IHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19PwogICAgdmFyIHJldHVybk1lc3NhZ2UgOiB7eyBtZXRob2R8b3V0cHV0IH19IQogICAgbGV0IHNlbSA9IERpc3BhdGNoU2VtYXBob3JlKHZhbHVlOiAwKQogICAgZG8gewogICAgICB0cnkgcmVjZWl2ZSgpIHtyZXNwb25zZSwgZXJyb3IgaW4KICAgICAgICByZXR1cm5NZXNzYWdlID0gcmVzcG9uc2UKICAgICAgICByZXR1cm5FcnJvciA9IGVycm9yCiAgICAgICAgc2VtLnNpZ25hbCgpCiAgICAgIH0KICAgICAgXyA9IHNlbS53YWl0KHRpbWVvdXQ6IERpc3BhdGNoVGltZS5kaXN0YW50RnV0dXJlKQogICAgfQogICAgaWYgbGV0IHJldHVybkVycm9yID0gcmV0dXJuRXJyb3IgewogICAgICB0aHJvdyByZXR1cm5FcnJvcgogICAgfQogICAgcmV0dXJuIHJldHVybk1lc3NhZ2UKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gd2FpdCBmb3IgYSByZXN1bHQuIE5vbmJsb2NraW5nLgogIHB1YmxpYyBmdW5jIHJlY2VpdmUoY29tcGxldGlvbjpAZXNjYXBpbmcgKHt7IG1ldGhvZHxvdXRwdXQgfX0/LCB7eyAufGNsaWVudGVycm9yOmZpbGUsc2VydmljZSB9fT8pLT4oKSkgdGhyb3dzIHsKICAgIGRvIHsKICAgICAgdHJ5IGNhbGwucmVjZWl2ZU1lc3NhZ2UoKSB7KGRhdGEpIGluCiAgICAgICAgaWYgbGV0IGRhdGEgPSBkYXRhIHsKICAgICAgICAgIGlmIGxldCByZXR1cm5NZXNzYWdlID0gdHJ5PyB7eyBtZXRob2R8b3V0cHV0IH19KHNlcmlhbGl6ZWREYXRhOmRhdGEpIHsKICAgICAgICAgICAgY29tcGxldGlvbihyZXR1cm5NZXNzYWdlLCBuaWwpCiAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICBjb21wbGV0aW9uKG5pbCwge3sgLnxjbGllbnRlcnJvcjpmaWxlLHNlcnZpY2UgfX0uaW52YWxpZE1lc3NhZ2VSZWNlaXZlZCkKICAgICAgICAgIH0KICAgICAgICB9IGVsc2UgewogICAgICAgICAgY29tcGxldGlvbihuaWwsIHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19LmVuZE9mU3RyZWFtKQogICAgICAgIH0KICAgICAgfQogICAgfQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byBzZW5kIGVhY2ggbWVzc2FnZSBpbiB0aGUgcmVxdWVzdCBzdHJlYW0uCiAgcHVibGljIGZ1bmMgc2VuZChfIG1lc3NhZ2U6RWNob19FY2hvUmVxdWVzdCwgZXJyb3JIYW5kbGVyOkBlc2NhcGluZyAoRXJyb3IpLT4oKSkgdGhyb3dzIHsKICAgIGxldCBtZXNzYWdlRGF0YSA9IHRyeSBtZXNzYWdlLnNlcmlhbGl6ZWREYXRhKCkKICAgIHRyeSBjYWxsLnNlbmRNZXNzYWdlKGRhdGE6bWVzc2FnZURhdGEsIGVycm9ySGFuZGxlcjplcnJvckhhbmRsZXIpCiAgfQoKICAvLy8gQ2FsbCB0aGlzIHRvIGNsb3NlIHRoZSBzZW5kaW5nIGNvbm5lY3Rpb24uIEJsb2NraW5nLgogIHB1YmxpYyBmdW5jIGNsb3NlU2VuZCgpIHRocm93cyB7CiAgICBsZXQgc2VtID0gRGlzcGF0Y2hTZW1hcGhvcmUodmFsdWU6IDApCiAgICB0cnkgY2xvc2VTZW5kKCkgewogICAgICBzZW0uc2lnbmFsKCkKICAgIH0KICAgIF8gPSBzZW0ud2FpdCh0aW1lb3V0OiBEaXNwYXRjaFRpbWUuZGlzdGFudEZ1dHVyZSkKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gY2xvc2UgdGhlIHNlbmRpbmcgY29ubmVjdGlvbi4gTm9uYmxvY2tpbmcuCiAgcHVibGljIGZ1bmMgY2xvc2VTZW5kKGNvbXBsZXRpb246QGVzY2FwaW5nICgpLT4oKSkgdGhyb3dzIHsKICAgIHRyeSBjYWxsLmNsb3NlKCkgewogICAgICBjb21wbGV0aW9uKCkKICAgIH0KICB9Cn0K"
+  templates["client-call-bidistreaming.swift"] = "Ly8vIHt7IG1ldGhvZC5uYW1lIH19IChCaWRpcmVjdGlvbmFsIFN0cmVhbWluZykKcHVibGljIGNsYXNzIHt7IC58Y2FsbDpmaWxlLHNlcnZpY2UsbWV0aG9kIH19IHsKICBwcml2YXRlIHZhciBjYWxsIDogQ2FsbAoKICAvLy8gQ3JlYXRlIGEgY2FsbC4KICBmaWxlcHJpdmF0ZSBpbml0KF8gY2hhbm5lbDogQ2hhbm5lbCkgewogICAgc2VsZi5jYWxsID0gY2hhbm5lbC5tYWtlQ2FsbCgie3sgLnxwYXRoOmZpbGUsc2VydmljZSxtZXRob2QgfX0iKQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byBzdGFydCBhIGNhbGwuIE5vbmJsb2NraW5nLgogIGZpbGVwcml2YXRlIGZ1bmMgc3RhcnQobWV0YWRhdGE6TWV0YWRhdGEsIGNvbXBsZXRpb246QGVzY2FwaW5nIChDYWxsUmVzdWx0KS0+KCkpCiAgICB0aHJvd3MgLT4ge3sgLnxjYWxsOmZpbGUsc2VydmljZSxtZXRob2QgfX0gewogICAgICB0cnkgc2VsZi5jYWxsLnN0YXJ0KC5iaWRpU3RyZWFtaW5nLCBtZXRhZGF0YTptZXRhZGF0YSwgY29tcGxldGlvbjpjb21wbGV0aW9uKQogICAgICByZXR1cm4gc2VsZgogIH0KCiAgLy8vIENhbGwgdGhpcyB0byB3YWl0IGZvciBhIHJlc3VsdC4gQmxvY2tpbmcuCiAgcHVibGljIGZ1bmMgcmVjZWl2ZSgpIHRocm93cyAtPiB7eyBtZXRob2R8b3V0cHV0IH19IHsKICAgIHZhciByZXR1cm5FcnJvciA6IHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19PwogICAgdmFyIHJldHVybk1lc3NhZ2UgOiB7eyBtZXRob2R8b3V0cHV0IH19IQogICAgbGV0IHNlbSA9IERpc3BhdGNoU2VtYXBob3JlKHZhbHVlOiAwKQogICAgZG8gewogICAgICB0cnkgcmVjZWl2ZSgpIHtyZXNwb25zZSwgZXJyb3IgaW4KICAgICAgICByZXR1cm5NZXNzYWdlID0gcmVzcG9uc2UKICAgICAgICByZXR1cm5FcnJvciA9IGVycm9yCiAgICAgICAgc2VtLnNpZ25hbCgpCiAgICAgIH0KICAgICAgXyA9IHNlbS53YWl0KHRpbWVvdXQ6IERpc3BhdGNoVGltZS5kaXN0YW50RnV0dXJlKQogICAgfQogICAgaWYgbGV0IHJldHVybkVycm9yID0gcmV0dXJuRXJyb3IgewogICAgICB0aHJvdyByZXR1cm5FcnJvcgogICAgfQogICAgcmV0dXJuIHJldHVybk1lc3NhZ2UKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gd2FpdCBmb3IgYSByZXN1bHQuIE5vbmJsb2NraW5nLgogIHB1YmxpYyBmdW5jIHJlY2VpdmUoY29tcGxldGlvbjpAZXNjYXBpbmcgKHt7IG1ldGhvZHxvdXRwdXQgfX0/LCB7eyAufGNsaWVudGVycm9yOmZpbGUsc2VydmljZSB9fT8pLT4oKSkgdGhyb3dzIHsKICAgIGRvIHsKICAgICAgdHJ5IGNhbGwucmVjZWl2ZU1lc3NhZ2UoKSB7KGRhdGEpIGluCiAgICAgICAgaWYgbGV0IGRhdGEgPSBkYXRhIHsKICAgICAgICAgIGlmIGxldCByZXR1cm5NZXNzYWdlID0gdHJ5PyB7eyBtZXRob2R8b3V0cHV0IH19KHNlcmlhbGl6ZWREYXRhOmRhdGEpIHsKICAgICAgICAgICAgY29tcGxldGlvbihyZXR1cm5NZXNzYWdlLCBuaWwpCiAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICBjb21wbGV0aW9uKG5pbCwge3sgLnxjbGllbnRlcnJvcjpmaWxlLHNlcnZpY2UgfX0uaW52YWxpZE1lc3NhZ2VSZWNlaXZlZCkKICAgICAgICAgIH0KICAgICAgICB9IGVsc2UgewogICAgICAgICAgY29tcGxldGlvbihuaWwsIHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19LmVuZE9mU3RyZWFtKQogICAgICAgIH0KICAgICAgfQogICAgfQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byBzZW5kIGVhY2ggbWVzc2FnZSBpbiB0aGUgcmVxdWVzdCBzdHJlYW0uCiAgcHVibGljIGZ1bmMgc2VuZChfIG1lc3NhZ2U6e3sgbWV0aG9kfGlucHV0IH19LCBlcnJvckhhbmRsZXI6QGVzY2FwaW5nIChFcnJvciktPigpKSB0aHJvd3MgewogICAgbGV0IG1lc3NhZ2VEYXRhID0gdHJ5IG1lc3NhZ2Uuc2VyaWFsaXplZERhdGEoKQogICAgdHJ5IGNhbGwuc2VuZE1lc3NhZ2UoZGF0YTptZXNzYWdlRGF0YSwgZXJyb3JIYW5kbGVyOmVycm9ySGFuZGxlcikKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gY2xvc2UgdGhlIHNlbmRpbmcgY29ubmVjdGlvbi4gQmxvY2tpbmcuCiAgcHVibGljIGZ1bmMgY2xvc2VTZW5kKCkgdGhyb3dzIHsKICAgIGxldCBzZW0gPSBEaXNwYXRjaFNlbWFwaG9yZSh2YWx1ZTogMCkKICAgIHRyeSBjbG9zZVNlbmQoKSB7CiAgICAgIHNlbS5zaWduYWwoKQogICAgfQogICAgXyA9IHNlbS53YWl0KHRpbWVvdXQ6IERpc3BhdGNoVGltZS5kaXN0YW50RnV0dXJlKQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byBjbG9zZSB0aGUgc2VuZGluZyBjb25uZWN0aW9uLiBOb25ibG9ja2luZy4KICBwdWJsaWMgZnVuYyBjbG9zZVNlbmQoY29tcGxldGlvbjpAZXNjYXBpbmcgKCktPigpKSB0aHJvd3MgewogICAgdHJ5IGNhbGwuY2xvc2UoKSB7CiAgICAgIGNvbXBsZXRpb24oKQogICAgfQogIH0KfQo="
 
-  templates["client-call-clientstreaming.swift"] = "Ly8vIHt7IG1ldGhvZC5uYW1lIH19IChDbGllbnQgU3RyZWFtaW5nKQpwdWJsaWMgY2xhc3Mge3sgLnxjYWxsOmZpbGUsc2VydmljZSxtZXRob2QgfX0gewogIHByaXZhdGUgdmFyIGNhbGwgOiBDYWxsCgogIC8vLyBDcmVhdGUgYSBjYWxsLgogIGZpbGVwcml2YXRlIGluaXQoXyBjaGFubmVsOiBDaGFubmVsKSB7CiAgICBzZWxmLmNhbGwgPSBjaGFubmVsLm1ha2VDYWxsKCJ7eyAufHBhdGg6ZmlsZSxzZXJ2aWNlLG1ldGhvZCB9fSIpCiAgfQoKICAvLy8gQ2FsbCB0aGlzIHRvIHN0YXJ0IGEgY2FsbC4gTm9uYmxvY2tpbmcuCiAgZmlsZXByaXZhdGUgZnVuYyBzdGFydChtZXRhZGF0YTpNZXRhZGF0YSwgY29tcGxldGlvbjpAZXNjYXBpbmcgKENhbGxSZXN1bHQpLT4oKSkKICAgIHRocm93cyAtPiB7eyAufGNhbGw6ZmlsZSxzZXJ2aWNlLG1ldGhvZCB9fSB7CiAgICAgIHRyeSBzZWxmLmNhbGwuc3RhcnQoLmNsaWVudFN0cmVhbWluZywgbWV0YWRhdGE6bWV0YWRhdGEsIGNvbXBsZXRpb246Y29tcGxldGlvbikKICAgICAgcmV0dXJuIHNlbGYKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gc2VuZCBlYWNoIG1lc3NhZ2UgaW4gdGhlIHJlcXVlc3Qgc3RyZWFtLiBOb25ibG9ja2luZy4KICBwdWJsaWMgZnVuYyBzZW5kKF8gbWVzc2FnZTpFY2hvX0VjaG9SZXF1ZXN0LCBlcnJvckhhbmRsZXI6QGVzY2FwaW5nIChFcnJvciktPigpKSB0aHJvd3MgewogICAgbGV0IG1lc3NhZ2VEYXRhID0gdHJ5IG1lc3NhZ2Uuc2VyaWFsaXplZERhdGEoKQogICAgdHJ5IGNhbGwuc2VuZE1lc3NhZ2UoZGF0YTptZXNzYWdlRGF0YSwgZXJyb3JIYW5kbGVyOmVycm9ySGFuZGxlcikKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gY2xvc2UgdGhlIGNvbm5lY3Rpb24gYW5kIHdhaXQgZm9yIGEgcmVzcG9uc2UuIEJsb2NraW5nLgogIHB1YmxpYyBmdW5jIGNsb3NlQW5kUmVjZWl2ZSgpIHRocm93cyAtPiB7eyBtZXRob2R8b3V0cHV0IH19IHsKICAgIHZhciByZXR1cm5FcnJvciA6IHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19PwogICAgdmFyIHJldHVyblJlc3BvbnNlIDoge3sgbWV0aG9kfG91dHB1dCB9fSEKICAgIGxldCBzZW0gPSBEaXNwYXRjaFNlbWFwaG9yZSh2YWx1ZTogMCkKICAgIGRvIHsKICAgICAgdHJ5IGNsb3NlQW5kUmVjZWl2ZSgpIHtyZXNwb25zZSwgZXJyb3IgaW4KICAgICAgICByZXR1cm5SZXNwb25zZSA9IHJlc3BvbnNlCiAgICAgICAgcmV0dXJuRXJyb3IgPSBlcnJvcgogICAgICAgIHNlbS5zaWduYWwoKQogICAgICB9CiAgICAgIF8gPSBzZW0ud2FpdCh0aW1lb3V0OiBEaXNwYXRjaFRpbWUuZGlzdGFudEZ1dHVyZSkKICAgIH0gY2F0Y2ggKGxldCBlcnJvcikgewogICAgICB0aHJvdyBlcnJvcgogICAgfQogICAgaWYgbGV0IHJldHVybkVycm9yID0gcmV0dXJuRXJyb3IgewogICAgICB0aHJvdyByZXR1cm5FcnJvcgogICAgfQogICAgcmV0dXJuIHJldHVyblJlc3BvbnNlCiAgfQoKICAvLy8gQ2FsbCB0aGlzIHRvIGNsb3NlIHRoZSBjb25uZWN0aW9uIGFuZCB3YWl0IGZvciBhIHJlc3BvbnNlLiBOb25ibG9ja2luZy4KICBwdWJsaWMgZnVuYyBjbG9zZUFuZFJlY2VpdmUoY29tcGxldGlvbjpAZXNjYXBpbmcgKHt7IG1ldGhvZHxvdXRwdXQgfX0/LCB7eyAufGNsaWVudGVycm9yOmZpbGUsc2VydmljZSB9fT8pLT4oKSkKICAgIHRocm93cyB7CiAgICAgIGRvIHsKICAgICAgICB0cnkgY2FsbC5yZWNlaXZlTWVzc2FnZSgpIHsocmVzcG9uc2VEYXRhKSBpbgogICAgICAgICAgaWYgbGV0IHJlc3BvbnNlRGF0YSA9IHJlc3BvbnNlRGF0YSwKICAgICAgICAgICAgbGV0IHJlc3BvbnNlID0gdHJ5PyB7eyBtZXRob2R8b3V0cHV0IH19KHNlcmlhbGl6ZWREYXRhOnJlc3BvbnNlRGF0YSkgewogICAgICAgICAgICBjb21wbGV0aW9uKHJlc3BvbnNlLCBuaWwpCiAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICBjb21wbGV0aW9uKG5pbCwge3sgLnxjbGllbnRlcnJvcjpmaWxlLHNlcnZpY2UgfX0uaW52YWxpZE1lc3NhZ2VSZWNlaXZlZCkKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgICAgdHJ5IGNhbGwuY2xvc2UoY29tcGxldGlvbjp7fSkKICAgICAgfSBjYXRjaCAobGV0IGVycm9yKSB7CiAgICAgICAgdGhyb3cgZXJyb3IKICAgICAgfQogIH0KfQo="
+  templates["client-call-clientstreaming.swift"] = "Ly8vIHt7IG1ldGhvZC5uYW1lIH19IChDbGllbnQgU3RyZWFtaW5nKQpwdWJsaWMgY2xhc3Mge3sgLnxjYWxsOmZpbGUsc2VydmljZSxtZXRob2QgfX0gewogIHByaXZhdGUgdmFyIGNhbGwgOiBDYWxsCgogIC8vLyBDcmVhdGUgYSBjYWxsLgogIGZpbGVwcml2YXRlIGluaXQoXyBjaGFubmVsOiBDaGFubmVsKSB7CiAgICBzZWxmLmNhbGwgPSBjaGFubmVsLm1ha2VDYWxsKCJ7eyAufHBhdGg6ZmlsZSxzZXJ2aWNlLG1ldGhvZCB9fSIpCiAgfQoKICAvLy8gQ2FsbCB0aGlzIHRvIHN0YXJ0IGEgY2FsbC4gTm9uYmxvY2tpbmcuCiAgZmlsZXByaXZhdGUgZnVuYyBzdGFydChtZXRhZGF0YTpNZXRhZGF0YSwgY29tcGxldGlvbjpAZXNjYXBpbmcgKENhbGxSZXN1bHQpLT4oKSkKICAgIHRocm93cyAtPiB7eyAufGNhbGw6ZmlsZSxzZXJ2aWNlLG1ldGhvZCB9fSB7CiAgICAgIHRyeSBzZWxmLmNhbGwuc3RhcnQoLmNsaWVudFN0cmVhbWluZywgbWV0YWRhdGE6bWV0YWRhdGEsIGNvbXBsZXRpb246Y29tcGxldGlvbikKICAgICAgcmV0dXJuIHNlbGYKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gc2VuZCBlYWNoIG1lc3NhZ2UgaW4gdGhlIHJlcXVlc3Qgc3RyZWFtLiBOb25ibG9ja2luZy4KICBwdWJsaWMgZnVuYyBzZW5kKF8gbWVzc2FnZTp7eyBtZXRob2R8aW5wdXQgfX0sIGVycm9ySGFuZGxlcjpAZXNjYXBpbmcgKEVycm9yKS0+KCkpIHRocm93cyB7CiAgICBsZXQgbWVzc2FnZURhdGEgPSB0cnkgbWVzc2FnZS5zZXJpYWxpemVkRGF0YSgpCiAgICB0cnkgY2FsbC5zZW5kTWVzc2FnZShkYXRhOm1lc3NhZ2VEYXRhLCBlcnJvckhhbmRsZXI6ZXJyb3JIYW5kbGVyKQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byBjbG9zZSB0aGUgY29ubmVjdGlvbiBhbmQgd2FpdCBmb3IgYSByZXNwb25zZS4gQmxvY2tpbmcuCiAgcHVibGljIGZ1bmMgY2xvc2VBbmRSZWNlaXZlKCkgdGhyb3dzIC0+IHt7IG1ldGhvZHxvdXRwdXQgfX0gewogICAgdmFyIHJldHVybkVycm9yIDoge3sgLnxjbGllbnRlcnJvcjpmaWxlLHNlcnZpY2UgfX0/CiAgICB2YXIgcmV0dXJuUmVzcG9uc2UgOiB7eyBtZXRob2R8b3V0cHV0IH19IQogICAgbGV0IHNlbSA9IERpc3BhdGNoU2VtYXBob3JlKHZhbHVlOiAwKQogICAgZG8gewogICAgICB0cnkgY2xvc2VBbmRSZWNlaXZlKCkge3Jlc3BvbnNlLCBlcnJvciBpbgogICAgICAgIHJldHVyblJlc3BvbnNlID0gcmVzcG9uc2UKICAgICAgICByZXR1cm5FcnJvciA9IGVycm9yCiAgICAgICAgc2VtLnNpZ25hbCgpCiAgICAgIH0KICAgICAgXyA9IHNlbS53YWl0KHRpbWVvdXQ6IERpc3BhdGNoVGltZS5kaXN0YW50RnV0dXJlKQogICAgfSBjYXRjaCAobGV0IGVycm9yKSB7CiAgICAgIHRocm93IGVycm9yCiAgICB9CiAgICBpZiBsZXQgcmV0dXJuRXJyb3IgPSByZXR1cm5FcnJvciB7CiAgICAgIHRocm93IHJldHVybkVycm9yCiAgICB9CiAgICByZXR1cm4gcmV0dXJuUmVzcG9uc2UKICB9CgogIC8vLyBDYWxsIHRoaXMgdG8gY2xvc2UgdGhlIGNvbm5lY3Rpb24gYW5kIHdhaXQgZm9yIGEgcmVzcG9uc2UuIE5vbmJsb2NraW5nLgogIHB1YmxpYyBmdW5jIGNsb3NlQW5kUmVjZWl2ZShjb21wbGV0aW9uOkBlc2NhcGluZyAoe3sgbWV0aG9kfG91dHB1dCB9fT8sIHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19PyktPigpKQogICAgdGhyb3dzIHsKICAgICAgZG8gewogICAgICAgIHRyeSBjYWxsLnJlY2VpdmVNZXNzYWdlKCkgeyhyZXNwb25zZURhdGEpIGluCiAgICAgICAgICBpZiBsZXQgcmVzcG9uc2VEYXRhID0gcmVzcG9uc2VEYXRhLAogICAgICAgICAgICBsZXQgcmVzcG9uc2UgPSB0cnk/IHt7IG1ldGhvZHxvdXRwdXQgfX0oc2VyaWFsaXplZERhdGE6cmVzcG9uc2VEYXRhKSB7CiAgICAgICAgICAgIGNvbXBsZXRpb24ocmVzcG9uc2UsIG5pbCkKICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgIGNvbXBsZXRpb24obmlsLCB7eyAufGNsaWVudGVycm9yOmZpbGUsc2VydmljZSB9fS5pbnZhbGlkTWVzc2FnZVJlY2VpdmVkKQogICAgICAgICAgfQogICAgICAgIH0KICAgICAgICB0cnkgY2FsbC5jbG9zZShjb21wbGV0aW9uOnt9KQogICAgICB9IGNhdGNoIChsZXQgZXJyb3IpIHsKICAgICAgICB0aHJvdyBlcnJvcgogICAgICB9CiAgfQp9Cg=="
 
   templates["client-call-serverstreaming.swift"] = "Ly8vIHt7IG1ldGhvZC5uYW1lIH19IChTZXJ2ZXIgU3RyZWFtaW5nKQpwdWJsaWMgY2xhc3Mge3sgLnxjYWxsOmZpbGUsc2VydmljZSxtZXRob2QgfX0gewogIHByaXZhdGUgdmFyIGNhbGwgOiBDYWxsCgogIC8vLyBDcmVhdGUgYSBjYWxsLgogIGZpbGVwcml2YXRlIGluaXQoXyBjaGFubmVsOiBDaGFubmVsKSB7CiAgICBzZWxmLmNhbGwgPSBjaGFubmVsLm1ha2VDYWxsKCJ7eyAufHBhdGg6ZmlsZSxzZXJ2aWNlLG1ldGhvZCB9fSIpCiAgfQoKICAvLy8gQ2FsbCB0aGlzIG9uY2Ugd2l0aCB0aGUgbWVzc2FnZSB0byBzZW5kLiBOb25ibG9ja2luZy4KICBmaWxlcHJpdmF0ZSBmdW5jIHN0YXJ0KHJlcXVlc3Q6IHt7IG1ldGhvZHxpbnB1dCB9fSwKICAgICAgICAgICAgICAgICAgICAgICAgIG1ldGFkYXRhOiBNZXRhZGF0YSwKICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBsZXRpb246IEBlc2NhcGluZyAoQ2FsbFJlc3VsdCkgLT4gKCkpCiAgICB0aHJvd3MgLT4ge3sgLnxjYWxsOmZpbGUsc2VydmljZSxtZXRob2QgfX0gewogICAgICBsZXQgcmVxdWVzdERhdGEgPSB0cnkgcmVxdWVzdC5zZXJpYWxpemVkRGF0YSgpCiAgICAgIHRyeSBjYWxsLnN0YXJ0KC5zZXJ2ZXJTdHJlYW1pbmcsCiAgICAgICAgICAgICAgICAgICAgIG1ldGFkYXRhOm1ldGFkYXRhLAogICAgICAgICAgICAgICAgICAgICBtZXNzYWdlOnJlcXVlc3REYXRhLAogICAgICAgICAgICAgICAgICAgICBjb21wbGV0aW9uOmNvbXBsZXRpb24pCiAgICAgIHJldHVybiBzZWxmCiAgfQoKICAvLy8gQ2FsbCB0aGlzIHRvIHdhaXQgZm9yIGEgcmVzdWx0LiBCbG9ja2luZy4KICBwdWJsaWMgZnVuYyByZWNlaXZlKCkgdGhyb3dzIC0+IHt7IG1ldGhvZHxvdXRwdXQgfX0gewogICAgdmFyIHJldHVybkVycm9yIDoge3sgLnxjbGllbnRlcnJvcjpmaWxlLHNlcnZpY2UgfX0/CiAgICB2YXIgcmV0dXJuUmVzcG9uc2UgOiB7eyBtZXRob2R8b3V0cHV0IH19IQogICAgbGV0IHNlbSA9IERpc3BhdGNoU2VtYXBob3JlKHZhbHVlOiAwKQogICAgZG8gewogICAgICB0cnkgcmVjZWl2ZSgpIHtyZXNwb25zZSwgZXJyb3IgaW4KICAgICAgICByZXR1cm5SZXNwb25zZSA9IHJlc3BvbnNlCiAgICAgICAgcmV0dXJuRXJyb3IgPSBlcnJvcgogICAgICAgIHNlbS5zaWduYWwoKQogICAgICB9CiAgICAgIF8gPSBzZW0ud2FpdCh0aW1lb3V0OiBEaXNwYXRjaFRpbWUuZGlzdGFudEZ1dHVyZSkKICAgIH0KICAgIGlmIGxldCByZXR1cm5FcnJvciA9IHJldHVybkVycm9yIHsKICAgICAgdGhyb3cgcmV0dXJuRXJyb3IKICAgIH0KICAgIHJldHVybiByZXR1cm5SZXNwb25zZQogIH0KCiAgLy8vIENhbGwgdGhpcyB0byB3YWl0IGZvciBhIHJlc3VsdC4gTm9uYmxvY2tpbmcuCiAgcHVibGljIGZ1bmMgcmVjZWl2ZShjb21wbGV0aW9uOkBlc2NhcGluZyAoe3sgbWV0aG9kfG91dHB1dCB9fT8sIHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19PyktPigpKSB0aHJvd3MgewogICAgZG8gewogICAgICB0cnkgY2FsbC5yZWNlaXZlTWVzc2FnZSgpIHsocmVzcG9uc2VEYXRhKSBpbgogICAgICAgIGlmIGxldCByZXNwb25zZURhdGEgPSByZXNwb25zZURhdGEgewogICAgICAgICAgaWYgbGV0IHJlc3BvbnNlID0gdHJ5PyB7eyBtZXRob2R8b3V0cHV0IH19KHNlcmlhbGl6ZWREYXRhOnJlc3BvbnNlRGF0YSkgewogICAgICAgICAgICBjb21wbGV0aW9uKHJlc3BvbnNlLCBuaWwpCiAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICBjb21wbGV0aW9uKG5pbCwge3sgLnxjbGllbnRlcnJvcjpmaWxlLHNlcnZpY2UgfX0uaW52YWxpZE1lc3NhZ2VSZWNlaXZlZCkKICAgICAgICAgIH0KICAgICAgICB9IGVsc2UgewogICAgICAgICAgY29tcGxldGlvbihuaWwsIHt7IC58Y2xpZW50ZXJyb3I6ZmlsZSxzZXJ2aWNlIH19LmVuZE9mU3RyZWFtKQogICAgICAgIH0KICAgICAgfQogICAgfQogIH0KfQo="
 
diff --git a/Plugin/Templates/client-call-bidistreaming.swift b/Plugin/Templates/client-call-bidistreaming.swift
@@ -51,7 +51,7 @@ public class {{ .|call:file,service,method }} {
   }
 
   /// Call this to send each message in the request stream.
-  public func send(_ message:Echo_EchoRequest, errorHandler:@escaping (Error)->()) throws {
+  public func send(_ message:{{ method|input }}, errorHandler:@escaping (Error)->()) throws {
     let messageData = try message.serializedData()
     try call.sendMessage(data:messageData, errorHandler:errorHandler)
   }
diff --git a/Plugin/Templates/client-call-clientstreaming.swift b/Plugin/Templates/client-call-clientstreaming.swift
@@ -15,7 +15,7 @@ public class {{ .|call:file,service,method }} {
   }
 
   /// Call this to send each message in the request stream. Nonblocking.
-  public func send(_ message:Echo_EchoRequest, errorHandler:@escaping (Error)->()) throws {
+  public func send(_ message:{{ method|input }}, errorHandler:@escaping (Error)->()) throws {
     let messageData = try message.serializedData()
     try call.sendMessage(data:messageData, errorHandler:errorHandler)
   }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class {{ .\|call:file,service,method }} {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/// Call this to send each message in the request stream.`
`54`		`- public func send(_ message:Echo_EchoRequest, errorHandler:@escaping (Error)->()) throws {`
	`54`	`+ public func send(_ message:{{ method\|input }}, errorHandler:@escaping (Error)->()) throws {`
`55`	`55`	`let messageData = try message.serializedData()`
`56`	`56`	`try call.sendMessage(data:messageData, errorHandler:errorHandler)`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class {{ .\|call:file,service,method }} {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/// Call this to send each message in the request stream. Nonblocking.`
`18`		`- public func send(_ message:Echo_EchoRequest, errorHandler:@escaping (Error)->()) throws {`
	`18`	`+ public func send(_ message:{{ method\|input }}, errorHandler:@escaping (Error)->()) throws {`
`19`	`19`	`let messageData = try message.serializedData()`
`20`	`20`	`try call.sendMessage(data:messageData, errorHandler:errorHandler)`
`21`	`21`	`}`