Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo/lib/mojo/application.mojom.dart

Index: mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
diff --git a/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
index 9f9b9bcb623a63f8cb6861a4c4b7d0efd68d5bad..57a09c6ff36eda8972826d64ef2a7e4689057d8a 100644
--- a/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
+++ b/mojo/dart/packages/mojo/lib/mojo/application.mojom.dart
@@ -5,9 +5,12 @@
 library application_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;
 import 'package:mojo/mojo/shell.mojom.dart' as shell_mojom;
 
@@ -111,6 +114,35 @@ class _ApplicationInitializeParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _application_Application_Initialize_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ApplicationInitializeParams'
+      ..fullIdentifier = 'mojo._ApplicationInitializeParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Shell')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_shell_Shell__'
+    ..typeKey = '_shell_Shell__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Args')
+        ..type = (new mojom_types.Type()..arrayType = (new mojom_types.ArrayType()
+    ..nullable = true
+    
+    ..elementType = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)))),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Url')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
 
 
 class _ApplicationAcceptConnectionParams extends bindings.Struct {
@@ -201,6 +233,46 @@ class _ApplicationAcceptConnectionParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _application_Application_AcceptConnection_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ApplicationAcceptConnectionParams'
+      ..fullIdentifier = 'mojo._ApplicationAcceptConnectionParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RequestorUrl')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Services')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_service_provider_ServiceProvider__'
+    ..typeKey = '_service_provider_ServiceProvider__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ExposedServices')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+    ..nullable = true
+  
+  
+    ..identifier = '_service_provider_ServiceProvider__'
+    ..typeKey = '_service_provider_ServiceProvider__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ResolvedUrl')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      ];
+}
 
 
 class _ApplicationRequestQuitParams extends bindings.Struct {
@@ -259,11 +331,48 @@ class _ApplicationRequestQuitParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _application_Application_RequestQuit_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_ApplicationRequestQuitParams'
+      ..fullIdentifier = 'mojo._ApplicationRequestQuitParams')
+    ..fields = <mojom_types.StructField>[];
+}
+
 
 const int _Application_initializeName = 0;
 const int _Application_acceptConnectionName = 1;
 const int _Application_requestQuitName = 2;
 
+mojom_types.MojomInterface _application_Application__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Application'
+      ..fullIdentifier = 'mojo.Application')
+    ..interfaceName = 'Application'
+    ..methods = <int, mojom_types.MojomMethod>{
+_Application_initializeName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Initialize')
+        ..ordinal = _Application_initializeName..parameters = _application_Application_Initialize_Params__(),_Application_acceptConnectionName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'AcceptConnection')
+        ..ordinal = _Application_acceptConnectionName..parameters = _application_Application_AcceptConnection_Params__(),_Application_requestQuitName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'RequestQuit')
+        ..ordinal = _Application_requestQuitName..parameters = _application_Application_RequestQuit_Params__(),
+    };
+}
+
+class _ApplicationServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _application_Application__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class Application {
   static const String serviceName = null;
   void initialize(Object shell, List<String> args, String url);
@@ -287,6 +396,9 @@ class _ApplicationProxyImpl extends bindings.Proxy {
     return new _ApplicationProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ApplicationServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -462,6 +574,47 @@ class ApplicationStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _ApplicationServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_application_Application_Initialize_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _application_Application_Initialize_Params__();
+map["_application_Application_AcceptConnection_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _application_Application_AcceptConnection_Params__();
+map["_application_Application_RequestQuit_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _application_Application_RequestQuit_Params__();
+map["_application_Application__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _application_Application__();
+service_provider_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+shell_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;
+}
+