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

package/helpers/typescript/method/index.js

@@ -0,0 +1,9 @@
+"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-implemented-method"), exports);
+tslib_1.__exportStar(require("./get-interface-methods"), exports);
+tslib_1.__exportStar(require("./get-method-chain"), exports);
+tslib_1.__exportStar(require("./get-overridden-method"), 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,mEAAyC;AACzC,kEAAwC;AACxC,6DAAmC;AACnC,kEAAwC"}

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-implemented-property.d.ts

@@ -0,0 +1,7 @@
+import { PropertyDeclaration, PropertySignature } from 'ts-morph';
+/**
+ *	Returns property that was implemented by the provided one
+ *
+ * @param property - Target property
+ */
+export declare function getImplementedProperty(property: PropertyDeclaration | PropertySignature): PropertyDeclaration | PropertySignature | undefined;

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getImplementedProperty = void 0;
+const core_1 = require("@ng-doc/core");
+const ts_morph_1 = require("ts-morph");
+const class_1 = require("../class");
+const find_interface_1 = require("../interface/find-interface");
+/**
+ *	Returns property that was implemented by the provided one
+ *
+ * @param property - Target property
+ */
+function getImplementedProperty(property) {
+    var _a, _b, _c;
+    const parent = property.getParent();
+    const name = property.getName();
+    if (ts_morph_1.Node.isClassDeclaration(parent)) {
+        const prop = (_a = (0, class_1.findBaseClass)(parent, (cls) => !!cls.getProperty(name))) === null || _a === void 0 ? void 0 : _a.getProperty(name);
+        if (prop === null || prop === void 0 ? void 0 : prop.isAbstract) {
+            return prop;
+        }
+        const nodes = parent
+            .getImplements()
+            .map((expr) => { var _a; return (_a = expr.getType().getSymbol()) === null || _a === void 0 ? void 0 : _a.getDeclarations()[0]; })
+            .filter(core_1.isPresent)
+            // Reverse implements because the latest one overrides previous one
+            .reverse();
+        for (const node of nodes) {
+            if (ts_morph_1.Node.isClassDeclaration(node)) {
+                const prop = (_b = (0, class_1.findClass)(node, (cls) => !!cls.getProperty(name))) === null || _b === void 0 ? void 0 : _b.getProperty(name);
+                if (prop === null || prop === void 0 ? void 0 : prop.isAbstract) {
+                    return prop;
+                }
+            }
+            if (ts_morph_1.Node.isInterfaceDeclaration(node)) {
+                const prop = (_c = (0, find_interface_1.findInterface)(node, (int) => !!int.getProperty(name))) === null || _c === void 0 ? void 0 : _c.getProperty(name);
+                if (prop) {
+                    return prop;
+                }
+            }
+        }
+    }
+    return undefined;
+}
+exports.getImplementedProperty = getImplementedProperty;
+//# sourceMappingURL=get-implemented-property.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-implemented-property.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/property/get-implemented-property.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAOkB;AAElB,oCAAkD;AAClD,gEAA0D;AAE1D;;;;GAIG;AACH,SAAgB,sBAAsB,CACrC,QAAiD;;IAEjD,MAAM,MAAM,GAAqB,QAAQ,CAAC,SAAS,EAAE,CAAC;IACtD,MAAM,IAAI,GAAW,QAAQ,CAAC,OAAO,EAAE,CAAC;IAExC,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,IAAI,GAAoC,MAAA,IAAA,qBAAa,EAC1D,MAAM,EACN,CAAC,GAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAClD,0CAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAErB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAE;YACrB,OAAO,IAAI,CAAC;SACZ;QAED,MAAM,KAAK,GAAW,MAAM;aAC1B,aAAa,EAAE;aACf,GAAG,CAAC,CAAC,IAAiC,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,0CAAE,eAAe,GAAG,CAAC,CAAC,CAAA,EAAA,CAAC;aAC5F,MAAM,CAAC,gBAAS,CAAC;YAClB,mEAAmE;aAClE,OAAO,EAAE,CAAC;QAEZ,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACzB,IAAI,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;gBAClC,MAAM,IAAI,GAAoC,MAAA,IAAA,iBAAS,EACtD,IAAI,EACJ,CAAC,GAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAClD,0CAAE,WAAW,CAAC,IAAI,CAAC,CAAC;gBAErB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,EAAE;oBACrB,OAAO,IAAI,CAAC;iBACZ;aACD;YAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;gBACtC,MAAM,IAAI,GAAkC,MAAA,IAAA,8BAAa,EACxD,IAAI,EACJ,CAAC,GAAyB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CACtD,0CAAE,WAAW,CAAC,IAAI,CAAC,CAAC;gBAErB,IAAI,IAAI,EAAE;oBACT,OAAO,IAAI,CAAC;iBACZ;aACD;SACD;KACD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAjDD,wDAiDC"}

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-overridden-property.d.ts

@@ -0,0 +1,7 @@
+import { PropertyDeclaration, PropertySignature } from 'ts-morph';
+/**
+ *	Returns property that was overridden by the provided one
+ *
+ * @param property - Target method
+ */
+export declare function getOverriddenProperty(property: PropertyDeclaration | PropertySignature): PropertyDeclaration | PropertySignature | undefined;

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

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getOverriddenProperty = void 0;
+const ts_morph_1 = require("ts-morph");
+const class_1 = require("../class");
+const interface_1 = require("../interface");
+/**
+ *	Returns property that was overridden by the provided one
+ *
+ * @param property - Target method
+ */
+function getOverriddenProperty(property) {
+    var _a, _b;
+    const parent = property.getParent();
+    const name = property.getName();
+    if (ts_morph_1.Node.isClassDeclaration(parent)) {
+        return (_a = (0, class_1.findBaseClass)(parent, (cls) => {
+            const prop = cls.getProperty(name);
+            return !!prop && !prop.isAbstract();
+        })) === null || _a === void 0 ? void 0 : _a.getProperty(name);
+    }
+    if (ts_morph_1.Node.isInterfaceDeclaration(parent)) {
+        return (_b = (0, interface_1.findInterface)(parent, (int) => int !== parent && !!int.getProperty(name))) === null || _b === void 0 ? void 0 : _b.getProperty(name);
+    }
+    return undefined;
+}
+exports.getOverriddenProperty = getOverriddenProperty;
+//# sourceMappingURL=get-overridden-property.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-overridden-property.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/property/get-overridden-property.ts"],"names":[],"mappings":";;;AAAA,uCAOkB;AAElB,oCAAuC;AACvC,4CAA2C;AAE3C;;;;GAIG;AACH,SAAgB,qBAAqB,CACpC,QAAiD;;IAEjD,MAAM,MAAM,GAAqB,QAAQ,CAAC,SAAS,EAAE,CAAC;IACtD,MAAM,IAAI,GAAW,QAAQ,CAAC,OAAO,EAAE,CAAC;IAExC,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,OAAO,MAAA,IAAA,qBAAa,EAAC,MAAM,EAAE,CAAC,GAAqB,EAAE,EAAE;YACtD,MAAM,IAAI,GAAoC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAEpE,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QACrC,CAAC,CAAC,0CAAE,WAAW,CAAC,IAAI,CAAC,CAAC;KACtB;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACxC,OAAO,MAAA,IAAA,yBAAa,EACnB,MAAM,EACN,CAAC,GAAyB,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CACxE,0CAAE,WAAW,CAAC,IAAI,CAAC,CAAC;KACrB;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAtBD,sDAsBC"}

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,34 @@
+"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);
+            }
+        });
+    }
+    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;KACH;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;AA5BD,4CA4BC"}

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

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

