protobufjs 5.0.1 → 5.0.2

package/dist/protobuf.js

@@ -57,7 +57,7 @@
      * @const
      * @expose
      */
-    ProtoBuf.VERSION = "5.0.1";
+    ProtoBuf.VERSION = "5.0.2";
 
     /**
      * Wire types.
@@ -289,122 +289,122 @@
      */
     ProtoBuf.populateDefaults = true;
 
-    /**
-     * @alias ProtoBuf.Util
-     * @expose
-     */
-    ProtoBuf.Util = (function() {
-        "use strict";
-
-        /**
-         * ProtoBuf utilities.
-         * @exports ProtoBuf.Util
-         * @namespace
-         */
-        var Util = {};
-
-        /**
-         * Flag if running in node or not.
-         * @type {boolean}
-         * @const
-         * @expose
-         */
-        Util.IS_NODE = !!(
-            typeof process === 'object' && process+'' === '[object process]' && !process['browser']
-        );
-
-        /**
-         * Constructs a XMLHttpRequest object.
-         * @return {XMLHttpRequest}
-         * @throws {Error} If XMLHttpRequest is not supported
-         * @expose
-         */
-        Util.XHR = function() {
-            // No dependencies please, ref: http://www.quirksmode.org/js/xmlhttp.html
-            var XMLHttpFactories = [
-                function () {return new XMLHttpRequest()},
-                function () {return new ActiveXObject("Msxml2.XMLHTTP")},
-                function () {return new ActiveXObject("Msxml3.XMLHTTP")},
-                function () {return new ActiveXObject("Microsoft.XMLHTTP")}
-            ];
-            /** @type {?XMLHttpRequest} */
-            var xhr = null;
-            for (var i=0;i<XMLHttpFactories.length;i++) {
-                try { xhr = XMLHttpFactories[i](); }
-                catch (e) { continue; }
-                break;
-            }
-            if (!xhr)
-                throw Error("XMLHttpRequest is not supported");
-            return xhr;
-        };
-
-        /**
-         * Fetches a resource.
-         * @param {string} path Resource path
-         * @param {function(?string)=} callback Callback receiving the resource's contents. If omitted the resource will
-         *   be fetched synchronously. If the request failed, contents will be null.
-         * @return {?string|undefined} Resource contents if callback is omitted (null if the request failed), else undefined.
-         * @expose
-         */
-        Util.fetch = function(path, callback) {
-            if (callback && typeof callback != 'function')
-                callback = null;
-            if (Util.IS_NODE) {
-                var fs = require("fs");
-                if (callback) {
-                    fs.readFile(path, function(err, data) {
-                        if (err)
-                            callback(null);
-                        else
-                            callback(""+data);
-                    });
-                } else
-                    try {
-                        return fs.readFileSync(path);
-                    } catch (e) {
-                        return null;
-                    }
-            } else {
-                var xhr = Util.XHR();
-                xhr.open('GET', path, callback ? true : false);
-                // xhr.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
-                xhr.setRequestHeader('Accept', 'text/plain');
-                if (typeof xhr.overrideMimeType === 'function') xhr.overrideMimeType('text/plain');
-                if (callback) {
-                    xhr.onreadystatechange = function() {
-                        if (xhr.readyState != 4) return;
-                        if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 && typeof xhr.responseText === 'string'))
-                            callback(xhr.responseText);
-                        else
-                            callback(null);
-                    };
-                    if (xhr.readyState == 4)
-                        return;
-                    xhr.send(null);
-                } else {
-                    xhr.send(null);
-                    if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 && typeof xhr.responseText === 'string'))
-                        return xhr.responseText;
-                    return null;
-                }
-            }
-        };
-
-        /**
-         * Converts a string to camel case.
-         * @param {string} str
-         * @returns {string}
-         * @expose
-         */
-        Util.toCamelCase = function(str) {
-            return str.replace(/_([a-zA-Z])/g, function ($0, $1) {
-                return $1.toUpperCase();
-            });
-        };
-
-        return Util;
-    })();
+    /**
+     * @alias ProtoBuf.Util
+     * @expose
+     */
+    ProtoBuf.Util = (function() {
+        "use strict";
+
+        /**
+         * ProtoBuf utilities.
+         * @exports ProtoBuf.Util
+         * @namespace
+         */
+        var Util = {};
+
+        /**
+         * Flag if running in node or not.
+         * @type {boolean}
+         * @const
+         * @expose
+         */
+        Util.IS_NODE = !!(
+            typeof process === 'object' && process+'' === '[object process]' && !process['browser']
+        );
+
+        /**
+         * Constructs a XMLHttpRequest object.
+         * @return {XMLHttpRequest}
+         * @throws {Error} If XMLHttpRequest is not supported
+         * @expose
+         */
+        Util.XHR = function() {
+            // No dependencies please, ref: http://www.quirksmode.org/js/xmlhttp.html
+            var XMLHttpFactories = [
+                function () {return new XMLHttpRequest()},
+                function () {return new ActiveXObject("Msxml2.XMLHTTP")},
+                function () {return new ActiveXObject("Msxml3.XMLHTTP")},
+                function () {return new ActiveXObject("Microsoft.XMLHTTP")}
+            ];
+            /** @type {?XMLHttpRequest} */
+            var xhr = null;
+            for (var i=0;i<XMLHttpFactories.length;i++) {
+                try { xhr = XMLHttpFactories[i](); }
+                catch (e) { continue; }
+                break;
+            }
+            if (!xhr)
+                throw Error("XMLHttpRequest is not supported");
+            return xhr;
+        };
+
+        /**
+         * Fetches a resource.
+         * @param {string} path Resource path
+         * @param {function(?string)=} callback Callback receiving the resource's contents. If omitted the resource will
+         *   be fetched synchronously. If the request failed, contents will be null.
+         * @return {?string|undefined} Resource contents if callback is omitted (null if the request failed), else undefined.
+         * @expose
+         */
+        Util.fetch = function(path, callback) {
+            if (callback && typeof callback != 'function')
+                callback = null;
+            if (Util.IS_NODE) {
+                var fs = require("fs");
+                if (callback) {
+                    fs.readFile(path, function(err, data) {
+                        if (err)
+                            callback(null);
+                        else
+                            callback(""+data);
+                    });
+                } else
+                    try {
+                        return fs.readFileSync(path);
+                    } catch (e) {
+                        return null;
+                    }
+            } else {
+                var xhr = Util.XHR();
+                xhr.open('GET', path, callback ? true : false);
+                // xhr.setRequestHeader('User-Agent', 'XMLHTTP/1.0');
+                xhr.setRequestHeader('Accept', 'text/plain');
+                if (typeof xhr.overrideMimeType === 'function') xhr.overrideMimeType('text/plain');
+                if (callback) {
+                    xhr.onreadystatechange = function() {
+                        if (xhr.readyState != 4) return;
+                        if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 && typeof xhr.responseText === 'string'))
+                            callback(xhr.responseText);
+                        else
+                            callback(null);
+                    };
+                    if (xhr.readyState == 4)
+                        return;
+                    xhr.send(null);
+                } else {
+                    xhr.send(null);
+                    if (/* remote */ xhr.status == 200 || /* local */ (xhr.status == 0 && typeof xhr.responseText === 'string'))
+                        return xhr.responseText;
+                    return null;
+                }
+            }
+        };
+
+        /**
+         * Converts a string to camel case.
+         * @param {string} str
+         * @returns {string}
+         * @expose
+         */
+        Util.toCamelCase = function(str) {
+            return str.replace(/_([a-zA-Z])/g, function ($0, $1) {
+                return $1.toUpperCase();
+            });
+        };
+
+        return Util;
+    })();
 
     /**
      * Language expressions.
@@ -1103,7 +1103,11 @@
                 else if (token === "service")
                     this._parseService(msg);
                 else if (token === "extensions")
-                    msg["extensions"] = this._parseExtensionRanges();
+                    if (msg.hasOwnProperty("extensions")) {
+                        msg["extensions"] = msg["extensions"].concat(this._parseExtensionRanges())
+                    } else {
+                        msg["extensions"] = this._parseExtensionRanges();
+                    }
                 else if (token === "reserved")
                     this._parseIgnored(); // TODO
                 else if (token === "extend")
@@ -1709,9 +1713,11 @@
          * converted to string form if so.
          * @param {string} syntax Syntax level of defining message type, e.g.,
          * proto2 or proto3.
+         * @param {string} name Name of the field containing this element (for error
+         * messages)
          * @constructor
          */
