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

package/helpers/typescript/method/get-interface-methods.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInterfaceMethods = void 0;
+const core_1 = require("@ng-doc/core");
+const interface_1 = require("../interface");
+/**
+ *
+ * @param int
+ */
+function getInterfaceMethods(int) {
+    const methods = new Map();
+    (0, interface_1.forAllInterfaces)(int, (i) => {
+        i.getMethods().forEach((method) => {
+            const name = method.getName();
+            if (!methods.get(name)) {
+                methods.set(name, method);
+            }
+        });
+    });
+    return (0, core_1.asArray)(methods.values());
+}
+exports.getInterfaceMethods = getInterfaceMethods;
+//# sourceMappingURL=get-interface-methods.js.map

package/helpers/typescript/method/get-interface-methods.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-interface-methods.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/method/get-interface-methods.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAGrC,4CAA8C;AAE9C;;;GAGG;AACH,SAAgB,mBAAmB,CAAC,GAAyB;IAC5D,MAAM,OAAO,GAAiC,IAAI,GAAG,EAA2B,CAAC;IAEjF,IAAA,4BAAgB,EAAC,GAAG,EAAE,CAAC,CAAuB,EAAE,EAAE;QACjD,CAAC,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAC,MAAuB,EAAE,EAAE;YAClD,MAAM,IAAI,GAAW,MAAM,CAAC,OAAO,EAAE,CAAC;YAEtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBACvB,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAC1B;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,cAAO,EAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;AAClC,CAAC;AAdD,kDAcC"}

package/helpers/typescript/method/get-method-chain.d.ts

@@ -0,0 +1,6 @@
+import { MethodDeclaration, MethodSignature } from 'ts-morph';
+/**
+ *
+ * @param method
+ */
+export declare function getMethodChain(method: MethodDeclaration): Array<MethodDeclaration | MethodSignature>;

package/helpers/typescript/method/get-method-chain.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMethodChain = void 0;
+const ts_morph_1 = require("ts-morph");
+const class_1 = require("../class");
+const for_all_interfaces_1 = require("../interface/for-all-interfaces");
+/**
+ *
+ * @param method
+ */
+function getMethodChain(method) {
+    const parent = method.getParent();
+    const methods = [];
+    if (ts_morph_1.Node.isClassDeclaration(parent)) {
+        (0, class_1.forAllClasses)(parent, (cls) => {
+            const mtd = cls.getMethod(method.getName());
+            if (mtd) {
+                methods.push(mtd);
+            }
+        });
+        // TODO: Add interfaces
+    }
+    if (ts_morph_1.Node.isInterfaceDeclaration(parent)) {
+        (0, for_all_interfaces_1.forAllInterfaces)(parent, (int) => {
+            const mtd = int.getMethod(method.getName());
+            if (mtd) {
+                methods.push(mtd);
+            }
+        });
+    }
+    return methods;
+}
+exports.getMethodChain = getMethodChain;
+//# sourceMappingURL=get-method-chain.js.map

package/helpers/typescript/method/get-method-chain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-method-chain.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/method/get-method-chain.ts"],"names":[],"mappings":";;;AAAA,uCAA0G;AAE1G,oCAAsD;AACtD,wEAAiE;AAEjE;;;GAGG;AACH,SAAgB,cAAc,CAAC,MAAyB;IACvD,MAAM,MAAM,GAAqB,MAAM,CAAC,SAAS,EAAE,CAAC;IACpD,MAAM,OAAO,GAA+C,EAAE,CAAC;IAE/D,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,IAAA,qBAAa,EAAC,MAAM,EAAE,CAAC,GAAqB,EAAE,EAAE;YAC/C,MAAM,GAAG,GAAkC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YAE3E,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAClB;QACF,CAAC,CAAC,CAAC;QAEH,uBAAuB;KACvB;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACxC,IAAA,qCAAgB,EAAC,MAAM,EAAE,CAAC,GAAyB,EAAE,EAAE;YACtD,MAAM,GAAG,GAAgC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YAEzE,IAAI,GAAG,EAAE;gBACR,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAClB;QACF,CAAC,CAAC,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AAChB,CAAC;AA3BD,wCA2BC"}

