Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
index fbd4aab0923254b477072aeaa6608ab67e855646..a55fbe02fe83a864d5855642637f245d43334d2d 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
@@ -5,9 +5,12 @@
 library echo_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;
 
 
 
@@ -76,6 +79,18 @@ class _EchoServiceEchoStringParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _echo_service_EchoService_EchoString_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_EchoServiceEchoStringParams'
+      ..fullIdentifier = 'test._EchoServiceEchoStringParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Value')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      ];
+}
 
 
 class EchoServiceEchoStringResponseParams extends bindings.Struct {
@@ -143,6 +158,18 @@ class EchoServiceEchoStringResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _echo_service_EchoService_EchoString_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'EchoServiceEchoStringResponseParams'
+      ..fullIdentifier = 'test.EchoServiceEchoStringResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Value')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      ];
+}
 
 
 class _EchoServiceDelayedEchoStringParams extends bindings.Struct {
@@ -219,6 +246,22 @@ class _EchoServiceDelayedEchoStringParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _echo_service_EchoService_DelayedEchoString_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_EchoServiceDelayedEchoStringParams'
+      ..fullIdentifier = 'test._EchoServiceDelayedEchoStringParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Value')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Millis')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.int32),
+      ];
+}
 
 
 class EchoServiceDelayedEchoStringResponseParams extends bindings.Struct {
@@ -286,10 +329,52 @@ class EchoServiceDelayedEchoStringResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _echo_service_EchoService_DelayedEchoString_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'EchoServiceDelayedEchoStringResponseParams'
+      ..fullIdentifier = 'test.EchoServiceDelayedEchoStringResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Value')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      ];
+}
+
 
 const int _EchoService_echoStringName = 0;
 const int _EchoService_delayedEchoStringName = 1;
 
+mojom_types.MojomInterface _echo_service_EchoService__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'EchoService'
+      ..fullIdentifier = 'test.EchoService')
+    ..interfaceName = 'EchoService'
+    ..methods = <int, mojom_types.MojomMethod>{
+_EchoService_echoStringName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'EchoString')
+        ..ordinal = _EchoService_echoStringName
+        ..responseParams = _echo_service_EchoService_EchoString_ResponseParams__()..parameters = _echo_service_EchoService_EchoString_Params__(),_EchoService_delayedEchoStringName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'DelayedEchoString')
+        ..ordinal = _EchoService_delayedEchoStringName
+        ..responseParams = _echo_service_EchoService_DelayedEchoString_ResponseParams__()..parameters = _echo_service_EchoService_DelayedEchoString_Params__(),
+    };
+}
+
+class _EchoServiceServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _echo_service_EchoService__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class EchoService {
   static const String serviceName = "test::EchoService";
   dynamic echoString(String value,[Function responseFactory = null]);
@@ -312,6 +397,9 @@ class _EchoServiceProxyImpl extends bindings.Proxy {
     return new _EchoServiceProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _EchoServiceServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _EchoService_echoStringName:
@@ -554,6 +642,44 @@ class EchoServiceStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _EchoServiceServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_echo_service_EchoService_EchoString_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _echo_service_EchoService_EchoString_Params__();
+map["_echo_service_EchoService_EchoString_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _echo_service_EchoService_EchoString_ResponseParams__();
+map["_echo_service_EchoService_DelayedEchoString_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _echo_service_EchoService_DelayedEchoString_Params__();
+map["_echo_service_EchoService_DelayedEchoString_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _echo_service_EchoService_DelayedEchoString_ResponseParams__();
+map["_echo_service_EchoService__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _echo_service_EchoService__();
+
+  return map;
+}
+
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}
+