Added ParseOptions to protobuf.parse and --keep-case for .proto sources to pbjs, see #564

Author: dcodeIO

LICENSE

@@ -1,3 +1,5 @@
+This license applies to all parts of protobuf.js except those files including
+or referencing a different license.
 
                                  Apache License
                            Version 2.0, January 2004

cli/pbjs.js

@@ -26,8 +26,13 @@ exports.main = function(args, callback) {
             root   : "r"
         },
         string: [ "target", "out", "path", "wrap", "root" ],
+        boolean: [ "keep-case", "encode", "decode", "verify", "delimited" ],
         default: {
-            target: "json"
+            target: "json",
+            encode: true,
+            decode: true,
+            verify: true,
+            delimited: true
         }
     });
 
@@ -55,15 +60,21 @@ exports.main = function(args, callback) {
                 "",
                 "  -o, --out       Saves to a file instead of writing to stdout.",
                 "",
-                "  -w, --wrap      Specifies the wrapper to use for *-module targets. Also accepts a path.",
+                "  Module targets only:",
+                "",
+                "  -w, --wrap      Specifies the wrapper to use. Also accepts a path to require a custom wrapper.",
                 "",
                 "                  default   Default wrapper supporting both CommonJS and AMD",
                 "                  commonjs  CommonJS only wrapper",
                 "                  amd       AMD only wrapper",
                 "",
-                "  -r, --root      Specifies an alternative protobuf.roots name for *-module targets.",
+                "  -r, --root      Specifies an alternative protobuf.roots name.",
+                "",
+                "  Proto sources only:",
+                "",
+                "  --keep-case     Keeps field casing instead of converting to camel case (not recommended).",
                 "",
-                "  Static code generation only:",
+                "  Static targets only:",
                 "",
                 "  --no-encode     Does not generate encode functions.",
                 "  --no-decode     Does not generate decode functions.",
@@ -104,7 +115,11 @@ exports.main = function(args, callback) {
         return filepath;
     };
 
-    root.load(files, function(err) {
+    var parseOptions = {
+        "keepCase": argv["keep-case"] || false
+    };
+
+    root.load(files, parseOptions, function(err) {
         if (err) {
             if (callback)
                 return callback(err);

cli/targets/static.js

@@ -271,7 +271,7 @@ function buildType(ref, type) {
         push("});");
     });
 
-    if (config.encode !== false) {
+    if (config.encode) {
 
         // #encode
         push("");
@@ -287,7 +287,7 @@ function buildType(ref, type) {
             util   : "$protobuf.util"
         });
 
-        if (config.delimited !== false) {
+        if (config.delimited) {
 
             // #encodeDelimited
             push("");
@@ -307,7 +307,7 @@ function buildType(ref, type) {
 
     }
 
-    if (config.decode !== false) {
+    if (config.decode) {
 
         // #decode
         push("");
@@ -323,7 +323,7 @@ function buildType(ref, type) {
             util   : "$protobuf.util"
         });
 
-        if (config.delimited !== false) {
+        if (config.delimited) {
 
             // #decodeDelimited
             push("");
@@ -342,7 +342,7 @@ function buildType(ref, type) {
         }
     }
 
-    if (config.verify !== false) {
+    if (config.verify) {
 
         // #verify
         push("");