Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/mojo/files/files.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/files/files.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/files/files.mojom.dart
index c62235ffd87c22d2057f03910c3ab51a666d843c..633273f916383ee01d909123d31f3b438bb58e6e 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/files/files.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/files/files.mojom.dart
@@ -5,9 +5,12 @@
 library files_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/directory.mojom.dart' as directory_mojom;
 import 'package:mojo_services/mojo/files/types.mojom.dart' as types_mojom;
 
@@ -85,6 +88,28 @@ class _FilesOpenFileSystemParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _files_Files_OpenFileSystem_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_FilesOpenFileSystemParams'
+      ..fullIdentifier = 'mojo.files._FilesOpenFileSystemParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'FileSystem')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = true)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Directory')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..isInterfaceRequest = true
+    ..identifier = '_directory_Directory__'
+    ..typeKey = '_directory_Directory__'
+  )),
+      ];
+}
 
 
 class FilesOpenFileSystemResponseParams extends bindings.Struct {
@@ -156,9 +181,52 @@ class FilesOpenFileSystemResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _files_Files_OpenFileSystem_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'FilesOpenFileSystemResponseParams'
+      ..fullIdentifier = 'mojo.files.FilesOpenFileSystemResponseParams')
+    ..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__'
+  )),
+      ];
+}
+
 
 const int _Files_openFileSystemName = 0;
 
+mojom_types.MojomInterface _files_Files__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'Files'
+      ..fullIdentifier = 'mojo.files.Files')
+    ..interfaceName = 'Files'
+    ..methods = <int, mojom_types.MojomMethod>{
+_Files_openFileSystemName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'OpenFileSystem')
+        ..ordinal = _Files_openFileSystemName
+        ..responseParams = _files_Files_OpenFileSystem_ResponseParams__()..parameters = _files_Files_OpenFileSystem_Params__(),
+    };
+}
+
+class _FilesServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _files_Files__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class Files {
   static const String serviceName = "mojo::files::Files";
   dynamic openFileSystem(String fileSystem,Object directory,[Function responseFactory = null]);
@@ -180,6 +248,9 @@ class _FilesProxyImpl extends bindings.Proxy {
     return new _FilesProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _FilesServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _Files_openFileSystemName:
@@ -366,6 +437,44 @@ class FilesStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _FilesServiceDescription();
+}
+
+
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_files_Files_OpenFileSystem_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _files_Files_OpenFileSystem_Params__();
+map["_files_Files_OpenFileSystem_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _files_Files_OpenFileSystem_ResponseParams__();
+map["_files_Files__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _files_Files__();
+directory_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;
+});
+
+  return map;
 }
 
+var _MojomDesc;
+Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
+  if (_MojomDesc == null) {
+    _MojomDesc = _initDescriptions();
+  }
+  return _MojomDesc;
+}