@rxap/plugin-nestjs 16.2.0-dev.1 → 16.2.0-dev.11
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 +73 -0
- package/README.md +1 -1
- package/package.json +32 -20
- package/src/executors/package-json/executor.js +5 -3
- package/src/executors/package-json/executor.js.map +1 -1
- package/src/executors/swagger-generate/executor.js +1 -0
- package/src/executors/swagger-generate/executor.js.map +1 -1
- package/src/generators/feature-microservice/generator.js +3 -0
- package/src/generators/feature-microservice/generator.js.map +1 -1
- package/src/generators/frontend-microservice/generator.js +3 -0
- package/src/generators/frontend-microservice/generator.js.map +1 -1
- package/src/generators/init/generator.js +1 -1
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init-application/extract-existing-config-validation.js +5 -2
- package/src/generators/init-application/extract-existing-config-validation.js.map +1 -1
- package/src/generators/init-application/files/shared/Dockerfile +6 -2
- package/src/generators/init-application/generator.d.ts +1 -0
- package/src/generators/init-application/generator.js +159 -157
- package/src/generators/init-application/generator.js.map +1 -1
- package/src/generators/init-application/schema.d.ts +1 -0
- package/src/generators/init-application/schema.json +4 -3
- package/src/generators/init-library/generator.js +15 -7
- package/src/generators/init-library/generator.js.map +1 -1
- package/src/generators/jwt/generator.js +5 -0
- package/src/generators/jwt/generator.js.map +1 -1
- package/src/generators/microservice/generator.js +3 -0
- package/src/generators/microservice/generator.js.map +1 -1
- package/src/generators/open-api/generator.js +4 -2
- package/src/generators/open-api/generator.js.map +1 -1
- package/src/generators/sentry/generator.js +1 -1
- package/src/generators/sentry/generator.js.map +1 -1
- package/src/generators/swagger/generator.js +39 -5
- package/src/generators/swagger/generator.js.map +1 -1
- package/src/lib/skip-non-nest-project.d.ts +1 -1
- package/src/lib/skip-non-nest-project.js +1 -2
- package/src/lib/skip-non-nest-project.js.map +1 -1
- package/src/generators/swagger/files/environments/environment.swagger.ts__tmpl__ +0 -8
|
@@ -4,8 +4,10 @@
|
|
|
4
4
|
"title": "",
|
|
5
5
|
"type": "object",
|
|
6
6
|
"properties": {
|
|
7
|
+
"project": {
|
|
8
|
+
"type": "string"
|
|
9
|
+
},
|
|
7
10
|
"projects": {
|
|
8
|
-
"alias": "project",
|
|
9
11
|
"type": "array",
|
|
10
12
|
"items": {
|
|
11
13
|
"type": "string"
|
|
@@ -122,8 +124,7 @@
|
|
|
122
124
|
},
|
|
123
125
|
"apiConfigurationFile": {
|
|
124
126
|
"type": "string",
|
|
125
|
-
"description": "The api configuration file to use"
|
|
126
|
-
"default": "shared/service/configuration/latest/config.api.json"
|
|
127
|
+
"description": "The api configuration file to use"
|
|
127
128
|
},
|
|
128
129
|
"standalone": {
|
|
129
130
|
"type": "boolean",
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.initLibraryGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
7
6
|
const plugin_library_1 = require("@rxap/plugin-library");
|
|
8
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
9
8
|
const path_1 = require("path");
|
|
@@ -13,19 +12,22 @@ function skipProject(tree, options, project, projectName) {
|
|
|
13
12
|
if ((0, skip_non_nest_project_1.SkipNonNestProject)(tree, options, project, projectName)) {
|
|
14
13
|
return true;
|
|
15
14
|
}
|
|
16
|
-
if ((0,
|
|
15
|
+
if ((0, workspace_utilities_1.SkipNonLibraryProject)(tree, options, project, projectName)) {
|
|
17
16
|
return true;
|
|
18
17
|
}
|
|
19
18
|
return false;
|
|
20
19
|
}
|
|
21
20
|
function setGeneralTargetDefaults(tree) {
|
|
22
21
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
22
|
+
if (!nxJson) {
|
|
23
|
+
throw new Error('No nx.json found');
|
|
24
|
+
}
|
|
23
25
|
(0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'check-version');
|
|
24
26
|
(0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'check-version', 'copy-client-sdk');
|
|
25
27
|
(0, devkit_1.updateNxJson)(tree, nxJson);
|
|
26
28
|
}
|
|
27
29
|
function updateProjectTargets(tree, project) {
|
|
28
|
-
if ((0,
|
|
30
|
+
if ((0, workspace_utilities_1.IsPublishable)(tree, project)) {
|
|
29
31
|
(0, workspace_utilities_1.CoerceTarget)(project, 'check-version', {
|
|
30
32
|
executor: '@rxap/plugin-library:check-version',
|
|
31
33
|
options: {
|
|
@@ -35,21 +37,27 @@ function updateProjectTargets(tree, project) {
|
|
|
35
37
|
}
|
|
36
38
|
}
|
|
37
39
|
function getNestMajorVersion(rootPackageJson) {
|
|
38
|
-
var _a;
|
|
39
|
-
let targetVersion = (_a = rootPackageJson.dependencies['@nestjs/core']) !== null &&
|
|
40
|
+
var _a, _b, _c;
|
|
41
|
+
let targetVersion = (_b = (_a = rootPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a['@nestjs/core']) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c['@nestjs/cli'];
|
|
40
42
|
if (!targetVersion) {
|
|
41
43
|
console.error(`The package @nestjs/core and @nestjs/cli are not installed in the root package.json`);
|
|
42
44
|
return null;
|
|
43
45
|
}
|
|
44
46
|
targetVersion = targetVersion.replace(/^[~^]/, '');
|
|
45
47
|
const version = (0, semver_1.parse)(targetVersion);
|
|
48
|
+
if (!version) {
|
|
49
|
+
throw new Error(`Can't parse version: ${targetVersion}`);
|
|
50
|
+
}
|
|
46
51
|
return `${version.major}.0.0`;
|
|
47
52
|
}
|
|
48
53
|
function updatePackageJson(tree, project, rootPackageJson) {
|
|
49
54
|
var _a;
|
|
50
|
-
if ((0,
|
|
55
|
+
if ((0, workspace_utilities_1.IsPublishable)(tree, project) && tree.exists((0, path_1.join)(project.root, 'package.json'))) {
|
|
51
56
|
const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
|
|
52
57
|
const version = (_a = getNestMajorVersion(rootPackageJson)) !== null && _a !== void 0 ? _a : packageJson.version;
|
|
58
|
+
if (!version) {
|
|
59
|
+
throw new Error('Can\'t determine the nest major version');
|
|
60
|
+
}
|
|
53
61
|
if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
|
|
54
62
|
packageJson.version = version;
|
|
55
63
|
}
|
|
@@ -66,7 +74,7 @@ function initLibraryGenerator(tree, options) {
|
|
|
66
74
|
if (skipProject(tree, options, project, projectName)) {
|
|
67
75
|
continue;
|
|
68
76
|
}
|
|
69
|
-
console.log(`init project: ${projectName}`);
|
|
77
|
+
console.log(`init nestjs library project: ${projectName}`);
|
|
70
78
|
yield (0, plugin_library_1.LibraryInitGenerator)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: false }));
|
|
71
79
|
updateProjectTargets(tree, project);
|
|
72
80
|
updatePackageJson(tree, project, rootPackageJson);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":";;;;AAAA,uCASoB;AACpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,11 @@ function UpdateAppConfig(tree, options, projectName) {
|
|
|
53
53
|
name: 'JWT_SECRET',
|
|
54
54
|
defaultValue: 'GenerateRandomString()',
|
|
55
55
|
},
|
|
56
|
+
{
|
|
57
|
+
name: 'JWT_AUTH_HEADER',
|
|
58
|
+
type: 'string',
|
|
59
|
+
defaultValue: 'Authorization',
|
|
60
|
+
},
|
|
56
61
|
],
|
|
57
62
|
overwrite: options.overwrite,
|
|
58
63
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/jwt/generator.ts"],"names":[],"mappings":";;;;AACA,6CAKwB;AACxB,iEAAuE;AACvE,mEAAqE;AACrE,uCAAmC;AAInC,SAAS,eAAe,CAAC,IAAU,EAAE,OAA8B;IAEjE,IAAA,gDAA2B,EACzB,IAAI,EACJ;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE1B,IAAA,mCAAwB,EAAC,UAAU,EAAE;YACnC,cAAc,EAAE,kBAAkB;YAClC,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,CAAE,kBAAkB,CAAE;oBACpC,eAAe,EAAE,gBAAgB;iBAClC;aACF;SACF,CAAC,CAAC;QAEH,IAAA,iCAAsB,EACpB,UAAU,EACV;YACE,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,WAAW;YACvB,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,CAAE,WAAW,CAAE;oBAC7B,eAAe,EAAE,aAAa;iBAC/B;gBACD;oBACE,eAAe,EAAE,gBAAgB;oBACjC,YAAY,EAAE,CAAE,wBAAwB,CAAE;iBAC3C;aACF;YACD,YAAY,EAAE,CAAC,CAAC,EAAE;gBAChB,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;gBACxC,kBAAO,CAAC,MAAM,CAAC;oBACb,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,wBAAwB;iBACnC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,CAAC;SACF,CACF,CAAC;IAEJ,CAAC,EACD,CAAE,oBAAoB,CAAE,CACzB,CAAC;AAEJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAA2B,EAAE,WAAmB;IAEnF,IAAA,gDAA2B,EACzB,IAAI,EACJ;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE1B,IAAA,8BAAmB,EAAC,UAAU,EAAE;YAC9B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,YAAY;oBAClB,YAAY,EAAE,wBAAwB;iBACvC;aACF;YACD,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAC;QAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,sBAAsB,CAAE;YACxC,eAAe,EAAE,iBAAiB;SACnC,CAAC,CAAC;IAEL,CAAC,EACD,CAAE,qBAAqB,CAAE,CAC1B,CAAC;AAEJ,CAAC;AAED,SAAsB,YAAY,CAAC,IAAU,EAAE,OAA2B;;QACxE,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;QAC1D,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjF,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,CAAC;CAAA;AAND,oCAMC;AAED,kBAAe,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/jwt/generator.ts"],"names":[],"mappings":";;;;AACA,6CAKwB;AACxB,iEAAuE;AACvE,mEAAqE;AACrE,uCAAmC;AAInC,SAAS,eAAe,CAAC,IAAU,EAAE,OAA8B;IAEjE,IAAA,gDAA2B,EACzB,IAAI,EACJ;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE1B,IAAA,mCAAwB,EAAC,UAAU,EAAE;YACnC,cAAc,EAAE,kBAAkB;YAClC,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,CAAE,kBAAkB,CAAE;oBACpC,eAAe,EAAE,gBAAgB;iBAClC;aACF;SACF,CAAC,CAAC;QAEH,IAAA,iCAAsB,EACpB,UAAU,EACV;YACE,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,WAAW;YACvB,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,CAAE,WAAW,CAAE;oBAC7B,eAAe,EAAE,aAAa;iBAC/B;gBACD;oBACE,eAAe,EAAE,gBAAgB;oBACjC,YAAY,EAAE,CAAE,wBAAwB,CAAE;iBAC3C;aACF;YACD,YAAY,EAAE,CAAC,CAAC,EAAE;gBAChB,CAAC,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;gBACxC,kBAAO,CAAC,MAAM,CAAC;oBACb,MAAM,EAAE,MAAM;oBACd,QAAQ,EAAE,wBAAwB;iBACnC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,CAAC;SACF,CACF,CAAC;IAEJ,CAAC,EACD,CAAE,oBAAoB,CAAE,CACzB,CAAC;AAEJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAA2B,EAAE,WAAmB;IAEnF,IAAA,gDAA2B,EACzB,IAAI,EACJ;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE1B,IAAA,8BAAmB,EAAC,UAAU,EAAE;YAC9B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,YAAY;oBAClB,YAAY,EAAE,wBAAwB;iBACvC;gBACD;oBACE,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE,QAAQ;oBACd,YAAY,EAAE,eAAe;iBAC9B;aACF;YACD,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAC;QAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,sBAAsB,CAAE;YACxC,eAAe,EAAE,iBAAiB;SACnC,CAAC,CAAC;IAEL,CAAC,EACD,CAAE,qBAAqB,CAAE,CAC1B,CAAC;AAEJ,CAAC;AAED,SAAsB,YAAY,CAAC,IAAU,EAAE,OAA2B;;QACxE,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,OAAO,CAAC,CAAC;QAC1D,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACjF,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChF,CAAC;CAAA;AAND,oCAMC;AAED,kBAAe,YAAY,CAAC"}
|
|
@@ -9,6 +9,9 @@ function microserviceGenerator(tree, options) {
|
|
|
9
9
|
var _a, _b, _c, _d;
|
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
11
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
12
|
+
if (!nxJson) {
|
|
13
|
+
throw new Error('No nx.json found');
|
|
14
|
+
}
|
|
12
15
|
const presetOptions = (_b = (_a = nxJson.generators) === null || _a === void 0 ? void 0 : _a['@nx/nest:application']) !== null && _b !== void 0 ? _b : {};
|
|
13
16
|
(_c = options.directory) !== null && _c !== void 0 ? _c : (options.directory = 'service');
|
|
14
17
|
(_d = presetOptions.tags) !== null && _d !== void 0 ? _d : (presetOptions.tags = '');
|
|
@@ -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,6DAAqE;AAGrE,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAAoC;;;QAGpC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,sBAAsB,CAAC,mCAAI,EAAE,CAAC;QAExE,MAAA,OAAO,CAAC,SAAS,oCAAjB,OAAO,CAAC,SAAS,GAAK,SAAS,EAAC;QAEhC,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,EAAE,EAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxC,aAAa,CAAC,IAAI,IAAI,CACE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACrC,GAAG,MAAM,CAAC;SAClC;QAED,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,aAAa,KAChB,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,SAAS,EAAE,OAAO,CAAC,SAAS,IAC5B,CAAC;QAEH,MAAM,WAAW,GAAG,CAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,CAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtG,MAAM,IAAA,mBAAwB,EAAC,IAAI,gCACjC,YAAY,EAAE,IAAI,EAClB,OAAO,EAAE,IAAI,EACb,eAAe,EAAE,IAAI,EACrB,MAAM,EAAE,IAAI,EACZ,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,IAAI,EACf,cAAc,EAAE,IAAI,IACjB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,IACzB,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,oFAAqF,WAAY,EAAE,CAAC,CAAC;;CAElH;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,mCAAgD;AAChD,6DAAqE;AAGrE,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAAoC;;;QAGpC,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACrC;QACD,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,sBAAsB,CAAC,mCAAI,EAAE,CAAC;QAExE,MAAA,OAAO,CAAC,SAAS,oCAAjB,OAAO,CAAC,SAAS,GAAK,SAAS,EAAC;QAEhC,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,EAAE,EAAC;QAC1B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxC,aAAa,CAAC,IAAI,IAAI,CACE,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACrC,GAAG,MAAM,CAAC;SAClC;QAED,MAAM,IAAA,2BAAoB,EAAC,IAAI,kCAC1B,aAAa,KAChB,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,SAAS,EAAE,OAAO,CAAC,SAAS,IAC5B,CAAC;QAEH,MAAM,WAAW,GAAG,CAAE,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,IAAI,CAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEtG,MAAM,IAAA,mBAAwB,EAAC,IAAI,gCACjC,YAAY,EAAE,IAAI,EAClB,OAAO,EAAE,IAAI,EACb,eAAe,EAAE,IAAI,EACrB,MAAM,EAAE,IAAI,EACZ,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,IAAI,EACf,cAAc,EAAE,IAAI,IACjB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,IACzB,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,oFAAqF,WAAY,EAAE,CAAC,CAAC;;CAElH;AA3CD,sDA2CC;AAED,kBAAe,qBAAqB,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.openApiGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
6
5
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
7
6
|
const workspace_ts_morph_1 = require("@rxap/workspace-ts-morph");
|
|
8
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
@@ -61,7 +60,10 @@ function UpdateAppConfig(tree, options) {
|
|
|
61
60
|
function openApiGenerator(tree, options) {
|
|
62
61
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
63
62
|
UpdateAppModule(tree, options);
|
|
64
|
-
const projectSourceRoot = (0,
|
|
63
|
+
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, options.project);
|
|
64
|
+
if (!projectSourceRoot) {
|
|
65
|
+
throw new Error(`Could not find the source root of the project: ${options.project}`);
|
|
66
|
+
}
|
|
65
67
|
if (!tree.exists((0, path_1.join)(projectSourceRoot, 'assets', 'open-api-server-config.json'))) {
|
|
66
68
|
tree.write((0, path_1.join)(projectSourceRoot, 'assets', 'open-api-server-config.json'), '[]');
|
|
67
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/open-api/generator.ts"],"names":[],"mappings":";;;;AACA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/open-api/generator.ts"],"names":[],"mappings":";;;;AACA,6CAIwB;AACxB,iEAAuE;AACvE,mEAGmC;AACnC,+BAA4B;AAC5B,uCAAmC;AAInC,SAAS,eAAe,CAAC,IAAU,EAAE,OAA8B;IAEjE,IAAA,gDAA2B,EACzB,IAAI,EACJ;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE1B,IAAA,iCAAsB,EACpB,UAAU,EACV;YACE,UAAU,EAAE,eAAe;YAC3B,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,CAAE,eAAe,EAAE,4BAA4B,CAAE;oBAC/D,eAAe,EAAE,qBAAqB;iBACvC;gBACD;oBACE,eAAe,EAAE,gBAAgB;oBACjC,YAAY,EAAE,CAAE,eAAe,CAAE;iBAClC;aACF;YACD,YAAY,EAAE,CAAC,CAAC,EAAE;gBAChB,CAAC,CAAC,SAAS,CAAC,8BAA8B,CAAC,CAAC;gBAC5C,kBAAO,CAAC,MAAM,CAAC;oBACb,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,4BAA4B;iBACvC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACN,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,CAAC;SACF,CACF,CAAC;IAEJ,CAAC,EACD,CAAE,oBAAoB,CAAE,CACzB,CAAC;AAEJ,CAAC;AAED,SAAS,eAAe,CAAC,IAAU,EAAE,OAA+B;IAElE,IAAA,gDAA2B,EACzB,IAAI,EACJ;QACE,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,EACD,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE1B,IAAA,8BAAmB,EAAC,UAAU,EAAE;YAC9B,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,kCAAkC;oBACxC,YAAY,EAAE,4HAA4H;iBAC3I;aACF;YACD,SAAS,EAAE,OAAO,CAAC,SAAS;SAC7B,CAAC,CAAC;QAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,aAAa,CAAE;YAC/B,eAAe,EAAE,6BAA6B;SAC/C,CAAC,CAAC;QAEH,IAAA,wBAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,MAAM,CAAE;YACxB,eAAe,EAAE,MAAM;SACxB,CAAC,CAAC;IAEL,CAAC,EACD,CAAE,qBAAqB,CAAE,CAC1B,CAAC;AAEJ,CAAC;AAED,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAA+B;;QAE/B,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,iBAAiB,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACtE,IAAI,CAAC,iBAAiB,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,kDAAmD,OAAO,CAAC,OAAQ,EAAE,CAAC,CAAC;SACxF;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,iBAAiB,EAAE,QAAQ,EAAE,6BAA6B,CAAC,CAAC,EAAE;YAClF,IAAI,CAAC,KAAK,CAAC,IAAA,WAAI,EAAC,iBAAiB,EAAE,QAAQ,EAAE,6BAA6B,CAAC,EAAE,IAAI,CAAC,CAAC;SACpF;QACD,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACxF,CAAC;CAAA;AAdD,4CAcC;AAED,kBAAe,gBAAgB,CAAC"}
|
|
@@ -123,7 +123,7 @@ function UpdateAppConfig(tree, options, projectName) {
|
|
|
123
123
|
},
|
|
124
124
|
{
|
|
125
125
|
name: 'SENTRY_SERVER_NAME',
|
|
126
|
-
defaultValue: `process.env.ROOT_DOMAIN ??
|
|
126
|
+
defaultValue: `process.env.ROOT_DOMAIN ?? environment.app`,
|
|
127
127
|
},
|
|
128
128
|
{
|
|
129
129
|
name: 'SENTRY_DEBUG',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/sentry/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/sentry/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,45 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.swaggerGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const
|
|
7
|
-
const
|
|
6
|
+
const ts_morph_1 = require("@rxap/ts-morph");
|
|
7
|
+
const workspace_ts_morph_1 = require("@rxap/workspace-ts-morph");
|
|
8
8
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
9
9
|
const path = require("path");
|
|
10
10
|
const path_1 = require("path");
|
|
11
|
+
const ts_morph_2 = require("ts-morph");
|
|
12
|
+
function coerceEnvironmentFiles(tree, options) {
|
|
13
|
+
(0, workspace_ts_morph_1.TsMorphNestProjectTransform)(tree, {
|
|
14
|
+
project: options.project,
|
|
15
|
+
}, (project, [sourceFile]) => {
|
|
16
|
+
(0, ts_morph_1.CoerceImports)(sourceFile, {
|
|
17
|
+
moduleSpecifier: '@rxap/nest-utilities',
|
|
18
|
+
namedImports: ['Environment'],
|
|
19
|
+
});
|
|
20
|
+
let appName = options.project;
|
|
21
|
+
if ((0, workspace_utilities_1.IsStandaloneWorkspace)(tree)) {
|
|
22
|
+
appName = (0, workspace_utilities_1.GetWorkspaceName)(tree);
|
|
23
|
+
}
|
|
24
|
+
const baseEnvironment = {
|
|
25
|
+
name: w => w.quote('swagger'),
|
|
26
|
+
production: 'true',
|
|
27
|
+
swagger: 'true',
|
|
28
|
+
app: w => w.quote(appName),
|
|
29
|
+
};
|
|
30
|
+
const normal = (0, ts_morph_1.CoerceVariableDeclaration)(sourceFile, 'environment', {
|
|
31
|
+
type: 'Environment',
|
|
32
|
+
initializer: ts_morph_2.Writers.object(baseEnvironment),
|
|
33
|
+
});
|
|
34
|
+
if (options.overwrite) {
|
|
35
|
+
normal.set({ initializer: ts_morph_2.Writers.object(baseEnvironment) });
|
|
36
|
+
}
|
|
37
|
+
}, [
|
|
38
|
+
'/environments/environment.swagger.ts?',
|
|
39
|
+
]);
|
|
40
|
+
}
|
|
11
41
|
function updateProjectTargets(project, options) {
|
|
12
42
|
if (!options.standalone) {
|
|
13
|
-
const buildTarget = (0,
|
|
14
|
-
const buildTargetOptions = (0,
|
|
43
|
+
const buildTarget = (0, workspace_utilities_1.GetTarget)(project, 'build');
|
|
44
|
+
const buildTargetOptions = (0, workspace_utilities_1.GetTargetOptions)(buildTarget);
|
|
15
45
|
if (!buildTargetOptions['outputPath']) {
|
|
16
46
|
throw new Error('The selected project has the build target without the option outputPath');
|
|
17
47
|
}
|
|
@@ -41,6 +71,9 @@ function updateProjectTargets(project, options) {
|
|
|
41
71
|
}
|
|
42
72
|
function updateNxDefaults(tree, options) {
|
|
43
73
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
74
|
+
if (!nxJson) {
|
|
75
|
+
throw new Error('No nx.json found');
|
|
76
|
+
}
|
|
44
77
|
if (!options.standalone) {
|
|
45
78
|
(0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'swagger-build', 'swagger-generate');
|
|
46
79
|
(0, workspace_utilities_1.CoerceTarget)(nxJson, 'swagger-generate', {
|
|
@@ -81,12 +114,13 @@ function updateNxDefaults(tree, options) {
|
|
|
81
114
|
}
|
|
82
115
|
function swaggerGenerator(tree, options) {
|
|
83
116
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
84
|
-
const projectRoot = (0,
|
|
117
|
+
const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, options.project);
|
|
85
118
|
(0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), (0, path_1.join)(projectRoot, 'src'), {
|
|
86
119
|
tmpl: '',
|
|
87
120
|
projectName: options.project,
|
|
88
121
|
});
|
|
89
122
|
const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
|
|
123
|
+
coerceEnvironmentFiles(tree, options);
|
|
90
124
|
updateNxDefaults(tree, options);
|
|
91
125
|
updateProjectTargets(project, options);
|
|
92
126
|
const projectSourceRoot = project.sourceRoot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProjectConfiguration, Tree } from '@nx/devkit';
|
|
2
|
-
import { SkipProjectOptions } from '@rxap/
|
|
2
|
+
import { SkipProjectOptions } from '@rxap/workspace-utilities';
|
|
3
3
|
export interface SkipNonNestProject extends SkipProjectOptions {
|
|
4
4
|
}
|
|
5
5
|
export declare function SkipNonNestProject(tree: Tree, options: SkipNonNestProject, project: ProjectConfiguration, projectName: string): boolean;
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SkipNonNestProject = void 0;
|
|
4
|
-
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
5
4
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
6
5
|
function SkipNonNestProject(tree, options, project, projectName) {
|
|
7
|
-
if ((0,
|
|
6
|
+
if ((0, workspace_utilities_1.SkipProject)(tree, options, project, projectName)) {
|
|
8
7
|
return true;
|
|
9
8
|
}
|
|
10
9
|
if (!(0, workspace_utilities_1.IsNestJsProject)(project)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skip-non-nest-project.js","sourceRoot":"","sources":["../../../../../../packages/plugin/nestjs/src/lib/skip-non-nest-project.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"skip-non-nest-project.js","sourceRoot":"","sources":["../../../../../../packages/plugin/nestjs/src/lib/skip-non-nest-project.ts"],"names":[],"mappings":";;;AAIA,mEAMmC;AAMnC,SAAgB,kBAAkB,CAChC,IAAU,EACV,OAA2B,EAC3B,OAA6B,EAC7B,WAAmB;IAEnB,IAAI,IAAA,iCAAW,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QACpD,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,IAAA,qCAAe,EAAC,OAAO,CAAC,EAAE;QAC7B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,IAAA,qCAAe,EAAC,OAAO,CAAC,IAAI,IAAA,wCAAkB,EAAC,OAAO,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,gDAgBC"}
|