WIP

Author: sethladd

lib/src/model.dart

@@ -963,10 +963,15 @@ class Library extends ModelElement {
     List<ClassElement> enumClasses = [];
     enumClasses.addAll(_exportedNamespace.definedNames.values
         .where((element) => element is ClassElement && element.isEnum));
-    _enums = enumClasses
-        .where(isPublic)
-        .map((e) => new Enum(e, this))
-        .toList(growable: false)..sort(byName);
+    _enums = enumClasses.where(isPublic).map((e) {
+      if (e.library != this._library &&
+          _exportedNamespace.definedNames.values.contains(e) &&
+          package._libraryElements.contains(e.library)) {
+        return new Enum(e, new Library(e.library, this.package));
+      } else {
+        return new Enum(e, this.library);
+      }
+    }).toList(growable: false)..sort(byName);
 
     return _enums;
   }
@@ -991,12 +996,12 @@ class Library extends ModelElement {
         .where((element) => element is FunctionElement));
 
     _functions = elements.where(isPublic).map((e) {
-      // TODO: port this logic to all names that come from exported libraries
-      if (e.library == this._library ||
-          !package._libraryElements.contains(e.library)) {
-        return new ModelFunction(e, this);
-      } else {
+      if (e.library != this._library &&
+          _exportedNamespace.definedNames.values.contains(e) &&
+          package._libraryElements.contains(e.library)) {
         return new ModelFunction(e, new Library(e.library, this.package));
+      } else {
+        return new ModelFunction(e, this.library);
       }
     }).toList(growable: false)..sort(byName);
 
@@ -1077,12 +1082,12 @@ class Library extends ModelElement {
           .where((element) => element is FunctionTypeAliasElement))
       ..removeWhere(isPrivate);
     _typeDefs = elements.map((e) {
-      // TODO: port this logic to all names that come from exported libraries
-      if (e.library == this._library ||
-          !package._libraryElements.contains(e.library)) {
-        return new Typedef(e, this);
-      } else {
+      if (e.library != this._library &&
+          _exportedNamespace.definedNames.values.contains(e) &&
+          package._libraryElements.contains(e.library)) {
         return new Typedef(e, new Library(e.library, this.package));
+      } else {
+        return new Typedef(e, this.library);
       }
     }).toList(growable: false)..sort(byName);
 
@@ -1107,12 +1112,12 @@ class Library extends ModelElement {
         .where((element) => element is ClassElement && !element.isEnum));
 
     _classes = types.where(isPublic).map((e) {
-      // TODO: port this logic to all names that come from exported libraries
-      if (e.library == this._library ||
-          !package._libraryElements.contains(e.library)) {
-        return new Class(e, this);
-      } else {
+      if (e.library != this._library &&
+          _exportedNamespace.definedNames.values.contains(e) &&
+          package._libraryElements.contains(e.library)) {
         return new Class(e, new Library(e.library, this.package));
+      } else {
+        return new Class(e, this.library);
       }
     }).toList(growable: false)..sort(byName);
 
@@ -1151,7 +1156,6 @@ class Library extends ModelElement {
       if (element is PropertyAccessorElement) elements.add(element.variable);
     });
     _variables = elements.where(isPublic).map((e) {
-      // TODO: port this logic to all names that come from exported libraries
       if (e.library == this._library ||
           !package._libraryElements.contains(e.library)) {
         return new TopLevelVariable(e, this);

test/dartdoc_test.dart

@@ -39,7 +39,7 @@ void main() {
       Package p = results.package;
       expect(p.name, 'test_package');
       expect(p.hasDocumentationFile, isTrue);
-      expect(p.libraries, hasLength(9));
+      expect(p.libraries, hasLength(10));
     });
 
     test('generate docs for ${path.basename(testPackageBadDir.path)} fails',
@@ -96,7 +96,7 @@ void main() {
       Package p = results.package;
       expect(p.name, 'test_package');
       expect(p.hasDocumentationFile, isTrue);
-      expect(p.libraries, hasLength(8));
+      expect(p.libraries, hasLength(9));
       expect(p.libraries.map((lib) => lib.name).contains('fake'), isFalse);
     });
   });

test/model_test.dart

@@ -45,8 +45,8 @@ void main() {
         expect(package.name, 'test_package');
       });
 
-      test('libraries', () {
-        expect(package.libraries, hasLength(7));
+      test('has all the libraries', () {
+        expect(package.libraries, hasLength(8));
       });
 
       test('is documented in library', () {
@@ -482,11 +482,12 @@ void main() {
     List<Class> classes;
     Class Apple, B, Cat, Cool, Dog, F, Dep, SpecialList;
     Class ExtendingClass, CatString;
-    Class Helper, CoolFromExporter;
+    Class Helper, CoolFromExporter, ExportedClass;
 
     setUp(() {
       classes = exLibrary.classes;
       CoolFromExporter = classes.firstWhere((c) => c.name == 'Cool');
+      ExportedClass = classes.firstWhere((c) => c.name == 'ExportedClass');
       Helper = classes.firstWhere((c) => c.name == 'Helper');
       Apple = classes.firstWhere((c) => c.name == 'Apple');
       B = classes.firstWhere((c) => c.name == 'B');
@@ -529,7 +530,7 @@ void main() {
     });
 
     test('correctly finds all the classes', () {
-      expect(classes, hasLength(18));
+      expect(classes, hasLength(19));
     });
 
     test('abstract', () {
@@ -619,20 +620,27 @@ void main() {
     });
 
     test(
-        'exported class from a src library should have linkedName with a link to the exporting class library',
-        () {
+        'exported class from a src library should have linkedName with a '
+        'link to the exporting class library', () {
       expect(Helper.linkedName, startsWith('<a href="ex'));
     });
 
     test(
-        'exported class from a public library should have linkedName with a link to origin library',
-        () {
+        'exported class from a public library should have linkedName '
+        'with a link to origin library', () {
       expect(Cool.linkedName, startsWith('<a href="fake/'));
     });
 
     test(
-        'exported class from a public library two levels deep should have linkedName with a link to origin library',
-        () {
+        'exported class, without a show, from a public library '
+        'should have linkedName with a link to origin library', () {
+      expect(ExportedClass.linkedName,
+          startsWith('<a href="to_be_exported/ExportedClass'));
+    });
+
+    test(
+        'exported class from a public library two levels deep should have '
+        'linkedName with a link to origin library', () {
       expect(CoolFromExporter.linkedName, startsWith('<a href="fake/Cool'));
     });
 
@@ -718,10 +726,33 @@ void main() {
   });
 
   group('Enum', () {
-    Enum animal;
+    Enum animal, Color, ExportedEnum;
 
     setUp(() {
       animal = exLibrary.enums.firstWhere((e) => e.name == 'Animal');
+      Color = exLibrary.enums.firstWhere((e) => e.name == 'Color');
+      ExportedEnum =
+          exLibrary.enums.firstWhere((e) => e.name == 'ExportedEnum');
+    });
+
+    test(
+        'exported enum with a show from a public library should have '
+        'linkedName with a link to origin library', () {
+      expect(Color.linkedName, startsWith('<a href="fake/Color'));
+    });
+
+    test(
+        'exported enum without a show from a public library should '
+        'have linkedName '
+        'with a link to origin library', () {
+      expect(ExportedEnum.linkedName,
+          startsWith('<a href="to_be_exported/ExportedEnum'));
+    });
+
+    test(
+        'should have linkedName '
+        'with a link to this library', () {
+      expect(animal.linkedName, startsWith('<a href="ex/Animal'));
     });
 
     test('has a fully qualified name', () {
@@ -765,10 +796,12 @@ void main() {
     ModelFunction f1;
     ModelFunction thisIsAsync;
     ModelFunction topLevelFunction;
-    ModelFunction short, helperFunction;
+    ModelFunction short, helperFunction, exportedFunction;
 
     setUp(() {
       short = exLibrary.functions.firstWhere((f) => f.name == 'short');
+      exportedFunction =
+          exLibrary.functions.firstWhere((f) => f.name == 'exportedFunction');
       helperFunction =
           exLibrary.functions.firstWhere((f) => f.name == 'helperFunction');
       f1 = exLibrary.functions.firstWhere((f) => f.name == 'function1');
@@ -779,9 +812,16 @@ void main() {
     });
 
     test(
-        'exported function from a public library should have linkedName with a link to origin library',
-        () {
-      expect(short.linkedName, startsWith('<a href="fake/'));
+        'exported function with a show from a public library should have '
+        'linkedName with a link to origin library', () {
+      expect(short.linkedName, startsWith('<a href="fake/short'));
+    });
+
+    test(
+        'exported function without a show from a public library should have '
+        'linkedName with a link to origin library', () {
+      expect(exportedFunction.linkedName,
+          startsWith('<a href="to_be_exported/exportedFunction'));
     });
 
     test(
@@ -1172,7 +1212,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
   group('Top-level Variable', () {
     TopLevelVariable v;
     TopLevelVariable v3, justGetter, justSetter;
-    TopLevelVariable setAndGet, mapWithDynamicKeys, topLevelVar;
+    TopLevelVariable setAndGet, mapWithDynamicKeys, topLevelVar, exportedField;
 
     setUp(() {
       v = exLibrary.properties.firstWhere((p) => p.name == 'number');
@@ -1187,6 +1227,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           .firstWhere((p) => p.name == 'mapWithDynamicKeys');
       topLevelVar =
           exLibrary.properties.firstWhere((p) => p.name == 'topLevelVar');
+      exportedField =
+          exLibrary.properties.firstWhere((p) => p.name == 'exportedField');
     });
 
     test('has a fully qualified name', () {
@@ -1201,11 +1243,16 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           equals('String'));
     });
 
-    test('linkedName for exported variable has origin library', () {
+    test('linkedName for exported variable via show has origin library', () {
       expect(mapWithDynamicKeys.linkedName,
           contains('href="fake/mapWithDynamicKeys.html"'));
     });
 
+    test('linkedName for exported variable via show has origin library', () {
+      expect(exportedField.linkedName,
+          contains('href="to_be_exported/exportedField.html"'));
+    });
+
     test(
         'linkedName for exported variable from private library has exported library',
         () {
@@ -1216,8 +1263,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(v.enclosingElement.name, equals(exLibrary.name));
     });
 
-    test('found six properties', () {
-      expect(exLibrary.properties, hasLength(7));
+    test('found eight properties', () {
+      expect(exLibrary.properties, hasLength(8));
     });
 
     test('linked return type is a double', () {
@@ -1359,13 +1406,15 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
   });
 
   group('Typedef', () {
-    Typedef t, FakeProcesses, DoThing;
+    Typedef t, FakeProcesses, DoThing, ExportedTypeDef;
 
     setUp(() {
       t = exLibrary.typedefs.firstWhere((t) => t.name == 'processMessage');
       FakeProcesses =
           exLibrary.typedefs.firstWhere((t) => t.name == 'FakeProcesses');
       DoThing = exLibrary.typedefs.firstWhere((t) => t.name == 'DoThing');
+      ExportedTypeDef =
+          exLibrary.typedefs.firstWhere((t) => t.name == 'ExportedTypeDef');
     });
 
     test('has a fully qualified name', () {
@@ -1384,11 +1433,16 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(t.linkedReturnType, equals('String'));
     });
 
-    test('linkedName for exported typedef is origin library', () {
+    test('linkedName for exported via show typedef is origin library', () {
       expect(
           FakeProcesses.linkedName, contains('href="fake/FakeProcesses.html"'));
     });
 
+    test('linkedName for exported without show typedef is origin library', () {
+      expect(ExportedTypeDef.linkedName,
+          contains('href="to_be_exported/ExportedTypeDef.html"'));
+    });
+
     test('linkedName for private exported typedef is exporting library', () {
       expect(DoThing.linkedName, contains('href="ex/DoThing.html"'));
     });

test/src/utils.dart

@@ -41,7 +41,8 @@ void init() {
     'lib/anonymous_library.dart',
     'lib/another_anonymous_lib.dart',
     'lib/is_deprecated.dart',
-    'lib/exporter.dart'
+    'lib/exporter.dart',
+    'lib/to_be_exported.dart'
   ];
 
   testPackage = _bootPackage(pathsForTestLib, 'test_package');

test_package/lib/example.dart

@@ -7,8 +7,11 @@ import 'src/mylib.dart' show Helper;
 
 export 'dart:core' show deprecated, Deprecated;
 
-// export a class, a field, and a typedef
-export 'fake.dart' show Cool, mapWithDynamicKeys, FakeProcesses, short;
+// export everything without a show
+export 'to_be_exported.dart';
+
+// export a class, a field, a typedef, enum, and a function via show
+export 'fake.dart' show Cool, mapWithDynamicKeys, FakeProcesses, short, Color;
 export 'src/mylib.dart' show Helper, topLevelVar, DoThing, helperFunction;
 
 const String COLOR = 'red';

test_package/lib/to_be_exported.dart

@@ -0,0 +1,11 @@
+library to_be_exported;
+
+String exportedField;
+
+void exportedFunction() {}
+
+typedef void ExportedTypeDef();
+
+class ExportedClass {}
+
+enum ExportedEnum { ONE, TWO, THREE }

test_package_docs/anonymous_library/anonymous_library-library.html

@@ -78,6 +78,7 @@ <h5><a href="index.html">test_package</a></h5>
       <li><a href="ex/ex-library.html">ex</a></li>
       <li><a href="exporter/exporter-library.html">exporter</a></li>
       <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+      <li><a href="to_be_exported/to_be_exported-library.html">to_be_exported</a></li>
       <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
     </ol>
   </div>

test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html

@@ -78,6 +78,7 @@ <h5><a href="index.html">test_package</a></h5>
       <li><a href="ex/ex-library.html">ex</a></li>
       <li><a href="exporter/exporter-library.html">exporter</a></li>
       <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+      <li><a href="to_be_exported/to_be_exported-library.html">to_be_exported</a></li>
       <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
     </ol>
   </div>

test_package_docs/code_in_comments/code_in_comments-library.html

@@ -75,6 +75,7 @@ <h5><a href="index.html">test_package</a></h5>
       <li><a href="ex/ex-library.html">ex</a></li>
       <li><a href="exporter/exporter-library.html">exporter</a></li>
       <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+      <li><a href="to_be_exported/to_be_exported-library.html">to_be_exported</a></li>
       <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
     </ol>
   </div>

test_package_docs/css/css-library.html

@@ -78,6 +78,7 @@ <h5><a href="index.html">test_package</a></h5>
       <li><a href="ex/ex-library.html">ex</a></li>
       <li><a href="exporter/exporter-library.html">exporter</a></li>
       <li><a class="deprecated" href="is_deprecated/is_deprecated-library.html">is_deprecated</a></li>
+      <li><a href="to_be_exported/to_be_exported-library.html">to_be_exported</a></li>
       <li><a href="two_exports/two_exports-library.html">two_exports</a></li>
     </ol>
   </div>