Properly parse text format options + simple test case, fixes #636

protobufjs · Jan 10, 2017 · 7e57f4c · 7e57f4c
1 parent fe4d97b
commit 7e57f4c
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 15 deletions.
diff --git a/dist/noparse/protobuf.js b/dist/noparse/protobuf.js
diff --git a/dist/noparse/protobuf.min.js b/dist/noparse/protobuf.min.js
diff --git a/dist/noparse/protobuf.min.js.gz b/dist/noparse/protobuf.min.js.gz
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/dist/runtime/protobuf.js b/dist/runtime/protobuf.js
diff --git a/dist/runtime/protobuf.min.js b/dist/runtime/protobuf.min.js
diff --git a/dist/runtime/protobuf.min.js.gz b/dist/runtime/protobuf.min.js.gz
diff --git a/src/parse.js b/src/parse.js
@@ -468,11 +468,10 @@ function parse(source, root, options) {
                 if (!isName(token))
                     throw illegal(token, "name");
 
-                name = name + "." + token;
                 if (skip(":", true))
-                    setOption(parent, name, readValue(true));
+                    setOption(parent, name + "." + token, readValue(true));
                 else
-                    parseOptionValue(parent, name);
+                    parseOptionValue(parent, name + "." + token);
             }
         } else
             setOption(parent, name, readValue(true));

diff --git a/tests/data/options-textformat.proto b/tests/data/options-textformat.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+import "google/protobuf/descriptor.proto";
+
+message MyOptions {
+  string a = 1;
+  string b = 2;
+}
+
+extend google.protobuf.FieldOptions {
+  MyOptions my_options = 50000;
+}
+
+message Test {
+  string value = 1 [(my_options) = { a: "foo" b: "bar" }];
+}
diff --git a/tests/options-textformat.js b/tests/options-textformat.js
@@ -0,0 +1,15 @@
+var tape = require("tape");
+
+var protobuf = require("..");
+
+tape.test("options in textformat", function(test) {
+
+    protobuf.load("tests/data/options-textformat.proto", function(err, root) {
+        if (err)
+            throw err;
+        var Test = root.lookup("Test");
+        test.same(Test.fields.value.options, { "(my_options).a": "foo", "(my_options).b": "bar" }, "should parse correctly");
+        test.end();
+    });
+
+});