npm - protobufjs - Versions diffs - 4.1.3 → 5.0.3 - Mend

protobufjs 4.1.3 → 5.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (80) hide show

package/.travis.yml +3 -1
package/README.md +147 -25
package/bin/pbjs +2 -2
package/bower.json +3 -3
package/cli/pbjs/targets/amd.js +1 -1
package/cli/pbjs/targets/json.js +9 -1
package/cli/pbjs/targets/proto.js +48 -24
package/cli/pbjs/util.js +1 -1
package/cli/pbjs.js +9 -2
package/dist/README.md +10 -10
package/dist/{ProtoBuf-light.js → protobuf-light.js} +92 -37
package/dist/protobuf-light.min.js +94 -0
package/dist/protobuf-light.min.js.gz +0 -0
package/dist/protobuf-light.min.map +8 -0
package/dist/{ProtoBuf.js → protobuf.js} +150 -60
package/dist/protobuf.min.js +116 -0
package/dist/protobuf.min.js.gz +0 -0
package/dist/protobuf.min.map +8 -0
package/docs/ProtoBuf.Builder.Message.html +106 -37
package/docs/ProtoBuf.Builder.Service.html +9 -9
package/docs/ProtoBuf.Builder.html +22 -22
package/docs/ProtoBuf.DotProto.Parser.html +7 -7
package/docs/ProtoBuf.DotProto.Tokenizer.html +11 -11
package/docs/ProtoBuf.DotProto.html +2 -2
package/docs/ProtoBuf.Map.html +6 -6
package/docs/ProtoBuf.Reflect.Element.html +104 -8
package/docs/ProtoBuf.Reflect.Enum.Value.html +10 -10
package/docs/ProtoBuf.Reflect.Enum.html +21 -21
package/docs/ProtoBuf.Reflect.Extension.html +3 -3
package/docs/ProtoBuf.Reflect.Message.ExtensionField.html +29 -29
package/docs/ProtoBuf.Reflect.Message.Field.html +28 -28
package/docs/ProtoBuf.Reflect.Message.OneOf.html +10 -10
package/docs/ProtoBuf.Reflect.Message.html +31 -28
package/docs/ProtoBuf.Reflect.Namespace.html +19 -19
package/docs/ProtoBuf.Reflect.Service.Method.html +11 -11
package/docs/ProtoBuf.Reflect.Service.RPCMethod.html +17 -17
package/docs/ProtoBuf.Reflect.Service.html +20 -20
package/docs/ProtoBuf.Reflect.T.html +9 -9
package/docs/ProtoBuf.Reflect.html +2 -2
package/docs/ProtoBuf.Util.html +6 -6
package/docs/ProtoBuf.html +28 -28
package/docs/ProtoBuf.js.html +151 -61
package/docs/index.html +1 -1
package/donate.png +0 -0
package/examples/websocket/server.js +4 -4
package/externs/{ProtoBuf.js → protobuf.js} +25 -14
package/index.js +1 -18
package/jsdoc.json +1 -1
package/package.json +11 -11
package/protobuf.png +0 -0
package/scripts/build.js +5 -10
package/src/ProtoBuf/Builder/Message.js +17 -8
package/src/ProtoBuf/Builder/Service.js +3 -0
package/src/ProtoBuf/Builder.js +34 -10
package/src/ProtoBuf/DotProto/Parser.js +58 -23
package/src/ProtoBuf/Lang.js +2 -2
package/src/ProtoBuf/Reflect/Element.js +17 -4
package/src/ProtoBuf/Reflect/Message/Field.js +6 -5
package/src/ProtoBuf/Reflect/Message.js +9 -4
package/src/{bower.json → bower.json.in} +2 -2
package/src/google/protobuf/descriptor.json +55 -15
package/src/{ProtoBuf.js → protobuf.js} +0 -0
package/src/wrap.js +4 -4
package/tests/complex.json +8 -1
package/tests/imports-weak.proto +7 -0
package/tests/suite.js +107 -82
package/.npmignore +0 -3
package/ProtoBuf.png +0 -0
package/dist/ProtoBuf-light.min.js +0 -87
package/dist/ProtoBuf-light.min.js.gz +0 -0
package/dist/ProtoBuf-light.min.map +0 -8
package/dist/ProtoBuf.min.js +0 -108
package/dist/ProtoBuf.min.js.gz +0 -0
package/dist/ProtoBuf.min.map +0 -8
package/examples/protoify/.npmignore +0 -2
package/examples/websocket/.npmignore +0 -3
package/externs/ByteBuffer.js +0 -767
package/externs/Long.js +0 -328
package/tests/gtfs-realtime.proto +0 -552
package/webpack.config.js +0 -9

