protobufjs 3.6.0 → 3.8.2

package/tests/oneof.proto

@@ -0,0 +1,6 @@
+message MyOneOf {
+    oneof my_oneof {
+        uint32 id = 1;
+        string name = 2;
+    }
+}

package/tests/options.json

@@ -1,32 +1,32 @@
-{
-    "package": "My",
-    "messages": [
-        {
-            "name": "Test",
-            "fields": [
-                {
-                    "rule": "optional",
-                    "options": {
-                        "default": "Max"
-                    },
-                    "type": "string",
-                    "name": "name",
-                    "id": 1
-                }
-            ],
-            "enums": [],
-            "messages": [],
-            "options": {
-                "(inmessage)": "My.Test",
-                "(foo.my_option).bar": false
-            }
-        }
-    ],
-    "enums": [],
-    "imports": [],
-    "options": {
-        "(toplevel_1)": 10,
-        "(toplevel_2)": "Hello world!"
-    },
-    "services": []
-}
+{
+    "package": "My",
+    "messages": [
+        {
+            "name": "Test",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "options": {
+                        "default": "Max"
+                    },
+                    "type": "string",
+                    "name": "name",
+                    "id": 1
+                }
+            ],
+            "enums": [],
+            "messages": [],
+            "options": {
+                "(inmessage)": "My.Test",
+                "(foo.my_option).bar": false
+            }
+        }
+    ],
+    "enums": [],
+    "imports": [],
+    "options": {
+        "(toplevel_1)": 10,
+        "(toplevel_2)": "Hello world!"
+    },
+    "services": []
+}

package/tests/options.proto

@@ -4,6 +4,8 @@ option (toplevel_2) = "Hello world!";
 
 message Test {
     optional string name = 1 [default="Max"];
+    optional string desc1 = 2 [default="Shouldn't mix quotes"];
+    optional string desc2 = 3 [default='Shouldn"t mix quotes'];
     option (inmessage) = My.Test;
     option (foo.my_option).bar = false;
 }

package/tests/proto2js/Bar.json

@@ -1,46 +1,46 @@
-{
-    "package": null,
-    "messages": [
-        {
-            "ref": "Foo",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "buzz",
-                    "id": 2,
-                    "options": {}
-                }
-            ]
-        }
-    ],
-    "enums": [],
-    "imports": [
-        {
-            "package": null,
-            "messages": [
-                {
-                    "name": "Foo",
-                    "fields": [
-                        {
-                            "rule": "required",
-                            "type": "string",
-                            "name": "fizz",
-                            "id": 1,
-                            "options": {}
-                        }
-                    ],
-                    "enums": [],
-                    "messages": [],
-                    "options": {}
-                }
-            ],
-            "enums": [],
-            "imports": [],
-            "options": {},
-            "services": []
-        }
-    ],
-    "options": {},
-    "services": []
-}
+{
+    "package": null,
+    "messages": [
+        {
+            "ref": "Foo",
+            "fields": [
+                {
+                    "rule": "required",
+                    "type": "string",
+                    "name": "buzz",
+                    "id": 2,
+                    "options": {}
+                }
+            ]
+        }
+    ],
+    "enums": [],
+    "imports": [
+        {
+            "package": null,
+            "messages": [
+                {
+                    "name": "Foo",
+                    "fields": [
+                        {
+                            "rule": "required",
+                            "type": "string",
+                            "name": "fizz",
+                            "id": 1,
+                            "options": {}
+                        }
+                    ],
+                    "enums": [],
+                    "messages": [],
+                    "options": {}
+                }
+            ],
+            "enums": [],
+            "imports": [],
+            "options": {},
+            "services": []
+        }
+    ],
+    "options": {},
+    "services": []
+}

package/tests/suite.js

@@ -877,6 +877,28 @@
             }
             test.done();
         },
+
+        "importExtensions": function(test) {
+            var x = "package x; \
+            message Test { \
+                extensions 1 to 10; \
+            } \
+            extend Test { \
+                optional int32 first_val = 1; \
+            }";
+            var y = "package y; \
+            extend x.Test { \
+                optional int32 second_val = 2; \
+            }";
+            var builder = ProtoBuf.newBuilder();
+            ProtoBuf.loadProto(x, builder);
+            ProtoBuf.loadProto(y, builder);
+            var Test = builder.build('x.Test');
+            var inst = new Test();
+            test.strictEqual(inst[".x.first_val"], null);
+            test.strictEqual(inst[".y.second_val"], null);
+            test.done();
+        },
         
         "toplevel": function(test) {
             try {
@@ -987,7 +1009,8 @@
                             "extensions": [
                                 2,
                                 536870911
-                            ]
+                            ],
+                            "oneofs": []
                         },
                         {
                             "ref": "Foo",
@@ -1011,7 +1034,8 @@
                                     "fields": [],
                                     "enums": [],
                                     "messages": [],
-                                    "options": {}
+                                    "options": {},
+                                    "oneofs": []
                                 },
                                 {
                                     "ref": ".Foo",
@@ -1026,7 +1050,8 @@
                                     ]
                                 }
                             ],
