@ng-doc/builder 15.0.0-beta.21 → 15.0.0-beta.23
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/classes/observable-set.js +1 -1
- package/classes/observable-set.js.map +1 -1
- package/engine/.cache/libs/builder/classes/observable-set.js +1 -1
- package/engine/.cache/libs/builder/engine/builder.js +7 -6
- package/engine/.cache/libs/builder/engine/entities/abstractions/source-file.entity.js +11 -4
- package/engine/.cache/libs/builder/engine/entities/dependencies.entity.js +2 -2
- package/engine/.cache/libs/builder/engine/entities/page.entity.js +4 -7
- package/engine/.cache/libs/builder/engine/entity-life-cycle.js +2 -2
- package/engine/.cache/libs/builder/helpers/find-closest-file.js +1 -1
- package/engine/builder.d.ts +1 -1
- package/engine/builder.js +7 -6
- package/engine/builder.js.map +1 -1
- package/engine/entities/abstractions/source-file.entity.d.ts +5 -1
- package/engine/entities/abstractions/source-file.entity.js +11 -4
- package/engine/entities/abstractions/source-file.entity.js.map +1 -1
- package/engine/entities/dependencies.entity.js +2 -2
- package/engine/entities/dependencies.entity.js.map +1 -1
- package/engine/entities/page.entity.d.ts +2 -2
- package/engine/entities/page.entity.js +4 -7
- package/engine/entities/page.entity.js.map +1 -1
- package/engine/entity-life-cycle.js +2 -2
- package/engine/entity-life-cycle.js.map +1 -1
- package/helpers/find-closest-file.js +1 -1
- package/helpers/find-closest-file.js.map +1 -1
- package/package.json +2 -2
- package/schematics/category/schema.json +2 -4
- package/schematics/page/schema.json +3 -6
- package/templates/page.module.ts.nunj +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"observable-set.js","sourceRoot":"","sources":["../../../../libs/builder/classes/observable-set.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AACrC,+BAA+C;AAC/C,8CAAmC;AAEnC,MAAa,aAAa;IAA1B;QACS,eAAU,GAAW,IAAI,GAAG,EAAE,CAAC;QAC/B,aAAQ,GAAwB,IAAI,oBAAa,EAAQ,CAAC;IAoBnE,CAAC;IAlBA,OAAO;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,GAAG,CAAC,GAAG,MAAW;QACjB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"observable-set.js","sourceRoot":"","sources":["../../../../libs/builder/classes/observable-set.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AACrC,+BAA+C;AAC/C,8CAAmC;AAEnC,MAAa,aAAa;IAA1B;QACS,eAAU,GAAW,IAAI,GAAG,EAAE,CAAC;QAC/B,aAAQ,GAAwB,IAAI,oBAAa,EAAQ,CAAC;IAoBnE,CAAC;IAlBA,OAAO;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,GAAG,CAAC,GAAG,MAAW;QACjB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,KAAQ;QACd,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,KAAK;QACJ,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC;CACD;AAtBD,sCAsBC"}
|
|
@@ -39,13 +39,13 @@ 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()));
|
|
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
|
|
46
46
|
*/
|
|
47
47
|
return (0, fork_join_or_empty_1.forkJoinOrEmpty)(entities.map((entity) => (entity.destroyed ? (0, rxjs_1.of)(null) : entity.emit()))).pipe((0, operators_1.mapTo)(entities));
|
|
48
|
-
}), (0, operators_1.
|
|
48
|
+
}), (0, operators_1.concatMap)((entities) => (0, rxjs_1.from)(this.project.emit()).pipe((0, operators_1.mapTo)(entities))), (0, operators_1.mergeMap)((entities) => {
|
|
49
49
|
// Re-fetch compiled data for non destroyed entities
|
|
50
50
|
return (0, fork_join_or_empty_1.forkJoinOrEmpty)(entities.map((entity) => entity.destroyed
|
|
51
51
|
? (0, rxjs_1.of)(entity)
|
|
@@ -60,11 +60,11 @@ class NgDocBuilder {
|
|
|
60
60
|
: entity.dependencies.changes().pipe((0, operators_1.switchMap)((dependencies) => this.watcher
|
|
61
61
|
.watch(dependencies)
|
|
62
62
|
.onChange(...dependencies)
|
|
63
|
-
.pipe((0, operators_1.tap)(() => entity.dependenciesChanged()))), (0, operators_1.startWith)(null), (0, operators_1.mapTo)(entity), (0, operators_1.takeUntil)(entity.onDestroy()))))
|
|
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
65
|
}), (0, operators_2.bufferDebounce)(0), (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
|
-
(0, operators_1.
|
|
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()
|
|
69
69
|
.pipe((0, operators_1.map)((skeleton) => [...output.flat(), ...skeleton]))), (0, operators_1.tap)((output) => {
|
|
70
70
|
/*
|
|
@@ -78,8 +78,9 @@ class NgDocBuilder {
|
|
|
78
78
|
return (0, rxjs_1.of)(void 0);
|
|
79
79
|
}));
|
|
80
80
|
}
|
|
81
|
-
get(id) {
|
|
82
|
-
|
|
81
|
+
get(id, canBeBuilt) {
|
|
82
|
+
const entity = this.entities.get(id);
|
|
83
|
+
return (0, core_1.isPresent)(canBeBuilt) ? ((entity === null || entity === void 0 ? void 0 : entity.canBeBuilt) === canBeBuilt ? entity : undefined) : entity;
|
|
83
84
|
}
|
|
84
85
|
collectGarbage() {
|
|
85
86
|
this.entities.asArray().forEach((entity) => {
|
|
@@ -5,6 +5,7 @@ const path_1 = require("path");
|
|
|
5
5
|
const rxjs_1 = require("rxjs");
|
|
6
6
|
const operators_1 = require("rxjs/operators");
|
|
7
7
|
const ts_morph_1 = require("ts-morph");
|
|
8
|
+
const helpers_1 = require("../../../helpers");
|
|
8
9
|
const variables_1 = require("../../variables");
|
|
9
10
|
const entity_1 = require("./entity");
|
|
10
11
|
class NgDocSourceFileEntity extends entity_1.NgDocEntity {
|
|
@@ -27,10 +28,6 @@ class NgDocSourceFileEntity extends entity_1.NgDocEntity {
|
|
|
27
28
|
get sourceFilePath() {
|
|
28
29
|
return path_1.default.relative(this.context.context.workspaceRoot, this.sourceFile.getFilePath());
|
|
29
30
|
}
|
|
30
|
-
get pathToCompiledFile() {
|
|
31
|
-
const relativePath = path_1.default.relative(this.context.context.workspaceRoot, this.sourceFile.getFilePath());
|
|
32
|
-
return path_1.default.join(variables_1.CACHE_PATH, relativePath.replace(/\.ts$/, '.js'));
|
|
33
|
-
}
|
|
34
31
|
/**
|
|
35
32
|
* Returns relative path to a sourceFileFolder of the source file
|
|
36
33
|
*
|
|
@@ -39,6 +36,16 @@ class NgDocSourceFileEntity extends entity_1.NgDocEntity {
|
|
|
39
36
|
get sourceFileFolder() {
|
|
40
37
|
return path_1.default.relative(this.context.context.workspaceRoot, path_1.default.dirname(this.sourceFilePath));
|
|
41
38
|
}
|
|
39
|
+
get importPath() {
|
|
40
|
+
return (0, helpers_1.slash)(this.sourceFilePath.replace(/.ts$/, ''));
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Returns import paths that can be used to import the current source file
|
|
44
|
+
*/
|
|
45
|
+
get pathToCompiledFile() {
|
|
46
|
+
const relativePath = path_1.default.relative(this.context.context.workspaceRoot, this.sourceFile.getFilePath());
|
|
47
|
+
return path_1.default.join(variables_1.CACHE_PATH, relativePath.replace(/\.ts$/, '.js'));
|
|
48
|
+
}
|
|
42
49
|
emit() {
|
|
43
50
|
if (!this.destroyed) {
|
|
44
51
|
return (0, rxjs_1.from)(this.sourceFile.refreshFromFileSystem()).pipe((0, operators_1.mapTo)(void 0));
|
|
@@ -29,8 +29,8 @@ class NgDocDependenciesEntity extends source_file_entity_1.NgDocSourceFileEntity
|
|
|
29
29
|
}
|
|
30
30
|
get parent() {
|
|
31
31
|
const expectedPath = path.join(this.sourceFileFolder, variables_1.PAGE_NAME);
|
|
32
|
-
const
|
|
33
|
-
return
|
|
32
|
+
const entity = this.builder.get(expectedPath);
|
|
33
|
+
return entity && (0, helpers_1.isPageEntity)(entity) ? entity : undefined;
|
|
34
34
|
}
|
|
35
35
|
get assets() {
|
|
36
36
|
return Object.keys(this.componentsAssets)
|
|
@@ -67,12 +67,10 @@ class NgDocPageEntity extends navigation_entity_1.NgDocNavigationEntity {
|
|
|
67
67
|
get assetsFolder() {
|
|
68
68
|
return path.relative(this.context.context.workspaceRoot, path.join(this.folderPath, 'assets'));
|
|
69
69
|
}
|
|
70
|
-
get
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
get pageDependenciesImport() {
|
|
75
|
-
return this.pageDependenciesFile ? (0, helpers_1.slash)(this.pageDependenciesFile.replace(/.ts$/, '')) : undefined;
|
|
70
|
+
get pageDependencies() {
|
|
71
|
+
const expectedPath = path.join(this.sourceFileFolder, variables_1.PAGE_DEPENDENCIES_NAME);
|
|
72
|
+
const entity = this.builder.get(expectedPath, true);
|
|
73
|
+
return entity && (0, helpers_1.isDependencyEntity)(entity) ? entity : undefined;
|
|
76
74
|
}
|
|
77
75
|
get componentsAssets() {
|
|
78
76
|
const dependencies = (0, core_1.asArray)(this.children.values()).filter(helpers_1.isDependencyEntity)[0];
|
|
@@ -123,7 +121,6 @@ class NgDocPageEntity extends navigation_entity_1.NgDocNavigationEntity {
|
|
|
123
121
|
this.dependencies.clear();
|
|
124
122
|
if (this.target) {
|
|
125
123
|
this.dependencies.add(this.mdPath);
|
|
126
|
-
this.pageDependenciesFile && this.dependencies.add(this.pageDependenciesFile);
|
|
127
124
|
this.playgroundFile && this.dependencies.add(this.playgroundFile);
|
|
128
125
|
(_b = (_a = this.playground) === null || _a === void 0 ? void 0 : _a.sourceFile) === null || _b === void 0 ? void 0 : _b.getReferencedSourceFiles().forEach((sourceFile) => sourceFile.refreshFromFileSystemSync());
|
|
129
126
|
const renderer = new renderer_1.NgDocRenderer(this.builder, {
|
|
@@ -12,7 +12,7 @@ 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.
|
|
15
|
+
return watcher.onAdd(path).pipe((0, operators_1.map)((p) => new EntityConstructor(builder, project.addSourceFileAtPath(p), builder.context)), (0, operators_1.concatMap)((entity) => childGenerator(entity).pipe((0, operators_1.concatMap)((entities) => (0, rxjs_1.merge)(...entities.map((entity) => (0, rxjs_1.merge)(watcher.onChange(...entity.rootFiles).pipe((0, operators_1.concatMap)(() => childGenerator(entity)), (0, operators_1.takeUntil)(entity.onDestroy())), watcher.onUnlink(...entity.rootFiles).pipe((0, operators_1.tap)(() => entity.destroy()), (0, operators_1.take)(1), (0, operators_1.map)(() => [entity]))))).pipe((0, operators_1.startWith)(entities))))));
|
|
16
16
|
}
|
|
17
17
|
exports.entityLifeCycle = entityLifeCycle;
|
|
18
18
|
/**
|
|
@@ -21,7 +21,7 @@ exports.entityLifeCycle = entityLifeCycle;
|
|
|
21
21
|
*/
|
|
22
22
|
function childGenerator(entity) {
|
|
23
23
|
entity.children.forEach((child) => child.destroy());
|
|
24
|
-
return entity.childrenGenerator().pipe((0, operators_1.
|
|
24
|
+
return entity.childrenGenerator().pipe((0, operators_1.concatMap)((entities) => !entities.length
|
|
25
25
|
? (0, rxjs_1.of)([entity])
|
|
26
26
|
: (0, rxjs_1.forkJoin)(entities.map((e) => childGenerator(e))).pipe((0, operators_1.map)((children) => [entity, ...children.flat()]))), (0, operators_1.tap)((entities) => entities.forEach((e) => entity.builder.entities.set(e.id, e))));
|
|
27
27
|
}
|
|
@@ -17,7 +17,7 @@ function findClosestFile(currentFolder, fileName) {
|
|
|
17
17
|
return filePath;
|
|
18
18
|
}
|
|
19
19
|
const parentPath = path.dirname(currentPath);
|
|
20
|
-
if (
|
|
20
|
+
if (['/', '.', ''].includes(parentPath)) {
|
|
21
21
|
return null;
|
|
22
22
|
}
|
|
23
23
|
return findClosestFile(parentPath, fileName);
|
package/engine/builder.d.ts
CHANGED
|
@@ -11,6 +11,6 @@ export declare class NgDocBuilder {
|
|
|
11
11
|
private readonly watcher;
|
|
12
12
|
constructor(context: NgDocBuilderContext);
|
|
13
13
|
run(): Observable<void>;
|
|
14
|
-
get(id: string): NgDocEntity | undefined;
|
|
14
|
+
get(id: string, canBeBuilt?: boolean): NgDocEntity | undefined;
|
|
15
15
|
private collectGarbage;
|
|
16
16
|
}
|
package/engine/builder.js
CHANGED
|
@@ -40,13 +40,13 @@ 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()));
|
|
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
|
|
47
47
|
*/
|
|
48
48
|
return (0, fork_join_or_empty_1.forkJoinOrEmpty)(entities.map((entity) => (entity.destroyed ? (0, rxjs_1.of)(null) : entity.emit()))).pipe((0, operators_1.mapTo)(entities));
|
|
49
|
-
}), (0, operators_1.
|
|
49
|
+
}), (0, operators_1.concatMap)((entities) => (0, rxjs_1.from)(this.project.emit()).pipe((0, operators_1.mapTo)(entities))), (0, operators_1.mergeMap)((entities) => {
|
|
50
50
|
// Re-fetch compiled data for non destroyed entities
|
|
51
51
|
return (0, fork_join_or_empty_1.forkJoinOrEmpty)(entities.map((entity) => entity.destroyed
|
|
52
52
|
? (0, rxjs_1.of)(entity)
|
|
@@ -61,11 +61,11 @@ class NgDocBuilder {
|
|
|
61
61
|
: entity.dependencies.changes().pipe((0, operators_1.switchMap)((dependencies) => this.watcher
|
|
62
62
|
.watch(dependencies)
|
|
63
63
|
.onChange(...dependencies)
|
|
64
|
-
.pipe((0, operators_1.tap)(() => entity.dependenciesChanged()))), (0, operators_1.startWith)(null), (0, operators_1.mapTo)(entity), (0, operators_1.takeUntil)(entity.onDestroy()))))
|
|
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
66
|
}), (0, operators_2.bufferDebounce)(0), (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
|
-
(0, operators_1.
|
|
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()
|
|
70
70
|
.pipe((0, operators_1.map)((skeleton) => [...output.flat(), ...skeleton]))), (0, operators_1.tap)((output) => {
|
|
71
71
|
/*
|
|
@@ -79,8 +79,9 @@ class NgDocBuilder {
|
|
|
79
79
|
return (0, rxjs_1.of)(void 0);
|
|
80
80
|
}));
|
|
81
81
|
}
|
|
82
|
-
get(id) {
|
|
83
|
-
|
|
82
|
+
get(id, canBeBuilt) {
|
|
83
|
+
const entity = this.entities.get(id);
|
|
84
|
+
return (0, core_1.isPresent)(canBeBuilt) ? ((entity === null || entity === void 0 ? void 0 : entity.canBeBuilt) === canBeBuilt ? entity : undefined) : entity;
|
|
84
85
|
}
|
|
85
86
|
collectGarbage() {
|
|
86
87
|
this.entities.asArray().forEach((entity) => {
|
package/engine/builder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../../../libs/builder/engine/builder.ts"],"names":[],"mappings":";;;;AAAA,uCAAgD;AAChD,+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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"}
|
|
@@ -17,13 +17,17 @@ export declare abstract class NgDocSourceFileEntity extends NgDocEntity {
|
|
|
17
17
|
*/
|
|
18
18
|
get rootFiles(): string[];
|
|
19
19
|
get sourceFilePath(): string;
|
|
20
|
-
get pathToCompiledFile(): string;
|
|
21
20
|
/**
|
|
22
21
|
* Returns relative path to a sourceFileFolder of the source file
|
|
23
22
|
*
|
|
24
23
|
* @type {string}
|
|
25
24
|
*/
|
|
26
25
|
get sourceFileFolder(): string;
|
|
26
|
+
get importPath(): string;
|
|
27
|
+
/**
|
|
28
|
+
* Returns import paths that can be used to import the current source file
|
|
29
|
+
*/
|
|
30
|
+
get pathToCompiledFile(): string;
|
|
27
31
|
emit(): Observable<void>;
|
|
28
32
|
destroy(): void;
|
|
29
33
|
/**
|
|
@@ -6,6 +6,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
6
6
|
const rxjs_1 = require("rxjs");
|
|
7
7
|
const operators_1 = require("rxjs/operators");
|
|
8
8
|
const ts_morph_1 = require("ts-morph");
|
|
9
|
+
const helpers_1 = require("../../../helpers");
|
|
9
10
|
const variables_1 = require("../../variables");
|
|
10
11
|
const entity_1 = require("./entity");
|
|
11
12
|
class NgDocSourceFileEntity extends entity_1.NgDocEntity {
|
|
@@ -28,10 +29,6 @@ class NgDocSourceFileEntity extends entity_1.NgDocEntity {
|
|
|
28
29
|
get sourceFilePath() {
|
|
29
30
|
return path_1.default.relative(this.context.context.workspaceRoot, this.sourceFile.getFilePath());
|
|
30
31
|
}
|
|
31
|
-
get pathToCompiledFile() {
|
|
32
|
-
const relativePath = path_1.default.relative(this.context.context.workspaceRoot, this.sourceFile.getFilePath());
|
|
33
|
-
return path_1.default.join(variables_1.CACHE_PATH, relativePath.replace(/\.ts$/, '.js'));
|
|
34
|
-
}
|
|
35
32
|
/**
|
|
36
33
|
* Returns relative path to a sourceFileFolder of the source file
|
|
37
34
|
*
|
|
@@ -40,6 +37,16 @@ class NgDocSourceFileEntity extends entity_1.NgDocEntity {
|
|
|
40
37
|
get sourceFileFolder() {
|
|
41
38
|
return path_1.default.relative(this.context.context.workspaceRoot, path_1.default.dirname(this.sourceFilePath));
|
|
42
39
|
}
|
|
40
|
+
get importPath() {
|
|
41
|
+
return (0, helpers_1.slash)(this.sourceFilePath.replace(/.ts$/, ''));
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Returns import paths that can be used to import the current source file
|
|
45
|
+
*/
|
|
46
|
+
get pathToCompiledFile() {
|
|
47
|
+
const relativePath = path_1.default.relative(this.context.context.workspaceRoot, this.sourceFile.getFilePath());
|
|
48
|
+
return path_1.default.join(variables_1.CACHE_PATH, relativePath.replace(/\.ts$/, '.js'));
|
|
49
|
+
}
|
|
43
50
|
emit() {
|
|
44
51
|
if (!this.destroyed) {
|
|
45
52
|
return (0, rxjs_1.from)(this.sourceFile.refreshFromFileSystem()).pipe((0, operators_1.mapTo)(void 0));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"source-file.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/source-file.entity.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,+BAAsC;AACtC,8CAAgD;AAChD,uCAAuF;
|
|
1
|
+
{"version":3,"file":"source-file.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/source-file.entity.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,+BAAsC;AACtC,8CAAgD;AAChD,uCAAuF;AAEvF,8CAAuC;AAGvC,+CAA2C;AAC3C,qCAAqC;AAErC,MAAsB,qBAAsB,SAAQ,oBAAW;IAM9D,YACmB,OAAqB,EAC9B,UAAsB,EACb,OAA4B;QAE9C,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAJN,YAAO,GAAP,OAAO,CAAc;QAC9B,eAAU,GAAV,UAAU,CAAY;QACb,YAAO,GAAP,OAAO,CAAqB;QAR/C;;WAEG;QACe,OAAE,GAAW,IAAI,CAAC,cAAc,CAAC;IAQnD,CAAC;IAED;;OAEG;IACH,IAAa,SAAS;QACrB,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;IACzF,CAAC;IAED;;;;OAIG;IACH,IAAI,gBAAgB;QACnB,OAAO,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,IAAI,UAAU;QACb,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,IAAI,kBAAkB;QACrB,MAAM,YAAY,GAAW,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QAE9G,OAAO,cAAI,CAAC,IAAI,CAAC,sBAAU,EAAE,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IACpE,CAAC;IAEQ,IAAI;QACZ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACpB,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAA,iBAAK,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACzE;QACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAEQ,OAAO;QACf,KAAK,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACO,8BAA8B;QACvC,MAAM,aAAa,GAAuB,IAAI,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC;QACnF,MAAM,WAAW,GAAuB,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,gBAAgB,EAAE,CAAC;QAC1E,MAAM,gBAAgB,GAAqB,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,0BAA0B,EAAE,CAAC;QAErF,OAAO,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,0BAA0B,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;IACzF,CAAC;CACD;AAtED,sDAsEC"}
|
|
@@ -30,8 +30,8 @@ class NgDocDependenciesEntity extends source_file_entity_1.NgDocSourceFileEntity
|
|
|
30
30
|
}
|
|
31
31
|
get parent() {
|
|
32
32
|
const expectedPath = path.join(this.sourceFileFolder, variables_1.PAGE_NAME);
|
|
33
|
-
const
|
|
34
|
-
return
|
|
33
|
+
const entity = this.builder.get(expectedPath);
|
|
34
|
+
return entity && (0, helpers_1.isPageEntity)(entity) ? entity : undefined;
|
|
35
35
|
}
|
|
36
36
|
get assets() {
|
|
37
37
|
return Object.keys(this.componentsAssets)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dependencies.entity.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/entities/dependencies.entity.ts"],"names":[],"mappings":";;;;AACA,uCAAgD;AAChD,mDAA6B;AAC7B,+BAAoC;AACpC,8CAAmC;AACnC,uCAOkB;AAElB,2CAA2E;AAE3E,+FAAwF;AAExF,0CAA0C;AAC1C,4CAAuC;AAEvC,0EAAwE;AAKxE,MAAa,uBAAwB,SAAQ,0CAAqB;IAAlE;;QACS,qBAAgB,GAAmB,EAAE,CAAC;IA4I/C,CAAC;IA1IA,IAAa,MAAM;QAClB,iDAAiD;QACjD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,UAAU;;QACb,OAAO,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,UAAU,KAAI,EAAE,CAAC;IACtC,CAAC;IAED,IAAa,eAAe;QAC3B,OAAO,IAAA,cAAO,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,IAAa,MAAM;QAClB,MAAM,YAAY,GAAW,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,qBAAS,CAAC,CAAC;QACzE,MAAM,
|
|
1
|
+
{"version":3,"file":"dependencies.entity.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/entities/dependencies.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { NgDocBuiltOutput } from '../../interfaces';
|
|
|
4
4
|
import { NgDocEntity } from './abstractions/entity';
|
|
5
5
|
import { NgDocNavigationEntity } from './abstractions/navigation.entity';
|
|
6
6
|
import { NgDocCategoryEntity } from './category.entity';
|
|
7
|
+
import { NgDocDependenciesEntity } from './dependencies.entity';
|
|
7
8
|
import { NgDocPlaygroundEntity } from './playground.entity';
|
|
8
9
|
export declare class NgDocPageEntity extends NgDocNavigationEntity<NgDocPage> {
|
|
9
10
|
moduleName: string;
|
|
@@ -26,8 +27,7 @@ export declare class NgDocPageEntity extends NgDocNavigationEntity<NgDocPage> {
|
|
|
26
27
|
get builtPagePath(): string;
|
|
27
28
|
get buildCandidates(): NgDocEntity[];
|
|
28
29
|
get assetsFolder(): string;
|
|
29
|
-
get
|
|
30
|
-
get pageDependenciesImport(): string | undefined;
|
|
30
|
+
get pageDependencies(): NgDocDependenciesEntity | undefined;
|
|
31
31
|
get componentsAssets(): string | undefined;
|
|
32
32
|
get playground(): NgDocPlaygroundEntity | undefined;
|
|
33
33
|
get playgroundFile(): string | undefined;
|
|
@@ -68,12 +68,10 @@ class NgDocPageEntity extends navigation_entity_1.NgDocNavigationEntity {
|
|
|
68
68
|
get assetsFolder() {
|
|
69
69
|
return path.relative(this.context.context.workspaceRoot, path.join(this.folderPath, 'assets'));
|
|
70
70
|
}
|
|
71
|
-
get
|
|
72
|
-
const
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
get pageDependenciesImport() {
|
|
76
|
-
return this.pageDependenciesFile ? (0, helpers_1.slash)(this.pageDependenciesFile.replace(/.ts$/, '')) : undefined;
|
|
71
|
+
get pageDependencies() {
|
|
72
|
+
const expectedPath = path.join(this.sourceFileFolder, variables_1.PAGE_DEPENDENCIES_NAME);
|
|
73
|
+
const entity = this.builder.get(expectedPath, true);
|
|
74
|
+
return entity && (0, helpers_1.isDependencyEntity)(entity) ? entity : undefined;
|
|
77
75
|
}
|
|
78
76
|
get componentsAssets() {
|
|
79
77
|
const dependencies = (0, core_1.asArray)(this.children.values()).filter(helpers_1.isDependencyEntity)[0];
|
|
@@ -124,7 +122,6 @@ class NgDocPageEntity extends navigation_entity_1.NgDocNavigationEntity {
|
|
|
124
122
|
this.dependencies.clear();
|
|
125
123
|
if (this.target) {
|
|
126
124
|
this.dependencies.add(this.mdPath);
|
|
127
|
-
this.pageDependenciesFile && this.dependencies.add(this.pageDependenciesFile);
|
|
128
125
|
this.playgroundFile && this.dependencies.add(this.playgroundFile);
|
|
129
126
|
(_b = (_a = this.playground) === null || _a === void 0 ? void 0 : _a.sourceFile) === null || _b === void 0 ? void 0 : _b.getReferencedSourceFiles().forEach((sourceFile) => sourceFile.refreshFromFileSystemSync());
|
|
130
127
|
const renderer = new renderer_1.NgDocRenderer(this.builder, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.entity.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/entities/page.entity.ts"],"names":[],"mappings":";;;;AAAA,uCAA2D;AAC3D,+CAAyB;AACzB,mDAA6B;AAC7B,+BAA8C;AAC9C,8CAAoD;AAGpD,2CAAgG;AAGhG,wCAAwC;AACxC,0CAA0C;AAC1C,4CAAyF;AAEzF,wEAAuE;AAKvE,MAAa,eAAgB,SAAQ,yCAAgC;IAArE;;QACU,eAAU,GAAW,IAAA,oBAAU,EAAC,0BAA0B,CAAC,CAAC;QACrE,kBAAa,GAAW,IAAA,oBAAU,EAAC,6BAA6B,CAAC,CAAC;QACzD,mBAAc,GAAW,GAAG,IAAA,oBAAU,EAAC,aAAa,CAAC,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"page.entity.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/entities/page.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ 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.
|
|
15
|
+
return watcher.onAdd(path).pipe((0, operators_1.map)((p) => new EntityConstructor(builder, project.addSourceFileAtPath(p), builder.context)), (0, operators_1.concatMap)((entity) => childGenerator(entity).pipe((0, operators_1.concatMap)((entities) => (0, rxjs_1.merge)(...entities.map((entity) => (0, rxjs_1.merge)(watcher.onChange(...entity.rootFiles).pipe((0, operators_1.concatMap)(() => childGenerator(entity)), (0, operators_1.takeUntil)(entity.onDestroy())), watcher.onUnlink(...entity.rootFiles).pipe((0, operators_1.tap)(() => entity.destroy()), (0, operators_1.take)(1), (0, operators_1.map)(() => [entity]))))).pipe((0, operators_1.startWith)(entities))))));
|
|
16
16
|
}
|
|
17
17
|
exports.entityLifeCycle = entityLifeCycle;
|
|
18
18
|
/**
|
|
@@ -21,7 +21,7 @@ exports.entityLifeCycle = entityLifeCycle;
|
|
|
21
21
|
*/
|
|
22
22
|
function childGenerator(entity) {
|
|
23
23
|
entity.children.forEach((child) => child.destroy());
|
|
24
|
-
return entity.childrenGenerator().pipe((0, operators_1.
|
|
24
|
+
return entity.childrenGenerator().pipe((0, operators_1.concatMap)((entities) => !entities.length
|
|
25
25
|
? (0, rxjs_1.of)([entity])
|
|
26
26
|
: (0, rxjs_1.forkJoin)(entities.map((e) => childGenerator(e))).pipe((0, operators_1.map)((children) => [entity, ...children.flat()]))), (0, operators_1.tap)((entities) => entities.forEach((e) => entity.builder.entities.set(e.id, e))));
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-life-cycle.js","sourceRoot":"","sources":["../../../../libs/builder/engine/entity-life-cycle.ts"],"names":[],"mappings":";;;AAAA,+BAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"entity-life-cycle.js","sourceRoot":"","sources":["../../../../libs/builder/engine/entity-life-cycle.ts"],"names":[],"mappings":";;;AAAA,+BAAqD;AACrD,8CAA0F;AAQ1F;;;;;;;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,qBAAS,EAAC,CAAC,MAAmB,EAAE,EAAE,CACjC,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,CAC1B,IAAA,qBAAS,EAAC,CAAC,QAAuB,EAAE,EAAE,CACrC,IAAA,YAAK,EACJ,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAmB,EAAE,EAAE,CACvC,IAAA,YAAK,EACJ,OAAO,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,CACzC,IAAA,qBAAS,EAAC,GAAG,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EACvC,IAAA,qBAAS,EAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAC7B,EACD,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,EACP,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CACnB,CACD,CACD,CACD,CAAC,IAAI,CAAC,IAAA,qBAAS,EAAC,QAAQ,CAAC,CAAC,CAC3B,CACD,CACD,CACD,CAAC;AACH,CAAC;AA/BD,0CA+BC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,MAAmB;IAC1C,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAkB,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAEjE,OAAO,MAAM,CAAC,iBAAiB,EAAE,CAAC,IAAI,CACrC,IAAA,qBAAS,EAAC,CAAC,QAAuB,EAAE,EAAE,CACrC,CAAC,QAAQ,CAAC,MAAM;QACf,CAAC,CAAC,IAAA,SAAE,EAAC,CAAC,MAAM,CAAC,CAAC;QACd,CAAC,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAClE,IAAA,eAAG,EAAC,CAAC,QAAyB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAC/D,CACJ,EACD,IAAA,eAAG,EAAC,CAAC,QAAuB,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAc,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAC5G,CAAC;AACH,CAAC"}
|
|
@@ -18,7 +18,7 @@ function findClosestFile(currentFolder, fileName) {
|
|
|
18
18
|
return filePath;
|
|
19
19
|
}
|
|
20
20
|
const parentPath = path.dirname(currentPath);
|
|
21
|
-
if (
|
|
21
|
+
if (['/', '.', ''].includes(parentPath)) {
|
|
22
22
|
return null;
|
|
23
23
|
}
|
|
24
24
|
return findClosestFile(parentPath, fileName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-closest-file.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/find-closest-file.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,aAAqB,EAAE,QAAgB;IACtE,MAAM,WAAW,GAAW,aAAa,CAAC;IAC1C,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE1D,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,QAAQ,CAAC;KAChB;IAED,MAAM,UAAU,GAAW,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,IAAI,
|
|
1
|
+
{"version":3,"file":"find-closest-file.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/find-closest-file.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,aAAqB,EAAE,QAAgB;IACtE,MAAM,WAAW,GAAW,aAAa,CAAC;IAC1C,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE1D,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC5B,OAAO,QAAQ,CAAC;KAChB;IAED,MAAM,UAAU,GAAW,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAErD,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACZ;IAED,OAAO,eAAe,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;AAC9C,CAAC;AAfD,0CAeC"}
|
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.23",
|
|
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.23",
|
|
9
9
|
"@angular-devkit/architect": ">=0.1500.0",
|
|
10
10
|
"chokidar": "^3.5.3",
|
|
11
11
|
"minimatch": "^5.1.0",
|
|
@@ -25,14 +25,12 @@
|
|
|
25
25
|
"route": {
|
|
26
26
|
"type": "string",
|
|
27
27
|
"description": "The route of the page",
|
|
28
|
-
"alias": "r"
|
|
29
|
-
"x-prompt": "The route of the category (its directory name by default, e.g. \"getting-started\")."
|
|
28
|
+
"alias": "r"
|
|
30
29
|
},
|
|
31
30
|
"category": {
|
|
32
31
|
"type": "boolean",
|
|
33
32
|
"description": "Automatically import the category.",
|
|
34
|
-
"alias": "c"
|
|
35
|
-
"x-prompt": "Do you want to automatically import closest category?"
|
|
33
|
+
"alias": "c"
|
|
36
34
|
},
|
|
37
35
|
"order": {
|
|
38
36
|
"type": "boolean",
|
|
@@ -25,20 +25,17 @@
|
|
|
25
25
|
"route": {
|
|
26
26
|
"type": "string",
|
|
27
27
|
"description": "The route of the page",
|
|
28
|
-
"alias": "r"
|
|
29
|
-
"x-prompt": "The route of the page (its directory name by default, e.g. \"getting-started\")."
|
|
28
|
+
"alias": "r"
|
|
30
29
|
},
|
|
31
30
|
"demo": {
|
|
32
31
|
"type": "boolean",
|
|
33
32
|
"description": "Generate module and page dependency file for demos.",
|
|
34
|
-
"alias": "d"
|
|
35
|
-
"x-prompt": "Are you going to create demos?"
|
|
33
|
+
"alias": "d"
|
|
36
34
|
},
|
|
37
35
|
"category": {
|
|
38
36
|
"type": "boolean",
|
|
39
37
|
"description": "Automatically import the category.",
|
|
40
|
-
"alias": "c"
|
|
41
|
-
"x-prompt": "Do you want to automatically import closest category?"
|
|
38
|
+
"alias": "c"
|
|
42
39
|
},
|
|
43
40
|
"order": {
|
|
44
41
|
"type": "boolean",
|
|
@@ -4,9 +4,9 @@ import {RouterModule} from '@angular/router';
|
|
|
4
4
|
import {CommonModule} from '@angular/common';
|
|
5
5
|
import {NgDocPageModule, NgDocRootPage, NgDocDemoAssets} from '@ng-doc/app';
|
|
6
6
|
import pageContent from '!!raw-loader!{{ page.builtPagePath }}';
|
|
7
|
-
{%- if page.
|
|
7
|
+
{%- if page.pageDependencies %}
|
|
8
8
|
// noinspection ES6UnusedImports
|
|
9
|
-
import pageDependencies from '{{ page.
|
|
9
|
+
import pageDependencies from '{{ page.pageDependencies.importPath }}';
|
|
10
10
|
{%- endif %}
|
|
11
11
|
{%- if page.componentsAssets %}
|
|
12
12
|
// noinspection ES6UnusedImports
|
|
@@ -21,7 +21,7 @@ import demoAssets from '{{ page.componentsAssets }}';
|
|
|
21
21
|
})
|
|
22
22
|
export class {{ page.componentName }} extends NgDocRootPage {
|
|
23
23
|
readonly pageContent: string = pageContent;
|
|
24
|
-
{%- if page.
|
|
24
|
+
{%- if page.pageDependencies %}
|
|
25
25
|
readonly demo: Record<string, Type<unknown>> | undefined = pageDependencies.demo;
|
|
26
26
|
readonly module: Type<unknown> | undefined = pageDependencies.module;
|
|
27
27
|
{%- endif %}
|
|
@@ -39,7 +39,7 @@ export class {{ page.componentName }} extends NgDocRootPage {
|
|
|
39
39
|
imports: [
|
|
40
40
|
CommonModule,
|
|
41
41
|
NgDocPageModule,
|
|
42
|
-
{%- if page.
|
|
42
|
+
{%- if page.pageDependencies %}
|
|
43
43
|
pageDependencies.module,
|
|
44
44
|
{%- endif %}
|
|
45
45
|
RouterModule.forChild([{
|