Generate Mojom Types for Dart

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

 {%- for method in interface.methods %}
 const int k{{interface|name}}_{{method|name}}_name = {{method.ordinal}};
 {%- endfor %}
 
 const String {{interface|name}}Name =
       '{{namespace|replace(".","::")}}::{{interface.name}}';
 
 {#--- Interface Enums #}
 {%- from "enum_definition.tmpl" import enum_def -%}
 {%- for enum in interface.enums %}
-  {{ enum_def(enum) }}
+  {{ enum_def(enum, typepkg, package) }}
 {%-  endfor %}
 
+{{ mojom_type_macros.writeMojomTypeDef(interface, typepkg, package) }}
+
+class _{{interface|name}}ServiceDescription extends {{descpkg}}ServiceDescription {
+  // Avoid infinite loop by overriding serviceDescription field.
+  final {{descpkg}}ServiceDescription serviceDescription = null;
+{% if should_gen_mojom_types -%}
+  dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return {{interface|mojom_type_identifier}}();
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions()[typeKey];
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return getAllMojomTypeDefinitions();
+  }
+{%- else -%}
+  dynamic getTopLevelInterface([Function responseFactory = null]) {
+    return null;
+  }
+  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
+    return null;
+  }
+  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
+    return null;
+  }
+{%- endif %}
+}
+
 abstract class {{interface|name}} {
+  final {{descpkg}}ServiceDescription serviceDescription =

[zra, 2015/11/18 19:24:35]

This is probably not the right place for this. See comment below.

+  {% if descpkg != '' -%}
+    new _{{interface|name}}ServiceDescription();
+  {%- else -%}
+    null;
+  {%- endif %}
+
 {%- for method in interface.methods %}
 {%- if method.response_parameters == None %}
   void {{method|name}}(
     {%- for parameter in method.parameters -%}
       {{parameter.kind|dart_type}} {{parameter|name}}{% if not loop.last %}, {% endif %}
     {%- endfor -%}
     );
 {%- else %}
 {%- set response_struct = method.response_param_struct %}
   dynamic {{method|name}}(
@@ skipping 21 matching lines @@
   {{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);
   }
 
   String get name => {{interface|name}}Name;
 
+  {{descpkg}}ServiceDescription get serviceDescription =>

[zra, 2015/11/18 19:24:36]

This seems like the right place. See comment below.

+    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 k{{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 21 matching lines @@
     }
   }
 
   String toString() {
     var superString = super.toString();
     return "{{interface|name}}ProxyImpl($superString)";
   }
 }
 
 
-class _{{interface|name}}ProxyCalls implements {{interface|name}} {
+class _{{interface|name}}ProxyCalls extends {{interface|name}} {

[zra, 2015/11/18 19:24:36]

Sorry for the lack of comments here. The ProxyCalls class has been carefully
constructed to try to avoid naming conflicts. Currently the only potential
conflict comes from the '_proxyImpl' field. This change introduces another
potential conflict by extending {{interface|name}}, which now has a new field.
It looks like that field has been added to the ProxyImpl class. Why does it need
to go in both places? If you're just trying to get more convenient access to the
serviceDescription, you can add a forwarding getter to the Proxy class below.

[alexfandrianto, 2015/11/19 23:27:23]

As discussed offline, the reason for these changes were to expose
serviceDescription to the server-side. However, we have thought of a workaround
that only needs us to add serviceDescription to the stub.

   {{interface|name}}ProxyImpl _proxyImpl;
 
   _{{interface|name}}ProxyCalls(this._proxyImpl);
 
   {%- for method in interface.methods %}
   {%- if method.response_parameters == None %}
     void {{method|name}}(
   {%- for parameter in method.parameters -%}
       {{parameter.kind|dart_type}} {{parameter|name}}{% if not loop.last %}, {% endif %}
   {%- endfor -%}
@@ skipping 186 matching lines @@
     _impl = d;
   }
 
   String toString() {
     var superString = super.toString();
     return "{{interface|name}}Stub($superString)";
   }
 
   int get version => {{interface.version}};
 }