package/helpers/typescript/method/index.d.ts

@@ -0,0 +1,3 @@
+export * from './get-class-methods';
+export * from './get-interface-methods';
+export * from './get-method-chain';

package/helpers/typescript/method/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./get-class-methods"), exports);
+tslib_1.__exportStar(require("./get-interface-methods"), exports);
+tslib_1.__exportStar(require("./get-method-chain"), exports);
+//# sourceMappingURL=index.js.map

package/helpers/typescript/method/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/method/index.ts"],"names":[],"mappings":";;;AAAA,8DAAoC;AACpC,kEAAwC;AACxC,6DAAmC"}

package/helpers/typescript/node/index.d.ts

@@ -0,0 +1 @@
+export * from './sort-by-nodes-name';

package/helpers/typescript/node/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./sort-by-nodes-name"), exports);
+//# sourceMappingURL=index.js.map

package/helpers/typescript/node/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/node/index.ts"],"names":[],"mappings":";;;AAAA,+DAAqC"}

package/helpers/typescript/node/sort-by-nodes-name.d.ts

@@ -0,0 +1,6 @@
+import { NameableNodeSpecific } from 'ts-morph';
+/**
+ *
+ * @param nodes
+ */
+export declare function sortByNodesName<T extends NameableNodeSpecific>(nodes: T[]): T[];

package/helpers/typescript/node/sort-by-nodes-name.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByNodesName = void 0;
+/**
+ *
+ * @param nodes
+ */
+function sortByNodesName(nodes) {
+    return nodes.sort((a, b) => { var _a, _b; return ((_a = a.getName()) !== null && _a !== void 0 ? _a : '').localeCompare((_b = b.getName()) !== null && _b !== void 0 ? _b : ''); });
+}
+exports.sortByNodesName = sortByNodesName;
+//# sourceMappingURL=sort-by-nodes-name.js.map

package/helpers/typescript/node/sort-by-nodes-name.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-by-nodes-name.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/node/sort-by-nodes-name.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,SAAgB,eAAe,CAAiC,KAAU;IACzE,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAI,EAAE,CAAI,EAAE,EAAE,eAAC,OAAA,CAAC,MAAA,CAAC,CAAC,OAAO,EAAE,mCAAI,EAAE,CAAC,CAAC,aAAa,CAAC,MAAA,CAAC,CAAC,OAAO,EAAE,mCAAI,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;AACzF,CAAC;AAFD,0CAEC"}

package/helpers/typescript/property/get-class-properties.d.ts

@@ -0,0 +1,6 @@
+import { ClassDeclaration, PropertyDeclaration } from 'ts-morph';
+/**
+ *
+ * @param cls
+ */
+export declare function getClassProperties(cls: ClassDeclaration): PropertyDeclaration[];

package/helpers/typescript/property/get-class-properties.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getClassProperties = void 0;
+const core_1 = require("@ng-doc/core");
+const class_1 = require("../class");
+/**
+ *
+ * @param cls
+ */
+function getClassProperties(cls) {
+    const properties = new Map();
+    (0, class_1.forAllClasses)(cls, (baseClass) => {
+        baseClass.getProperties().forEach((property) => {
+            const name = property.getName();
+            if (!properties.get(name) && (!property.isAbstract() || (property.isAbstract() && cls === baseClass))) {
+                properties.set(name, property);
+            }
+        });
+    });
+    return (0, core_1.asArray)(properties.values());
+}
+exports.getClassProperties = getClassProperties;
+//# sourceMappingURL=get-class-properties.js.map

