4 files changed, 41 insertions(+), 5 deletions(-)

A eg/nested.proto
M lib/Protobuf/Actions.rakumod
M lib/Protobuf/Grammar.rakumod
A t/04-nested.rakutest

@@ 0,0 1,22 @@
+syntax = "proto3";
+
+package helloworld;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply) {}
+  rpc Echo (EchoRequest) returns (HelloReply) {}
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+}
+
+message EchoRequest {
+  HelloRequest hello = 1;
+  string world = 2;
+}
+

@@ 26,11 26,10 @@ class Protobuf::Actions {
     my @things := $<proto>.made.List;
     my @services = @things.grep( * ~~ Protobuf::Service );
     my @messages = @things.grep( * ~~ Protobuf::Message );
-    my %messages = @messages.map: { .name => $_ }
     for @services -> $s {
       for $s.endpoints -> $e {
-        $e.request = %messages{ $e.request.name };
-        $e.response = %messages{ $e.response.name };
+        $e.request = %*messages{ $e.request.name };
+        $e.response = %*messages{ $e.response.name };
       }
     }
     $/.make: Protobuf::Definition.new: :@services, :@messages;


@@ 45,7 44,11 @@ class Protobuf::Actions {
   }
 
   method message($/) {
-    $/.make: Protobuf::Message.new( name => ~$<messageName>, fields => $<messageBody>.made )
+    my $name = ~$<messageName>;
+    my @fields = $<messageBody>.made;
+    my $msg =  Protobuf::Message.new( :$name, :@fields );
+    %*messages{ $name } = $msg;
+    $/.make: $msg;
   }
 
   method messageBody($/) {


@@ 53,7 56,8 @@ class Protobuf::Actions {
   }
 
   method field($/) {
-    $/.make: Protobuf::Field.new( name => ~$<fieldName>, type => ~$<type> );
+    my $type = ~$<type>;
+    $/.make: Protobuf::Field.new( name => ~$<fieldName>, type => %*messages{ $type } // $type );
   }
 
   method service($/) {

@@ 290,6 290,7 @@ rule topLevelDef {
 }
 
 rule TOP {
+  :my %*messages;
   [ \s
     | [ '//' \V* [$|\n] ]
   ]*

@@ 0,0 1,9 @@
+use Protobuf;
+use Test;
+
+my $m = parse-proto($?FILE.IO.parent.parent.child('eg/nested.proto').slurp);
+my @services = $m.services;
+is @services[0].endpoints[1].request.fields[0].type.name, 'HelloRequest', 'type name';
+is @services[0].endpoints[1].request.fields[0].type.fields[0].name, 'name', 'type has nested attributes';
+
+done-testing;