@rxap/plugin-nestjs 16.1.0-dev.28 → 16.1.0-dev.29

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 (4) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/package.json +2 -2
  3. package/src/generators/open-api/generator.js +33 -4
  4. package/src/generators/open-api/generator.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,12 @@
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.1.0-dev.29](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.1.0-dev.28...@rxap/plugin-nestjs@16.1.0-dev.29) (2023-09-19)
7
+
8
+ ### Bug Fixes
9
+
10
+ - support dynamic server config loading ([088583a](https://gitlab.com/rxap/packages/commit/088583acece9a693a461c958af3fa27cb20d661f))
11
+
6
12
  # [16.1.0-dev.28](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@16.1.0-dev.27...@rxap/plugin-nestjs@16.1.0-dev.28) (2023-09-18)
7
13
 
8
14
  ### Bug Fixes
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "16.1.0-dev.28",
2
+ "version": "16.1.0-dev.29",
3
3
  "name": "@rxap/plugin-nestjs",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -80,7 +80,7 @@
80
80
  },
81
81
  "schematics": "./generators.json",
82
82
  "type": "commonjs",
83
- "gitHead": "8b2c54a5a63673f2b9af75adcb86442856fa22ea",
83
+ "gitHead": "f1bb2d6598d105370781998f8905bf87c4d61dea",
84
84
  "main": "./src/index.js",
85
85
  "types": "./src/index.d.ts"
86
86
  }
package/src/generators/open-api/generator.js CHANGED
@@ -2,9 +2,11 @@
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");
5
6
  const ts_morph_1 = require("@rxap/ts-morph");
6
7
  const workspace_ts_morph_1 = require("@rxap/workspace-ts-morph");
7
8
  const workspace_utilities_1 = require("@rxap/workspace-utilities");
9
+ const path_1 = require("path");
8
10
  const ts_morph_2 = require("ts-morph");
9
11
  function UpdateAppModule(tree, options) {
10
12
  (0, workspace_ts_morph_1.TsMorphNestProjectTransform)(tree, {
@@ -14,7 +16,7 @@ function UpdateAppModule(tree, options) {
14
16
  moduleName: 'OpenApiModule',
15
17
  structures: [
16
18
  {
17
- namedImports: ['OpenApiModule'],
19
+ namedImports: ['OpenApiModule', 'OpenApiModuleOptionsLoader'],
18
20
  moduleSpecifier: '@rxap/nest-open-api',
19
21
  },
20
22
  {
@@ -25,18 +27,45 @@ function UpdateAppModule(tree, options) {
25
27
  importWriter: w => {
26
28
  w.writeLine('OpenApiModule.registerAsync(');
27
29
  ts_morph_2.Writers.object({
28
- inject: '[ ConfigService ]',
29
- imports: '[ ConfigModule ]',
30
- useFactory: '(config: ConfigService) => ({})',
30
+ isGlobal: 'true',
31
+ useClass: 'OpenApiModuleOptionsLoader',
31
32
  })(w);
32
33
  w.write(')');
33
34
  },
34
35
  });
35
36
  }, ['/app/app.module.ts']);
36
37
  }
38
+ function UpdateAppConfig(tree, options) {
39
+ (0, workspace_ts_morph_1.TsMorphNestProjectTransform)(tree, {
40
+ project: options.project,
41
+ }, (project, [sourceFile]) => {
42
+ (0, ts_morph_1.CoerceNestAppConfig)(sourceFile, {
43
+ itemList: [
44
+ {
45
+ name: 'OPEN_API_SERVER_CONFIG_FILE_PATH',
46
+ defaultValue: `environment.production ? '/app/assets/open-api-server-config.json' : join(__dirname, 'assets/open-api-server-config.json')`,
47
+ },
48
+ ],
49
+ overwrite: options.overwrite,
50
+ });
51
+ (0, ts_morph_1.CoerceImports)(sourceFile, {
52
+ namedImports: ['environment'],
53
+ moduleSpecifier: '../environments/environment',
54
+ });
55
+ (0, ts_morph_1.CoerceImports)(sourceFile, {
56
+ namedImports: ['join'],
57
+ moduleSpecifier: 'path',
58
+ });
59
+ }, ['/app/app.config.ts?']);
60
+ }
37
61
  function openApiGenerator(tree, options) {
38
62
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
39
63
  UpdateAppModule(tree, options);
64
+ const projectSourceRoot = (0, generator_utilities_1.GetProjectSourceRoot)(tree, options.project);
65
+ if (!tree.exists((0, path_1.join)(projectSourceRoot, 'assets', 'open-api-server-config.json'))) {
66
+ tree.write((0, path_1.join)(projectSourceRoot, 'assets', 'open-api-server-config.json'), '[]');
67
+ }
68
+ UpdateAppConfig(tree, options);
40
69
  yield (0, workspace_utilities_1.AddPackageJsonDependency)(tree, '@rxap/nest-open-api', 'latest', { soft: true });
41
70
  });
42
71
  }
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,6CAAwD;AACxD,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,iCAAsB,EACpB,UAAU,EACV;YACE,UAAU,EAAE,eAAe;YAC3B,UAAU,EAAE;gBACV;oBACE,YAAY,EAAE,CAAE,eAAe,CAAE;oBACjC,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,MAAM,EAAE,mBAAmB;oBAC3B,OAAO,EAAE,kBAAkB;oBAC3B,UAAU,EAAE,iCAAiC;iBAC9C,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,SAAsB,gBAAgB,CACpC,IAAU,EACV,OAA+B;;QAE/B,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;AAND,4CAMC;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,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"}