Rewrite simple test (only grpc output)

examples/js-grpc/templates/{{.File.Package}}/{{.File.Package}}_grpc_js.js.tmpl

@@ -3,6 +3,7 @@
 'use strict';
 var grpc = require('grpc');
 var {{$Package}}_pb = require('./{{$Package}}_pb.js');
+
 {{range .File.Service}}{{range .Method}}
 function serialize_{{$Package}}_{{.InputType | splitArray "." | last}}(arg) {
   if (!(arg instanceof {{$Package}}_pb.{{.InputType | splitArray "." | last}})) {
@@ -24,10 +25,12 @@ function serialize_{{$Package}}_{{.OutputType | splitArray "." | last}}(arg) {
 
 function deserialize_{{$Package}}_{{.OutputType | splitArray "." | last}}(buffer_arg) {
   return {{$Package}}_pb.{{.OutputType | splitArray "." | last}}.deserializeBinary(new Uint8Array(buffer_arg));
-}{{end}}{{end}}
+}
+{{end}}{{end}}
 {{range .File.Service}}
 var {{.Name}}Service = exports.{{.Name}}Service = {
-  {{$serviceName:=.Name}}{{range .Method}}{{.Name | lowerFirst}}: {
+  {{$serviceName:=.Name}}
+  {{range .Method}}{{.Name | lowerCamelCase}}: {
     path: '/{{$Package}}.{{$serviceName}}/{{.Name}}',
     requestStream: {{.ClientStreaming | default "false"}},
     responseStream: {{.ServerStreaming | default "false"}},
@@ -37,7 +40,8 @@ var {{.Name}}Service = exports.{{.Name}}Service = {
     requestDeserialize: deserialize_{{$Package}}_{{.InputType | splitArray "." | last}},
     responseSerialize: serialize_{{$Package}}_{{.OutputType | splitArray "." | last}},
     responseDeserialize: deserialize_{{$Package}}_{{.OutputType | splitArray "." | last}},
-  },{{end}}
+  },
+  {{end}}
 }
 
 exports.{{.Name}}Client = grpc.makeGenericClientConstructor({{.Name}}Service);{{end}}

examples/js-grpc/templates/{{.File.Package}}/{{.File.Package}}_pb.js.tmpl

@@ -1,148 +0,0 @@
-// GENERATED CODE -- DO NOT EDIT!
-{{$Package:=.File.Package}}
-var jspb = require('google-protobuf');
-var goog = jspb;
-var global = Function('return this')();
-{{range .File.MessageType}}
-goog.exportSymbol('proto.{{$Package}}.{{.Name}}', null, global);{{end}}
-{{range .File.MessageType}}
-/**
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.{{$Package}}.{{.Name}} = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.{{$Package}}.{{.Name}}, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.{{$Package}}.{{.Name}}.displayName = 'proto.{{$Package}}.{{.Name}}';
-}
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.{{$Package}}.{{.Name}}.prototype.toObject = function(opt_includeInstance) {
-  return proto.{{$Package}}.{{.Name}}.toObject(opt_includeInstance, this);
-};
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.{{$Package}}.{{.Name}}} msg The msg instance to transform.
- * @return {!Object}
- */
-proto.{{$Package}}.{{.Name}}.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    name: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.{{$Package}}.{{.Name}}}
- */
-proto.{{$Package}}.{{.Name}}.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.{{$Package}}.{{.Name}};
-  return proto.{{$Package}}.{{.Name}}.deserializeBinaryFromReader(msg, reader);
-};
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.{{$Package}}.{{.Name}}} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.{{$Package}}.{{.Name}}}
- */
-proto.{{$Package}}.{{.Name}}.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-/**
- * Class method variant: serializes the given message to binary data
- * (in protobuf wire format), writing to the given BinaryWriter.
- * @param {!proto.{{$Package}}.{{.Name}}} message
- * @param {!jspb.BinaryWriter} writer
- */
-proto.{{$Package}}.{{.Name}}.serializeBinaryToWriter = function(message, writer) {
-  message.serializeBinaryToWriter(writer);
-};
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.{{$Package}}.{{.Name}}.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  this.serializeBinaryToWriter(writer);
-  return writer.getResultBuffer();
-};
-
-{{range .Field}}
-/**
- * Serializes the message to binary data (in protobuf wire format),
- * writing to the given BinaryWriter.
- * @param {!jspb.BinaryWriter} writer
- */
-proto.{{$Package}}.{{.Name}}.prototype.serializeBinaryToWriter = function (writer) {
-  var f = undefined;
-  f = this.get{{.Name | upperFirst}}();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-/**
- * optional string name = 1;
- * @return {string}
- */
-proto.{{$Package}}.{{.Name}}.prototype.get{{.Name | upperFirst}} = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-/** @param {string} value */
-proto.{{$Package}}.{{.Name}}.prototype.set{{.Name | upperFirst}} = function(value) {
-  jspb.Message.setField(this, 1, value);
-};
-{{end}}{{end}}
-goog.object.extend(exports, proto.{{$Package}});