@rxap/plugin-nestjs 16.2.0-dev.2 → 16.2.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.
Files changed (26) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/README.md +1 -1
  3. package/package.json +15 -14
  4. package/src/executors/package-json/executor.js +2 -2
  5. package/src/executors/package-json/executor.js.map +1 -1
  6. package/src/generators/feature-microservice/generator.js +3 -0
  7. package/src/generators/feature-microservice/generator.js.map +1 -1
  8. package/src/generators/frontend-microservice/generator.js +3 -0
  9. package/src/generators/frontend-microservice/generator.js.map +1 -1
  10. package/src/generators/init/generator.js +1 -1
  11. package/src/generators/init/generator.js.map +1 -1
  12. package/src/generators/init-application/extract-existing-config-validation.js +5 -2
  13. package/src/generators/init-application/extract-existing-config-validation.js.map +1 -1
  14. package/src/generators/init-application/files/shared/Dockerfile +1 -1
  15. package/src/generators/init-application/generator.js +47 -33
  16. package/src/generators/init-application/generator.js.map +1 -1
  17. package/src/generators/init-application/schema.d.ts +1 -0
  18. package/src/generators/init-application/schema.json +3 -1
  19. package/src/generators/init-library/generator.js +12 -3
  20. package/src/generators/init-library/generator.js.map +1 -1
  21. package/src/generators/microservice/generator.js +3 -0
  22. package/src/generators/microservice/generator.js.map +1 -1
  23. package/src/generators/open-api/generator.js +3 -0
  24. package/src/generators/open-api/generator.js.map +1 -1
  25. package/src/generators/swagger/generator.js +3 -0
  26. package/src/generators/swagger/generator.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,13 @@
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
+ # [16.2.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.2.0-dev.2...@rxap/plugin-nestjs@16.2.0-dev.3) (2024-03-14)
7
+
8
+ ### Bug Fixes
9
+
10
+ - add missing docker gitlab ci generator call ([bb3da1b](https://gitlab.com/rxap/packages/commit/bb3da1b1ce5ca3d207b93bae131753d35aadbd55))
11
+ - api prefix processing ([eed2206](https://gitlab.com/rxap/packages/commit/eed2206e85f077adc9ba29ad1208fe5ac2141b1a))
12
+
6
13
  # [16.2.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.2.0-dev.1...@rxap/plugin-nestjs@16.2.0-dev.2) (2024-03-11)
7
14
 
8
15
  ### Bug Fixes
package/README.md CHANGED
@@ -19,7 +19,7 @@ yarn add @rxap/plugin-nestjs
19
19
  ```
20
20
  **Install peer dependencies:**
21
21
  ```bash
22
- yarn add @nx/devkit@^16.5.0 @nx/js@^16.5.0 @nx/nest@^16.5.0 @rxap/generator-utilities@^1.1.1-dev.0 @rxap/node-utilities@^1.1.1-dev.1 @rxap/plugin-application@^16.1.1-dev.1 @rxap/plugin-library@^16.1.0-dev.5 @rxap/plugin-utilities@^16.1.1-dev.2 @rxap/ts-morph@^1.1.0-dev.18 @rxap/utilities@^16.1.0-dev.7 @rxap/workspace-ts-morph@^16.0.2-dev.1 @rxap/workspace-utilities@^16.1.0-dev.0 ts-morph@^18.0.0 tslib@2.6.2
22
+ yarn add @nx/devkit@^16.5.0 @nx/js@^16.5.0 @nx/nest@^16.5.0 @rxap/generator-utilities@^1.1.1-dev.1 @rxap/node-utilities@^1.2.0-dev.0 @rxap/plugin-application@^16.1.1-dev.2 @rxap/plugin-docker@* @rxap/plugin-library@^16.1.0-dev.5 @rxap/plugin-utilities@^16.1.1-dev.2 @rxap/ts-morph@^1.1.0-dev.18 @rxap/utilities@^16.1.0-dev.7 @rxap/workspace-ts-morph@^16.0.2-dev.2 @rxap/workspace-utilities@^16.1.0-dev.1 ts-morph@^18.0.0 tslib@2.6.2
23
23
  ```
24
24
  **Execute the init generator:**
25
25
  ```bash
package/package.json CHANGED
@@ -1,9 +1,10 @@
1
1
  {
2
- "version": "16.2.0-dev.2",
2
+ "version": "16.2.0-dev.3",
3
3
  "name": "@rxap/plugin-nestjs",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
6
6
  "@apidevtools/json-schema-ref-parser": "9.0.9",
7
+ "colors": "1.4.0",
7
8
  "fs-extra": "11.1.1",
8
9
  "glob": "10.3.10",
9
10
  "handlebars": "4.7.7",
@@ -17,19 +18,19 @@
17
18
  "@nx/devkit": "^16.5.0",
18
19
  "@nx/js": "^16.5.0",
19
20
  "@nx/nest": "^16.5.0",
20
- "@rxap/generator-utilities": "^1.1.1-dev.0",
21
- "@rxap/node-utilities": "^1.1.1-dev.1",
22
- "@rxap/plugin-application": "^16.1.1-dev.1",
21
+ "@rxap/generator-utilities": "^1.1.1-dev.1",
22
+ "@rxap/node-utilities": "^1.2.0-dev.0",
23
+ "@rxap/plugin-application": "^16.1.1-dev.2",
24
+ "@rxap/plugin-docker": "*",
23
25
  "@rxap/plugin-library": "^16.1.0-dev.5",
24
26
  "@rxap/plugin-utilities": "^16.1.1-dev.2",
25
27
  "@rxap/ts-morph": "^1.1.0-dev.18",
26
28
  "@rxap/utilities": "^16.1.0-dev.7",
27
- "@rxap/workspace-ts-morph": "^16.0.2-dev.1",
28
- "@rxap/workspace-utilities": "^16.1.0-dev.0",
29
+ "@rxap/workspace-ts-morph": "^16.0.2-dev.2",
30
+ "@rxap/workspace-utilities": "^16.1.0-dev.1",
29
31
  "ts-morph": "^18.0.0",
30
32
  "tslib": "2.6.2",
31
- "@rxap/generator-ts-morph": "1.0.2-dev.0",
32
- "@rxap/plugin-docker": "16.1.0-dev.3"
33
+ "@rxap/generator-ts-morph": "1.0.2-dev.0"
33
34
  },
34
35
  "author": {
35
36
  "name": "Merzough Münker",
@@ -55,15 +56,15 @@
55
56
  "packageGroup": [
56
57
  {
57
58
  "package": "@rxap/generator-utilities",
58
- "version": "1.1.1-dev.0"
59
+ "version": "1.1.1-dev.1"
59
60
  },
60
61
  {
61
62
  "package": "@rxap/node-utilities",
62
- "version": "1.1.1-dev.1"
63
+ "version": "1.2.0-dev.0"
63
64
  },
64
65
  {
65
66
  "package": "@rxap/plugin-application",
66
- "version": "16.1.1-dev.1"
67
+ "version": "16.1.1-dev.2"
67
68
  },
68
69
  {
69
70
  "package": "@rxap/plugin-library",
@@ -83,11 +84,11 @@
83
84
  },
84
85
  {
85
86
  "package": "@rxap/workspace-ts-morph",
86
- "version": "16.0.2-dev.1"
87
+ "version": "16.0.2-dev.2"
87
88
  },
88
89
  {
89
90
  "package": "@rxap/workspace-utilities",
90
- "version": "16.1.0-dev.0"
91
+ "version": "16.1.0-dev.1"
91
92
  }
92
93
  ]
93
94
  },
@@ -102,7 +103,7 @@
102
103
  },
103
104
  "schematics": "./generators.json",
104
105
  "type": "commonjs",
105
- "gitHead": "67bc7956fc88110f26bacf9c78884454a3714aa7",
106
+ "gitHead": "ed07f30b85b21d1521b602abd6932bba6029001c",
106
107
  "main": "./src/index.js",
107
108
  "types": "./src/index.d.ts"
108
109
  }
package/src/executors/package-json/executor.js CHANGED
@@ -6,7 +6,7 @@ const plugin_utilities_1 = require("@rxap/plugin-utilities");
6
6
  const fs_1 = require("fs");
7
7
  const path_1 = require("path");
8
8
  function runExecutor(options, context) {
9
- var _a, _b;
9
+ var _a, _b, _c, _d;
10
10
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
11
11
  console.log('Executor ran for PackageJson', options);
12
12
  (0, plugin_utilities_1.LoadProjectToPackageMapping)(context);
@@ -14,7 +14,7 @@ function runExecutor(options, context) {
14
14
  if (options.dependencies) {
15
15
  const rootPackageJson = (0, node_utilities_1.jsonFile)((0, path_1.join)(context.root, 'package.json'));
16
16
  for (const dependency of options.dependencies) {
17
- dependencies[dependency] = (_b = (_a = rootPackageJson.dependencies[dependency]) !== null && _a !== void 0 ? _a : rootPackageJson.devDependencies[dependency]) !== null && _b !== void 0 ? _b : 'latest';
17
+ dependencies[dependency] = (_d = (_b = (_a = rootPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a[dependency]) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.devDependencies) === null || _c === void 0 ? void 0 : _c[dependency]) !== null && _d !== void 0 ? _d : 'latest';
18
18
  }
19
19
  }
20
20
  const packageJson = { dependencies, name: context.projectName, private: true };
package/src/executors/package-json/executor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/package-json/executor.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,6DAIgC;AAChC,2BAAmC;AACnC,+BAA4B;AAG5B,SAA8B,WAAW,CACvC,OAAkC,EAClC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;QAErD,IAAA,8CAA2B,EAAC,OAAO,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,IAAA,sDAAmC,EAAC,OAAO,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,MAAM,eAAe,GAAG,IAAA,yBAAQ,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YACrE,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE;gBAC7C,YAAY,CAAC,UAAU,CAAC,GAAG,MAAA,MAAA,eAAe,CAAC,YAAY,CAAC,UAAU,CAAC,mCACxC,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,mCAAI,QAAQ,CAAC;aACpF;SACF;QAED,MAAM,WAAW,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAE/E,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE1C,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEnG,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA3BD,8BA2BC"}
1
+ {"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/executors/package-json/executor.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,6DAIgC;AAEhC,2BAAmC;AACnC,+BAA4B;AAG5B,SAA8B,WAAW,CACvC,OAAkC,EAClC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;QAErD,IAAA,8CAA2B,EAAC,OAAO,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,IAAA,sDAAmC,EAAC,OAAO,CAAC,CAAC;QAElE,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,MAAM,eAAe,GAAgB,IAAA,yBAAQ,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YAClF,KAAK,MAAM,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE;gBAC7C,YAAY,CAAC,UAAU,CAAC,GAAG,MAAA,MAAA,MAAA,eAAe,CAAC,YAAY,0CAAG,UAAU,CAAC,mCAC1C,MAAA,eAAe,CAAC,eAAe,0CAAG,UAAU,CAAC,mCAAI,QAAQ,CAAC;aACtF;SACF;QAED,MAAM,WAAW,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAE/E,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAE1C,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,IAAA,iCAAc,EAAC,OAAO,CAAC,EAAE,cAAc,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAEnG,OAAO;YACL,OAAO,EAAE,IAAI;SACd,CAAC;;CACH;AA3BD,8BA2BC"}
package/src/generators/feature-microservice/generator.js CHANGED
@@ -8,6 +8,9 @@ function featureMicroserviceGenerator(tree, options) {
8
8
  var _a, _b;
9
9
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
10
10
  const nxJson = (0, devkit_1.readNxJson)(tree);
11
+ if (!nxJson) {
12
+ throw new Error('No nx.json found');
13
+ }
11
14
  const presetOptions = (_b = (_a = nxJson.generators) === null || _a === void 0 ? void 0 : _a['@rxap/plugin-nestjs:microservice']) !== null && _b !== void 0 ? _b : {};
12
15
  yield (0, generator_1.default)(tree, Object.assign(Object.assign(Object.assign(Object.assign({}, presetOptions), { apiPrefix: ['api', 'feature', options.feature].join('/') }), options), { name: options.feature, directory: ['service', 'feature'].join('/') }));
13
16
  });
package/src/generators/feature-microservice/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/feature-microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,yDAA8D;AAG9D,SAAsB,4BAA4B,CAChD,IAAU,EACV,OAA2C;;;QAG3C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,kCAAkC,CAAC,mCAAI,EAAE,CAAC;QAEpF,MAAM,IAAA,mBAAqB,EAAC,IAAI,8DAC3B,aAAa,KAChB,SAAS,EAAE,CAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KACvD,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,SAAS,EAAE,CAAE,SAAS,EAAE,SAAS,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAC7C,CAAC;;CAEJ;AAhBD,oEAgBC;AAED,kBAAe,4BAA4B,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/feature-microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,yDAA8D;AAG9D,SAAsB,4BAA4B,CAChD,IAAU,EACV,OAA2C;;;QAG3C,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,kCAAkC,CAAC,mCAAI,EAAE,CAAC;QAEpF,MAAM,IAAA,mBAAqB,EAAC,IAAI,8DAC3B,aAAa,KAChB,SAAS,EAAE,CAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KACvD,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,SAAS,EAAE,CAAE,SAAS,EAAE,SAAS,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAC7C,CAAC;;CAEJ;AAnBD,oEAmBC;AAED,kBAAe,4BAA4B,CAAC"}
package/src/generators/frontend-microservice/generator.js CHANGED
@@ -8,6 +8,9 @@ function frontendMicroserviceGenerator(tree, options) {
8
8
  var _a, _b;
9
9
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
10
10
  const nxJson = (0, devkit_1.readNxJson)(tree);
11
+ if (!nxJson) {
12
+ throw new Error('No nx.json found');
13
+ }
11
14
  const presetOptions = (_b = (_a = nxJson.generators) === null || _a === void 0 ? void 0 : _a['@rxap/plugin-nestjs:microservice']) !== null && _b !== void 0 ? _b : {};
12
15
  yield (0, generator_1.default)(tree, Object.assign(Object.assign(Object.assign(Object.assign({}, presetOptions), { apiPrefix: ['api', 'app', options.frontend, options.feature].join('/') }), options), { name: options.feature, directory: ['service', 'app', options.frontend].join('/') }));
13
16
  });
package/src/generators/frontend-microservice/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/frontend-microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,yDAA8D;AAG9D,SAAsB,6BAA6B,CACjD,IAAU,EACV,OAA4C;;;QAG5C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,aAAa,GAAG,MAAA,MAAA,MAAM,CAAC,UAAU,0CAAG,kCAAkC,CAAC,mCAAI,EAAE,CAAC;QAEpF,MAAM,IAAA,mBAAqB,EAAC,IAAI,8DAC3B,aAAa,KAChB,SAAS,EAAE,CAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KACrE,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,SAAS,EAAE,CAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAC3D,CAAC;;CAEJ;AAhBD,sEAgBC;AAED,kBAAe,6BAA6B,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/frontend-microservice/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,yDAA8D;AAG9D,SAAsB,6BAA6B,CACjD,IAAU,EACV,OAA4C;;;QAG5C,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,kCAAkC,CAAC,mCAAI,EAAE,CAAC;QAEpF,MAAM,IAAA,mBAAqB,EAAC,IAAI,8DAC3B,aAAa,KAChB,SAAS,EAAE,CAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KACrE,OAAO,KACV,IAAI,EAAE,OAAO,CAAC,OAAO,EACrB,SAAS,EAAE,CAAE,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,IAC3D,CAAC;;CAEJ;AAnBD,sEAmBC;AAED,kBAAe,6BAA6B,CAAC"}
package/src/generators/init/generator.js CHANGED
@@ -21,7 +21,7 @@ function initGenerator(tree, options) {
21
21
  continue;
22
22
  }
23
23
  if (!options.skipProjects) {
24
- console.log(`init project: ${projectName}`);
24
+ console.log(`init nestjs project: ${projectName}`);
25
25
  }
26
26
  if ((0, workspace_utilities_1.IsLibraryProject)(project)) {
27
27
  yield (0, generator_2.default)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: options.skipProjects }));
