Generate Mojom Types in Dart (Take 2)

mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal_client.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal_client.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal_client.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal_client.mojom.dart
index a93be5dab65ad13494b313b58cf7204e9f6bd5a9..049e8130e7b4657cd40bb3f86ccc5ab0da63ea1f 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal_client.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal_client.mojom.dart
@@ -5,9 +5,12 @@
 library terminal_client_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_services/mojo/files/file.mojom.dart' as file_mojom;
 
 
@@ -76,9 +79,51 @@ class _TerminalClientConnectToTerminalParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _terminal_client_TerminalClient_ConnectToTerminal_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_TerminalClientConnectToTerminalParams'
+      ..fullIdentifier = 'mojo.terminal._TerminalClientConnectToTerminalParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Terminal')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_file_File__'
+    ..typeKey = '_file_File__'
+  )),
+      ];
+}
+
 
 const int _TerminalClient_connectToTerminalName = 0;
 
+mojom_types.MojomInterface _terminal_client_TerminalClient__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'TerminalClient'
+      ..fullIdentifier = 'mojo.terminal.TerminalClient')
+    ..interfaceName = 'TerminalClient'
+    ..methods = <int, mojom_types.MojomMethod>{
+_TerminalClient_connectToTerminalName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ConnectToTerminal')
+        ..ordinal = _TerminalClient_connectToTerminalName..parameters = _terminal_client_TerminalClient_ConnectToTerminal_Params__(),
+    };
+}
+
+class _TerminalClientServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _terminal_client_TerminalClient__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class TerminalClient {
   static const String serviceName = "mojo::terminal::TerminalClient";
   void connectToTerminal(Object terminal);
@@ -100,6 +145,9 @@ class _TerminalClientProxyImpl extends bindings.Proxy {
     return new _TerminalClientProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _TerminalClientServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -243,6 +291,38 @@ class TerminalClientStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _TerminalClientServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_terminal_client_TerminalClient_ConnectToTerminal_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_client_TerminalClient_ConnectToTerminal_Params__();
+map["_terminal_client_TerminalClient__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _terminal_client_TerminalClient__();
+file_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;
+}
+