@ng-doc/builder 15.0.0-beta.25 → 15.0.0-beta.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/engine/.cache/libs/builder/engine/builder.js +2 -2
- package/engine/.cache/libs/builder/engine/entity-life-cycle.js +10 -4
- package/engine/builder.js +2 -2
- package/engine/builder.js.map +1 -1
- package/engine/entity-life-cycle.js +10 -4
- package/engine/entity-life-cycle.js.map +1 -1
- package/package.json +2 -2
- package/schematics/page/files/ng-doc.module.ts.template +0 -2
- package/templates/api/base.html.nunj +2 -1
- package/templates/api/class.html.nunj +1 -1
- package/templates/helpers/declaration-modifiers.html.nunj +7 -3
- package/templates/helpers/method.html.nunj +2 -1
- package/templates/helpers/no-content.html.nunj +3 -0
|
@@ -39,7 +39,7 @@ class NgDocBuilder {
|
|
|
39
39
|
}
|
|
40
40
|
run() {
|
|
41
41
|
fs.rmSync(this.context.buildPath, { recursive: true, force: true });
|
|
42
|
-
const entities = (0, rxjs_1.merge)((0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_PATTERN, entities_1.NgDocPageEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.CATEGORY_PATTERN, entities_1.NgDocCategoryEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_DEPENDENCY_PATTERN, entities_1.NgDocDependenciesEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.API_PATTERN, entities_1.NgDocApiEntity)).pipe((0, buffer_until_once_1.bufferUntilOnce)(this.watcher.onReady()), (0, operators_1.map)((entities) => entities.flat()), (0, operators_1.share)());
|
|
42
|
+
const entities = (0, rxjs_1.merge)((0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_PATTERN, entities_1.NgDocPageEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.CATEGORY_PATTERN, entities_1.NgDocCategoryEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_DEPENDENCY_PATTERN, entities_1.NgDocDependenciesEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.API_PATTERN, entities_1.NgDocApiEntity)).pipe((0, buffer_until_once_1.bufferUntilOnce)(this.watcher.onReady()), (0, operators_1.map)((entities) => entities.flat()), (0, operators_2.bufferDebounce)(100), (0, operators_1.map)((entities) => entities.flat()), (0, operators_1.share)());
|
|
43
43
|
return entities.pipe((0, operators_1.tap)(() => this.context.context.reportRunning()), (0, operators_1.mergeMap)((entities) => {
|
|
44
44
|
/*
|
|
45
45
|
Refresh and compile source files for all not destroyed entities
|
|
@@ -62,7 +62,7 @@ class NgDocBuilder {
|
|
|
62
62
|
.onChange(...dependencies)
|
|
63
63
|
.pipe((0, operators_1.tap)(() => entity.dependenciesChanged()))), (0, operators_1.startWith)(null), (0, operators_1.mapTo)(entity), (0, operators_1.takeUntil)((0, rxjs_1.merge)(entity.onDestroy(), this.watcher.onChange(...entity.rootFiles))))))
|
|
64
64
|
: (0, rxjs_1.of)(null)));
|
|
65
|
-
}), (0, operators_2.bufferDebounce)(
|
|
65
|
+
}), (0, operators_2.bufferDebounce)(500), (0, operators_1.map)((entities) => entities.filter(core_1.isPresent)), (0, operators_1.tap)(() => { var _a; return this.entities.updateKeywordMap((_a = this.context.options.ngDoc) === null || _a === void 0 ? void 0 : _a.keywords); }),
|
|
66
66
|
// Build touched entities and their dependencies
|
|
67
67
|
(0, operators_1.concatMap)((entities) => (0, fork_join_or_empty_1.forkJoinOrEmpty)((0, build_candidates_1.buildCandidates)(entities).map((entity) => entity.destroyed ? (0, rxjs_1.of)([]) : entity.buildArtifacts())).pipe((0, operators_1.switchMap)((output) => this.skeleton
|
|
68
68
|
.buildArtifacts()
|
|
@@ -12,15 +12,21 @@ const operators_1 = require("rxjs/operators");
|
|
|
12
12
|
* @param EntityConstructor
|
|
13
13
|
*/
|
|
14
14
|
function entityLifeCycle(builder, project, watcher, path, EntityConstructor) {
|
|
15
|
-
return watcher.onAdd(path).pipe((0, operators_1.map)((p) => new EntityConstructor(builder, project.addSourceFileAtPath(p), builder.context)), (0, operators_1.mergeMap)((entity) => childGenerator(entity
|
|
15
|
+
return watcher.onAdd(path).pipe((0, operators_1.map)((p) => new EntityConstructor(builder, project.addSourceFileAtPath(p), builder.context)), (0, operators_1.mergeMap)((entity) => childGenerator(entity, watcher)));
|
|
16
16
|
}
|
|
17
17
|
exports.entityLifeCycle = entityLifeCycle;
|
|
18
18
|
/**
|
|
19
19
|
*
|
|
20
20
|
* @param entity
|
|
21
|
+
* @param watcher
|
|
21
22
|
*/
|
|
22
|
-
function childGenerator(entity) {
|
|
23
|
-
return
|
|
23
|
+
function childGenerator(entity, watcher) {
|
|
24
|
+
return (0, rxjs_1.merge)(watcher
|
|
25
|
+
.watch(entity.rootFiles)
|
|
26
|
+
.onChange(...entity.rootFiles)
|
|
27
|
+
.pipe((0, operators_1.takeUntil)(entity.onDestroy())), watcher.onUnlink(...entity.rootFiles).pipe((0, operators_1.tap)(() => entity.destroy()), (0, operators_1.take)(1))).pipe((0, operators_1.startWith)(entity), (0, operators_1.switchMap)(() => entity.destroyed
|
|
24
28
|
? (0, rxjs_1.of)([entity])
|
|
25
|
-
:
|
|
29
|
+
: entity.childrenGenerator().pipe((0, operators_1.switchMap)((children) => children.length
|
|
30
|
+
? (0, rxjs_1.merge)(...children.map((child) => childGenerator(child, watcher)))
|
|
31
|
+
: (0, rxjs_1.of)([])), (0, operators_1.map)((children) => [entity, ...children]), (0, operators_1.tap)((entities) => entities.forEach((e) => entity.builder.entities.set(e.id, e))))));
|
|
26
32
|
}
|
package/engine/builder.js
CHANGED
|
@@ -40,7 +40,7 @@ class NgDocBuilder {
|
|
|
40
40
|
}
|
|
41
41
|
run() {
|
|
42
42
|
fs.rmSync(this.context.buildPath, { recursive: true, force: true });
|
|
43
|
-
const entities = (0, rxjs_1.merge)((0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_PATTERN, entities_1.NgDocPageEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.CATEGORY_PATTERN, entities_1.NgDocCategoryEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_DEPENDENCY_PATTERN, entities_1.NgDocDependenciesEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.API_PATTERN, entities_1.NgDocApiEntity)).pipe((0, buffer_until_once_1.bufferUntilOnce)(this.watcher.onReady()), (0, operators_1.map)((entities) => entities.flat()), (0, operators_1.share)());
|
|
43
|
+
const entities = (0, rxjs_1.merge)((0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_PATTERN, entities_1.NgDocPageEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.CATEGORY_PATTERN, entities_1.NgDocCategoryEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.PAGE_DEPENDENCY_PATTERN, entities_1.NgDocDependenciesEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.project, this.watcher, variables_1.API_PATTERN, entities_1.NgDocApiEntity)).pipe((0, buffer_until_once_1.bufferUntilOnce)(this.watcher.onReady()), (0, operators_1.map)((entities) => entities.flat()), (0, operators_2.bufferDebounce)(100), (0, operators_1.map)((entities) => entities.flat()), (0, operators_1.share)());
|
|
44
44
|
return entities.pipe((0, operators_1.tap)(() => this.context.context.reportRunning()), (0, operators_1.mergeMap)((entities) => {
|
|
45
45
|
/*
|
|
46
46
|
Refresh and compile source files for all not destroyed entities
|
|
@@ -63,7 +63,7 @@ class NgDocBuilder {
|
|
|
63
63
|
.onChange(...dependencies)
|
|
64
64
|
.pipe((0, operators_1.tap)(() => entity.dependenciesChanged()))), (0, operators_1.startWith)(null), (0, operators_1.mapTo)(entity), (0, operators_1.takeUntil)((0, rxjs_1.merge)(entity.onDestroy(), this.watcher.onChange(...entity.rootFiles))))))
|
|
65
65
|
: (0, rxjs_1.of)(null)));
|
|
66
|
-
}), (0, operators_2.bufferDebounce)(
|
|
66
|
+
}), (0, operators_2.bufferDebounce)(500), (0, operators_1.map)((entities) => entities.filter(core_1.isPresent)), (0, operators_1.tap)(() => { var _a; return this.entities.updateKeywordMap((_a = this.context.options.ngDoc) === null || _a === void 0 ? void 0 : _a.keywords); }),
|
|
67
67
|
// Build touched entities and their dependencies
|
|
68
68
|
(0, operators_1.concatMap)((entities) => (0, fork_join_or_empty_1.forkJoinOrEmpty)((0, build_candidates_1.buildCandidates)(entities).map((entity) => entity.destroyed ? (0, rxjs_1.of)([]) : entity.buildArtifacts())).pipe((0, operators_1.switchMap)((output) => this.skeleton
|
|
69
69
|
.buildArtifacts()
|
package/engine/builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../libs/builder/engine/builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../libs/builder/engine/builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,16 +12,22 @@ const operators_1 = require("rxjs/operators");
|
|
|
12
12
|
* @param EntityConstructor
|
|
13
13
|
*/
|
|
14
14
|
function entityLifeCycle(builder, project, watcher, path, EntityConstructor) {
|
|
15
|
-
return watcher.onAdd(path).pipe((0, operators_1.map)((p) => new EntityConstructor(builder, project.addSourceFileAtPath(p), builder.context)), (0, operators_1.mergeMap)((entity) => childGenerator(entity
|
|
15
|
+
return watcher.onAdd(path).pipe((0, operators_1.map)((p) => new EntityConstructor(builder, project.addSourceFileAtPath(p), builder.context)), (0, operators_1.mergeMap)((entity) => childGenerator(entity, watcher)));
|
|
16
16
|
}
|
|
17
17
|
exports.entityLifeCycle = entityLifeCycle;
|
|
18
18
|
/**
|
|
19
19
|
*
|
|
20
20
|
* @param entity
|
|
21
|
+
* @param watcher
|
|
21
22
|
*/
|
|
22
|
-
function childGenerator(entity) {
|
|
23
|
-
return
|
|
23
|
+
function childGenerator(entity, watcher) {
|
|
24
|
+
return (0, rxjs_1.merge)(watcher
|
|
25
|
+
.watch(entity.rootFiles)
|
|
26
|
+
.onChange(...entity.rootFiles)
|
|
27
|
+
.pipe((0, operators_1.takeUntil)(entity.onDestroy())), watcher.onUnlink(...entity.rootFiles).pipe((0, operators_1.tap)(() => entity.destroy()), (0, operators_1.take)(1))).pipe((0, operators_1.startWith)(entity), (0, operators_1.switchMap)(() => entity.destroyed
|
|
24
28
|
? (0, rxjs_1.of)([entity])
|
|
25
|
-
:
|
|
29
|
+
: entity.childrenGenerator().pipe((0, operators_1.switchMap)((children) => children.length
|
|
30
|
+
? (0, rxjs_1.merge)(...children.map((child) => childGenerator(child, watcher)))
|
|
31
|
+
: (0, rxjs_1.of)([])), (0, operators_1.map)((children) => [entity, ...children]), (0, operators_1.tap)((entities) => entities.forEach((e) => entity.builder.entities.set(e.id, e))))));
|
|
26
32
|
}
|
|
27
33
|
//# sourceMappingURL=entity-life-cycle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-life-cycle.js","sourceRoot":"","sources":["../../../../libs/builder/engine/entity-life-cycle.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"entity-life-cycle.js","sourceRoot":"","sources":["../../../../libs/builder/engine/entity-life-cycle.ts"],"names":[],"mappings":";;;AAAA,+BAA2C;AAC3C,8CAAyF;AAQzF;;;;;;;GAOG;AACH,SAAgB,eAAe,CAC9B,OAAqB,EACrB,OAAgB,EAChB,OAAqB,EACrB,IAAY,EACZ,iBAA6C;IAE7C,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAC9B,IAAA,eAAG,EAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,EACnG,IAAA,oBAAQ,EAAC,CAAC,MAAmB,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAClE,CAAC;AACH,CAAC;AAXD,0CAWC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,MAAmB,EAAE,OAAqB;IACjE,OAAO,IAAA,YAAK,EACX,OAAO;SACL,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC;SACvB,QAAQ,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;SAC7B,IAAI,CAAC,IAAA,qBAAS,EAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,EACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CACzC,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAC3B,IAAA,gBAAI,EAAC,CAAC,CAAC,CACP,CACD,CAAC,IAAI,CACL,IAAA,qBAAS,EAAC,MAAM,CAAC,EACjB,IAAA,qBAAS,EAAC,GAAG,EAAE,CACd,MAAM,CAAC,SAAS;QACf,CAAC,CAAC,IAAA,SAAE,EAAC,CAAC,MAAM,CAAC,CAAC;QACd,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAC/B,IAAA,qBAAS,EAAC,CAAC,QAAuB,EAAE,EAAE,CACrC,QAAQ,CAAC,MAAM;YACd,CAAC,CAAC,IAAA,YAAK,EAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;YAChF,CAAC,CAAC,IAAA,SAAE,EAAC,EAAE,CAAC,CACT,EACD,IAAA,eAAG,EAAC,CAAC,QAAuB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,EACvD,IAAA,eAAG,EAAC,CAAC,QAAuB,EAAE,EAAE,CAC/B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAC1E,CACA,CACJ,CACD,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-doc/builder",
|
|
3
|
-
"version": "15.0.0-beta.
|
|
3
|
+
"version": "15.0.0-beta.27",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"builders": "./builders.json",
|
|
6
6
|
"schematics": "./schematics/collection.json",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@ng-doc/core": "15.0.0-beta.
|
|
8
|
+
"@ng-doc/core": "15.0.0-beta.27",
|
|
9
9
|
"@angular-devkit/architect": ">=0.1500.0",
|
|
10
10
|
"chokidar": "^3.5.3",
|
|
11
11
|
"minimatch": "^5.1.0",
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
{% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
|
|
2
|
+
{% import "helpers/no-content.html.nunj" as noContentMacro %}
|
|
2
3
|
|
|
3
4
|
<header>
|
|
4
5
|
{% include "parts/page-tags.html.nunj" %}
|
|
@@ -10,7 +11,7 @@
|
|
|
10
11
|
<section>
|
|
11
12
|
{% set description = docNode | extractDocs %}
|
|
12
13
|
|
|
13
|
-
{{ description if description else 'No documentation has been provided.' }}
|
|
14
|
+
{{ description if description else noContentMacro.render('No documentation has been provided.') }}
|
|
14
15
|
</section>
|
|
15
16
|
|
|
16
17
|
{% include "parts/see-also.html.nunj" %}
|
|
@@ -7,32 +7,36 @@
|
|
|
7
7
|
{% set isStatic = declaration.isStatic and declaration.isStatic() %}
|
|
8
8
|
{% set isAsync = declaration.isAsync and declaration.isAsync() %}
|
|
9
9
|
{% set isReadonly = declaration.isReadonly and declaration.isReadonly() %}
|
|
10
|
+
{% set isOverriden = declaration.hasOverrideKeyword and declaration.hasOverrideKeyword() %}
|
|
10
11
|
|
|
11
12
|
{%- if type == 'badge' %}
|
|
12
|
-
{%- if isAbstract or isStatic or isAsync or isReadonly %}
|
|
13
|
+
{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
|
|
13
14
|
<span class="ng-doc-badge-wrapper">
|
|
14
15
|
{{ badgeMacro.render("Abstract") if isAbstract }}
|
|
15
16
|
{{ badgeMacro.render("Static") if isStatic }}
|
|
16
17
|
{{ badgeMacro.render("Async") if isAsync }}
|
|
18
|
+
{{ badgeMacro.render("Overriden") if isOverriden }}
|
|
17
19
|
{{ badgeMacro.render("Readonly") if isReadonly }}
|
|
18
20
|
</span>
|
|
19
21
|
{%- endif %}
|
|
20
22
|
|
|
21
23
|
{%- elseif type == 'modifier' %}
|
|
22
|
-
{%- if isAbstract or isStatic or isAsync or isReadonly %}
|
|
24
|
+
{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
|
|
23
25
|
<div class="ng-doc-modifiers-wrapper">
|
|
24
26
|
{{ modifierMacro.render("Abstract") if isAbstract }}
|
|
25
27
|
{{ modifierMacro.render("Static") if isStatic }}
|
|
26
28
|
{{ modifierMacro.render("Async") if isAsync }}
|
|
29
|
+
{{ modifierMacro.render("Overriden") if isOverriden }}
|
|
27
30
|
{{ modifierMacro.render("Readonly") if isReadonly }}
|
|
28
31
|
</div>
|
|
29
32
|
{%- endif %}
|
|
30
33
|
{%- else %}
|
|
31
|
-
{%- if isAbstract or isStatic or isAsync or isReadonly %}
|
|
34
|
+
{%- if isAbstract or isStatic or isAsync or isOverriden or isReadonly %}
|
|
32
35
|
<span class="ng-doc-tags-wrapper">
|
|
33
36
|
{{ tagMacro.render("abstract") if isAbstract }}
|
|
34
37
|
{{ tagMacro.render("static") if isStatic }}
|
|
35
38
|
{{ tagMacro.render("async") if isAsync }}
|
|
39
|
+
{{ tagMacro.render("overriden") if isOverriden }}
|
|
36
40
|
{{ tagMacro.render("readonly") if isReadonly }}
|
|
37
41
|
</span>
|
|
38
42
|
{%- endif %}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
{% import "helpers/declaration-modifiers.html.nunj" as tagsMacro %}
|
|
4
4
|
{% import "helpers/parameters.html.nunj" as parametersMacro %}
|
|
5
5
|
{% import "helpers/decorators.html.nunj" as decoratorsMacro %}
|
|
6
|
+
{% import "helpers/no-content.html.nunj" as noContentMacro %}
|
|
6
7
|
|
|
7
8
|
{% macro render(method) %}
|
|
8
9
|
{% set parameters = method.getParameters() %}
|
|
@@ -22,7 +23,7 @@
|
|
|
22
23
|
<td>
|
|
23
24
|
{% set description = method | extractDocs %}
|
|
24
25
|
|
|
25
|
-
{{ description if description else 'No documentation has been provided.' }}
|
|
26
|
+
{{ description if description else noContentMacro.render('No documentation has been provided.') }}
|
|
26
27
|
</td>
|
|
27
28
|
</tr>
|
|
28
29
|
<tr>
|