Mojo JS Bindings: Eliminate foo$ Stub and Proxy class members

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

 {%- for method in interface.methods %}
   var k{{interface.name}}_{{method.name}}_Name = {{method.ordinal}};
 {%- endfor %}
 
   function {{interface.name}}Proxy(receiver) {

[esprehn, 2014/12/29 22:00:44]

class {{interface.name}}Proxy extends bindings.ProxyBase {
  constructor(receiver) {
    super(receiver);
  }
}

[hansmuller1, 2014/12/29 23:14:11]

I hadn't been using classes in the generated code because it needs to run in
Chromium (the application framework classes are only intended to work with the
JS content handler; the Mojo SDK). [per our side discussion ...] It looks like
https://codereview.chromium.org/808433002 ushers in ES6 classes for Chrome, by
default (NICE). I will submit a follow-up CL that uses classes in all of the
Mojo JS bindings.

-    connection.initProxyInstance(this, {{interface.name}}, receiver);
+    bindings.ProxyBase.call(this, receiver);
   }
+  {{interface.name}}Proxy.prototype = Object.create(bindings.ProxyBase.prototype);

[esprehn, 2014/12/29 22:00:44]

Use class, then you don't need this at all.

[hansmuller1, 2014/12/29 23:14:11]

Acknowledged.

 
 {%- for method in interface.methods %}
   {{interface.name}}Proxy.prototype.{{method.name|stylize_method}} = function(
 {%- for parameter in method.parameters -%}
 {{parameter.name}}{% if not loop.last %}, {% endif %}
 {%- endfor -%}
 ) {
     var params = new {{interface.name}}_{{method.name}}_Params();
 {%- for parameter in method.parameters %}
     params.{{parameter.name}} = {{parameter|js_proxy_method_parameter_value}};
@@ skipping 20 matching lines @@
             reader.decodeStruct({{interface.name}}_{{method.name}}_ResponseParams);
         resolve(responseParams);
       }).catch(function(result) {
         reject(Error("Connection error: " + result));
       });
     }.bind(this));
 {%- endif %}
   };
 {%- endfor %}
 
   function {{interface.name}}Stub(delegate) {

[esprehn, 2014/12/29 22:00:44]

class {{interface.name}}Stub extends StubBase {
  constructor(delegate) {
   super(delegate);
   this.delegaete$ = delegate;
  }
}

also why do you still need the $ suffix here?

[hansmuller1, 2014/12/29 23:14:11]

Oops, that's a mistake.The super class does the delegate initialization, I
should have deleted that line.

-      this.delegate$ = delegate;
+    bindings.StubBase.call(this, delegate);
+    this.delegate$ = delegate;
   }
+  {{interface.name}}Stub.prototype = Object.create(bindings.StubBase.prototype);

[esprehn, 2014/12/29 22:00:44]

don't need this with class.

[hansmuller1, 2014/12/29 23:14:11]

Acknowledged.

 
 {%- for method in interface.methods %}
-{% macro stub_method_parameters() -%}
-{%- for parameter in method.parameters -%}
-  {{parameter.name}}{% if not loop.last %}, {% endif %}
-{%- endfor %}
-{%- endmacro %}
-  {{interface.name}}Stub.prototype.{{method.name|stylize_method}} = function({{stub_method_parameters()}}) {
-    if (this.delegate$.{{method.name|stylize_method}})
-      return this.delegate$.{{method.name|stylize_method}}({{method.parameters|map('js_stub_method_parameter_value')|join(',')}});
+{%-   set js_method_name = method.name|stylize_method %}
+{%-   set delegate_expr =  "bindings.StubBindings(this).delegate" %}
+  {{interface.name}}Stub.prototype.{{js_method_name}} = function({{method.parameters|map(attribute='name')|join(', ')}}) {
+    return {{delegate_expr}} && {{delegate_expr}}.{{js_method_name}} && {{delegate_expr}}.{{js_method_name}}({{method.parameters|map('js_stub_method_parameter_value')|join(', ')}});
   }
 {%- endfor %}
 
   {{interface.name}}Stub.prototype.accept = function(message) {
     var reader = new codec.MessageReader(message);
     switch (reader.messageName) {
 {%- for method in interface.methods %}
 {%- if method.response_parameters == None %}
     case k{{interface.name}}_{{method.name}}_Name:
       var params = reader.decodeStruct({{interface.name}}_{{method.name}}_Params);
@@ skipping 110 matching lines @@
 {%- from "enum_definition.tmpl" import enum_def -%}
 {%- for enum in interface.enums %}
   {{ enum_def("%s.%s"|format(interface.name, enum.name), enum) }}
 {%-  endfor %}
   {{interface.name}}Stub.prototype.validator = validate{{interface.name}}Request;
 {%- if interface|has_callbacks %}
   {{interface.name}}Proxy.prototype.validator = validate{{interface.name}}Response;
 {%- else %}
   {{interface.name}}Proxy.prototype.validator = null;
 {%- endif %}