@rxap/plugin-nestjs 19.1.2-dev.1 → 19.1.2-dev.10
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/CHANGELOG.md +45 -0
- package/GUIDES.md +42 -1
- package/package.json +14 -14
- package/src/generators/health-indicator/generator.js +3 -3
- package/src/generators/health-indicator/generator.js.map +1 -1
- package/src/generators/init-application/set-general-target-defaults.js +0 -1
- package/src/generators/init-application/set-general-target-defaults.js.map +1 -1
- package/src/generators/init-application/update-project-targets.js +21 -12
- package/src/generators/init-application/update-project-targets.js.map +1 -1
- package/src/generators/microservice/generator.js +6 -5
- package/src/generators/microservice/generator.js.map +1 -1
- package/src/generators/swagger/generator.js +16 -13
- package/src/generators/swagger/generator.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,51 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [19.1.2-dev.10](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.9...@rxap/plugin-nestjs@19.1.2-dev.10) (2024-07-10)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rxap/plugin-nestjs
|
|
9
|
+
|
|
10
|
+
## [19.1.2-dev.9](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.8...@rxap/plugin-nestjs@19.1.2-dev.9) (2024-07-10)
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
- ensure services are correctly created ([6760176](https://gitlab.com/rxap/packages/commit/6760176b43db349b696bded511ac6dd1ba3ef02d))
|
|
15
|
+
|
|
16
|
+
## [19.1.2-dev.8](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.7...@rxap/plugin-nestjs@19.1.2-dev.8) (2024-07-09)
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
- use /swagger as swagger build output ([4609b23](https://gitlab.com/rxap/packages/commit/4609b23fdfcec1cf2e9fe458d8648ac7ee40dc36))
|
|
21
|
+
|
|
22
|
+
## [19.1.2-dev.7](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.6...@rxap/plugin-nestjs@19.1.2-dev.7) (2024-07-03)
|
|
23
|
+
|
|
24
|
+
**Note:** Version bump only for package @rxap/plugin-nestjs
|
|
25
|
+
|
|
26
|
+
## [19.1.2-dev.6](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.5...@rxap/plugin-nestjs@19.1.2-dev.6) (2024-07-03)
|
|
27
|
+
|
|
28
|
+
### Bug Fixes
|
|
29
|
+
|
|
30
|
+
- check if build target exists ([1df2bd1](https://gitlab.com/rxap/packages/commit/1df2bd1c6e8b885ad8efc2831c621e502f82c41c))
|
|
31
|
+
- check if build target exists ([17059b0](https://gitlab.com/rxap/packages/commit/17059b08551acf15a7f0ecd7a06d32ae3c2ed06c))
|
|
32
|
+
|
|
33
|
+
## [19.1.2-dev.5](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.4...@rxap/plugin-nestjs@19.1.2-dev.5) (2024-07-03)
|
|
34
|
+
|
|
35
|
+
### Bug Fixes
|
|
36
|
+
|
|
37
|
+
- support plugin based build targets ([d18058f](https://gitlab.com/rxap/packages/commit/d18058f9673cf3f61abe59ccad18e8370d79c636))
|
|
38
|
+
|
|
39
|
+
## [19.1.2-dev.4](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.3...@rxap/plugin-nestjs@19.1.2-dev.4) (2024-07-03)
|
|
40
|
+
|
|
41
|
+
**Note:** Version bump only for package @rxap/plugin-nestjs
|
|
42
|
+
|
|
43
|
+
## [19.1.2-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.2...@rxap/plugin-nestjs@19.1.2-dev.3) (2024-07-03)
|
|
44
|
+
|
|
45
|
+
**Note:** Version bump only for package @rxap/plugin-nestjs
|
|
46
|
+
|
|
47
|
+
## [19.1.2-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.1...@rxap/plugin-nestjs@19.1.2-dev.2) (2024-07-03)
|
|
48
|
+
|
|
49
|
+
**Note:** Version bump only for package @rxap/plugin-nestjs
|
|
50
|
+
|
|
6
51
|
## [19.1.2-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.2-dev.0...@rxap/plugin-nestjs@19.1.2-dev.1) (2024-07-02)
|
|
7
52
|
|
|
8
53
|
**Note:** Version bump only for package @rxap/plugin-nestjs
|
package/GUIDES.md
CHANGED
|
@@ -1,7 +1,48 @@
|
|
|
1
|
-
#
|
|
1
|
+
# Application
|
|
2
|
+
|
|
3
|
+
## Standalone
|
|
4
|
+
|
|
5
|
+
Use the nx generate to create a new application:
|
|
6
|
+
|
|
7
|
+
```bash
|
|
8
|
+
NAME=app
|
|
9
|
+
nx g @nx/nest:application \
|
|
10
|
+
--name=service-$NAME \
|
|
11
|
+
--directory service/$NAME \
|
|
12
|
+
--projectNameAndRootFormat as-provided \
|
|
13
|
+
--tags service,nest
|
|
14
|
+
```
|
|
15
|
+
|
|
16
|
+
Initialize the application:
|
|
17
|
+
|
|
18
|
+
```bash
|
|
19
|
+
nx g @rxap/plugin-nestjs:init-application \
|
|
20
|
+
--project service-$NAME \
|
|
21
|
+
--cleanup \
|
|
22
|
+
--generateMain \
|
|
23
|
+
--overwrite
|
|
24
|
+
```
|
|
25
|
+
|
|
26
|
+
## Standalone Microservice
|
|
27
|
+
|
|
28
|
+
Use the nx generate to create a new standalone microservice:
|
|
29
|
+
|
|
30
|
+
```bash
|
|
31
|
+
nx g @rxap/plugin-nestjs:frontend-microservice --name $NAME
|
|
32
|
+
```
|
|
33
|
+
|
|
34
|
+
## Frontend Microservice
|
|
2
35
|
|
|
3
36
|
Run the following command to create a new frontend microservice:
|
|
4
37
|
|
|
5
38
|
```bash
|
|
6
39
|
nx g @rxap/plugin-nestjs:frontend-microservice --feature $FEATURE --frontend $PROJECT
|
|
7
40
|
```
|
|
41
|
+
|
|
42
|
+
## Feature Microservice
|
|
43
|
+
|
|
44
|
+
Run the following command to create a new feature microservice:
|
|
45
|
+
|
|
46
|
+
```bash
|
|
47
|
+
nx g @rxap/plugin-nestjs:feature-microservice --feature $FEATURE --frontend $PROJECT
|
|
48
|
+
```
|
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "19.1.2-dev.
|
|
2
|
+
"version": "19.1.2-dev.10",
|
|
3
3
|
"name": "@rxap/plugin-nestjs",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@nx/devkit": "19.
|
|
7
|
-
"@nx/js": "19.
|
|
8
|
-
"@nx/nest": "19.
|
|
9
|
-
"@rxap/node-utilities": "^1.3.
|
|
10
|
-
"@rxap/plugin-application": "^19.1.1-dev.
|
|
11
|
-
"@rxap/plugin-library": "^19.3.2-dev.
|
|
12
|
-
"@rxap/plugin-open-api": "^19.1.4-dev.
|
|
13
|
-
"@rxap/plugin-utilities": "^19.0.6-dev.
|
|
14
|
-
"@rxap/ts-morph": "^1.4.3-dev.
|
|
15
|
-
"@rxap/utilities": "^16.3.0-dev.
|
|
16
|
-
"@rxap/workspace-ts-morph": "^19.1.3-dev.
|
|
17
|
-
"@rxap/workspace-utilities": "^19.4.0-dev.
|
|
6
|
+
"@nx/devkit": "19.4.2",
|
|
7
|
+
"@nx/js": "19.4.2",
|
|
8
|
+
"@nx/nest": "19.4.2",
|
|
9
|
+
"@rxap/node-utilities": "^1.3.3-dev.0",
|
|
10
|
+
"@rxap/plugin-application": "^19.1.1-dev.7",
|
|
11
|
+
"@rxap/plugin-library": "^19.3.2-dev.7",
|
|
12
|
+
"@rxap/plugin-open-api": "^19.1.4-dev.8",
|
|
13
|
+
"@rxap/plugin-utilities": "^19.0.6-dev.7",
|
|
14
|
+
"@rxap/ts-morph": "^1.4.3-dev.3",
|
|
15
|
+
"@rxap/utilities": "^16.3.0-dev.2",
|
|
16
|
+
"@rxap/workspace-ts-morph": "^19.1.3-dev.7",
|
|
17
|
+
"@rxap/workspace-utilities": "^19.4.0-dev.6",
|
|
18
18
|
"colors": "1.4.0",
|
|
19
19
|
"semver": "7.5.3",
|
|
20
20
|
"ts-morph": "18.0.0",
|
|
@@ -54,6 +54,6 @@
|
|
|
54
54
|
},
|
|
55
55
|
"schematics": "./generators.json",
|
|
56
56
|
"type": "commonjs",
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "2bc56c53056b39e5d40b0eeb1df951804bfdbd01",
|
|
58
58
|
"main": "./src/index.js"
|
|
59
59
|
}
|
|
@@ -13,12 +13,12 @@ function healthIndicatorGenerator(tree, options) {
|
|
|
13
13
|
project: options.project,
|
|
14
14
|
backend: undefined,
|
|
15
15
|
}, (project, [moduleSourceFile, controllerSourceFile, healthIndiectorSourceFile]) => {
|
|
16
|
-
(0, ts_morph_1.
|
|
16
|
+
(0, ts_morph_1.CoerceHealthIndicator)(healthIndiectorSourceFile, options.name);
|
|
17
17
|
(0, ts_morph_1.CoerceNestModuleProvider)(moduleSourceFile, {
|
|
18
|
-
providerObject: (0, utilities_1.
|
|
18
|
+
providerObject: (0, utilities_1.classify)(options.name) + 'HealthIndicator',
|
|
19
19
|
moduleSpecifier: `./${(0, utilities_1.dasherize)(options.name)}.health-indicator`,
|
|
20
20
|
});
|
|
21
|
-
(0, ts_morph_1.
|
|
21
|
+
(0, ts_morph_1.CoerceHealthEndpoint)(controllerSourceFile, options.name);
|
|
22
22
|
(0, ts_morph_1.AddToGlobalHealthEndpoint)(controllerSourceFile, options.name);
|
|
23
23
|
}, [
|
|
24
24
|
'/app/health/health.module.ts',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/health-indicator/generator.ts"],"names":[],"mappings":";;;;AACA,6CAKwB;AACxB,+
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/health-indicator/generator.ts"],"names":[],"mappings":";;;;AACA,6CAKwB;AACxB,+CAGyB;AACzB,iEAAuE;AACvE,kEAA8E;AAG9E,SAAsB,wBAAwB,CAC5C,IAAU,EACV,OAAuC;;QAEvC,MAAM,IAAA,mBAA4B,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClD,IAAA,gDAA2B,EAAC,IAAI,EAAE;YAChC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,OAAO,EAAE,SAAS;SACnB,EAAE,CAAC,OAAO,EAAE,CAAE,gBAAgB,EAAE,oBAAoB,EAAE,yBAAyB,CAAE,EAAE,EAAE;YACpF,IAAA,gCAAqB,EAAC,yBAAyB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/D,IAAA,mCAAwB,EAAC,gBAAgB,EAAE;gBACzC,cAAc,EAAE,IAAA,oBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,iBAAiB;gBAC1D,eAAe,EAAE,KAAM,IAAA,qBAAS,EAAC,OAAO,CAAC,IAAI,CAAE,mBAAmB;aACnE,CAAC,CAAC;YACH,IAAA,+BAAoB,EAAC,oBAAoB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;YACzD,IAAA,oCAAyB,EAAC,oBAAoB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC,EAAE;YACD,8BAA8B;YAC9B,kCAAkC;YAClC,eAAgB,IAAA,qBAAS,EAAC,OAAO,CAAC,IAAI,CAAE,uBAAuB;SAChE,CAAC,CAAC;IACL,CAAC;CAAA;AArBD,4DAqBC;AAED,kBAAe,wBAAwB,CAAC"}
|
|
@@ -19,7 +19,6 @@ function setGeneralTargetDefaults(tree, options) {
|
|
|
19
19
|
},
|
|
20
20
|
});
|
|
21
21
|
(0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'generate-open-api', 'swagger-generate');
|
|
22
|
-
(0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'test', '^generate-open-api');
|
|
23
22
|
}
|
|
24
23
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
25
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-general-target-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/set-general-target-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,mEAImC;AAGnC,SAAgB,wBAAwB,CAAC,IAAU,EAAE,OAAuC;IAC1F,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAExC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC;QACzE,IAAA,oDAA8B,EAC5B,MAAM,EAAE,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;QACxD,IAAA,kCAAY,EAAC,MAAM,EAAE,uBAAuB,EAAE;YAC5C,QAAQ,EAAE,kCAAkC;YAC5C,cAAc,EAAE;gBACd,UAAU,EAAE,EAAE;aACf;SACF,CAAC,CAAC;QACH,IAAA,oDAA8B,EAAC,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"set-general-target-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/set-general-target-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,mEAImC;AAGnC,SAAgB,wBAAwB,CAAC,IAAU,EAAE,OAAuC;IAC1F,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAExC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,IAAA,oDAA8B,EAAC,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,CAAC;QACzE,IAAA,oDAA8B,EAC5B,MAAM,EAAE,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;QACxD,IAAA,kCAAY,EAAC,MAAM,EAAE,uBAAuB,EAAE;YAC5C,QAAQ,EAAE,kCAAkC;YAC5C,cAAc,EAAE;gBACd,UAAU,EAAE,EAAE;aACf;SACF,CAAC,CAAC;QACH,IAAA,oDAA8B,EAAC,MAAM,EAAE,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;IAClF,CAAC;IAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAvBD,4DAuBC"}
|
|
@@ -2,16 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateProjectTargets = void 0;
|
|
4
4
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
|
+
const path_1 = require("path");
|
|
5
6
|
function updateProjectTargets(tree, projectName, project, options) {
|
|
6
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
7
|
-
var
|
|
7
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
8
|
+
var _l, _m, _o, _p;
|
|
8
9
|
if (!options.standalone) {
|
|
9
10
|
(0, workspace_utilities_1.CoerceTarget)(project, 'generate-package-json', {});
|
|
10
11
|
}
|
|
11
|
-
const outputPath = (_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.outputPath;
|
|
12
|
-
if (!outputPath) {
|
|
13
|
-
throw new Error(`No outputPath found for project ${projectName}`);
|
|
14
|
-
}
|
|
12
|
+
const outputPath = (_d = (_c = (_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.outputPath) !== null && _d !== void 0 ? _d : (0, path_1.join)('dist', project.root);
|
|
15
13
|
if (options.swagger && !options.standalone) {
|
|
16
14
|
(0, workspace_utilities_1.CoerceTarget)(project, 'generate-open-api', {
|
|
17
15
|
executor: '@rxap/plugin-library:run-generator',
|
|
@@ -26,7 +24,18 @@ function updateProjectTargets(tree, projectName, project, options) {
|
|
|
26
24
|
});
|
|
27
25
|
}
|
|
28
26
|
(0, workspace_utilities_1.CoerceTarget)(project, 'build', {
|
|
27
|
+
executor: '@nx/webpack:webpack',
|
|
28
|
+
outputs: ['{options.outputPath}'],
|
|
29
|
+
defaultConfiguration: 'production',
|
|
29
30
|
options: {
|
|
31
|
+
target: 'node',
|
|
32
|
+
compiler: 'tsc',
|
|
33
|
+
outputPath: (0, path_1.join)('dist', project.root),
|
|
34
|
+
main: (0, path_1.join)(project.root, 'src/main.ts'),
|
|
35
|
+
tsConfig: (0, path_1.join)(project.root, 'tsconfig.app.json'),
|
|
36
|
+
assets: [(0, path_1.join)(project.root, 'src/assets')],
|
|
37
|
+
isolatedConfig: true,
|
|
38
|
+
webpackConfig: (0, path_1.join)(project.root, 'webpack.config.js'),
|
|
30
39
|
generatePackageJson: true,
|
|
31
40
|
},
|
|
32
41
|
configurations: {
|
|
@@ -45,8 +54,8 @@ function updateProjectTargets(tree, projectName, project, options) {
|
|
|
45
54
|
}, workspace_utilities_1.Strategy.OVERWRITE);
|
|
46
55
|
if (tree.exists('LICENSE')) {
|
|
47
56
|
const buildConfiguration = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
48
|
-
(
|
|
49
|
-
(
|
|
57
|
+
(_e = buildConfiguration.options) !== null && _e !== void 0 ? _e : (buildConfiguration.options = {});
|
|
58
|
+
(_f = (_l = buildConfiguration.options).assets) !== null && _f !== void 0 ? _f : (_l.assets = []);
|
|
50
59
|
(0, workspace_utilities_1.CoerceAssets)(buildConfiguration.options.assets, [
|
|
51
60
|
{
|
|
52
61
|
'input': '',
|
|
@@ -56,10 +65,10 @@ function updateProjectTargets(tree, projectName, project, options) {
|
|
|
56
65
|
]);
|
|
57
66
|
(0, workspace_utilities_1.CoerceTarget)(project, 'build', buildConfiguration, workspace_utilities_1.Strategy.REPLACE);
|
|
58
67
|
}
|
|
59
|
-
if ((
|
|
60
|
-
(
|
|
61
|
-
(
|
|
62
|
-
(
|
|
68
|
+
if ((_g = project.targets) === null || _g === void 0 ? void 0 : _g['docker']) {
|
|
69
|
+
(_h = (_m = project.targets['docker']).options) !== null && _h !== void 0 ? _h : (_m.options = {});
|
|
70
|
+
(_j = (_o = project.targets['docker'].options).dockerfile) !== null && _j !== void 0 ? _j : (_o.dockerfile = 'shared/nestjs/Dockerfile');
|
|
71
|
+
(_k = (_p = project.targets['docker'].options).buildArgList) !== null && _k !== void 0 ? _k : (_p.buildArgList = []);
|
|
63
72
|
if (options.apiPrefix !== false &&
|
|
64
73
|
!project.targets['docker'].options.buildArgList.some((arg) => arg.startsWith('PATH_PREFIX='))) {
|
|
65
74
|
project.targets['docker'].options.buildArgList.push('PATH_PREFIX=REGEX:app/app.config.ts:validationSchema\\[\'GLOBAL_API_PREFIX\'\\]\\s*=\\s*Joi.string\\(\\).default\\(\\s*\'(.+)\',?\\s*\\);');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/update-project-targets.ts"],"names":[],"mappings":";;;AAIA,mEAKmC;
|
|
1
|
+
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/update-project-targets.ts"],"names":[],"mappings":";;;AAIA,mEAKmC;AACnC,+BAA4B;AAG5B,SAAgB,oBAAoB,CAClC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAuC;;;IAEvG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,IAAA,kCAAY,EAAC,OAAO,EAAE,uBAAuB,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,UAAU,GAAG,MAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,KAAK,0CAAE,OAAO,0CAAE,UAAU,mCAAI,IAAA,WAAI,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7F,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QAC3C,IAAA,kCAAY,EAAC,OAAO,EAAE,mBAAmB,EAAE;YACzC,QAAQ,EAAE,oCAAoC;YAC9C,OAAO,EAAE;gBACP,SAAS,EAAE,gCAAgC;gBAC3C,OAAO,EAAE;oBACP,OAAO,EAAE,YAAa,WAAY,EAAE;oBACpC,IAAI,EAAE,GAAI,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAE,eAAe;oBACtE,QAAQ,EAAE,WAAW;iBACtB;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAA,kCAAY,EAAC,OAAO,EAAE,OAAO,EAAE;QAC7B,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE,CAAE,sBAAsB,CAAC;QAClC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,KAAK;YACf,UAAU,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC;YACtC,IAAI,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC;YACvC,QAAQ,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC;YACjD,MAAM,EAAE,CAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAE;YAC5C,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC;YACtD,mBAAmB,EAAE,IAAI;SAC1B;QACD,cAAc,EAAE;YACd,UAAU,EAAE;gBACV,gBAAgB,EAAE;oBAChB;wBACE,OAAO,EAAE,GAAI,OAAO,CAAC,UAAW,8BAA8B;wBAC9D,IAAI,EAAE,GAAI,OAAO,CAAC,UAAW,mCAAmC;qBACjE;iBACF;aACF;YACD,WAAW,EAAE;gBACX,QAAQ,EAAE,IAAI;aACf;SACF;KACF,EAAE,8BAAQ,CAAC,SAAS,CAAC,CAAC;IAEvB,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,kBAAkB,GAAG,IAAA,+BAAS,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvD,MAAA,kBAAkB,CAAC,OAAO,oCAA1B,kBAAkB,CAAC,OAAO,GAAK,EAAE,EAAC;QAClC,YAAA,kBAAkB,CAAC,OAAO,EAAC,MAAM,uCAAN,MAAM,GAAK,EAAE,EAAC;QACzC,IAAA,kCAAY,EAAC,kBAAkB,CAAC,OAAO,CAAC,MAAM,EAAE;YAC9C;gBACE,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,SAAS;gBACjB,QAAQ,EAAE,GAAG;aACd;SACF,CAAC,CAAC;QACH,IAAA,kCAAY,EAAC,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,8BAAQ,CAAC,OAAO,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,MAAA,OAAO,CAAC,OAAO,0CAAG,QAAQ,CAAC,EAAE,CAAC;QAChC,YAAA,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;QACzC,YAAA,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAC,UAAU,uCAAV,UAAU,GAAK,0BAA0B,EAAC;QAC5E,YAAA,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAC,YAAY,uCAAZ,YAAY,GAAK,EAAE,EAAC;QACtD,IAAI,OAAO,CAAC,SAAS,KAAK,KAAK;YAC3B,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAC1G,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CACjD,2IAA2I,CAAC,CAAC;QACjJ,CAAC;IACH,CAAC;AAEH,CAAC;AA9ED,oDA8EC"}
|
|
@@ -16,15 +16,16 @@ function microserviceGenerator(tree, options) {
|
|
|
16
16
|
}
|
|
17
17
|
const presetOptions = (_b = (_a = nxJson.generators) === null || _a === void 0 ? void 0 : _a['@nx/nest:application']) !== null && _b !== void 0 ? _b : {};
|
|
18
18
|
let { directory, name } = options;
|
|
19
|
-
name = (0, utilities_1.dasherize)(name);
|
|
20
|
-
directory !== null && directory !== void 0 ? directory : (directory = (0, path_1.join)('service', name.replace(
|
|
19
|
+
name = (0, utilities_1.CoercePrefix)((0, utilities_1.dasherize)(name), 'service-');
|
|
20
|
+
directory !== null && directory !== void 0 ? directory : (directory = (0, path_1.join)('service', name.replace(/(^service-)/, '')));
|
|
21
21
|
(_c = presetOptions.tags) !== null && _c !== void 0 ? _c : (presetOptions.tags = '');
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
22
|
+
const tags = presetOptions.tags.split(',').map(tag => tag.trim());
|
|
23
|
+
(0, utilities_1.CoerceArrayItems)(tags, ['nest', 'service']);
|
|
24
|
+
presetOptions.tags = tags.join(',');
|
|
25
25
|
console.log('Generate nest application'.cyan);
|
|
26
26
|
console.log('name: ' + name.magenta);
|
|
27
27
|
console.log('directory: ' + directory.magenta);
|
|
28
|
+
console.log('tags: ' + tags.join(', ').magenta);
|
|
28
29
|
yield (0, nest_1.applicationGenerator)(tree, Object.assign(Object.assign({}, presetOptions), { projectNameAndRootFormat: 'as-provided', name,
|
|
29
30
|
directory }));
|
|
30
31
|
const projectName = name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,mCAAgD;AAChD,+
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,mCAAgD;AAChD,+CAIyB;AACzB,+BAA4B;AAC5B,6DAAqE;AAGrE,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAAoC;;;QAGpC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,sBAAsB,CAAC,mCAAI,EAAE,CAAC;QAExE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QAElC,IAAI,GAAG,IAAA,wBAAY,EAAC,IAAA,qBAAS,EAAC,IAAI,CAAC,EAAE,UAAU,CAAC,CAAC;QACjD,SAAS,aAAT,SAAS,cAAT,SAAS,IAAT,SAAS,GAAK,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,EAAC;QAE/D,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,EAAE,EAAC;QAC1B,MAAM,IAAI,GAAI,aAAa,CAAC,IAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9E,IAAA,4BAAgB,EAAC,IAAI,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5C,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEpC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,aAAa,KAChB,wBAAwB,EAAE,aAAa,EACvC,IAAI;YACJ,SAAS,IACT,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,CAAC;QAEzB,MAAM,IAAA,mBAAwB,EAAC,IAAI,gCACjC,YAAY,EAAE,IAAI,IACf,OAAO,KACV,OAAO,EAAE,WAAW,IACpB,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,oFAAqF,WAAY,EAAE,CAAC,CAAC;IAEnH,CAAC;CAAA;AA3CD,sDA2CC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -40,15 +40,16 @@ function coerceEnvironmentFiles(tree, options) {
|
|
|
40
40
|
]);
|
|
41
41
|
}
|
|
42
42
|
function updateProjectTargets(project, options) {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
if (
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
43
|
+
var _a;
|
|
44
|
+
let tsConfig = (0, path_1.join)(project.root, 'tsconfig.app.json');
|
|
45
|
+
if ('build' in ((_a = project.targets) !== null && _a !== void 0 ? _a : {})) {
|
|
46
|
+
const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
47
|
+
const buildTargetOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
|
|
48
|
+
if (buildTargetOptions['tsConfig']) {
|
|
49
|
+
tsConfig = buildTargetOptions['tsConfig'];
|
|
50
|
+
}
|
|
50
51
|
}
|
|
51
|
-
const outputPath =
|
|
52
|
+
const outputPath = (0, workspace_utilities_1.GetBuildOutputForProject)(project).replace('dist/', 'swagger/');
|
|
52
53
|
(0, workspace_utilities_1.CoerceTarget)(project, 'swagger-build', {
|
|
53
54
|
options: {
|
|
54
55
|
outputPath,
|
|
@@ -57,7 +58,7 @@ function updateProjectTargets(project, options) {
|
|
|
57
58
|
compiler: `tsc`,
|
|
58
59
|
webpackConfig: `${project.root}/webpack.config.js`,
|
|
59
60
|
transformers: ['@nestjs/swagger/plugin'],
|
|
60
|
-
tsConfig
|
|
61
|
+
tsConfig,
|
|
61
62
|
fileReplacements: [
|
|
62
63
|
{
|
|
63
64
|
replace: `${project.sourceRoot}/environments/environment.ts`,
|
|
@@ -77,14 +78,14 @@ function updateNxDefaults(tree, options) {
|
|
|
77
78
|
(0, workspace_utilities_1.CoerceTarget)(nxJson, 'swagger-generate', {
|
|
78
79
|
executor: '@rxap/plugin-nestjs:swagger-generate',
|
|
79
80
|
outputs: [
|
|
80
|
-
`{workspaceRoot}/
|
|
81
|
+
`{workspaceRoot}/swagger/${options.standalone ? '{projectName}' : '{projectRoot}'}/openapi.json`
|
|
81
82
|
],
|
|
82
83
|
inputs: [
|
|
83
|
-
`{workspaceRoot}/
|
|
84
|
-
`{workspaceRoot}/
|
|
84
|
+
`{workspaceRoot}/swagger/${options.standalone ? '{projectName}' : '{projectRoot}'}/main.js`,
|
|
85
|
+
`{workspaceRoot}/swagger/${options.standalone ? '{projectName}' : '{projectRoot}'}/main.js.map`
|
|
85
86
|
],
|
|
86
87
|
'dependsOn': [
|
|
87
|
-
'
|
|
88
|
+
'swagger-build'
|
|
88
89
|
]
|
|
89
90
|
}, workspace_utilities_1.Strategy.REPLACE);
|
|
90
91
|
(0, workspace_utilities_1.CoerceTarget)(nxJson, 'swagger-build', {
|
|
@@ -125,6 +126,8 @@ function swaggerGenerator(tree, options) {
|
|
|
125
126
|
throw new Error('The selected project has no sourceRoot');
|
|
126
127
|
}
|
|
127
128
|
(0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
|
|
129
|
+
(0, workspace_utilities_1.CoerceIgnorePattern)(tree, '.nxignore', ['!/swagger/**']);
|
|
130
|
+
(0, workspace_utilities_1.CoerceIgnorePattern)(tree, '.gitignore', ['swagger/**']);
|
|
128
131
|
yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, 'swagger-ui-express', 'latest', { soft: true });
|
|
129
132
|
yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@nestjs/swagger', 'latest', { soft: true });
|
|
130
133
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":"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"}
|