@ng-doc/add 15.0.0-beta.9 → 15.0.1
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/README.md +35 -6
- package/package.json +25 -4
- package/schematics/ng-add/constants/assets.d.ts +6 -1
- package/schematics/ng-add/constants/assets.js +25 -18
- package/schematics/ng-add/constants/assets.js.map +1 -1
- package/schematics/ng-add/constants/styles.js +1 -1
- package/schematics/ng-add/constants/styles.js.map +1 -1
- package/schematics/ng-add/index.js +5 -1
- package/schematics/ng-add/index.js.map +1 -1
- package/schematics/ng-add/steps/add-assets.js +2 -2
- package/schematics/ng-add/steps/add-assets.js.map +1 -1
- package/schematics/ng-add/steps/add-git-ignore.js.map +1 -1
- package/schematics/ng-add/steps/add-js-dependencies.d.ts +8 -0
- package/schematics/ng-add/steps/add-js-dependencies.js +32 -0
- package/schematics/ng-add/steps/add-js-dependencies.js.map +1 -0
- package/schematics/ng-add/steps/add-layout.js +3 -3
- package/schematics/ng-add/steps/add-layout.js.map +1 -1
- package/schematics/ng-add/steps/add-tsconfig-paths.js +6 -6
- package/schematics/ng-add/steps/add-tsconfig-paths.js.map +1 -1
- package/schematics/ng-add/steps/replace-builders.js +4 -6
- package/schematics/ng-add/steps/replace-builders.js.map +1 -1
- package/schematics/ng-add/steps/update-app-ts-config.d.ts +7 -0
- package/schematics/ng-add/steps/update-app-ts-config.js +51 -0
- package/schematics/ng-add/steps/update-app-ts-config.js.map +1 -0
package/README.md
CHANGED
|
@@ -1,11 +1,40 @@
|
|
|
1
|
-
|
|
1
|
+
[![GitHub Workflow Status][build-shield]][build-url]
|
|
2
|
+
[![NPM][npm-shield]][npm-url]
|
|
3
|
+
[![MIT License][license-shield]][license-url]
|
|
2
4
|
|
|
3
|
-
|
|
5
|
+
<!-- PROJECT LOGO -->
|
|
6
|
+
<br />
|
|
7
|
+
<div align="center">
|
|
8
|
+
<a href="https://github.com/skoropadas/ng-doc">
|
|
9
|
+
<img src="https://ng-doc.com/assets/images/ng-doc.svg" alt="Logo" height="100px">
|
|
10
|
+
</a>
|
|
4
11
|
|
|
5
|
-
|
|
12
|
+
<h3 align="center">NgDoc</h3>
|
|
6
13
|
|
|
7
|
-
|
|
14
|
+
<p align="center">
|
|
15
|
+
Create documentation faster than ever!
|
|
16
|
+
<br />
|
|
17
|
+
<a href="https://ng-doc.com/"><strong>Explore the docs »</strong></a>
|
|
18
|
+
<br />
|
|
19
|
+
<br />
|
|
20
|
+
<a href="https://ng-doc.com/getting-started/roadmap">Roadmap</a>
|
|
21
|
+
·
|
|
22
|
+
<a href="https://github.com/skoropadas/ng-doc/issues">Report Bug</a>
|
|
23
|
+
·
|
|
24
|
+
<a href="https://github.com/skoropadas/ng-doc/issues">Request Feature</a>
|
|
25
|
+
</p>
|
|
26
|
+
</div>
|
|
8
27
|
|
|
9
|
-
|
|
28
|
+
<!-- ABOUT THE PROJECT -->
|
|
10
29
|
|
|
11
|
-
|
|
30
|
+
## About The Project
|
|
31
|
+
|
|
32
|
+
This library is a part of NgDoc project, that uses to create documentation
|
|
33
|
+
for Angular projects, please check our [repo](https://github.com/skoropadas/ng-doc) for more details.
|
|
34
|
+
|
|
35
|
+
[npm-shield]: https://img.shields.io/npm/v/@ng-doc/builder.svg?style=for-the-badge
|
|
36
|
+
[npm-url]: https://www.npmjs.com/package/@ng-doc/builder
|
|
37
|
+
[license-shield]: https://img.shields.io/github/license/skoropadas/ng-doc.svg?style=for-the-badge
|
|
38
|
+
[license-url]: https://github.com/othneildrew/Best-README-Template/blob/master/LICENSE.txt
|
|
39
|
+
[build-shield]: https://img.shields.io/github/actions/workflow/status/skoropadas/ng-doc/release.yml?style=for-the-badge&branch=release
|
|
40
|
+
[build-url]: https://github.com/skoropadas/ng-doc/actions
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ng-doc/add",
|
|
3
|
-
"version": "15.0.
|
|
3
|
+
"version": "15.0.1",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"schematics": "./schematics/collection.json",
|
|
6
6
|
"ng-add": {
|
|
@@ -9,10 +9,31 @@
|
|
|
9
9
|
"publishConfig": {
|
|
10
10
|
"access": "public"
|
|
11
11
|
},
|
|
12
|
-
"
|
|
13
|
-
"@angular/cdk": ">=
|
|
12
|
+
"dependencies": {
|
|
13
|
+
"@angular/cdk": ">=15.0.0",
|
|
14
|
+
"@angular-devkit/schematics": ">=15.0.0",
|
|
14
15
|
"ng-morph": "^2.1.1"
|
|
15
16
|
},
|
|
16
17
|
"main": "./schematics/index.js",
|
|
17
|
-
"types": "./schematics/index.d.ts"
|
|
18
|
+
"types": "./schematics/index.d.ts",
|
|
19
|
+
"keywords": [
|
|
20
|
+
"angular",
|
|
21
|
+
"documentation",
|
|
22
|
+
"generator",
|
|
23
|
+
"builder",
|
|
24
|
+
"guides",
|
|
25
|
+
"api",
|
|
26
|
+
"demo",
|
|
27
|
+
"ng-doc"
|
|
28
|
+
],
|
|
29
|
+
"author": "Skoropad Aleksandr <alex@skoropad.dev>",
|
|
30
|
+
"repository": {
|
|
31
|
+
"type": "git",
|
|
32
|
+
"url": "git+https://github.com/skoropadas/ng-doc.git"
|
|
33
|
+
},
|
|
34
|
+
"bugs": {
|
|
35
|
+
"url": "https://github.com/skoropadas/ng-doc/issues"
|
|
36
|
+
},
|
|
37
|
+
"homepage": "https://ng-doc.com/",
|
|
38
|
+
"license": "MIT"
|
|
18
39
|
}
|
|
@@ -1,21 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
3
|
+
exports.getNgDocAssets = void 0;
|
|
4
|
+
/**
|
|
5
|
+
*
|
|
6
|
+
* @param options
|
|
7
|
+
*/
|
|
8
|
+
function getNgDocAssets(options) {
|
|
9
|
+
return [
|
|
10
|
+
{
|
|
11
|
+
glob: '**/*',
|
|
12
|
+
input: 'node_modules/@ng-doc/app/assets',
|
|
13
|
+
output: 'assets/ng-doc/app',
|
|
14
|
+
},
|
|
15
|
+
{
|
|
16
|
+
glob: '**/*',
|
|
17
|
+
input: 'node_modules/@ng-doc/ui-kit/assets',
|
|
18
|
+
output: 'assets/ng-doc/ui-kit',
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
glob: '**/*',
|
|
22
|
+
input: `.ng-doc/${options.project}/assets`,
|
|
23
|
+
output: 'assets/ng-doc',
|
|
24
|
+
},
|
|
25
|
+
];
|
|
26
|
+
}
|
|
27
|
+
exports.getNgDocAssets = getNgDocAssets;
|
|
21
28
|
//# sourceMappingURL=assets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/assets.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/assets.ts"],"names":[],"mappings":";;;AAEA;;;GAGG;AACH,SAAgB,cAAc,CAAC,OAAe;IAC7C,OAAO;QACN;YACC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,iCAAiC;YACxC,MAAM,EAAE,mBAAmB;SAC3B;QACD;YACC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,oCAAoC;YAC3C,MAAM,EAAE,sBAAsB;SAC9B;QACD;YACC,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,WAAW,OAAO,CAAC,OAAO,SAAS;YAC1C,MAAM,EAAE,eAAe;SACvB;KACD,CAAC;AACH,CAAC;AAlBD,wCAkBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NG_DOC_STYLES = void 0;
|
|
4
|
-
exports.NG_DOC_STYLES = ['
|
|
4
|
+
exports.NG_DOC_STYLES = ['node_modules/@ng-doc/app/styles/global.css'];
|
|
5
5
|
//# sourceMappingURL=styles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/styles.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/constants/styles.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAa,CAAC,4CAA4C,CAAC,CAAC"}
|
|
@@ -7,11 +7,13 @@ const ng_morph_1 = require("ng-morph");
|
|
|
7
7
|
const version_1 = require("./constants/version");
|
|
8
8
|
const add_assets_1 = require("./steps/add-assets");
|
|
9
9
|
const add_git_ignore_1 = require("./steps/add-git-ignore");
|
|
10
|
+
const add_js_dependencies_1 = require("./steps/add-js-dependencies");
|
|
10
11
|
const add_layout_1 = require("./steps/add-layout");
|
|
11
12
|
const add_ng_doc_modules_1 = require("./steps/add-ng-doc-modules");
|
|
12
13
|
const add_styles_1 = require("./steps/add-styles");
|
|
13
14
|
const add_tsconfig_paths_1 = require("./steps/add-tsconfig-paths");
|
|
14
15
|
const replace_builders_1 = require("./steps/replace-builders");
|
|
16
|
+
const update_app_ts_config_1 = require("./steps/update-app-ts-config");
|
|
15
17
|
/**
|
|
16
18
|
*
|
|
17
19
|
* @param options
|
|
@@ -39,10 +41,12 @@ function ngAddSetupProject(options) {
|
|
|
39
41
|
(0, replace_builders_1.replaceBuilders)(options),
|
|
40
42
|
(0, add_styles_1.addStyles)(options),
|
|
41
43
|
(0, add_assets_1.addAssets)(options),
|
|
44
|
+
(0, add_js_dependencies_1.addJsDependencies)(options),
|
|
42
45
|
(0, add_ng_doc_modules_1.addNgDocModules)(options),
|
|
43
46
|
(0, add_layout_1.addLayout)(options),
|
|
44
47
|
(0, add_tsconfig_paths_1.addTsconfigPaths)(options),
|
|
45
|
-
(0,
|
|
48
|
+
(0, update_app_ts_config_1.updateAppTsConfig)(options),
|
|
49
|
+
(0, add_git_ignore_1.addGitIgnore)(),
|
|
46
50
|
]);
|
|
47
51
|
}
|
|
48
52
|
exports.ngAddSetupProject = ngAddSetupProject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/add/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA+E;AAC/E,4DAA0F;AAC1F,uCAAgH;AAEhH,iDAAmD;AAEnD,mDAA6C;AAC7C,2DAAoD;AACpD,mDAA6C;AAC7C,mEAA2D;AAC3D,mDAA6C;AAC7C,mEAA4D;AAC5D,+DAAyD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../libs/add/schematics/ng-add/index.ts"],"names":[],"mappings":";;;AAAA,2DAA+E;AAC/E,4DAA0F;AAC1F,uCAAgH;AAEhH,iDAAmD;AAEnD,mDAA6C;AAC7C,2DAAoD;AACpD,qEAA8D;AAC9D,mDAA6C;AAC7C,mEAA2D;AAC3D,mDAA6C;AAC7C,mEAA4D;AAC5D,+DAAyD;AACzD,uEAA+D;AAE/D;;;GAGG;AACH,SAAgB,KAAK,CAAC,OAAe;IACpC,OAAO,CAAC,IAAU,EAAE,OAAyB,EAAE,EAAE;QAChD,IAAA,2BAAgB,EAAC,IAAA,wBAAa,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAErE,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAC/E,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QACnF,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAClF,IAAA,mCAAwB,EAAC,IAAI,EAAE,EAAC,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,wBAAc,EAAC,CAAC,CAAC;QAChF,IAAA,sCAA2B,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QAEjD,OAAO,CAAC,OAAO,CAAC,IAAI,8BAAsB,EAAE,EAAE;YAC7C,OAAO,CAAC,OAAO,CAAC,IAAI,wBAAgB,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;SACtE,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAdD,sBAcC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAChD,OAAO,IAAA,kBAAK,EAAC;QACZ,IAAA,kCAAe,EAAC,OAAO,CAAC;QACxB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,uCAAiB,EAAC,OAAO,CAAC;QAC1B,IAAA,oCAAe,EAAC,OAAO,CAAC;QACxB,IAAA,sBAAS,EAAC,OAAO,CAAC;QAClB,IAAA,qCAAgB,EAAC,OAAO,CAAC;QACzB,IAAA,wCAAiB,EAAC,OAAO,CAAC;QAC1B,IAAA,6BAAY,GAAE;KACd,CAAC,CAAC;AACJ,CAAC;AAZD,8CAYC"}
|
|
@@ -22,10 +22,10 @@ function addAssets(options) {
|
|
|
22
22
|
const targetOptions = (0, schematics_1.getProjectTargetOptions)(project, 'build');
|
|
23
23
|
const assets = targetOptions['assets'];
|
|
24
24
|
if (!assets) {
|
|
25
|
-
targetOptions['assets'] = assets_1.
|
|
25
|
+
targetOptions['assets'] = (0, assets_1.getNgDocAssets)(options);
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
|
-
targetOptions['assets'] = Array.from(new Set([...assets_1.
|
|
28
|
+
targetOptions['assets'] = Array.from(new Set([...(0, assets_1.getNgDocAssets)(options), ...assets]));
|
|
29
29
|
});
|
|
30
30
|
};
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-assets.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAGhE,qEAA8G;AAE9G,
|
|
1
|
+
{"version":3,"file":"add-assets.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-assets.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAGhE,qEAA8G;AAE9G,gDAAmD;AAEnD,sDAAgD;AAEhD;;;;GAIG;AACH,SAAgB,SAAS,CAAC,OAAe;IACxC,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,aAAa,GAA8B,IAAA,oCAAuB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3F,MAAM,MAAM,GAA0B,aAAa,CAAC,QAAQ,CAA0B,CAAC;YAEvF,IAAI,CAAC,MAAM,EAAE;gBACZ,aAAa,CAAC,QAAQ,CAAC,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,CAAC;gBAClD,OAAO;aACP;YAED,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,uBAAc,EAAC,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAxBD,8BAwBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-git-ignore.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-git-ignore.ts"],"names":[],"mappings":";;;AACA,qEAA2F;AAE3F;;;;GAIG;AACH,SAAgB,YAAY;IAC3B,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YAEtE,MAAM,SAAS,GAAkB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEzD,IAAI,CAAC,SAAS,EAAE;gBACf,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;gBAEtG,OAAO;aACP;YAED,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,SAAS,4BAA4B,CAAC,
|
|
1
|
+
{"version":3,"file":"add-git-ignore.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-git-ignore.ts"],"names":[],"mappings":";;;AACA,qEAA2F;AAE3F;;;;GAIG;AACH,SAAgB,YAAY;IAC3B,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAC;YAEtE,MAAM,SAAS,GAAkB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAEzD,IAAI,CAAC,SAAS,EAAE;gBACf,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;gBAEtG,OAAO;aACP;YAED,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,GAAG,SAAS,4BAA4B,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAhBD,oCAgBC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addJsDependencies = void 0;
|
|
4
|
+
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
6
|
+
const get_project_1 = require("../utils/get-project");
|
|
7
|
+
/**
|
|
8
|
+
*
|
|
9
|
+
* @param options
|
|
10
|
+
* @param context
|
|
11
|
+
*/
|
|
12
|
+
function addJsDependencies(options) {
|
|
13
|
+
return async (tree, context) => {
|
|
14
|
+
return (0, workspace_1.updateWorkspace)((workspace) => {
|
|
15
|
+
context.logger.info(`[INFO]: Adding @ng-doc/core to allowedCommonJsDependencies...`);
|
|
16
|
+
const project = (0, get_project_1.getProject)(options, workspace);
|
|
17
|
+
if (!project) {
|
|
18
|
+
context.logger.warn(`[WARNING]: Target project not found.`);
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const targetOptions = (0, schematics_1.getProjectTargetOptions)(project, 'build');
|
|
22
|
+
const jsDependencies = targetOptions['allowedCommonJsDependencies'];
|
|
23
|
+
if (!jsDependencies) {
|
|
24
|
+
targetOptions['allowedCommonJsDependencies'] = ['@ng-doc/core'];
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
targetOptions['allowedCommonJsDependencies'] = Array.from(new Set([...jsDependencies, '@ng-doc/core']));
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
exports.addJsDependencies = addJsDependencies;
|
|
32
|
+
//# sourceMappingURL=add-js-dependencies.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-js-dependencies.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-js-dependencies.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAGhE,qEAA8G;AAG9G,sDAAgD;AAEhD;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAChD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;YAErF,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,aAAa,GAA8B,IAAA,oCAAuB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3F,MAAM,cAAc,GAA0B,aAAa,CAAC,6BAA6B,CAE7E,CAAC;YAEb,IAAI,CAAC,cAAc,EAAE;gBACpB,aAAa,CAAC,6BAA6B,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gBAChE,OAAO;aACP;YAED,aAAa,CAAC,6BAA6B,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC;QACzG,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA1BD,8CA0BC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addLayout = void 0;
|
|
4
4
|
const schematics_1 = require("@angular/cdk/schematics");
|
|
5
|
-
const workspace_1 = require("@
|
|
5
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
6
6
|
const app_component_content_1 = require("../constants/app-component-content");
|
|
7
7
|
const get_app_template_path_1 = require("../utils/get-app-template-path");
|
|
8
8
|
const get_project_1 = require("../utils/get-project");
|
|
@@ -12,7 +12,7 @@ const get_project_1 = require("../utils/get-project");
|
|
|
12
12
|
*/
|
|
13
13
|
function addLayout(options) {
|
|
14
14
|
return async (tree, context) => {
|
|
15
|
-
context.logger.info(`[INFO]: Adding
|
|
15
|
+
context.logger.info(`[INFO]: Adding NgDoc layout to the root component...`);
|
|
16
16
|
const workspace = await (0, workspace_1.getWorkspace)(tree);
|
|
17
17
|
const project = (0, get_project_1.getProject)(options, workspace);
|
|
18
18
|
if (!project) {
|
|
@@ -30,7 +30,7 @@ function addLayout(options) {
|
|
|
30
30
|
recorder.remove(0, html.length);
|
|
31
31
|
recorder.insertLeft(0, app_component_content_1.APP_COMPONENT_CONTENT);
|
|
32
32
|
tree.commitUpdate(recorder);
|
|
33
|
-
context.logger.info(`Content of the app component was replaced with ng-doc layout.`);
|
|
33
|
+
context.logger.info(`[INFO]: Content of the app component was replaced with ng-doc layout.`);
|
|
34
34
|
}
|
|
35
35
|
};
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-layout.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-layout.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAIhE
|
|
1
|
+
{"version":3,"file":"add-layout.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-layout.ts"],"names":[],"mappings":";;;AAAA,wDAAgE;AAIhE,qEAAmE;AAEnE,8EAAyE;AAEzE,0EAAkE;AAClE,sDAAgD;AAEhD;;;GAGG;AACH,SAAgB,SAAS,CAAC,OAAe;IACxC,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;QAE5E,MAAM,SAAS,GAAwB,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAChE,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAE9E,IAAI,CAAC,OAAO,EAAE;YACb,OAAO;SACP;QAED,MAAM,YAAY,GAA8B,IAAA,oCAAuB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1F,MAAM,eAAe,GAAuB,IAAA,0CAAkB,EAAC,IAAI,EAAE,YAAY,CAAC,MAAM,CAAW,CAAC,CAAC;QAErG,IAAI,CAAC,eAAe,EAAE;YACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;YAExF,OAAO;SACP;QAED,MAAM,IAAI,GAAkB,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAEvD,IAAI,IAAI,EAAE;YACT,MAAM,QAAQ,GAAmB,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAEnE,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAChC,QAAQ,CAAC,UAAU,CAAC,CAAC,EAAE,6CAAqB,CAAC,CAAC;YAC9C,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;YAE5B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;SAC7F;IACF,CAAC,CAAC;AACH,CAAC;AAjCD,8BAiCC"}
|
|
@@ -22,15 +22,15 @@ function addTsconfigPaths(options) {
|
|
|
22
22
|
const buildTarget = project.targets.get('build');
|
|
23
23
|
const serveTarget = project.targets.get('serve');
|
|
24
24
|
if (buildTarget) {
|
|
25
|
-
const tsConfigPath =
|
|
26
|
-
updateTsConfigPaths(tree, tsConfigPath, options.project);
|
|
25
|
+
const tsConfigPath = buildTarget.options && buildTarget.options['tsConfig'];
|
|
26
|
+
tsConfigPath && updateTsConfigPaths(tree, String(tsConfigPath), options.project);
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
29
|
context.logger.warn(`[WARNING]: "build" target was not found, please add paths to ".ng-doc" folder in your tsconfig.json file manually.`);
|
|
30
30
|
}
|
|
31
31
|
if (serveTarget) {
|
|
32
|
-
const tsConfigPath =
|
|
33
|
-
updateTsConfigPaths(tree, tsConfigPath, options.project);
|
|
32
|
+
const tsConfigPath = serveTarget.options && serveTarget.options['tsConfig'];
|
|
33
|
+
tsConfigPath && updateTsConfigPaths(tree, String(tsConfigPath), options.project);
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
context.logger.warn(`[WARNING]: "serve" target was not found, please add paths to ".ng-doc" folder in your tsconfig.json file manually.`);
|
|
@@ -51,8 +51,8 @@ function updateTsConfigPaths(tree, filePath, projectName) {
|
|
|
51
51
|
const paths = json.get(['compilerOptions', 'paths']);
|
|
52
52
|
const ext = json.get(['extends']);
|
|
53
53
|
if (paths || !ext) {
|
|
54
|
-
json.modify(['compilerOptions', 'paths', `${modules_1.GENERATED_PATH}`], `.ng-doc/${projectName}/index.ts`);
|
|
55
|
-
json.modify(['compilerOptions', 'paths', `${modules_1.GENERATED_PATH}/*`], `.ng-doc/${projectName}/*`);
|
|
54
|
+
json.modify(['compilerOptions', 'paths', `${modules_1.GENERATED_PATH}`], [`.ng-doc/${projectName}/index.ts`]);
|
|
55
|
+
json.modify(['compilerOptions', 'paths', `${modules_1.GENERATED_PATH}/*`], [`.ng-doc/${projectName}/*`]);
|
|
56
56
|
}
|
|
57
57
|
else if (ext) {
|
|
58
58
|
updateTsConfigPaths(tree, path.join(path.dirname(filePath), ext), projectName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-tsconfig-paths.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-tsconfig-paths.ts"],"names":[],"mappings":";;;AACA,qEAK+C;AAC/C,uCAAkC;AAClC,6BAA6B;AAE7B,kDAAoD;AAEpD,sDAAgD;AAEhD;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,OAAe;IAC/C,
|
|
1
|
+
{"version":3,"file":"add-tsconfig-paths.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/add-tsconfig-paths.ts"],"names":[],"mappings":";;;AACA,qEAK+C;AAC/C,uCAAkC;AAClC,6BAA6B;AAE7B,kDAAoD;AAEpD,sDAAgD;AAEhD;;;GAGG;AACH,SAAgB,gBAAgB,CAAC,OAAe;IAC/C,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YAEzE,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAE/E,IAAI,WAAW,EAAE;gBAChB,MAAM,YAAY,GACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAO,CAAC,UAAU,CAAY,CAAC;gBAEpE,YAAY,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aACjF;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAClB,oHAAoH,CACpH,CAAC;aACF;YAED,IAAI,WAAW,EAAE;gBAChB,MAAM,YAAY,GACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAO,CAAC,UAAU,CAAY,CAAC;gBAEpE,YAAY,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;aACjF;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAClB,oHAAoH,CACpH,CAAC;aACF;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAtCD,4CAsCC;AAED;;;;;;GAMG;AACH,SAAS,mBAAmB,CAAC,IAAU,EAAE,QAAgB,EAAE,WAAmB;IAC7E,MAAM,IAAI,GAAa,IAAI,mBAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAuB,IAAI,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IACzE,MAAM,GAAG,GAAuB,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAEtD,IAAI,KAAK,IAAI,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,OAAO,EAAE,GAAG,wBAAc,EAAE,CAAC,EAAE,CAAC,WAAW,WAAW,WAAW,CAAC,CAAC,CAAC;QACpG,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,OAAO,EAAE,GAAG,wBAAc,IAAI,CAAC,EAAE,CAAC,WAAW,WAAW,IAAI,CAAC,CAAC,CAAC;KAC/F;SAAM,IAAI,GAAG,EAAE;QACf,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;KAC/E;AACF,CAAC"}
|
|
@@ -20,10 +20,9 @@ function replaceBuilders(options) {
|
|
|
20
20
|
const serveTarget = project.targets.get('serve');
|
|
21
21
|
if (buildTarget) {
|
|
22
22
|
buildTarget.builder = '@ng-doc/builder:browser';
|
|
23
|
-
Object.keys(buildTarget.configurations)
|
|
24
|
-
.forEach((config) => {
|
|
23
|
+
Object.keys(buildTarget.configurations).forEach((config) => {
|
|
25
24
|
buildTarget.configurations[config].ngDoc = {
|
|
26
|
-
pages: project.sourceRoot
|
|
25
|
+
pages: project.sourceRoot,
|
|
27
26
|
};
|
|
28
27
|
});
|
|
29
28
|
context.logger.info(`[INFO]: The page path for "build" target is set to "${project.sourceRoot}"`);
|
|
@@ -33,10 +32,9 @@ function replaceBuilders(options) {
|
|
|
33
32
|
}
|
|
34
33
|
if (serveTarget) {
|
|
35
34
|
serveTarget.builder = '@ng-doc/builder:dev-server';
|
|
36
|
-
Object.keys(serveTarget.configurations)
|
|
37
|
-
.forEach((config) => {
|
|
35
|
+
Object.keys(serveTarget.configurations).forEach((config) => {
|
|
38
36
|
serveTarget.configurations[config].ngDoc = {
|
|
39
|
-
pages: project.sourceRoot
|
|
37
|
+
pages: project.sourceRoot,
|
|
40
38
|
};
|
|
41
39
|
});
|
|
42
40
|
context.logger.info(`[INFO]: The page path for "serve" target is set to "${project.sourceRoot}"`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replace-builders.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/replace-builders.ts"],"names":[],"mappings":";;;AACA,qEAK+C;
|
|
1
|
+
{"version":3,"file":"replace-builders.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/replace-builders.ts"],"names":[],"mappings":";;;AACA,qEAK+C;AAG/C,sDAAgD;AAEhD;;;GAGG;AACH,SAAgB,eAAe,CAAC,OAAe;IAC9C,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YAE7D,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAE/E,IAAI,WAAW,EAAE;gBAChB,WAAW,CAAC,OAAO,GAAG,yBAAyB,CAAC;gBAEhD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;oBACxE,WAAW,CAAC,cAAsB,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG;wBACnD,KAAK,EAAE,OAAO,CAAC,UAAU;qBACzB,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC;aAClG;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;aACrG;YAED,IAAI,WAAW,EAAE;gBAChB,WAAW,CAAC,OAAO,GAAG,4BAA4B,CAAC;gBAEnD,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,cAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;oBACxE,WAAW,CAAC,cAAsB,CAAC,MAAM,CAAC,CAAC,KAAK,GAAG;wBACnD,KAAK,EAAE,OAAO,CAAC,UAAU;qBACzB,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,OAAO,CAAC,UAAU,GAAG,CAAC,CAAC;aAClG;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;aACrG;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AA1CD,0CA0CC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateAppTsConfig = void 0;
|
|
4
|
+
const workspace_1 = require("@schematics/angular/utility/workspace");
|
|
5
|
+
const ng_morph_1 = require("ng-morph");
|
|
6
|
+
const get_project_1 = require("../utils/get-project");
|
|
7
|
+
/**
|
|
8
|
+
*
|
|
9
|
+
* @param options
|
|
10
|
+
*/
|
|
11
|
+
function updateAppTsConfig(options) {
|
|
12
|
+
return async (tree, context) => {
|
|
13
|
+
return (0, workspace_1.updateWorkspace)((workspace) => {
|
|
14
|
+
context.logger.info(`[INFO]: Updating application tsconfig...`);
|
|
15
|
+
const project = (0, get_project_1.getProject)(options, workspace);
|
|
16
|
+
if (!project) {
|
|
17
|
+
context.logger.warn(`[WARNING]: Target project not found.`);
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const buildTarget = project.targets.get('build');
|
|
21
|
+
const serveTarget = project.targets.get('serve');
|
|
22
|
+
if (buildTarget) {
|
|
23
|
+
const tsConfigPath = buildTarget.options && buildTarget.options['tsConfig'];
|
|
24
|
+
tsConfigPath && updateTsConfig(tree, String(tsConfigPath));
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
context.logger.warn(`[WARNING]: "build" target was not found.`);
|
|
28
|
+
}
|
|
29
|
+
if (serveTarget) {
|
|
30
|
+
const tsConfigPath = serveTarget.options && serveTarget.options['tsConfig'];
|
|
31
|
+
tsConfigPath && updateTsConfig(tree, String(tsConfigPath));
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
context.logger.warn(`[WARNING]: "serve" target was not found.`);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
exports.updateAppTsConfig = updateAppTsConfig;
|
|
40
|
+
/**
|
|
41
|
+
*
|
|
42
|
+
* @param tree
|
|
43
|
+
* @param path
|
|
44
|
+
* @param filePath
|
|
45
|
+
* @param projectName
|
|
46
|
+
*/
|
|
47
|
+
function updateTsConfig(tree, filePath) {
|
|
48
|
+
const json = new ng_morph_1.JSONFile(tree, filePath);
|
|
49
|
+
json.modify(['compilerOptions', 'allowSyntheticDefaultImports'], true);
|
|
50
|
+
}
|
|
51
|
+
//# sourceMappingURL=update-app-ts-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-app-ts-config.js","sourceRoot":"","sources":["../../../../../../libs/add/schematics/ng-add/steps/update-app-ts-config.ts"],"names":[],"mappings":";;;AACA,qEAK+C;AAC/C,uCAAkC;AAGlC,sDAAgD;AAEhD;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,OAAe;IAChD,OAAO,KAAK,EAAE,IAAU,EAAE,OAAyB,EAAE,EAAE;QACtD,OAAO,IAAA,2BAAe,EAAC,CAAC,SAA8B,EAAE,EAAE;YACzD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;YAEhE,MAAM,OAAO,GAAkC,IAAA,wBAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAE9E,IAAI,CAAC,OAAO,EAAE;gBACb,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;gBAC5D,OAAO;aACP;YAED,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,WAAW,GAAiC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAE/E,IAAI,WAAW,EAAE;gBAChB,MAAM,YAAY,GACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAO,CAAC,UAAU,CAAY,CAAC;gBAEpE,YAAY,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;aAC3D;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;aAChE;YAED,IAAI,WAAW,EAAE;gBAChB,MAAM,YAAY,GACjB,WAAW,CAAC,OAAO,IAAK,WAAW,CAAC,OAAO,CAAC,UAAU,CAAY,CAAC;gBAEpE,YAAY,IAAI,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;aAC3D;iBAAM;gBACN,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;aAChE;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;AACH,CAAC;AAlCD,8CAkCC;AAED;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,IAAU,EAAE,QAAgB;IACnD,MAAM,IAAI,GAAa,IAAI,mBAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAEpD,IAAI,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,8BAA8B,CAAC,EAAE,IAAI,CAAC,CAAC;AACxE,CAAC"}
|