Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
index 55c58bdc36cd0d28e8d3246af026a4a944d6e70f..30cef0a1a71b3949550cd1753c8d1d6eadbe203e 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
@@ -5,9 +5,12 @@
 library service_registry_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;
 import 'package:mojo/mojo/service_provider.mojom.dart' as service_provider_mojom;
 
 
@@ -100,9 +103,57 @@ class _ServiceRegistryAddServicesParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _service_registry_ServiceRegistry_AddServices_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ServiceRegistryAddServicesParams'
+      ..fullIdentifier = 'mojo._ServiceRegistryAddServicesParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'InterfaceNames')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..elementType = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)))),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ServiceProvider')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_service_provider_ServiceProvider__'
+    ..typeKey = '_service_provider_ServiceProvider__'
+  )),
+      ];
+}
+
 
 const int _ServiceRegistry_addServicesName = 0;
 
+mojom_types.MojomInterface _service_registry_ServiceRegistry__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'ServiceRegistry'
+      ..fullIdentifier = 'mojo.ServiceRegistry')
+    ..interfaceName = 'ServiceRegistry'
+    ..methods = <int, mojom_types.MojomMethod>{
+_ServiceRegistry_addServicesName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AddServices')
+        ..ordinal = _ServiceRegistry_addServicesName..parameters = _service_registry_ServiceRegistry_AddServices_Params__(),
+    };
+}
+
+class _ServiceRegistryServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _service_registry_ServiceRegistry__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class ServiceRegistry {
   static const String serviceName = "mojo::ServiceRegistry";
   void addServices(List<String> interfaceNames, Object serviceProvider);
@@ -124,6 +175,9 @@ class _ServiceRegistryProxyImpl extends bindings.Proxy {
     return new _ServiceRegistryProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ServiceRegistryServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -268,6 +322,38 @@ class ServiceRegistryStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ServiceRegistryServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_service_registry_ServiceRegistry_AddServices_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _service_registry_ServiceRegistry_AddServices_Params__();
+map["_service_registry_ServiceRegistry__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _service_registry_ServiceRegistry__();
+service_provider_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+
+  return map;
 }
 
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}