Integrated internal changes from Google

This includes all internal changes from around May 20 to now.

1 files changed, 29 insertions, 0 deletions

diff --git a/js/testbinary.proto b/js/testbinary.proto
index 60c70190..a3fcb5f1 100644
--- a/js/testbinary.proto
+++ b/js/testbinary.proto
@@ -183,3 +183,32 @@ extend TestExtendable {
       [packed=true];
 
 }
+
+message TestMapFields {
+  option (jspb.generate_from_object) = true;
+
+  map<string, string> map_string_string = 1;
+  map<string, int32> map_string_int32 = 2;
+  map<string, int64> map_string_int64 = 3;
+  map<string, bool> map_string_bool = 4;
+  map<string, double> map_string_double = 5;
+  map<string, MapValueEnum> map_string_enum = 6;
+  map<string, MapValueMessage> map_string_msg = 7;
+
+  map<int32, string> map_int32_string = 8;
+  map<int64, string> map_int64_string = 9;
+  map<bool, string> map_bool_string = 10;
+
+  optional TestMapFields test_map_fields = 11;
+  map<string, TestMapFields> map_string_testmapfields = 12;
+}
+
+enum MapValueEnum {
+  MAP_VALUE_FOO = 0;
+  MAP_VALUE_BAR = 1;
+  MAP_VALUE_BAZ = 2;
+}
+
+message MapValueMessage {
+  optional int32 foo = 1;
+}