@ng-doc/builder 15.0.0-beta.28 → 15.0.0-beta.29

package/templates/helpers/constructor.html.nunj

@@ -0,0 +1,34 @@
+{% import "helpers/code.html.nunj" as codeMacro %}
+{% import "helpers/parameters.html.nunj" as parametersMacro %}
+{% import "helpers/no-content.html.nunj" as noContentMacro %}
+
+{% macro render(constructor) %}
+	{% set parameters = constructor.getParameters() %}
+	<div class="ng-doc-table-wrapper">
+		<table class="ng-doc-method-table">
+			<tbody>
+			<tr>
+				<td>
+					{% set description = constructor | extractDocs %}
+
+					{{ description if description else noContentMacro.render('No documentation has been provided.') }}
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<h5 class="no-anchor">Presentation</h5>
+					{{ codeMacro.render(constructor | constructorPresentation, "typescript", false) }}
+				</td>
+			</tr>
+			<tr>
+				<td>
+					{%- if parameters.length %}
+						<h5 class="no-anchor">Parameters</h5>
+						{{ parametersMacro.render(parameters, constructor) }}
+					{%- endif %}
+				</td>
+			</tr>
+			</tbody>
+		</table>
+	</div>
+{% endmacro %}

package/templates/helpers/declaration-modifiers.html.nunj

@@ -7,37 +7,33 @@
 	{% set isStatic = declaration.isStatic and declaration.isStatic() %}
 	{% set isAsync = declaration.isAsync and declaration.isAsync() %}
 	{% set isReadonly = declaration.isReadonly and declaration.isReadonly() %}
-	{% set isOverriden = declaration.hasOverrideKeyword and declaration.hasOverrideKeyword() %}
-	{% set tooltip = ["Abstract" if isAbstract, 'Static' if isStatic, 'Async' if isAsync, 'Readonly' if isReadonly, 'Overriden' if isOverriden] | noEmpty | join(', ') %}
+	{% set tooltip = ["Abstract" if isAbstract, 'Static' if isStatic, 'Async' if isAsync, 'Readonly' if isReadonly] | noEmpty | join(', ') %}
 
 	{%- if type == 'badge' %}
