Generate Mojom Types in Dart (Take 2)

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

Index: mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart b/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
index d72979f683608945c306f8c1fb2020029033dc5f..0594c0322d1cf2ec921cebfac66e5bae4addf78c 100644
--- a/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
@@ -5,9 +5,12 @@
 library http_server_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/http_server/http_request.mojom.dart' as http_request_mojom;
 import 'package:mojo_services/http_server/http_response.mojom.dart' as http_response_mojom;
 
@@ -85,6 +88,27 @@ class _HttpServerSetHandlerParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _http_server_HttpServer_SetHandler_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HttpServerSetHandlerParams'
+      ..fullIdentifier = 'http_server._HttpServerSetHandlerParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Pattern')
+        ..type = (new mojom_types.Type()
+..stringType = (new mojom_types.StringType()..nullable = false)),
+      
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Handler')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_http_server_HttpHandler__'
+    ..typeKey = '_http_server_HttpHandler__'
+  )),
+      ];
+}
 
 
 class HttpServerSetHandlerResponseParams extends bindings.Struct {
@@ -152,6 +176,17 @@ class HttpServerSetHandlerResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _http_server_HttpServer_SetHandler_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HttpServerSetHandlerResponseParams'
+      ..fullIdentifier = 'http_server.HttpServerSetHandlerResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Success')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.bool),
+      ];
+}
 
 
 class _HttpServerGetPortParams extends bindings.Struct {
@@ -210,6 +245,13 @@ class _HttpServerGetPortParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _http_server_HttpServer_GetPort_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HttpServerGetPortParams'
+      ..fullIdentifier = 'http_server._HttpServerGetPortParams')
+    ..fields = <mojom_types.StructField>[];
+}
 
 
 class HttpServerGetPortResponseParams extends bindings.Struct {
@@ -277,6 +319,17 @@ class HttpServerGetPortResponseParams extends bindings.Struct {
     return map;
   }
 }
+mojom_types.MojomStruct _http_server_HttpServer_GetPort_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HttpServerGetPortResponseParams'
+      ..fullIdentifier = 'http_server.HttpServerGetPortResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Port')
+        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.uint16),
+      ];
+}
 
 
 class _HttpHandlerHandleRequestParams extends bindings.Struct {
@@ -344,6 +397,22 @@ class _HttpHandlerHandleRequestParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _http_server_HttpHandler_HandleRequest_Params__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = '_HttpHandlerHandleRequestParams'
+      ..fullIdentifier = 'http_server._HttpHandlerHandleRequestParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Request')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_http_request_HttpRequest__'
+    ..typeKey = '_http_request_HttpRequest__'
+  )),
+      ];
+}
 
 
 class HttpHandlerHandleRequestResponseParams extends bindings.Struct {
@@ -411,10 +480,56 @@ class HttpHandlerHandleRequestResponseParams extends bindings.Struct {
         'Object containing handles cannot be encoded to JSON.');
   }
 }
+mojom_types.MojomStruct _http_server_HttpHandler_HandleRequest_ResponseParams__() {
+  return new mojom_types.MojomStruct()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HttpHandlerHandleRequestResponseParams'
+      ..fullIdentifier = 'http_server.HttpHandlerHandleRequestResponseParams')
+    ..fields = <mojom_types.StructField>[
+      new mojom_types.StructField()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'Response')
+        ..type = (new mojom_types.Type()
+    ..typeReference = (new mojom_types.TypeReference()
+  
+    ..identifier = '_http_response_HttpResponse__'
+    ..typeKey = '_http_response_HttpResponse__'
+  )),
+      ];
+}
+
 
 const int _HttpServer_setHandlerName = 0;
 const int _HttpServer_getPortName = 1;
 
