protobufjs 4.1.3 → 5.0.3

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;
 });

package/tests/complex.json

@@ -1,8 +1,10 @@
 {
     "package": "Game.Cars",
+    "syntax": "proto2",
     "messages": [
         {
             "name": "Car",
+            "syntax": "proto2",
             "fields": [
                 {
                     "rule": "required",
@@ -29,6 +31,7 @@
             "messages": [
                 {
                     "name": "Vendor",
+                    "syntax": "proto2",
                     "fields": [
                         {
                             "rule": "required",
@@ -52,6 +55,7 @@
                     "messages": [
                         {
                             "name": "Address",
+                            "syntax": "proto2",
                             "fields": [
                                 {
                                     "rule": "required",
@@ -65,6 +69,7 @@
                 },
                 {
                     "name": "Holder",
+                    "syntax": "proto2",
                     "fields": [
                         {
                             "rule": "optional",
@@ -90,6 +95,7 @@
             "enums": [
                 {
                     "name": "Speed",
+                    "syntax": "proto2",
                     "values": [
                         {
                             "name": "FAST",
@@ -103,5 +109,6 @@
                 }
             ]
         }
-    ]
+    ],
+    "isNamespace": true
 }

package/tests/imports-weak.proto

@@ -0,0 +1,7 @@
+package My;
+
+import weak "example1.proto";
+
+message Test2 {
+    required Test1 test1 = 1;
+}

package/tests/suite.js

@@ -20,7 +20,7 @@
  */
 (function(global) {
 
-    var FILE = "ProtoBuf.js";
+    var FILE = "protobuf.js";
     var BROWSER = !!global.window;
     var StdOutFixture = require('fixture-stdout');
     var fixture = new StdOutFixture();
@@ -263,6 +263,36 @@
             test.deepEqual(t2, t3);
             test.done();
         },
+        
+        "constructorWithOneofs": function(test) {
+            try {
+                var builder = ProtoBuf.loadProtoFile(__dirname+"/oneof.proto"),
+                    MyOneOf = builder.build("MyOneOf"),
+                    TOneOf = builder.lookup(".MyOneOf");
+                test.ok(TOneOf.getChild("my_oneof"));
+                
+                var myOneOf = new MyOneOf();
+                test.strictEqual(myOneOf.my_oneof, null);
+                myOneOf.set("id", 1);
+                test.strictEqual(myOneOf.my_oneof, "id");
+                myOneOf.set("name", "me");
+                test.strictEqual(myOneOf.my_oneof, "name");
+                test.strictEqual(myOneOf.id, null);
+                
+                var copy = new MyOneOf(myOneOf); // this line is what was failing
+                // Error: .MyOneOf#my_oneof is not a field: undefined
+                
+                test.deepEqual(myOneOf, copy);
+                
+                // Test same things are there
+                test.strictEqual(copy.my_oneof, "name");
+                test.strictEqual(copy.name, "me");
+                test.strictEqual(copy.id, null);
+            } catch (e) {
+                fail(e);
+            }
+            test.done();
+        },
 
         "numberFormats": function(test) {
             try {
@@ -396,7 +426,7 @@
             try {
                 var builder = ProtoBuf.loadProto("message Image { required bytes data = 1; }"),
                     Image = builder.build("Image"),
-                    data = fs.readFileSync(__dirname+"/../ProtoBuf.png"),
+                    data = fs.readFileSync(__dirname+"/../protobuf.png"),
                     image = new Image({ data: data }),
                     bb = image.encode(),
                     imageDec = Image.decode(bb),
@@ -674,6 +704,18 @@
             test.done();
         },
 
+        // Test error messages
+        "errorMessage": function(test) {
+            test.throws(function() {
+                var builder = ProtoBuf.loadJsonFile(__dirname+"/complex.json");
+                var Game = builder.build("Game");
+                var car = new Game.Cars.Car();
+                car.speed = "hello";
+                car.encode();
+            }, /Illegal value for speed/);
+            test.done();
+        },
+
         // Builder reused to add definitions from multiple sources
         "multiBuilder": function(test) {
             try {
@@ -914,6 +956,19 @@
             test.done();
         },
 
+        "weakImports": function(test) {
+            try {
+                var builder = ProtoBuf.loadProtoFile(__dirname+"/imports-weak.proto");
+                var root = builder.build();
+            } catch (e) {
+                test.ok(e.message.indexOf("unresolvable type reference") >= 0);
+                test.done();
+                return;
+            }
+            var e = new Error("Weak import was imported.");
+            fail(e);
+        },
+
         "importExtensions": function(test) {
             var x = "package x; \
             message Test { \
@@ -1046,82 +1101,51 @@
         "extend": function(test) {
             try {
                 var ast = new ProtoBuf.DotProto.Parser(fs.readFileSync(__dirname+"/extend.proto")).parse();
-                test.deepEqual(ast,  {
-                    "package": null,
-                    "messages": [
-                        {
-                            "ref": "google.protobuf.MessageOptions",
-                            "fields": [
-                                {
-                                    "rule": "optional",
-                                    "options": {},
-                                    "type": "int32",
-                                    "name": "foo",
-                                    "id": 1001
-                                }
-                            ]
-                        },
-                        {
-                            "name": "Foo",
-                            "fields": [],
-                            "enums": [],
-                            "messages": [],
-                            "options": {},
-                            "extensions": [
-                                2,
-                                536870911
-                            ],
-                            "oneofs": []
-                        },
-                        {
-                            "ref": "Foo",
-                            "fields":[
-                                {
-                                    "rule": "optional",
-                                    "options": {},
-                                    "type": "string",
-                                    "name": "bar",
-                                    "id": 2
-                                }
-                            ]
-                        },
-                        {
-                            "name": "Bar",
-                            "fields": [],
-                            "enums": [],
-                            "messages": [
-                                {
-                                    "name": "Foo",
-                                    "fields": [],
-                                    "enums": [],
-                                    "messages": [],
-                                    "options": {},
-                                    "oneofs": []
-                                },
-                                {
-                                    "ref": ".Foo",
-                                    "fields": [
-                                        {
-                                            "rule": "optional",
-                                            "options": {},
-                                            "type": "Foo",
-                                            "name": "foo",
-                                            "id": 3
-                                        }
-                                    ]
-                                }
-                            ],
-                            "options": {},
-                            "oneofs": []
-                        }
-                    ],
-                    "enums": [],
-                    "imports": [
-                        "google/protobuf/descriptor.proto"
-                    ],
-                    "options": {},
-                    "services": []
-                });
+                test.deepEqual(ast, { package: null,
+                    messages:
+                        [ { ref: 'google.protobuf.MessageOptions',
+                            fields:
+                                [ { rule: 'optional',
+                                    type: 'int32',
+                                    name: 'foo',
+                                    options: {},
+                                    id: 1001 } ] },
+                            { name: 'Foo',
+                                fields: [],
+                                enums: [],
+                                messages: [],
+                                options: {},
+                                services: [],
+                                oneofs: {},
+                                extensions: [ [ 2, 536870911 ] ] },
+                            { ref: 'Foo',
+                                fields:
+                                    [ { rule: 'optional',
+                                        type: 'string',
+                                        name: 'bar',
+                                        options: {},
+                                        id: 2 } ] },
+                            { name: 'Bar',
+                                fields: [],
+                                enums: [],
+                                messages:
+                                    [ { name: 'Foo',
+                                        fields: [],
+                                        enums: [],
+                                        messages: [],
+                                        options: {},
+                                        services: [],
+                                        oneofs: {} },
+                                        { ref: '.Foo',
+                                            fields: [ { rule: 'optional', type: 'Foo', name: 'foo', options: {}, id: 3 } ] } ],
+                                options: {},
+                                services: [],
+                                oneofs: {} } ],
+                    enums: [],
+                    imports: [ 'google/protobuf/descriptor.proto' ],
+                    options: {},
+                    services: [] }
+                );
 
                 var builder = ProtoBuf.loadProtoFile(__dirname+"/extend.proto");
                 var TFoo = builder.lookup(".Foo"),
@@ -1133,8 +1157,8 @@
                 test.strictEqual(fields[0].id, 2);
                 test.strictEqual(fields[1].name, ".Bar.foo");
                 test.strictEqual(fields[1].id, 3);
-                test.deepEqual(TFoo.extensions, [2, ProtoBuf.ID_MAX]); // Defined
-                test.deepEqual(TBar.extensions, [ProtoBuf.ID_MIN, ProtoBuf.ID_MAX]); // Undefined
+                test.deepEqual(TFoo.extensions, [[2, ProtoBuf.ID_MAX]]); // explicitly defined
+                test.strictEqual(TBar.extensions, undefined); // none defined
                 test.deepEqual(TBar.getChild("foo"), { builder: builder, parent: TBar, name: "foo", field: TFoo.getChild('.Bar.foo') });
                 test.strictEqual(TBar.getChildren(ProtoBuf.Reflect.Message.Field).length, 0);
                 var root = builder.build();
@@ -1272,7 +1296,8 @@
         },
 
         // Properly ignore "syntax" and "extensions" keywords
-        "gtfs-realtime": function(test) {
+        // The corresponding .proto file has been removed upon request
+        /* "gtfs-realtime": function(test) {
             try {
                 test.doesNotThrow(function() {
                     ProtoBuf.loadProtoFile(__dirname+"/gtfs-realtime.proto");
@@ -1281,7 +1306,7 @@
                 fail(e);
             }
             test.done();
-        },
+        }, */
 
         "delimited": function(test) {
             try {

package/.npmignore

@@ -1,3 +0,0 @@
-.idea
-node_modules/
-npm-debug.log