Fixed: Properly parse nested textformat options, also tackles #655

protobufjs · Jan 21, 2017 · ef7be35 · ef7be35
1 parent 27b1635
commit ef7be35
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 36 deletions.
diff --git a/dist/light/protobuf.js b/dist/light/protobuf.js
diff --git a/dist/light/protobuf.min.js b/dist/light/protobuf.min.js
diff --git a/dist/light/protobuf.min.js.gz b/dist/light/protobuf.min.js.gz
diff --git a/dist/minimal/protobuf.js b/dist/minimal/protobuf.js
diff --git a/dist/minimal/protobuf.min.js b/dist/minimal/protobuf.min.js
diff --git a/dist/minimal/protobuf.min.js.gz b/dist/minimal/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/src/parse.js b/src/parse.js
@@ -494,24 +494,28 @@ function parse(source, root, options) {
     }
 
     function parseOptionValue(parent, name) {
-        if (skip("{", true)) {
-            while ((token = next()) !== "}") {
-
-                /* istanbul ignore next */
-                if (!isName(token))
+        if (skip("{", true)) { // { a: "foo" b { c: "bar" } }
+            /* istanbul ignore next */
+            do {
+                if (!isName(token = next()))
                     throw illegal(token, "name");
-
-                skip(":");
-                // if (skip(":", true))
-                    parent.setOption(name + "." + token, readValue(true));
-                // else
-                //     parseOptionValue(parent, name + "." + token);
-            }
+                if (peek() === "{")
+                    parseOptionValue(parent, name + "." + token);
+                else {
+                    skip(":");
+                    setOption(parent, name + "." + token, readValue(true));
+                }
+            } while (!skip("}", true));
         } else
-            parent.setOption(name, readValue(true));
+            setOption(parent, name, readValue(true));
         // Does not enforce a delimiter to be universal
     }
 
+    function setOption(parent, name, value) {
+        if (parent.setOption)
+            parent.setOption(name, value);
+    }
+
     function parseInlineOptions(parent) {
         if (skip("[", true)) {
             do {

diff --git a/tests/comp_options-textformat.js b/tests/comp_options-textformat.js
@@ -13,11 +13,13 @@ extend google.protobuf.FieldOptions {\
 }\
 message Test {\
   string value = 1 [(my_options) = { a: \"foo\" b: \"bar\" }];\
+  string value2 = 2 [(my_options) = { a: \"foo\" b { c: \"bar\" } }];\
 }";
 
 tape.test("options in textformat", function(test) {
     var root = protobuf.parse(proto).root;
     var Test = root.lookup("Test");
     test.same(Test.fields.value.options, { "(my_options).a": "foo", "(my_options).b": "bar" }, "should parse correctly");
+    test.same(Test.fields.value2.options, { "(my_options).a": "foo", "(my_options).b.c": "bar" }, "should parse correctly when nested");
     test.end();
 });
diff --git a/tests/data/uncommon.proto b/tests/data/uncommon.proto
@@ -41,6 +41,8 @@ enum Test3;
 
 enum Test4{
     option (custom).foo = "";
+    ONE = 1 [foo="bar"];
+    TWO = 2 [(my_options) = { a: "foo" b { c: "bar" } }];
 };
 
 service Test5;