refactor(transformer): use the new compiler

Part of angular#3605

Author: Tim Blasi

modules_dart/transform/lib/src/transform/bind_generator/generator.dart

@@ -34,7 +34,6 @@ class _ExtractQueryFieldsFromAnnotation extends Object
   }
 }
 
-
 class _ExtractQueryFieldsFromPropMetadata extends Object
     with RecursiveAstVisitor<Object> {
   final ConstantEvaluator _evaluator = new ConstantEvaluator();
@@ -52,7 +51,10 @@ class _ExtractQueryFieldsFromPropMetadata extends Object
     var res = false;
     list.elements.forEach((item) {
       var n = item.constructorName.toString();
-      if(n == "ContentChild" || n == "ViewChild" || n == "ContentChildren" || n == "ViewChildren") {
+      if (n == "ContentChild" ||
+          n == "ViewChild" ||
+          n == "ContentChildren" ||
+          n == "ViewChildren") {
         res = true;
       }
     });
@@ -65,14 +67,12 @@ class _ExtractQueryFieldsFromPropMetadata extends Object
   }
 }
 
-
 Future<String> createNgSettersAndGetters(
     AssetReader reader, AssetId entryPoint) async {
   NgDeps ngDeps = await NgDeps.parse(reader, entryPoint);
 
   String code = ngDeps.code;
   var setters = _generateSetters(_createPropertiesMap(ngDeps));
-  var getters = _generateGetters(_createEventPropertiesList(ngDeps));
 
   ngDeps.registeredTypes.forEach((t) {
     final fromAnnotation = new _ExtractQueryFieldsFromAnnotation();
@@ -86,16 +86,13 @@ Future<String> createNgSettersAndGetters(
     setters.addAll(_generateSetters(fromPropMetadata.asMap()));
   });
 
-  if (setters.isEmpty && getters.isEmpty) return code;
+  if (setters.isEmpty) return code;
   var out = new StringBuffer();
   var codeInjectIdx = ngDeps.registeredTypes.last.registerMethod.end;
   out.write(code.substring(0, codeInjectIdx));
   if (setters.isNotEmpty) {
     out.write('..registerSetters({${setters.join(', ')}})');
   }
-  if (getters.isNotEmpty) {
-    out.write('..registerGetters({${getters.join(', ')}})');
-  }
   out.write(code.substring(codeInjectIdx));
   return '$out';
 }
@@ -123,7 +120,7 @@ List<String> _generateSetters(Map<String, String> bindMap) {
 /// the bind properties and the values are either the one and only type
 /// binding to that property or the empty string.
 Map<String, String> _createPropertiesMap(NgDeps ngDeps) {
-  var visitor = new ExtractNamedExpressionVisitor('inputs');
+  var visitor = new ExtractNamedExpressionVisitor('properties');
   var bindMap = {};
   ngDeps.registeredTypes.forEach((RegisteredType t) {
     visitor.bindConfig.clear();
@@ -147,37 +144,3 @@ Map<String, String> _createPropertiesMap(NgDeps ngDeps) {
   });
   return bindMap;
 }
-
-/// Consumes the list generated by {@link _createEventPropertiesList} to codegen
-/// getters.
-List<String> _generateGetters(List<String> eventProperties) {
-  var getters = [];
-  // TODO(kegluneq): Include types for receivers. See #886.
-  for (var property in eventProperties) {
-    if (!prop.isValid(property)) {
-      // TODO(kegluenq): Eagerly throw here once #1295 is addressed.
-      getters.add(prop.lazyInvalidGetter(property));
-    } else {
-      getters.add(''' '${prop.sanitize(property)}': (o) => o.$property''');
-    }
-  }
-  return getters;
-}
-
-/// Collapses all `events` in {@link ngDeps} into a list of corresponding
-/// property names.
-List<String> _createEventPropertiesList(NgDeps ngDeps) {
-  var visitor = new ExtractNamedExpressionVisitor('outputs');
-  var propertyNames = [];
-  ngDeps.registeredTypes.forEach((RegisteredType t) {
-    visitor.bindConfig.clear();
-    t.annotations.accept(visitor);
-    visitor.bindConfig.forEach((String config) {
-      // See comments for `Directive` in annotations_impl/annotations.ts for
-      // details on how `events` is specified. We are pulling out the property
-      // name only (everything before the first `:`).
-      propertyNames.add(config.split(':').first.trim());
-    });
-  });
-  return propertyNames;
-}

modules_dart/transform/lib/src/transform/common/code/ng_deps_code.dart

@@ -38,17 +38,9 @@ class NgDepsVisitor extends RecursiveAstVisitor<Object> {
   }
 
   void _createModel(String libraryUri) {
-    _model = new NgDepsModel()..libraryUri = libraryUri;
-
-    // We need to import & export the original file.
-    var origDartFile = path.basename(processedFile.path);
-    _model.imports.add(new ImportModel()..uri = origDartFile);
-    _model.exports.add(new ExportModel()..uri = origDartFile);
-
-    // Used to register reflective information.
-    _model.imports.add(new ImportModel()
-      ..uri = REFLECTOR_IMPORT
-      ..prefix = REFLECTOR_PREFIX);
+    _model = new NgDepsModel()
+      ..libraryUri = libraryUri
+      ..sourceFile = path.basename(processedFile.path);
   }
 
   @override
@@ -139,6 +131,14 @@ abstract class NgDepsWriterMixin
       buffer.writeln('library ${model.libraryUri}${DEPS_EXTENSION};\n');
     }
 
+    // We need to import & export the source file.
+    writeImportModel(new ImportModel()..uri = model.sourceFile);
+
+    // Used to register reflective information.
+    writeImportModel(new ImportModel()
+      ..uri = REFLECTOR_IMPORT
+      ..prefix = REFLECTOR_PREFIX);
+
     // We do not support `partUris`, so skip outputting them.
     for (var importModel in model.imports) {
       // Ignore deferred imports here so as to not load the deferred libraries
@@ -149,6 +149,7 @@ abstract class NgDepsWriterMixin
 
       writeImportModel(importModel);
     }
+    writeExportModel(new ExportModel()..uri = model.sourceFile);
     model.exports.forEach(writeExportModel);
 
     buffer

modules_dart/transform/lib/src/transform/common/code/source_module.dart

@@ -0,0 +1,34 @@
+library angular2.transform.common.code.reflection_info_code;
+
+import 'package:angular2/src/compiler/source_module.dart';
+
+import 'uri.dart';
+
+/// Writes the full Dart code for the provided [SourceModule].
+///
+/// If `libraryName` is provided, the generated source will be generated with
+/// the approprate "library" directive.
+String writeSourceModule(SourceModule sourceModule, {String libraryName}) {
+  if (sourceModule == null) return null;
+  var buf = new StringBuffer();
+  var sourceWithImports = sourceModule.getSourceWithImports();
+
+  if (libraryName != null && libraryName.isNotEmpty) {
+    buf..writeln('library $libraryName;')..writeln();
+  }
+  sourceWithImports.imports.forEach((import) {
+    // Format for importLine := [uri, prefix]
+    if (import.length != 2) {
+      throw new FormatException(
+          'Unexpected import format! '
+          'Angular 2 compiler returned imports in an unexpected format. '
+          'Expected [<import_uri>, <prefix>].',
+          import.join(', '));
+    }
+    buf.writeln(writeImportUri(import[0],
+        prefix: import[1], fromAbsolute: sourceModule.moduleUrl));
+  });
+  buf..writeln()..writeln(sourceWithImports.source);
+
+  return buf.toString();
+}

modules_dart/transform/lib/src/transform/common/code/uri.dart

@@ -0,0 +1,76 @@
+library angular2.transform.common.code.reflection_info_code;
+
+import 'package:angular2/src/transform/common/url_resolver.dart';
+import 'package:path/path.dart' as path;
+
+/// Generates an `import` statement for the file specified by `importPath`.
+///
+/// If `fromAbsolute` is specified, `importPath` may be a relative path,
+/// otherwise it is expected to be absolute.
+String writeImportUri(String importPath, {String prefix, String fromAbsolute}) {
+  var codegenImportPath;
+
+  var resolver = const TransformerUrlResolver();
+  var importUri = resolver.toAssetScheme(Uri.parse(importPath));
+  if (_canPackageImport(importUri) ||
+      fromAbsolute == null ||
+      fromAbsolute.isEmpty) {
+    codegenImportPath = _toPackageImport(importUri);
+  } else {
+    var moduleUri = resolver.toAssetScheme(Uri.parse(fromAbsolute));
+    if (_canImportRelative(importUri, from: moduleUri)) {
+      codegenImportPath = path.url.relative(importUri.toString(),
+          from: path.dirname(moduleUri.toString()));
+    } else {
+      var errMsg;
+      if (fromAbsolute == null || fromAbsolute.isEmpty) {
+        errMsg = 'Can only import $importPath using a relative uri';
+      } else {
+        errMsg = 'Cannot import $importPath from $fromAbsolute';
+      }
+      throw new FormatException(errMsg, importPath);
+    }
+  }
+
+  if (prefix != null && prefix.isNotEmpty) {
+    prefix = ' as $prefix';
+  }
+  return 'import \'$codegenImportPath\'$prefix;';
+}
+
+// For a relative import, the scheme, first (package) and second (lib|test|web)
+// path segments must be equal.
+bool _canImportRelative(Uri importUri, {Uri from}) {
+  if (importUri == null) throw new ArgumentError.notNull('importUri');
+  if (from == null) throw new ArgumentError.notNull('from');
+  assert(importUri.scheme == 'asset');
+  assert(importUri.pathSegments.length >= 2);
+  assert(from.scheme == 'asset');
+  assert(from.pathSegments.length >= 2);
+  return importUri.pathSegments.first == from.pathSegments.first &&
+      importUri.pathSegments[1] == from.pathSegments[1];
+}
+
+/// Pub's package scheme assumes that an asset lives under the lib/ directory,
+/// so an asset: Uri is package-importable if its second path segment is lib/.
+///
+/// For a file located at angular2/lib/src/file.dart:
+/// - Asset scheme =>  asset:angular2/lib/src/file.dart
+/// - Package scheme => package:angular2/src/file.dart
+bool _canPackageImport(Uri assetImport) {
+  if (assetImport == null) throw new ArgumentError.notNull('assetImport');
+  if (!assetImport.isAbsolute || assetImport.scheme != 'asset') {
+    throw new ArgumentError.value(assetImport, 'assetImport',
+        'Must be an absolute uri using the asset: scheme');
+  }
+  return assetImport.pathSegments.length >= 2 &&
+      assetImport.pathSegments[1] == 'lib';
+}
+
+String _toPackageImport(Uri assetImport) {
+  assert(_canPackageImport(assetImport));
+  var subPath = assetImport.pathSegments
+      .getRange(2, assetImport.pathSegments.length)
+      .join('/');
+  return 'package:${assetImport.pathSegments.first}/$subPath';
+}