Typedef information showing properly.

pkg/docgen/lib/docgen.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 /**
  * **docgen** is a tool for creating machine readable representations of Dart
  * code metadata, including: classes, members, comments and annotations.
  *
  * docgen is run on a `.dart` file or a directory containing `.dart` files.
  *
@@ skipping 365 matching lines @@
           mirror.superinterfaces.map((interface) => interface.qualifiedName);
       var clazz = new Class(mirrorName, superclass, _getComment(mirror), 
           interfaces.toList(), _getVariables(mirror.variables, includePrivate),
           _getMethods(mirror.methods, includePrivate),
           _getAnnotations(mirror), _getGenerics(mirror), mirror.qualifiedName);
       _currentClass = mirror;
       
       if (isError(mirror.qualifiedName)) {
         errors[mirrorName] = clazz;
       } else if (mirror.isTypedef) {
-        typedefs[mirrorName] = clazz;
+        typedefs[mirrorName] = new Typedef(mirrorName, 
+            mirror.value.returnType.qualifiedName,  _getComment(mirror), 
+            _getGenerics(mirror), _getParameters(mirror.value.parameters),
+            _getAnnotations(mirror), mirror.qualifiedName);
       } else if (mirror.isAbstract) {
         abstractClasses[mirrorName] = clazz;
       } else if (mirror.isClass) {
         classes[mirrorName] = clazz;
       } else {
         throw new ArgumentError('$mirrorName - no class type match. ');
       }
     }
   });
   return {
     'abstract': abstractClasses, 
     'class': classes,
     'typedef': typedefs,
     'error': errors
   };
 }
 
 /**
  * Returns a map of [Parameter] objects constructed from inputted mirrors.

[Alan Knight, 2013/07/19 20:28:15]

Inputted isn't a word, and better to just write write "from [mirrorList]."

[janicejl, 2013/07/19 21:26:57]

Done.

  */
 Map<String, Parameter> _getParameters(List<ParameterMirror> mirrorList) {
   var data = {};
   mirrorList.forEach((ParameterMirror mirror) {
     _currentMember = mirror;
     data[mirror.simpleName] = new Parameter(mirror.simpleName, 
         mirror.isOptional, mirror.isNamed, mirror.hasDefaultValue, 
         mirror.type.qualifiedName, mirror.defaultValue, 
         _getAnnotations(mirror));
   });
@@ skipping 129 matching lines @@
     classMap['superclass'] = superclass;
     classMap['implements'] = new List.from(interfaces);
     classMap['variables'] = recurseMap(variables);
     classMap['methods'] = recurseMap(methods);
     classMap['annotations'] = new List.from(annotations);
     classMap['generics'] = recurseMap(generics);
     return classMap;
   }
 }
 
+class Typedef extends Indexable {
+  String name;

[Alan Knight, 2013/07/19 20:28:15]

Do all Indexables have a name? Could this be pushed up to the superclass? And
possibly they all have comments and maybe annotations as well?

[janicejl, 2013/07/19 21:26:57]

Done. I have moved name and comment up to indexable. I did not move annotations
as Libraries do not have annotations(afaik) and libraries are also indexable. 

+  String returnType;
+  
+  /// Documentation comment with converted markdown. 
+  String comment;
+  
+  Map<String, Parameter> parameters;
+  
+  /// Generic information about the typedef. 
+  Map<String, Generic> generics;
+  
+  /// List of the meta annotations on the typedef. 
+  List<String> annotations;
+  
+  Typedef(this.name, this.returnType, this.comment, this.generics, 
+      this.parameters, this.annotations,
+      String qualifiedName) : super(qualifiedName) {}
+  
+  Map toMap() {
+    var typedefMap = {};
+    typedefMap['name'] = name;

[Alan Knight, 2013/07/19 20:28:15]

Either write this as a literal map, or use cascades so you're not repeating
typedefMap so often.

[janicejl, 2013/07/19 21:26:57]

Done. Also modified all the other toMap functions to stay consistent. They now
all use the literal map. 

+    typedefMap['comment'] = comment;
+    typedefMap['return'] = returnType;
+    typedefMap['parameters'] = recurseMap(parameters);
+    typedefMap['annotations'] = new List.from(annotations);
+    typedefMap['generics'] = recurseMap(generics);
+    return typedefMap;
+  }
+}
+
 /**
  * A class containing properties of a Dart variable.
  */
 class Variable extends Indexable {
 
   /// Documentation comment with converted markdown.
   String comment;
 
   String name;
   bool isFinal;
@@ skipping 95 matching lines @@
   
   Generic(this.name, this.type);
   
   Map toMap() {
     return {
       'name': name,
       'type': type
     };
   }
 }