Split up model.dart and move to a subpackage

dart-lang · Nov 11, 2019 · cef078d · cef078d
1 parent b0e8c3d
commit cef078d
Show file tree

Hide file tree

Showing 55 changed files with 7,762 additions and 7,349 deletions.
diff --git a/lib/dartdoc.dart b/lib/dartdoc.dart
@@ -16,7 +16,7 @@ import 'package:dartdoc/src/dartdoc_options.dart';
 import 'package:dartdoc/src/generator.dart';
 import 'package:dartdoc/src/html/html_generator.dart';
 import 'package:dartdoc/src/logging.dart';
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:dartdoc/src/tuple.dart';
 import 'package:dartdoc/src/utils.dart';
@@ -29,7 +29,7 @@ import 'package:path/path.dart' as path;
 export 'package:dartdoc/src/dartdoc_options.dart';
 export 'package:dartdoc/src/element_type.dart';
 export 'package:dartdoc/src/generator.dart';
-export 'package:dartdoc/src/model.dart';
+export 'package:dartdoc/src/model/model.dart';
 export 'package:dartdoc/src/package_meta.dart';
 
 const String programName = 'dartdoc';

diff --git a/lib/src/element_type.dart b/lib/src/element_type.dart
@@ -10,7 +10,7 @@ import 'dart:collection';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart';
 
 /// Base class representing a type in Dartdoc.  It wraps a [DartType], and

diff --git a/lib/src/empty_generator.dart b/lib/src/empty_generator.dart
@@ -3,7 +3,7 @@ library dartdoc.empty_generator;
 import 'dart:async';
 
 import 'package:dartdoc/src/generator.dart';
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart';
 
 /// A generator that does not generate files, but does traverse the [PackageGraph]

diff --git a/lib/src/generator.dart b/lib/src/generator.dart
@@ -7,7 +7,7 @@ library dartdoc.generator;
 
 import 'dart:async' show Stream, Future;
 
-import 'package:dartdoc/src/model.dart' show PackageGraph;
+import 'package:dartdoc/src/model/model.dart' show PackageGraph;
 
 /// An abstract class that defines a generator that generates documentation for
 /// a given package.

diff --git a/lib/src/html/html_generator.dart b/lib/src/html/html_generator.dart
@@ -14,7 +14,7 @@ import 'package:dartdoc/src/generator.dart';
 import 'package:dartdoc/src/html/html_generator_instance.dart';
 import 'package:dartdoc/src/html/template_data.dart';
 import 'package:dartdoc/src/html/templates.dart';
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:path/path.dart' as path;
 
 typedef Renderer = String Function(String input);

diff --git a/lib/src/html/html_generator_instance.dart b/lib/src/html/html_generator_instance.dart
@@ -13,7 +13,7 @@ import 'package:dartdoc/src/html/resources.g.dart' as resources;
 import 'package:dartdoc/src/html/template_data.dart';
 import 'package:dartdoc/src/html/templates.dart';
 import 'package:dartdoc/src/logging.dart';
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/model_utils.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:mustache/mustache.dart';

diff --git a/lib/src/html/template_data.dart b/lib/src/html/template_data.dart
@@ -2,7 +2,7 @@
 // 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.
 
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 
 abstract class HtmlOptions {
   String get relCanonicalPrefix;

diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart
@@ -10,7 +10,7 @@ import 'dart:math';
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:dartdoc/src/element_type.dart';
-import 'package:dartdoc/src/model.dart';
+import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/tuple.dart';
 import 'package:dartdoc/src/warnings.dart';
 import 'package:html/parser.dart' show parse;