Generate Mojom Types in Dart (Take 2)

mojo/public/tools/bindings/generators/dart_templates/interface_definition.tmpl

 {%- for method in interface.methods %}
 const int _{{interface|name}}_{{method|name}}Name = {{method.ordinal}};
 {%- endfor %}
 
 {#--- Interface Enums #}
 {%- from "enum_definition.tmpl" import enum_def -%}
 {%- for enum in interface.enums %}
-  {{ enum_def(enum) }}
+  {{ enum_def(enum, typepkg, package) }}
 {%-  endfor %}
 
+{% if should_gen_mojom_types -%}
+{{ mojom_type_macros.writeMojomTypeDef(interface, typepkg, package) }}
+{%- endif %}
+
+class _{{interface|name}}ServiceDescription implements {{descpkg}}ServiceDescription {
+{%- if should_gen_mojom_types %}
+  dynamic getTopLevelInterface([Function responseFactory]) =>
+      _{{interface|mojom_type_identifier|lower_camel}}();
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
+      getAllMojomTypeDefinitions()[typeKey];
+
+  dynamic getAllTypeDefinitions([Function responseFactory]) =>
+      getAllMojomTypeDefinitions();
+{%- else %}
+  dynamic getTopLevelInterface([Function responseFactory]) => null;
+
+  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) => null;
+
+  dynamic getAllTypeDefinitions([Function responseFactory]) => null;
+{%- endif %}
+}
+
 abstract class {{interface|name}} {
 {%- if interface.service_name %}
   static const String serviceName = "{{interface.service_name}}";
 {%- else %}
   static const String serviceName = null;
 {%- endif %}
 
 {%- for method in interface.methods %}
 {%- if method.response_parameters == None %}
   void {{method|name}}(
@@ skipping 25 matching lines @@
       super.fromHandle(handle);
 
   _{{interface|name}}ProxyImpl.unbound() : super.unbound();
 
   static _{{interface|name}}ProxyImpl newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For _{{interface|name}}ProxyImpl"));
     return new _{{interface|name}}ProxyImpl.fromEndpoint(endpoint);
   }
 
+  {{descpkg}}ServiceDescription get serviceDescription =>
+    new _{{interface|name}}ServiceDescription();
+
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
 {%- for method in interface.methods %}
 {%- if method.response_parameters != None %}
 {%- set response_struct = method.response_param_struct %}
       case _{{interface|name}}_{{method|name}}Name:
         var r = {{response_struct|name}}.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
@@ skipping 225 matching lines @@
     assert(_impl == null);
     _impl = d;
   }
 
   String toString() {
     var superString = super.toString();
     return "{{interface|name}}Stub($superString)";
   }
 
   int get version => {{interface.version}};
+
+  {{descpkg}}ServiceDescription get serviceDescription =>
+    new _{{interface|name}}ServiceDescription();
 }