package/src/generators/init/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAGmC;AACnC,2EAAqE;AACrE,6DAAqE;AACrE,yDAA6D;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,IAAA,0CAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBAEzB,OAAO,CAAC,GAAG,CAAC,iBAAkB,WAAY,EAAE,CAAC,CAAC;aAE/C;YAED,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE;gBAC7B,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAExB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,IAAA,0CAAoB,EAAC,OAAO,CAAC,EAAE;gBACjC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAE5B,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;SAEF;IAEH,CAAC;CAAA;AArCD,sCAqCC;AAED,kBAAe,aAAa,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAGmC;AACnC,2EAAqE;AACrE,6DAAqE;AACrE,yDAA6D;AAG7D,SAAS,WAAW,CAAC,IAAU,EAAE,OAA4B,EAAE,OAA6B,EAAE,WAAmB;IAE/G,IAAI,IAAA,0CAAkB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QAC3D,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,aAAa,CAAC,IAAU,EAAE,OAA4B;;QAC1E,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE;gBAEzB,OAAO,CAAC,GAAG,CAAC,wBAAyB,WAAY,EAAE,CAAC,CAAC;aAEtD;YAED,IAAI,IAAA,sCAAgB,EAAC,OAAO,CAAC,EAAE;gBAC7B,MAAM,IAAA,mBAAoB,EAAC,IAAI,kCAExB,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;YAED,IAAI,IAAA,0CAAoB,EAAC,OAAO,CAAC,EAAE;gBACjC,MAAM,IAAA,mBAAwB,EAAC,IAAI,kCAE5B,OAAO,KACV,QAAQ,EAAE,CAAE,WAAW,CAAE,EACzB,YAAY,EAAE,OAAO,CAAC,YAAY,IAErC,CAAC;aACH;SAEF;IAEH,CAAC;CAAA;AArCD,sCAqCC;AAED,kBAAe,aAAa,CAAC"}
package/src/generators/init-application/extract-existing-config-validation.js CHANGED
@@ -4,6 +4,7 @@ exports.ExtractExistingConfigValidation = void 0;
4
4
  const ts_morph_1 = require("@rxap/ts-morph");
