protobufjs 3.6.0 → 3.8.2

package/src/ProtoBuf/Reflect/Service.js

@@ -1,14 +1,15 @@
 /**
  * Constructs a new Service.
  * @exports ProtoBuf.Reflect.Service
+ * @param {!ProtoBuf.Builder} builder Builder reference
  * @param {!ProtoBuf.Reflect.Namespace} root Root
  * @param {string} name Service name
  * @param {Object.<string,*>=} options Options
  * @constructor
  * @extends ProtoBuf.Reflect.Namespace
  */
-var Service = function(root, name, options) {
-    Namespace.call(this, root, name, options);
+var Service = function(builder, root, name, options) {
+    Namespace.call(this, builder, root, name, options);
 
     /**
      * @override
@@ -22,8 +23,11 @@ var Service = function(root, name, options) {
     this.clazz = null;
 };
 
-// Extends Namespace
-Service.prototype = Object.create(Namespace.prototype);
+/**
+ * @alias ProtoBuf.Reflect.Service.prototype
+ * @inner
+ */
+var ServicePrototype = Service.prototype = Object.create(Namespace.prototype);
 
 /**
  * Builds the service and returns the runtime counterpart, which is a fully functional class.
@@ -33,7 +37,7 @@ Service.prototype = Object.create(Namespace.prototype);
  * @throws {Error} If the message cannot be built
  * @expose
  */
-Service.prototype.build = function(rebuild) {
+ServicePrototype.build = function(rebuild) {
     if (this.clazz && !rebuild)
         return this.clazz;
 

package/src/ProtoBuf/Reflect/T.js

@@ -3,14 +3,22 @@
  * @exports ProtoBuf.Reflect.T
  * @constructor
  * @abstract
- * @param {ProtoBuf.Reflect.T} parent Parent object
+ * @param {!ProtoBuf.Builder} builder Builder reference
+ * @param {?ProtoBuf.Reflect.T} parent Parent object
  * @param {string} name Object name
  */
-var T = function(parent, name) {
+var T = function(builder, parent, name) {
+
+    /**
+     * Builder reference.
+     * @type {!ProtoBuf.Builder}
+     * @expose
+     */
+    this.builder = builder;
 
     /**
      * Parent object.
-     * @type {ProtoBuf.Reflect.T|null}
+     * @type {?ProtoBuf.Reflect.T}
      * @expose
      */
     this.parent = parent;
@@ -30,12 +38,18 @@ var T = function(parent, name) {
     this.className;
 };
 
+/**
+ * @alias ProtoBuf.Reflect.T.prototype
+ * @inner
+ */
+var TPrototype = T.prototype;
+
 /**
  * Returns the fully qualified name of this object.
  * @returns {string} Fully qualified name as of ".PATH.TO.THIS"
  * @expose
  */
-T.prototype.fqn = function() {
+TPrototype.fqn = function() {
     var name = this.name,
         ptr = this;
     do {
@@ -53,7 +67,7 @@ T.prototype.fqn = function() {
  * @return String representation
  * @expose
  */
-T.prototype.toString = function(includeClass) {
+TPrototype.toString = function(includeClass) {
     return (includeClass ? this.className + " " : "") + this.fqn();
 };
 
@@ -62,6 +76,6 @@ T.prototype.toString = function(includeClass) {
  * @throws {Error} If this type cannot be built directly
  * @expose
  */
-T.prototype.build = function() {
+TPrototype.build = function() {
     throw Error(this.toString(true)+" cannot be built directly");
 };

package/src/ProtoBuf/Reflect.js

@@ -52,6 +52,14 @@ ProtoBuf.Reflect = (function(ProtoBuf) {
      */
     Reflect.Message.ExtensionField = ExtensionField;
 
+    //? include("Reflect/Message/OneOf.js");
+
+    /**
+     * @alias ProtoBuf.Reflect.Message.OneOf
+     * @expose
+     */
+    Reflect.Message.OneOf = OneOf;
+
     //? include("Reflect/Enum.js");
 
     /**
@@ -101,4 +109,5 @@ ProtoBuf.Reflect = (function(ProtoBuf) {
     Reflect.Service.RPCMethod = RPCMethod;
 
     return Reflect;
+
 })(ProtoBuf);

package/src/ProtoBuf/Util.js

@@ -1,132 +1,132 @@
-/**
- * @alias ProtoBuf.Util
- * @expose
- */
-ProtoBuf.Util = (function() {
-    "use strict";
-
-    // Object.create polyfill
-    // ref: https://developer.mozilla.org/de/docs/JavaScript/Reference/Global_Objects/Object/create
-    if (!Object.create)
-        /** @expose */
-        Object.create = function (o) {
-            if (arguments.length > 1)
-                throw Error('Object.create polyfill only accepts the first parameter.');
-            function F() {}
-            F.prototype = o;
-            return new F();
-        };
-
-    /**
-     * ProtoBuf utilities.
-     * @exports ProtoBuf.Util
-     * @namespace
-     */
-    var Util = {};
-
-    /**
-     * Flag if running in node (fs is available) or not.
-     * @type {boolean}
-     * @const
-     * @expose
-     */
-    Util.IS_NODE = false;
-    try {
-        // There is no reliable way to detect node.js as an environment, so our
-        // best bet is to feature-detect what we actually need.
-        Util.IS_NODE =
-            typeof require === 'function' &&
-            typeof require("fs").readFileSync === 'function' &&
-            typeof require("path").resolve === 'function';
-    } catch (e) {}
-    
-    /**
-     * 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) {
-            if (callback) {
-                require("fs").readFile(path, function(err, data) {
-                    if (err)
-                        callback(null);
-                    else
-                        callback(""+data);
-                });
-            } else
-                try {
-                    return require("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;
-            }
-        }
-    };
-
-    /**
-     * Tests if an object is an array.
-     * @function
-     * @param {*} obj Object to test
-     * @returns {boolean} true if it is an array, else false
-     * @expose
-     */
-    Util.isArray = Array.isArray || function(obj) {
-        return Object.prototype.toString.call(obj) === "[object Array]";
-    };
-    
-    return Util;
-})();
+/**
+ * @alias ProtoBuf.Util
+ * @expose
+ */
+ProtoBuf.Util = (function() {
+    "use strict";
+
+    // Object.create polyfill
+    // ref: https://developer.mozilla.org/de/docs/JavaScript/Reference/Global_Objects/Object/create
+    if (!Object.create)
+        /** @expose */
+        Object.create = function (o) {
+            if (arguments.length > 1)
+                throw Error('Object.create polyfill only accepts the first parameter.');
+            function F() {}
+            F.prototype = o;
+            return new F();
+        };
+
+    /**
+     * ProtoBuf utilities.
+     * @exports ProtoBuf.Util
+     * @namespace
+     */
+    var Util = {};
+
+    /**
+     * Flag if running in node (fs is available) or not.
+     * @type {boolean}
+     * @const
+     * @expose
+     */
+    Util.IS_NODE = false;
+    try {
+        // There is no reliable way to detect node.js as an environment, so our
+        // best bet is to feature-detect what we actually need.
+        Util.IS_NODE =
+            typeof require === 'function' &&
+            typeof require("fs").readFileSync === 'function' &&
+            typeof require("path").resolve === 'function';
+    } catch (e) {}
+    
+    /**
+     * 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) {
+            if (callback) {
+                require("fs").readFile(path, function(err, data) {
+                    if (err)
+                        callback(null);
+                    else
+                        callback(""+data);
+                });
+            } else
+                try {
+                    return require("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;
+            }
+        }
+    };
+
+    /**
+     * Tests if an object is an array.
+     * @function
+     * @param {*} obj Object to test
+     * @returns {boolean} true if it is an array, else false
+     * @expose
+     */
+    Util.isArray = Array.isArray || function(obj) {
+        return Object.prototype.toString.call(obj) === "[object Array]";
+    };
+    
+    return Util;
+})();

package/src/ProtoBuf.js

@@ -257,10 +257,9 @@
          * @expose
          */
         ProtoBuf.loadProto = function(proto, builder, filename) {
-            if (typeof builder === 'string' || (builder && typeof builder["file"] === 'string' && typeof builder["root"] === 'string')) {
-                filename = builder;
-                builder = null;
-            }
+            if (typeof builder === 'string' || (builder && typeof builder["file"] === 'string' && typeof builder["root"] === 'string'))
+                filename = builder,
+                builder = undefined;
             return ProtoBuf.loadJson((new ProtoBuf.DotProto.Parser(proto)).parse(), builder, filename);
         };
 
@@ -328,18 +327,18 @@
         //? } // !NOPARSE
 
         /**
-         * Constructs a new Builder with the specified package defined.
-         * @param {string=} pkg Package name as fully qualified name, e.g. "My.Game". If no package is specified, the
-         * builder will only contain a global namespace.
-         * @param {Object.<string,*>=} options Top level options
-         * @return {ProtoBuf.Builder} New Builder
+         * Constructs a new empty Builder.
+         * @param {Object.<string,*>=} options Builder options, defaults to global options set on ProtoBuf
+         * @return {!ProtoBuf.Builder} Builder
          * @expose
          */
-        ProtoBuf.newBuilder = function(pkg, options) {
-            var builder = new ProtoBuf.Builder();
-            if (typeof pkg !== 'undefined' && pkg !== null)
-                builder.define(pkg, options);
-            return builder;
+        ProtoBuf.newBuilder = function(options) {
+            options = options || {};
+            if (typeof options['convertFieldsToCamelCase'] === 'undefined')
+                options['convertFieldsToCamelCase'] = ProtoBuf.convertFieldsToCamelCase;
+            if (typeof options['populateAccessors'] === 'undefined')
+                options['populateAccessors'] = ProtoBuf.populateAccessors;
+            return new ProtoBuf.Builder(options);
         };
 
         /**
@@ -361,7 +360,6 @@
                 json = JSON.parse(json);
             builder["import"](json, filename);
             builder.resolveAll();
-            builder.build();
             return builder;
         };
 
@@ -402,8 +400,8 @@
         return ProtoBuf;
     }
 
-    /* CommonJS */ if (typeof module !== 'undefined' && module["exports"])
-        module["exports"] = init(require("bytebuffer"));
+    /* CommonJS */ if (typeof require === 'function' && typeof module === 'object' && module && typeof exports === 'object' && exports)
+        module['exports'] = init(require("bytebuffer"));
     /* AMD */ else if (typeof define === 'function' && define["amd"])
         define(["ByteBuffer"], init);
     /* Global */ else

package/src/google/protobuf/descriptor.json

@@ -14,7 +14,8 @@
             ],
             "enums": [],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "FileDescriptorProto",
@@ -99,7 +100,8 @@
             ],
             "enums": [],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "DescriptorProto",
@@ -176,10 +178,12 @@
                     ],
                     "enums": [],
                     "messages": [],
-                    "options": {}
+                    "options": {},
+                    "oneofs": {}
                 }
             ],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "FieldDescriptorProto",
@@ -340,7 +344,8 @@
                 }
             ],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "EnumDescriptorProto",
@@ -369,7 +374,8 @@
             ],
             "enums": [],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "EnumValueDescriptorProto",
@@ -398,7 +404,8 @@
             ],
             "enums": [],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "ServiceDescriptorProto",
@@ -427,7 +434,8 @@
             ],
             "enums": [],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "MethodDescriptorProto",
@@ -463,7 +471,8 @@
             ],
             "enums": [],
             "messages": [],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "FileOptions",
@@ -573,6 +582,7 @@
             ],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -610,6 +620,7 @@
             "enums": [],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -698,6 +709,7 @@
             ],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -726,6 +738,7 @@
             "enums": [],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -745,6 +758,7 @@
             "enums": [],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -764,6 +778,7 @@
             "enums": [],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -783,6 +798,7 @@
             "enums": [],
             "messages": [],
             "options": {},
+            "oneofs": {},
             "extensions": [
                 1000,
                 536870911
@@ -863,10 +879,12 @@
                     ],
                     "enums": [],
                     "messages": [],
-                    "options": {}
+                    "options": {},
+                    "oneofs": {}
                 }
             ],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         },
         {
             "name": "SourceCodeInfo",
@@ -919,10 +937,12 @@
                     ],
                     "enums": [],
                     "messages": [],
-                    "options": {}
+                    "options": {},
+                    "oneofs": {}
                 }
             ],
-            "options": {}
+            "options": {},
+            "oneofs": {}
         }
     ],
     "enums": [],