Create local alias for super class in --closure mode (issue #312)

Author: Olivier Chafik

lib/runtime/dart/_runtime.js

@@ -726,7 +726,8 @@ dart_library.library('dart/_runtime', null, /* Imports */[
   const _mixins = Symbol("mixins");
   const implements$ = Symbol("implements");
   const metadata = Symbol("metadata");
-  const TypeRep = class TypeRep extends LazyTagged(() => core.Type) {
+  const _TypeRepBase = LazyTagged(() => core.Type);
+  const TypeRep = class TypeRep extends _TypeRepBase {
     get name() {
       return this.toString();
     }

lib/src/codegen/js_codegen.dart

@@ -375,10 +375,10 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ClosureAnnotator {
       }
     }
 
-    var classDecl = new JS.ClassDeclaration(new JS.ClassExpression(
-        new JS.Identifier(element.name), _classHeritage(element), body));
+    var classExpr = new JS.ClassExpression(
+        new JS.Identifier(element.name), _classHeritage(element), body);
 
-    return _finishClassDef(element.type, classDecl);
+    return _finishClassDef(element.type, _emitClassDeclaration(classExpr));
   }
 
   JS.Statement _emitJsType(String dartClassName, DartObject jsName) {
@@ -669,6 +669,25 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ClosureAnnotator {
     }
   }
 
+  _isQualifiedPath(JS.Expression node) =>
+      node is JS.Identifier ||
+      node is JS.PropertyAccess &&
+          _isQualifiedPath(node.receiver) &&
+          node.selector is JS.LiteralString;
+
+  JS.Statement _emitClassDeclaration(JS.ClassExpression cls) {
+    var body = <JS.Statement>[];
+    if (options.closure &&
+        cls.heritage != null && !_isQualifiedPath(cls.heritage)) {
+      // Workaround for Closure: super classes must be qualified paths.
+      var superVar = new JS.Identifier(cls.name.name + r'$super');
+      body.add(js.statement('const # = #;', [superVar, cls.heritage]));
+      cls = new JS.ClassExpression(cls.name, superVar, cls.methods);
+    }
+    body.add(new JS.ClassDeclaration(cls));
+    return _statement(body);
+  }
+
   /// Emit class members that need to come after the class declaration, such
   /// as static fields. See [_emitClassMethods] for things that are emitted
   /// inside the ES6 `class { ... }` node.
@@ -696,7 +715,7 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ClosureAnnotator {
       }
     }
 
-    body.add(new JS.ClassDeclaration(cls));
+    body.add(_emitClassDeclaration(cls));
 
     // TODO(jmesserly): we should really just extend native Array.
     if (jsPeerName != null && classElem.typeParameters.isNotEmpty) {

test/codegen/expect/closure.js

@@ -117,7 +117,8 @@ dart_library.library('closure', null, /* Imports */[
   /** @type {string} */
   Foo.some_static_var = "abc";
   class Bar extends core.Object {}
-  class Baz extends dart.mixin(Foo$(core.int), Bar) {
+  const Baz$super = dart.mixin(Foo$(core.int), Bar);
+  class Baz extends Baz$super {
     /** @param {?number} i */
     Baz(i) {
       super.Foo(i, 123);

tool/input_sdk/private/types.dart

@@ -38,8 +38,9 @@ final metadata = JS('', 'Symbol("metadata")');
 ///  String toString();
 ///
 ///
+final _TypeRepBase = JS('', '$LazyTagged(() => $Type)');
 final TypeRep = JS('', '''
-  class TypeRep extends $LazyTagged(() => $Type) {
+  class TypeRep extends $_TypeRepBase {
     get name() {return this.toString();}
   }
 ''');