-		{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
+		{%- if isAbstract or isStatic or isAsync or isReadonly %}
 			<span class="ng-doc-badge-wrapper" ngDocTooltip="{{ tooltip }}">
 				{{ badgeMacro.render("Abstract") if isAbstract }}
 				{{ badgeMacro.render("Static") if isStatic }}
 				{{ badgeMacro.render("Async") if isAsync }}
-				{{ badgeMacro.render("Overriden") if isOverriden }}
 				{{ badgeMacro.render("Readonly") if isReadonly }}
 			</span>
 		{%- endif %}
 
 	{%- elseif type == 'modifier' %}
-		{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
+		{%- if isAbstract or isStatic or isAsync or isReadonly %}
 			<div class="ng-doc-modifiers-wrapper">
 				{{ modifierMacro.render("Abstract") if isAbstract }}
 				{{ modifierMacro.render("Static") if isStatic }}
 				{{ modifierMacro.render("Async") if isAsync }}
-				{{ modifierMacro.render("Overriden") if isOverriden }}
 				{{ modifierMacro.render("Readonly") if isReadonly }}
 			</div>
 		{%- endif %}
 	{%- else %}
-		{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
+		{%- if isAbstract or isStatic or isAsync or isReadonly %}
 			<span class="ng-doc-tags-wrapper">
 				{{ tagMacro.render("abstract") if isAbstract }}
 				{{ tagMacro.render("static") if isStatic }}
 				{{ tagMacro.render("async") if isAsync }}
-				{{ tagMacro.render("overriden") if isOverriden }}
 				{{ tagMacro.render("readonly") if isReadonly }}
 			</span>
 		{%- endif %}

package/templates/helpers/method.html.nunj

@@ -5,23 +5,38 @@
 {% import "helpers/decorators.html.nunj" as decoratorsMacro %}
 {% import "helpers/no-content.html.nunj" as noContentMacro %}
 
-{% macro render(method) %}
+{% macro render(method, originalParent) %}
 	{% set parameters = method.getParameters() %}
+	{% set methodChain = method | getMethodChain %}
+	{% set inheritedFrom = method.getParent() if method.getParent() !== originalParent %}
+	{% set overriddenMethod = method | getOverriddenMethod %}
+	{% set implementedMethod = method | getImplementedMethod %}
+	{% set docNode = methodChain | firstNodeWithComment %}
+
 	<div class="ng-doc-table-wrapper">
 		<table class="ng-doc-method-table">
 			<thead>
 			<tr>
 				<th>
 					{{ decoratorsMacro.render(method.getDecorators()) if method.getDecorators }}
-					<h3>{{ method.getName() }}</h3>
 					{{ tagsMacro.render(method, 'modifier') }}
+					<h3>{{ method.getName() }}</h3>
+					<div class="ng-doc-node-details">
+						{%- if inheritedFrom %}
+							inherited from <code>{{ inheritedFrom.getName() }}</code>
+						{%- elseif overriddenMethod %}
+							overrides <code>{{ overriddenMethod.getParent().getName() }}</code>
+						{%- elseif implementedMethod %}
+							implements <code>{{ implementedMethod.getParent().getName() }}</code>
+						{%- endif %}
+					</div>
 				</th>
 			</tr>
 			</thead>
 			<tbody>
 			<tr>
 				<td>
-					{% set description = method | extractDocs %}
+					{% set description = docNode | extractDocs %}
 
 					{{ description if description else noContentMacro.render('No documentation has been provided.') }}
 				</td>
@@ -36,7 +51,7 @@
 				<td>
 					{%- if parameters.length %}
 						<h5 class="no-anchor">Parameters</h5>
-						{{ parametersMacro.render(parameters, method) }}
+						{{ parametersMacro.render(parameters, docNode) }}
 					{%- endif %}
 					<h5 class="no-anchor">Returns</h5>
 					<p>

package/templates/helpers/methods.html.nunj

@@ -1,7 +1,7 @@
 {% import "helpers/method.html.nunj" as method %}
 
-{% macro render(methods) %}
+{% macro render(methods, originalParent) %}
 {%- for m in methods %}
-{{ method.render(m) }}
+{{ method.render(m, originalParent) }}
 {% endfor -%}
 {% endmacro %}

package/templates/helpers/parameters.html.nunj

@@ -1,4 +1,5 @@
 {% import "helpers/type.html.nunj" as typeMacro %}
+{% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
 
 {% macro render(parameters, origin) %}
 	<div class="ng-doc-table-wrapper">
@@ -13,7 +14,7 @@
 			<tbody>
 			{%- for param in parameters %}
 				<tr>
-					<td>{{ param.getName() }}</td>
+					<td>{{ tagsMacro.render(param, "badge") }}{{ param.getName() }}</td>
 					<td>{{ typeMacro.render(param.getType()) }}</td>
 					<td>{{ origin | extractParameterDocs(param.getName()) }}</td>
 				</tr>

package/templates/helpers/properties.html.nunj

@@ -2,7 +2,7 @@
 {% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
 {% import "helpers/decorators.html.nunj" as decoratorsMacro %}
 
-{% macro render(properties) %}
+{% macro render(properties, originalParent) %}
 	<div class="ng-doc-table-wrapper">
 		<table class="ng-doc-properties-table">
 			<thead>
@@ -14,13 +14,30 @@
 			</thead>
 			<tbody>
 			{%- for property in properties %}
+				{% set propertyChain = property | getPropertyChain %}
+				{% set inheritedFrom = property.getParent() if property.getParent() !== originalParent %}
+				{% set overriddenProperty = property | getOverriddenProperty %}
+				{% set implementedProperty = property | getImplementedProperty %}
+				{% set docNode = propertyChain | firstNodeWithComment %}
+
 				<tr>
 					<td>
 						{{ decoratorsMacro.render(property.getDecorators(), true) if property.getDecorators }}
 						{{ tagsMacro.render(property, "badge") }}{{ property.getName() }}
+						<div class="ng-doc-node-details">
+							{%- if inheritedFrom %}
+								inherited from <code>{{ inheritedFrom.getName() }}</code>
+							{%- elseif overriddenProperty %}
+								overrides
+								<code>{{ overriddenProperty.getParent().getName() }}</code>
+							{%- elseif implementedProperty %}
+								implements
+								<code>{{ implementedProperty.getParent().getName() }}</code>
+							{%- endif %}
+						</div>
 					</td>
 					<td>{{ typeMacro.render(property.getType()) }}</td>
-					<td>{{ property | extractDocs }}</td>
+					<td>{{ docNode | extractDocs }}</td>
 				</tr>
 			{%- endfor %}
 			</tbody>