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;
 
 import 'dart:js' as js;
 import 'dart:mirrors';
 import 'dart:mirrors' as mirrors;
 
-import 'package:js/src/metadata.dart';
+import 'package:js/src/metadata.dart' as metadata;
 import 'package:js/src/js_elements.dart';
 import 'package:js/src/js_impl.dart' as jsi;
 import 'package:js/src/js_impl.dart';
 
 // This is the public interface of js.dart
 // The exports must match those in static.dart
-export 'package:js/src/js_impl.dart' hide JsInterface;
+// JsInterface is not include to show the version defined here
+export 'package:js/src/js_impl.dart' show JsGlobal, toJs, toDart,
+    registerJsConstructorForType, registerFactoryForJsConstructor;
 export 'dart:js' show JsObject;
 export 'package:js/src/metadata.dart';
 
 import 'package:quiver/mirrors.dart';
 
 final _dart = js.context['dart'];
 final _obj = js.context['Object'];
 
 // This is ugly. For each ExportedClass we need a reference to the class mirror
 // to implement constructors, but ExportedClass is used in code generation
 // as well.
 Expando<ClassMirror> _classMirrors = new Expando<ClassMirror>();
 
 initializeJavaScript() {
   var libraries = currentMirrorSystem().libraries;
 
   var jsElements = new JsElements();
   var jsInterface = reflectType(JsInterface);
 
   for (var library in libraries.values) {
     var exportedLibrary;
     var libraryName = _getName(library);
     var libraryExportAnnotation = _getExportAnnotation(library);
     if (libraryExportAnnotation != null) {
       exportedLibrary = jsElements.getLibrary(libraryName);
     }
 
     var classes = library.declarations.values.where((d) => d is ClassMirror);
     for (ClassMirror clazz in classes) {
-      JsProxy jsProxyAnnotation = _getJsProxyAnnotation(clazz);
+      metadata.JsProxy jsProxyAnnotation = _getJsProxyAnnotation(clazz);
       if (jsProxyAnnotation != null && jsProxyAnnotation.constructor != null) {
         _registerProxy(clazz, jsProxyAnnotation);
       }
 
       var classExportAnnotation = _getExportAnnotation(clazz);
       var classNoExportAnnotation = _getNoExportAnnotation(clazz);
 
       if (classNoExportAnnotation == null
           && !clazz.isAbstract
           && !classImplements(clazz, jsInterface)
@@ skipping 65 matching lines @@
     // remove the class name
     var name = rawName == c.name ? '' : rawName.substring(c.name.length + 1);
 
     var parameters = ctor.parameters.map((p) =>
         new ExportedParameter(_getName(p), _getKind(p), _getType(p))).toList();
 
     c.children[name] = new ExportedConstructor(name, c, parameters);
   }
 }
 
-void _registerProxy(ClassMirror clazz, JsProxy jsProxyAnnotation) {
+void _registerProxy(ClassMirror clazz, metadata.JsProxy jsProxyAnnotation) {
   var constructorExpr = jsProxyAnnotation.constructor;
   var createdConstructor = clazz.declarations[#created];
   jsi.registerFactoryForJsConstructor(
       getPath(jsProxyAnnotation.constructor),
       (JsObject o) => clazz.newInstance(#created, [o]).reflectee);
 }
 
 _exportLibrary(ExportedLibrary library, JsObject parent) {
   JsObject libraryJsObj = parent;
   var parts = library.name.split('.');
   parts.forEach((p) {
     if (!libraryJsObj.hasProperty(p)) {
-      libraryJsObj = libraryJsObj[p] = new JsObject.jsify({});
+      libraryJsObj = libraryJsObj[p] = new JsObject(_obj);
     } else {
       libraryJsObj = libraryJsObj[p];
     }
   });
   library.declarations.forEach((n, d) => _exportDeclaration(d, libraryJsObj));
 }
 
 _exportDeclaration(ExportedElement e, JsObject parent) {
   if (e is ExportedClass) {
     _exportClass(e, parent);
@@ skipping 114 matching lines @@
   call() => throw new StateError('There should always been at least 1 parameter'
       '(js this).');
 
   noSuchMethod(Invocation invocation) {
     var self = invocation.positionalArguments.first;
     var args = invocation.positionalArguments.skip(1).toList();
     return f(self, args);
   }
 }
 
-Export _getExportAnnotation(DeclarationMirror d) {
-  var m = d.metadata.firstWhere((m) => m.type.reflectedType == Export,
-      orElse: () => null);
+metadata.Export _getExportAnnotation(DeclarationMirror d) {
+  var m = d.metadata
+      .firstWhere((m) => m.type.reflectedType == metadata.Export,
+          orElse: () => null);
   return m == null ? null : m.reflectee;
 }
 
-NoExport _getNoExportAnnotation(DeclarationMirror d) {
-  var m = d.metadata.firstWhere((m) => m.type.reflectedType == NoExport,
-      orElse: () => null);
+metadata.NoExport _getNoExportAnnotation(DeclarationMirror d) {
+  var m = d.metadata
+      .firstWhere((m) => m.type.reflectedType == metadata.NoExport,
+          orElse: () => null);
   return m == null ? null : m.reflectee;
 }
 
 String _getName(DeclarationMirror m) => MirrorSystem.getName(m.simpleName);
 
 ParameterKind _getKind(ParameterMirror p) {
   if (p.isNamed) return ParameterKind.NAMED;
   if (p.isOptional) return ParameterKind.POSITIONAL;
   return ParameterKind.REQUIRED;
 }
@@ skipping 38 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 == metadata.jsify);

[Siggi Cherem (dart-lang), 2014/10/07 20:41:41]

80

[justinfagnani, 2014/10/08 06:30:02]

Done.

+          if (hasJsify) {
+            jsArgs[i] = jsify(arg);
+          } 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);
+metadata.JsProxy _getJsProxyAnnotation(ClassMirror c) {
+  var jsProxyAnnotationMirror = c.metadata
+      .firstWhere((i) => i.reflectee is metadata.JsProxy, orElse: () => null);
 
   if (jsProxyAnnotationMirror == null) return null;
 
   return jsProxyAnnotationMirror.reflectee;
 }
 
 
 /**
  * Returns all the declarations on [classMirror] and its super classes and
  * interfaces. This is difference from [ClassMirror.instanceMembers].
@@ skipping 13 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);
 }