Fix treatment of nested messages.

Incorporates changes to protobuf-javascript library from
gonzojive/protobuf-javascript#3.

Author: reddaly

e2e/typescript_proto_usage/greeting.proto

@@ -1,51 +1,63 @@
 syntax = "proto3";
 
-package com.example.greeting.v1;
+package com.example.greeting.v3;
 
 import "github.com/gonzojive/rules_ts_proto/example/prefix/location/location.proto";
 
 option java_multiple_files = true;
 
 message GreetingRequest {
-    string name = 1;
-    .someorg.type.Position origin = 2;
-
-    message Greeting {
-        string message = 1;
-    }
-    Greeting greeting_message = 3;
+  string name = 1;
+  .someorg.type.Position origin = 2;
+
+  message Greeting {
+    int32 unimportant_field = 1;
+    string message = 5;
+  }
+  Greeting greeting_message = 3;
 }
 
 message GreetingResponse {
-    string greeting = 1;
+  string greeting = 1;
 }
 
 service GreetingService {
-    rpc greet(GreetingRequest) returns (GreetingResponse);
+  rpc greet(GreetingRequest) returns (GreetingResponse);
 }
 
 enum TopLevelEnumExample {
-    EXAMPLE_ENUM_VALUE_1 = 0;
-    THINGY2 = 2;
+  EXAMPLE_ENUM_VALUE_1 = 0;
+  THINGY2 = 2;
 }
 
 message Foo {
-    message Bar {}
+  message Bar {}
 }
 
 message RepeatedThing {
-    repeated string child_strings = 1;
+  repeated string child_strings = 1;
 
-    repeated .someorg.type.Position child_positions = 2;
+  repeated .someorg.type.Position child_positions = 2;
 
-    repeated GreetingRequest child_requests = 3;
-    repeated TopLevelEnumExample child_enums = 4;
-    repeated Foo.Bar child_bars = 5;
+  repeated GreetingRequest child_requests = 3;
+  repeated TopLevelEnumExample child_enums = 4;
+  repeated Foo.Bar child_bars = 5;
 }
 
 message MutuallyExclusiveThing {
-    oneof some_value {
-        string mutex_string = 1;
-        .someorg.type.Position mutex_position = 2;
+  oneof some_value {
+    string mutex_string = 1;
+    .someorg.type.Position mutex_position = 2;
+  }
+}
+
+message Ancestor1 {
+  message Ancestor2 {
+    message Ancestor3 {
+      int32 ignored1 = 1;
+      int32 ignored2 = 2;
+      int32 ignored3 = 3;
+      string value = 4;
     }
-}
+  }
+}

e2e/typescript_proto_usage/tests/greeting_jasmine/greeting.spec.js

@@ -1,4 +1,4 @@
-import { GreetingRequest, TopLevelEnumExample, RepeatedThing } from "../../greeting_pb.mjs"
+import { Ancestor1, GreetingRequest, TopLevelEnumExample, RepeatedThing } from "../../greeting_pb.mjs"
 import { Position } from "../../location/location_pb.mjs"
 //import { GreetingRequest } from "../../greeting_pb";
 
@@ -28,6 +28,15 @@ describe("lib", () => {
     expect(requestRoundtripped.getGreetingMessage().getMessage()).toBe(message);
   });
 
+  it("sub-sub types should be serializable", () => {
+    const input = new Ancestor1.Ancestor2.Ancestor3()
+        .setValue("xyz");
+    const inputRoundtripped = Ancestor1.Ancestor2.Ancestor3.deserializeBinary(
+      input.serializeBinary());
+    expect(input.getValue()).toBe("xyz");
+    expect(inputRoundtripped.getValue()).toBe("xyz");
+  });
+
   it("should be serializable with repeated fields", () => {
     const object = new RepeatedThing().setChildStringsList(["x", "y"]);
     const roundtripped = RepeatedThing.deserializeBinary(object.serializeBinary());

ts_proto/repositories.bzl

@@ -45,7 +45,7 @@ def rules_ts_proto_dependencies():
 
     git_repository(
         name = "com_google_protobuf_javascript",
-        commit = "dfa5a70a44926f183bdf4fd001dcca869a4f4ad6",
+        commit = "d3ce92c081bd585dc6079609a868744b5e3033fe",
         remote = "https://github.com/gonzojive/protobuf-javascript.git",
     )