protobufjs 5.0.0 → 5.0.1

package/docs/ProtoBuf.js.html

@@ -84,7 +84,7 @@
      * @const
      * @expose
      */
-    ProtoBuf.VERSION = "5.0.0";
+    ProtoBuf.VERSION = "5.0.1";
 
     /**
      * Wire types.
@@ -752,7 +752,8 @@
                 // "syntax": undefined
             };
             var token,
-                head = true;
+                head = true,
+                weak;
             try {
                 while (token = this.tn.next()) {
                     switch (token) {
@@ -769,11 +770,12 @@
                             if (!head)
                                 throw Error("unexpected 'import'");
                             token = this.tn.peek();
-                            if (token === "public") // ignored
+                            if (token === "public" || (weak = token === "weak")) // token ignored
                                 this.tn.next();
                             token = this._readString();
                             this.tn.skip(";");
-                            topLevel["imports"].push(token);
+                            if (!weak) // import ignored
+                                topLevel["imports"].push(token);
                             break;
                         case 'syntax':
                             if (!head)
@@ -1128,11 +1130,11 @@
                 else if (token === "service")
                     this._parseService(msg);
                 else if (token === "extensions")
-                    this._parseExtensions(msg);
+                    msg["extensions"] = this._parseExtensionRanges();
+                else if (token === "reserved")
+                    this._parseIgnored(); // TODO
                 else if (token === "extend")
                     this._parseExtend(msg);
-                else if (token === "reserved")
-                    this._parseMessageReserved(msg);
                 else if (Lang.TYPEREF.test(token)) {
                     if (!this.proto3)
                         throw Error("illegal field rule: "+token);
@@ -1146,17 +1148,10 @@
         };
 
         /**
-         * Parses a message's reserved ids / names statement.
-         * @param {!Object} msg Message definition
+         * Parses an ignored statement.
          * @private
          */
