fix(.d.ts): correct ComponentAnnotation inheritance

Closes angular#2356

docs/dgeni-package/templates/type-definition.template.html

@@ -24,7 +24,7 @@
   {%- if export.content -%}
     {$ commentBlock(export, 3) $}
   {%- endif %}
-  {$ export.docType $} {$ export.name $}{$ export.typeParams $}{$ export.heritage $}
+  {$ export.docType $} {$ export.name $}{$ export.typeParams $}{%- if export.heritage == ' extends  Directive' %} extends DirectiveAnnotation{% else %}{$ export.heritage $}{% endif %}
   {%- if export.docType == 'class' or export.docType == 'interface' %} {
   {%- if export.newMember -%}
     {$ commentBlock(export.newMember, 5) $}

modules/angular2/angular2.api.ts

@@ -11,13 +11,9 @@ export * from './angular2';
 // 1) if the symbol is intended to be part of the public API, then re-export somewhere else
 // 2) if the symbol should be omitted from the public API, then the class exposing it should
 //    not be exported, or should avoid exposing the symbol.
-export {ProtoRecord, RecordType} from './src/change_detection/proto_record';
 export * from './src/core/compiler/element_injector';
 export {DependencyAnnotation} from './src/di/annotations_impl';
-// FIXME: this is a workaround for https://github.com/angular/angular/issues/2356
-// We export the Directive *annotation* instead of the *decorator*.
-// But it breaks the build.
-export {Directive, LifecycleEvent} from './src/core/annotations_impl/annotations';
+export {LifecycleEvent} from './src/core/annotations_impl/annotations';
 export {Form} from './src/forms/directives/form_interface';
 export {TypeDecorator, ClassDefinition} from './src/util/decorators';
 export {Query} from './src/core/annotations_impl/di';