From 60819e2084ddfca401d2505fa00b435fb1773ef4 Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Fri, 13 Dec 2019 09:42:53 -0800
Subject: [PATCH 1/8] Remove --hosted-url as it is actually unused

---
 lib/src/html/html_generator.dart | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index 8cac333a0a..388aa1a578 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -131,7 +131,6 @@ class HtmlGenerator extends Generator {
 }
 
 class HtmlGeneratorOptions implements HtmlOptions {
-  final String url;
   final String faviconPath;
   final bool prettyIndexJson;
   final String templatesDir;
@@ -146,8 +145,7 @@ class HtmlGeneratorOptions implements HtmlOptions {
   final bool useBaseHref;
 
   HtmlGeneratorOptions(
-      {this.url,
-      this.relCanonicalPrefix,
+      {this.relCanonicalPrefix,
       this.faviconPath,
       String toolVersion,
       this.prettyIndexJson = false,
@@ -165,7 +163,6 @@ Future<List<Generator>> initGenerators(GeneratorContext config) async {
   // TODO(jcollins-g): Rationalize based on GeneratorContext all the way down
   // through the generators.
   HtmlGeneratorOptions options = HtmlGeneratorOptions(
-      url: config.hostedUrl,
       relCanonicalPrefix: config.relCanonicalPrefix,
       toolVersion: dartdocVersion,
       faviconPath: config.favicon,
@@ -191,6 +188,7 @@ Future<void> _setSdkFooterCopyrightUri() async {
   }
 }
 
+// Dartdoc options specific to generators
 abstract class GeneratorContext implements DartdocOptionContext {
   String get favicon => optionSet['favicon'].valueAt(context);
   List<String> get footer => optionSet['footer'].valueAt(context);
@@ -201,7 +199,6 @@ abstract class GeneratorContext implements DartdocOptionContext {
   List<String> get footerTextPaths =>
       optionSet['footerTextPaths'].valueAt(context);
   List<String> get header => optionSet['header'].valueAt(context);
-  String get hostedUrl => optionSet['hostedUrl'].valueAt(context);
   bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context);
   String get relCanonicalPrefix =>
       optionSet['relCanonicalPrefix'].valueAt(context);
@@ -248,9 +245,6 @@ Future<List<DartdocOption>> createGeneratorOptions() async {
         isFile: true,
         help: 'paths to header files containing HTML text.',
         splitCommas: true),
-    DartdocOptionArgOnly<String>('hostedUrl', null,
-        help:
-            'URL where the docs will be hosted (used to generate the sitemap).'),
     DartdocOptionArgOnly<bool>('prettyIndexJson', false,
         help:
             "Generates `index.json` with indentation and newlines. The file is larger, but it's also easier to diff.",

From 808a37f9369e1228b62ac45ea33d353d120b12b6 Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Wed, 18 Dec 2019 07:58:51 -0800
Subject: [PATCH 2/8] Move templatesDir option to generator context

---
 lib/src/dartdoc_options.dart     | 13 -------------
 lib/src/html/html_generator.dart | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/src/dartdoc_options.dart b/lib/src/dartdoc_options.dart
index 409f87617f..73851310b5 100644
--- a/lib/src/dartdoc_options.dart
+++ b/lib/src/dartdoc_options.dart
@@ -1421,8 +1421,6 @@ class DartdocOptionContext extends DartdocOptionContextBase
   bool isPackageExcluded(String name) =>
       excludePackages.any((pattern) => name == pattern);
 
-  String get templatesDir => optionSet['templatesDir'].valueAt(context);
-
   // TODO(jdkoren): temporary while we confirm href base behavior doesn't break important clients
   bool get useBaseHref => optionSet['useBaseHref'].valueAt(context);
 }
@@ -1627,17 +1625,6 @@ Future<List<DartdocOption>> createDartdocOptions() async {
             'exist. Executables for different platforms are specified by '
             'giving the platform name as a key, and a list of strings as the '
             'command.'),
-    DartdocOptionArgOnly<String>("templatesDir", null,
-        isDir: true,
-        mustExist: true,
-        hide: true,
-        help:
-            'Path to a directory containing templates to use instead of the default ones. '
-            'Directory must contain an html file for each of the following: 404error, category, '
-            'class, constant, constructor, enum, function, index, library, method, mixin, '
-            'property, top_level_constant, top_level_property, typedef. Partial templates are '
-            'supported; 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).'),
     DartdocOptionArgOnly<bool>('useBaseHref', false,
         help:
             'Use <base href> in generated files (legacy behavior). This option '
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index 388aa1a578..c74fac2403 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -181,6 +181,7 @@ Future<List<Generator>> initGenerators(GeneratorContext config) async {
 }
 
 Uri _sdkFooterCopyrightUri;
+
 Future<void> _setSdkFooterCopyrightUri() async {
   if (_sdkFooterCopyrightUri == null) {
     _sdkFooterCopyrightUri = await Isolate.resolvePackageUri(
@@ -189,19 +190,26 @@ Future<void> _setSdkFooterCopyrightUri() async {
 }
 
 // Dartdoc options specific to generators
-abstract class GeneratorContext implements DartdocOptionContext {
+abstract class GeneratorContext implements DartdocOptionContextBase {
   String get favicon => optionSet['favicon'].valueAt(context);
+
   List<String> get footer => optionSet['footer'].valueAt(context);
 
   /// _footerText is only used to construct synthetic options.
   // ignore: unused_element
   List<String> get _footerText => optionSet['footerText'].valueAt(context);
+
   List<String> get footerTextPaths =>
       optionSet['footerTextPaths'].valueAt(context);
+
   List<String> get header => optionSet['header'].valueAt(context);
+
   bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context);
+
   String get relCanonicalPrefix =>
       optionSet['relCanonicalPrefix'].valueAt(context);
+
+  String get templatesDir => optionSet['templatesDir'].valueAt(context);
 }
 
 Future<List<DartdocOption>> createGeneratorOptions() async {
@@ -254,5 +262,16 @@ Future<List<DartdocOption>> createGeneratorOptions() async {
             '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.'),
+    DartdocOptionArgOnly<String>("templatesDir", null,
+        isDir: true,
+        mustExist: true,
+        hide: true,
+        help:
+            'Path to a directory containing templates to use instead of the default ones. '
+            'Directory must contain an html file for each of the following: 404error, category, '
+            'class, constant, constructor, enum, function, index, library, method, mixin, '
+            'property, top_level_constant, top_level_property, typedef. Partial templates are '
+            'supported; 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).'),
   ];
 }

From 87730b0821f3ca14ff116663231375f37c8cecbf Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Wed, 18 Dec 2019 09:16:29 -0800
Subject: [PATCH 3/8] Separate html generator options from generic ones

---
 lib/dartdoc.dart                 |  2 +-
 lib/src/html/html_generator.dart | 54 +++++++++++++++++++-------------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 2c1057036d..09c115ae02 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -39,7 +39,7 @@ const String dartdocVersion = packageVersion;
 /// Helper class to initialize the default generators since they require
 /// GeneratorContext.
 class DartdocGeneratorOptionContext extends DartdocOptionContext
-    with GeneratorContext {
+    with BaseGeneratorContext, HtmlGeneratorContext {
   DartdocGeneratorOptionContext(DartdocOptionSet optionSet, Directory dir)
       : super(optionSet, dir);
 }
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index c74fac2403..0b657b32f7 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -159,7 +159,8 @@ Future<List<Generator>> initEmptyGenerators(DartdocOptionContext config) async {
 }
 
 /// Initialize and setup the generators.
-Future<List<Generator>> initGenerators(GeneratorContext config) async {
+Future<List<Generator>> initGenerators(
+    DartdocGeneratorOptionContext config) async {
   // TODO(jcollins-g): Rationalize based on GeneratorContext all the way down
   // through the generators.
   HtmlGeneratorOptions options = HtmlGeneratorOptions(
@@ -189,10 +190,8 @@ Future<void> _setSdkFooterCopyrightUri() async {
   }
 }
 
-// Dartdoc options specific to generators
-abstract class GeneratorContext implements DartdocOptionContextBase {
-  String get favicon => optionSet['favicon'].valueAt(context);
-
+/// Dartdoc options related to generators generally.
+mixin BaseGeneratorContext on DartdocOptionContextBase {
   List<String> get footer => optionSet['footer'].valueAt(context);
 
   /// _footerText is only used to construct synthetic options.
@@ -206,29 +205,33 @@ abstract class GeneratorContext implements DartdocOptionContextBase {
 
   bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context);
 
+  String get templatesDir => optionSet['templatesDir'].valueAt(context);
+}
+
+/// Dartdoc options related to html generation.
+mixin HtmlGeneratorContext on DartdocOptionContextBase {
+  String get favicon => optionSet['favicon'].valueAt(context);
+
   String get relCanonicalPrefix =>
       optionSet['relCanonicalPrefix'].valueAt(context);
-
-  String get templatesDir => optionSet['templatesDir'].valueAt(context);
 }
 
 Future<List<DartdocOption>> createGeneratorOptions() async {
   await _setSdkFooterCopyrightUri();
   return <DartdocOption>[
-    DartdocOptionArgFile<String>('favicon', null,
-        isFile: true,
-        help: 'A path to a favicon for the generated docs.',
-        mustExist: true),
     DartdocOptionArgFile<List<String>>('footer', [],
         isFile: true,
-        help: 'paths to footer files containing HTML text.',
+        help:
+            'Paths to files with content to add to page footers, but possibly '
+            'outside of dedicated footer elements for the generator (e.g. '
+            'outside of <footer> for an HTML generator). To add text content '
+            'to dedicated footer elements, use --footer-text instead.',
         mustExist: true,
         splitCommas: true),
     DartdocOptionArgFile<List<String>>('footerText', [],
         isFile: true,
-        help:
-            'paths to footer-text files (optional text next to the package name '
-            'and version).',
+        help: 'Paths to files with content to add to page footers (next to the '
+            'package name and version).',
         mustExist: true,
         splitCommas: true),
     DartdocOptionSyntheticOnly<List<String>>(
@@ -251,17 +254,12 @@ Future<List<DartdocOption>> createGeneratorOptions() async {
     ),
     DartdocOptionArgFile<List<String>>('header', [],
         isFile: true,
-        help: 'paths to header files containing HTML text.',
+        help: 'Paths to files with content to add to page headers.',
         splitCommas: true),
     DartdocOptionArgOnly<bool>('prettyIndexJson', false,
         help:
             "Generates `index.json` with indentation and newlines. The file is larger, but it's also easier to diff.",
         negatable: false),
-    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.'),
     DartdocOptionArgOnly<String>("templatesDir", null,
         isDir: true,
         mustExist: true,
@@ -273,5 +271,19 @@ Future<List<DartdocOption>> createGeneratorOptions() async {
             'property, top_level_constant, top_level_property, typedef. Partial templates are '
             'supported; 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());
+}
+
+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.'),
   ];
 }

From 14e8acc8eeb16058c988678fa4768e72a23591e1 Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Wed, 18 Dec 2019 09:39:33 -0800
Subject: [PATCH 4/8] Move base generator context options to generator.dart

---
 lib/src/generator.dart           | 96 ++++++++++++++++++++++++++++++++
 lib/src/html/html_generator.dart | 85 ----------------------------
 2 files changed, 96 insertions(+), 85 deletions(-)

diff --git a/lib/src/generator.dart b/lib/src/generator.dart
index d062ae97c5..91277f5efe 100644
--- a/lib/src/generator.dart
+++ b/lib/src/generator.dart
@@ -6,9 +6,15 @@
 library dartdoc.generator;
 
 import 'dart:async' show Stream, Future;
+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';
 import 'package:dartdoc/src/warnings.dart';
+import 'package:path/path.dart' as path;
 
 /// An abstract class that defines a generator that generates documentation for
 /// a given package.
@@ -25,3 +31,93 @@ abstract class Generator {
   /// Fetches all filenames written by this generator.
   Map<String, Warnable> get writtenFiles;
 }
+
+/// Dartdoc options related to generators generally.
+mixin BaseGeneratorContext on DartdocOptionContextBase {
+  List<String> get footer => optionSet['footer'].valueAt(context);
+
+  /// _footerText is only used to construct synthetic options.
+  // ignore: unused_element
+  List<String> get _footerText => optionSet['footerText'].valueAt(context);
+
+  List<String> get footerTextPaths =>
+      optionSet['footerTextPaths'].valueAt(context);
+
+  List<String> get header => optionSet['header'].valueAt(context);
+
+  bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context);
+
+  String get templatesDir => optionSet['templatesDir'].valueAt(context);
+}
+
+Uri _sdkFooterCopyrightUri;
+
+Future<void> _setSdkFooterCopyrightUri() async {
+  if (_sdkFooterCopyrightUri == null) {
+    // TODO(jdkoren): find a way to make this not specific to HTML, or have
+    // alternatives for other supported formats.
+    _sdkFooterCopyrightUri = await Isolate.resolvePackageUri(
+        Uri.parse('package:dartdoc/resources/sdk_footer_text.html'));
+  }
+}
+
+Future<List<DartdocOption>> createGeneratorOptions() async {
+  await _setSdkFooterCopyrightUri();
+  return <DartdocOption>[
+    DartdocOptionArgFile<List<String>>('footer', [],
+        isFile: true,
+        help:
+            'Paths to files with content to add to page footers, but possibly '
+            'outside of dedicated footer elements for the generator (e.g. '
+            'outside of <footer> for an HTML generator). To add text content '
+            'to dedicated footer elements, use --footer-text instead.',
+        mustExist: true,
+        splitCommas: true),
+    DartdocOptionArgFile<List<String>>('footerText', [],
+        isFile: true,
+        help: 'Paths to files with content to add to page footers (next to the '
+            'package name and version).',
+        mustExist: true,
+        splitCommas: true),
+    DartdocOptionSyntheticOnly<List<String>>(
+      'footerTextPaths',
+      (DartdocSyntheticOption<List<String>> option, Directory dir) {
+        final List<String> footerTextPaths = <String>[];
+        final PackageMeta topLevelPackageMeta =
+            option.root['topLevelPackageMeta'].valueAt(dir);
+        // TODO(jcollins-g): Eliminate special casing for SDK and use config file.
+        if (topLevelPackageMeta.isSdk == true) {
+          footerTextPaths
+              .add(path.canonicalize(_sdkFooterCopyrightUri.toFilePath()));
+        }
+        footerTextPaths.addAll(option.parent['footerText'].valueAt(dir));
+        return footerTextPaths;
+      },
+      isFile: true,
+      help: 'paths to footer-text-files (adding special case for SDK)',
+      mustExist: true,
+    ),
+    DartdocOptionArgFile<List<String>>('header', [],
+        isFile: true,
+        help: 'Paths to files with content to add to page headers.',
+        splitCommas: true),
+    DartdocOptionArgOnly<bool>('prettyIndexJson', false,
+        help:
+            'Generates `index.json` with indentation and newlines. The file is '
+            'larger, but it\'s also easier to diff.',
+        negatable: false),
+    DartdocOptionArgOnly<String>("templatesDir", null,
+        isDir: true,
+        mustExist: true,
+        hide: true,
+        help:
+            'Path to a directory with templates to use instead of the default '
+            'ones. Directory must contain a file for each of the following: '
+            '404error, category, class, constant, constructor, enum, function, '
+            'index, library, method, mixin, property, top_level_constant, '
+            'top_level_property, typedef. Partial templates are supported; '
+            '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());
+}
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index 0b657b32f7..b5ce1679ad 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -181,33 +181,6 @@ Future<List<Generator>> initGenerators(
   ];
 }
 
-Uri _sdkFooterCopyrightUri;
-
-Future<void> _setSdkFooterCopyrightUri() async {
-  if (_sdkFooterCopyrightUri == null) {
-    _sdkFooterCopyrightUri = await Isolate.resolvePackageUri(
-        Uri.parse('package:dartdoc/resources/sdk_footer_text.html'));
-  }
-}
-
-/// Dartdoc options related to generators generally.
-mixin BaseGeneratorContext on DartdocOptionContextBase {
-  List<String> get footer => optionSet['footer'].valueAt(context);
-
-  /// _footerText is only used to construct synthetic options.
-  // ignore: unused_element
-  List<String> get _footerText => optionSet['footerText'].valueAt(context);
-
-  List<String> get footerTextPaths =>
-      optionSet['footerTextPaths'].valueAt(context);
-
-  List<String> get header => optionSet['header'].valueAt(context);
-
-  bool get prettyIndexJson => optionSet['prettyIndexJson'].valueAt(context);
-
-  String get templatesDir => optionSet['templatesDir'].valueAt(context);
-}
-
 /// Dartdoc options related to html generation.
 mixin HtmlGeneratorContext on DartdocOptionContextBase {
   String get favicon => optionSet['favicon'].valueAt(context);
@@ -216,64 +189,6 @@ mixin HtmlGeneratorContext on DartdocOptionContextBase {
       optionSet['relCanonicalPrefix'].valueAt(context);
 }
 
-Future<List<DartdocOption>> createGeneratorOptions() async {
-  await _setSdkFooterCopyrightUri();
-  return <DartdocOption>[
-    DartdocOptionArgFile<List<String>>('footer', [],
-        isFile: true,
-        help:
-            'Paths to files with content to add to page footers, but possibly '
-            'outside of dedicated footer elements for the generator (e.g. '
-            'outside of <footer> for an HTML generator). To add text content '
-            'to dedicated footer elements, use --footer-text instead.',
-        mustExist: true,
-        splitCommas: true),
-    DartdocOptionArgFile<List<String>>('footerText', [],
-        isFile: true,
-        help: 'Paths to files with content to add to page footers (next to the '
-            'package name and version).',
-        mustExist: true,
-        splitCommas: true),
-    DartdocOptionSyntheticOnly<List<String>>(
-      'footerTextPaths',
-      (DartdocSyntheticOption<List<String>> option, Directory dir) {
-        final List<String> footerTextPaths = <String>[];
-        final PackageMeta topLevelPackageMeta =
-            option.root['topLevelPackageMeta'].valueAt(dir);
-        // TODO(jcollins-g): Eliminate special casing for SDK and use config file.
-        if (topLevelPackageMeta.isSdk == true) {
-          footerTextPaths
-              .add(path.canonicalize(_sdkFooterCopyrightUri.toFilePath()));
-        }
-        footerTextPaths.addAll(option.parent['footerText'].valueAt(dir));
-        return footerTextPaths;
-      },
-      isFile: true,
-      help: 'paths to footer-text-files (adding special case for SDK)',
-      mustExist: true,
-    ),
-    DartdocOptionArgFile<List<String>>('header', [],
-        isFile: true,
-        help: 'Paths to files with content to add to page headers.',
-        splitCommas: true),
-    DartdocOptionArgOnly<bool>('prettyIndexJson', false,
-        help:
-            "Generates `index.json` with indentation and newlines. The file is larger, but it's also easier to diff.",
-        negatable: false),
-    DartdocOptionArgOnly<String>("templatesDir", null,
-        isDir: true,
-        mustExist: true,
-        hide: true,
-        help:
-            'Path to a directory containing templates to use instead of the default ones. '
-            'Directory must contain an html file for each of the following: 404error, category, '
-            'class, constant, constructor, enum, function, index, library, method, mixin, '
-            'property, top_level_constant, top_level_property, typedef. Partial templates are '
-            'supported; 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());
-}
-
 List<DartdocOption> createHtmlGeneratorOptions() {
   return <DartdocOption>[
     DartdocOptionArgFile<String>('favicon', null,

From 338edd2fbd38249ce991d9ae0fbe36e387bc5a2f Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Wed, 18 Dec 2019 09:53:20 -0800
Subject: [PATCH 5/8] Move initEmptyGenerators

---
 lib/dartdoc.dart                 | 6 +++---
 lib/src/empty_generator.dart     | 5 +++++
 lib/src/html/html_generator.dart | 6 +-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 09c115ae02..6ef66a16dc 100644
--- a/lib/dartdoc.dart
+++ b/lib/dartdoc.dart
@@ -13,6 +13,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:dartdoc/src/dartdoc_options.dart';
+import 'package:dartdoc/src/empty_generator.dart';
 import 'package:dartdoc/src/generator.dart';
 import 'package:dartdoc/src/html/html_generator.dart';
 import 'package:dartdoc/src/logging.dart';
@@ -36,8 +37,7 @@ const String programName = 'dartdoc';
 // Update when pubspec version changes by running `pub run build_runner build`
 const String dartdocVersion = packageVersion;
 
-/// Helper class to initialize the default generators since they require
-/// GeneratorContext.
+/// Helper class that consolidates option contexts for instantiating generators.
 class DartdocGeneratorOptionContext extends DartdocOptionContext
     with BaseGeneratorContext, HtmlGeneratorContext {
   DartdocGeneratorOptionContext(DartdocOptionSet optionSet, Directory dir)
@@ -64,7 +64,7 @@ class Dartdoc extends PackageBuilder {
   /// and returns a Dartdoc object with them.
   static Future<Dartdoc> withDefaultGenerators(
       DartdocGeneratorOptionContext config) async {
-    List<Generator> generators = await initGenerators(config);
+    List<Generator> generators = await initHtmlGenerators(config);
     return Dartdoc._(config, generators);
   }
 
diff --git a/lib/src/empty_generator.dart b/lib/src/empty_generator.dart
index d87957400c..666df064d7 100644
--- a/lib/src/empty_generator.dart
+++ b/lib/src/empty_generator.dart
@@ -2,6 +2,7 @@ library dartdoc.empty_generator;
 
 import 'dart:async';
 
+import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/generator.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart';
@@ -39,3 +40,7 @@ class EmptyGenerator extends Generator {
   @override
   final Map<String, Warnable> writtenFiles = {};
 }
+
+Future<List<Generator>> initEmptyGenerators(DartdocOptionContext config) async {
+  return [EmptyGenerator()];
+}
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index b5ce1679ad..4f34a40b9e 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -154,12 +154,8 @@ class HtmlGeneratorOptions implements HtmlOptions {
       : this.toolVersion = toolVersion ?? 'unknown';
 }
 
-Future<List<Generator>> initEmptyGenerators(DartdocOptionContext config) async {
-  return [EmptyGenerator()];
-}
-
 /// Initialize and setup the generators.
-Future<List<Generator>> initGenerators(
+Future<List<Generator>> initHtmlGenerators(
     DartdocGeneratorOptionContext config) async {
   // TODO(jcollins-g): Rationalize based on GeneratorContext all the way down
   // through the generators.

From 44225eb023432d907589509d92a79e3c019bbf20 Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Wed, 18 Dec 2019 14:57:09 -0800
Subject: [PATCH 6/8] Make initHtmlGenerators take HtmlGeneratorContext instead

---
 lib/src/html/html_generator.dart | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index 4f34a40b9e..f5c1eadb75 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -155,30 +155,28 @@ class HtmlGeneratorOptions implements HtmlOptions {
 }
 
 /// Initialize and setup the generators.
-Future<List<Generator>> initHtmlGenerators(
-    DartdocGeneratorOptionContext config) async {
+Future<List<Generator>> initHtmlGenerators(HtmlGeneratorContext context) async {
   // TODO(jcollins-g): Rationalize based on GeneratorContext all the way down
   // through the generators.
   HtmlGeneratorOptions options = HtmlGeneratorOptions(
-      relCanonicalPrefix: config.relCanonicalPrefix,
+      relCanonicalPrefix: context.relCanonicalPrefix,
       toolVersion: dartdocVersion,
-      faviconPath: config.favicon,
-      prettyIndexJson: config.prettyIndexJson,
-      templatesDir: config.templatesDir,
-      useBaseHref: config.useBaseHref);
-
+      faviconPath: context.favicon,
+      prettyIndexJson: context.prettyIndexJson,
+      templatesDir: context.templatesDir,
+      useBaseHref: context.useBaseHref);
   return [
     await HtmlGenerator.create(
       options: options,
-      headers: config.header,
-      footers: config.footer,
-      footerTexts: config.footerTextPaths,
+      headers: context.header,
+      footers: context.footer,
+      footerTexts: context.footerTextPaths,
     )
   ];
 }
 
 /// Dartdoc options related to html generation.
-mixin HtmlGeneratorContext on DartdocOptionContextBase {
+mixin HtmlGeneratorContext on BaseGeneratorContext {
   String get favicon => optionSet['favicon'].valueAt(context);
 
   String get relCanonicalPrefix =>

From 3a75ebf535410223a9203dc19205400c70550dd3 Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Fri, 3 Jan 2020 15:00:14 -0800
Subject: [PATCH 7/8] Recombine options into one GeneratorContext

---
 lib/dartdoc.dart                 |  2 +-
 lib/src/generator.dart           | 19 ++++++++++++++++---
 lib/src/html/html_generator.dart | 24 +-----------------------
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
index 6ef66a16dc..66a8a8a8f0 100644
--- a/lib/dartdoc.dart
+++ b/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);
 }
diff --git a/lib/src/generator.dart b/lib/src/generator.dart
index 91277f5efe..93673a9158 100644
--- a/lib/src/generator.dart
+++ b/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';
 import 'package:dartdoc/src/warnings.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());
+  ];
 }
diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
index f5c1eadb75..29be73c776 100644
--- a/lib/src/html/html_generator.dart
+++ b/lib/src/html/html_generator.dart
@@ -155,7 +155,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(
@@ -174,25 +174,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.'),
-  ];
-}

From 17e6db27956f7fe127815969451d8c7d5edaefa5 Mon Sep 17 00:00:00 2001
From: Jonathan Koren <jdkoren@google.com>
Date: Tue, 7 Jan 2020 07:42:57 -0800
Subject: [PATCH 8/8] Temporarily dupe useBaseHrefs in GeneratorContext

---
 lib/src/generator.dart | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/generator.dart b/lib/src/generator.dart
index 93673a9158..6ea61e18ab 100644
--- a/lib/src/generator.dart
+++ b/lib/src/generator.dart
@@ -52,6 +52,9 @@ mixin GeneratorContext on DartdocOptionContextBase {
       optionSet['relCanonicalPrefix'].valueAt(context);
 
   String get templatesDir => optionSet['templatesDir'].valueAt(context);
+
+  // TODO(jdkoren): duplicated temporarily so that GeneratorContext is enough for configuration.
+  bool get useBaseHref => optionSet['useBaseHref'].valueAt(context);
 }
 
 Uri _sdkFooterCopyrightUri;