Mojo JS bindings: code generator maps interface ptr and request to InterfacePtr and InterfaceReques…

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}}Ptr() {
     this.ptr = new bindings.InterfacePtrController({{interface.name}});
   }
 
   function {{interface.name}}Proxy(receiver) {
     bindings.ProxyBase.call(this, receiver);
   }
   {{interface.name}}Proxy.prototype = Object.create(bindings.ProxyBase.prototype);
 
 {%- for method in interface.methods %}
   {{interface.name}}Ptr.prototype.{{method.name|stylize_method}} = function() {
     return {{interface.name}}Proxy.prototype.{{method.name|stylize_method}}
         .apply(this.ptr.getProxy(), arguments);
   };
 
   {{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}};
+    params.{{parameter.name}} = {{parameter.name}};
 {%- endfor %}
 
 {%- if method.response_parameters == None %}
     var builder = new codec.MessageBuilder(
         k{{interface.name}}_{{method.name}}_Name,
         codec.align({{interface.name}}_{{method.name}}_Params.encodedSize));
     builder.encodeStruct({{interface.name}}_{{method.name}}_Params, params);
     var message = builder.finish();
     this.receiver_.accept(message);
 {%- else %}
@@ skipping 19 matching lines @@
 
   function {{interface.name}}Stub(delegate) {
     bindings.StubBase.call(this, delegate);
   }
   {{interface.name}}Stub.prototype = Object.create(bindings.StubBase.prototype);
 
 {%- for method in interface.methods %}
 {%-   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(', ')}});
+    return {{delegate_expr}} && {{delegate_expr}}.{{js_method_name}} && {{delegate_expr}}.{{js_method_name}}({{method.parameters|map(attribute='name')|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 86 matching lines @@
 {%-   endfor %}
     }
     if (paramsClass === null)
       return validator.validationError.NONE;
     return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
 {%- endif %}
   }
 
   var {{interface.name}} = {
     name: '{{namespace|replace(".","::")}}::{{interface.name}}',
+    ptrClass: {{interface.name}}Ptr,
     proxyClass: {{interface.name}}Proxy,
     stubClass: {{interface.name}}Stub,
     validateRequest: validate{{interface.name}}Request,
 {%- if interface|has_callbacks %}
     validateResponse: validate{{interface.name}}Response,
 {%- else %}
     validateResponse: null,
 {%- endif %}
   };
 {#--- Interface Constants #}
 {%- for constant in interface.constants %}
   {{interface.name}}.{{constant.name}} = {{constant.value|expression_to_text}},
 {%-   endfor %}
 {#--- Interface Enums #}
 {%- 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 %}