Dart: Adds Interface and InterfaceRequest interfaces.

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

 {%- for method in interface.methods %}
 const int _{{interface|name|lower_camel}}Method{{method|name|upper_camel}}Name = {{method.ordinal}};
 {%- endfor %}
 
 {#--- Interface Enums #}
 {%- from "enum_definition.tmpl" import enum_def -%}
 {%- for enum in interface.enums %}
   {{ enum_def(enum, typepkg, package) }}
 {%-  endfor %}
 
@@ skipping 22 matching lines @@
 {%- endif %}
 }
 
 abstract class {{interface|name}} {
 {%- if interface.service_name %}
   static const String serviceName = "{{interface.service_name}}";
 {%- else %}
   static const String serviceName = null;
 {%- endif %}
 
+  static {{descpkg}}ServiceDescription _cachedServiceDescription;
+  static {{descpkg}}ServiceDescription get serviceDescription {
+    if (_cachedServiceDescription == null) {
+      _cachedServiceDescription = new _{{interface|name}}ServiceDescription();
+    }
+    return _cachedServiceDescription;
+  }
+
+  static {{interface|name}}Proxy connectToService(
+      bindings.ServiceConnector s, String url, [String serviceName]) {
+    {{interface|name}}Proxy p = new {{interface|name}}Proxy.unbound();
+    String name = serviceName ?? {{interface|name}}.serviceName;
+    if ((name == null) || name.isEmpty) {
+      throw new core.MojoApiError(
+          "If an interface has no ServiceName, then one must be provided.");
+    }
+    s.connectToService(url, p, name);
+    return p;
+  }
+
 {%- 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 %}
   dynamic {{method|name}}(
   {%- for parameter in method.parameters -%}
     {{parameter.kind|dart_type}} {{parameter|name}},
   {%- endfor -%}
     [Function responseFactory = null]);
 {%- endif %}
 {%- endfor %}
 
 {#--- Interface Constants #}
 {%- for constant in interface.constants %}
   static const {{constant.kind|dart_type}} {{constant|name}} = {{constant.resolved_value}};
 {%-   endfor %}
 }
 
+abstract class {{interface|name}}Interface
+    implements bindings.MojoInterface<{{interface|name}}>,
+               {{interface|name}} {
+  factory {{interface|name}}Interface([{{interface|name}} impl]) =>
+      new {{interface|name}}Stub.unbound(impl);
+  factory {{interface|name}}Interface.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint,
+      [{{interface|name}} impl]) =>
+      new {{interface|name}}Stub.fromEndpoint(endpoint, impl);
+}
+
+abstract class {{interface|name}}InterfaceRequest
+    implements bindings.MojoInterface<{{interface|name}}>,
+               {{interface|name}} {
+  factory {{interface|name}}InterfaceRequest() =>
+      new {{interface|name}}Proxy.unbound();
+}
+
 class _{{interface|name}}ProxyControl
     extends bindings.ProxyMessageHandler
-    implements bindings.ProxyControl {
+    implements bindings.ProxyControl<{{interface|name}}> {
   _{{interface|name}}ProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _{{interface|name}}ProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _{{interface|name}}ProxyControl.unbound() : super.unbound();
 
-  {{descpkg}}ServiceDescription get serviceDescription =>
-      new _{{interface|name}}ServiceDescription();
-
   String get serviceName => {{interface|name}}.serviceName;
 
   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|lower_camel}}Method{{method|name|upper_camel}}Name:
         var r = {{response_struct|name}}.deserialize(
             message.payload);
@@ skipping 16 matching lines @@
         break;
 {%- endif %}
 {%- endfor %}
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
+  {{interface|name}} get impl => null;
+  set impl({{interface|name}} _) {
+    throw new core.MojoApiError("The impl of a Proxy cannot be set.");
+  }
+
   @override
   String toString() {
     var superString = super.toString();
     return "_{{interface|name}}ProxyControl($superString)";
   }
 }
 
 class {{interface|name}}Proxy
