Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
index d07f1234f8f50311890009566bc1c6814ae72c2b..fa9a5c8b4ffcb401b3237a7cbbcd0fc16e994b4f 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/terminal/terminal.mojom.dart
@@ -5,9 +5,12 @@
 library terminal_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;
 import 'package:mojo_services/mojo/files/types.mojom.dart' as types_mojom;
 import 'package:mojo_services/mojo/terminal/terminal_client.mojom.dart' as terminal_client_mojom;
@@ -86,6 +89,27 @@ class _TerminalConnectParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_Connect_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_TerminalConnectParams'
+      ..fullIdentifier = 'mojo.terminal._TerminalConnectParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalFile')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_file_File__'
+    ..typeKey = '_file_File__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Force')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class TerminalConnectResponseParams extends bindings.Struct {
@@ -157,6 +181,22 @@ class TerminalConnectResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_Connect_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'TerminalConnectResponseParams'
+      ..fullIdentifier = 'mojo.terminal.TerminalConnectResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_types_Error__'
+    ..typeKey = '_types_Error__'
+  )),
+      ];
+}
 
 
 class _TerminalConnectToClientParams extends bindings.Struct {
@@ -231,6 +271,26 @@ class _TerminalConnectToClientParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_ConnectToClient_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_TerminalConnectToClientParams'
+      ..fullIdentifier = 'mojo.terminal._TerminalConnectToClientParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'TerminalClient')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_terminal_client_TerminalClient__'
+    ..typeKey = '_terminal_client_TerminalClient__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Force')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class TerminalConnectToClientResponseParams extends bindings.Struct {
@@ -302,6 +362,22 @@ class TerminalConnectToClientResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_ConnectToClient_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'TerminalConnectToClientResponseParams'
+      ..fullIdentifier = 'mojo.terminal.TerminalConnectToClientResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_types_Error__'
+    ..typeKey = '_types_Error__'
+  )),
+      ];
+}
 
 
 class _TerminalGetSizeParams extends bindings.Struct {
@@ -360,6 +436,13 @@ class _TerminalGetSizeParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_GetSize_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_TerminalGetSizeParams'
+      ..fullIdentifier = 'mojo.terminal._TerminalGetSizeParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class TerminalGetSizeResponseParams extends bindings.Struct {
@@ -449,6 +532,30 @@ class TerminalGetSizeResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_GetSize_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'TerminalGetSizeResponseParams'
+      ..fullIdentifier = 'mojo.terminal.TerminalGetSizeResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_types_Error__'
+    ..typeKey = '_types_Error__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Rows')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Columns')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
 
 
 class _TerminalSetSizeParams extends bindings.Struct {
@@ -534,6 +641,25 @@ class _TerminalSetSizeParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_SetSize_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_TerminalSetSizeParams'
+      ..fullIdentifier = 'mojo.terminal._TerminalSetSizeParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Rows')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Columns')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Reset')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class TerminalSetSizeResponseParams extends bindings.Struct {
@@ -623,12 +749,72 @@ class TerminalSetSizeResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _terminal_Terminal_SetSize_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'TerminalSetSizeResponseParams'
+      ..fullIdentifier = 'mojo.terminal.TerminalSetSizeResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Error')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_types_Error__'
+    ..typeKey = '_types_Error__'
+  )),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Rows')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Columns')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint32),
+      ];
+}
+
 
 const int _Terminal_connectName = 0;
 const int _Terminal_connectToClientName = 1;
 const int _Terminal_getSizeName = 2;
 const int _Terminal_setSizeName = 3;
 
+mojom_types.MojomInterface _terminal_Terminal__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Terminal'
+      ..fullIdentifier = 'mojo.terminal.Terminal')
+    ..interfaceName = 'Terminal'
+    ..methods = <int, mojom_types.MojomMethod>{
+_Terminal_connectName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Connect')
+        ..ordinal = _Terminal_connectName
+        ..responseParams = _terminal_Terminal_Connect_ResponseParams__()..parameters = _terminal_Terminal_Connect_Params__(),_Terminal_connectToClientName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'ConnectToClient')
+        ..ordinal = _Terminal_connectToClientName
+        ..responseParams = _terminal_Terminal_ConnectToClient_ResponseParams__()..parameters = _terminal_Terminal_ConnectToClient_Params__(),_Terminal_getSizeName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetSize')
+        ..ordinal = _Terminal_getSizeName
+        ..responseParams = _terminal_Terminal_GetSize_ResponseParams__()..parameters = _terminal_Terminal_GetSize_Params__(),_Terminal_setSizeName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SetSize')
+        ..ordinal = _Terminal_setSizeName
+        ..responseParams = _terminal_Terminal_SetSize_ResponseParams__()..parameters = _terminal_Terminal_SetSize_Params__(),
+    };
+}
+
+class _TerminalServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _terminal_Terminal__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class Terminal {
   static const String serviceName = "mojo::terminal::Terminal";
   dynamic connect(Object terminalFile,bool force,[Function responseFactory = null]);
@@ -653,6 +839,9 @@ class _TerminalProxyImpl extends bindings.Proxy {
     return new _TerminalProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _TerminalServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _Terminal_connectName:
@@ -1013,6 +1202,65 @@ class TerminalStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _TerminalServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_terminal_Terminal_Connect_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_Connect_Params__();
+map["_terminal_Terminal_Connect_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_Connect_ResponseParams__();
+map["_terminal_Terminal_ConnectToClient_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_ConnectToClient_Params__();
+map["_terminal_Terminal_ConnectToClient_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_ConnectToClient_ResponseParams__();
+map["_terminal_Terminal_GetSize_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_GetSize_Params__();
+map["_terminal_Terminal_GetSize_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_GetSize_ResponseParams__();
+map["_terminal_Terminal_SetSize_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_SetSize_Params__();
+map["_terminal_Terminal_SetSize_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _terminal_Terminal_SetSize_ResponseParams__();
+map["_terminal_Terminal__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _terminal_Terminal__();
+file_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+types_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+terminal_client_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;
+}