5
5
  const ts_morph_2 = require("ts-morph");
6
6
  function ExtractExistingConfigValidation(sourceFile) {
7
+ var _a;
7
8
  const metadata = (0, ts_morph_1.GetNestModuleMetadata)(sourceFile);
8
9
  const imports = metadata.getProperty('imports');
9
10
  if (!imports) {
@@ -18,8 +19,7 @@ function ExtractExistingConfigValidation(sourceFile) {
18
19
  if (configModuleArguments.length === 1) {
19
20
  const configModuleArgument = configModuleArguments[0];
20
21
  const objectLiteralExpression = configModuleArgument.asKindOrThrow(ts_morph_2.SyntaxKind.ObjectLiteralExpression);
21
- const validateLiteralElement = objectLiteralExpression.getProperty('validationSchema')
22
- .asKindOrThrow(ts_morph_2.SyntaxKind.PropertyAssignment);
22
+ const validateLiteralElement = (_a = objectLiteralExpression.getProperty('validationSchema')) === null || _a === void 0 ? void 0 : _a.asKindOrThrow(ts_morph_2.SyntaxKind.PropertyAssignment);
23
23
  const joiObject = validateLiteralElement === null || validateLiteralElement === void 0 ? void 0 : validateLiteralElement.getInitializer();
24
24
  if ((joiObject === null || joiObject === void 0 ? void 0 : joiObject.getKind()) === ts_morph_2.SyntaxKind.CallExpression) {
25
25
  const joiObjectArgument = joiObject.asKindOrThrow(ts_morph_2.SyntaxKind.CallExpression).getArguments()[0];
@@ -28,6 +28,9 @@ function ExtractExistingConfigValidation(sourceFile) {
28
28
  for (const property of objectLiteralExpression2.getProperties()) {
29
29
  const propertyAssignment = property.asKindOrThrow(ts_morph_2.SyntaxKind.PropertyAssignment);
30
30
  const initializer = propertyAssignment.getInitializer();
31
+ if (!initializer) {
32
+ throw new Error('No initializer found');
33
+ }
31
34
  const text = initializer.getText();
32
35
  const item = {
33
36
  name: propertyAssignment.getName(),
package/src/generators/init-application/extract-existing-config-validation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extract-existing-config-validation.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/extract-existing-config-validation.ts"],"names":[],"mappings":";;;AAAA,6CAGwB;AACxB,uCAGkB;AAElB,SAAgB,+BAA+B,CAAC,UAAsB;IAEpE,MAAM,QAAQ,GAAG,IAAA,gCAAqB,EAAC,UAAU,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IACD,MAAM,8BAA8B,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC;IAC5F,MAAM,sBAAsB,GAAG,8BAA8B,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;IAC7H,KAAK,MAAM,IAAI,IAAI,sBAAsB,CAAC,WAAW,EAAE,EAAE;QACvD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAU,CAAC,cAAc,CAAC,CAAC;YACnE,MAAM,qBAAqB,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;YAC1D,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBACtD,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;gBACvG,MAAM,sBAAsB,GAAG,uBAAuB,CAAC,WAAW,CAAC,kBAAkB,CAAC;qBAC/B,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC;gBACpG,MAAM,SAAS,GAAG,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,cAAc,EAAE,CAAC;gBAC3D,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,EAAE,MAAK,qBAAU,CAAC,cAAc,EAAE;oBACtD,MAAM,iBAAiB,GAAG,SAAS,CAAC,aAAa,CAAC,qBAAU,CAAC,cAAc,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC/F,MAAM,wBAAwB,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;oBACtG,MAAM,KAAK,GAAqC,EAAE,CAAC;oBACnD,KAAK,MAAM,QAAQ,IAAI,wBAAwB,CAAC,aAAa,EAAE,EAAE;wBAC/D,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC;wBACjF,MAAM,WAAW,GAAG,kBAAkB,CAAC,cAAc,EAAE,CAAC;wBACxD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;wBACnC,MAAM,IAAI,GAAmC;4BAC3C,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE;4BAClC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;4BACnB,IAAI;yBACE,CAAC;wBACT,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAClB;oBACD,OAAO,KAAK,CAAC;iBACd;aACF;SACF;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAzCD,0EAyCC"}
1
+ {"version":3,"file":"extract-existing-config-validation.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/extract-existing-config-validation.ts"],"names":[],"mappings":";;;AAAA,6CAGwB;AACxB,uCAGkB;AAElB,SAAgB,+BAA+B,CAAC,UAAsB;;IAEpE,MAAM,QAAQ,GAAG,IAAA,gCAAqB,EAAC,UAAU,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,CAAC;KACX;IACD,MAAM,8BAA8B,GAAG,OAAO,CAAC,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC;IAC5F,MAAM,sBAAsB,GAAG,8BAA8B,CAAC,2BAA2B,CAAC,qBAAU,CAAC,sBAAsB,CAAC,CAAC;IAC7H,KAAK,MAAM,IAAI,IAAI,sBAAsB,CAAC,WAAW,EAAE,EAAE;QACvD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;YACpD,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,qBAAU,CAAC,cAAc,CAAC,CAAC;YACnE,MAAM,qBAAqB,GAAG,YAAY,CAAC,YAAY,EAAE,CAAC;YAC1D,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;gBACtD,MAAM,uBAAuB,GAAG,oBAAoB,CAAC,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;gBACvG,MAAM,sBAAsB,GAAG,MAAA,uBAAuB,CAAC,WAAW,CAAC,kBAAkB,CAAC,0CAC9B,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC;gBACrG,MAAM,SAAS,GAAG,sBAAsB,aAAtB,sBAAsB,uBAAtB,sBAAsB,CAAE,cAAc,EAAE,CAAC;gBAC3D,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,EAAE,MAAK,qBAAU,CAAC,cAAc,EAAE;oBACtD,MAAM,iBAAiB,GAAG,SAAS,CAAC,aAAa,CAAC,qBAAU,CAAC,cAAc,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;oBAC/F,MAAM,wBAAwB,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC;oBACtG,MAAM,KAAK,GAAqC,EAAE,CAAC;oBACnD,KAAK,MAAM,QAAQ,IAAI,wBAAwB,CAAC,aAAa,EAAE,EAAE;wBAC/D,MAAM,kBAAkB,GAAG,QAAQ,CAAC,aAAa,CAAC,qBAAU,CAAC,kBAAkB,CAAC,CAAC;wBACjF,MAAM,WAAW,GAAG,kBAAkB,CAAC,cAAc,EAAE,CAAC;wBACxD,IAAI,CAAC,WAAW,EAAE;4BAChB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;yBACzC;wBACD,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;wBACnC,MAAM,IAAI,GAAmC;4BAC3C,IAAI,EAAE,kBAAkB,CAAC,OAAO,EAAE;4BAClC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;4BACnB,IAAI;yBACE,CAAC;wBACT,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAClB;oBACD,OAAO,KAAK,CAAC;iBACd;aACF;SACF;KACF;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AA5CD,0EA4CC"}
package/src/generators/init-application/files/shared/Dockerfile CHANGED
@@ -11,7 +11,7 @@ ENV TRAEFIK_SERVICE_NAME=${NAME_PREFIX}${PROJECT_NAME}
11
11
 
12
12
  ENV TRAEFIK_ROUTER_NAME=${NAME_PREFIX}${PROJECT_NAME}
13
13
  ENV TRAEFIK_ROUTER_PRIORITY=20
14
- ENV TRAEFIK_ROUTER_PATH_PREFIX=/$PATH_PREFIX
14
+ ENV TRAEFIK_ROUTER_PATH_PREFIX=/$PATH_PREFIX/
15
15
 
16
16
  ENV TREAFIK_HEALTH_CHECK_INTERVAL=60s
17
17
  ENV TREAFIK_HEALTH_CHECK_TIMEOUT=30s
package/src/generators/init-application/generator.js CHANGED
@@ -6,7 +6,9 @@ const devkit_1 = require("@nx/devkit");
6
6
  const library_1 = require("@nx/js/src/generators/library/library");
7
7
  const generator_utilities_1 = require("@rxap/generator-utilities");
8
8
  const plugin_application_1 = require("@rxap/plugin-application");
9
+ const plugin_docker_1 = require("@rxap/plugin-docker");
9
10
  const ts_morph_1 = require("@rxap/ts-morph");
11
+ const utilities_1 = require("@rxap/utilities");
10
12
  const workspace_ts_morph_1 = require("@rxap/workspace-ts-morph");
11
13
  const workspace_utilities_1 = require("@rxap/workspace-utilities");
12
14
  const path_1 = require("path");
@@ -120,14 +122,17 @@ function skipProject(tree, options, project, projectName) {
120
122
  }
121
123
  function setGeneralTargetDefaults(tree) {
122
124
  const nxJson = (0, devkit_1.readNxJson)(tree);
125
+ if (!nxJson) {
126
+ throw new Error('No nx.json found');
127
+ }
123
128
  (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'generate-package-json');
124
129
  (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'generate-open-api', 'swagger-generate');
125
130
  (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'generate-package-json', 'generate-open-api', 'swagger-generate', 'swagger-build');
126
131
  (0, devkit_1.updateNxJson)(tree, nxJson);
127
132
  }
128
- function updateProjectTargets(project, options) {
129
- var _a, _b, _c, _d, _e, _f;
130
- var _g, _h, _j;
133
+ function updateProjectTargets(projectName, project, options) {
134
+ var _a, _b, _c, _d, _e, _f, _g;
135
+ var _h, _j, _k;
131
136
  (0, workspace_utilities_1.CoerceTarget)(project, 'generate-package-json', {
132
137
  executor: '@rxap/plugin-nestjs:package-json',
133
138
  configurations: {
@@ -136,7 +141,7 @@ function updateProjectTargets(project, options) {
136
141
  });
137
142
  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;
138
143
  if (!outputPath) {
139
- throw new Error(`No outputPath found for project ${project.name}`);
144
+ throw new Error(`No outputPath found for project ${projectName}`);
140
145
  }
141
146
  if (options.swagger && !options.standalone) {
142
147
  (0, workspace_utilities_1.CoerceTarget)(project, 'generate-open-api', {
@@ -144,9 +149,9 @@ function updateProjectTargets(project, options) {
144
149
  options: {
145
150
  generator: '@rxap/plugin-open-api:generate',
146
151
  options: {
147
- project: `open-api-${project.name}`,
152
+ project: `open-api-${projectName}`,
148
153
  path: `${outputPath.replace('dist/', 'dist/swagger/')}/openapi.json`,
149
- serverId: project.name,
154
+ serverId: projectName,
150
155
  },
151
156
  },
152
157
  });
@@ -169,12 +174,12 @@ function updateProjectTargets(project, options) {
169
174
  },
170
175
  },
171
176
  }, workspace_utilities_1.Strategy.OVERWRITE);
172
- if (project.targets['docker']) {
173
- (_d = (_g = project.targets['docker']).options) !== null && _d !== void 0 ? _d : (_g.options = {});
174
- (_e = (_h = project.targets['docker'].options).dockerfile) !== null && _e !== void 0 ? _e : (_h.dockerfile = 'shared/nestjs/Dockerfile');
175
- (_f = (_j = project.targets['docker'].options).buildArgList) !== null && _f !== void 0 ? _f : (_j.buildArgList = []);
177
+ if ((_d = project.targets) === null || _d === void 0 ? void 0 : _d['docker']) {
178
+ (_e = (_h = project.targets['docker']).options) !== null && _e !== void 0 ? _e : (_h.options = {});
179
+ (_f = (_j = project.targets['docker'].options).dockerfile) !== null && _f !== void 0 ? _f : (_j.dockerfile = 'shared/nestjs/Dockerfile');
180
+ (_g = (_k = project.targets['docker'].options).buildArgList) !== null && _g !== void 0 ? _g : (_k.buildArgList = []);
176
181
  if (!project.targets['docker'].options.buildArgList.some((arg) => arg.startsWith('PATH_PREFIX='))) {
177
- project.targets['docker'].options.buildArgList.push('REGEX:app/app.config.ts:validationSchema\\[\'GLOBAL_API_PREFIX\'\\]\\s*=\\s*Joi.string\\(\\).default\\(\\s*\'(.+)\',?\\s*\\);');
182
+ project.targets['docker'].options.buildArgList.push('PATH_PREFIX=REGEX:app/app.config.ts:validationSchema\\[\'GLOBAL_API_PREFIX\'\\]\\s*=\\s*Joi.string\\(\\).default\\(\\s*\'(.+)\',?\\s*\\);');
178
183
  }
179
184
  }
180
185
  }
@@ -208,19 +213,22 @@ function addDependencies(tree, options) {
208
213
  }
209
214
  });
210
215
  }
211
- function createOpenApiClientSdkLibrary(tree, project, projects) {
216
+ function createOpenApiClientSdkLibrary(tree, projectName, project, projects) {
212
217
  var _a;
213
218
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
214
- const openApiProjectName = `open-api-${project.name}`;
219
+ const openApiProjectName = `open-api-${projectName}`;
215
220
  if (projects.has(openApiProjectName)) {
216
- console.log(`Open api client sdk library for project ${project.name} already exists`);
221
+ console.log(`Open api client sdk library for project ${projectName} already exists`);
217
222
  return;
218
223
  }
219
224
  const projectRoot = project.root;
220
225
  const fragments = projectRoot.split('/');
221
226
  const name = fragments.pop();
227
+ if (!name) {
228
+ throw new Error(`Can't find project folder from the project root path for project '${projectName}'`);
229
+ }
222
230
  // only remove the root folder if it is one of the following
223
- if (['libs', 'applications', 'apps', 'packages'].includes(fragments[0])) {
231
+ if (['libs', 'applications', 'apps', 'packages', 'service'].includes(fragments[0])) {
224
232
  fragments.shift(); // remove the root folder
225
233
  }
226
234
  const directory = ['open-api', ...fragments].filter(Boolean).join('/');
@@ -266,14 +274,15 @@ function createOpenApiClientSdkLibrary(tree, project, projects) {
266
274
  tree.delete(`${openApiProjectRoot}/README.md`);
267
275
  }
268
276
  (_a = openApiProjectConfiguration.implicitDependencies) !== null && _a !== void 0 ? _a : (openApiProjectConfiguration.implicitDependencies = []);
269
- if (!openApiProjectConfiguration.implicitDependencies.includes(project.name)) {
270
- openApiProjectConfiguration.implicitDependencies.push(project.name);
277
+ if (!openApiProjectConfiguration.implicitDependencies.includes(projectName)) {
278
+ openApiProjectConfiguration.implicitDependencies.push(projectName);
271
279
  }
272
280
  (0, devkit_1.updateProjectConfiguration)(tree, openApiProjectName, openApiProjectConfiguration);
273
281
  });
274
282
  }
275
283
  function getPort(tree, options, projectSourceRoot) {
276
- if (options.port && options.projects.length === 1) {
284
+ var _a;
285
+ if (options.port && ((_a = options.projects) === null || _a === void 0 ? void 0 : _a.length) === 1) {
277
286
  return options.port;
278
287
  }
279
288
  if (tree.exists((0, path_1.join)(projectSourceRoot, 'app', 'app.config.ts'))) {
@@ -310,7 +319,7 @@ function assertMainStatements(sourceFile) {
310
319
  const existingStatements = (_a = sourceFile.getStatements().map(s => s.getText())) !== null && _a !== void 0 ? _a : [];
311
320
  for (const statement of statements) {
312
321
  if (!existingStatements.includes(statement)) {
313
- console.error(`Missing statement from main.ts: ${statement}`);
322
+ console.error(`Missing statement from nestjs main.ts: ${statement}`);
314
323
  sourceFile.set({
315
324
  statements: [
316
325
  MAIN_NEST_APP_OPTIONS_STATEMENT,
@@ -354,9 +363,9 @@ function assertMainStatements(sourceFile) {
354
363
  }
355
364
  }
356
365
  }
357
- function updateMainFile(tree, project, projectName, options) {
358
- (0, workspace_ts_morph_1.TsMorphAngularProjectTransform)(tree, {
359
- project: project.name,
366
+ function updateMainFile(tree, projectName, options) {
367
+ (0, workspace_ts_morph_1.TsMorphNestProjectTransform)(tree, {
368
+ project: projectName,
360
369
  // directory: '..' // to move from the apps/demo/src/app folder into the apps/demo/src folder
361
370
  }, (project, [sourceFile]) => {
362
371
  var _a;
@@ -476,7 +485,7 @@ function updateApiConfigurationFile(tree, projectName, apiPrefix, apiConfigurati
476
485
  });
477
486
  }
478
487
  function initApplicationGenerator(tree, options) {
479
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
488
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
480
489
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
481
490
  (_a = options.standalone) !== null && _a !== void 0 ? _a : (options.standalone = false);
482
491
  (_b = options.sentry) !== null && _b !== void 0 ? _b : (options.sentry = true);
@@ -493,13 +502,20 @@ function initApplicationGenerator(tree, options) {
493
502
  (_o = options.jwt) !== null && _o !== void 0 ? _o : (options.jwt = false);
494
503
  (_p = options.statusRegister) !== null && _p !== void 0 ? _p : (options.statusRegister = true);
495
504
  (_q = options.apiConfigurationFile) !== null && _q !== void 0 ? _q : (options.apiConfigurationFile = 'shared/service/configuration/latest/config.api.json');
505
+ (_r = options.project) !== null && _r !== void 0 ? _r : (options.project = undefined);
506
+ (_s = options.projects) !== null && _s !== void 0 ? _s : (options.projects = []);
507
+ if (options.project) {
508
+ (0, utilities_1.CoerceArrayItems)(options.projects, [options.project]);
509
+ }
496
510
  console.log('nestjs application init generator:', options);
511
+ yield (0, plugin_application_1.ApplicationInitWorkspace)(tree, options);
497
512
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/nest-server', 'latest', { soft: true });
498
513
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/nest-utilities', 'latest', { soft: true });
499
514
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/nest-logger', 'latest', { soft: true });
500
515
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@nestjs/terminus', 'latest', { soft: true });
501
516
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@nestjs/config', 'latest', { soft: true });
502
517
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@nestjs/cache-manager', 'latest', { soft: true });
518
+ yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, 'cache-manager', 'latest', { soft: true });
503
519
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, 'joi', 'latest', { soft: true });
504
520
  yield (0, workspace_utilities_1.AddPackageJsonDevDependency)(tree, '@rxap/plugin-nestjs', 'latest', { soft: true });
505
521
  yield (0, workspace_utilities_1.AddPackageJsonDevDependency)(tree, '@rxap/plugin-library', 'latest', { soft: true });
@@ -539,15 +555,15 @@ function initApplicationGenerator(tree, options) {
539
555
  }
540
556
  const port = getPort(tree, options, projectSourceRoot);
541
557
  const globalApiPrefix = (0, workspace_utilities_1.GetNestApiPrefix)(tree, options, projectSourceRoot, projectName);
542
- console.log(`init project: ${projectName}`);
543
- yield (0, plugin_application_1.ApplicationInitGenerator)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: false }));
544
- updateProjectTargets(project, options);
558
+ console.log(`init nestjs application project: ${projectName}`);
559
+ (0, plugin_application_1.ApplicationInitProject)(tree, projectName, project, options);
560
+ updateProjectTargets(projectName, project, options);
545
561
  updateGitIgnore(tree, project);
546
562
  updateTags(project, options);
547
563
  if (!options.standalone) {
548
564
  yield updateApiConfigurationFile(tree, projectName, globalApiPrefix, options.apiConfigurationFile);
549
565
  if (options.swagger) {
550
- yield createOpenApiClientSdkLibrary(tree, project, projects);
566
+ yield createOpenApiClientSdkLibrary(tree, projectName, project, projects);
551
567
  }
552
568
  }
553
569
  // apply changes to the project configuration
@@ -622,10 +638,10 @@ function initApplicationGenerator(tree, options) {
622
638
  removeAppServiceFile(tree, projectSourceRoot);
623
639
  removeAppControllerSpecFile(tree, projectSourceRoot);
624
640
  if (options.generateMain) {
625
- updateMainFile(tree, project, projectName, options);
641
+ updateMainFile(tree, projectName, options);
626
642
  }
627
- if (options.healthIndicator || ((_r = options.healthIndicatorList) === null || _r === void 0 ? void 0 : _r.length)) {
628
- if ((_s = options.healthIndicatorList) === null || _s === void 0 ? void 0 : _s.length) {
643
+ if (options.healthIndicator || ((_t = options.healthIndicatorList) === null || _t === void 0 ? void 0 : _t.length)) {
644
+ if ((_u = options.healthIndicatorList) === null || _u === void 0 ? void 0 : _u.length) {
629
645
  for (const healthIndicator of options.healthIndicatorList) {
630
646
  yield (0, generator_2.default)(tree, {
631
647
  name: healthIndicator,
@@ -675,9 +691,7 @@ function initApplicationGenerator(tree, options) {
675
691
  }
676
692
  }
677
693
  }
678
- else {
679
- yield (0, plugin_application_1.ApplicationInitGenerator)(tree, Object.assign(Object.assign({}, options), { projects: [], skipProjects: true }));
680
- }
694
+ yield (0, plugin_docker_1.DockerGitlabCiGenerator)(tree, {});
681
695
  });
682
696
  }
683
697
  exports.initApplicationGenerator = initApplicationGenerator;
package/src/generators/init-application/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/generator.ts"],"names":[],"mappings":"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"}
package/src/generators/init-application/schema.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  export interface InitApplicationGeneratorSchema {
2
2
  generateMain?: boolean;
3
3
  swaggerLive?: boolean;
4
+ project?: string;
4
5
  projects?: string[];
5
6
  sentry?: boolean;
6
7
  swagger?: boolean;
package/src/generators/init-application/schema.json CHANGED
@@ -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"
package/src/generators/init-library/generator.js CHANGED
@@ -20,6 +20,9 @@ function skipProject(tree, options, project, projectName) {
20
20
  }
21
21
  function setGeneralTargetDefaults(tree) {
22
22
  const nxJson = (0, devkit_1.readNxJson)(tree);
23
+ if (!nxJson) {
24
+ throw new Error('No nx.json found');
25
+ }
23
26
  (0, workspace_utilities_1.CoerceTargetDefaultsDependency)(nxJson, 'build', 'check-version');
24
27
  (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'check-version', 'copy-client-sdk');
25
28
  (0, devkit_1.updateNxJson)(tree, nxJson);
@@ -35,14 +38,17 @@ function updateProjectTargets(tree, project) {
35
38
  }
36
39
  }
37
40
  function getNestMajorVersion(rootPackageJson) {
38
- var _a;
39
- let targetVersion = (_a = rootPackageJson.dependencies['@nestjs/core']) !== null && _a !== void 0 ? _a : rootPackageJson.devDependencies['@nestjs/cli'];
41
+ var _a, _b, _c;
42
+ 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
43
  if (!targetVersion) {
41
44
  console.error(`The package @nestjs/core and @nestjs/cli are not installed in the root package.json`);
42
45
  return null;
43
46
  }
44
47
  targetVersion = targetVersion.replace(/^[~^]/, '');
45
48
  const version = (0, semver_1.parse)(targetVersion);
49
+ if (!version) {
50
+ throw new Error(`Can't parse version: ${targetVersion}`);
51
+ }
46
52
  return `${version.major}.0.0`;
47
53
  }
48
54
  function updatePackageJson(tree, project, rootPackageJson) {
@@ -50,6 +56,9 @@ function updatePackageJson(tree, project, rootPackageJson) {
50
56
  if ((0, generator_utilities_1.IsPublishable)(tree, project) && tree.exists((0, path_1.join)(project.root, 'package.json'))) {
51
57
  const packageJson = (0, devkit_1.readJson)(tree, (0, path_1.join)(project.root, 'package.json'));
52
58
  const version = (_a = getNestMajorVersion(rootPackageJson)) !== null && _a !== void 0 ? _a : packageJson.version;
59
+ if (!version) {
60
+ throw new Error('Can\'t determine the nest major version');
61
+ }
53
62
  if (!packageJson.version || (0, semver_1.gte)(version, packageJson.version)) {
54
63
  packageJson.version = version;
55
64
  }
@@ -66,7 +75,7 @@ function initLibraryGenerator(tree, options) {
66
75
  if (skipProject(tree, options, project, projectName)) {
67
76
  continue;
68
77
  }
69
- console.log(`init project: ${projectName}`);
78
+ console.log(`init nestjs library project: ${projectName}`);
70
79
  yield (0, plugin_library_1.LibraryInitGenerator)(tree, Object.assign(Object.assign({}, options), { projects: [projectName], skipProjects: false }));
71
80
  updateProjectTargets(tree, project);
72
81
  updatePackageJson(tree, project, rootPackageJson);
package/src/generators/init-library/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-library/generator.ts"],"names":[],"mappings":"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"}
package/src/generators/microservice/generator.js CHANGED
@@ -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 = '');
package/src/generators/microservice/generator.js.map CHANGED
@@ -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;AAxCD,sDAwCC;AAED,kBAAe,qBAAqB,CAAC"}
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"}
package/src/generators/open-api/generator.js CHANGED
@@ -62,6 +62,9 @@ function openApiGenerator(tree, options) {
62
62
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
63
63
  UpdateAppModule(tree, options);
64
64
  const projectSourceRoot = (0, generator_utilities_1.GetProjectSourceRoot)(tree, options.project);
65
+ if (!projectSourceRoot) {
66
+ throw new Error(`Could not find the source root of the project: ${options.project}`);
67
+ }
65
68
  if (!tree.exists((0, path_1.join)(projectSourceRoot, 'assets', 'open-api-server-config.json'))) {
66
69
  tree.write((0, path_1.join)(projectSourceRoot, 'assets', 'open-api-server-config.json'), '[]');
67
70
  }
package/src/generators/open-api/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/open-api/generator.ts"],"names":[],"mappings":";;;;AACA,mEAAiE;AACjE,6CAIwB;AACxB,iEAAuE;AACvE,mEAAqE;AACrE,+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,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;AAXD,4CAWC;AAED,kBAAe,gBAAgB,CAAC"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/open-api/generator.ts"],"names":[],"mappings":";;;;AACA,mEAAiE;AACjE,6CAIwB;AACxB,iEAAuE;AACvE,mEAAqE;AACrE,+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"}
package/src/generators/swagger/generator.js CHANGED
@@ -41,6 +41,9 @@ function updateProjectTargets(project, options) {
41
41
  }
42
42
  function updateNxDefaults(tree, options) {
43
43
  const nxJson = (0, devkit_1.readNxJson)(tree);
44
+ if (!nxJson) {
45
+ throw new Error('No nx.json found');
46
+ }
44
47
  if (!options.standalone) {
45
48
  (0, workspace_utilities_1.CoerceNxJsonCacheableOperation)(nxJson, 'swagger-build', 'swagger-generate');
46
49
  (0, workspace_utilities_1.CoerceTarget)(nxJson, 'swagger-generate', {
package/src/generators/swagger/generator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/swagger/generator.ts"],"names":[],"mappings":"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"}