Recombine options into one GeneratorContext

Author: jdkoren

lib/dartdoc.dart

@@ -39,7 +39,7 @@ const String dartdocVersion = packageVersion;
 
 /// Helper class that consolidates option contexts for instantiating generators.
 class DartdocGeneratorOptionContext extends DartdocOptionContext
-    with BaseGeneratorContext, HtmlGeneratorContext {
+    with GeneratorContext {
   DartdocGeneratorOptionContext(DartdocOptionSet optionSet, Directory dir)
       : super(optionSet, dir);
 }

lib/src/generator.dart

@@ -10,7 +10,6 @@ import 'dart:io' show Directory;
 import 'dart:isolate';
 
 import 'package:dartdoc/src/dartdoc_options.dart';
-import 'package:dartdoc/src/html/html_generator.dart';
 import 'package:dartdoc/src/model/model.dart' show PackageGraph;
 import 'package:dartdoc/src/package_meta.dart';
 
@@ -33,7 +32,7 @@ abstract class Generator {
 }
 
 /// Dartdoc options related to generators generally.
-mixin BaseGeneratorContext on DartdocOptionContextBase {
+mixin GeneratorContext on DartdocOptionContextBase {
   List<String> get footer => optionSet['footer'].valueAt(context);
 
   /// _footerText is only used to construct synthetic options.
@@ -47,6 +46,11 @@ mixin BaseGeneratorContext on DartdocOptionContextBase {
 
   bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context);
 
+  String get favicon => optionSet['favicon'].valueAt(context);
+
+  String get relCanonicalPrefix =>
+      optionSet['relCanonicalPrefix'].valueAt(context);
+
   String get templatesDir => optionSet['templatesDir'].valueAt(context);
 }
 
@@ -106,6 +110,15 @@ Future<List<DartdocOption>> createGeneratorOptions() async {
             'Generates `index.json` with indentation and newlines. The file is '
             'larger, but it\'s also easier to diff.',
         negatable: false),
+    DartdocOptionArgFile<String>('favicon', null,
+        isFile: true,
+        help: 'A path to a favicon for the generated docs.',
+        mustExist: true),
+    DartdocOptionArgOnly<String>('relCanonicalPrefix', null,
+        help:
+            'If provided, add a rel="canonical" prefixed with provided value. '
+            'Consider using if building many versions of the docs for public '
+            'SEO; learn more at https://goo.gl/gktN6F.'),
     DartdocOptionArgOnly<String>("templatesDir", null,
         isDir: true,
         mustExist: true,
@@ -119,5 +132,5 @@ Future<List<DartdocOption>> createGeneratorOptions() async {
             'they must begin with an underscore, and references to them must '
             'omit the leading underscore (e.g. use {{>foo}} to reference the '
             'partial template _foo.html).'),
-  ]..addAll(createHtmlGeneratorOptions());
+  ];
 }

lib/src/html/html_generator.dart

@@ -141,7 +141,7 @@ class HtmlGeneratorOptions implements HtmlOptions {
 }
 
 /// Initialize and setup the generators.
-Future<List<Generator>> initHtmlGenerators(HtmlGeneratorContext context) async {
+Future<List<Generator>> initHtmlGenerators(GeneratorContext context) async {
   // TODO(jcollins-g): Rationalize based on GeneratorContext all the way down
   // through the generators.
   HtmlGeneratorOptions options = HtmlGeneratorOptions(
@@ -160,25 +160,3 @@ Future<List<Generator>> initHtmlGenerators(HtmlGeneratorContext context) async {
     )
   ];
 }
-
-/// Dartdoc options related to html generation.
-mixin HtmlGeneratorContext on BaseGeneratorContext {
-  String get favicon => optionSet['favicon'].valueAt(context);
-
-  String get relCanonicalPrefix =>
-      optionSet['relCanonicalPrefix'].valueAt(context);
-}
-
-List<DartdocOption> createHtmlGeneratorOptions() {
-  return <DartdocOption>[
-    DartdocOptionArgFile<String>('favicon', null,
-        isFile: true,
-        help: 'A path to a favicon for the generated docs.',
-        mustExist: true),
-    DartdocOptionArgOnly<String>('relCanonicalPrefix', null,
-        help:
-            'If provided, add a rel="canonical" prefixed with provided value. '
-            'Consider using if\nbuilding many versions of the docs for public '
-            'SEO; learn more at https://goo.gl/gktN6F.'),
-  ];
-}