Refactor DartDocConfig object usage, part 1 (#1661)

* refactors

* Library/Package/PackageGraph constructor shuffle

* Not quite there; still need to populate non-local packages

* weird vm thing

* Got it?

* Add another test

* tweaks for Flutter

* Initialization speedups

* Canonicalize path comparisons and increase timeouts on the complex dartdoc tests for travis

* Update grind with different parameters

* First step complete, now to eliminate dupes

* Condense more into config

* remove commented out line

* Everything but the generator information is moved now.

* dartfmt

* Restore a commented out test

* Use localPublicLibraries in restored test

* dartfmt + review comments

Author: jcollins-g

bin/dartdoc.dart

@@ -68,10 +68,6 @@ main(List<String> arguments) async {
     exit(1);
   }
 
-  List<String> excludeLibraries = args['exclude'] as List<String>;
-  List<String> includeLibraries = args['include'] as List<String>;
-  List<String> includeExternals = args['include-external'] as List<String>;
-
   String url = args['hosted-url'];
 
   List<String> headerFilePaths =
@@ -252,26 +248,30 @@ main(List<String> arguments) async {
     ]);
   }
 
-  setConfig(
-      addCrossdart: args['add-crossdart'],
-      examplePathPrefix: args['example-path-prefix'],
-      showWarnings: args['show-warnings'],
-      includeSource: args['include-source'],
-      inputDir: inputDir,
-      sdkVersion: sdk.sdkVersion,
-      autoIncludeDependencies: args['auto-include-dependencies'],
-      packageOrder: args['package-order'].isEmpty
-          ? args['category-order']
-          : args['package-order'],
-      reexportMinConfidence:
-          double.parse(args['ambiguous-reexport-scorer-min-confidence']),
-      verboseWarnings: args['verbose-warnings'],
-      excludePackages: args['exclude-packages'],
-      dropTextFrom: dropTextFrom,
-      validateLinks: args['validate-links']);
-
-  DartDoc dartdoc = new DartDoc(inputDir, excludeLibraries, sdkDir, generators,
-      outputDir, packageMeta, includeLibraries, includeExternals);
+  DartDocConfig config = new DartDocConfig.fromParameters(
+    addCrossdart: args['add-crossdart'],
+    autoIncludeDependencies: args['auto-include-dependencies'],
+    dropTextFrom: dropTextFrom,
+    examplePathPrefix: args['example-path-prefix'],
+    excludeLibraries: args['exclude'],
+    excludePackages: args['exclude-packages'],
+    includeExternals: args['include-external'],
+    includeLibraries: args['include'],
+    includeSource: args['include-source'],
+    inputDir: inputDir,
+    packageOrder: args['package-order'].isEmpty
+        ? args['category-order']
+        : args['package-order'],
+    reexportMinConfidence:
+        double.parse(args['ambiguous-reexport-scorer-min-confidence']),
+    sdkDir: sdkDir,
+    sdkVersion: sdk.sdkVersion,
+    showWarnings: args['show-warnings'],
+    validateLinks: args['validate-links'],
+    verboseWarnings: args['verbose-warnings'],
+  );
+
+  DartDoc dartdoc = new DartDoc(config, generators, outputDir, packageMeta);
 
   dartdoc.onCheckProgress.listen(logProgress);
   await Chain.capture(() async {

lib/dartdoc.dart

@@ -75,25 +75,9 @@ class DartDoc extends PackageBuilder {
   final StreamController<String> _onCheckProgress =
       new StreamController(sync: true);
 
-  DartDoc(
-      Directory rootDir,
-      List<String> excludes,
-      Directory sdkDir,
-      this.generators,
-      this.outputDir,
-      PackageMeta packageMeta,
-      List<String> includes,
-      List<String> includeExternals)
-      : super(
-            rootDir,
-            excludes,
-            config.excludePackages,
-            sdkDir,
-            packageMeta,
-            includes,
-            includeExternals,
-            config.showWarnings,
-            config.autoIncludeDependencies);
+  DartDoc(DartDocConfig config, this.generators, this.outputDir,
+      PackageMeta packageMeta)
+      : super(config, packageMeta);
 
   Stream<String> get onCheckProgress => _onCheckProgress.stream;
 

lib/src/config.dart

@@ -23,65 +23,86 @@ class LocalConfig {
   }
 }
 
-class Config {
-  final Directory inputDir;
-  final bool showWarnings;
+class DartDocConfig {
   final bool addCrossdart;
+  final bool autoIncludeDependencies;
+  final List<String> dropTextFrom;
+  final List<String> excludeLibraries;
+  final List<String> excludePackages;
   final String examplePathPrefix;
+  final List<String> includeExternals;
+  final List<String> includeLibraries;
   final bool includeSource;
-  final String sdkVersion;
-  final bool autoIncludeDependencies;
+  final Directory inputDir;
   final List<String> packageOrder;
   final double reexportMinConfidence;
-  final bool verboseWarnings;
-  final List<String> dropTextFrom;
-  final List<String> excludePackages;
+  final Directory sdkDir;
+  final String sdkVersion;
+  final bool showWarnings;
   final bool validateLinks;
-  Config._(
-      this.inputDir,
-      this.showWarnings,
-      this.addCrossdart,
-      this.examplePathPrefix,
-      this.includeSource,
-      this.sdkVersion,
-      this.autoIncludeDependencies,
-      this.packageOrder,
-      this.reexportMinConfidence,
-      this.verboseWarnings,
-      this.dropTextFrom,
-      this.excludePackages,
-      this.validateLinks);
-}
-
-Config _config;
-Config get config => _config;
+  final bool verboseWarnings;
+  DartDocConfig._(
+    this.addCrossdart,
+    this.autoIncludeDependencies,
+    this.dropTextFrom,
+    this.examplePathPrefix,
+    this.excludeLibraries,
+    this.excludePackages,
+    this.includeExternals,
+    this.includeLibraries,
+    this.includeSource,
+    this.inputDir,
+    this.packageOrder,
+    this.reexportMinConfidence,
+    this.sdkDir,
+    this.sdkVersion,
+    this.showWarnings,
+    this.validateLinks,
+    this.verboseWarnings,
+  );
 
-void setConfig(
-    {Directory inputDir,
-    bool showWarnings: false,
+  factory DartDocConfig.fromParameters({
     bool addCrossdart: false,
+    bool autoIncludeDependencies: false,
+    List<String> dropTextFrom,
     String examplePathPrefix,
+    List<String> excludeLibraries,
+    List<String> excludePackages,
+    List<String> includeExternals,
+    List<String> includeLibraries,
     bool includeSource: true,
-    String sdkVersion,
-    bool autoIncludeDependencies: false,
+    Directory inputDir,
     List<String> packageOrder,
     double reexportMinConfidence: 0.1,
+    Directory sdkDir,
+    String sdkVersion,
+    bool showWarnings: false,
+    bool validateLinks: true,
     bool verboseWarnings: true,
-    List<String> dropTextFrom,
-    List<String> excludePackages,
-    bool validateLinks: true}) {
-  _config = new Config._(
-      inputDir,
-      showWarnings,
+  }) {
+    return new DartDocConfig._(
       addCrossdart,
+      autoIncludeDependencies,
+      dropTextFrom ?? const <String>[],
       examplePathPrefix,
+      excludeLibraries ?? const <String>[],
+      excludePackages ?? const <String>[],
+      includeExternals ?? const <String>[],
+      includeLibraries ?? const <String>[],
       includeSource,
-      sdkVersion,
-      autoIncludeDependencies,
+      inputDir,
       packageOrder ?? const <String>[],
       reexportMinConfidence,
+      sdkDir ?? getSdkDir(),
+      sdkVersion,
+      showWarnings,
+      validateLinks,
       verboseWarnings,
-      dropTextFrom ?? const <String>[],
-      excludePackages ?? const <String>[],
-      validateLinks);
+    );
+  }
+
+  bool isLibraryExcluded(String name) =>
+      excludeLibraries.any((pattern) => name == pattern);
+  bool isPackageExcluded(String name) =>
+      excludePackages.any((pattern) => name == pattern);
 }