package/helpers/typescript/property/get-class-properties.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-class-properties.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/property/get-class-properties.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAGrC,oCAAuC;AAEvC;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,GAAqB;IACvD,MAAM,UAAU,GAAqC,IAAI,GAAG,EAA+B,CAAC;IAE5F,IAAA,qBAAa,EAAC,GAAG,EAAE,CAAC,SAA2B,EAAE,EAAE;QAClD,SAAS,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,QAA6B,EAAE,EAAE;YACnE,MAAM,IAAI,GAAW,QAAQ,CAAC,OAAO,EAAE,CAAC;YAExC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,IAAI,GAAG,KAAK,SAAS,CAAC,CAAC,EAAE;gBACtG,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC/B;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,cAAO,EAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;AACrC,CAAC;AAdD,gDAcC"}

package/helpers/typescript/property/get-interface-properties.d.ts

@@ -0,0 +1,6 @@
+import { InterfaceDeclaration, PropertySignature } from 'ts-morph';
+/**
+ *
+ * @param int
+ */
+export declare function getInterfaceProperties(int: InterfaceDeclaration): PropertySignature[];

package/helpers/typescript/property/get-interface-properties.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInterfaceProperties = void 0;
+const core_1 = require("@ng-doc/core");
+const interface_1 = require("../interface");
+/**
+ *
+ * @param int
+ */
+function getInterfaceProperties(int) {
+    const properties = new Map();
+    (0, interface_1.forAllInterfaces)(int, (i) => {
+        i.getProperties().forEach((property) => {
+            const name = property.getName();
+            if (!properties.get(name)) {
+                properties.set(name, property);
+            }
+        });
+    });
+    return (0, core_1.asArray)(properties.values());
+}
+exports.getInterfaceProperties = getInterfaceProperties;
+//# sourceMappingURL=get-interface-properties.js.map

package/helpers/typescript/property/get-interface-properties.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-interface-properties.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/property/get-interface-properties.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAGrC,4CAA8C;AAE9C;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,GAAyB;IAC/D,MAAM,UAAU,GAAmC,IAAI,GAAG,EAA6B,CAAC;IAExF,IAAA,4BAAgB,EAAC,GAAG,EAAE,CAAC,CAAuB,EAAE,EAAE;QACjD,CAAC,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,QAA2B,EAAE,EAAE;YACzD,MAAM,IAAI,GAAW,QAAQ,CAAC,OAAO,EAAE,CAAC;YAExC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC1B,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC/B;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,cAAO,EAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;AACrC,CAAC;AAdD,wDAcC"}

package/helpers/typescript/property/get-property-chain.d.ts

@@ -0,0 +1,6 @@
+import { PropertyDeclaration, PropertySignature } from 'ts-morph';
+/**
+ *
+ * @param property
+ */
+export declare function getPropertyChain(property: PropertyDeclaration | PropertySignature): Array<PropertyDeclaration | PropertySignature>;

package/helpers/typescript/property/get-property-chain.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPropertyChain = void 0;
+const ts_morph_1 = require("ts-morph");
+const class_1 = require("../class");
+const interface_1 = require("../interface");
+/**
+ *
+ * @param property
+ */
+function getPropertyChain(property) {
+    const parent = property.getParent();
+    const name = property.getName();
+    const properties = [];
+    if (ts_morph_1.Node.isClassDeclaration(parent)) {
+        (0, class_1.forAllClasses)(parent, (cls) => {
+            const prop = cls.getProperty(name);
+            if (prop) {
+                properties.push(prop);
+            }
+        });
+        // TODO: Add interfaces
+    }
+    if (ts_morph_1.Node.isInterfaceDeclaration(parent)) {
+        (0, interface_1.forAllInterfaces)(parent, (int) => {
+            const prop = int.getProperty(name);
+            if (prop) {
+                properties.push(prop);
+            }
+        });
+    }
+    return properties;
+}
+exports.getPropertyChain = getPropertyChain;
+//# sourceMappingURL=get-property-chain.js.map