package/docs/ProtoBuf.js.html CHANGED Viewed

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>JSDoc: Source: ProtoBuf.js</title>
+    <title>JSDoc: Source: protobuf.js</title>
     <script src="scripts/prettify/prettify.js"> </script>
     <script src="scripts/prettify/lang-css.js"> </script>
@@ -17,7 +17,7 @@
 <div id="main">
-    <h1 class="page-title">Source: ProtoBuf.js</h1>
+    <h1 class="page-title">Source: protobuf.js</h1>
@@ -43,14 +43,14 @@
  */
 /**
- * @license ProtoBuf.js (c) 2013 Daniel Wirtz &lt;dcode@dcode.io>
+ * @license protobuf.js (c) 2013 Daniel Wirtz &lt;dcode@dcode.io>
  * Released under the Apache License, Version 2.0
- * see: https://github.com/dcodeIO/ProtoBuf.js for details
+ * see: https://github.com/dcodeIO/protobuf.js for details
  */
 (function(global, factory) {
     /* AMD */ if (typeof define === 'function' &amp;&amp; define["amd"])
-        define(["ByteBuffer"], factory);
+        define(["bytebuffer"], factory);
     /* CommonJS */ else if (typeof require === "function" &amp;&amp; typeof module === "object" &amp;&amp; module &amp;&amp; module["exports"])
         module["exports"] = factory(require("bytebuffer"), true);
     /* Global */ else
@@ -85,7 +85,7 @@
      * @const
      * @expose
      */
-    ProtoBuf.VERSION = "4.1.3";
+    ProtoBuf.VERSION = "5.0.2";
     /**
      * Wire types.
@@ -753,7 +753,8 @@
                 // "syntax": undefined
             };
             var token,
-                head = true;
+                head = true,
+                weak;
             try {
                 while (token = this.tn.next()) {
                     switch (token) {
@@ -770,11 +771,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)
@@ -1099,6 +1101,7 @@
                 "enums": [],
                 "messages": [],
                 "options": {},
+                "services": [],
                 "oneofs": {}
                 // "extensions": undefined
             };
@@ -1125,8 +1128,16 @@
                     this._parseMessage(msg);
                 else if (token === "option")
                     this._parseOption(msg);
+                else if (token === "service")
+                    this._parseService(msg);
                 else if (token === "extensions")
-                    this._parseExtensions(msg);
+                    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")
                     this._parseExtend(msg);
                 else if (Lang.TYPEREF.test(token)) {
@@ -1141,6 +1152,16 @@
             return msg;
         };
+        /**
+         * Parses an ignored statement.
+         * @private
+         */
+        ParserPrototype._parseIgnored = function() {
+            while (this.tn.peek() !== ';')
+                this.tn.next();
+            this.tn.skip(";");
+        };
         /**
          * Parses a message field.
          * @param {!Object} msg Message definition
@@ -1303,29 +1324,43 @@
         };
         /**
-         * Parses an extensions statement.
-         * @param {!Object} msg Message object
+         * Parses extension / reserved ranges.
+         * @returns {!Array.&lt;!Array.&lt;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;
         };
         /**
@@ -1706,9 +1741,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).
@@ -1734,6 +1771,12 @@
              */
             this.syntax = syntax;
+            /**
+             * Name of the field containing this element (for error messages)
+             * @type {string}
+             */
+            this.name = name;
             if (isMapKey &amp;&amp; ProtoBuf.MAP_KEY_TYPES.indexOf(type) &lt; 0)
                 throw Error("Invalid map key type: " + type.name);
         };
@@ -1784,6 +1827,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).
@@ -1793,9 +1840,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"]:
@@ -2285,10 +2333,10 @@
             /**
              * Extensions range.
-             * @type {!Array.&lt;number>}
+             * @type {!Array.&lt;number>|undefined}
              * @expose
              */