-    extends bindings.Proxy
-    implements {{interface|name}} {
+    extends bindings.Proxy<{{interface|name}}>
+    implements {{interface|name}},
+               {{interface|name}}Interface,
+               {{interface|name}}InterfaceRequest {
   {{interface|name}}Proxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _{{interface|name}}ProxyControl.fromEndpoint(endpoint));
 
   {{interface|name}}Proxy.fromHandle(core.MojoHandle handle)
       : super(new _{{interface|name}}ProxyControl.fromHandle(handle));
 
   {{interface|name}}Proxy.unbound()
       : super(new _{{interface|name}}ProxyControl.unbound());
 
   static {{interface|name}}Proxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For {{interface|name}}Proxy"));
     return new {{interface|name}}Proxy.fromEndpoint(endpoint);
   }
 
-  factory {{interface|name}}Proxy.connectToService(
-      bindings.ServiceConnector s, String url, [String serviceName]) {
-    {{interface|name}}Proxy p = new {{interface|name}}Proxy.unbound();
-    s.connectToService(url, p, serviceName);
-    return p;
-  }
-
 {% 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 -%}
 {%- set request_struct = method.param_struct -%}
   ) {
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
@@ skipping 39 matching lines @@
   }
 
   _{{interface|name}}StubControl.fromHandle(
       core.MojoHandle handle, [{{interface|name}} impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _{{interface|name}}StubControl.unbound([this._impl]) : super.unbound();
 
+  String get serviceName => {{interface|name}}.serviceName;
+
 {% for method in interface.methods %}
 {%- if method.response_parameters != None %}
 {%- set response_struct = method.response_param_struct %}
   {{response_struct|name}} _{{response_struct|name|lower_camel}}Factory(
     {%- for param in method.response_parameters -%}
       {{param.kind|dart_type}} {{param|name}}{% if not loop.last %}, {% endif %}
     {%- endfor -%}
   ) {
     var result = new {{response_struct|name}}();
     {%- for param in method.response_parameters %}
@@ skipping 80 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_{{interface|name}}StubControl($superString)";
   }
 
   int get version => {{interface.version}};
-
-  static {{descpkg}}ServiceDescription _cachedServiceDescription;
-  static {{descpkg}}ServiceDescription get serviceDescription {
-    if (_cachedServiceDescription == null) {
-      _cachedServiceDescription = new _{{interface|name}}ServiceDescription();
-    }
-    return _cachedServiceDescription;
-  }
 }
 
 class {{interface|name}}Stub
     extends bindings.Stub<{{interface|name}}>
-    implements {{interface|name}} {
+    implements {{interface|name}},
+               {{interface|name}}Interface,
+               {{interface|name}}InterfaceRequest {
+  {{interface|name}}Stub.unbound([{{interface|name}} impl])
+      : super(new _{{interface|name}}StubControl.unbound(impl));
+
   {{interface|name}}Stub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [{{interface|name}} impl])
       : super(new _{{interface|name}}StubControl.fromEndpoint(endpoint, impl));
 
   {{interface|name}}Stub.fromHandle(
       core.MojoHandle handle, [{{interface|name}} impl])
       : super(new _{{interface|name}}StubControl.fromHandle(handle, impl));
 
-  {{interface|name}}Stub.unbound([{{interface|name}} impl])
-      : super(new _{{interface|name}}StubControl.unbound(impl));
-
   static {{interface|name}}Stub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For {{interface|name}}Stub"));
     return new {{interface|name}}Stub.fromEndpoint(endpoint);
   }
 
-  static {{descpkg}}ServiceDescription get serviceDescription =>
-      _{{interface|name}}StubControl.serviceDescription;
-
 {% 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 -%}
   ) {
     return impl.{{method|name}}(
 {%- for parameter in method.parameters -%}
     {{parameter|name}}{% if not loop.last %}, {% endif %}
 {%- endfor -%}
     );
   }
 {%- else %}
   dynamic {{method|name}}(
 {%- for parameter in method.parameters -%}
     {{parameter.kind|dart_type}} {{parameter|name}},
 {%- endfor -%}
     [Function responseFactory = null]) {
     return impl.{{method|name}}(
 {%- for parameter in method.parameters -%}
     {{parameter|name}},
 {%- endfor -%}
     responseFactory);
   }
 {%- endif %}
 {%- endfor %}
 }