Flatten change

Author: jcollins-g

lib/dartdoc.dart

@@ -164,7 +164,7 @@ class DartDoc {
     if (config != null && config.autoIncludeDependencies) {
       package = Package.withAutoIncludedDependencies(
           libraries, packageMeta, warningOptions);
-      libraries = package.libraries.map((l) => l.element).toList();
+      libraries = package.publicLibraries.map((l) => l.element).toList();
       // remove excluded libraries again, in case they are picked up through
       // dependencies.
       excludes.forEach((pattern) {
@@ -200,10 +200,10 @@ class DartDoc {
 
     double seconds = _stopwatch.elapsedMilliseconds / 1000.0;
     print(
-        "\ndocumented ${package.libraries.length} librar${package.libraries.length == 1 ? 'y' : 'ies'} "
+        "\ndocumented ${package.publicLibraries.length} librar${package.publicLibraries.length == 1 ? 'y' : 'ies'} "
         "in ${seconds.toStringAsFixed(1)} seconds");
 
-    if (package.libraries.isEmpty) {
+    if (package.publicLibraries.isEmpty) {
       throw new DartDocFailure(
           "dartdoc could not find any libraries to document. Run `pub get` and try again.");
     }

lib/src/element_type.dart

@@ -15,7 +15,11 @@ class ElementType {
   final ModelElement element;
   String _linkedName;
 
-  ElementType(this._type, this.element);
+  ElementType(this._type, this.element) {
+    assert(element != null);
+  }
+
+  DartType get type => _type;
 
   bool get isDynamic => _type.isDynamic;
 
@@ -56,7 +60,11 @@ class ElementType {
     return _linkedName;
   }
 
-  String get name => _type.name;
+  String get name {
+    if (_type.name == null)
+      return _type.element.name;
+    return _type.name;
+  }
 
   ModelElement get returnElement {
     Element e;
@@ -129,6 +137,11 @@ class ElementType {
     // can happen if element is dynamic
     if (f.element.library != null) {
       lib = new ModelElement.from(f.element.library, element.library);
+    } else {
+      // TODO(jcollins-g): Assigning libraries to dynamics doesn't make sense,
+      // really, but is needed for .package.
+      assert(f.element.kind == ElementKind.DYNAMIC);
+      lib = element.library;
     }
     return new ElementType(f, new ModelElement.from(f.element, lib));
   }

lib/src/html/html_generator_instance.dart

@@ -96,86 +96,78 @@ class HtmlGeneratorInstance implements HtmlOptions {
 
     generatePackage();
 
-    for (var lib in package.libraries) {
+    for (var lib in package.libraries.where((l) => l.isDocumented)) {
       generateLibrary(package, lib);
 
-      for (var clazz in lib.allClasses) {
-        // TODO(jcollins-g): consider refactor so that only the canonical
-        // ModelElements show up in these lists
-        if (!clazz.isCanonical) continue;
-
+      for (var clazz in lib.allClasses.where((c) => c.isDocumented)) {
         generateClass(package, lib, clazz);
 
-        for (var constructor in clazz.constructors) {
+        for (var constructor in clazz.constructors.where((c) => c.isDocumented)) {
           if (!constructor.isCanonical) continue;
           generateConstructor(package, lib, clazz, constructor);
         }
 
-        for (var constant in clazz.constants) {
+        for (var constant in clazz.constants.where((c) => c.isDocumented)) {
           if (!constant.isCanonical) continue;
           generateConstant(package, lib, clazz, constant);
         }
 
-        for (var property in clazz.staticProperties) {
+        for (var property in clazz.staticProperties.where((s) => s.isDocumented)) {
           if (!property.isCanonical) continue;
           generateProperty(package, lib, clazz, property);
         }
 
-        for (var property in clazz.propertiesForPages) {
+        for (var property in clazz.propertiesForPages.where((p) => p.isDocumented)) {
           if (!property.isCanonical) continue;
           generateProperty(package, lib, clazz, property);
         }
 
-        for (var method in clazz.methodsForPages) {
+        for (var method in clazz.methodsForPages.where((m) => m.isDocumented)) {
           if (!method.isCanonical) continue;
           generateMethod(package, lib, clazz, method);
         }
 
-        for (var operator in clazz.operatorsForPages) {
+        for (var operator in clazz.operatorsForPages.where((o) => o.isDocumented)) {
           if (!operator.isCanonical) continue;
           generateMethod(package, lib, clazz, operator);
         }
 
-        for (var method in clazz.staticMethods) {
+        for (var method in clazz.staticMethods.where((s) => s.isDocumented)) {
           if (!method.isCanonical) continue;
           generateMethod(package, lib, clazz, method);
         }
       }
 
-      for (var eNum in lib.enums) {
-        if (!eNum.isCanonical) continue;
+      for (var eNum in lib.enums.where((e) => e.isDocumented)) {
         generateEnum(package, lib, eNum);
-        for (var property in eNum.propertiesForPages) {
-          if (!property.isCanonical) continue;
+        for (var property in eNum.propertiesForPages.where((p) => p.isDocumented)) {
           generateProperty(package, lib, eNum, property);
         }
-        for (var operator in eNum.operatorsForPages) {
-          if (!operator.isCanonical) continue;
+        for (var operator in eNum.operatorsForPages.where((o) => o.isDocumented)) {
           generateMethod(package, lib, eNum, operator);
         }
-        for (var method in eNum.methodsForPages) {
-          if (!method.isCanonical) continue;
+        for (var method in eNum.methodsForPages.where((m) => m.isDocumented)) {
           generateMethod(package, lib, eNum, method);
         }
       }
 
-      for (var constant in lib.constants) {
-        if (!constant.isCanonical) continue;
+      for (var constant in lib.constants.where((e) => e.isDocumented)) {
         generateTopLevelConstant(package, lib, constant);
       }
 
-      for (var property in lib.properties) {
-        if (!property.isCanonical) continue;
+      for (var property in lib.properties.where((p) => p.isDocumented)) {
+        if (property.name == 'topLevelVariable')
+          1+1;
+        if (property.linkedReturnType == '')
+          1+1;
         generateTopLevelProperty(package, lib, property);
       }
 
-      for (var function in lib.functions) {
-        if (!function.isCanonical) continue;
+      for (var function in lib.functions.where((f) => f.isDocumented)) {
         generateFunction(package, lib, function);
       }
 
-      for (var typeDef in lib.typedefs) {
-        if (!typeDef.isCanonical) continue;
+      for (var typeDef in lib.typedefs.where((t) => t.isDocumented)) {
         generateTypeDef(package, lib, typeDef);
       }
     }
@@ -310,7 +302,9 @@ class HtmlGeneratorInstance implements HtmlOptions {
     assert(!_writtenFiles.contains(fullName));
     _writeFile(fullName, content);
     _writtenFiles.add(fullName);
-    if (data.self is ModelElement) documentedElements.add(data.self);
+    if (data.self is ModelElement) {
+      documentedElements.add(data.self);
+    }
   }
 
   void _writeFile(String filename, String content) {

lib/src/html/template_data.dart

@@ -135,18 +135,18 @@ class LibraryTemplateData extends TemplateData<Library> {
   List get navLinks => [package];
   @override
   Iterable<Subnav> getSubNavItems() sync* {
-    if (library.hasClasses)
+    if (library.hasPublicClasses)
       yield new Subnav('Classes', '${library.href}#classes');
-    if (library.hasConstants)
+    if (library.hasPublicConstants)
       yield new Subnav('Constants', '${library.href}#constants');
-    if (library.hasProperties)
+    if (library.hasPublicProperties)
       yield new Subnav('Properties', '${library.href}#properties');
-    if (library.hasFunctions)
+    if (library.hasPublicFunctions)
       yield new Subnav('Functions', '${library.href}#functions');
-    if (library.hasEnums) yield new Subnav('Enums', '${library.href}#enums');
-    if (library.hasTypedefs)
+    if (library.hasPublicEnums) yield new Subnav('Enums', '${library.href}#enums');
+    if (library.hasPublicTypedefs)
       yield new Subnav('Typedefs', '${library.href}#typedefs');
-    if (library.hasExceptions)
+    if (library.hasPublicExceptions)
       yield new Subnav('Exceptions', '${library.href}#exceptions');
   }
 
@@ -188,19 +188,19 @@ class ClassTemplateData extends TemplateData<Class> {
   String get htmlBase => '..';
   @override
   Iterable<Subnav> getSubNavItems() sync* {
-    if (clazz.hasConstructors)
+    if (clazz.hasPublicConstructors)
       yield new Subnav('Constructors', '${clazz.href}#constructors');
-    if (clazz.hasProperties)
+    if (clazz.hasPublicProperties)
       yield new Subnav('Properties', '${clazz.href}#instance-properties');
-    if (clazz.hasMethods)
+    if (clazz.hasPublicMethods)
       yield new Subnav('Methods', '${clazz.href}#instance-methods');
-    if (clazz.hasOperators)
+    if (clazz.hasPublicOperators)
       yield new Subnav('Operators', '${clazz.href}#operators');
-    if (clazz.hasStaticProperties)
+    if (clazz.hasPublicStaticProperties)
       yield new Subnav('Static Properties', '${clazz.href}#static-properties');
-    if (clazz.hasStaticMethods)
+    if (clazz.hasPublicStaticMethods)
       yield new Subnav('Static Methods', '${clazz.href}#static-methods');
-    if (clazz.hasConstants)
+    if (clazz.hasPublicConstants)
       yield new Subnav('Constants', '${clazz.href}#constants');
   }
 

lib/src/html/templates.dart

@@ -28,8 +28,6 @@ const _partials = const <String>[
   'sidebar_for_enum',
   'source_code',
   'sidebar_for_library',
-  'accessor_getter',
-  'accessor_setter'
 ];
 
 Future<Map<String, String>> _loadPartials(List<String> headerPaths,

lib/src/markdown_processor.dart

@@ -390,6 +390,7 @@ Element _findRefElementInLibrary(String codeRef, ModelElement element,
   assert(element != null);
   assert(element.package.allLibrariesAdded);
 
+
   String codeRefChomped = codeRef.replaceFirst(isConstructor, '');
 
   final Library library = element.library;
@@ -518,6 +519,7 @@ Element _findRefElementInLibrary(String codeRef, ModelElement element,
       }
     }
   }
+  results.remove(null);
 
   // This could conceivably be a reference to an enum member.  They don't show up in allModelElements.
   // TODO(jcollins-g): Put enum members in allModelElements with useful hrefs without blowing up other assumptions about what that means.
@@ -541,10 +543,10 @@ Element _findRefElementInLibrary(String codeRef, ModelElement element,
       }
     }
   }
+  results.remove(null);
 
   Element result;
 
-  results.remove(null);
   if (results.length > 1) {
     // If this name could refer to a class or a constructor, prefer the class.
     if (results.any((r) => r is Class)) {