implement top-level JS annotated getters

lib/src/compiler/code_generator.dart

 // Copyright (c) 2015, 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.
 
 import 'dart:collection' show HashMap, HashSet;
 import 'dart:math' show min, max;
 
 import 'package:analyzer/analyzer.dart' hide ConstantEvaluator;
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart' show Token, TokenType;
@@ skipping 63 matching lines @@
   /// Usually a [SimpleIdentifier], but it can also be other expressions
   /// that are safe to evaluate multiple times, such as `this`.
   Expression _cascadeTarget;
 
   /// The variable for the current catch clause
   SimpleIdentifier _catchParameter;
 
   /// In an async* function, this represents the stream controller parameter.
   JS.TemporaryId _asyncStarController;
 
-  /// The top-level reference to 'self' if this is a library tagged with @JS()
-  JS.TemporaryId _self;
-
   final _privateNames =
       new HashMap<LibraryElement, HashMap<String, JS.TemporaryId>>();
   final _initializingFormalTemps =
       new HashMap<ParameterElement, JS.TemporaryId>();
 
   final _dartxVar = new JS.Identifier('dartx');
   final _runtimeLibVar = new JS.Identifier('dart');
   final namedArgumentTemp = new JS.TemporaryId('opts');
 
   final _hasDeferredSupertype = new HashSet<ClassElement>();
@@ skipping 120 matching lines @@
       _libraries[library] = libraryTemp;
       items.add(new JS.ExportDeclaration(
           js.call('const # = Object.create(null)', [libraryTemp])));
 
       // dart:_runtime has a magic module that holds extenstion method symbols.
       // TODO(jmesserly): find a cleaner design for this.
       if (_isDartRuntime(library)) {
         items.add(new JS.ExportDeclaration(
             js.call('const # = Object.create(null)', [_dartxVar])));
       }
-
-      if (findAnnotation(library, isPublicJSAnnotation) != null) {
-        _self = new JS.TemporaryId('self');
-        items.add(js.statement('const # = window;', [_self]));
-      }
     }
 
     // Collect all Element -> Node mappings, in case we need to forward declare
     // any nodes.
     var nodes = new HashMap<Element, AstNode>.identity();
     var sdkBootstrappingFns = new List<FunctionElement>();
     for (var unit in compilationUnits) {
       if (_isDartRuntime(unit.element.library)) {
         sdkBootstrappingFns.addAll(unit.element.functions);
       }
@@ skipping 27 matching lines @@
     switch (options.moduleFormat) {
       case ModuleFormat.legacy:
         return new LegacyModuleBuilder().build(module);
       case ModuleFormat.node:
         return new NodeModuleBuilder().build(module);
       case ModuleFormat.es6:
         return module;
     }
   }
 
+  List<String> _getJSName(Element e) {
+    if (findAnnotation(e.library, isPublicJSAnnotation) == null) {
+      return null;
+    }
+
+    var libraryJSName = getAnnotationName(e.library, isPublicJSAnnotation);
+    var libraryPrefix = [];
+    if (libraryJSName != null && libraryJSName.isNotEmpty) {
+      libraryPrefix.addAll(libraryJSName.split('.'));
+    }
+
+    var elementJSName;
+    if (findAnnotation(e, isPublicJSAnnotation) != null) {
+      elementJSName = getAnnotationName(e, isPublicJSAnnotation) ?? '';
+    }
+    if (e is TopLevelVariableElement &&
+        e.getter != null &&
+        (e.getter.isExternal ||
+            findAnnotation(e.getter, isPublicJSAnnotation) != null)) {
+      elementJSName = getAnnotationName(e.getter, isPublicJSAnnotation) ?? '';
+    }
+    if (elementJSName == null) return null;
+
+    var elementJSParts = [];
+    if (elementJSName.isNotEmpty) {
+      elementJSParts.addAll(elementJSName.split('.'));
+    } else {
+      elementJSParts.add(e.name);
+    }
+
+    return libraryPrefix..addAll(elementJSParts);
+  }
+
+  JS.Expression _emitJSInterop(Element e) {
+    var jsName = _getJSName(e);
+    if (jsName == null) return null;
+    var fullName = ['global']..addAll(jsName);
+    var access = _runtimeLibVar;
+    for (var part in fullName) {
+      access = new JS.PropertyAccess(access, js.string(part));
+    }
+    return access;
+  }
+
   /// Flattens blocks in [items] to a single list.
   ///
   /// This will not flatten blocks that are marked as being scopes.
   void _copyAndFlattenBlocks(
       List<JS.ModuleItem> result, Iterable<JS.ModuleItem> items) {
     for (var item in items) {
       if (item is JS.Block && !item.isScope) {
         _copyAndFlattenBlocks(result, item.statements);
       } else {
         result.add(item);
@@ skipping 2045 matching lines @@
       if (jsArgs != null) {
         var genericName = _emitTopLevelName(element, suffix: '\$');
         return js.call('#(#)', [genericName, jsArgs]);
       }
     }
 
     return _emitTopLevelName(element);
   }
 
   JS.PropertyAccess _emitTopLevelName(Element e, {String suffix: ''}) {
-    if (e is TopLevelVariableElement &&
-        e.getter != null &&
-        findAnnotation(e.getter, isPublicJSAnnotation) != null) {
-      var annotationName = getAnnotationName(e.getter, isPublicJSAnnotation);
-      var name = annotationName ?? e.name;
-      JS.PropertyAccess result = null;
-      for (var segment in name.split('.')) {
-        result = new JS.PropertyAccess(result ?? _self, js.string(segment));
-      }
-      return result;
-    }
+    var interop = _emitJSInterop(e);
+    if (interop != null) return interop;
     String name = getJSExportName(e) + suffix;
     return new JS.PropertyAccess(
         emitLibraryName(e.library), _propertyName(name));
   }
 
   @override
   JS.Expression visitAssignmentExpression(AssignmentExpression node) {
     var left = node.leftHandSide;
     var right = node.rightHandSide;
     if (node.operator.type == TokenType.EQ) return _emitSet(left, right);
@@ skipping 671 matching lines @@
       return getter
           ? parent.getGetter(element.name)
           : parent.getSetter(element.name);
     }
     return null;
   }
 
   JS.Expression _emitConstructorName(
       ConstructorElement element, DartType type, SimpleIdentifier name) {
     var classElem = element.enclosingElement;
-    if (findAnnotation(classElem, isPublicJSAnnotation) != null) {
-      var annotationName = getAnnotationName(classElem, isPublicJSAnnotation);
-      var typeName = js.string(annotationName ?? classElem.name);
-      return new JS.PropertyAccess(_self, typeName);
-    }
+    var interop = _emitJSInterop(classElem);
+    if (interop != null) return interop;
     var typeName = _emitType(type);
     if (name != null || element.isFactory) {
       var namedCtor = _constructorName(element);
       return new JS.PropertyAccess(typeName, namedCtor);
     }
     return typeName;
   }
 
   @override
   visitConstructorName(ConstructorName node) {
@@ skipping 1432 matching lines @@
 }
 
 bool isLibraryPrefix(Expression node) =>
     node is SimpleIdentifier && node.staticElement is PrefixElement;
 
 LibraryElement _getLibrary(AnalysisContext c, String uri) =>
     c.computeLibraryElement(c.sourceFactory.forUri(uri));
 
 bool _isDartRuntime(LibraryElement l) =>
     l.isInSdk && l.source.uri.toString() == 'dart:_runtime';