File tree Expand file tree Collapse file tree 9 files changed +25
-25
lines changed Expand file tree Collapse file tree 9 files changed +25
-25
lines changed Original file line number Diff line number Diff line change @@ -85,13 +85,19 @@ export function getBreakingChange(doc: ApiDoc): string | null {
85
85
return breakingChange ? breakingChange . description : null ;
86
86
}
87
87
88
+ export function getDeprecationMessage ( doc : ApiDoc ) : string | null {
89
+ const deprecatedMessage = findJsDocTag ( doc , 'deprecated' ) ;
90
+ return deprecatedMessage ? deprecatedMessage . description : null ;
91
+ }
92
+
88
93
/**
89
94
* Decorates public exposed docs. Creates a property on the doc that indicates whether
90
- * the item is deprecated or not.
95
+ * the item is deprecated or not and set deprecation message .
91
96
*/
92
97
export function decorateDeprecatedDoc ( doc : ApiDoc & DeprecationInfo ) {
93
98
doc . isDeprecated = isDeprecatedDoc ( doc ) ;
94
99
doc . breakingChange = getBreakingChange ( doc ) ;
100
+ doc . deprecatedMessage = getDeprecationMessage ( doc ) ;
95
101
96
102
if ( doc . isDeprecated && ! doc . breakingChange ) {
97
103
console . warn ( 'Warning: There is a deprecated item without a @breaking-change tag.' , doc . id ) ;
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ import {NormalizedFunctionParameters} from './normalize-function-parameters';
12
12
export interface DeprecationInfo {
13
13
isDeprecated : boolean ;
14
14
breakingChange : string | null ;
15
+ deprecatedMessage : string | null ;
15
16
}
16
17
17
18
/** Interface that describes Dgeni documents that have decorators. */
Original file line number Diff line number Diff line change 1
1
{% import "macros.html" as macros %}
2
2
3
3
< h4 id ="{$ class.name $} " class ="docs-header-link docs-api-h4 docs-api-class-name ">
4
+ {%- if class.isDeprecated -%}
5
+ < span header-link ="{$ class.name $} "> </ span >
6
+ < code class ="docs-api-class-deprecated-marker " {$ macros.deprecationTitle(class, class.name) $} > </ code >
7
+ {% else %}
4
8
< span header-link ="{$ class.name $} "> </ span >
5
9
< code > {$ class.name $}</ code >
10
+ {%- endif -%}
6
11
{% if class.extendedDoc %}
7
12
< span class ="docs-api-class-extends-clauses ">
8
13
< span class ="docs-api-class-extends-label "> extends</ span >
@@ -31,12 +36,6 @@ <h4 id="{$ class.name $}" class="docs-header-link docs-api-h4 docs-api-class-nam
31
36
< span class ="docs-api-class-export-name "> {$ class.directiveExportAs $}</ span >
32
37
{%- endif -%}
33
38
34
- {%- if class.isDeprecated -%}
35
- < div class ="docs-api-class-deprecated-marker " {$ macros.deprecationTitle(class) $} >
36
- Deprecated
37
- </ div >
38
- {%- endif -%}
39
-
40
39
{$ propertyList(class.properties) $}
41
40
42
41
{$ methodList(class.methods) $}
Original file line number Diff line number Diff line change @@ -6,9 +6,7 @@ <h4 id="{$ constant.name $}" class="docs-header-link docs-api-h4 docs-api-consta
6
6
</ h4 >
7
7
8
8
{%- if constant.isDeprecated -%}
9
- < div class ="docs-api-constant-deprecated-marker " {$ macros.deprecationTitle(constant) $} >
10
- Deprecated
11
- </ div >
9
+ < div class ="docs-api-constant-deprecated-marker " {$ macros.deprecationTitle(constant, "Deprecated") $}> </ div >
12
10
{%- endif -%}
13
11
14
12
{%- if constant.description -%}
Original file line number Diff line number Diff line change @@ -10,9 +10,7 @@ <h4 id="{$ interface.name $}" class="docs-header-link docs-api-h4 docs-api-inter
10
10
{%- endif -%}
11
11
12
12
{%- if interface.isDeprecated -%}
13
- < div class ="docs-api-interface-deprecated-marker " {$ macros.deprecationTitle(interface) $} >
14
- Deprecated
15
- </ div >
13
+ < div class ="docs-api-interface-deprecated-marker " {$ macros.deprecationTitle(interface, "Deprecated") $}> </ div >
16
14
{%- endif -%}
17
15
18
16
{$ propertyList(interface.properties) $}
Original file line number Diff line number Diff line change 1
- {% macro deprecationTitle(doc) %}
2
- {%- if doc.breakingChange -%}
3
- title="Will be removed in v{$ doc.breakingChange $} or later"
1
+ {% macro deprecationTitle(doc, innerText) %}
2
+ {%- if doc.breakingChange and doc.deprecatedMessage -%}
3
+ depreciation-title="{$ doc.deprecatedMessage $} Will be removed in v{$ doc.breakingChange $} or later."
4
+ inner-text="{$ innerText $}"
5
+ {% else %}
6
+ depreciation-title="{$ doc.deprecatedMessage $}"
7
+ inner-text="{$ innerText $}"
4
8
{%- endif -%}
5
9
{% endmacro %}
Original file line number Diff line number Diff line change 5
5
< tr class ="docs-api-method-name-row ">
6
6
< th colspan ="2 " class ="docs-api-method-name-cell ">
7
7
{%- if method.isDeprecated -%}
8
- < div class ="docs-api-deprecated-marker " {$ macros.deprecationTitle(method) $} >
9
- Deprecated
10
- </ div >
8
+ < div class ="docs-api-deprecated-marker " {$ macros.deprecationTitle(method, "Deprecated") $}> </ div >
11
9
{%- endif -%}
12
10
{%- if method.isStatic -%}
13
11
< div class ="docs-api-modifier-method-marker ">
Original file line number Diff line number Diff line change 21
21
</ div >
22
22
{%- endif -%}
23
23
{%- if property.isDeprecated -%}
24
- < div class ="docs-api-deprecated-marker " {$ macros.deprecationTitle(property) $} >
25
- Deprecated
26
- </ div >
24
+ < div class ="docs-api-deprecated-marker " {$ macros.deprecationTitle(property, "Deprecated") $}> </ div >
27
25
{%- endif -%}
28
26
29
27
< p class ="docs-api-property-name ">
Original file line number Diff line number Diff line change @@ -6,9 +6,7 @@ <h4 id="{$ alias.name $}" class="docs-header-link docs-api-h4 docs-api-type-alia
6
6
</ h4 >
7
7
8
8
{%- if alias.isDeprecated -%}
9
- < div class ="docs-api-type-alias-deprecated-marker " {$ macros.deprecationTitle(alias) $} >
10
- Deprecated
11
- </ div >
9
+ < div class ="docs-api-type-alias-deprecated-marker " {$ macros.deprecationTitle(alias, "Deprecated") $}> </ div >
12
10
{%- endif -%}
13
11
14
12
{%- if alias.description -%}
You can’t perform that action at this time.
0 commit comments