+mojom_types.MojomInterface _http_server_HttpServer__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HttpServer'
+      ..fullIdentifier = 'http_server.HttpServer')
+    ..interfaceName = 'HttpServer'
+    ..methods = <int, mojom_types.MojomMethod>{
+_HttpServer_setHandlerName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'SetHandler')
+        ..ordinal = _HttpServer_setHandlerName
+        ..responseParams = _http_server_HttpServer_SetHandler_ResponseParams__()..parameters = _http_server_HttpServer_SetHandler_Params__(),_HttpServer_getPortName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'GetPort')
+        ..ordinal = _HttpServer_getPortName
+        ..responseParams = _http_server_HttpServer_GetPort_ResponseParams__()..parameters = _http_server_HttpServer_GetPort_Params__(),
+    };
+}
+
+class _HttpServerServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _http_server_HttpServer__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class HttpServer {
   static const String serviceName = null;
   dynamic setHandler(String pattern,Object handler,[Function responseFactory = null]);
@@ -437,6 +552,9 @@ class _HttpServerProxyImpl extends bindings.Proxy {
     return new _HttpServerProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HttpServerServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _HttpServer_setHandlerName:
@@ -678,10 +796,40 @@ class HttpServerStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HttpServerServiceDescription();
 }
 
 const int _HttpHandler_handleRequestName = 0;
 
+mojom_types.MojomInterface _http_server_HttpHandler__() {
+  return new mojom_types.MojomInterface()
+    ..declData = (new mojom_types.DeclarationData()
+      ..shortName = 'HttpHandler'
+      ..fullIdentifier = 'http_server.HttpHandler')
+    ..interfaceName = 'HttpHandler'
+    ..methods = <int, mojom_types.MojomMethod>{
+_HttpHandler_handleRequestName: new mojom_types.MojomMethod()
+        ..declData = (new mojom_types.DeclarationData()..shortName = 'HandleRequest')
+        ..ordinal = _HttpHandler_handleRequestName
+        ..responseParams = _http_server_HttpHandler_HandleRequest_ResponseParams__()..parameters = _http_server_HttpHandler_HandleRequest_Params__(),
+    };
+}
+
+class _HttpHandlerServiceDescription implements service_describer.ServiceDescription {
+dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return _http_server_HttpHandler__();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+}
+
 abstract class HttpHandler {
   static const String serviceName = null;
   dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]);
@@ -703,6 +851,9 @@ class _HttpHandlerProxyImpl extends bindings.Proxy {
     return new _HttpHandlerProxyImpl.fromEndpoint(endpoint);
   }
 
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HttpHandlerServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _HttpHandler_handleRequestName:
@@ -888,6 +1039,59 @@ class HttpHandlerStub extends bindings.Stub {
   }
 
   int get version => 0;
+
+
+  service_describer.ServiceDescription get serviceDescription =>
+    new _HttpHandlerServiceDescription();
 }
 
 
+
+
+
+
+
+Map<String, mojom_types.UserDefinedType> _initDescriptions() {
+  var map = new HashMap<String, mojom_types.UserDefinedType>();
+map["_http_server_HttpServer_SetHandler_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _http_server_HttpServer_SetHandler_Params__();
+map["_http_server_HttpServer_SetHandler_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _http_server_HttpServer_SetHandler_ResponseParams__();
+map["_http_server_HttpServer_GetPort_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _http_server_HttpServer_GetPort_Params__();
+map["_http_server_HttpServer_GetPort_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _http_server_HttpServer_GetPort_ResponseParams__();
+map["_http_server_HttpHandler_HandleRequest_Params__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _http_server_HttpHandler_HandleRequest_Params__();
+map["_http_server_HttpHandler_HandleRequest_ResponseParams__"] =
+    new mojom_types.UserDefinedType()
+      ..structType = _http_server_HttpHandler_HandleRequest_ResponseParams__();
+map["_http_server_HttpServer__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _http_server_HttpServer__();
+map["_http_server_HttpHandler__"] =
+    new mojom_types.UserDefinedType()
+      ..interfaceType = _http_server_HttpHandler__();
+http_request_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
+  map[s] = udt;
+});
+http_response_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;
+}
+