protobufjs 4.1.2 → 5.0.2

package/src/ProtoBuf/Util.js

@@ -1,116 +1,116 @@
-/**
- * @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;
+})();

package/src/bower.json

@@ -2,11 +2,11 @@
     "name": "protobuf",
     "description": "Protocol Buffers for JavaScript. Finally.",
     "version": /*?== VERSION */,
-    "main": "dist/ProtoBuf.js",
+    "main": "dist/protobuf.js",
     "license": "Apache-2.0",
     "homepage": "http://dcode.io/",
     "dependencies": {
-        "bytebuffer": "~3"
+        "bytebuffer": "~5"
     },
     "keywords": ["net", "buffer", "protobuf", "serialization", "bytebuffer", "websocket", "webrtc"],
     "ignore": [

package/src/google/protobuf/descriptor.json

@@ -1,5 +1,6 @@
 {
     "package": "google.protobuf",
+    "syntax": "proto2",
     "options": {
         "java_package": "com.google.protobuf",
         "java_outer_classname": "DescriptorProtos",
@@ -8,6 +9,7 @@
     "messages": [
         {
             "name": "FileDescriptorSet",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "repeated",
@@ -19,6 +21,7 @@
         },
         {
             "name": "FileDescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -90,6 +93,7 @@
         },
         {
             "name": "DescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -137,6 +141,7 @@
             "messages": [
                 {
                     "name": "ExtensionRange",
+                    "syntax": "proto2",
                     "fields": [
                         {
                             "rule": "optional",
@@ -156,6 +161,7 @@
         },
         {
             "name": "FieldDescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -209,6 +215,7 @@
             "enums": [
                 {
                     "name": "Type",
+                    "syntax": "proto2",
                     "values": [
                         {
                             "name": "TYPE_DOUBLE",
@@ -286,6 +293,7 @@
                 },
                 {
                     "name": "Label",
+                    "syntax": "proto2",
                     "values": [
                         {
                             "name": "LABEL_OPTIONAL",
@@ -305,6 +313,7 @@
         },
         {
             "name": "EnumDescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -328,6 +337,7 @@
         },
         {
             "name": "EnumValueDescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -351,6 +361,7 @@
         },
         {
             "name": "ServiceDescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -374,6 +385,7 @@
         },
         {
             "name": "MethodDescriptorProto",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -403,6 +415,7 @@
         },
         {
             "name": "FileOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -484,12 +497,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ],
             "enums": [
                 {
                     "name": "OptimizeMode",
+                    "syntax": "proto2",
                     "values": [
                         {
                             "name": "SPEED",
@@ -509,6 +525,7 @@
         },
         {
             "name": "MessageOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -536,12 +553,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ]
         },
         {
             "name": "FieldOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -599,12 +619,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ],
             "enums": [
                 {
                     "name": "CType",
+                    "syntax": "proto2",
                     "values": [
                         {
                             "name": "STRING",
@@ -624,6 +647,7 @@
         },
         {
             "name": "EnumOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "optional",
@@ -642,12 +666,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ]
         },
         {
             "name": "EnumValueOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "repeated",
@@ -657,12 +684,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ]
         },
         {
             "name": "ServiceOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "repeated",
@@ -672,12 +702,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ]
         },
         {
             "name": "MethodOptions",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "repeated",
@@ -687,12 +720,15 @@
                 }
             ],
             "extensions": [
-                1000,
-                536870911
+                [
+                    1000,
+                    536870911
+                ]
             ]
         },
         {
             "name": "UninterpretedOption",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "repeated",
@@ -740,6 +776,7 @@
             "messages": [
                 {
                     "name": "NamePart",
+                    "syntax": "proto2",
                     "fields": [
                         {
                             "rule": "required",
@@ -759,6 +796,7 @@
         },
         {
             "name": "SourceCodeInfo",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "repeated",
@@ -770,6 +808,7 @@
             "messages": [
                 {
                     "name": "Location",
+                    "syntax": "proto2",
                     "fields": [
                         {
                             "rule": "repeated",
@@ -805,5 +844,6 @@
                 }
             ]
         }
-    ]
+    ],
+    "isNamespace": true
 }

package/src/wrap.js

@@ -15,14 +15,14 @@
  */
 
 /**
- * @license ProtoBuf.js (c) 2013 Daniel Wirtz <dcode@dcode.io>
+ * @license protobuf.js (c) 2013 Daniel Wirtz <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' && define["amd"])
-        define(["ByteBuffer"], factory);
+        define(["bytebuffer"], factory);
     /* CommonJS */ else if (typeof require === "function" && typeof module === "object" && module && module["exports"])
         module["exports"] = factory(require("bytebuffer"), true);
     /* Global */ else
@@ -31,7 +31,7 @@
 })(this, function(ByteBuffer, isCommonJS) {
     "use strict";
 
-    //? include("ProtoBuf.js");
+    //? include("protobuf.js");
 
     return ProtoBuf;
 });