@rxap/plugin-nestjs 19.1.3-dev.1 → 19.1.3-dev.2

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 (6) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/package.json +2 -2
  3. package/src/generators/init-application/assert-main-statements.js +5 -1
  4. package/src/generators/init-application/assert-main-statements.js.map +1 -1
  5. package/src/generators/init-application/update-main-file.js +14 -0
  6. package/src/generators/init-application/update-main-file.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
+ ## [19.1.3-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.3-dev.1...@rxap/plugin-nestjs@19.1.3-dev.2) (2024-08-15)
7
+
8
+ ### Bug Fixes
9
+
10
+ - add the logger init ([a66f0fe](https://gitlab.com/rxap/packages/commit/a66f0fe5a7b2b8dfef708cc775566daa0167ec43))
11
+ - add the required rxap logger type ([d77498c](https://gitlab.com/rxap/packages/commit/d77498c67b28778e83a001273882ccc26605db95))
12
+
6
13
  ## [19.1.3-dev.1](https://gitlab.com/rxap/packages/compare/@rxap/plugin-nestjs@19.1.3-dev.0...@rxap/plugin-nestjs@19.1.3-dev.1) (2024-08-12)
7
14
 
8
15
  ### Bug Fixes
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "19.1.3-dev.1",
2
+ "version": "19.1.3-dev.2",
3
3
  "name": "@rxap/plugin-nestjs",
4
4
  "license": "GPL-3.0-or-later",
5
5
  "dependencies": {
@@ -54,6 +54,6 @@
54
54
  },
55
55
  "schematics": "./generators.json",
56
56
  "type": "commonjs",
57
- "gitHead": "4f4db300cfb5db8aaf0c9736227c9dfe09caecdc",
57
+ "gitHead": "22c9f31cfbc605f71eab69717ca09cf2d63f659b",
58
58
  "main": "./src/index.js"
59
59
  }
package/src/generators/init-application/assert-main-statements.js CHANGED
@@ -14,7 +14,7 @@ function assertMainStatements(sourceFile) {
14
14
  const statements = [];
15
15
  statements.push('const options: NestApplicationOptions = {');
16
16
  statements.push('const bootstrapOptions: Partial<MonolithicBootstrapOptions> = {');
17
- statements.push('const server = new Monolithic<NestApplicationOptions, NestExpressApplication>(AppModule, environment, options, bootstrapOptions);');
17
+ statements.push('const server = new Monolithic<NestApplicationOptions, RxapLogger, NestExpressApplication>(AppModule, environment, options, bootstrapOptions);');
18
18
  const existingStatements = (_a = sourceFile.getStatements().map(s => s.getText())) !== null && _a !== void 0 ? _a : [];
19
19
  for (const statement of statements) {
20
20
  if (!existingStatements.includes(statement)) {
@@ -35,6 +35,10 @@ function assertMainStatements(sourceFile) {
35
35
  moduleSpecifier: '@nestjs/common',
36
36
  namedImports: ['NestApplicationOptions'],
37
37
  },
38
+ {
39
+ moduleSpecifier: '@rxap/nest-logger',
40
+ namedImports: ['RxapLogger'],
41
+ },
38
42
  {
39
43
  moduleSpecifier: '@nestjs/platform-express',
40
44
  namedImports: ['NestExpressApplication'],
package/src/generators/init-application/assert-main-statements.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"assert-main-statements.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/assert-main-statements.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAG/C,MAAM,gCAAgC,GAAG,mEAAmE,CAAC;AAC7G,MAAM,qBAAqB,GAAG,mIAAmI,CAAC;AACrJ,QAAA,wBAAwB,GAAG,4FAA4F,CAAC;AACrI,MAAM,2BAA2B,GAAG,8BAA8B,CAAC;AACnE,MAAM,2BAA2B,GAAG,oCAAoC,CAAC;AACzE,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AAC/D,MAAM,+BAA+B,GAAG,6CAA6C,CAAC;AAEtF,SAAgB,oBAAoB,CAAC,UAAsB;;IACzD,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,UAAU,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAC7D,UAAU,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;IACnF,UAAU,CAAC,IAAI,CACb,mIAAmI,CAAC,CAAC;IAEvI,MAAM,kBAAkB,GAAG,MAAA,UAAU,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,mCAAI,EAAE,CAAC;IAClF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,KAAK,CAAC,2CAA4C,SAAU,EAAE,CAAC,CAAC;YACxE,UAAU,CAAC,GAAG,CAAC;gBACb,UAAU,EAAE;oBACV,+BAA+B;oBAC/B,gCAAgC;oBAChC,qBAAqB;oBACrB,2BAA2B;oBAC3B,2BAA2B;oBAC3B,yBAAyB;oBACzB,gCAAwB;iBACzB;aACF,CAAC,CAAC;YACH,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,gBAAgB;oBACjC,YAAY,EAAE,CAAE,wBAAwB,CAAE;iBAC3C;gBACD;oBACE,eAAe,EAAE,0BAA0B;oBAC3C,YAAY,EAAE,CAAE,wBAAwB,CAAE;iBAC3C;gBACD;oBACE,eAAe,EAAE,mBAAmB;oBACpC,YAAY,EAAE;wBACZ,4BAA4B;wBAC5B,YAAY;wBACZ,aAAa;wBACb,mBAAmB;wBACnB,WAAW;qBACZ;iBACF;gBACD;oBACE,eAAe,EAAE,kBAAkB;oBACnC,YAAY,EAAE,CAAE,WAAW,CAAE;iBAC9B;gBACD;oBACE,eAAe,EAAE,4BAA4B;oBAC7C,YAAY,EAAE,CAAE,aAAa,CAAE;iBAChC;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC;AAGH,CAAC;AAxDD,oDAwDC"}
1
+ {"version":3,"file":"assert-main-statements.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/assert-main-statements.ts"],"names":[],"mappings":";;;AAAA,6CAA+C;AAG/C,MAAM,gCAAgC,GAAG,mEAAmE,CAAC;AAC7G,MAAM,qBAAqB,GAAG,mIAAmI,CAAC;AACrJ,QAAA,wBAAwB,GAAG,4FAA4F,CAAC;AACrI,MAAM,2BAA2B,GAAG,8BAA8B,CAAC;AACnE,MAAM,2BAA2B,GAAG,oCAAoC,CAAC;AACzE,MAAM,yBAAyB,GAAG,4BAA4B,CAAC;AAC/D,MAAM,+BAA+B,GAAG,6CAA6C,CAAC;AAEtF,SAAgB,oBAAoB,CAAC,UAAsB;;IACzD,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,UAAU,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;IAC7D,UAAU,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;IACnF,UAAU,CAAC,IAAI,CACb,+IAA+I,CAAC,CAAC;IAEnJ,MAAM,kBAAkB,GAAG,MAAA,UAAU,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,mCAAI,EAAE,CAAC;IAClF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,OAAO,CAAC,KAAK,CAAC,2CAA4C,SAAU,EAAE,CAAC,CAAC;YACxE,UAAU,CAAC,GAAG,CAAC;gBACb,UAAU,EAAE;oBACV,+BAA+B;oBAC/B,gCAAgC;oBAChC,qBAAqB;oBACrB,2BAA2B;oBAC3B,2BAA2B;oBAC3B,yBAAyB;oBACzB,gCAAwB;iBACzB;aACF,CAAC,CAAC;YACH,IAAA,wBAAa,EAAC,UAAU,EAAE;gBACxB;oBACE,eAAe,EAAE,gBAAgB;oBACjC,YAAY,EAAE,CAAE,wBAAwB,CAAE;iBAC3C;gBACD;oBACE,eAAe,EAAE,mBAAmB;oBACpC,YAAY,EAAE,CAAE,YAAY,CAAE;iBAC/B;gBACD;oBACE,eAAe,EAAE,0BAA0B;oBAC3C,YAAY,EAAE,CAAE,wBAAwB,CAAE;iBAC3C;gBACD;oBACE,eAAe,EAAE,mBAAmB;oBACpC,YAAY,EAAE;wBACZ,4BAA4B;wBAC5B,YAAY;wBACZ,aAAa;wBACb,mBAAmB;wBACnB,WAAW;qBACZ;iBACF;gBACD;oBACE,eAAe,EAAE,kBAAkB;oBACnC,YAAY,EAAE,CAAE,WAAW,CAAE;iBAC9B;gBACD;oBACE,eAAe,EAAE,4BAA4B;oBAC7C,YAAY,EAAE,CAAE,aAAa,CAAE;iBAChC;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC;AAGH,CAAC;AA5DD,oDA4DC"}
package/src/generators/init-application/update-main-file.js CHANGED
@@ -15,6 +15,20 @@ function updateMainFile(tree, projectName, options) {
15
15
  (0, assert_main_statements_1.assertMainStatements)(sourceFile);
16
16
  const importDeclarations = [];
17
17
  const statements = [];
18
+ if (options.sentry) {
19
+ importDeclarations.push({
20
+ moduleSpecifier: '@rxap/nest-logger',
21
+ namedImports: ['UseSentryLoggerFactory'],
22
+ });
23
+ statements.push('server.useLogger(UseSentryLoggerFactory());');
24
+ }
25
+ else {
26
+ importDeclarations.push({
27
+ moduleSpecifier: '@rxap/nest-logger',
28
+ namedImports: ['UseRxapLoggerFactory'],
29
+ });
30
+ statements.push('server.useLogger(UseRxapLoggerFactory());');
31
+ }
18
32
  if (options.validator) {
19
33
  importDeclarations.push({
20
34
  moduleSpecifier: '@rxap/nest-server',
package/src/generators/init-application/update-main-file.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-main-file.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/update-main-file.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-main-file.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/nestjs/src/generators/init-application/update-main-file.ts"],"names":[],"mappings":"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"}