-            this.extensions = [ProtoBuf.ID_MIN, ProtoBuf.ID_MAX];
+            this.extensions = undefined;
             /**
              * Runtime message class.
@@ -2457,9 +2505,11 @@
                 MessagePrototype.set = function(keyOrObj, value, noAssert) {
                     if (keyOrObj &amp;&amp; typeof keyOrObj === 'object') {
                         noAssert = value;
-                        for (var ikey in keyOrObj)
-                            if (keyOrObj.hasOwnProperty(ikey) &amp;&amp; typeof (value = keyOrObj[ikey]) !== 'undefined')
+                        for (var ikey in keyOrObj) {
+                            // Check if virtual oneof field - don't set these
+                            if (keyOrObj.hasOwnProperty(ikey) &amp;&amp; typeof (value = keyOrObj[ikey]) !== 'undefined' &amp;&amp; T._oneofsByName[ikey] === undefined)
                                 this.$set(ikey, value, noAssert);
+                        }
                         return this;
                     }
                     var field = T._fieldsByName[keyOrObj];
@@ -2687,18 +2737,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;
@@ -2907,6 +2958,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
@@ -2915,13 +2967,17 @@
                  * @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
+                    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) {
@@ -2944,7 +3000,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() &lt; 1)
                         return null;
                     var off = buffer.offset,
@@ -3066,6 +3123,7 @@
             this._fields = [];
             this._fieldsById = {};
             this._fieldsByName = {};
+            this._oneofsByName = {};
             for (var i=0, k=this.children.length, child; i&lt;k; i++) {
                 child = this.children[i];
                 if (child instanceof Enum || child instanceof Message || child instanceof Service) {
@@ -3077,6 +3135,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) &amp;&amp; !(child instanceof Extension)) // Not built
                     throw Error("Illegal reflect child of "+this.toString(true)+": "+this.children[i].toString(true));
             }
@@ -3176,14 +3237,15 @@
         /**
          * 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
          * @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;
@@ -3402,9 +3464,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).
@@ -3426,9 +3488,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");
@@ -4042,6 +4105,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));
@@ -4485,13 +4551,12 @@
                                 subObj.push(svc);
                             });
-                        // Set extension range
+                        // Set extension ranges
                         if (def["extensions"]) {
-                            obj.extensions = def["extensions"];
-                            if (obj.extensions[0] &lt; 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
@@ -4530,8 +4595,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'] &lt; 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] &amp;&amp; fld["id"] &lt;= 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'])
@@ -4612,7 +4685,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;
@@ -4658,7 +4735,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) &amp;&amp; !ProtoBuf.DotProto)       // If this is a light build
@@ -4756,6 +4836,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' &amp;&amp;
+                  this.ptr.repeated &amp;&amp; this.ptr.options.packed === undefined &amp;&amp;
+                  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) {
@@ -5217,7 +5307,7 @@
 <br class="clear">
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.3</a> on Tue Nov 17 2015 01:51:27 GMT+0100 (Mitteleuropäische Zeit)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.3</a> on Fri Jan 27 2017 17:03:55 GMT+0100 (Mitteleuropäische Zeit)
 </footer>
 <script> prettyPrint(); </script>

package/docs/index.html CHANGED Viewed

@@ -56,7 +56,7 @@
 <br class="clear">
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.3</a> on Tue Nov 17 2015 01:51:27 GMT+0100 (Mitteleuropäische Zeit)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.3.3</a> on Fri Jan 27 2017 17:03:55 GMT+0100 (Mitteleuropäische Zeit)
 </footer>
 <script> prettyPrint(); </script>

package/donate.png ADDED Viewed

Binary file

package/examples/websocket/server.js CHANGED Viewed

@@ -8,9 +8,9 @@ var http = require("http"),
 // Copy dependencies to "www/" (example specific, you usually don't have to care
 var deps = [
-    ["Long.min.js", "./node_modules/protobufjs/node_modules/bytebuffer/node_modules/long/dist/Long.min.js"],
-    ["ByteBufferAB.min.js", "./node_modules/protobufjs/node_modules/bytebuffer/dist/ByteBufferAB.min.js"],
-    ["ProtoBuf.min.js", "./node_modules/protobufjs/dist/ProtoBuf.min.js"]
+      ["Long.min.js", "./node_modules/long/dist/Long.min.js"],
+      ["ByteBufferAB.min.js", "./node_modules/bytebuffer/dist/ByteBufferAB.min.js"],
+      ["ProtoBuf.min.js", "./node_modules/protobufjs/dist/ProtoBuf.min.js"]
 ];
 for (var i=0, dep, data; i<deps.length; i++) {
     dep = deps[i];
@@ -68,7 +68,7 @@ server.on("error", function(err) {
     console.log("Failed to start server:", err);
     process.exit(1);
 });
 // WebSocket adapter
 var wss = new ws.Server({server: server});
 wss.on("connection", function(socket) {

package/externs/{ProtoBuf.js → protobuf.js} RENAMED Viewed

@@ -27,7 +27,17 @@
  */
 /**
- * {@type object.<string.*>}
+ * @typedef {Array}
+ */
+var Buffer;
+/**
+ * @typedef {Object}
+ */
+var dcodeIO;
+/**
+ * {@type Object.<string.*>}
  */
 var ProtoBuf = {};
