@rxap/ts-morph 1.6.0-dev.2 → 1.6.0

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 (7) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/package.json +3 -3
  3. package/src/lib/nest/coerce-dto-class.js +14 -9
  4. package/src/lib/nest/coerce-dto-class.js.map +1 -1
  5. package/src/lib/nest/coerce-nest-app-config.d.ts +5 -1
  6. package/src/lib/nest/coerce-nest-app-config.js +13 -1
  7. package/src/lib/nest/coerce-nest-app-config.js.map +1 -1
package/CHANGELOG.md CHANGED
@@ -3,6 +3,16 @@
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
+ # [1.6.0](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.6.0-dev.3...@rxap/ts-morph@1.6.0) (2026-01-23)
7
+
8
+ **Note:** Version bump only for package @rxap/ts-morph
9
+
10
+ # [1.6.0-dev.3](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.6.0-dev.2...@rxap/ts-morph@1.6.0-dev.3) (2026-01-13)
11
+
12
+ ### Features
13
+
14
+ - **nestjs:** enhance Sentry setup and validation schema handling ([aabfcb9](https://gitlab.com/rxap/packages/commit/aabfcb9f32d463c277517b39b1b68548a5116706))
15
+
6
16
  # [1.6.0-dev.2](https://gitlab.com/rxap/packages/compare/@rxap/ts-morph@1.6.0-dev.1...@rxap/ts-morph@1.6.0-dev.2) (2025-09-18)
7
17
 
8
18
  **Note:** Version bump only for package @rxap/ts-morph
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
- "version": "1.6.0-dev.2",
2
+ "version": "1.6.0",
3
3
  "name": "@rxap/ts-morph",
4
4
  "description": "Provides utilities for manipulating TypeScript code using the ts-morph library. It offers a fluent API to add, modify, and remove code elements such as classes, decorators, imports, and properties in both Angular and NestJS projects. This package simplifies common code generation and refactoring tasks.\n",
5
5
  "license": "GPL-3.0-or-later",
6
6
  "dependencies": {
7
7
  "@nx/devkit": "20.5.0",
8
- "@rxap/utilities": "^16.5.0-dev.0",
8
+ "@rxap/utilities": "^16.5.0",
9
9
  "colors": "^1.4.0",
10
10
  "ts-morph": "^18.0.0",
11
11
  "tslib": "2.6.2"
@@ -44,7 +44,7 @@
44
44
  },
45
45
  "schematics": "./generators.json",
46
46
  "type": "commonjs",
47
- "gitHead": "ef20bc50270ad0727a111d54e48cb279ff3ed5cf",
47
+ "gitHead": "36b0e9732b24717840935712e316593ff6aba795",
48
48
  "types": "./src/index.d.ts",
49
49
  "main": "./src/index.js"
50
50
  }
package/src/lib/nest/coerce-dto-class.js CHANGED
@@ -206,15 +206,20 @@ function addClassValidatorDecoratorForType(propertyDeclaration, propertyType) {
206
206
  moduleSpecifier: 'class-validator',
207
207
  });
208
208
  break;
209
- case 'unknown':
210
- (0, coerce_decorator_1.CoerceDecorator)(propertyDeclaration, 'ApiProperty', {
211
- arguments: [ts_morph_1.Writers.object({ type: w => w.quote('unknown') })],
212
- });
213
- (0, coerce_imports_1.CoerceImports)(sourceFile, {
214
- namedImports: ['ApiProperty'],
215
- moduleSpecifier: '@nestjs/swagger',
216
- });
217
- break;
209
+ // If the property type is unknown we should NOT add the ApiProperty decorator
210
+ // case 'unknown':
211
+ // CoerceDecorator(
212
+ // propertyDeclaration,
213
+ // 'ApiProperty',
214
+ // {
215
+ // arguments: [ Writers.object({ type: w => w.quote('unknown') }) ],
216
+ // },
217
+ // );
218
+ // CoerceImports(sourceFile, {
219
+ // namedImports: [ 'ApiProperty' ],
220
+ // moduleSpecifier: '@nestjs/swagger',
221
+ // });
222
+ // break;
218
223
  }
219
224
  }
220
225
  function cleanupUnknownApiPropertyDecorator(propertyDeclaration) {
package/src/lib/nest/coerce-dto-class.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"coerce-dto-class.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-dto-class.ts"],"names":[],"mappings":"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"}
package/src/lib/nest/coerce-nest-app-config.d.ts CHANGED
@@ -6,7 +6,11 @@ export interface CoerceNestAppConfigOptionsItem {
6
6
  builder?: (item: Omit<CoerceNestAppConfigOptionsItem, 'builder'>) => string | WriterFunction;
7
7
  }
8
8
  export interface CoerceNestAppConfigOptions {
9
- itemList: Array<CoerceNestAppConfigOptionsItem>;
9
+ itemList?: Array<CoerceNestAppConfigOptionsItem>;
10
+ /**
11
+ * A list of function that will be called to expand the validation schema.
12
+ */
13
+ expandList?: Array<string | WriterFunction>;
10
14
  overwrite?: boolean;
11
15
  }
12
16
  export declare function CoerceNestAppConfig(sourceFile: SourceFile, options: CoerceNestAppConfigOptions): void;
package/src/lib/nest/coerce-nest-app-config.js CHANGED
@@ -5,7 +5,7 @@ const ts_morph_1 = require("ts-morph");
5
5
  const coerce_imports_1 = require("../coerce-imports");
6
6
  const coerce_variable_declaration_1 = require("../coerce-variable-declaration");
7
7
  function CoerceNestAppConfig(sourceFile, options) {
8
- const { itemList, overwrite } = options;
8
+ const { itemList = [], expandList = [], overwrite } = options;
9
9
  const objVariableDeclaration = (0, coerce_variable_declaration_1.CoerceVariableDeclaration)(sourceFile, 'validationSchema', {
10
10
  type: 'SchemaMap',
11
11
  initializer: '{}',
@@ -45,6 +45,18 @@ function CoerceNestAppConfig(sourceFile, options) {
45
45
  sourceFile.insertStatements(schemaIndex, writeValidationSchemaExpression(item));
46
46
  }
47
47
  }
48
+ for (const expand of expandList) {
49
+ const initializer = objVariableDeclaration.getInitializerOrThrow();
50
+ initializer.asKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression).addSpreadAssignment({
51
+ expression: typeof expand === 'function' ? expand : expand.endsWith(')') ? expand : `${expand}(environment)`,
52
+ });
53
+ }
54
+ if (expandList.length) {
55
+ (0, coerce_imports_1.CoerceImports)(sourceFile, {
56
+ moduleSpecifier: '../environments/environment',
57
+ namedImports: ['environment'],
58
+ });
59
+ }
48
60
  }
49
61
  function writeValidationSchemaExpression(item) {
50
62
  return w => {
package/src/lib/nest/coerce-nest-app-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"coerce-nest-app-config.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-app-config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"coerce-nest-app-config.js","sourceRoot":"","sources":["../../../../../../packages/ts-morph/src/lib/nest/coerce-nest-app-config.ts"],"names":[],"mappings":"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"}