package/helpers/typescript/property/index.js

@@ -0,0 +1,9 @@
+"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-implemented-property"), exports);
+tslib_1.__exportStar(require("./get-interface-properties"), exports);
+tslib_1.__exportStar(require("./get-overridden-property"), 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,qEAA2C;AAC3C,oEAA0C;AAC1C,+DAAqC"}

package/interfaces/asset.d.ts

@@ -3,6 +3,7 @@ export interface NgDocAsset {
     originalPath: string;
     outputPath: string;
     name: string;
+    code: string;
     output: string;
     title: string;
     type: NgDocCodeType;

package/package.json

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

package/templates/api/class.html.nunj

@@ -1,6 +1,7 @@
 {% 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/tag.html.nunj" as tagMacro %}
@@ -31,36 +32,49 @@
 {% 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 staticProperties = allProperties | filterByStatic(true) -%}
+	{%- set staticGetAccessors = declaration.getGetAccessors() | filterByStatic(true) | filterByScope("public") -%}
+	{%- set staticMethods = allMethods | filterByStatic(true) | filterByScope("public") -%}
+	{%- set properties = allProperties | 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 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

@@ -19,20 +19,20 @@
 {% endblock %}
 
 {% block overview %}
-	{%- set properties = declaration.getProperties() -%}
-	{%- set methods = declaration.getMethods() -%}
+	{%- set properties = declaration | getInterfaceProperties | sortByNodesName -%}
+	{%- set methods = declaration | getInterfaceMethods | sortByNodesName -%}
 
 	{% if properties.length -%}
 		<section>
 			<h2>Properties</h2>
-			{{ propertiesMacro.render(properties) }}
+			{{ propertiesMacro.render(properties, declaration) }}
 		</section>
 	{%- endif %}
 
 	{% if methods.length -%}
 		<section>
 			<h2>Methods</h2>
-			{{ methodsMacro.render(methods) }}
+			{{ methodsMacro.render(methods, declaration) }}
 		</section>
 	{%- endif %}
 {% endblock %}

package/templates/code.html.nunj

@@ -0,0 +1,3 @@
+{% import "helpers/code.html.nunj" as codeMacro -%}
+
+{{ codeMacro.render(code, lang) }}

package/templates/helpers/code.html.nunj

@@ -1,3 +1,3 @@
 {% macro render(code, language = "typescript", copyButton = true) -%}
-	<pre><code lang="{{ language }}" class="language-{{ language }}">{{ code | escape }}</code></pre>
+	<pre><code lang="{{ language | lower }}" class="language-{{ language | lower }}">{{ code | escape }}</code></pre>
 {%- 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,36 +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] | noEmpty | join(', ') %}
 
 	{%- if type == 'badge' %}
-		{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
-			<span class="ng-doc-badge-wrapper">
+		{%- 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>