@@ -38,7 +48,7 @@ var ProtoBuf = {};
 ProtoBuf.VERSION;
 /**
- * @type {!object.<string,number>}
+ * @type {!Object.<string,number>}
  * @const
  */
 ProtoBuf.WIRE_TYPES = {};
@@ -97,7 +107,7 @@ ProtoBuf.populateAccessors;
 /**
  * @dict
- * @type {!object.<string,{name: string, wireType: number}>}
+ * @type {!Object<string,{name: string, wireType: number}>}
  * @const
  */
 ProtoBuf.TYPES;
@@ -113,22 +123,22 @@ ProtoBuf.ID_MIN;
 ProtoBuf.ID_MAX;
 /**
- * @type {!function(new: ByteBuffer, ...[*])}
+ * @type {!function(new: ByteBuffer, ...*)}
  */
 ProtoBuf.ByteBuffer;
 /**
- * @type {?function(new: Long, ...[*])}
+ * @type {?function(new: Long, ...*)}
  */
 ProtoBuf.Long;
 /**
- * @type {!object.<string,string|RegExp>}
+ * @type {!Object<string,string|RegExp>}
  */
 ProtoBuf.Lang;
 /**
- * @type {!object.<string,function>}
+ * @type {Object<string, function(*)>}
  */
 ProtoBuf.DotProto;
@@ -154,7 +164,7 @@ ProtoBuf.DotProto.Tokenizer.prototype.index;
 ProtoBuf.DotProto.Tokenizer.prototype.line;
 /**
- * @type {array.<string>}
+ * @type {Array.<string>}
  */
 ProtoBuf.DotProto.Tokenizer.prototype.stack;
@@ -171,7 +181,7 @@ ProtoBuf.DotProto.Tokenizer.prototype.next = function() {};
 /**
  * @return {?string}
- * @thorws {Error}
+ * @throws {Error}
  */
 ProtoBuf.DotProto.Tokenizer.prototype.peek = function() {};
@@ -193,7 +203,7 @@ ProtoBuf.DotProto.Parser = function(proto) {};
 ProtoBuf.DotProto.Parser.prototype.tn;
 /**
- * @return {{package: string|null, messages: Array.<object>, enums: Array.<object>, imports: Array.<string>, options: object<string,*>}}
+ * @return {{package: (string|null), messages: Array.<Object>, enums: Array.<Object>, imports: Array.<string>, options: Object<string,*>}}
  * @throws {Error}
  */
 ProtoBuf.DotProto.Parser.prototype.parse = function() {};
@@ -205,7 +215,7 @@ ProtoBuf.DotProto.Parser.prototype.parse = function() {};
 ProtoBuf.DotProto.Parser.prototype.toString = function() {};
 /**
- * @type {Object.<string,function>}
+ * @type {Object<string, function(*)>}
  */
 ProtoBuf.Reflect.Reflect = {};
@@ -339,10 +349,11 @@ ProtoBuf.Reflect.Message.prototype.calculate = function(message) {};
 /**
  * @param {!ProtoBuf.Builder.Message} message
  * @param {!ByteBuffer} buffer
+ * @param {boolean} 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
@@ -366,7 +377,7 @@ ProtoBuf.Reflect.Message.prototype.decodeDelimited = function(buffer, length) {}
  * @param {string} type
  * @param {string} name
  * @param {number} id
- * @param {Object.<string.*>=} options
+ * @param {Object<string>=} options
  * @constructor
  * @extends ProtoBuf.Reflect.T
  */
@@ -873,7 +884,7 @@ ProtoBuf.loadProtoFile = function(filename, callback, builder) {};
 ProtoBuf.protoFromFile = function(filename, callback, builder) {};
 /**
- * @param {!*|string} proto
+ * @param {!*|string} json
  * @param {(ProtoBuf.Builder|string|{root: string, file: string})=} builder
  * @param {(string|{root: string, file: string})=} filename
  * @return {!ProtoBuf.Builder}

package/index.js CHANGED Viewed

@@ -1,18 +1 @@
-/*
- Copyright 2013 Daniel Wirtz <dcode@dcode.io>
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-var ProtoBuf = require("./dist/ProtoBuf.js");
-module.exports = ProtoBuf;
+module.exports = require("./dist/protobuf.js");

package/jsdoc.json CHANGED Viewed

@@ -3,7 +3,7 @@
         "allowUnknownTags": true
     },
     "source": {
-        "include": ["dist/ProtoBuf.js"]
+        "include": ["dist/protobuf.js"]
     },
     "opts": {
         "destination": "docs"