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

package/helpers/index.js

@@ -11,10 +11,14 @@ tslib_1.__exportStar(require("./entity-type"), exports);
 tslib_1.__exportStar(require("./extract-docs"), exports);
 tslib_1.__exportStar(require("./extract-path-anchor"), exports);
 tslib_1.__exportStar(require("./extract-selectors"), exports);
+tslib_1.__exportStar(require("./filter-useless-members"), exports);
 tslib_1.__exportStar(require("./find-closest-file"), exports);
 tslib_1.__exportStar(require("./format-code"), exports);
 tslib_1.__exportStar(require("./generate-api-entities"), exports);
+tslib_1.__exportStar(require("./get-declaration-type"), exports);
 tslib_1.__exportStar(require("./get-entity-constructor"), exports);
+tslib_1.__exportStar(require("./get-keyword-type-from-entity"), exports);
+tslib_1.__exportStar(require("./get-kind-type"), exports);
 tslib_1.__exportStar(require("./is-not-excluded-path"), exports);
 tslib_1.__exportStar(require("./is-supported-declaration"), exports);
 tslib_1.__exportStar(require("./marked"), exports);

package/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,+DAAqC;AACrC,mEAAyC;AACzC,oEAA0C;AAC1C,sEAA4C;AAC5C,8DAAoC;AACpC,wDAA8B;AAC9B,yDAA+B;AAC/B,gEAAsC;AACtC,8DAAoC;AACpC,8DAAoC;AACpC,wDAA8B;AAC9B,kEAAwC;AACxC,mEAAyC;AACzC,iEAAuC;AACvC,qEAA2C;AAC3C,mDAAyB;AACzB,qDAA2B;AAC3B,2DAAiC;AACjC,6DAAmC;AACnC,yDAA+B;AAC/B,0DAAgC;AAChC,6DAAmC;AACnC,kDAAwB;AACxB,uDAA6B;AAC7B,wDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,+DAAqC;AACrC,mEAAyC;AACzC,oEAA0C;AAC1C,sEAA4C;AAC5C,8DAAoC;AACpC,wDAA8B;AAC9B,yDAA+B;AAC/B,gEAAsC;AACtC,8DAAoC;AACpC,mEAAyC;AACzC,8DAAoC;AACpC,wDAA8B;AAC9B,kEAAwC;AACxC,iEAAuC;AACvC,mEAAyC;AACzC,yEAA+C;AAC/C,0DAAgC;AAChC,iEAAuC;AACvC,qEAA2C;AAC3C,mDAAyB;AACzB,qDAA2B;AAC3B,2DAAiC;AACjC,6DAAmC;AACnC,yDAA+B;AAC/B,0DAAgC;AAChC,6DAAmC;AACnC,kDAAwB;AACxB,uDAA6B;AAC7B,wDAA8B"}

package/helpers/presentation.js

@@ -86,7 +86,6 @@ exports.variablePresentation = variablePresentation;
  */
 function parameterPresentation(parameter) {
     return [
-        parameter.hasOverrideKeyword() ? 'override' : '',
         decoratorsPresentation(parameter),
         scopePresentation(parameter),
         modPresentation(parameter),

package/helpers/presentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/presentation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"presentation.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/presentation.ts"],"names":[],"mappings":"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"}

package/helpers/typescript/member/find-member.js

