@ng-doc/builder 15.7.7 → 15.7.9
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/entities/abstractions/entity.d.ts +4 -0
- package/engine/entities/abstractions/entity.js +6 -0
- package/engine/entities/abstractions/entity.js.map +1 -1
- package/engine/entities/abstractions/file.entity.js.map +1 -1
- package/engine/entities/abstractions/navigation.entity.js +1 -1
- package/engine/entities/abstractions/navigation.entity.js.map +1 -1
- package/engine/entities/abstractions/route.entity.js.map +1 -1
- package/engine/functions/build-candidates.js +10 -1
- package/engine/functions/build-candidates.js.map +1 -1
- package/engine/renderer.js +2 -1
- package/engine/renderer.js.map +1 -1
- package/helpers/create-builder-context.js +1 -1
- package/helpers/create-builder-context.js.map +1 -1
- package/package.json +2 -2
- package/templates/api-scope.module.ts.nunj +3 -3
- package/templates/api.module.ts.nunj +1 -1
- package/templates/category.module.ts.nunj +3 -3
|
@@ -62,6 +62,10 @@ export declare abstract class NgDocEntity {
|
|
|
62
62
|
* Contains all children of the current entity.
|
|
63
63
|
*/
|
|
64
64
|
get children(): NgDocEntity[];
|
|
65
|
+
/**
|
|
66
|
+
* Returns children that are ready to build or already built
|
|
67
|
+
*/
|
|
68
|
+
get builtChildren(): NgDocEntity[];
|
|
65
69
|
/**
|
|
66
70
|
* Recursively returns children for the current entity
|
|
67
71
|
*
|
|
@@ -56,6 +56,12 @@ class NgDocEntity {
|
|
|
56
56
|
.asArray()
|
|
57
57
|
.filter((entity) => entity.parent === this && !entity.destroyed);
|
|
58
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Returns children that are ready to build or already built
|
|
61
|
+
*/
|
|
62
|
+
get builtChildren() {
|
|
63
|
+
return this.children.filter((entity) => entity.isReadyForBuild);
|
|
64
|
+
}
|
|
59
65
|
/**
|
|
60
66
|
* Recursively returns children for the current entity
|
|
61
67
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/entity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/file.entity.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,kEAAkC;AAClC,mDAA6B;AAC7B,+BAAgD;AAChD,uCAAgD;
|
|
1
|
+
{"version":3,"file":"file.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/file.entity.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,kEAAkC;AAClC,mDAA6B;AAC7B,+BAAgD;AAChD,uCAAgD;AAEhD,8CAAkD;AAClD,+CAAiD;AAGjD,6DAA2D;AAE3D;;GAEG;AACH,MAAsB,eAAmB,SAAQ,0CAAqB;IAM5D,MAAM;QACd,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAE1B,IAAI;YACH,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;YAC/D,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC;YAEvD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACjB,IAAI,KAAK,CACR,kBAAkB,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,mDAAmD,CAClG,CAAC;aACF;SACD;QAAC,OAAO,CAAU,EAAE;YACpB,OAAO,IAAA,iBAAU,EAAC,CAAC,CAAC,CAAC;SACrB;QAED,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAEzB,OAAO,IAAA,SAAE,EAAC,KAAK,CAAC,CAAC,CAAC;IACnB,CAAC;IAES,qBAAqB;;QAC9B,MAAM,cAAc,GAAuB,MAAA,MAAA,MAAA,MAAA,MAAA,MAAA,IAAI,CAAC,8BAA8B,EAAE,0CAC7E,WAAW,CAAC,UAAU,CAAC,0CACvB,iBAAiB,CAAC,qBAAU,CAAC,UAAU,CAAC,0CACxC,GAAG,EAAE,0CACL,cAAc,GAAG,CAAC,CAAC,0CACnB,aAAa,EAAE,0CACf,WAAW,EAAE,CAAC;QAEjB,IAAI,cAAc,IAAI,IAAA,mBAAS,EAAC,cAAc,EAAE,4BAAgB,CAAC,IAAI,cAAc,KAAK,IAAI,CAAC,cAAc,EAAE;YAC5G,MAAM,MAAM,GAA4B,IAAI,CAAC,OAAO,CAAC,GAAG,CACvD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,cAAc,CAAC,CACjE,CAAC;YAEF,OAAO,IAAA,0BAAgB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;SACrD;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAEQ,OAAO;QACf,KAAK,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAEQ,eAAe;QACvB,KAAK,CAAC,eAAe,EAAE,CAAC;QAExB,IAAI,CAAC,UAAU;aACb,aAAa,EAAE;aACf,cAAc,EAAE;aAChB,OAAO,CAAC,CAAC,IAAgB,EAAE,EAAE;YAC7B,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC;CACD;AA5DD,0CA4DC"}
|
|
@@ -31,7 +31,7 @@ class NgDocNavigationEntity extends route_entity_1.NgDocRouteEntity {
|
|
|
31
31
|
* @type {NgDocEntity[]}
|
|
32
32
|
*/
|
|
33
33
|
get navigationItems() {
|
|
34
|
-
return this.
|
|
34
|
+
return this.builtChildren.filter((child) => child instanceof NgDocNavigationEntity && child.isNavigable);
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
exports.NgDocNavigationEntity = NgDocNavigationEntity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/navigation.entity.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,iDAAgD;AAEhD;;GAEG;AACH,MAAsB,qBAAyB,SAAQ,+BAAmB;IAA1E;;QACC;;WAEG;QACM,gBAAW,GAAY,IAAI,CAAC;IAgCtC,CAAC;IAvBA,IAAa,UAAU;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,IAAI,UAAU;QACb,OAAO,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"navigation.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/navigation.entity.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,iDAAgD;AAEhD;;GAEG;AACH,MAAsB,qBAAyB,SAAQ,+BAAmB;IAA1E;;QACC;;WAEG;QACM,gBAAW,GAAY,IAAI,CAAC;IAgCtC,CAAC;IAvBA,IAAa,UAAU;QACtB,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,IAAI,UAAU;QACb,OAAO,IAAA,0BAAgB,EAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,IAAI,eAAe;QAClB,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAC/B,CAAC,KAAkB,EAAE,EAAE,CAAC,KAAK,YAAY,qBAAqB,IAAI,KAAK,CAAC,WAAW,CACnF,CAAC;IACH,CAAC;CACD;AApCD,sDAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/route.entity.ts"],"names":[],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"route.entity.js","sourceRoot":"","sources":["../../../../../../libs/builder/engine/entities/abstractions/route.entity.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,8CAAuC;AACvC,mDAAkD;AAElD,MAAsB,gBAA8B,SAAQ,iCAAoB;IAAhF;;QAgBC;;;WAGG;QACH,iBAAY,GAAgB,IAAI,GAAG,EAAU,CAAC;QAuB9C;;WAEG;QACH,wDAAwD;QACxD,wDAAwD;IACzD,CAAC;IA1BA;;OAEG;IACH,IAAI,iBAAiB;QACpB,OAAO,SAAS,CAAC;IAClB,CAAC;IAED;;OAEG;IACH,IAAI,iBAAiB;QACpB,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,IAAI,SAAS;;QACZ,MAAM,WAAW,GAChB,IAAI,CAAC,MAAM,YAAY,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,mCAAI,EAAE,CAAC;QAEzG,OAAO,IAAA,eAAK,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACvD,CAAC;CAOD;AAhDD,4CAgDC"}
|
|
@@ -19,7 +19,16 @@ function buildCandidates(entities) {
|
|
|
19
19
|
.map((candidate) => candidate.keywords)
|
|
20
20
|
.flat()));
|
|
21
21
|
const candidatesByKeywords = entitiesFromStore.filter((entity) => (0, helpers_1.isRouteEntity)(entity) && candidatesKeywords.some((keyword) => entity.usedKeywords.has(keyword)));
|
|
22
|
-
return (0, core_1.asArray)(new Set([...candidates, ...candidatesByKeywords]));
|
|
22
|
+
return (0, core_1.asArray)(new Set([...candidates, ...candidatesByKeywords])).sort(prioritySort);
|
|
23
23
|
}
|
|
24
24
|
exports.buildCandidates = buildCandidates;
|
|
25
|
+
// Sort entities by parent-child relationship, children should be first, parents should be last
|
|
26
|
+
/**
|
|
27
|
+
*
|
|
28
|
+
* @param a
|
|
29
|
+
* @param b
|
|
30
|
+
*/
|
|
31
|
+
function prioritySort(a, b) {
|
|
32
|
+
return b.parentEntities.length - a.parentEntities.length;
|
|
33
|
+
}
|
|
25
34
|
//# sourceMappingURL=build-candidates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-candidates.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/functions/build-candidates.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,2CAA4C;AAI5C;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,QAAuB;;IACtD,MAAM,iBAAiB,GAAkB,IAAA,cAAO,EAAC,MAAA,QAAQ,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1F,MAAM,UAAU,GAAkB,IAAA,cAAO,EACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAsB,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CACnG,CAAC;IACF,MAAM,kBAAkB,GAAa,IAAA,cAAO,EAC3C,IAAI,GAAG,CACN,UAAU;SACR,MAAM,CAAC,uBAAa,CAAC;SACrB,GAAG,CAAC,CAAC,SAA2B,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC;SACxD,IAAI,EAAE,CACR,CACD,CAAC;IAEF,MAAM,oBAAoB,GAAkB,iBAAiB,CAAC,MAAM,CACnE,CAAC,MAAmB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"build-candidates.js","sourceRoot":"","sources":["../../../../../libs/builder/engine/functions/build-candidates.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,2CAA4C;AAI5C;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,QAAuB;;IACtD,MAAM,iBAAiB,GAAkB,IAAA,cAAO,EAAC,MAAA,QAAQ,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1F,MAAM,UAAU,GAAkB,IAAA,cAAO,EACxC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAsB,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CACnG,CAAC;IACF,MAAM,kBAAkB,GAAa,IAAA,cAAO,EAC3C,IAAI,GAAG,CACN,UAAU;SACR,MAAM,CAAC,uBAAa,CAAC;SACrB,GAAG,CAAC,CAAC,SAA2B,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC;SACxD,IAAI,EAAE,CACR,CACD,CAAC;IAEF,MAAM,oBAAoB,GAAkB,iBAAiB,CAAC,MAAM,CACnE,CAAC,MAAmB,EAAE,EAAE,CACvB,IAAA,uBAAa,EAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CACxG,CAAC;IAEF,OAAO,IAAA,cAAO,EAAC,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AACtF,CAAC;AApBD,0CAoBC;AAED,+FAA+F;AAC/F;;;;GAIG;AACH,SAAS,YAAY,CAAC,CAAc,EAAE,CAAc;IACnD,OAAO,CAAC,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC;AAC1D,CAAC"}
|
package/engine/renderer.js
CHANGED
|
@@ -7,6 +7,7 @@ const fs = tslib_1.__importStar(require("fs"));
|
|
|
7
7
|
const nunjucks_1 = require("nunjucks");
|
|
8
8
|
const path = tslib_1.__importStar(require("path"));
|
|
9
9
|
const rxjs_1 = require("rxjs");
|
|
10
|
+
const operators_1 = require("rxjs/operators");
|
|
10
11
|
const ts_morph_1 = require("ts-morph");
|
|
11
12
|
const filters = tslib_1.__importStar(require("./template-filters"));
|
|
12
13
|
const variables_1 = require("./variables");
|
|
@@ -28,7 +29,7 @@ class NgDocRelativeLoader {
|
|
|
28
29
|
}
|
|
29
30
|
class NgDocRenderer {
|
|
30
31
|
render(template, options) {
|
|
31
|
-
return (0, rxjs_1.of)(this.renderSync(template, options));
|
|
32
|
+
return (0, rxjs_1.of)(null).pipe((0, operators_1.map)(() => this.renderSync(template, options)));
|
|
32
33
|
}
|
|
33
34
|
renderSync(template, options) {
|
|
34
35
|
return this.getEnvironment(options).render(template, options === null || options === void 0 ? void 0 : options.context);
|
package/engine/renderer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../../libs/builder/engine/renderer.ts"],"names":[],"mappings":";;;;AAAA,uCAAwC;AACxC,+CAAyB;AACzB,uCAA8C;AAC9C,mDAA6B;AAC7B,+BAAoC;AACpC,uCAA8B;AAI9B,oEAA8C;AAC9C,2CAA2C;AAE3C,MAAM,mBAAmB;IACxB,YAA6B,IAAY,EAAmB,iBAAyC;QAAxE,SAAI,GAAJ,IAAI,CAAQ;QAAmB,sBAAiB,GAAjB,iBAAiB,CAAwB;IAAG,CAAC;IACzG,SAAS,CAAC,IAAY;;QACrB,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEpD,MAAA,IAAI,CAAC,iBAAiB,0CAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEtC,OAAO;YACN,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;YACvC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;SACb,CAAC;IACH,CAAC;CACD;AAED,MAAa,aAAa;IACzB,MAAM,CAAmB,QAAgB,EAAE,OAAiC;QAC3E,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../../libs/builder/engine/renderer.ts"],"names":[],"mappings":";;;;AAAA,uCAAwC;AACxC,+CAAyB;AACzB,uCAA8C;AAC9C,mDAA6B;AAC7B,+BAAoC;AACpC,8CAAmC;AACnC,uCAA8B;AAI9B,oEAA8C;AAC9C,2CAA2C;AAE3C,MAAM,mBAAmB;IACxB,YAA6B,IAAY,EAAmB,iBAAyC;QAAxE,SAAI,GAAJ,IAAI,CAAQ;QAAmB,sBAAiB,GAAjB,iBAAiB,CAAwB;IAAG,CAAC;IACzG,SAAS,CAAC,IAAY;;QACrB,MAAM,QAAQ,GAAW,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAEpD,MAAA,IAAI,CAAC,iBAAiB,0CAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEtC,OAAO;YACN,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC;YACvC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;SACb,CAAC;IACH,CAAC;CACD;AAED,MAAa,aAAa;IACzB,MAAM,CAAmB,QAAgB,EAAE,OAAiC;QAC3E,OAAO,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAA,eAAG,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,UAAU,CAAmB,QAAgB,EAAE,OAAiC;QAC/E,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAEO,cAAc,CAAmB,OAAiC;;QACzE,IAAI,WAAW,GAAgB,IAAI,sBAAW,CAC7C,IAAI,mBAAmB,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,mCAAI,0BAAc,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,CAAC,EACrF,EAAC,UAAU,EAAE,KAAK,EAAC,CACnB,CAAC;QAEF,IAAA,iBAAU,EAAC,OAAO,CAAC,CAAC,OAAO,CAC1B,CAAC,MAA4B,EAAE,EAAE,CAAC,CAAC,WAAW,GAAG,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAChG,CAAC;QAEF,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,eAAI,CAAC,CAAC;QAEpC,OAAO,WAAW,CAAC;IACpB,CAAC;CACD;AAvBD,sCAuBC"}
|
|
@@ -15,7 +15,7 @@ const load_config_1 = require("./load-config");
|
|
|
15
15
|
function createBuilderContext(targetOptions, options, context) {
|
|
16
16
|
var _a, _b, _c, _d, _e, _f;
|
|
17
17
|
const buildPath = path.join(context.workspaceRoot, '.ng-doc', (_b = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project) !== null && _b !== void 0 ? _b : 'app');
|
|
18
|
-
const projectRoot = path.
|
|
18
|
+
const projectRoot = path.dirname(targetOptions['main']);
|
|
19
19
|
if (Object.keys((_c = options.ngDoc) !== null && _c !== void 0 ? _c : {}).length) {
|
|
20
20
|
context.logger.warn('`ngDoc` field in `angular.json` file is deprecated and will be removed in the next major release.\n' +
|
|
21
21
|
'Please use configuration file to configure NgDoc. For more information, see https://ng-doc.com/getting-started/configuration#builder-configuration');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-builder-context.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/create-builder-context.ts"],"names":[],"mappings":";;;;AAEA,uCAAqD;AACrD,mDAA6B;AAG7B,+CAAyC;AAEzC;;;;;;GAMG;AACH,SAAgB,oBAAoB,CACnC,aAA8B,EAC9B,OAAoB,EACpB,OAAuB;;IAEvB,MAAM,SAAS,GAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,EAAE,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,OAAO,mCAAI,KAAK,CAAC,CAAC;IACxG,MAAM,WAAW,GAAW,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"create-builder-context.js","sourceRoot":"","sources":["../../../../libs/builder/helpers/create-builder-context.ts"],"names":[],"mappings":";;;;AAEA,uCAAqD;AACrD,mDAA6B;AAG7B,+CAAyC;AAEzC;;;;;;GAMG;AACH,SAAgB,oBAAoB,CACnC,aAA8B,EAC9B,OAAoB,EACpB,OAAuB;;IAEvB,MAAM,SAAS,GAAW,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,SAAS,EAAE,MAAA,MAAA,OAAO,CAAC,MAAM,0CAAE,OAAO,mCAAI,KAAK,CAAC,CAAC;IACxG,MAAM,WAAW,GAAW,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAW,CAAC,CAAC;IAE1E,IAAI,MAAM,CAAC,IAAI,CAAC,MAAA,OAAO,CAAC,KAAK,mCAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAC5C,OAAO,CAAC,MAAM,CAAC,IAAI,CAClB,qGAAqG;YACpG,oJAAoJ,CACrJ,CAAC;KACF;IAED,MAAM,MAAM,GAAuB,EAAC,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,IAAA,wBAAU,EAAC,WAAW,CAAC,EAAC,CAAC;IAElF,OAAO;QACN,QAAQ,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,mCAAI,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM;QACN,OAAO;QACP,mBAAmB,EAAE,MAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAG,qBAAqB,CAAoB,mCAAI,KAAK;QACxF,UAAU,EAAE,CAAA,MAAA,MAAM,CAAC,KAAK,0CAAE,MAAM,EAAC,CAAC,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QACxE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;QAC1C,SAAS;QACT,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC;QACpC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC;KAC1C,CAAC;AACH,CAAC;AA5BD,oDA4BC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-doc/builder",
|
|
3
|
-
"version": "15.7.
|
|
3
|
+
"version": "15.7.9",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"builders": "./builders.json",
|
|
6
6
|
"schematics": "./schematics/collection.json",
|
|
7
7
|
"dependencies": {
|
|
8
|
-
"@ng-doc/core": "15.7.
|
|
8
|
+
"@ng-doc/core": "15.7.9",
|
|
9
9
|
"@angular-devkit/architect": ">=0.1500.0",
|
|
10
10
|
"chokidar": "^3.5.3",
|
|
11
11
|
"minimatch": "^5.1.0",
|
|
@@ -5,13 +5,13 @@ import {RouterModule} from "@angular/router";
|
|
|
5
5
|
@NgModule({
|
|
6
6
|
imports: [
|
|
7
7
|
RouterModule.forChild([
|
|
8
|
-
{%- if scope.
|
|
9
|
-
{path: '', redirectTo: '{{ scope.
|
|
8
|
+
{%- if scope.builtChildren.length %}
|
|
9
|
+
{path: '', redirectTo: '{{ scope.builtChildren[0].route }}', pathMatch: 'full' },
|
|
10
10
|
{%- endif %}
|
|
11
11
|
{
|
|
12
12
|
path: '',
|
|
13
13
|
children: [
|
|
14
|
-
{%- for page in scope.
|
|
14
|
+
{%- for page in scope.builtChildren %}
|
|
15
15
|
{
|
|
16
16
|
path: '{{ page.route }}',
|
|
17
17
|
loadChildren: () => import('{{ page.moduleImport }}').then(m => m.DynamicModule)
|
|
@@ -26,7 +26,7 @@ export class DynamicComponent {
|
|
|
26
26
|
path: '',
|
|
27
27
|
component: DynamicComponent,
|
|
28
28
|
},
|
|
29
|
-
{%- for scope in api.
|
|
29
|
+
{%- for scope in api.builtChildren %}
|
|
30
30
|
{
|
|
31
31
|
path: '{{ scope.route }}',
|
|
32
32
|
loadChildren: () => import('{{ scope.moduleImport }}').then(m => m.DynamicModule)
|
|
@@ -4,13 +4,13 @@ import {RouterModule} from "@angular/router";
|
|
|
4
4
|
|
|
5
5
|
@NgModule({
|
|
6
6
|
imports: [RouterModule.forChild([
|
|
7
|
-
{%- if category.
|
|
8
|
-
{path: '', redirectTo: '{{ category.
|
|
7
|
+
{%- if category.builtChildren.length %}
|
|
8
|
+
{path: '', redirectTo: '{{ category.builtChildren[0].route }}', pathMatch: 'full' },
|
|
9
9
|
{%- endif %}
|
|
10
10
|
{
|
|
11
11
|
path: '',
|
|
12
12
|
children: [
|
|
13
|
-
{%- for child in category.
|
|
13
|
+
{%- for child in category.builtChildren %}
|
|
14
14
|
{
|
|
15
15
|
path: '{{ child.route }}',
|
|
16
16
|
loadChildren: () => import('{{ child.moduleImport }}').then(m => m.DynamicModule)
|