Fix static codegen issues with uglifyjs3; New: Explicitly define service method names when generating static code, see #857

Author: dcodeIO

cli/targets/static.js

@@ -172,12 +172,9 @@ var shortVars = {
 function beautifyCode(code) {
     // Add semicolons
     code = UglifyJS.minify(code, {
-        fromString: true,
         compress: false,
         mangle: false,
-        output: {
-            beautify: true
-        }
+        output: { beautify: true }
     }).code;
     // Properly beautify
     var ast = espree.parse(code);
@@ -653,11 +650,11 @@ function buildService(ref, service) {
             "@returns {undefined}",
             "@variation 1"
         ]);
-        push(escapeName(service.name) + ".prototype" + util.safeProp(lcName) + " = function " + escapeName(lcName) + "(request, callback) {");
+        push("Object.defineProperty(" + escapeName(service.name) + ".prototype" + util.safeProp(lcName) + " = function " + escapeName(lcName) + "(request, callback) {");
             ++indent;
             push("return this.rpcCall(" + escapeName(lcName) + ", $root." + exportName(method.resolvedRequestType) + ", $root." + exportName(method.resolvedResponseType) + ", request, callback);");
             --indent;
-        push("};");
+        push("}, \"name\", { value: " + JSON.stringify(method.name) + " });");
         if (config.comments)
             push("");
         pushComment([

dist/light/protobuf.js

@@ -4,7 +4,6 @@ var pbjs = require("../cli/pbjs");
 [
     "google/protobuf/api.proto",
     "google/protobuf/descriptor.proto",
-    "google/protobuf/field_mask.proto",
     "google/protobuf/source_context.proto",
     "google/protobuf/type.proto",