@ng-doc/builder 15.0.0-beta.9 → 15.0.0

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/interfaces/asset.d.ts

@@ -1,8 +1,9 @@
-import { NgDocCodeType } from '../types';
+import { NgDocCodeType } from '@ng-doc/core';
 export interface NgDocAsset {
     originalPath: string;
     outputPath: string;
     name: string;
+    code: string;
     output: string;
     title: string;
     type: NgDocCodeType;

package/interfaces/builder-context.d.ts

@@ -1,13 +1,14 @@
 import { BuilderContext } from '@angular-devkit/architect';
-import { NgDocStyleType } from '../types';
+import { NgDocStyleType } from '@ng-doc/core';
 import { NgDocSchema } from './schema';
 export interface NgDocBuilderContext {
     tsConfig: string;
     options: NgDocSchema;
     context: BuilderContext;
     inlineStyleLanguage: NgDocStyleType;
+    pagesPaths: string[];
     assetsPath: string;
     buildPath: string;
     apiPath: string;
-    modulesPath: string;
+    guidesPath: string;
 }

package/interfaces/index.d.ts

@@ -1,20 +1,9 @@
 export * from './action-output';
-export * from './api';
-export * from './api-list';
-export * from './api-list-item';
-export * from './api-scope';
 export * from './asset';
 export * from './builder-context';
 export * from './built-output';
-export * from './category';
-export * from './dependencies';
 export * from './keyword-map';
-export * from './page';
 export * from './page-index';
 export * from './path-anchor';
-export * from './playground';
-export * from './playground-config';
-export * from './playground-data';
-export * from './playground-dynamic-content';
 export * from './renderer-options';
 export * from './schema';

package/interfaces/index.js

@@ -2,23 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./action-output"), exports);
-tslib_1.__exportStar(require("./api"), exports);
-tslib_1.__exportStar(require("./api-list"), exports);
-tslib_1.__exportStar(require("./api-list-item"), exports);
-tslib_1.__exportStar(require("./api-scope"), exports);
 tslib_1.__exportStar(require("./asset"), exports);
 tslib_1.__exportStar(require("./builder-context"), exports);
 tslib_1.__exportStar(require("./built-output"), exports);
-tslib_1.__exportStar(require("./category"), exports);
-tslib_1.__exportStar(require("./dependencies"), exports);
 tslib_1.__exportStar(require("./keyword-map"), exports);
-tslib_1.__exportStar(require("./page"), exports);
 tslib_1.__exportStar(require("./page-index"), exports);
 tslib_1.__exportStar(require("./path-anchor"), exports);
-tslib_1.__exportStar(require("./playground"), exports);
-tslib_1.__exportStar(require("./playground-config"), exports);
-tslib_1.__exportStar(require("./playground-data"), exports);
-tslib_1.__exportStar(require("./playground-dynamic-content"), exports);
 tslib_1.__exportStar(require("./renderer-options"), exports);
 tslib_1.__exportStar(require("./schema"), exports);
 //# sourceMappingURL=index.js.map

package/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,0DAAgC;AAChC,gDAAsB;AACtB,qDAA2B;AAC3B,0DAAgC;AAChC,sDAA4B;AAC5B,kDAAwB;AACxB,4DAAkC;AAClC,yDAA+B;AAC/B,qDAA2B;AAC3B,yDAA+B;AAC/B,wDAA8B;AAC9B,iDAAuB;AACvB,uDAA6B;AAC7B,wDAA8B;AAC9B,uDAA6B;AAC7B,8DAAoC;AACpC,4DAAkC;AAClC,uEAA6C;AAC7C,6DAAmC;AACnC,mDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../libs/builder/interfaces/index.ts"],"names":[],"mappings":";;;AAAA,0DAAgC;AAChC,kDAAwB;AACxB,4DAAkC;AAClC,yDAA+B;AAC/B,wDAA8B;AAC9B,uDAA6B;AAC7B,wDAA8B;AAC9B,6DAAmC;AACnC,mDAAyB"}

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/interfaces/renderer-options.d.ts

@@ -1,4 +1,6 @@
+import { ObservableSet } from '../classes';
 export interface NgDocRendererOptions<T> {
     scope?: string;
-    overrideContext?: T;
+    dependenciesStore?: ObservableSet<string>;
+    context?: T;
 }

package/interfaces/schema.d.ts

@@ -1,7 +1,8 @@
 import { NgDocGlobalKeyword } from './keyword-map';
 export interface NgDocSchema {
     browserTarget: string;
-    ngDoc: NgDocConfiguration;
+    main: string;
+    ngDoc?: NgDocConfiguration;
 }
 /**
  * NgDoc configuration interface, that configure NgDoc library
@@ -10,7 +11,7 @@ export interface NgDocConfiguration {
     /**
      * List of paths to your documentation location (e.g. "src/app")
      */
-    pages: string | string[];
+    pages?: string | string[];
     /**
      * Route prefix uses to add some additional route segment before documentation pages,
      * you can use it e.g. to wrap documentation with additional route like "docs".
@@ -20,7 +21,7 @@ export interface NgDocConfiguration {
      * Tag for of the current target, you can use it in conjunction with the `onlyForTags` field in your pages to
      * hide pages for certain documentation builds
      */
-    tag: string;
+    tag?: string;
     /**
      * List of the global keywords, to create link to foreign websites
      */

package/operators/buffer-debounce.js

@@ -8,8 +8,8 @@ const operators_1 = require("rxjs/operators");
  */
 function bufferDebounce(duration) {
     return (source) => {
-        let buffer = [];
-        return source.pipe((0, operators_1.tap)((value) => buffer.push(value)), (0, operators_1.debounceTime)(duration), (0, operators_1.map)(() => buffer), (0, operators_1.tap)(() => (buffer = [])));
+        const sharedSource = source.pipe((0, operators_1.share)());
+        return sharedSource.pipe((0, operators_1.buffer)(sharedSource.pipe((0, operators_1.debounceTime)(duration))));
     };
 }
 exports.bufferDebounce = bufferDebounce;

package/operators/buffer-debounce.js.map

@@ -1 +1 @@
-{"version":3,"file":"buffer-debounce.js","sourceRoot":"","sources":["../../../../libs/builder/operators/buffer-debounce.ts"],"names":[],"mappings":";;;AACA,8CAAsD;AAEtD;;;GAGG;AACH,SAAgB,cAAc,CAAI,QAAgB;IACjD,OAAO,CAAC,MAAqB,EAAE,EAAE;QAChC,IAAI,MAAM,GAAQ,EAAE,CAAC;QAErB,OAAO,MAAM,CAAC,IAAI,CACjB,IAAA,eAAG,EAAC,CAAC,KAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EACrC,IAAA,wBAAY,EAAC,QAAQ,CAAC,EACtB,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,EACjB,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CACxB,CAAC;IACH,CAAC,CAAC;AACH,CAAC;AAXD,wCAWC"}
+{"version":3,"file":"buffer-debounce.js","sourceRoot":"","sources":["../../../../libs/builder/operators/buffer-debounce.ts"],"names":[],"mappings":";;;AACA,8CAA2D;AAE3D;;;GAGG;AACH,SAAgB,cAAc,CAAI,QAAgB;IACjD,OAAO,CAAC,MAAqB,EAAE,EAAE;QAChC,MAAM,YAAY,GAAkB,MAAM,CAAC,IAAI,CAAC,IAAA,iBAAK,GAAE,CAAC,CAAC;QAEzD,OAAO,YAAY,CAAC,IAAI,CAAC,IAAA,kBAAM,EAAC,YAAY,CAAC,IAAI,CAAC,IAAA,wBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,CAAC,CAAC;AACH,CAAC;AAND,wCAMC"}

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@ng-doc/builder",
-  "version": "15.0.0-beta.9",
+  "version": "15.0.0",
   "type": "commonjs",
   "builders": "./builders.json",
   "schematics": "./schematics/collection.json",
-  "peerDependencies": {
-    "@angular-devkit/architect": "^0.1303.5",
+  "dependencies": {
+    "@ng-doc/core": "15.0.0",
+    "@angular-devkit/architect": ">=0.1500.0",
     "chokidar": "^3.5.3",
     "minimatch": "^5.1.0",
     "rxjs": "^6.6.7",
@@ -22,14 +23,32 @@
     "rehype-highlight": "^4.1.0",
     "rehype-slug": "^4.0.0",
     "highlight.js": "^11.5.1",
+    "raw-loader": "^4.0.2",
     "@microsoft/tsdoc": "^0.14.2"
   },
-  "dependencies": {
-    "@ng-doc/core": "15.0.0-beta.9"
-  },
   "publishConfig": {
     "access": "public"
   },
   "main": "./index.js",
-  "types": "./index.d.ts"
+  "types": "./index.d.ts",
+  "keywords": [
+    "angular",
+    "documentation",
+    "generator",
+    "builder",
+    "guides",
+    "api",
+    "demo",
+    "ng-doc"
+  ],
+  "author": "Skoropad Aleksandr <alex@skoropad.dev>",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/skoropadas/ng-doc.git"
+  },
+  "bugs": {
+    "url": "https://github.com/skoropadas/ng-doc/issues"
+  },
+  "homepage": "https://ng-doc.com/",
+  "license": "MIT"
 }