-        var Element = function(type, resolvedType, isMapKey, syntax) {
+        var Element = function(type, resolvedType, isMapKey, syntax, name) {
 
             /**
              * Element type, as a string (e.g., int32).
@@ -1737,6 +1743,12 @@
              */
             this.syntax = syntax;
 
+            /**
+             * Name of the field containing this element (for error messages)
+             * @type {string}
+             */
+            this.name = name;
+
             if (isMapKey && ProtoBuf.MAP_KEY_TYPES.indexOf(type) < 0)
                 throw Error("Invalid map key type: " + type.name);
         };
@@ -1787,6 +1799,10 @@
             throw Error("not convertible to Long");
         }
 
+        ElementPrototype.toString = function() {
+            return (this.name || '') + (this.isMapKey ? 'map' : 'value') + ' element';
+        }
+
         /**
          * Checks if the given value can be set for an element of this type (singular
          * field or one element of a repeated field or map).
@@ -2461,9 +2477,11 @@
                 MessagePrototype.set = function(keyOrObj, value, noAssert) {
                     if (keyOrObj && typeof keyOrObj === 'object') {
                         noAssert = value;
-                        for (var ikey in keyOrObj)
-                            if (keyOrObj.hasOwnProperty(ikey) && typeof (value = keyOrObj[ikey]) !== 'undefined')
+                        for (var ikey in keyOrObj) {
+                            // Check if virtual oneof field - don't set these
+                            if (keyOrObj.hasOwnProperty(ikey) && typeof (value = keyOrObj[ikey]) !== 'undefined' && T._oneofsByName[ikey] === undefined)
                                 this.$set(ikey, value, noAssert);
+                        }
                         return this;
                     }
                     var field = T._fieldsByName[keyOrObj];
@@ -2927,10 +2945,11 @@
                         length = -1;
                     if (typeof buffer === 'string')
                         buffer = ByteBuffer.wrap(buffer, enc ? enc : "base64");
-                    buffer = ByteBuffer.isByteBuffer(buffer) ? buffer : ByteBuffer.wrap(buffer); // May throw
+                    else if (!ByteBuffer.isByteBuffer(buffer))
+                        buffer = ByteBuffer.wrap(buffer); // May throw
                     var le = buffer.littleEndian;
                     try {
-                        var msg = T.decode(buffer.LE());
+                        var msg = T.decode(buffer.LE(), length);
                         buffer.LE(le);
                         return msg;
                     } catch (e) {
@@ -2953,7 +2972,8 @@
                 Message.decodeDelimited = function(buffer, enc) {
                     if (typeof buffer === 'string')
                         buffer = ByteBuffer.wrap(buffer, enc ? enc : "base64");
-                    buffer = ByteBuffer.isByteBuffer(buffer) ? buffer : ByteBuffer.wrap(buffer); // May throw
+                    else if (!ByteBuffer.isByteBuffer(buffer))
+                        buffer = ByteBuffer.wrap(buffer); // May throw
                     if (buffer.remaining() < 1)
                         return null;
                     var off = buffer.offset,
@@ -3075,6 +3095,7 @@
             this._fields = [];
             this._fieldsById = {};
             this._fieldsByName = {};
+            this._oneofsByName = {};
             for (var i=0, k=this.children.length, child; i<k; i++) {
                 child = this.children[i];
                 if (child instanceof Enum || child instanceof Message || child instanceof Service) {
@@ -3086,6 +3107,9 @@
                     this._fields.push(child),
                     this._fieldsById[child.id] = child,
                     this._fieldsByName[child.name] = child;
+                else if (child instanceof Message.OneOf) {
+                    this._oneofsByName[child.name] = child;
+                }
                 else if (!(child instanceof Message.OneOf) && !(child instanceof Extension)) // Not built
                     throw Error("Illegal reflect child of "+this.toString(true)+": "+this.children[i].toString(true));
             }
@@ -3192,7 +3216,8 @@
          * @expose
          */
         MessagePrototype.decode = function(buffer, length, expectedGroupEndId) {
-            length = typeof length === 'number' ? length : -1;
+            if (typeof length !== 'number')
+                length = -1;
             var start = buffer.offset,
                 msg = new (this.clazz)(),
                 tag, wireType, id, field;
@@ -3411,9 +3436,9 @@
          * @expose
          */
         FieldPrototype.build = function() {
-            this.element = new Element(this.type, this.resolvedType, false, this.syntax);
+            this.element = new Element(this.type, this.resolvedType, false, this.syntax, this.name);
             if (this.map)
-                this.keyElement = new Element(this.keyType, undefined, true, this.syntax);
+                this.keyElement = new Element(this.keyType, undefined, true, this.syntax, this.name);
 
             // In proto3, fields do not have field presence, and every field is set to
             // its type's default value ("", 0, 0.0, or false).
@@ -4632,7 +4657,11 @@
                     root = require("path")['resolve'](root);
                 if (root.indexOf("\\") >= 0 || filename.file.indexOf("\\") >= 0)
                     delim = '\\';
-                var fname = root + delim + filename.file;
+                var fname;
+                if (ProtoBuf.Util.IS_NODE)
+                    fname = require("path")['join'](root, filename.file);
+                else
+                    fname = root + delim + filename.file;
                 if (this.files[fname] === true)
                     return this.reset();
                 this.files[fname] = true;
@@ -4678,7 +4707,10 @@
                         var importFilename = json['imports'][i];
                         if (importFilename === "google/protobuf/descriptor.proto")
                             continue; // Not needed and therefore not used
-                        importFilename = importRoot + delim + importFilename;
+                        if (ProtoBuf.Util.IS_NODE)
+                            importFilename = require("path")['join'](importRoot, importFilename);
+                        else
+                            importFilename = importRoot + delim + importFilename;
                         if (this.files[importFilename] === true)
                             continue; // Already imported
                         if (/\.proto$/i.test(importFilename) && !ProtoBuf.DotProto)       // If this is a light build
@@ -4776,6 +4808,16 @@
                     this.ptr.keyType = ProtoBuf.TYPES[this.ptr.keyType];
                 }
 
+                // If it's a repeated and packable field then proto3 mandates it should be packed by
+                // default
+                if (
+                  this.ptr.syntax === 'proto3' &&
+                  this.ptr.repeated && this.ptr.options.packed === undefined &&
+                  ProtoBuf.PACKABLE_WIRE_TYPES.indexOf(this.ptr.type.wireType) !== -1
+                ) {
+                  this.ptr.options.packed = true;
+                }
+
             } else if (this.ptr instanceof ProtoBuf.Reflect.Service.Method) {
 
                 if (this.ptr instanceof ProtoBuf.Reflect.Service.RPCMethod) {