@rxap/plugin-nestjs 20.0.0-dev.1 → 20.0.0-dev.3
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 +17 -0
- package/package.json +18 -11
- package/src/application.d.ts +6 -0
- package/src/application.js +125 -0
- package/src/application.js.map +1 -0
- package/src/generators/init/generator.js +4 -7
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init/init-workspace.d.ts +3 -0
- package/src/generators/init/init-workspace.js +20 -0
- package/src/generators/init/init-workspace.js.map +1 -0
- package/src/generators/init-application/coerce-open-api-client-sdk-library.js +1 -1
- package/src/generators/init-application/coerce-open-api-client-sdk-library.js.map +1 -1
- package/src/generators/init-application/update-project-targets.js +5 -9
- package/src/generators/init-application/update-project-targets.js.map +1 -1
- package/src/generators/init-library/generator.js +2 -18
- package/src/generators/init-library/generator.js.map +1 -1
- package/src/generators/microservice/generator.js.map +1 -1
- package/src/generators/swagger/generator.js +0 -38
- package/src/generators/swagger/generator.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,23 @@
|
|
|
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
|
+
# [20.0.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@20.0.0-dev.2...@rxap/plugin-nestjs@20.0.0-dev.3) (2025-01-03)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rxap/plugin-nestjs
|
|
9
|
+
|
|
10
|
+
# [20.0.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@20.0.0-dev.1...@rxap/plugin-nestjs@20.0.0-dev.2) (2025-01-03)
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
- skip angular projects ([ec3ed5e](https://gitlab.com/rxap/packages/commit/ec3ed5e4dacb3c69dea8158005ea328e15547486))
|
|
15
|
+
|
|
16
|
+
### Features
|
|
17
|
+
|
|
18
|
+
- add application plugin ([d3bf26d](https://gitlab.com/rxap/packages/commit/d3bf26d2e20fdb6c410aaf6a35e751afcead629b))
|
|
19
|
+
- support nx plugins ([a28c12d](https://gitlab.com/rxap/packages/commit/a28c12d411a1ce331a9b25f201d8b4674ac84e88))
|
|
20
|
+
- support nx plugins ([011871a](https://gitlab.com/rxap/packages/commit/011871a844241ead7a5dc2a07470af65251c8647))
|
|
21
|
+
- support nx plugins ([2182939](https://gitlab.com/rxap/packages/commit/2182939d1806d22deb78683471df5b7b83cf7395))
|
|
22
|
+
|
|
6
23
|
# [20.0.0-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.7-dev.1...@rxap/plugin-nestjs@20.0.0-dev.1) (2024-12-11)
|
|
7
24
|
|
|
8
25
|
**Note:** Version bump only for package @rxap/plugin-nestjs
|
package/package.json
CHANGED
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "20.0.0-dev.
|
|
2
|
+
"version": "20.0.0-dev.3",
|
|
3
3
|
"name": "@rxap/plugin-nestjs",
|
|
4
4
|
"license": "GPL-3.0-or-later",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@nx/devkit": "20.2.1",
|
|
7
7
|
"@nx/js": "20.2.1",
|
|
8
8
|
"@nx/nest": "20.2.1",
|
|
9
|
-
"@rxap/node-utilities": "^1.3.7-dev.
|
|
10
|
-
"@rxap/plugin-application": "^20.0.0-dev.
|
|
11
|
-
"@rxap/plugin-library": "^20.0.0-dev.
|
|
12
|
-
"@rxap/plugin-open-api": "^20.0.0-dev.
|
|
13
|
-
"@rxap/plugin-utilities": "^20.0.0-dev.
|
|
14
|
-
"@rxap/ts-morph": "^1.5.2-dev.
|
|
15
|
-
"@rxap/utilities": "^16.4.1-dev.
|
|
16
|
-
"@rxap/workspace-ts-morph": "^19.1.8-dev.
|
|
17
|
-
"@rxap/workspace-utilities": "^19.
|
|
9
|
+
"@rxap/node-utilities": "^1.3.7-dev.2",
|
|
10
|
+
"@rxap/plugin-application": "^20.0.0-dev.2",
|
|
11
|
+
"@rxap/plugin-library": "^20.0.0-dev.3",
|
|
12
|
+
"@rxap/plugin-open-api": "^20.0.0-dev.3",
|
|
13
|
+
"@rxap/plugin-utilities": "^20.0.0-dev.2",
|
|
14
|
+
"@rxap/ts-morph": "^1.5.2-dev.2",
|
|
15
|
+
"@rxap/utilities": "^16.4.1-dev.2",
|
|
16
|
+
"@rxap/workspace-ts-morph": "^19.1.8-dev.2",
|
|
17
|
+
"@rxap/workspace-utilities": "^19.6.0-dev.0",
|
|
18
18
|
"colors": "1.4.0",
|
|
19
19
|
"semver": "7.5.3",
|
|
20
20
|
"ts-morph": "18.0.0",
|
|
@@ -54,7 +54,14 @@
|
|
|
54
54
|
},
|
|
55
55
|
"schematics": "./generators.json",
|
|
56
56
|
"type": "commonjs",
|
|
57
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "97299cc674f33fcabf743adeeaa3ab2979059553",
|
|
58
|
+
"exports": {
|
|
59
|
+
"./package.json": "./package.json",
|
|
60
|
+
".": {
|
|
61
|
+
"types": "./src/index.d.ts",
|
|
62
|
+
"default": "./src/index.js"
|
|
63
|
+
}
|
|
64
|
+
},
|
|
58
65
|
"types": "./src/index.d.ts",
|
|
59
66
|
"main": "./src/index.js"
|
|
60
67
|
}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createNodesV2 = void 0;
|
|
4
|
+
exports.normalizeOptions = normalizeOptions;
|
|
5
|
+
const tslib_1 = require("tslib");
|
|
6
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
7
|
+
const fs_1 = require("fs");
|
|
8
|
+
const globs_1 = require("nx/src/utils/globs");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
require("colors");
|
|
11
|
+
function normalizeOptions(options) {
|
|
12
|
+
return options !== null && options !== void 0 ? options : {};
|
|
13
|
+
}
|
|
14
|
+
exports.createNodesV2 = [
|
|
15
|
+
(0, globs_1.combineGlobPatterns)([
|
|
16
|
+
'**/tsconfig.app.json',
|
|
17
|
+
'**/src/main.ts',
|
|
18
|
+
'**/src/app/app.module.ts',
|
|
19
|
+
'**/src/app/app.controller.ts',
|
|
20
|
+
]),
|
|
21
|
+
(configFilePaths, options, context) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
22
|
+
const normalizedOptions = normalizeOptions(options);
|
|
23
|
+
const includedConfigFilePaths = yield Promise.all(configFilePaths.map((configFilePath) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
+
if (yield shouldHaveProjectConfiguration(configFilePath, normalizedOptions, context)) {
|
|
25
|
+
return configFilePath;
|
|
26
|
+
}
|
|
27
|
+
return undefined;
|
|
28
|
+
}))).then((configFilePathOrUndefinedList) => configFilePathOrUndefinedList.filter((value) => value !== undefined));
|
|
29
|
+
const results = yield Promise.all(includedConfigFilePaths.map((configFilePath) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
30
|
+
const [projectPath, projectConfiguration] = yield createProjectConfiguration(configFilePath, normalizedOptions, context);
|
|
31
|
+
return [configFilePath, projectPath, projectConfiguration];
|
|
32
|
+
})));
|
|
33
|
+
return results.map(([configFilePath, projectPath, projectConfiguration]) => [
|
|
34
|
+
configFilePath,
|
|
35
|
+
{
|
|
36
|
+
projects: {
|
|
37
|
+
[projectPath]: projectConfiguration,
|
|
38
|
+
},
|
|
39
|
+
},
|
|
40
|
+
]);
|
|
41
|
+
}),
|
|
42
|
+
];
|
|
43
|
+
function shouldHaveProjectConfiguration(configFilePath, options, context) {
|
|
44
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
const projectPath = (0, path_1.dirname)(configFilePath);
|
|
46
|
+
const tree = new workspace_utilities_1.FsTree(context.workspaceRoot);
|
|
47
|
+
const projectConfiguration = (0, workspace_utilities_1.FindProjectByPath)(tree, projectPath);
|
|
48
|
+
if (!projectConfiguration) {
|
|
49
|
+
// console.log(`The folder of the file '${ configFilePath }' is not the root of a project. Skipping`.yellow);
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
if (['ngx', 'angular'].some(tag => { var _a; return (_a = projectConfiguration.tags) === null || _a === void 0 ? void 0 : _a.includes(tag); })) {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
55
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(projectPath, 'src/index.html'))) {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
return true;
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
function createProjectConfiguration(configFilePath, options, context) {
|
|
62
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
const projectPath = (0, path_1.dirname)(configFilePath);
|
|
64
|
+
const targets = {};
|
|
65
|
+
const tree = new workspace_utilities_1.FsTree(context.workspaceRoot);
|
|
66
|
+
const projectConfiguration = (0, workspace_utilities_1.FindProjectByPath)(tree, projectPath);
|
|
67
|
+
if (!projectConfiguration) {
|
|
68
|
+
throw new Error(`Could not find project in '${projectPath}'`);
|
|
69
|
+
}
|
|
70
|
+
targets['generate-package-json'] = createGeneratePackageJsonTarget();
|
|
71
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(projectPath, 'src/swagger.ts'))) {
|
|
72
|
+
targets['swagger-build'] = createSwaggerBuildTarget(projectPath);
|
|
73
|
+
targets['swagger-generate'] = createSwaggerGenerateTarget(projectPath);
|
|
74
|
+
}
|
|
75
|
+
return [
|
|
76
|
+
projectPath, {
|
|
77
|
+
targets,
|
|
78
|
+
},
|
|
79
|
+
];
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
function createGeneratePackageJsonTarget() {
|
|
83
|
+
return {
|
|
84
|
+
cache: true,
|
|
85
|
+
executor: '@rxap/plugin-nestjs:package-json',
|
|
86
|
+
inputs: ['production', '^production'],
|
|
87
|
+
outputs: ['{projectRoot}/package.json'],
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
function createSwaggerBuildTarget(projectPath) {
|
|
91
|
+
const target = {
|
|
92
|
+
cache: true,
|
|
93
|
+
executor: '@nx/webpack:webpack',
|
|
94
|
+
outputs: ['{options.outputPath}'],
|
|
95
|
+
inputs: ['production', '^production'],
|
|
96
|
+
dependsOn: ['build'],
|
|
97
|
+
options: {
|
|
98
|
+
deleteOutputPath: false,
|
|
99
|
+
outputPath: (0, path_1.join)('swagger', projectPath),
|
|
100
|
+
main: (0, path_1.join)(projectPath, 'src/swagger.ts'),
|
|
101
|
+
target: 'node',
|
|
102
|
+
compiler: 'tsc',
|
|
103
|
+
webpackConfig: (0, path_1.join)(projectPath, 'webpack.config.js'),
|
|
104
|
+
transformers: ['@nestjs/swagger/plugin'],
|
|
105
|
+
tsConfig: (0, path_1.join)(projectPath, 'tsconfig.app.json'),
|
|
106
|
+
},
|
|
107
|
+
};
|
|
108
|
+
if ((0, fs_1.existsSync)((0, path_1.join)(projectPath, 'src/environments/environment.swagger.ts'))) {
|
|
109
|
+
target.options.fileReplacements = [{
|
|
110
|
+
replace: (0, path_1.join)(projectPath, 'src/environments/environment.swagger.ts'),
|
|
111
|
+
with: (0, path_1.join)(projectPath, 'src/environments/environment.ts'),
|
|
112
|
+
}];
|
|
113
|
+
}
|
|
114
|
+
return target;
|
|
115
|
+
}
|
|
116
|
+
function createSwaggerGenerateTarget(projectPath) {
|
|
117
|
+
return {
|
|
118
|
+
cache: true,
|
|
119
|
+
executor: '@rxap/plugin-nestjs:swagger-generate',
|
|
120
|
+
dependsOn: ['swagger-build'],
|
|
121
|
+
outputs: ['{workspaceRoot}/' + (0, path_1.join)(`swagger`, projectPath, 'openapi.json')],
|
|
122
|
+
inputs: ['{workspaceRoot}/' + (0, path_1.join)(`swagger`, projectPath, 'main.js')],
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
//# sourceMappingURL=application.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../packages/plugin/nestjs/src/application.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
|
8
8
|
const skip_non_nest_project_1 = require("../../lib/skip-non-nest-project");
|
|
9
9
|
const generator_1 = require("../init-application/generator");
|
|
10
10
|
const generator_2 = require("../init-library/generator");
|
|
11
|
+
const init_workspace_1 = require("./init-workspace");
|
|
11
12
|
function skipProject(tree, options, project, projectName) {
|
|
12
13
|
if (options.project === projectName) {
|
|
13
14
|
return false;
|
|
@@ -26,15 +27,11 @@ function initGenerator(tree, options) {
|
|
|
26
27
|
(0, utilities_1.CoerceArrayItems)(options.projects, [options.project]);
|
|
27
28
|
}
|
|
28
29
|
console.log('nestjs init generator:', options);
|
|
30
|
+
yield (0, init_workspace_1.initWorkspace)(tree, options);
|
|
29
31
|
(0, workspace_utilities_1.GenerateSerializedSchematicFile)(tree, '/', '@rxap/plugin-nestjs', 'init', options);
|
|
30
32
|
yield (0, workspace_utilities_1.AddPackageJsonDevDependency)(tree, '@nx/nest', (0, workspace_utilities_1.GetNxVersion)(tree), { soft: true });
|
|
31
|
-
for (const [projectName, project] of (0,
|
|
32
|
-
|
|
33
|
-
continue;
|
|
34
|
-
}
|
|
35
|
-
if (!options.skipProjects) {
|
|
36
|
-
console.log(`init nestjs project: ${projectName}`);
|
|
37
|
-
}
|
|
33
|
+
for (const [projectName, project] of (0, workspace_utilities_1.ForeachInitProject)(tree, options, skipProject)) {
|
|
34
|
+
console.log(`init nestjs project: ${projectName}`);
|
|
38
35
|
if ((0, workspace_utilities_1.IsLibraryProject)(project)) {
|
|
39
36
|
yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
|
|
40
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init/generator.ts"],"names":[],"mappings":";;AAkCA,sCAqDC;;AAvFD,uCAIoB;AACpB,+CAAmD;AACnD,mEAOmC;AACnC,2EAAqE;AACrE,6DAAqE;AACrE,yDAA6D;AAC7D,qDAAiD;AAGjD,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,OAAO,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,IAAA,0CAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;QAC5D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;;QAC1E,MAAA,OAAO,CAAC,OAAO,oCAAf,OAAO,CAAC,OAAO,GAAK,SAAS,EAAC;QAC9B,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;QACxB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,IAAA,4BAAgB,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAE/C,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEnC,IAAA,qDAA+B,EAC7B,IAAI,EACJ,GAAG,EACH,qBAAqB,EACrB,MAAM,EACN,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,iDAA2B,EAAC,IAAI,EAAE,UAAU,EAAE,IAAA,kCAAY,EAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAExF,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,wCAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;YAEtF,OAAO,CAAC,GAAG,CAAC,wBAAyB,WAAY,EAAE,CAAC,CAAC;YAErD,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAExB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;YACJ,CAAC;YAED,IAAI,IAAA,0CAAoB,EAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,MAAM,IAAA,mBAAwB,EAAC,IAAI,gCAE/B,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,YAAY,EACvB,SAAS,EAAE,MAAM,IACd,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;YACJ,CAAC;QAEH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACxB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;IAEH,CAAC;CAAA;AAED,kBAAe,aAAa,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.initWorkspace = initWorkspace;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
6
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
7
|
+
function initWorkspace(tree, options) {
|
|
8
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
|
+
console.log('init nestjs workspace');
|
|
10
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
11
|
+
if ((0, workspace_utilities_1.IsRxapRepository)(tree)) {
|
|
12
|
+
(0, workspace_utilities_1.CoerceNxPlugin)(nxJson, './packages/plugin/nestjs/src/application.ts');
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
(0, workspace_utilities_1.CoerceNxPlugin)(nxJson, '@rxap/plugin-nestjs/application');
|
|
16
|
+
}
|
|
17
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=init-workspace.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"init-workspace.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init/init-workspace.ts"],"names":[],"mappings":";;AAWA,sCAaC;;AAxBD,uCAIoB;AACpB,mEAGmC;AAGnC,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAErC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAE,CAAC;QAEjC,IAAI,IAAA,sCAAgB,EAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,IAAA,oCAAc,EAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,IAAA,oCAAc,EAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;QAC5D,CAAC;QAED,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE7B,CAAC;CAAA"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.coerceOpenApiClientSdkLibrary = coerceOpenApiClientSdkLibrary;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
6
5
|
const js_1 = require("@nx/js");
|
|
7
6
|
const plugin_open_api_1 = require("@rxap/plugin-open-api");
|
|
7
|
+
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
8
|
require("colors");
|
|
9
9
|
function coerceOpenApiClientSdkLibrary(tree, projectName) {
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coerce-open-api-client-sdk-library.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/coerce-open-api-client-sdk-library.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"coerce-open-api-client-sdk-library.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/coerce-open-api-client-sdk-library.ts"],"names":[],"mappings":";;AAMA,sEA8BC;;AAnCD,+BAA+D;AAC/D,2DAAoE;AACpE,mEAAuD;AACvD,kBAAgB;AAEhB,SAAsB,6BAA6B,CACjD,IAAU,EACV,WAAmB;;QAGnB,MAAM,kBAAkB,GAAG,YAAa,WAAY,EAAE,CAAC;QAEvD,IAAI,CAAC,IAAA,gCAAU,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,CAAC;YAE1C,OAAO,CAAC,GAAG,CAAC,yCAA0C,kBAAmB,EAAE,CAAC,IAAI,CAAC,CAAC;YAClF,MAAM,IAAA,qBAAiB,EAAC,IAAI,EAAE;gBAC5B,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,YAAa,WAAY,EAAE;gBACtC,UAAU,EAAE,kBAAkB;gBAC9B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI;gBACb,cAAc,EAAE,MAAM;gBACtB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,KAAK;gBAClB,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,IAAI,CAAC,CAAC;YAC3D,MAAM,IAAA,6CAA2B,EAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,kBAAkB;aAC5B,CAAC,CAAC;QAEL,CAAC;IAEH,CAAC;CAAA"}
|
|
@@ -4,11 +4,8 @@ exports.updateProjectTargets = updateProjectTargets;
|
|
|
4
4
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
function updateProjectTargets(tree, projectName, project, options) {
|
|
7
|
-
var _a, _b, _c, _d, _e
|
|
8
|
-
var _g, _h
|
|
9
|
-
if (!options.standalone) {
|
|
10
|
-
(0, workspace_utilities_1.CoerceTarget)(project, 'generate-package-json', {});
|
|
11
|
-
}
|
|
7
|
+
var _a, _b, _c, _d, _e;
|
|
8
|
+
var _f, _g, _h;
|
|
12
9
|
(0, workspace_utilities_1.CoerceTarget)(project, 'build', {
|
|
13
10
|
executor: '@nx/webpack:webpack',
|
|
14
11
|
outputs: ['{options.outputPath}'],
|
|
@@ -41,7 +38,7 @@ function updateProjectTargets(tree, projectName, project, options) {
|
|
|
41
38
|
if (tree.exists('LICENSE')) {
|
|
42
39
|
const buildConfiguration = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
43
40
|
(_a = buildConfiguration.options) !== null && _a !== void 0 ? _a : (buildConfiguration.options = {});
|
|
44
|
-
(_b = (
|
|
41
|
+
(_b = (_f = buildConfiguration.options).assets) !== null && _b !== void 0 ? _b : (_f.assets = []);
|
|
45
42
|
(0, workspace_utilities_1.CoerceAssets)(buildConfiguration.options.assets, [
|
|
46
43
|
{
|
|
47
44
|
'input': '',
|
|
@@ -52,9 +49,8 @@ function updateProjectTargets(tree, projectName, project, options) {
|
|
|
52
49
|
(0, workspace_utilities_1.CoerceTarget)(project, 'build', buildConfiguration, workspace_utilities_1.Strategy.REPLACE);
|
|
53
50
|
}
|
|
54
51
|
if ((_c = project.targets) === null || _c === void 0 ? void 0 : _c['docker']) {
|
|
55
|
-
(_d = (
|
|
56
|
-
(_e = (
|
|
57
|
-
(_f = (_k = project.targets['docker'].options).buildArgList) !== null && _f !== void 0 ? _f : (_k.buildArgList = []);
|
|
52
|
+
(_d = (_g = project.targets['docker']).options) !== null && _d !== void 0 ? _d : (_g.options = {});
|
|
53
|
+
(_e = (_h = project.targets['docker'].options).buildArgList) !== null && _e !== void 0 ? _e : (_h.buildArgList = []);
|
|
58
54
|
if (options.apiPrefix !== false &&
|
|
59
55
|
!project.targets['docker'].options.buildArgList.some((arg) => arg.startsWith('PATH_PREFIX='))) {
|
|
60
56
|
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":";;AAaA,
|
|
1
|
+
{"version":3,"file":"update-project-targets.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/update-project-targets.ts"],"names":[],"mappings":";;AAaA,oDAyDC;AAlED,mEAKmC;AACnC,+BAA4B;AAG5B,SAAgB,oBAAoB,CAClC,IAAU,EAAE,WAAmB,EAAE,OAA6B,EAAE,OAAuC;;;IAEvG,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,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"}
|
|
@@ -27,18 +27,12 @@ function setGeneralTargetDefaults(tree) {
|
|
|
27
27
|
throw new Error('No nx.json found');
|
|
28
28
|
}
|
|
29
29
|
(0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'check-version');
|
|
30
|
-
(0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'check-version', 'copy-
|
|
30
|
+
(0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'check-version', 'copy-open-api-sdk');
|
|
31
31
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
32
32
|
}
|
|
33
33
|
function updateProjectTargets(tree, project, options) {
|
|
34
|
-
var _a
|
|
34
|
+
var _a;
|
|
35
35
|
if ((0, workspace_utilities_1.IsPublishable)(tree, project)) {
|
|
36
|
-
(0, workspace_utilities_1.CoerceTarget)(project, 'check-version', {
|
|
37
|
-
executor: '@rxap/plugin-library:check-version',
|
|
38
|
-
options: {
|
|
39
|
-
packageName: '@nestjs/core',
|
|
40
|
-
},
|
|
41
|
-
});
|
|
42
36
|
const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
43
37
|
const buildOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
|
|
44
38
|
const tsConfigPath = ((_a = buildOptions.tsConfig) !== null && _a !== void 0 ? _a : (0, path_1.join)(project.root, 'tsconfig.lib.json'));
|
|
@@ -53,16 +47,6 @@ function updateProjectTargets(tree, project, options) {
|
|
|
53
47
|
defaultConfiguration: 'development',
|
|
54
48
|
}, workspace_utilities_1.Strategy.OVERWRITE);
|
|
55
49
|
}
|
|
56
|
-
if (((_b = options.targets) === null || _b === void 0 ? void 0 : _b.fixDependencies) !== false) {
|
|
57
|
-
(0, workspace_utilities_1.CoerceTarget)(project, 'fix-dependencies', {
|
|
58
|
-
options: {
|
|
59
|
-
options: {
|
|
60
|
-
strict: true,
|
|
61
|
-
onlyDependencies: false,
|
|
62
|
-
},
|
|
63
|
-
},
|
|
64
|
-
}, workspace_utilities_1.Strategy.OVERWRITE);
|
|
65
|
-
}
|
|
66
50
|
}
|
|
67
51
|
function getNestMajorVersion(rootPackageJson) {
|
|
68
52
|
var _a, _b, _c;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/microservice/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/microservice/generator.ts"],"names":[],"mappings":";;AAcA,sDA0CC;;AAxDD,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,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;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -39,43 +39,6 @@ function coerceEnvironmentFiles(tree, options) {
|
|
|
39
39
|
'/environments/environment.swagger.ts?',
|
|
40
40
|
]);
|
|
41
41
|
}
|
|
42
|
-
function updateProjectTargets(projectName, project, options) {
|
|
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
|
-
}
|
|
51
|
-
}
|
|
52
|
-
const outputPath = (0, workspace_utilities_1.GetBuildOutputForProject)(project).replace('dist/', 'swagger/');
|
|
53
|
-
(0, workspace_utilities_1.CoerceTarget)(project, 'swagger-build', {
|
|
54
|
-
options: {
|
|
55
|
-
outputPath,
|
|
56
|
-
main: `${project.sourceRoot}/swagger.ts`,
|
|
57
|
-
target: `node`,
|
|
58
|
-
compiler: `tsc`,
|
|
59
|
-
webpackConfig: `${project.root}/webpack.config.js`,
|
|
60
|
-
transformers: ['@nestjs/swagger/plugin'],
|
|
61
|
-
tsConfig,
|
|
62
|
-
fileReplacements: [
|
|
63
|
-
{
|
|
64
|
-
replace: `${project.sourceRoot}/environments/environment.ts`,
|
|
65
|
-
with: `${project.sourceRoot}/environments/environment.swagger.ts`,
|
|
66
|
-
},
|
|
67
|
-
],
|
|
68
|
-
},
|
|
69
|
-
});
|
|
70
|
-
(0, workspace_utilities_1.CoerceTarget)(project, 'swagger-generate', {
|
|
71
|
-
outputs: [
|
|
72
|
-
`{workspaceRoot}/swagger/${options.standalone ? projectName : project.root}/openapi.json`
|
|
73
|
-
],
|
|
74
|
-
inputs: [
|
|
75
|
-
`{workspaceRoot}/swagger/${options.standalone ? projectName : project.root}/main.js`,
|
|
76
|
-
],
|
|
77
|
-
}, workspace_utilities_1.Strategy.REPLACE);
|
|
78
|
-
}
|
|
79
42
|
function updateNxDefaults(tree, options) {
|
|
80
43
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
81
44
|
if (!nxJson) {
|
|
@@ -122,7 +85,6 @@ function swaggerGenerator(tree, options) {
|
|
|
122
85
|
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
123
86
|
coerceEnvironmentFiles(tree, options);
|
|
124
87
|
updateNxDefaults(tree, options);
|
|
125
|
-
updateProjectTargets(projectName, project, options);
|
|
126
88
|
const projectSourceRoot = project.sourceRoot;
|
|
127
89
|
if (!projectSourceRoot) {
|
|
128
90
|
throw new Error('The selected project has no sourceRoot');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":"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"}
|