package/schematics/api/files/ng-doc.api.ts.template

@@ -1,4 +1,4 @@
-import {NgDocApi} from '@ng-doc/builder';
+import {NgDocApi} from '@ng-doc/core';
 
 const Api: NgDocApi = {
 	title: 'API',

package/schematics/api/schema.json

@@ -7,7 +7,10 @@
 		"path": {
 			"type": "string",
 			"format": "path",
-			"description": "The path to create the simple schematic within.",
+			"$default": {
+				"$source": "workingDirectory"
+			},
+			"description": "The path at which to create the entity file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
 			"visible": false
 		}
 	}

package/schematics/category/files/ng-doc.category.ts.template

@@ -1,4 +1,4 @@
-import {NgDocCategory} from '@ng-doc/builder';<% if (importPath && categoryName) { %>
+import {NgDocCategory} from '@ng-doc/core';<% if (importPath && categoryName) { %>
 import <%= categoryName %> from '<%= importPath %>';<% } %>
 
 const <%= constantName %>: NgDocCategory = {

package/schematics/category/index.js

@@ -16,9 +16,8 @@ const utils_1 = require("../utils");
 function build(options) {
     return (host) => {
         const path = (0, path_1.join)(options.path, `/${(0, strings_1.dasherize)(options.title)}`);
-        const rootFolder = process.cwd();
         const closestCategoryFile = options.category
-            ? (0, helpers_1.findClosestFile)(rootFolder, options.path, engine_1.CATEGORY_NAME)
+            ? (0, helpers_1.findClosestFile)(options.path, engine_1.CATEGORY_NAME)
             : null;
         const categoryConstantName = options.category && closestCategoryFile ? (0, utils_1.extractDefaultExportName)(closestCategoryFile) : null;
         const categoryImportPath = closestCategoryFile

package/schematics/category/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/category/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAYoC;AACpC,+BAAoC;AAEpC,yCAA2C;AAC3C,2CAA8C;AAC9C,oCAAkD;AAGlD;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAiC;IACtD,OAAO,CAAC,IAAU,EAAE,EAAE;QACrB,MAAM,IAAI,GAAW,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,UAAU,GAAW,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,MAAM,mBAAmB,GAAkB,OAAO,CAAC,QAAQ;YAC1D,CAAC,CAAC,IAAA,yBAAe,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,sBAAa,CAAC;YAC1D,CAAC,CAAC,IAAI,CAAC;QACR,MAAM,oBAAoB,GACzB,OAAO,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAA,gCAAwB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChG,MAAM,kBAAkB,GAAkB,mBAAmB;YAC5D,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC;QAER,OAAO,CAAC,YAAY,GAAG,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;QAE5D,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,2BAAc,EAAC,EAAC,GAAG,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,kBAAkB,EAAC,CAAC;gBAChG,IAAA,iBAAI,EAAC,IAAI,CAAC;gBACV,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA/BD,sBA+BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/category/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAYoC;AACpC,+BAAoC;AAEpC,yCAA2C;AAC3C,2CAA8C;AAC9C,oCAAkD;AAGlD;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAiC;IACtD,OAAO,CAAC,IAAU,EAAE,EAAE;QACrB,MAAM,IAAI,GAAW,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,mBAAmB,GAAkB,OAAO,CAAC,QAAQ;YAC1D,CAAC,CAAC,IAAA,yBAAe,EAAC,OAAO,CAAC,IAAI,EAAE,sBAAa,CAAC;YAC9C,CAAC,CAAC,IAAI,CAAC;QACR,MAAM,oBAAoB,GACzB,OAAO,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAA,gCAAwB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChG,MAAM,kBAAkB,GAAkB,mBAAmB;YAC5D,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC;QAER,OAAO,CAAC,YAAY,GAAG,GAAG,IAAA,kBAAQ,EAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC;QAE5D,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,2BAAc,EAAC,EAAC,GAAG,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,UAAU,EAAE,kBAAkB,EAAC,CAAC;gBAChG,IAAA,iBAAI,EAAC,IAAI,CAAC;gBACV,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA9BD,sBA8BC"}

package/schematics/category/schema.json

@@ -4,6 +4,15 @@
 	"title": "NgDocPage schematic",
 	"type": "object",
 	"properties": {
+		"path": {
+			"type": "string",
+			"format": "path",
+			"$default": {
+				"$source": "workingDirectory"
+			},
+			"description": "The path at which to create the entity file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
+			"visible": false
+		},
 		"title": {
 			"type": "string",
 			"description": "The title of the page.",
@@ -16,20 +25,12 @@
 		"route": {
 			"type": "string",
 			"description": "The route of the page",
-			"alias": "r",
-			"x-prompt": "The route of the category (its directory name by default, e.g. \"getting-started\")."
-		},
-		"path": {
-			"type": "string",
-			"format": "path",
-			"description": "The path to create the simple schematic within.",
-			"visible": false
+			"alias": "r"
 		},
 		"category": {
 			"type": "boolean",
 			"description": "Automatically import the category.",
-			"alias": "c",
-			"x-prompt": "Do you want to automatically import closest category?"
+			"alias": "c"
 		},
 		"order": {
 			"type": "boolean",

package/schematics/dependencies/files/ng-doc.dependencies.ts.template

@@ -1,5 +1,5 @@
-import {NgDocDependencies} from '@ng-doc/builder';
-import {NgDocPageModule} from './ng-doc.module';
+import {NgDocDependencies} from '@ng-doc/core';<% if (module) { %>
+import {<%= pageName %>Module} from './ng-doc.module';<% } %>
 
 const <%= pageName %>Dependencies: NgDocDependencies = {<% if (module) { %>
 	module: <%= pageName %>Module,<% } %>

package/schematics/dependencies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/dependencies/index.ts"],"names":[],"mappings":";;;;AAAA,2DAaoC;AACpC,qDAA8C;AAE9C,yCAAuC;AACvC,oCAAkD;AAGlD,MAAM,aAAa,GAAa,CAAC,2BAA2B,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAqC;IAC1D,OAAO,CAAC,IAAU,EAAE,EAAE;;QACrB,MAAM,QAAQ,GAAW,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAS,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAW,MAAA,IAAA,gCAAwB,EAAC,QAAQ,CAAC,mCAAI,MAAM,CAAC;QAEtE,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,mBAAM,EACL,CAAC,IAAY,EAAE,EAAE,CAChB,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;oBAC1D,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CACxC;gBACD,IAAA,2BAAc,EAAC,EAAC,GAAG,OAAO,EAAE,QAAQ,EAAC,CAAC;gBACtC,IAAA,iBAAI,EAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA1BD,sBA0BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/dependencies/index.ts"],"names":[],"mappings":";;;;AAAA,2DAaoC;AACpC,qDAAoC;AAEpC,yCAAuC;AACvC,oCAAkD;AAGlD,MAAM,aAAa,GAAa,CAAC,2BAA2B,CAAC,CAAC;AAE9D;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAAqC;IAC1D,OAAO,CAAC,IAAU,EAAE,EAAE;;QACrB,MAAM,QAAQ,GAAW,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,kBAAS,CAAC,CAAC;QAC5D,MAAM,QAAQ,GAAW,MAAA,IAAA,gCAAwB,EAAC,QAAQ,CAAC,mCAAI,MAAM,CAAC;QAEtE,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,mBAAM,EACL,CAAC,IAAY,EAAE,EAAE,CAChB,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC;oBAC1D,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CACxC;gBACD,IAAA,2BAAc,EAAC,EAAC,GAAG,OAAO,EAAE,QAAQ,EAAC,CAAC;gBACtC,IAAA,iBAAI,EAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA1BD,sBA0BC"}

package/schematics/dependencies/schema.json

@@ -12,7 +12,10 @@
 		"path": {
 			"type": "string",
 			"format": "path",
-			"description": "The path to create the simple schematic within.",
+			"$default": {
+				"$source": "workingDirectory"
+			},
+			"description": "The path at which to create the entity file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
 			"visible": false
 		}
 	}

package/schematics/page/files/index.md.template

@@ -1,3 +1,3 @@
-# {{ ngDocPage.title }}
+# {{ NgDocPage.title }}
 
 It's time to write some awesome docs!

package/schematics/page/files/ng-doc.dependencies.ts.template

@@ -1,4 +1,4 @@
-import {NgDocDependencies} from '@ng-doc/builder';
+import {NgDocDependencies} from '@ng-doc/core';
 import {<%= pageName %>Module} from './ng-doc.module';
 
 const <%= pageName %>Dependencies: NgDocDependencies = {

package/schematics/page/files/ng-doc.module.ts.template

@@ -5,7 +5,5 @@ import {CommonModule} from '@angular/common';
 	imports: [CommonModule],
 	// Declare you demo components here
 	declarations: [],
-	// And export them
-	exports: []
 })
 export class <%= pageName %>Module {}

package/schematics/page/files/ng-doc.page.ts.template

@@ -1,4 +1,4 @@
-import {NgDocPage} from '@ng-doc/builder';<% if (importPath && categoryName) { %>
+import {NgDocPage} from '@ng-doc/core';<% if (importPath && categoryName) { %>
 import <%= categoryName %> from '<%= importPath %>';<% } %>
 
 const <%= pageName %>: NgDocPage = {

package/schematics/page/index.js

@@ -17,9 +17,8 @@ const demoTemplates = ['ng-doc.module.ts.template', 'ng-doc.dependencies.ts.temp
 function build(options) {
     return (host) => {
         const path = (0, path_1.join)(options.path, `/${(0, strings_1.dasherize)(options.title)}`);
-        const rootFolder = process.cwd();
         const closestCategoryFile = options.category
-            ? (0, helpers_1.findClosestFile)(rootFolder, options.path, engine_1.CATEGORY_NAME)
+            ? (0, helpers_1.findClosestFile)(options.path, engine_1.CATEGORY_NAME)
             : null;
         const pageName = (0, strings_1.classify)(options.title);
         const categoryConstantName = options.category && closestCategoryFile ? (0, utils_1.extractDefaultExportName)(closestCategoryFile) : null;

package/schematics/page/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/page/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAaoC;AACpC,+BAA8C;AAE9C,yCAA2C;AAC3C,2CAA8C;AAC9C,oCAAkD;AAGlD,MAAM,aAAa,GAAa,CAAC,2BAA2B,EAAE,iCAAiC,CAAC,CAAC;AAEjG;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAA6B;IAClD,OAAO,CAAC,IAAU,EAAE,EAAE;QACrB,MAAM,IAAI,GAAW,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,UAAU,GAAW,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,MAAM,mBAAmB,GAAkB,OAAO,CAAC,QAAQ;YAC1D,CAAC,CAAC,IAAA,yBAAe,EAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,sBAAa,CAAC;YAC1D,CAAC,CAAC,IAAI,CAAC;QACR,MAAM,QAAQ,GAAW,IAAA,kBAAQ,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,oBAAoB,GACzB,OAAO,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAA,gCAAwB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChG,MAAM,kBAAkB,GAAkB,mBAAmB;YAC5D,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC;QAER,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,mBAAM,EACL,CAAC,IAAY,EAAE,EAAE,CAChB,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;oBACxD,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CACxC;gBACD,IAAA,2BAAc,EAAC;oBACd,GAAG,OAAO;oBACV,YAAY,EAAE,oBAAoB;oBAClC,UAAU,EAAE,kBAAkB;oBAC9B,QAAQ;oBACR,OAAO,EAAE,OAAO,CAAC,OAAO;iBACxB,CAAC;gBACF,IAAA,iBAAI,EAAC,IAAI,CAAC;gBACV,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAzCD,sBAyCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/builder/schematics/page/index.ts"],"names":[],"mappings":";;;AAAA,oEAA2E;AAC3E,2DAaoC;AACpC,+BAA8C;AAE9C,yCAA2C;AAC3C,2CAA8C;AAC9C,oCAAkD;AAGlD,MAAM,aAAa,GAAa,CAAC,2BAA2B,EAAE,iCAAiC,CAAC,CAAC;AAEjG;;;;;GAKG;AACH,SAAgB,KAAK,CAAC,OAA6B;IAClD,OAAO,CAAC,IAAU,EAAE,EAAE;QACrB,MAAM,IAAI,GAAW,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,IAAA,mBAAS,EAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,MAAM,mBAAmB,GAAkB,OAAO,CAAC,QAAQ;YAC1D,CAAC,CAAC,IAAA,yBAAe,EAAC,OAAO,CAAC,IAAI,EAAE,sBAAa,CAAC;YAC9C,CAAC,CAAC,IAAI,CAAC;QACR,MAAM,QAAQ,GAAW,IAAA,kBAAQ,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,oBAAoB,GACzB,OAAO,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAA,gCAAwB,EAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChG,MAAM,kBAAkB,GAAkB,mBAAmB;YAC5D,CAAC,CAAC,IAAA,eAAQ,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACzD,CAAC,CAAC,IAAI,CAAC;QAER,OAAO,IAAA,kBAAK,EAAC;YACZ,IAAA,sBAAS,EACR,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,SAAS,CAAC,EAAE;gBACrB,IAAA,mBAAM,EACL,CAAC,IAAY,EAAE,EAAE,CAChB,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC;oBACxD,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CACxC;gBACD,IAAA,2BAAc,EAAC;oBACd,GAAG,OAAO;oBACV,YAAY,EAAE,oBAAoB;oBAClC,UAAU,EAAE,kBAAkB;oBAC9B,QAAQ;oBACR,OAAO,EAAE,OAAO,CAAC,OAAO;iBACxB,CAAC;gBACF,IAAA,iBAAI,EAAC,IAAI,CAAC;gBACV,IAAA,oBAAO,EAAC,CAAC,SAAoB,EAAE,EAAE;oBAChC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;wBAChC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;qBAClD;oBACD,OAAO,SAAS,CAAC;gBAClB,CAAC,CAAC;aACF,CAAC,EACF,0BAAa,CAAC,SAAS,CACvB;SACD,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAxCD,sBAwCC"}

package/schematics/page/schema.json

@@ -4,6 +4,15 @@
 	"title": "NgDocPage schematic",
 	"type": "object",
 	"properties": {
+		"path": {
+			"type": "string",
+			"format": "path",
+			"$default": {
+				"$source": "workingDirectory"
+			},
+			"description": "The path at which to create the entity file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
+			"visible": false
+		},
 		"title": {
 			"type": "string",
 			"description": "The title of the page.",
@@ -16,31 +25,22 @@
 		"route": {
 			"type": "string",
 			"description": "The route of the page",
-			"alias": "r",
-			"x-prompt": "The route of the page (its directory name by default, e.g. \"getting-started\")."
+			"alias": "r"
 		},
 		"demo": {
 			"type": "boolean",
 			"description": "Generate module and page dependency file for demos.",
-			"alias": "d",
-			"x-prompt": "Are you going to create demos?"
+			"alias": "d"
 		},
 		"category": {
 			"type": "boolean",
 			"description": "Automatically import the category.",
-			"alias": "c",
-			"x-prompt": "Do you want to automatically import closest category?"
+			"alias": "c"
 		},
 		"order": {
 			"type": "boolean",
 			"description": "Order page in sidebar",
 			"alias": "o"
-		},
-		"path": {
-			"type": "string",
-			"format": "path",
-			"description": "The path to create the simple schematic within.",
-			"visible": false
 		}
 	}
 }

package/templates/api/base.html.nunj

@@ -1,4 +1,5 @@
 {% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
+{% import "helpers/no-content.html.nunj" as noContentMacro %}
 
 <header>
 	{% include "parts/page-tags.html.nunj" %}
@@ -10,7 +11,7 @@
 <section>
 	{% set description = docNode | extractDocs %}
 
-	{{ description if description else 'No documentation has been provided.' }}
+	{{ description if description else noContentMacro.render('No documentation has been provided.') }}
 </section>
 
 {% include "parts/see-also.html.nunj" %}

package/templates/api/class.html.nunj

@@ -1,13 +1,14 @@
 {% 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 %}
+{% import "helpers/accessors.html.nunj" as accessorsMacro %}
 {% import "helpers/modifier.html.nunj" as modifierMacro %}
 
 {% block modifier %}
-	{{ modifierMacro.render('Abstract') }}
+	{{ modifierMacro.render('abstract') if declaration.isAbstract() }}
 {% endblock %}
 
 {% block details %}
@@ -18,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>
@@ -31,36 +32,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"]) | 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) -%}
+	{%- 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 -%}