@@ -13,7 +13,7 @@ const get_interface_member_1 = require("../interface/get-interface-member");
 function findMember(node, name) {
     var _a;
     if (ts_morph_1.Node.isClassDeclaration(node)) {
-        const member = (_a = (0, class_1.findClass)(node, (cls) => !!cls.getMember(name))) === null || _a === void 0 ? void 0 : _a.getMember(name);
+        const member = (_a = (0, class_1.findClass)(node, (cls) => !!cls.getInstanceMember(name))) === null || _a === void 0 ? void 0 : _a.getInstanceMember(name);
         return member;
     }
     if (ts_morph_1.Node.isInterfaceDeclaration(node)) {

package/helpers/typescript/member/find-member.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-member.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/find-member.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,oCAAkD;AAClD,4CAA2C;AAC3C,4EAAqE;AAKrE;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAA6C,EAAE,IAAY;;IACrF,IAAI,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;QAClC,MAAM,MAAM,GAAiC,MAAA,IAAA,iBAAS,EACrD,IAAI,EACJ,CAAC,GAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAChD,0CAAE,SAAS,CAAC,IAAI,CAAqB,CAAC;QAEvC,OAAO,MAAM,CAAC;KACd;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;QACtC,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;YACtC,MAAM,aAAa,GAAqC,IAAA,yBAAa,EACpE,IAAI,EACJ,CAAC,GAAyB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAA,yCAAkB,EAAC,GAAG,EAAE,IAAI,CAAC,CAC9D,CAAC;YAEF,OAAO,aAAa,IAAI,IAAA,yCAAkB,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;SAChE;KACD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAtBD,gCAsBC"}
+{"version":3,"file":"find-member.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/find-member.ts"],"names":[],"mappings":";;;AAAA,uCAAgG;AAEhG,oCAAkD;AAClD,4CAA2C;AAC3C,4EAAqE;AAKrE;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAA6C,EAAE,IAAY;;IACrF,IAAI,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;QAClC,MAAM,MAAM,GAAiC,MAAA,IAAA,iBAAS,EACrD,IAAI,EACJ,CAAC,GAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CACxD,0CAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAE3B,OAAO,MAAM,CAAC;KACd;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;QACtC,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;YACtC,MAAM,aAAa,GAAqC,IAAA,yBAAa,EACpE,IAAI,EACJ,CAAC,GAAyB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAA,yCAAkB,EAAC,GAAG,EAAE,IAAI,CAAC,CAC9D,CAAC;YAEF,OAAO,aAAa,IAAI,IAAA,yCAAkB,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;SAChE;KACD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAtBD,gCAsBC"}

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

@@ -4,19 +4,20 @@ exports.getImplementedMember = void 0;
 const core_1 = require("@ng-doc/core");
 const ts_morph_1 = require("ts-morph");
 const find_member_1 = require("./find-member");
+const get_member_parent_1 = require("./get-member-parent");
 /**
  *	Returns member that was implemented by the provided one
  *
  * @param member - Target member
  */
 function getImplementedMember(member) {
-    const parent = member.getParent();
+    const parent = (0, get_member_parent_1.getMemberParent)(member);
     const name = member.getName();
     if (ts_morph_1.Node.isClassDeclaration(parent)) {
         const baseClass = parent.getBaseClass();
         if (baseClass) {
             const member = (0, find_member_1.findMember)(baseClass, name);
-            if (member === null || member === void 0 ? void 0 : member.isAbstract()) {
+            if (ts_morph_1.Node.isAbstractable(member) && member.isAbstract()) {
                 return member;
             }
         }
@@ -29,7 +30,7 @@ function getImplementedMember(member) {
         for (const node of nodes) {
             if (ts_morph_1.Node.isClassDeclaration(node)) {
                 const member = (0, find_member_1.findMember)(node, name);
-                if (member === null || member === void 0 ? void 0 : member.isAbstract()) {
+                if (ts_morph_1.Node.isAbstractable(member) && member.isAbstract()) {
                     return member;
                 }
             }

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

@@ -1 +1 @@
-{"version":3,"file":"get-implemented-member.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/get-implemented-member.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAA6E;AAE7E,+CAAyC;AAGzC;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAuB;IAC3D,MAAM,MAAM,GAAqB,MAAM,CAAC,SAAS,EAAE,CAAC;IACpD,MAAM,IAAI,GAAW,MAAM,CAAC,OAAO,EAAE,CAAC;IAEtC,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,SAAS,GAAiC,MAAM,CAAC,YAAY,EAAE,CAAC;QAEtE,IAAI,SAAS,EAAE;YACd,MAAM,MAAM,GAAiC,IAAA,wBAAU,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAEzE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE,EAAE;gBACzB,OAAO,MAAM,CAAC;aACd;SACD;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,MAAM,GAAiC,IAAA,wBAAU,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAEpE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE,EAAE;oBACzB,OAAO,MAAM,CAAC;iBACd;aACD;YAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;gBACtC,MAAM,MAAM,GAAqC,IAAA,wBAAU,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAExE,IAAI,MAAM,EAAE;oBACX,OAAO,MAAM,CAAC;iBACd;aACD;SACD;KACD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AA1CD,oDA0CC"}
+{"version":3,"file":"get-implemented-member.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/get-implemented-member.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,uCAA6E;AAE7E,+CAAyC;AACzC,2DAAoD;AAGpD;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,MAAuB;IAC3D,MAAM,MAAM,GAAqB,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC;IACzD,MAAM,IAAI,GAAW,MAAM,CAAC,OAAO,EAAE,CAAC;IAEtC,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,SAAS,GAAiC,MAAM,CAAC,YAAY,EAAE,CAAC;QAEtE,IAAI,SAAS,EAAE;YACd,MAAM,MAAM,GAAiC,IAAA,wBAAU,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAEzE,IAAI,eAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE;gBACvD,OAAO,MAAM,CAAC;aACd;SACD;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,MAAM,GAAiC,IAAA,wBAAU,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAEpE,IAAI,eAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE;oBACvD,OAAO,MAAM,CAAC;iBACd;aACD;YAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;gBACtC,MAAM,MAAM,GAAqC,IAAA,wBAAU,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBAExE,IAAI,MAAM,EAAE;oBACX,OAAO,MAAM,CAAC;iBACd;aACD;SACD;KACD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AA1CD,oDA0CC"}

package/helpers/typescript/member/get-inherited-parent.d.ts

@@ -0,0 +1,8 @@
+import { Node } from 'ts-morph';
+import { NgDocMemberType } from '../index';
+/**
+ *
+ * @param member
+ * @param currentNode
+ */
+export declare function getInheritedParent(member: NgDocMemberType, currentNode: Node): Node | undefined;

package/helpers/typescript/member/get-inherited-parent.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInheritedParent = void 0;
+const ts_morph_1 = require("ts-morph");
+const index_1 = require("../index");
+/**
+ *
+ * @param member
+ * @param currentNode
+ */
+function getInheritedParent(member, currentNode) {
+    const memberParent = (0, index_1.getMemberParent)(member);
+    if (ts_morph_1.Node.isConstructorDeclaration(currentNode)) {
+        currentNode = currentNode.getParent();
+    }
+    return memberParent === currentNode ? undefined : memberParent;
+}
+exports.getInheritedParent = getInheritedParent;
+//# sourceMappingURL=get-inherited-parent.js.map

package/helpers/typescript/member/get-inherited-parent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-inherited-parent.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/get-inherited-parent.ts"],"names":[],"mappings":";;;AAAA,uCAA8B;AAE9B,oCAA0D;AAE1D;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,MAAuB,EAAE,WAAiB;IAC5E,MAAM,YAAY,GAAS,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC;IAEnD,IAAI,eAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAE;QAC/C,WAAW,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC;KACtC;IAED,OAAO,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC;AAChE,CAAC;AARD,gDAQC"}

package/helpers/typescript/member/get-member-parent.d.ts

@@ -0,0 +1,7 @@
+import { Node } from 'ts-morph';
+import { NgDocMemberType } from './member-type';
+/**
+ *
+ * @param member
+ */
+export declare function getMemberParent(member: NgDocMemberType): Node;

package/helpers/typescript/member/get-member-parent.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMemberParent = void 0;
+const ts_morph_1 = require("ts-morph");
+/**
+ *
+ * @param member
+ */
+function getMemberParent(member) {
+    const parent = member.getParent();
+    return ts_morph_1.Node.isConstructorDeclaration(parent) ? parent.getParent() : parent;
+}
+exports.getMemberParent = getMemberParent;
+//# sourceMappingURL=get-member-parent.js.map

package/helpers/typescript/member/get-member-parent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-member-parent.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/get-member-parent.ts"],"names":[],"mappings":";;;AAAA,uCAA8B;AAI9B;;;GAGG;AACH,SAAgB,eAAe,CAAC,MAAuB;IACtD,MAAM,MAAM,GAAqB,MAAM,CAAC,SAAS,EAAE,CAAC;IAEpD,OAAO,eAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;AAC5E,CAAC;AAJD,0CAIC"}

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

@@ -5,18 +5,20 @@ const ts_morph_1 = require("ts-morph");
 const class_1 = require("../class");
 const interface_1 = require("../interface");
 const find_member_1 = require("./find-member");
+const get_member_parent_1 = require("./get-member-parent");
 /**
  *	Returns member that was overridden by the provided one
  *
  * @param member - Target member
  */
 function getOverriddenMember(member) {
-    const parent = member.getParent();
+    const parent = (0, get_member_parent_1.getMemberParent)(member);
     const name = member.getName();
     if (ts_morph_1.Node.isClassDeclaration(parent)) {
         const baseClass = (0, class_1.findBaseClass)(parent, (cls) => {
             const member = (0, find_member_1.findMember)(cls, name);
-            return !!member && !member.isAbstract();
+            const isAbstract = ts_morph_1.Node.isAbstractable(member) && member.isAbstract();
+            return !!member && !isAbstract;
         });
         return baseClass && (0, find_member_1.findMember)(baseClass, name);
     }

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

@@ -1 +1 @@
-{"version":3,"file":"get-overridden-member.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/get-overridden-member.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,oCAAuC;AACvC,4CAA2C;AAC3C,+CAAyC;AAGzC;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,MAAuB;IAC1D,MAAM,MAAM,GAAqB,MAAM,CAAC,SAAS,EAAE,CAAC;IACpD,MAAM,IAAI,GAAW,MAAM,CAAC,OAAO,EAAE,CAAC;IAEtC,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,SAAS,GAAiC,IAAA,qBAAa,EAAC,MAAM,EAAE,CAAC,GAAqB,EAAE,EAAE;YAC/F,MAAM,MAAM,GAAiC,IAAA,wBAAU,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAEnE,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,OAAO,SAAS,IAAI,IAAA,wBAAU,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;KAChD;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACxC,MAAM,aAAa,GAAqC,IAAA,yBAAa,EACpE,MAAM,EACN,CAAC,GAAyB,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,IAAI,CAAC,CAAC,IAAA,wBAAU,EAAC,GAAG,EAAE,IAAI,CAAC,CACxE,CAAC;QAEF,OAAO,aAAa,IAAI,IAAA,wBAAU,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;KACxD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAxBD,kDAwBC"}
+{"version":3,"file":"get-overridden-member.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/get-overridden-member.ts"],"names":[],"mappings":";;;AAAA,uCAAsE;AAEtE,oCAAuC;AACvC,4CAA2C;AAC3C,+CAAyC;AACzC,2DAAoD;AAGpD;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,MAAuB;IAC1D,MAAM,MAAM,GAAS,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,IAAI,GAAW,MAAM,CAAC,OAAO,EAAE,CAAC;IAEtC,IAAI,eAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACpC,MAAM,SAAS,GAAiC,IAAA,qBAAa,EAAC,MAAM,EAAE,CAAC,GAAqB,EAAE,EAAE;YAC/F,MAAM,MAAM,GAAiC,IAAA,wBAAU,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACnE,MAAM,UAAU,GAAY,eAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;YAE/E,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,OAAO,SAAS,IAAI,IAAA,wBAAU,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;KAChD;IAED,IAAI,eAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,EAAE;QACxC,MAAM,aAAa,GAAqC,IAAA,yBAAa,EACpE,MAAM,EACN,CAAC,GAAyB,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,IAAI,CAAC,CAAC,IAAA,wBAAU,EAAC,GAAG,EAAE,IAAI,CAAC,CACxE,CAAC;QAEF,OAAO,aAAa,IAAI,IAAA,wBAAU,EAAC,aAAa,EAAE,IAAI,CAAC,CAAC;KACxD;IAED,OAAO,SAAS,CAAC;AAClB,CAAC;AAzBD,kDAyBC"}

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

@@ -1,4 +1,6 @@
 export * from './find-member';
 export * from './get-implemented-member';
+export * from './get-inherited-parent';
+export * from './get-member-parent';
 export * from './get-overridden-member';
 export * from './member-type';

package/helpers/typescript/member/index.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./find-member"), exports);
 tslib_1.__exportStar(require("./get-implemented-member"), exports);
+tslib_1.__exportStar(require("./get-inherited-parent"), exports);
+tslib_1.__exportStar(require("./get-member-parent"), exports);
 tslib_1.__exportStar(require("./get-overridden-member"), exports);
 tslib_1.__exportStar(require("./member-type"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,mEAAyC;AACzC,kEAAwC;AACxC,wDAA8B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../libs/builder/helpers/typescript/member/index.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAC9B,mEAAyC;AACzC,iEAAuC;AACvC,8DAAoC;AACpC,kEAAwC;AACxC,wDAA8B"}

package/helpers/typescript/member/member-type.d.ts

@@ -1,4 +1,4 @@
-import { CallSignatureDeclaration, ClassMemberTypes, ClassStaticBlockDeclaration, ConstructorDeclaration, ConstructSignatureDeclaration, IndexSignatureDeclaration, TypeElementTypes } from 'ts-morph';
-export declare type NgDocClassMember = Exclude<ClassMemberTypes, ConstructorDeclaration | CallSignatureDeclaration | ClassStaticBlockDeclaration>;
+import { CallSignatureDeclaration, ClassInstanceMemberTypes, ConstructSignatureDeclaration, IndexSignatureDeclaration, TypeElementTypes } from 'ts-morph';
+export declare type NgDocClassMember = ClassInstanceMemberTypes;
 export declare type NgDocInterfaceMember = Exclude<TypeElementTypes, ConstructSignatureDeclaration | CallSignatureDeclaration | IndexSignatureDeclaration>;
 export declare type NgDocMemberType = NgDocClassMember | NgDocInterfaceMember;

package/interfaces/keyword-map.d.ts

@@ -1,6 +1,8 @@
+import { NgDocKeywordType } from '../types';
 export interface NgDocKeyword {
     title: string;
     path: string;
+    type?: NgDocKeywordType;
     isCodeLink: boolean;
 }
 export interface NgDocGlobalKeyword {

package/interfaces/page-index.d.ts

@@ -1,9 +1,9 @@
-import { NgDocPageType } from '@ng-doc/core';
+import { NgDocKindType, NgDocPageType } from '@ng-doc/core';
 export interface NgDocPageIndex {
     route: string;
     title: string;
     type: NgDocPageType;
     heading: string;
     content: string;
-    kind?: string;
+    kind?: NgDocKindType;
 }

package/package.json

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

package/templates/api/class.html.nunj

@@ -5,11 +5,10 @@
 {% 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 %}
 
 {% block modifier %}
-	{{ modifierMacro.render('Abstract') if declaration.isAbstract() }}
+	{{ modifierMacro.render('abstract') if declaration.isAbstract() }}
 {% endblock %}
 
 {% block details %}
@@ -20,12 +19,12 @@
 		<div class="ng-doc-header-details">
 			{% if extends %}
 				<span class="ng-doc-header-details-label">Extends</span>
-				{{ tagMacro.render(typeMacro.render(extends.getType()), "class-extends") }}
+				{{ typeMacro.render(extends.getType()) }}
 			{%- endif %}
 			{% if implements.length %}
 				<span class="ng-doc-header-details-label">Implements</span>
 				{%- for i in implements -%}
-					{{ tagMacro.render(typeMacro.render(i.getType()), "class-implements") }}
+					{{ typeMacro.render(i.getType()) }}
 				{%- endfor %}
 			{%- endif %}
 		</div>
@@ -34,9 +33,9 @@
 
 {% block overview %}
 	{%- 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 allProperties = declaration | getClassProperties | filterByScope(["public", "protected"]) | filterUselessMembers | sortByNodesName -%}
+	{%- set allMethods = declaration | getClassMethods | filterByScope(["public", "protected"]) | filterUselessMembers | sortByNodesName -%}
+	{%- set allAccessors = declaration | getClassAccessors | filterByScope(["public", "protected"]) | filterUselessMembers | sortByNodesName -%}
 
 	{%- set staticProperties = allProperties | filterByStatic(true) -%}
 	{%- set staticAccessors = allAccessors | filterByStatic(true) -%}

package/templates/api/interface.html.nunj

@@ -4,7 +4,6 @@
 {% 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 %}
 	{%- set extends = declaration.getExtends() -%}
@@ -13,16 +12,16 @@
 		<div class="ng-doc-header-details">
 			<span class="ng-doc-header-details-label">Extends</span>
 			{%- for i in extends -%}
-				{{ tagMacro.render(typeMacro.render(i.getType()), "interface-extends") }}
+				{{ typeMacro.render(i.getType()) }}
 			{%- endfor %}
 		</div>
 	{% endif %}
 {% endblock %}
 
 {% block overview %}
-	{%- set properties = declaration | getInterfaceProperties | sortByNodesName -%}
-	{%- set methods = declaration | getInterfaceMethods | sortByNodesName -%}
-	{%- set accessors = declaration | getInterfaceAccessors | sortByNodesName -%}
+	{%- set properties = declaration | getInterfaceProperties | filterUselessMembers | sortByNodesName -%}
+	{%- set methods = declaration | getInterfaceMethods | filterUselessMembers | sortByNodesName -%}
+	{%- set accessors = declaration | getInterfaceAccessors | filterUselessMembers | sortByNodesName -%}
 
 	{% if properties.length -%}
 		<section>

package/templates/helpers/accessor.html.nunj

@@ -6,11 +6,11 @@
 {% import "helpers/no-content.html.nunj" as noContentMacro %}
 {% import "helpers/modifier.html.nunj" as modifierMacro %}
 
-{% macro render(accessor, originalParent) %}
-	{% macro renderAccessor(accessor, type, originalParent) %}
+{% macro render(accessor, origin) %}
+	{% macro renderAccessor(accessor, type, origin) %}
 		{% set parameters = accessor.getParameters() %}
 		{% set accessorChain = accessor | getAccessorChain %}
-		{% set inheritedFrom = accessor.getParent() if accessor.getParent() !== originalParent %}
+		{% set inheritedFrom = accessor | getInheritedParent(origin) %}
 		{% set overriddenMember = accessor | getOverriddenMember %}
 		{% set implementedMember = accessor | getImplementedMember %}
 		{% set docNode = accessorChain | firstNodeWithComment %}
@@ -63,6 +63,6 @@
 	{% endmacro %}
 
 
-	{{ renderAccessor(accessor.get, "get", originalParent) if accessor.get }}
-	{{ renderAccessor(accessor.set, "set", originalParent) if accessor.set }}
+	{{ renderAccessor(accessor.get, "get", origin) if accessor.get }}
+	{{ renderAccessor(accessor.set, "set", origin) if accessor.set }}
 {% endmacro %}

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

@@ -12,20 +12,20 @@
 	{%- if type == 'badge' %}
 		{%- 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("Readonly") if isReadonly }}
+				{{ badgeMacro.render("abstract") if isAbstract }}
+				{{ badgeMacro.render("static") if isStatic }}
+				{{ badgeMacro.render("async") if isAsync }}
+				{{ badgeMacro.render("readonly") if isReadonly }}
 			</span>
 		{%- endif %}
 
 	{%- elseif type == 'modifier' %}
 		{%- 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("Readonly") if isReadonly }}
+				{{ modifierMacro.render("abstract") if isAbstract }}
+				{{ modifierMacro.render("static") if isStatic }}
+				{{ modifierMacro.render("async") if isAsync }}
+				{{ modifierMacro.render("readonly") if isReadonly }}
 			</div>
 		{%- endif %}
 	{%- else %}

package/templates/helpers/method.html.nunj

@@ -5,10 +5,10 @@
 {% import "helpers/decorators.html.nunj" as decoratorsMacro %}
 {% import "helpers/no-content.html.nunj" as noContentMacro %}
 
-{% macro render(method, originalParent) %}
+{% macro render(method, origin) %}
 	{% set parameters = method.getParameters() %}
 	{% set methodChain = method | getMethodChain %}
-	{% set inheritedFrom = method.getParent() if method.getParent() !== originalParent %}
+	{% set inheritedFrom = method | getInheritedParent(origin) %}
 	{% set overriddenMember = method | getOverriddenMember %}
 	{% set implementedMember = method | getImplementedMember %}
 	{% set docNode = methodChain | firstNodeWithComment %}
@@ -20,14 +20,14 @@
 				<th>
 					{{ decoratorsMacro.render(method.getDecorators()) if method.getDecorators }}
 					{{ tagsMacro.render(method, 'modifier') }}
-					<h3>{{ method.getName() }}</h3>
+					<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>
+							overrides <code>{{ (overriddenMember | getMemberParent).getName() }}</code>
 						{%- elseif implementedMember %}
-							implements <code>{{ implementedMember.getParent().getName() }}</code>
+							implements <code>{{ (implementedMember | getMemberParent).getName() }}</code>
 						{%- endif %}
 					</div>
 				</th>

package/templates/helpers/parameters.html.nunj

@@ -1,5 +1,6 @@
 {% import "helpers/type.html.nunj" as typeMacro %}
 {% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
+{% import "helpers/decorators.html.nunj" as decoratorsMacro %}
 
 {% macro render(parameters, origin) %}
 	<div class="ng-doc-table-wrapper">
@@ -13,8 +14,26 @@
 			</thead>
 			<tbody>
 			{%- for param in parameters %}
+				{% set paramChain = param | getPropertyChain %}
+				{% set inheritedFrom = param | getInheritedParent(origin) %}
+				{% set overriddenMember = param | getOverriddenMember %}
+				{% set implementedMember = param | getImplementedMember %}
+				{% set docNode = paramChain | firstNodeWithComment %}
+
 				<tr>
-					<td>{{ tagsMacro.render(param, "badge") }}{{ param.getName() }}</td>
+					<td>
+						{{ decoratorsMacro.render(param.getDecorators(), true) if param.getDecorators }}
+						{{ tagsMacro.render(param, "badge") }}{{ param.getName() }}
+						<div class="ng-doc-node-details">
+							{%- if inheritedFrom %}
+								inherited from <code>{{ inheritedFrom.getName() }}</code>
+							{%- elseif overriddenMember %}
+								overrides <code>{{ (overriddenMember | getMemberParent).getName() }}</code>
+							{%- elseif implementedMember %}
+								implements <code>{{ (implementedMember | getMemberParent).getName() }}</code>
+							{%- endif %}
+						</div>
+					</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, originalParent) %}
+{% macro render(properties, origin) %}
 	<div class="ng-doc-table-wrapper">
 		<table class="ng-doc-properties-table">
 			<thead>
@@ -15,7 +15,7 @@
 			<tbody>
 			{%- for property in properties %}
 				{% set propertyChain = property | getPropertyChain %}
-				{% set inheritedFrom = property.getParent() if property.getParent() !== originalParent %}
+				{% set inheritedFrom = property | getInheritedParent(origin) %}
 				{% set overriddenMember = property | getOverriddenMember %}
 				{% set implementedMember = property | getImplementedMember %}
 				{% set docNode = propertyChain | firstNodeWithComment %}
@@ -28,9 +28,9 @@
 							{%- if inheritedFrom %}
 								inherited from <code>{{ inheritedFrom.getName() }}</code>
 							{%- elseif overriddenMember %}
-								overrides <code>{{ overriddenMember.getParent().getName() }}</code>
+								overrides <code>{{ (overriddenMember | getMemberParent).getName() }}</code>
 							{%- elseif implementedMember %}
-								implements <code>{{ implementedMember.getParent().getName() }}</code>
+								implements <code>{{ (implementedMember | getMemberParent).getName() }}</code>
 							{%- endif %}
 						</div>
 					</td>

package/templates/parts/page-tags.html.nunj

@@ -3,11 +3,12 @@
 
 <div class="ng-doc-page-tags">
 	{% set selectors = declaration | extractSelectors %}
+	{% set declarationType = declaration | getDeclarationType %}
 
 
 	{{ tagMacro.render(scope.name, "ng-doc-scope") }}
 	<span class="ng-doc-inline-delimiter">/</span>
-	{{ tagMacro.render(declaration.getKindName() | humanizeDeclarationName) }}
+	{{ tagMacro.render(declarationType) if declarationType }}
 
 
 	{%- if declaration.getDecorators and declaration.getDecorators().length %}

package/types/index.d.ts

@@ -1,5 +1,6 @@
 export * from './action';
 export * from './artifact-processor';
 export * from './constructable';
+export * from './keyword-type';
 export * from './snippet-type';
 export * from './supported-declarations';

package/types/index.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./action"), exports);
 tslib_1.__exportStar(require("./artifact-processor"), exports);
 tslib_1.__exportStar(require("./constructable"), exports);
+tslib_1.__exportStar(require("./keyword-type"), exports);
 tslib_1.__exportStar(require("./snippet-type"), exports);
 tslib_1.__exportStar(require("./supported-declarations"), exports);
 //# sourceMappingURL=index.js.map

package/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/types/index.ts"],"names":[],"mappings":";;;AAAA,mDAAyB;AACzB,+DAAqC;AACrC,0DAAgC;AAChC,yDAA+B;AAC/B,mEAAyC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/types/index.ts"],"names":[],"mappings":";;;AAAA,mDAAyB;AACzB,+DAAqC;AACrC,0DAAgC;AAChC,yDAA+B;AAC/B,yDAA+B;AAC/B,mEAAyC"}

package/types/keyword-type.d.ts

@@ -0,0 +1,2 @@
+import { NgDocKindType, NgDocPageType } from '@ng-doc/core';
+export declare type NgDocKeywordType = NgDocKindType | NgDocPageType;

package/types/keyword-type.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=keyword-type.js.map

package/types/keyword-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyword-type.js","sourceRoot":"","sources":["../../../../libs/builder/types/keyword-type.ts"],"names":[],"mappings":""}

package/engine/.cache/libs/app/components/page-map/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./page-map.component"), exports);
-tslib_1.__exportStar(require("./page-map.module"), exports);
-tslib_1.__exportStar(require("./page-map-element/page-map-element.component"), exports);

package/engine/.cache/libs/core/helpers/humanize-declaration-name.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.humanizeDeclarationName = void 0;
-/**
- *
- * @param declarationName
- */
-function humanizeDeclarationName(declarationName) {
-    return declarationName
-        .replace('Declaration', '')
-        .replace(/([a-z])([A-Z])/g, '$1 $2');
-}
-exports.humanizeDeclarationName = humanizeDeclarationName;