@ng-doc/builder 15.1.0 → 15.2.0
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/builder.d.ts +0 -1
- package/engine/builder.js +8 -8
- package/engine/builder.js.map +1 -1
- package/package.json +2 -2
package/engine/builder.d.ts
CHANGED
|
@@ -12,7 +12,6 @@ export declare class NgDocBuilder {
|
|
|
12
12
|
readonly renderer: NgDocRenderer;
|
|
13
13
|
private readonly compiledProject;
|
|
14
14
|
readonly project: Project;
|
|
15
|
-
private readonly watcher;
|
|
16
15
|
constructor(context: NgDocBuilderContext);
|
|
17
16
|
run(): Observable<void>;
|
|
18
17
|
get(id: string, canBeBuilt?: boolean): NgDocEntity | undefined;
|
package/engine/builder.js
CHANGED
|
@@ -31,7 +31,10 @@ class NgDocBuilder {
|
|
|
31
31
|
},
|
|
32
32
|
});
|
|
33
33
|
this.project = (0, helpers_1.createProject)({ tsConfigFilePath: this.context.tsConfig });
|
|
34
|
-
|
|
34
|
+
}
|
|
35
|
+
run() {
|
|
36
|
+
fs.rmSync(this.context.buildPath, { recursive: true, force: true });
|
|
37
|
+
const watcher = new watcher_1.NgDocWatcher(this.context.pagesPaths
|
|
35
38
|
.map((pagesPath) => [
|
|
36
39
|
path.join(pagesPath, variables_1.PAGE_PATTERN),
|
|
37
40
|
path.join(pagesPath, variables_1.CATEGORY_PATTERN),
|
|
@@ -39,10 +42,7 @@ class NgDocBuilder {
|
|
|
39
42
|
path.join(pagesPath, variables_1.API_PATTERN),
|
|
40
43
|
])
|
|
41
44
|
.flat());
|
|
42
|
-
|
|
43
|
-
run() {
|
|
44
|
-
fs.rmSync(this.context.buildPath, { recursive: true, force: true });
|
|
45
|
-
const entities = (0, rxjs_1.merge)((0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, this.watcher, variables_1.PAGE_PATTERN, entities_1.NgDocPageEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, this.watcher, variables_1.CATEGORY_PATTERN, entities_1.NgDocCategoryEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, this.watcher, variables_1.PAGE_DEPENDENCY_PATTERN, entities_1.NgDocDependenciesEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, 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)());
|
|
45
|
+
const entities = (0, rxjs_1.merge)((0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, watcher, variables_1.PAGE_PATTERN, entities_1.NgDocPageEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, watcher, variables_1.CATEGORY_PATTERN, entities_1.NgDocCategoryEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, watcher, variables_1.PAGE_DEPENDENCY_PATTERN, entities_1.NgDocDependenciesEntity), (0, entity_life_cycle_1.entityLifeCycle)(this, this.compiledProject, watcher, variables_1.API_PATTERN, entities_1.NgDocApiEntity)).pipe((0, buffer_until_once_1.bufferUntilOnce)(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)());
|
|
46
46
|
return entities.pipe((0, operators_1.tap)(() => this.context.context.reportRunning()), (0, operators_1.mergeMap)((entities) => {
|
|
47
47
|
/*
|
|
48
48
|
Refresh and compile source files for all not destroyed entities
|
|
@@ -64,10 +64,10 @@ class NgDocBuilder {
|
|
|
64
64
|
// Watch for dependency changes of non-destroyed entities
|
|
65
65
|
entity.destroyed
|
|
66
66
|
? (0, rxjs_1.of)(entity)
|
|
67
|
-
: entity.dependencies.changes().pipe((0, operators_1.switchMap)((dependencies) =>
|
|
67
|
+
: entity.dependencies.changes().pipe((0, operators_1.switchMap)((dependencies) => watcher
|
|
68
68
|
.watch(dependencies)
|
|
69
69
|
.onChange(...dependencies)
|
|
70
|
-
.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(),
|
|
70
|
+
.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(), watcher.onChange(...entity.rootFiles))))))
|
|
71
71
|
: (0, rxjs_1.of)(null)));
|
|
72
72
|
}), (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); }),
|
|
73
73
|
// Build touched entities and their dependencies
|
|
@@ -85,7 +85,7 @@ class NgDocBuilder {
|
|
|
85
85
|
}))), (0, operators_1.mapTo)(void 0), (0, operators_1.catchError)((e) => {
|
|
86
86
|
this.context.context.logger.error(`NgDoc error: ${e.message}\n${e.stack}`);
|
|
87
87
|
return (0, rxjs_1.of)(void 0);
|
|
88
|
-
}));
|
|
88
|
+
}), (0, operators_1.finalize)(() => watcher.close()));
|
|
89
89
|
}
|
|
90
90
|
get(id, canBeBuilt) {
|
|
91
91
|
const entity = this.entities.get(id);
|
package/engine/builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../libs/builder/engine/builder.ts"],"names":[],"mappings":";;;;AAAA,uCAAuC;AACvC,+CAAyB;AACzB,mDAA6B;AAC7B,+BAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../libs/builder/engine/builder.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-doc/builder",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.2.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"builders": "./builders.json",
|
|
6
6
|
"schematics": "./schematics/collection.json",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@ng-doc/core": "15.
|
|
8
|
+
"@ng-doc/core": "15.2.0",
|
|
9
9
|
"@angular-devkit/architect": ">=0.1500.0",
|
|
10
10
|
"chokidar": "^3.5.3",
|
|
11
11
|
"minimatch": "^5.1.0",
|