roll up a BUNCH of args into an options class

Author: kevmoo

lib/dartdoc.dart

@@ -50,16 +50,20 @@ Future<List<Generator>> initGenerators(String url, List<String> headerFilePaths,
     {String faviconPath,
     bool useCategories: false,
     bool prettyIndexJson: false}) async {
+  var options = new HtmlGeneratorOptions(
+      url: url,
+      relCanonicalPrefix: relCanonicalPrefix,
+      toolVersion: version,
+      faviconPath: faviconPath,
+      useCategories: useCategories,
+      prettyIndexJson: prettyIndexJson);
+
   return [
     await HtmlGenerator.create(
-        url: url,
-        headers: headerFilePaths,
-        footers: footerFilePaths,
-        relCanonicalPrefix: relCanonicalPrefix,
-        toolVersion: version,
-        faviconPath: faviconPath,
-        useCategories: useCategories,
-        prettyIndexJson: prettyIndexJson)
+      options: options,
+      headers: headerFilePaths,
+      footers: footerFilePaths,
+    )
   ];
 }
 

lib/src/html/html_generator.dart

@@ -12,8 +12,6 @@ import '../model.dart';
 import 'html_generator_instance.dart';
 import 'templates.dart';
 
-String dartdocVersion = 'unknown';
-
 typedef String Renderer(String input);
 
 // Generation order for libraries:
@@ -35,13 +33,8 @@ typedef String Renderer(String input);
 //   methods
 
 class HtmlGenerator extends Generator {
-  final String _url;
-  final String _relCanonicalPrefix;
   final Templates _templates;
-  final String _toolVersion;
-  final String faviconPath;
-  final bool useCategories;
-  final bool prettyIndexJson;
+  final HtmlGeneratorOptions _options;
 
   final StreamController<File> _onFileCreated =
       new StreamController(sync: true);
@@ -51,38 +44,40 @@ class HtmlGenerator extends Generator {
 
   /// [url] - optional URL for where the docs will be hosted.
   static Future<HtmlGenerator> create(
-      {String url,
+      {HtmlGeneratorOptions options,
       List<String> headers,
-      List<String> footers,
-      String relCanonicalPrefix,
-      String toolVersion,
-      String faviconPath,
-      bool useCategories: false,
-      bool prettyIndexJson: false}) async {
+      List<String> footers}) async {
     var templates =
         await Templates.create(headerPaths: headers, footerPaths: footers);
 
-    if (toolVersion == null) {
-      toolVersion = 'unknown';
-    }
-
-    return new HtmlGenerator._(url, relCanonicalPrefix, templates, toolVersion,
-        faviconPath: faviconPath,
-        useCategories: useCategories,
-        prettyIndexJson: prettyIndexJson);
+    return new HtmlGenerator._(
+        options ?? new HtmlGeneratorOptions(), templates);
   }
 
-  HtmlGenerator._(
-      this._url, this._relCanonicalPrefix, this._templates, this._toolVersion,
-      {this.faviconPath, this.useCategories, this.prettyIndexJson: false});
+  HtmlGenerator._(this._options, this._templates);
 
   @override
   Future generate(Package package, Directory out) {
-    return new HtmlGeneratorInstance(_toolVersion, _url, _templates, package,
-            out, _onFileCreated, _relCanonicalPrefix,
-            faviconPath: faviconPath,
-            useCategories: useCategories,
-            prettyIndexJson: prettyIndexJson)
+    return new HtmlGeneratorInstance(
+            _options, _templates, package, out, _onFileCreated)
         .generate();
   }
 }
+
+class HtmlGeneratorOptions {
+  final String url;
+  final String relCanonicalPrefix;
+  final String faviconPath;
+  final String toolVersion;
+  final bool useCategories;
+  final bool prettyIndexJson;
+
+  HtmlGeneratorOptions(
+      {this.url,
+      this.relCanonicalPrefix,
+      this.faviconPath,
+      String toolVersion,
+      this.useCategories: false,
+      this.prettyIndexJson: false})
+      : this.toolVersion = toolVersion ?? 'unknown';
+}

lib/src/html/html_generator_instance.dart

@@ -11,29 +11,31 @@ import 'package:collection/collection.dart' show compareNatural;
 import 'package:path/path.dart' as path;
 
 import '../model.dart';
+import 'html_generator.dart' show HtmlGeneratorOptions;
 import 'resource_loader.dart' as loader;
 import 'resources.g.dart' as resources;
 import 'template_data.dart';
 import 'templates.dart';
 
 class HtmlGeneratorInstance implements HtmlOptions {
-  final String url;
+  final HtmlGeneratorOptions _options;
+
+  String get url => _options.url;
   final Templates _templates;
   final Package package;
   final Directory out;
   final List<ModelElement> documentedElements = <ModelElement>[];
   final StreamController<File> _onFileCreated;
   @override
-  final String relCanonicalPrefix;
+  String get relCanonicalPrefix => _options.relCanonicalPrefix;
   @override
-  final String toolVersion;
-  final String faviconPath;
-  final bool useCategories;
-  final bool prettyIndexJson;
-
-  HtmlGeneratorInstance(this.toolVersion, this.url, this._templates,
-      this.package, this.out, this._onFileCreated, this.relCanonicalPrefix,
-      {this.faviconPath, this.useCategories, this.prettyIndexJson: false});
+  String get toolVersion => _options.toolVersion;
+  String get faviconPath => _options.faviconPath;
+  bool get useCategories => _options.useCategories;
+  bool get prettyIndexJson => _options.prettyIndexJson;
+
+  HtmlGeneratorInstance(this._options, this._templates, this.package, this.out,
+      this._onFileCreated);
 
   Future generate() async {
     if (!out.existsSync()) out.createSync();