Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
index 39444f7677eaa6e57e766fe547e9c8c6a2cbc776..31692a5afe40c1ba39ec2adcd162f3aca26bfa7d 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/host_resolver.mojom.dart
@@ -5,9 +5,12 @@
 library host_resolver_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/network_error.mojom.dart' as network_error_mojom;
 import 'package:mojo_services/mojo/net_address.mojom.dart' as net_address_mojom;
 
@@ -91,6 +94,27 @@ class _HostResolverGetHostAddressesParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _host_resolver_HostResolver_GetHostAddresses_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HostResolverGetHostAddressesParams'
+      ..fullIdentifier = 'mojo._HostResolverGetHostAddressesParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Host')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Family')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_net_address_NetAddressFamily__'
+    ..typeKey = '_net_address_NetAddressFamily__'
+  )),
+      ];
+}
 
 
 class HostResolverGetHostAddressesResponseParams extends bindings.Struct {
@@ -187,9 +211,64 @@ class HostResolverGetHostAddressesResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _host_resolver_HostResolver_GetHostAddresses_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HostResolverGetHostAddressesResponseParams'
+      ..fullIdentifier = 'mojo.HostResolverGetHostAddressesResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Result')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_network_error_NetworkError__'
+    ..typeKey = '_network_error_NetworkError__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Addresses')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..nullable = true
+    
+    ..elementType = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_net_address_NetAddress__'
+    ..typeKey = '_net_address_NetAddress__'
+  )))),
+      ];
+}
+
 
 const int _HostResolver_getHostAddressesName = 0;
 
+mojom_types.MojomInterface _host_resolver_HostResolver__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HostResolver'
+      ..fullIdentifier = 'mojo.HostResolver')
+    ..interfaceName = 'HostResolver'
+    ..methods = <int, mojom_types.MojomMethod>{
+_HostResolver_getHostAddressesName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetHostAddresses')
+        ..ordinal = _HostResolver_getHostAddressesName
+        ..responseParams = _host_resolver_HostResolver_GetHostAddresses_ResponseParams__()..parameters = _host_resolver_HostResolver_GetHostAddresses_Params__(),
+    };
+}
+
+class _HostResolverServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _host_resolver_HostResolver__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class HostResolver {
   static const String serviceName = null;
   dynamic getHostAddresses(String host,net_address_mojom.NetAddressFamily family,[Function responseFactory = null]);
@@ -211,6 +290,9 @@ class _HostResolverProxyImpl extends bindings.Proxy {
     return new _HostResolverProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HostResolverServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _HostResolver_getHostAddressesName:
@@ -398,6 +480,44 @@ class HostResolverStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HostResolverServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_host_resolver_HostResolver_GetHostAddresses_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _host_resolver_HostResolver_GetHostAddresses_Params__();
+map["_host_resolver_HostResolver_GetHostAddresses_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _host_resolver_HostResolver_GetHostAddresses_ResponseParams__();
+map["_host_resolver_HostResolver__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _host_resolver_HostResolver__();
+network_error_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+net_address_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;
+}
+