Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
index ba9d67d22c64ee12db3d9043ec0d037819accf12..2c2abaebc46bb70eaa8644f9e55c6dd6924a1a3c 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
@@ -5,9 +5,12 @@
 library pingpong_service_mojom;
 
 import 'dart:async';
+import 'dart:collection';
 
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
+import 'package:mojo/mojo/bindings/types/mojom_types.mojom.dart' as mojom_types;
+import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 
 
 
@@ -75,6 +78,22 @@ class _PingPongServiceSetClientParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_SetClient_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongServiceSetClientParams'
+      ..fullIdentifier = 'test._PingPongServiceSetClientParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Client')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_pingpong_service_PingPongClient__'
+    ..typeKey = '_pingpong_service_PingPongClient__'
+  )),
+      ];
+}
 
 
 class _PingPongServicePingParams extends bindings.Struct {
@@ -142,6 +161,17 @@ class _PingPongServicePingParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_Ping_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongServicePingParams'
+      ..fullIdentifier = 'test._PingPongServicePingParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'PingValue')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      ];
+}
 
 
 class _PingPongServicePingTargetUrlParams extends bindings.Struct {
@@ -218,6 +248,22 @@ class _PingPongServicePingTargetUrlParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_PingTargetURL_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongServicePingTargetUrlParams'
+      ..fullIdentifier = 'test._PingPongServicePingTargetUrlParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Url')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Count')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      ];
+}
 
 
 class PingPongServicePingTargetUrlResponseParams extends bindings.Struct {
@@ -285,6 +331,17 @@ class PingPongServicePingTargetUrlResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_PingTargetURL_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'PingPongServicePingTargetUrlResponseParams'
+      ..fullIdentifier = 'test.PingPongServicePingTargetUrlResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ok')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class _PingPongServicePingTargetServiceParams extends bindings.Struct {
@@ -359,6 +416,26 @@ class _PingPongServicePingTargetServiceParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_PingTargetService_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongServicePingTargetServiceParams'
+      ..fullIdentifier = 'test._PingPongServicePingTargetServiceParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Service')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_pingpong_service_PingPongService__'
+    ..typeKey = '_pingpong_service_PingPongService__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Count')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      ];
+}
 
 
 class PingPongServicePingTargetServiceResponseParams extends bindings.Struct {
@@ -426,6 +503,17 @@ class PingPongServicePingTargetServiceResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_PingTargetService_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'PingPongServicePingTargetServiceResponseParams'
+      ..fullIdentifier = 'test.PingPongServicePingTargetServiceResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ok')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class _PingPongServiceGetPingPongServiceParams extends bindings.Struct {
@@ -492,6 +580,23 @@ class _PingPongServiceGetPingPongServiceParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_GetPingPongService_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongServiceGetPingPongServiceParams'
+      ..fullIdentifier = 'test._PingPongServiceGetPingPongServiceParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Service')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_pingpong_service_PingPongService__'
+    ..typeKey = '_pingpong_service_PingPongService__'
+  )),
+      ];
+}
 
 
 class _PingPongServiceQuitParams extends bindings.Struct {
@@ -550,6 +655,13 @@ class _PingPongServiceQuitParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongService_Quit_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongServiceQuitParams'
+      ..fullIdentifier = 'test._PingPongServiceQuitParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class _PingPongClientPongParams extends bindings.Struct {
@@ -617,6 +729,18 @@ class _PingPongClientPongParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _pingpong_service_PingPongClient_Pong_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_PingPongClientPongParams'
+      ..fullIdentifier = 'test._PingPongClientPongParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'PongValue')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      ];
+}
+
 
 const int _PingPongService_setClientName = 0;
 const int _PingPongService_pingName = 1;
@@ -625,6 +749,43 @@ const int _PingPongService_pingTargetServiceName = 3;
 const int _PingPongService_getPingPongServiceName = 4;
 const int _PingPongService_quitName = 5;
 
