protobufjs 5.0.1 → 5.0.2

package/examples/protoify/json.json

@@ -1,123 +1,123 @@
-{
-    "package": "js",
-    "messages": [
-        {
-            "name": "Value",
-            "fields": [
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "sint32",
-                    "name": "integer",
-                    "id": 1,
-                    "oneof": "type"
-                },
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "double",
-                    "name": "double",
-                    "id": 2,
-                    "oneof": "type"
-                },
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "string",
-                    "name": "string",
-                    "id": 3,
-                    "oneof": "type"
-                },
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "bool",
-                    "name": "boolean",
-                    "id": 4,
-                    "oneof": "type"
-                },
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "bool",
-                    "name": "null",
-                    "id": 5,
-                    "oneof": "type"
-                },
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "Array",
-                    "name": "array",
-                    "id": 6,
-                    "oneof": "type"
-                },
-                {
-                    "rule": "optional",
-                    "options": {},
-                    "type": "Object",
-                    "name": "object",
-                    "id": 7,
-                    "oneof": "type"
-                }
-            ],
-            "enums": [],
-            "messages": [],
-            "options": {},
-            "oneofs": {
-                "type": [
-                    1,
-                    2,
-                    3,
-                    4,
-                    5,
-                    6,
-                    7
-                ]
-            }
-        },
-        {
-            "name": "Array",
-            "fields": [
-                {
-                    "rule": "repeated",
-                    "options": {},
-                    "type": "Value",
-                    "name": "values",
-                    "id": 1
-                }
-            ],
-            "enums": [],
-            "messages": [],
-            "options": {},
-            "oneofs": {}
-        },
-        {
-            "name": "Object",
-            "fields": [
-                {
-                    "rule": "repeated",
-                    "options": {},
-                    "type": "Value",
-                    "name": "keys",
-                    "id": 1
-                },
-                {
-                    "rule": "repeated",
-                    "options": {},
-                    "type": "Value",
-                    "name": "values",
-                    "id": 2
-                }
-            ],
-            "enums": [],
-            "messages": [],
-            "options": {},
-            "oneofs": {}
-        }
-    ],
-    "enums": [],
-    "imports": [],
-    "options": {},
-    "services": []
-}
+{
+    "package": "js",
+    "messages": [
+        {
+            "name": "Value",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "sint32",
+                    "name": "integer",
+                    "id": 1,
+                    "oneof": "type"
+                },
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "double",
+                    "name": "double",
+                    "id": 2,
+                    "oneof": "type"
+                },
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "string",
+                    "name": "string",
+                    "id": 3,
+                    "oneof": "type"
+                },
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "bool",
+                    "name": "boolean",
+                    "id": 4,
+                    "oneof": "type"
+                },
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "bool",
+                    "name": "null",
+                    "id": 5,
+                    "oneof": "type"
+                },
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "Array",
+                    "name": "array",
+                    "id": 6,
+                    "oneof": "type"
+                },
+                {
+                    "rule": "optional",
+                    "options": {},
+                    "type": "Object",
+                    "name": "object",
+                    "id": 7,
+                    "oneof": "type"
+                }
+            ],
+            "enums": [],
+            "messages": [],
+            "options": {},
+            "oneofs": {
+                "type": [
+                    1,
+                    2,
+                    3,
+                    4,
+                    5,
+                    6,
+                    7
+                ]
+            }
+        },
+        {
+            "name": "Array",
+            "fields": [
+                {
+                    "rule": "repeated",
+                    "options": {},
+                    "type": "Value",
+                    "name": "values",
+                    "id": 1
+                }
+            ],
+            "enums": [],
+            "messages": [],
+            "options": {},
+            "oneofs": {}
+        },
+        {
+            "name": "Object",
+            "fields": [
+                {
+                    "rule": "repeated",
+                    "options": {},
+                    "type": "Value",
+                    "name": "keys",
+                    "id": 1
+                },
+                {
+                    "rule": "repeated",
+                    "options": {},
+                    "type": "Value",
+                    "name": "values",
+                    "id": 2
+                }
+            ],
+            "enums": [],
+            "messages": [],
+            "options": {},
+            "oneofs": {}
+        }
+    ],
+    "enums": [],
+    "imports": [],
+    "options": {},
+    "services": []
+}

package/examples/websocket/server.js

@@ -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

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