-                            "options": {}
+                            "options": {},
+                            "oneofs": []
                         }
                     ],
                     "enums": [],
@@ -1036,7 +1061,7 @@
                     "options": {},
                     "services": []
                 });
-                
+
                 var builder = ProtoBuf.loadProtoFile(__dirname+"/extend.proto");
                 var TFoo = builder.lookup(".Foo"),
                     TBar = builder.lookup(".Bar"),
@@ -1049,7 +1074,7 @@
                 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(TBar.getChild("foo"), { parent: TBar, name: "foo", field: TFoo.getChild('.Bar.foo') });
+                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();
                 test.strictEqual(TFoo.getChild(".Bar.foo").resolvedType, TBarFoo); // .Bar.Foo, not .Foo
@@ -1080,6 +1105,31 @@
             }
             test.done();
         },
+
+        "oneofs": 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 bb = myOneOf.encode().compact();
+                test.strictEqual(bb.toString("debug"), "<12 02 6D 65>"); // id 2, wt 2, len 2
+                myOneOf = MyOneOf.decode(bb);
+                test.strictEqual(myOneOf.my_oneof, "name");
+                test.strictEqual(myOneOf.name, "me");
+                test.strictEqual(myOneOf.id, null);
+            } catch (e) {
+                fail(e);
+            }
+            test.done();
+        },
         
         "services": function(test) {
             try {
@@ -1441,14 +1491,12 @@
         
         "toRaw": function(test) {
             try {
-                var builder = ProtoBuf.loadProto("message MyMessage { required int32 a = 1; required int32 b = 2; }"),
+                var builder = ProtoBuf.loadProto("message MyMessage { required int32 a = 1; required int32 b = 2; required bytes c = 3; }"),
                     MyMessage = builder.build("MyMessage");
-                var raw = { a: 1, b: 2 },
+                var raw = { a: 1, b: 2, c: "YWJj" },
                     myMessage = new MyMessage(raw);
-                test.deepEqual(myMessage, raw);
-                test.strictEqual(myMessage.encode, MyMessage.prototype.encode);
-                test.deepEqual(myMessage.toRaw(), raw);
-                test.strictEqual(myMessage.toRaw().encode, undefined);
+                test.deepEqual(myMessage.c.toBase64(), raw.c);
+                test.deepEqual(myMessage.toRaw(true), raw);
             } catch (e) {
                 fail(e);
             }
@@ -1564,6 +1612,26 @@
             test.done();
         },
 
+        "builderOptions": function(test) {
+            try {
+                var proto = "message Foo { optional uint32 foo_bar = 1; }";
+                var builder = ProtoBuf.newBuilder({
+                    convertFieldsToCamelCase: true
+                });
+                ProtoBuf.loadProto(proto, builder, "tests/builderOptions.proto");
+                var Foo = builder.build("Foo");
+                test.strictEqual(ProtoBuf.convertFieldsToCamelCase, false);
+                test.strictEqual(builder.options.convertFieldsToCamelCase, true);
+                var foo = new Foo();
+                test.ok(typeof foo.fooBar !== 'undefined');
+                test.ok(typeof foo.foo_bar === 'undefined');
+                test.done();
+            } catch (e) {
+                fail(e);
+            }
+            test.done();
+        },
+
         // Node.js only
         "loaders": BROWSER ? {} : {
             
@@ -1573,10 +1641,13 @@
                   , util = require('util');
         
                 var code = fs.readFileSync(__dirname+"/../dist/"+FILE);
+                var exports = {};
                 var sandbox = new Sandbox({
                     module: {
-                        exports: {}
+                        exports: exports,
+                        id: "protobufjs"
                     },
+                    exports: exports,
                     require: (function() {
                         function require(mod) {
                             if (mod == 'bytebuffer') require.called = true;

package/.idea/.name

@@ -1 +0,0 @@
-ProtoBuf

package/.idea/ProtoBuf.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-

package/.idea/dictionaries/Daniel.xml

@@ -1,7 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="Daniel">
-    <words>
-      <w>accessors</w>
-    </words>
-  </dictionary>
-</component>

package/.idea/encodings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

package/.idea/misc.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" />
-</project>
-

package/.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/ProtoBuf.iml" filepath="$PROJECT_DIR$/.idea/ProtoBuf.iml" />
-    </modules>
-  </component>
-</project>
-

package/.idea/scopes/scope_settings.xml

@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>

package/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-