+mojom_types.MojomInterface _pingpong_service_PingPongService__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'PingPongService'
+      ..fullIdentifier = 'test.PingPongService')
+    ..interfaceName = 'PingPongService'
+    ..methods = <int, mojom_types.MojomMethod>{
+_PingPongService_setClientName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SetClient')
+        ..ordinal = _PingPongService_setClientName..parameters = _pingpong_service_PingPongService_SetClient_Params__(),_PingPongService_pingName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Ping')
+        ..ordinal = _PingPongService_pingName..parameters = _pingpong_service_PingPongService_Ping_Params__(),_PingPongService_pingTargetUrlName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'PingTargetUrl')
+        ..ordinal = _PingPongService_pingTargetUrlName
+        ..responseParams = _pingpong_service_PingPongService_PingTargetURL_ResponseParams__()..parameters = _pingpong_service_PingPongService_PingTargetURL_Params__(),_PingPongService_pingTargetServiceName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'PingTargetService')
+        ..ordinal = _PingPongService_pingTargetServiceName
+        ..responseParams = _pingpong_service_PingPongService_PingTargetService_ResponseParams__()..parameters = _pingpong_service_PingPongService_PingTargetService_Params__(),_PingPongService_getPingPongServiceName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetPingPongService')
+        ..ordinal = _PingPongService_getPingPongServiceName..parameters = _pingpong_service_PingPongService_GetPingPongService_Params__(),_PingPongService_quitName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Quit')
+        ..ordinal = _PingPongService_quitName..parameters = _pingpong_service_PingPongService_Quit_Params__(),
+    };
+}
+
+class _PingPongServiceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _pingpong_service_PingPongService__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class PingPongService {
   static const String serviceName = "test::PingPongService";
   void setClient(Object client);
@@ -651,6 +812,9 @@ class _PingPongServiceProxyImpl extends bindings.Proxy {
     return new _PingPongServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _PingPongServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _PingPongService_pingTargetUrlName:
@@ -949,10 +1113,39 @@ class PingPongServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _PingPongServiceServiceDescription();
 }
 
 const int _PingPongClient_pongName = 0;
 
+mojom_types.MojomInterface _pingpong_service_PingPongClient__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'PingPongClient'
+      ..fullIdentifier = 'test.PingPongClient')
+    ..interfaceName = 'PingPongClient'
+    ..methods = <int, mojom_types.MojomMethod>{
+_PingPongClient_pongName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Pong')
+        ..ordinal = _PingPongClient_pongName..parameters = _pingpong_service_PingPongClient_Pong_Params__(),
+    };
+}
+
+class _PingPongClientServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _pingpong_service_PingPongClient__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class PingPongClient {
   static const String serviceName = null;
   void pong(int pongValue);
@@ -974,6 +1167,9 @@ class _PingPongClientProxyImpl extends bindings.Proxy {
     return new _PingPongClientProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _PingPongClientServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -1117,6 +1313,62 @@ class PingPongClientStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _PingPongClientServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_pingpong_service_PingPongService_SetClient_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_SetClient_Params__();
+map["_pingpong_service_PingPongService_Ping_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_Ping_Params__();
+map["_pingpong_service_PingPongService_PingTargetURL_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_PingTargetURL_Params__();
+map["_pingpong_service_PingPongService_PingTargetURL_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_PingTargetURL_ResponseParams__();
+map["_pingpong_service_PingPongService_PingTargetService_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_PingTargetService_Params__();
+map["_pingpong_service_PingPongService_PingTargetService_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_PingTargetService_ResponseParams__();
+map["_pingpong_service_PingPongService_GetPingPongService_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_GetPingPongService_Params__();
+map["_pingpong_service_PingPongService_Quit_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongService_Quit_Params__();
+map["_pingpong_service_PingPongClient_Pong_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _pingpong_service_PingPongClient_Pong_Params__();
+map["_pingpong_service_PingPongService__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _pingpong_service_PingPongService__();
+map["_pingpong_service_PingPongClient__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _pingpong_service_PingPongClient__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+