Add @jsify annotation. Support automatically proxying Lists and Maps to Dart in Proxies. Support co…

lib/src/mirrors.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * This library contains semi-private APIs for implementing typed interfaces and
  * exports.
  */
 library js.mirrors;
 
@@ skipping 332 matching lines @@
     }
 
     if (jsConstructor != null) {
       // TODO: support constructor expressions
       var ctor = getPath(jsConstructor);
       var jsObj = new JsObject(ctor, args);
       return classMirror.newInstance(#created, [jsObj]).reflectee;
     }
   }
 
-  dynamic noSuchMethod(Invocation i) {
+  dynamic noSuchMethod(Invocation invocation) {
     var mirror = mirrors.reflect(this);
-    var decl = getDeclaration(mirror.type, i.memberName);
+    var decl = getDeclaration(mirror.type, invocation.memberName);
 
     if (decl != null) {
       mirrors.MethodMirror method = decl;
-      String name = mirrors.MirrorSystem.getName(i.memberName);
-      if (i.isGetter) {
+      String name = mirrors.MirrorSystem.getName(invocation.memberName);
+      if (invocation.isGetter) {
         var o = toDart(toJs(this)[name]);
         assert(o == null ||
             mirrors.reflect(o).type.isSubtypeOf(method.returnType));
         return o;
       }
-      if (i.isSetter) {
+      if (invocation.isSetter) {
         // remove the trailing '=' from the setter name
         name = name.substring(0, name.length - 1);
-        var v = toJs(i.positionalArguments[0]);
+        var v = toJs(invocation.positionalArguments[0]);
         toJs(this)[name] = v;
         return null;
       }
-      if (i.isMethod) {
-        var jsArgs = i.positionalArguments.map(toJs).toList();
-        var o = toDart(toJs(this).callMethod(name, jsArgs));
+      if (invocation.isMethod) {
+        MethodMirror m = decl;
+        var positionalParams = m.parameters.where((p) => !p.isNamed).toList();
+        var positionalArgs = invocation.positionalArguments;
+        var jsArgs = new List(positionalArgs.length);
+        for (int i = 0; i < positionalArgs.length; i++) {
+          var param = positionalParams[i];
+          var arg = positionalArgs[i];
+          var hasJsify = param.metadata.any((m) => m.reflectee == jsify);
+          if (hasJsify) {
+            jsArgs[i] = new js.JsObject.jsify(arg);

[alexandre.ardhuin, 2014/10/01 20:36:52]

Even if @jsify is used we shouldn't jsify an JsObjectMap or JsList.

[justinfagnani, 2014/10/07 20:32:24]

Done.

+          } else {
+            jsArgs[i] = toJs(arg);
+          }
+        }
+        var returnType = m.returnType.hasReflectedType
+            ? m.returnType.originalDeclaration.simpleName
+            : null;
+        var o = toDart(toJs(this).callMethod(name, jsArgs), returnType);
         assert(o == null ||
             mirrors.reflect(o).type.isSubtypeOf(method.returnType));
         return o;
       }
       assert(false);
     }
-    return super.noSuchMethod(i);
+    return super.noSuchMethod(invocation);
   }
 }
 
 JsProxy _getJsProxyAnnotation(ClassMirror c) {
   var jsProxyAnnotationMirror =
       c.metadata
       .firstWhere((i) => i.reflectee is JsProxy, orElse: () => null);
 
   if (jsProxyAnnotationMirror == null) return null;
 
@@ skipping 20 matching lines @@
     _getDeclarations(classMirror.superclass, declarations);
   }
   // TODO: See if a getter can shadow an implicit setter from a field in a
   // superclass. This could happen if a superclass has a field and a subclass
   // has a getter with the same name. Since the field doesn't induce a setter
   // in the declarations, the field would be replaced by the getter and there
   // would be no associated setter. The solution would be to create a synthetic
   // setter if we're adding a getter than shadows a field.
   declarations.addAll(classMirror.declarations);
 }