Added Message#asJSON option for bytes conversion

protobufjs · Dec 12, 2016 · 52cd8b5 · 52cd8b5
1 parent ce41d0e
commit 52cd8b5
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 26 deletions.
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/package.json b/package.json
@@ -50,6 +50,8 @@
     "long": "^3.2.0"
   },
   "devDependencies": {
+    "@types/long": "^3.0.31",
+    "@types/node": "0.0.3",
     "benchmark": "^2.1.2",
     "browserify": "^13.1.1",
     "bundle-collapser": "^1.2.1",
@@ -69,7 +71,7 @@
     "tap-spec": "^4.1.1",
     "tape": "^4.6.3",
     "tsd-jsdoc": "dcodeIO/tsd-jsdoc",
-    "typescript": "^2.2.0-dev.20161202",
+    "typescript": "^2.2.0-dev.20161212",
     "vinyl-buffer": "^1.0.0",
     "vinyl-fs": "^2.4.4",
     "vinyl-source-stream": "^1.1.0",

diff --git a/scripts/minimal-env.js b/scripts/minimal-env.js
diff --git a/src/field.js b/src/field.js
@@ -266,7 +266,11 @@ FieldPrototype.jsonConvert = function(value, options) {
                 ? typeof value === "number"
                 ? value
                 : util.Long.fromValue(value).toNumber()
-                : util.Long.fromValue(value, this.type.charAt(0) === "u").toString();
+                : util.Long.fromValue(value, this.type.charAt(0) === "u").toString()
+        else if (options.bytes && this.type === "bytes")
+            return options.bytes === Array
+                ? Array.prototype.slice.call(value)
+                : util.base64.encode(value, 0, value.length);
     }
     return value;
 };
diff --git a/src/message.js b/src/message.js
@@ -33,6 +33,9 @@ var MessagePrototype = Message.prototype;
  * @param {*} [options.enum=Number] Enum value conversion type.
  * Valid values are `String` and `Number` (the global types).
  * Defaults to the numeric ids.
+ * @param {*} [options.bytes] Bytes value conversion type.
+ * Valid values are `Array` and `String` (the global types).
+ * Defaults to return the underlying buffer type.
  * @param {boolean} [options.defaults=false] Also sets default values on the resulting object
  * @returns {Object.<string,*>} JSON object
  */

diff --git a/types/protobuf.js.d.ts b/types/protobuf.js.d.ts
@@ -1,6 +1,6 @@
 /*
  * protobuf.js v6.1.0 TypeScript definitions
- * Generated Mon, 12 Dec 2016 22:50:39 UTC
+ * Generated Mon, 12 Dec 2016 23:18:49 UTC
  */
 declare module "protobufjs" {
 
@@ -508,6 +508,9 @@ declare module "protobufjs" {
        * @param {*} [options.enum=Number] Enum value conversion type.
        * Valid values are `String` and `Number` (the global types).
        * Defaults to the numeric ids.
+       * @param {*} [options.bytes] Bytes value conversion type.
+       * Valid values are `Array` and `String` (the global types).
+       * Defaults to return the underlying buffer type.
        * @param {boolean} [options.defaults=false] Also sets default values on the resulting object
        * @returns {Object.<string,*>} JSON object
        */