package/helpers/typescript/property/get-property-chain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-property-chain.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/property/get-property-chain.ts"],"names":[],"mappings":";;;AAAA,uCAA8G;AAE9G,oCAAuC;AACvC,4CAA8C;AAE9C;;;GAGG;AACH,SAAgB,gBAAgB,CAC/B,QAAiD;IAEjD,MAAM,MAAM,GAAqB,QAAQ,CAAC,SAAS,EAAE,CAAC;IACtD,MAAM,IAAI,GAAW,QAAQ,CAAC,OAAO,EAAE,CAAC;IACxC,MAAM,UAAU,GAAmD,EAAE,CAAC;IAEtE,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,IAAA,qBAAa,EAAC,MAAM,EAAE,CAAC,GAAqB,EAAE,EAAE;YAC/C,MAAM,IAAI,GAAoC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEpE,IAAI,IAAI,EAAE;gBACT,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtB;QACF,CAAC,CAAC,CAAC;QAEH,uBAAuB;KACvB;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACxC,IAAA,4BAAgB,EAAC,MAAM,EAAE,CAAC,GAAyB,EAAE,EAAE;YACtD,MAAM,IAAI,GAAkC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAElE,IAAI,IAAI,EAAE;gBACT,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACtB;QACF,CAAC,CAAC,CAAC;KACH;IAED,OAAO,UAAU,CAAC;AACnB,CAAC;AA9BD,4CA8BC"}

package/helpers/typescript/property/index.d.ts

@@ -0,0 +1,3 @@
+export * from './get-class-properties';
+export * from './get-interface-properties';
+export * from './get-property-chain';

package/helpers/typescript/property/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./get-class-properties"), exports);
+tslib_1.__exportStar(require("./get-interface-properties"), exports);
+tslib_1.__exportStar(require("./get-property-chain"), exports);
+//# sourceMappingURL=index.js.map

