expose strong checker API, for use by analyzer_cli

lib/devc.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.
 
 /// Command line tool to run the checker on a Dart program.
 library dev_compiler.devc;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
@@ skipping 35 matching lines @@
   AnalysisContext get context;
   TypeRules get rules;
   Uri get entryPointUri;
 }
 
 /// Encapsulates the logic to do a one-off compilation or a partial compilation
 /// when the compiler is run as a development server.
 class Compiler implements AbstractCompiler {
   final CompilerOptions options;
   final AnalysisContext context;
-  final CheckerReporter _reporter;
+  final CompilerReporter _reporter;
   final TypeRules rules;
   final CodeChecker _checker;
   final SourceNode _entryNode;
   List<LibraryInfo> _libraries = <LibraryInfo>[];
   final _generators = <CodeGenerator>[];
   bool _hashing;
   bool _failure = false;
 
   factory Compiler(CompilerOptions options,
-      {AnalysisContext context, CheckerReporter reporter}) {
-    if (context == null) context = createAnalysisContext(options);
+      {AnalysisContext context, CompilerReporter reporter}) {
+    var strongOpts = options.strongOptions;
+    var sourceOpts = options.sourceOptions;
+    if (context == null) {
+      context = createAnalysisContextWithSources(strongOpts, sourceOpts);
+    }
 
     if (reporter == null) {
       reporter = options.dumpInfo
           ? new SummaryReporter(context, options.logLevel)
           : new LogReporter(context, useColors: options.useColors);
     }
     var graph = new SourceGraph(context, reporter, options);
-    var rules = new RestrictedRules(context.typeProvider, options: options);
-    var checker = new CodeChecker(rules, reporter, options);
+    var rules = new RestrictedRules(context.typeProvider,
+        options: options.strongOptions);
+    var checker = new CodeChecker(rules, reporter, strongOpts);
 
-    var inputFile = options.entryPointFile;
+    var inputFile = sourceOpts.entryPointFile;
     var inputUri = inputFile.startsWith('dart:') ||
             inputFile.startsWith('package:')
         ? Uri.parse(inputFile)
-        : new Uri.file(path.absolute(options.useImplicitHtml
-            ? ResolverOptions.implicitHtmlFile
+        : new Uri.file(path.absolute(sourceOpts.useImplicitHtml
+            ? SourceResolverOptions.implicitHtmlFile
             : inputFile));
     var entryNode = graph.nodeFromUri(inputUri);
 
     return new Compiler._(
         options, context, reporter, rules, checker, entryNode);
   }
 
   Compiler._(this.options, this.context, this._reporter, this.rules,
       this._checker, this._entryNode) {
-    if (options.outputDir != null) {
+    if (outputDir != null) {
       _generators.add(new JSGenerator(this));
     }
     // TODO(sigmund): refactor to support hashing of the dart output?
     _hashing = options.enableHashing && _generators.length == 1;
   }
 
   Uri get entryPointUri => _entryNode.uri;
+  String get outputDir => options.codegenOptions.outputDir;
 
   bool _buildSource(SourceNode node) {
     if (node is HtmlSourceNode) {
       _buildHtmlFile(node);
     } else if (node is DartSourceNode) {
       _buildDartLibrary(node);
     } else if (node is ResourceSourceNode) {
       _buildResourceFile(node);
     } else {
       assert(false); // should not get a build request on PartSourceNode
     }
 
     // TODO(sigmund): don't always return true. Use summarization to better
     // determine when rebuilding is needed.
     return true;
   }
 
   void _buildHtmlFile(HtmlSourceNode node) {
-    if (options.outputDir == null) return;
+    if (outputDir == null) return;
     var uri = node.source.uri;
     _reporter.enterHtml(uri);
     var output = generateEntryHtml(node, options);
     if (output == null) {
       _failure = true;
       return;
     }
     _reporter.leaveHtml();
     var filename = path.basename(node.uri.path);
-    String outputFile = path.join(options.outputDir, filename);
+    String outputFile = path.join(outputDir, filename);
     new File(outputFile).writeAsStringSync(output);
   }
 
   void _buildResourceFile(ResourceSourceNode node) {
     // ResourceSourceNodes files that just need to be copied over to the output
     // location. These can be external dependencies or pieces of the
     // dev_compiler runtime.
-    if (options.outputDir == null) return;
+    if (outputDir == null) return;
     var filepath = resourceOutputPath(node.uri, _entryNode.uri);
     assert(filepath != null);
-    filepath = path.join(options.outputDir, filepath);
+    filepath = path.join(outputDir, filepath);
     var dir = path.dirname(filepath);
     new Directory(dir).createSync(recursive: true);
     new File.fromUri(node.source.uri).copySync(filepath);
     if (_hashing) node.cachingHash = computeHashFromFile(filepath);
   }
 
   bool _isEntry(DartSourceNode node) {
     if (_entryNode is DartSourceNode) return _entryNode == node;
     return (_entryNode as HtmlSourceNode).scripts.contains(node);
   }
@@ skipping 24 matching lines @@
       var unitSource = unit.element.source;
       _reporter.enterCompilationUnit(unit);
       // TODO(sigmund): integrate analyzer errors with static-info (issue #6).
       failureInLib = logErrors(unitSource) || failureInLib;
       _checker.visitCompilationUnit(unit);
       if (_checker.failure) failureInLib = true;
       _reporter.leaveCompilationUnit();
     }
     if (failureInLib) {
       _failure = true;
-      if (!options.forceCompile) return;
+      if (!options.codegenOptions.forceCompile) return;
     }
 
     for (var cg in _generators) {
       var hash = cg.generateLibrary(libraryUnit, current);
       if (_hashing) node.cachingHash = hash;
     }
     _reporter.leaveLibrary();
   }
 
   /// Log any errors encountered when resolving [source] and return whether any
@@ skipping 18 matching lines @@
     // dependency_graph now detects broken imports or unsupported features
     // like more than one script tag (see .severe messages in
     // dependency_graph.dart). Such failures should be reported back
     // here so we can mark failure=true in the CheckerResutls.
     rebuild(_entryNode, _buildSource);
     _dumpInfoIfRequested();
     clock.stop();
     var time = (clock.elapsedMilliseconds / 1000).toStringAsFixed(2);
     _log.fine('Compiled ${_libraries.length} libraries in ${time} s\n');
     return new CheckerResults(
-        _libraries, rules, _failure || options.forceCompile);
+        _libraries, rules, _failure || options.codegenOptions.forceCompile);
   }
 
   void _runAgain() {
     var clock = new Stopwatch()..start();
     _libraries = <LibraryInfo>[];
     int changed = 0;
 
     // TODO(sigmund): propagate failures here (see TODO in run).
     rebuild(_entryNode, (n) {
       changed++;
       return _buildSource(n);
     });
     clock.stop();
     if (changed > 0) _dumpInfoIfRequested();
     var time = (clock.elapsedMilliseconds / 1000).toStringAsFixed(2);
     _log.fine("Compiled ${changed} libraries in ${time} s\n");
   }
 
   _dumpInfoIfRequested() {
     if (!options.dumpInfo || _reporter is! SummaryReporter) return;
     var result = (_reporter as SummaryReporter).result;
     if (!options.serverMode) print(summaryToString(result));
     var filepath = options.serverMode
-        ? path.join(options.outputDir, 'messages.json')
+        ? path.join(outputDir, 'messages.json')
         : options.dumpInfoFile;
     if (filepath == null) return;
     new File(filepath).writeAsStringSync(JSON.encode(result.toJsonMap()));
   }
 }
 
 class CompilerServer {
   final Compiler compiler;
   final String outDir;
   final String host;
   final int port;
   final String _entryPath;
 
   factory CompilerServer(CompilerOptions options) {
-    var entryPath = path.basename(options.entryPointFile);
+    var entryPath = path.basename(options.sourceOptions.entryPointFile);
     var extension = path.extension(entryPath);
-    if (extension != '.html' && !options.useImplicitHtml) {
+    if (extension != '.html' && !options.sourceOptions.useImplicitHtml) {
       print('error: devc in server mode requires an HTML or Dart entry point.');
       exit(1);
     }
 
     // TODO(sigmund): allow running without a dir, but keep output in memory?
-    var outDir = options.outputDir;
+    var outDir = options.codegenOptions.outputDir;
     if (outDir == null) {
       print('error: devc in server mode also requires specifying and '
           'output location for generated code.');
       exit(1);
     }
     var port = options.port;
     var host = options.host;
     var compiler = new Compiler(options);
     return new CompilerServer._(compiler, outDir, host, port, entryPath);
   }
 
   CompilerServer._(
       Compiler compiler, this.outDir, this.host, this.port, String entryPath)
       : this.compiler = compiler,
-        this._entryPath = compiler.options.useImplicitHtml
-            ? ResolverOptions.implicitHtmlFile
+        // TODO(jmesserly): this logic is duplicated in a few places
+        this._entryPath = compiler.options.sourceOptions.useImplicitHtml
+            ? SourceResolverOptions.implicitHtmlFile
             : entryPath;
 
   Future start() async {
     // Create output directory if needed. shelf_static will fail otherwise.
     var out = new Directory(outDir);
     if (!await out.exists()) await out.create(recursive: true);
 
     var handler = const shelf.Pipeline()
         .addMiddleware(rebuildAndCache)
         .addHandler(shelf_static.createStaticHandler(outDir,
@@ skipping 21 matching lines @@
       // Note: the cache-control header should be enough, but this doesn't hurt
       // and can help renew the policy after it expires.
       headers['ETag'] = hash;
     }
     return response.change(headers: headers);
   };
 }
 
 final _log = new Logger('dev_compiler');
 final _earlyErrorResult = new CheckerResults(const [], null, true);