-        ParserPrototype._parseMessageReserved = function(msg) {
-            // TODO: This currently just skips a reserved statement for compatibility.
-            // Valid formats are
-            //   reserved 2, 15, 9 to 11;
-            // for reserved ids or
-            //   reserved "foo", "bar";
-            // for reserved names.
+        ParserPrototype._parseIgnored = function() {
             while (this.tn.peek() !== ';')
                 this.tn.next();
             this.tn.skip(";");
@@ -1324,29 +1319,43 @@
         };
 
         /**
-         * Parses an extensions statement.
-         * @param {!Object} msg Message object
+         * Parses extension / reserved ranges.
+         * @returns {!Array.<!Array.<number>>}
          * @private
          */
-        ParserPrototype._parseExtensions = function(msg) {
-            var token = this.tn.next(),
+        ParserPrototype._parseExtensionRanges = function() {
+            var ranges = [];
+            var token,
+                range,
+                value;
+            do {
                 range = [];
-            if (token === "min")
-                range.push(ProtoBuf.ID_MIN);
-            else if (token === "max")
-                range.push(ProtoBuf.ID_MAX);
-            else
-                range.push(mkNumber(token));
-            this.tn.skip("to");
-            token = this.tn.next();
-            if (token === "min")
-                range.push(ProtoBuf.ID_MIN);
-            else if (token === "max")
-                range.push(ProtoBuf.ID_MAX);
-            else
-                range.push(mkNumber(token));
+                while (true) {
+                    token = this.tn.next();
+                    switch (token) {
+                        case "min":
+                            value = ProtoBuf.ID_MIN;
+                            break;
+                        case "max":
+                            value = ProtoBuf.ID_MAX;
+                            break;
+                        default:
+                            value = mkNumber(token);
+                            break;
+                    }
+                    range.push(value);
+                    if (range.length === 2)
+                        break;
+                    if (this.tn.peek() !== "to") {
+                        range.push(value);
+                        break;
+                    }
+                    this.tn.next();
+                }
+                ranges.push(range);
+            } while (this.tn.omit(","));
             this.tn.skip(";");
-            msg["extensions"] = range;
+            return ranges;
         };
 
         /**
@@ -1814,9 +1823,10 @@
          * @expose
          */
         ElementPrototype.verifyValue = function(value) {
-            var fail = function(val, msg) {
-                throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
-            }.bind(this);
+            var self = this;
+            function fail(val, msg) {
+                throw Error("Illegal value for "+self.toString(true)+" of type "+self.type.name+": "+val+" ("+msg+")");
+            }
             switch (this.type) {
                 // Signed 32bit
                 case ProtoBuf.TYPES["int32"]:
@@ -2306,10 +2316,10 @@
 
             /**
              * Extensions range.
-             * @type {!Array.<number>}
+             * @type {!Array.<number>|undefined}
              * @expose
              */
-            this.extensions = [ProtoBuf.ID_MIN, ProtoBuf.ID_MAX];
+            this.extensions = undefined;
 
             /**
              * Runtime message class.
@@ -2708,18 +2718,19 @@
                  * @name ProtoBuf.Builder.Message#encodeDelimited
                  * @function
                  * @param {(!ByteBuffer|boolean)=} buffer ByteBuffer to encode to. Will create a new one and flip it if omitted.
+                 * @param {boolean=} noVerify Whether to not verify field values, defaults to `false`
                  * @return {!ByteBuffer} Encoded message as a ByteBuffer
                  * @throws {Error} If the message cannot be encoded or if required fields are missing. The later still
                  *  returns the encoded ByteBuffer in the `encoded` property on the error.
                  * @expose
                  */
-                MessagePrototype.encodeDelimited = function(buffer) {
+                MessagePrototype.encodeDelimited = function(buffer, noVerify) {
                     var isNew = false;
                     if (!buffer)
                         buffer = new ByteBuffer(),
                         isNew = true;
                     var enc = new ByteBuffer().LE();
-                    T.encode(this, enc).flip();
+                    T.encode(this, enc, noVerify).flip();
                     buffer.writeVarint32(enc.remaining());
                     buffer.append(enc);
                     return isNew ? buffer.flip() : buffer;
@@ -2928,6 +2939,7 @@
                  * @name ProtoBuf.Builder.Message.decode
                  * @function
                  * @param {!ByteBuffer|!ArrayBuffer|!Buffer|string} buffer Buffer to decode from
+                 * @param {(number|string)=} length Message length. Defaults to decode all the remainig data.
                  * @param {string=} enc Encoding if buffer is a string: hex, utf8 (not recommended), defaults to base64
                  * @return {!ProtoBuf.Builder.Message} Decoded message
                  * @throws {Error} If the message cannot be decoded or if required fields are missing. The later still
@@ -2936,7 +2948,10 @@
                  * @see ProtoBuf.Builder.Message.decode64
                  * @see ProtoBuf.Builder.Message.decodeHex
                  */
-                Message.decode = function(buffer, enc) {
+                Message.decode = function(buffer, length, enc) {
+                    if (typeof length === 'string')
+                        enc = length,
+                        length = -1;
                     if (typeof buffer === 'string')
                         buffer = ByteBuffer.wrap(buffer, enc ? enc : "base64");
                     buffer = ByteBuffer.isByteBuffer(buffer) ? buffer : ByteBuffer.wrap(buffer); // May throw
@@ -3197,7 +3212,7 @@
         /**
          * Decodes an encoded message and returns the decoded message.
          * @param {ByteBuffer} buffer ByteBuffer to decode from
-         * @param {number=} length Message length. Defaults to decode all the available data.
+         * @param {number=} length Message length. Defaults to decode all remaining data.
          * @param {number=} expectedGroupEndId Expected GROUPEND id if this is a legacy group
          * @return {ProtoBuf.Builder.Message} Decoded message
          * @throws {Error} If the message cannot be decoded
@@ -3447,9 +3462,10 @@
          */
         FieldPrototype.verifyValue = function(value, skipRepeated) {
             skipRepeated = skipRepeated || false;
-            var fail = function(val, msg) {
-                throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
-            }.bind(this);
+            var self = this;
+            function fail(val, msg) {
+                throw Error("Illegal value for "+self.toString(true)+" of type "+self.type.name+": "+val+" ("+msg+")");
+            }
             if (value === null) { // NULL values for optional fields
                 if (this.required)
                     fail(typeof value, "required");
@@ -4063,6 +4079,9 @@
                                         callback(err);
                                         return;
                                     }
+                                    // Coalesce to empty string when service response has empty content
+                                    if (res === null)
+                                        res = ''
                                     try { res = method.resolvedResponseType.clazz.decode(res); } catch (notABuffer) {}
                                     if (!res || !(res instanceof method.resolvedResponseType.clazz)) {
                                         callback(Error("Illegal response type received in service method "+ T.name+"#"+method.name));
@@ -4506,13 +4525,12 @@
                                 subObj.push(svc);
                             });
 
-                        // Set extension range
+                        // Set extension ranges
                         if (def["extensions"]) {
-                            obj.extensions = def["extensions"];
-                            if (obj.extensions[0] < ProtoBuf.ID_MIN)
-                                obj.extensions[0] = ProtoBuf.ID_MIN;
-                            if (obj.extensions[1] > ProtoBuf.ID_MAX)
-                                obj.extensions[1] = ProtoBuf.ID_MAX;
+                            if (typeof def["extensions"][0] === 'number') // pre 5.0.1
+                                obj.extensions = [ def["extensions"] ];
+                            else
+                                obj.extensions = def["extensions"];
                         }
 
                         // Create on top of current namespace
@@ -4551,8 +4569,16 @@
                             def["fields"].forEach(function(fld) {
                                 if (obj.getChild(fld['id']|0) !== null)
                                     throw Error("duplicate extended field id in "+obj.name+": "+fld['id']);
-                                if (fld['id'] < obj.extensions[0] || fld['id'] > obj.extensions[1])
-                                    throw Error("illegal extended field id in "+obj.name+": "+fld['id']+" ("+obj.extensions.join(' to ')+" expected)");
+                                // Check if field id is allowed to be extended
+                                if (obj.extensions) {
+                                    var valid = false;
+                                    obj.extensions.forEach(function(range) {
+                                        if (fld["id"] >= range[0] && fld["id"] <= range[1])
+                                            valid = true;
+                                    });
+                                    if (!valid)
+                                        throw Error("illegal extended field id in "+obj.name+": "+fld['id']+" (not within valid ranges)");
+                                }
                                 // Convert extension field names to camel case notation if the override is set
                                 var name = fld["name"];
                                 if (this.options['convertFieldsToCamelCase'])
@@ -5238,7 +5264,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Tue Nov 17 2015 00:07:57 GMT+0100 (Mitteleuropäische Zeit)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Wed Jan 06 2016 01:34:58 GMT+0100 (Mitteleuropäische Zeit)
 </footer>
 
 <script> prettyPrint(); </script>

package/docs/index.html

@@ -54,7 +54,7 @@
 <br clear="both">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Tue Nov 17 2015 00:07:57 GMT+0100 (Mitteleuropäische Zeit)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.0-alpha9</a> on Wed Jan 06 2016 01:34:58 GMT+0100 (Mitteleuropäische Zeit)
 </footer>
 
 <script> prettyPrint(); </script>

package/externs/protobuf.js

@@ -349,10 +349,11 @@ ProtoBuf.Reflect.Message.prototype.calculate = function(message) {};
 /**
  * @param {!ProtoBuf.Builder.Message} message
  * @param {!ByteBuffer} buffer
+ * @param {bool} noVerify
  * @return {!ByteBuffer}
  * @throws {Error}
  */
-ProtoBuf.Reflect.Message.prototype.encodeDelimited = function(message, buffer) {};
+ProtoBuf.Reflect.Message.prototype.encodeDelimited = function(message, buffer, noVerify) {};
 
 /**
  * @param {!ByteBuffer} buffer

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Protocol Buffers for JavaScript. Finally.",
   "author": "Daniel Wirtz <dcode@dcode.io>",
   "contributors": [

package/src/ProtoBuf/Builder/Message.js

@@ -340,18 +340,19 @@ MessagePrototype.calculate = function() {
  * @name ProtoBuf.Builder.Message#encodeDelimited
  * @function
  * @param {(!ByteBuffer|boolean)=} buffer ByteBuffer to encode to. Will create a new one and flip it if omitted.
+ * @param {boolean=} noVerify Whether to not verify field values, defaults to `false`
  * @return {!ByteBuffer} Encoded message as a ByteBuffer
  * @throws {Error} If the message cannot be encoded or if required fields are missing. The later still
  *  returns the encoded ByteBuffer in the `encoded` property on the error.
  * @expose
  */
-MessagePrototype.encodeDelimited = function(buffer) {
+MessagePrototype.encodeDelimited = function(buffer, noVerify) {
     var isNew = false;
     if (!buffer)
         buffer = new ByteBuffer(),
         isNew = true;
     var enc = new ByteBuffer().LE();
-    T.encode(this, enc).flip();
+    T.encode(this, enc, noVerify).flip();
     buffer.writeVarint32(enc.remaining());
     buffer.append(enc);
     return isNew ? buffer.flip() : buffer;
@@ -560,6 +561,7 @@ MessagePrototype.encodeJSON = function() {
  * @name ProtoBuf.Builder.Message.decode
  * @function
  * @param {!ByteBuffer|!ArrayBuffer|!Buffer|string} buffer Buffer to decode from
+ * @param {(number|string)=} length Message length. Defaults to decode all the remainig data.
  * @param {string=} enc Encoding if buffer is a string: hex, utf8 (not recommended), defaults to base64
  * @return {!ProtoBuf.Builder.Message} Decoded message
  * @throws {Error} If the message cannot be decoded or if required fields are missing. The later still
@@ -568,7 +570,10 @@ MessagePrototype.encodeJSON = function() {
  * @see ProtoBuf.Builder.Message.decode64
  * @see ProtoBuf.Builder.Message.decodeHex
  */
-Message.decode = function(buffer, enc) {
+Message.decode = function(buffer, length, enc) {
+    if (typeof length === 'string')
+        enc = length,
+        length = -1;
     if (typeof buffer === 'string')
         buffer = ByteBuffer.wrap(buffer, enc ? enc : "base64");
     buffer = ByteBuffer.isByteBuffer(buffer) ? buffer : ByteBuffer.wrap(buffer); // May throw

package/src/ProtoBuf/Builder/Service.js

@@ -77,6 +77,9 @@ for (var i=0; i<rpc.length; i++) {
                         callback(err);
                         return;
                     }
+                    // Coalesce to empty string when service response has empty content
+                    if (res === null)
+                        res = ''
                     try { res = method.resolvedResponseType.clazz.decode(res); } catch (notABuffer) {}
                     if (!res || !(res instanceof method.resolvedResponseType.clazz)) {
                         callback(Error("Illegal response type received in service method "+ T.name+"#"+method.name));

package/src/ProtoBuf/Builder.js

@@ -243,13 +243,12 @@ ProtoBuf.Builder = (function(ProtoBuf, Lang, Reflect) {
                             subObj.push(svc);
                         });
 
-                    // Set extension range
+                    // Set extension ranges
                     if (def["extensions"]) {
-                        obj.extensions = def["extensions"];
-                        if (obj.extensions[0] < ProtoBuf.ID_MIN)
-                            obj.extensions[0] = ProtoBuf.ID_MIN;
-                        if (obj.extensions[1] > ProtoBuf.ID_MAX)
-                            obj.extensions[1] = ProtoBuf.ID_MAX;
+                        if (typeof def["extensions"][0] === 'number') // pre 5.0.1
+                            obj.extensions = [ def["extensions"] ];
+                        else
+                            obj.extensions = def["extensions"];
                     }
 
                     // Create on top of current namespace
@@ -288,8 +287,16 @@ ProtoBuf.Builder = (function(ProtoBuf, Lang, Reflect) {
                         def["fields"].forEach(function(fld) {
                             if (obj.getChild(fld['id']|0) !== null)
                                 throw Error("duplicate extended field id in "+obj.name+": "+fld['id']);
-                            if (fld['id'] < obj.extensions[0] || fld['id'] > obj.extensions[1])
-                                throw Error("illegal extended field id in "+obj.name+": "+fld['id']+" ("+obj.extensions.join(' to ')+" expected)");
+                            // Check if field id is allowed to be extended
+                            if (obj.extensions) {
+                                var valid = false;
+                                obj.extensions.forEach(function(range) {
+                                    if (fld["id"] >= range[0] && fld["id"] <= range[1])
+                                        valid = true;
+                                });
+                                if (!valid)
+                                    throw Error("illegal extended field id in "+obj.name+": "+fld['id']+" (not within valid ranges)");
+                            }
                             // Convert extension field names to camel case notation if the override is set
                             var name = fld["name"];
                             if (this.options['convertFieldsToCamelCase'])

package/src/ProtoBuf/DotProto/Parser.js

@@ -50,7 +50,8 @@ ParserPrototype.parse = function() {
         // "syntax": undefined
     };
     var token,
-        head = true;
+        head = true,
+        weak;
     try {
         while (token = this.tn.next()) {
             switch (token) {
@@ -67,11 +68,12 @@ ParserPrototype.parse = function() {
                     if (!head)
                         throw Error("unexpected 'import'");
                     token = this.tn.peek();
-                    if (token === "public") // ignored
+                    if (token === "public" || (weak = token === "weak")) // token ignored
                         this.tn.next();
                     token = this._readString();
                     this.tn.skip(";");
-                    topLevel["imports"].push(token);
+                    if (!weak) // import ignored
+                        topLevel["imports"].push(token);
                     break;
                 case 'syntax':
                     if (!head)
@@ -426,11 +428,11 @@ ParserPrototype._parseMessage = function(parent, fld) {
         else if (token === "service")
             this._parseService(msg);
         else if (token === "extensions")
-            this._parseExtensions(msg);
+            msg["extensions"] = this._parseExtensionRanges();
+        else if (token === "reserved")
+            this._parseIgnored(); // TODO
         else if (token === "extend")
             this._parseExtend(msg);
-        else if (token === "reserved")
-            this._parseMessageReserved(msg);
         else if (Lang.TYPEREF.test(token)) {
             if (!this.proto3)
                 throw Error("illegal field rule: "+token);
@@ -444,17 +446,10 @@ ParserPrototype._parseMessage = function(parent, fld) {
 };
 
 /**
- * Parses a message's reserved ids / names statement.
- * @param {!Object} msg Message definition
+ * Parses an ignored statement.
  * @private
  */
-ParserPrototype._parseMessageReserved = function(msg) {
-    // TODO: This currently just skips a reserved statement for compatibility.
-    // Valid formats are
-    //   reserved 2, 15, 9 to 11;
-    // for reserved ids or
-    //   reserved "foo", "bar";
-    // for reserved names.
+ParserPrototype._parseIgnored = function() {
     while (this.tn.peek() !== ';')
         this.tn.next();
     this.tn.skip(";");
@@ -622,29 +617,43 @@ ParserPrototype._parseEnum = function(msg) {
 };
 
 /**
- * Parses an extensions statement.
- * @param {!Object} msg Message object
+ * Parses extension / reserved ranges.
+ * @returns {!Array.<!Array.<number>>}
  * @private
  */
-ParserPrototype._parseExtensions = function(msg) {
-    var token = this.tn.next(),
+ParserPrototype._parseExtensionRanges = function() {
+    var ranges = [];
+    var token,
+        range,
+        value;
+    do {
         range = [];
-    if (token === "min")
-        range.push(ProtoBuf.ID_MIN);
-    else if (token === "max")
-        range.push(ProtoBuf.ID_MAX);
-    else
-        range.push(mkNumber(token));
-    this.tn.skip("to");
-    token = this.tn.next();
-    if (token === "min")
-        range.push(ProtoBuf.ID_MIN);
-    else if (token === "max")
-        range.push(ProtoBuf.ID_MAX);
-    else
-        range.push(mkNumber(token));
+        while (true) {
+            token = this.tn.next();
+            switch (token) {
+                case "min":
+                    value = ProtoBuf.ID_MIN;
+                    break;
+                case "max":
+                    value = ProtoBuf.ID_MAX;
+                    break;
+                default:
+                    value = mkNumber(token);
+                    break;
+            }
+            range.push(value);
+            if (range.length === 2)
+                break;
+            if (this.tn.peek() !== "to") {
+                range.push(value);
+                break;
+            }
+            this.tn.next();
+        }
+        ranges.push(range);
+    } while (this.tn.omit(","));
     this.tn.skip(";");
-    msg["extensions"] = range;
+    return ranges;
 };
 
 /**

package/src/ProtoBuf/Reflect/Element.js

@@ -102,9 +102,10 @@ function mkLong(value, unsigned) {
  * @expose
  */
 ElementPrototype.verifyValue = function(value) {
-    var fail = function(val, msg) {
-        throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
-    }.bind(this);
+    var self = this;
+    function fail(val, msg) {
+        throw Error("Illegal value for "+self.toString(true)+" of type "+self.type.name+": "+val+" ("+msg+")");
+    }
     switch (this.type) {
         // Signed 32bit
         case ProtoBuf.TYPES["int32"]:

package/src/ProtoBuf/Reflect/Message/Field.js

@@ -165,9 +165,10 @@ FieldPrototype.build = function() {
  */
 FieldPrototype.verifyValue = function(value, skipRepeated) {
     skipRepeated = skipRepeated || false;
-    var fail = function(val, msg) {
-        throw Error("Illegal value for "+this.toString(true)+" of type "+this.type.name+": "+val+" ("+msg+")");
-    }.bind(this);
+    var self = this;
+    function fail(val, msg) {
+        throw Error("Illegal value for "+self.toString(true)+" of type "+self.type.name+": "+val+" ("+msg+")");
+    }
     if (value === null) { // NULL values for optional fields
         if (this.required)
             fail(typeof value, "required");

package/src/ProtoBuf/Reflect/Message.js

@@ -20,10 +20,10 @@ var Message = function(builder, parent, name, options, isGroup, syntax) {
 
     /**
      * Extensions range.
-     * @type {!Array.<number>}
+     * @type {!Array.<number>|undefined}
      * @expose
      */
-    this.extensions = [ProtoBuf.ID_MIN, ProtoBuf.ID_MAX];
+    this.extensions = undefined;
 
     /**
      * Runtime message class.
@@ -204,7 +204,7 @@ function skipTillGroupEnd(expectedId, buf) {
 /**
  * Decodes an encoded message and returns the decoded message.
  * @param {ByteBuffer} buffer ByteBuffer to decode from
- * @param {number=} length Message length. Defaults to decode all the available data.
+ * @param {number=} length Message length. Defaults to decode all remaining data.
  * @param {number=} expectedGroupEndId Expected GROUPEND id if this is a legacy group
  * @return {ProtoBuf.Builder.Message} Decoded message
  * @throws {Error} If the message cannot be decoded