package/helpers/typescript/property/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/property/index.ts"],"names":[],"mappings":";;;AAAA,iEAAuC;AACvC,qEAA2C;AAC3C,+DAAqC"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ng-doc/builder",
-  "version": "15.0.0-beta.28",
+  "version": "15.0.0-beta.30",
   "type": "commonjs",
   "builders": "./builders.json",
   "schematics": "./schematics/collection.json",
   "dependencies": {
-    "@ng-doc/core": "15.0.0-beta.28",
+    "@ng-doc/core": "15.0.0-beta.30",
     "@angular-devkit/architect": ">=0.1500.0",
     "chokidar": "^3.5.3",
     "minimatch": "^5.1.0",

package/templates/api/class.html.nunj

@@ -1,8 +1,10 @@
 {% extends "api/base.html.nunj" %}
 
 {% import "helpers/type.html.nunj" as typeMacro %}
+{% import "helpers/constructor.html.nunj" as constructorMacro %}
 {% import "helpers/methods.html.nunj" as methodsMacro %}
 {% import "helpers/properties.html.nunj" as propertiesMacro %}
+{% import "helpers/accessors.html.nunj" as accessorsMacro %}
 {% import "helpers/tag.html.nunj" as tagMacro %}
 {% import "helpers/modifier.html.nunj" as modifierMacro %}
 
@@ -31,36 +33,65 @@
 {% endblock %}
 
 {% block overview %}
-	{%- set staticProperties = declaration.getProperties() | filterByStatic(true) | filterByScope("public") -%}
-	{%- set staticMethods = declaration.getMethods() | filterByStatic(true) | filterByScope("public") -%}
-	{%- set properties = declaration.getProperties() | filterByStatic(false) | filterByScope("public") -%}
-	{%- set methods = declaration.getMethods() | filterByStatic(false) | filterByScope("public") -%}
+	{%- set constructors = declaration.getConstructors() | filterByScope("public") -%}
+	{%- set allProperties = declaration | getClassProperties | filterByScope(["public", "protected"]) | sortByNodesName -%}
+	{%- set allMethods = declaration | getClassMethods | filterByScope(["public", "protected"]) | sortByNodesName -%}
+	{%- set allAccessors = declaration | getClassAccessors | filterByScope(["public", "protected"]) | sortByNodesName -%}
+
+	{%- set staticProperties = allProperties | filterByStatic(true) -%}
+	{%- set staticAccessors = allAccessors | filterByStatic(true) -%}
+	{%- set staticMethods = allMethods | filterByStatic(true) -%}
+	{%- set properties = allProperties | filterByStatic(false) -%}
+	{%- set accessors = allAccessors | filterByStatic(false) -%}
+	{%- set getAccessors = declaration.getGetAccessors() | filterByStatic(false) -%}
+	{%- set methods = allMethods | filterByStatic(false) -%}
+
+	{% if constructors.length -%}
+		<section>
+			<h2>Constructor</h2>
+			{{ constructorMacro.render(constructors[0]) }}
+		</section>
+	{%- endif %}
 
 	{% if staticProperties.length -%}
 		<section>
 			<h2>Static Properties</h2>
-			{{ propertiesMacro.render(staticProperties) }}
+			{{ propertiesMacro.render(staticProperties, declaration) }}
 		</section>
 	{%- endif %}
 
 	{% if properties.length -%}
 		<section>
 			<h2>Properties</h2>
-			{{ propertiesMacro.render(properties) }}
+			{{ propertiesMacro.render(properties, declaration) }}
+		</section>
+	{%- endif %}
+
+	{% if staticAccessors.length -%}
+		<section>
+			<h2>Static Accessors</h2>
+			{{ accessorsMacro.render(staticAccessors, declaration) }}
+		</section>
+	{%- endif %}
+
+	{% if accessors.length -%}
+		<section>
+			<h2>Accessors</h2>
+			{{ accessorsMacro.render(accessors, declaration) }}
 		</section>
 	{%- endif %}
 
 	{% if staticMethods.length -%}
 		<section>
 			<h2>Static Methods</h2>
-			{{ methodsMacro.render(staticMethods) }}
+			{{ methodsMacro.render(staticMethods, declaration) }}
 		</section>
 	{%- endif %}
 
 	{% if methods.length -%}
 		<section>
 			<h2>Methods</h2>
-			{{ methodsMacro.render(methods) }}
+			{{ methodsMacro.render(methods, declaration) }}
 		</section>
 	{%- endif %}
 {% endblock %}

package/templates/api/function.html.nunj

@@ -8,7 +8,7 @@
 
 	<section>
 		<h2>Presentation</h2>
-		{{ codeMacro.render(declaration | methodPresentation, "typescript", false) }}
+		{{ codeMacro.render(declaration | functionPresentation, "typescript", false) }}
 	</section>
 
 	{% if parameters.length -%}

package/templates/api/interface.html.nunj

@@ -3,6 +3,7 @@
 {% import "helpers/type.html.nunj" as typeMacro %}
 {% import "helpers/methods.html.nunj" as methodsMacro %}
 {% import "helpers/properties.html.nunj" as propertiesMacro %}
+{% import "helpers/accessors.html.nunj" as accessorsMacro %}
 {% import "helpers/tag.html.nunj" as tagMacro %}
 
 {% block details %}
@@ -19,20 +20,28 @@
 {% endblock %}
 
 {% block overview %}
-	{%- set properties = declaration.getProperties() -%}
-	{%- set methods = declaration.getMethods() -%}
+	{%- set properties = declaration | getInterfaceProperties | sortByNodesName -%}
+	{%- set methods = declaration | getInterfaceMethods | sortByNodesName -%}
+	{%- set accessors = declaration | getInterfaceAccessors | sortByNodesName -%}
 
 	{% if properties.length -%}
 		<section>
 			<h2>Properties</h2>
-			{{ propertiesMacro.render(properties) }}
+			{{ propertiesMacro.render(properties, declaration) }}
+		</section>
+	{%- endif %}
+
+	{% if accessors.length -%}
+		<section>
+			<h2>Accessors</h2>
+			{{ accessorsMacro.render(accessors, declaration) }}
 		</section>
 	{%- endif %}
 
 	{% if methods.length -%}
 		<section>
 			<h2>Methods</h2>
-			{{ methodsMacro.render(methods) }}
+			{{ methodsMacro.render(methods, declaration) }}
 		</section>
 	{%- endif %}
 {% endblock %}

package/templates/helpers/accessor.html.nunj

@@ -0,0 +1,68 @@
+{% import "helpers/code.html.nunj" as codeMacro %}
+{% import "helpers/type.html.nunj" as typeMacro %}
+{% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
+{% import "helpers/parameters.html.nunj" as parametersMacro %}
+{% import "helpers/decorators.html.nunj" as decoratorsMacro %}
+{% import "helpers/no-content.html.nunj" as noContentMacro %}
+{% import "helpers/modifier.html.nunj" as modifierMacro %}
+
+{% macro render(accessor, originalParent) %}
+	{% macro renderAccessor(accessor, type, originalParent) %}
+		{% set parameters = accessor.getParameters() %}
+		{% set accessorChain = accessor | getAccessorChain %}
+		{% set inheritedFrom = accessor.getParent() if accessor.getParent() !== originalParent %}
+		{% set overriddenMember = accessor | getOverriddenMember %}
+		{% set implementedMember = accessor | getImplementedMember %}
+		{% set docNode = accessorChain | firstNodeWithComment %}
+
+		<div class="ng-doc-table-wrapper">
+			<table class="ng-doc-accessor-table">
+				<thead>
+				<tr>
+					<th>
+						{{ decoratorsMacro.render(accessor.getDecorators()) if accessor.getDecorators }}
+						{{ tagsMacro.render(accessor, 'modifier') }}
+						<h3>{{ modifierMacro.render(type) }} {{ accessor.getName() }}</h3>
+						<div class="ng-doc-node-details">
+							{%- if inheritedFrom %}
+								inherited from <code>{{ inheritedFrom.getName() }}</code>
+							{%- elseif overriddenMember %}
+								overrides <code>{{ overriddenMember.getParent().getName() }}</code>
+							{%- elseif implementedMember %}
+								implements <code>{{ implementedMember.getParent().getName() }}</code>
+							{%- endif %}
+						</div>
+					</th>
+				</tr>
+				</thead>
+				<tbody>
+				<tr>
+					<td>
+						{% set description = docNode | extractDocs %}
+
+						{{ description if description else noContentMacro.render('No documentation has been provided.') }}
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<h5 class="no-anchor">Presentation</h5>
+						{{ codeMacro.render(accessor | accessorPresentation, "typescript", false) }}
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<h5 class="no-anchor">Type</h5>
+						<p>
+							{{ typeMacro.render(accessor.getType()) }}
+						</p>
+					</td>
+				</tr>
+				</tbody>
+			</table>
+		</div>
+	{% endmacro %}
+
+
+	{{ renderAccessor(accessor.get, "get", originalParent) if accessor.get }}
+	{{ renderAccessor(accessor.set, "set", originalParent) if accessor.set }}
+{% endmacro %}

package/templates/helpers/accessors.html.nunj

@@ -0,0 +1,7 @@
+{% import "helpers/accessor.html.nunj" as accessor %}
+
+{% macro render(accessors, originalParent) %}
+	{%- for a in accessors | groupAccessors %}
+		{{ accessor.render(a, originalParent) }}
+	{% endfor -%}
+{% endmacro %}

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 overriddenMember = method | getOverriddenMember %}
+	{% set implementedMember = method | getImplementedMember %}
+	{% 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 overriddenMember %}
+							overrides <code>{{ overriddenMember.getParent().getName() }}</code>
+						{%- elseif implementedMember %}
+							implements <code>{{ implementedMember.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 %}