package/jsdoc.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "Protocol Buffers for JavaScript. Finally.",
   "author": "Daniel Wirtz <dcode@dcode.io>",
   "contributors": [
@@ -30,7 +30,7 @@
   "dependencies": {
     "ascli": "~1",
     "bytebuffer": "~5",
-    "glob": "^5.0.10",
+    "glob": "^7.0.5",
     "yargs": "^3.10.0"
   },
   "devDependencies": {

package/scripts/build.js

@@ -1,53 +1,53 @@
-/*
- 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 MetaScript = require("metascript"),
-    path = require("path"),
-    fs = require("fs");
-
-var rootDir = path.join(__dirname, ".."),
-    srcDir  = path.join(rootDir, "src"),
-    distDir = path.join(rootDir, "dist"),
-    pkg = require(path.join(rootDir, "package.json")),
-    filename;
-
-var scope = {
-    VERSION: pkg.version,           // Version
-    DOTPROTO: true                  // Whether to include the ProtoBuf.DotProto package for .proto syntax support
-};
-
-// Make full build
-console.log("Building protobuf.js with scope", JSON.stringify(scope, null, 2));
-fs.writeFileSync(
-    path.join(distDir, "protobuf.js"),
-    MetaScript.transform(fs.readFileSync(filename = path.join(srcDir, "wrap.js")), filename, scope, srcDir)
-);
-
-// Make light build
-scope.DOTPROTO = false;
-console.log("Building protobuf-light.js with scope", JSON.stringify(scope, null, 2));
-fs.writeFileSync(
-    path.join(distDir, "protobuf-light.js"),
-    MetaScript.transform(fs.readFileSync(filename = path.join(srcDir, "wrap.js")), filename, scope, srcDir)
-);
-
-// Update bower.json
-scope = { VERSION: pkg.version };
-console.log("Updating bower.json with scope", JSON.stringify(scope, null, 2));
-fs.writeFileSync(
-    path.join(rootDir, "bower.json"),
-    MetaScript.transform(fs.readFileSync(filename = path.join(srcDir, "bower.json")), filename, scope, srcDir)
-);
+/*
+ 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 MetaScript = require("metascript"),
+    path = require("path"),
+    fs = require("fs");
+
+var rootDir = path.join(__dirname, ".."),
+    srcDir  = path.join(rootDir, "src"),
+    distDir = path.join(rootDir, "dist"),
+    pkg = require(path.join(rootDir, "package.json")),
+    filename;
+
+var scope = {
+    VERSION: pkg.version,           // Version
+    DOTPROTO: true                  // Whether to include the ProtoBuf.DotProto package for .proto syntax support
+};
+
+// Make full build
+console.log("Building protobuf.js with scope", JSON.stringify(scope, null, 2));
+fs.writeFileSync(
+    path.join(distDir, "protobuf.js"),
+    MetaScript.transform(fs.readFileSync(filename = path.join(srcDir, "wrap.js")), filename, scope, srcDir)
+);
+
+// Make light build
+scope.DOTPROTO = false;
+console.log("Building protobuf-light.js with scope", JSON.stringify(scope, null, 2));
+fs.writeFileSync(
+    path.join(distDir, "protobuf-light.js"),
+    MetaScript.transform(fs.readFileSync(filename = path.join(srcDir, "wrap.js")), filename, scope, srcDir)
+);
+
+// Update bower.json
+scope = { VERSION: pkg.version };
+console.log("Updating bower.json with scope", JSON.stringify(scope, null, 2));
+fs.writeFileSync(
+    path.join(rootDir, "bower.json"),
+    MetaScript.transform(fs.readFileSync(filename = path.join(srcDir, "bower.json")), filename, scope, srcDir)
+);

package/src/ProtoBuf/Builder/Message.js

@@ -110,9 +110,11 @@ MessagePrototype.$add = MessagePrototype.add;
 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];
@@ -576,10 +578,11 @@ Message.decode = function(buffer, length, enc) {
         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) {
@@ -602,7 +605,8 @@ Message.decode = function(buffer, length, enc) {
 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,

package/src/ProtoBuf/Builder.js

@@ -377,7 +377,11 @@ ProtoBuf.Builder = (function(ProtoBuf, Lang, Reflect) {
                 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;
@@ -423,7 +427,10 @@ ProtoBuf.Builder = (function(ProtoBuf, Lang, Reflect) {
                     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
@@ -521,6 +528,16 @@ ProtoBuf.Builder = (function(ProtoBuf, Lang, Reflect) {
                 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) {

package/src/ProtoBuf/DotProto/Parser.js

@@ -428,7 +428,11 @@ ParserPrototype._parseMessage = function(parent, fld) {
         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")

package/src/ProtoBuf/Reflect/Element.js

@@ -15,9 +15,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).
@@ -43,6 +45,12 @@ var Element = function(type, resolvedType, isMapKey, syntax) {
      */
     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);
 };
@@ -93,6 +101,10 @@ function mkLong(value, unsigned) {
     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).

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

@@ -141,9 +141,9 @@ var FieldPrototype = Field.prototype = Object.create(T.prototype);
  * @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).

package/src/ProtoBuf/Reflect/Message.js

@@ -94,6 +94,7 @@ MessagePrototype.build = function(rebuild) {
     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) {
@@ -105,6 +106,9 @@ MessagePrototype.build = function(rebuild) {
             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));
     }
@@ -211,7 +215,8 @@ function skipTillGroupEnd(expectedId, buf) {
  * @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;