fix(transformer): prepare transformers for full template compilation

tbosch · tbosch · commit 894079511748 · 2016-05-17T21:10:40.000-07:00
diff --git a/modules/angular2/src/router/router.ts b/modules/angular2/src/router/router.ts
@@ -359,8 +359,8 @@ export class Router {
       if (componentInstruction.reuse) {
         next = this._outlet.reuse(componentInstruction);
       } else {
-        next =
-            this.deactivate(instruction).then((_) => this._outlet.activate(componentInstruction));
+        let outlet = this._outlet;
+        next = this.deactivate(instruction).then((_) => outlet.activate(componentInstruction));
       }
       if (isPresent(instruction.child)) {
         next = next.then((_) => {
@@ -412,7 +412,8 @@ export class Router {
       next = this._childRouter.deactivate(childInstruction);
     }
     if (isPresent(this._outlet)) {
-      next = next.then((_) => this._outlet.deactivate(componentInstruction));
+      let outlet = this._outlet;
+      next = next.then((_) => outlet.deactivate(componentInstruction));
     }
 
     // TODO: handle aux routes
diff --git a/modules_dart/transform/lib/src/transform/directive_metadata_linker/ng_meta_linker.dart b/modules_dart/transform/lib/src/transform/directive_metadata_linker/ng_meta_linker.dart
@@ -113,7 +113,7 @@ class _Linker {
     if (ngMeta.needsResolution) {
       final resolver = new _NgMetaIdentifierResolver(
           assetId, reader, ngMetas, resolvedIdentifiers, errorOnMissingIdentifiers);
-      return resolver.resolveNgMeta(ngMeta);
+      return resolver.resolveNgMeta(ngMeta, assetId);
     } else {
       return null;
     }
@@ -177,8 +177,8 @@ class _NgMetaIdentifierResolver {
 
   _NgMetaIdentifierResolver(this.entryPoint, this.reader, this.ngMetas, this.resolvedIdentifiers, this.errorOnMissingIdentifiers);
 
-  Future resolveNgMeta(NgMeta ngMeta) async {
-    final ngMetaMap = await _extractNgMetaMap(ngMeta);
+  Future resolveNgMeta(NgMeta ngMeta, AssetId assetId) async {
+    final ngMetaMap = await _extractNgMetaMap(ngMeta, assetId);
     ngMeta.identifiers.forEach((_, meta) {
       if (meta is CompileIdentifierMetadata && meta.value != null) {
         meta.value = _resolveProviders(ngMetaMap, meta.value, "root");
@@ -375,14 +375,16 @@ class _NgMetaIdentifierResolver {
           name: id.name, moduleUrl: resolvedIdentifiers[id.name]);
 
       // these are so common that we special case them in the transformer
-    } else if (id.name == "Window" || id.name == "Document") {
+    } else if (id.name == "Window" || id.name == "Document" || id.name == "Storage") {
       return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'dart:html');
+    } else if (id.name == "Random") {
+      return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'dart:math');
     } else if (id.name == "Profiler") {
       return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'asset:perf_api/lib/perf_api.dart');
     } else if (id.name == "Logger") {
       return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'asset:logging/lib/logging.dart');
     } else if (id.name == "Clock") {
-      return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'asset:quiver/lib/src/time/clock.dart');
+      return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'asset:quiver/lib/time.dart');
     } else if (id.name == "Log") {
       return new CompileIdentifierMetadata(name: id.name, moduleUrl: 'asset:angular2/lib/src/testing/utils.dart');
     } else if (id.name == "TestComponentBuilder") {
@@ -421,7 +423,7 @@ class _NgMetaIdentifierResolver {
 
   /// Walks all the imports and creates a map from prefixes to
   /// all the symbols available through those prefixes
-  Future<Map<String, NgMeta>> _extractNgMetaMap(NgMeta ngMeta) async {
+  Future<Map<String, NgMeta>> _extractNgMetaMap(NgMeta ngMeta, AssetId assetId) async {
     final res = {"": new NgMeta.empty()};
     res[""].addAll(ngMeta);
 
@@ -442,11 +444,34 @@ class _NgMetaIdentifierResolver {
       if (newMeta != null) {
         res[import.prefix].addAll(newMeta);
       } else {
-        final summaryAsset =
-        fromUri(_urlResolver.resolve(assetUri, toSummaryExtension(import.uri)));
+        final summaryUri = _urlResolver.resolve(
+          assetUri, toSummaryExtension(import.uri));
+        final summaryAsset = fromUri(summaryUri);
         final summary = await _readNgMeta(reader, summaryAsset, {});
         if (summary != null) {
-          res[import.prefix].addAll(summary);
+
+          // We get here if we are in an import/export cycle. To resolve this
+          // we load the summaries directly. This is sufficient for resolving
+          // which module the symbol is defined in, which is the purpose of the
+          // map we are building.
+          final prefixRes = res[import.prefix];
+          prefixRes.addAll(summary);
+          if (summary.ngDeps != null &&
+              summary.ngDeps.exports != null) {
+
+
+            // Re-exporting one level of exports is usually sufficient.
+            // Consider a recursively exporting exports.
+            for (var export in summary.ngDeps.exports) {
+              final exportAsset = fromUri(
+                _urlResolver.resolve(
+                  summaryUri, toSummaryExtension(export.uri)));
+              final exportSummary = await _readNgMeta(reader, exportAsset, {});
+              if (exportSummary != null) {
+                prefixRes.addAll(exportSummary);
+              }
+            }
+          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -359,8 +359,8 @@ export class Router {`
`359`	`359`	`if (componentInstruction.reuse) {`
`360`	`360`	`next = this._outlet.reuse(componentInstruction);`
`361`	`361`	`} else {`
`362`		`- next =`
`363`		`- this.deactivate(instruction).then((_) => this._outlet.activate(componentInstruction));`
	`362`	`+ let outlet = this._outlet;`
	`363`	`+ next = this.deactivate(instruction).then((_) => outlet.activate(componentInstruction));`
`364`	`364`	`}`
`365`	`365`	`if (isPresent(instruction.child)) {`
`366`	`366`	`next = next.then((_) => {`
`@@ -412,7 +412,8 @@ export class Router {`
`412`	`412`	`next = this._childRouter.deactivate(childInstruction);`
`413`	`413`	`}`
`414`	`414`	`if (isPresent(this._outlet)) {`
`415`		`- next = next.then((_) => this._outlet.deactivate(componentInstruction));`
	`415`	`+ let outlet = this._outlet;`
	`416`	`+ next = next.then((_) => outlet.deactivate(componentInstruction));`
`416`	`417`	`}`
`417`	`418`
`418`	`419`	`// TODO: handle aux routes`