protobufjs 6.8.4 → 6.8.8

package/cli/pbts.js

@@ -24,9 +24,10 @@ exports.main = function(args, callback) {
             name: "n",
             out : "o",
             main: "m",
-            global: "g"
+            global: "g",
+            import: "i"
         },
-        string: [ "name", "out", "global" ],
+        string: [ "name", "out", "global", "import" ],
         boolean: [ "comments", "main" ],
         default: {
             comments: true,
@@ -49,6 +50,8 @@ exports.main = function(args, callback) {
                 "",
                 "  -g, --global    Name of the global object in browser environments, if any.",
                 "",
+                "  -i, --import    Comma delimited list of imports. Local names will equal camelCase of the basename.",
+                "",
                 "  --no-comments   Does not output any JSDoc comments.",
                 "",
                 chalk.bold.gray("  Internal flags:"),
@@ -98,7 +101,8 @@ exports.main = function(args, callback) {
         // There is no proper API for jsdoc, so this executes the CLI and pipes the output
         var basedir = path.join(__dirname, ".");
         var moduleName = argv.name || "null";
-        var cmd = "node \"" + require.resolve("jsdoc/jsdoc.js") + "\" -c \"" + path.join(basedir, "lib", "tsd-jsdoc.json") + "\" -q \"module=" + encodeURIComponent(moduleName) + "&comments=" + Boolean(argv.comments) + "\" " + files.map(function(file) { return "\"" + file + "\""; }).join(" ");
+        var nodePath = process.execPath;
+        var cmd = "\"" + nodePath + "\" \"" + require.resolve("jsdoc/jsdoc.js") + "\" -c \"" + path.join(basedir, "lib", "tsd-jsdoc.json") + "\" -q \"module=" + encodeURIComponent(moduleName) + "&comments=" + Boolean(argv.comments) + "\" " + files.map(function(file) { return "\"" + file + "\""; }).join(" ");
         var child = child_process.exec(cmd, {
             cwd: process.cwd(),
             argv0: "node",
@@ -134,18 +138,43 @@ exports.main = function(args, callback) {
             return undefined;
         });
 
+        function getImportName(importItem) {
+            return path.basename(importItem, ".js").replace(/([-_~.+]\w)/g, function(match) {
+                return match[1].toUpperCase();
+            });
+        }
+
         function finish() {
             var output = [];
-            if (argv.global)
+            if (argv.main)
                 output.push(
-                    "export as namespace " + argv.global + ";",
+                    "// DO NOT EDIT! This is a generated file. Edit the JSDoc in src/*.js instead and run 'npm run types'.",
                     ""
                 );
-            if (!argv.main)
+            if (argv.global)
                 output.push(
-                    "import * as $protobuf from \"protobufjs\";",
+                    "export as namespace " + argv.global + ";",
                     ""
                 );
+
+            if (!argv.main) {
+                // Ensure we have a usable array of imports
+                var importArray = typeof argv.import === "string" ? argv.import.split(",") : argv.import || [];
+
+                // Build an object of imports and paths
+                var imports = {
+                    $protobuf: "protobufjs"
+                };
+                importArray.forEach(function(importItem) {
+                    imports[getImportName(importItem)] = importItem;
+                });
+
+                // Write out the imports
+                Object.keys(imports).forEach(function(key) {
+                    output.push("import * as " + key + " from \"" + imports[key] + "\";");
+                });
+            }
+
             output = output.join("\n") + "\n" + out.join("");
 
             try {

package/cli/targets/proto.js

@@ -70,7 +70,7 @@ function escape(str) {
     return str.replace(/[\\"']/g, "\\$&")
               .replace(/\r/g, "\\r")
               .replace(/\n/g, "\\n")
-              .replace(/\u0000/g, "\\0");
+              .replace(/\u0000/g, "\\0"); // eslint-disable-line no-control-regex
 }
 
 function value(v) {

package/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([