@goast/kotlin 0.4.10 → 0.4.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.
Files changed (20) hide show
  1. package/esm/src/ast/references/jakarta.d.ts +4 -0
  2. package/esm/src/ast/references/jakarta.d.ts.map +1 -1
  3. package/esm/src/ast/references/jakarta.js +4 -0
  4. package/esm/src/generators/models/args.d.ts +1 -5
  5. package/esm/src/generators/models/args.d.ts.map +1 -1
  6. package/esm/src/generators/models/model-generator.d.ts +1 -2
  7. package/esm/src/generators/models/model-generator.d.ts.map +1 -1
  8. package/esm/src/generators/models/model-generator.js +46 -15
  9. package/package.json +1 -1
  10. package/script/src/ast/references/jakarta.d.ts +4 -0
  11. package/script/src/ast/references/jakarta.d.ts.map +1 -1
  12. package/script/src/ast/references/jakarta.js +5 -1
  13. package/script/src/generators/models/args.d.ts +1 -5
  14. package/script/src/generators/models/args.d.ts.map +1 -1
  15. package/script/src/generators/models/model-generator.d.ts +1 -2
  16. package/script/src/generators/models/model-generator.d.ts.map +1 -1
  17. package/script/src/generators/models/model-generator.js +46 -15
  18. package/src/src/ast/references/jakarta.ts +4 -0
  19. package/src/src/generators/models/args.ts +1 -6
  20. package/src/src/generators/models/model-generator.ts +51 -20
package/esm/src/ast/references/jakarta.d.ts CHANGED
@@ -2,4 +2,8 @@ import { type KtReferenceFactory } from '../nodes/reference.js';
2
2
  export declare const generated: KtReferenceFactory;
3
3
  export declare const valid: KtReferenceFactory;
4
4
  export declare const pattern: KtReferenceFactory;
5
+ export declare const min: KtReferenceFactory;
6
+ export declare const max: KtReferenceFactory;
7
+ export declare const notEmpty: KtReferenceFactory;
8
+ export declare const size: KtReferenceFactory;
5
9
  //# sourceMappingURL=jakarta.d.ts.map
package/esm/src/ast/references/jakarta.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jakarta.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/jakarta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7E,eAAO,MAAM,SAAS,EAAE,kBAA2E,CAAC;AAGpG,eAAO,MAAM,KAAK,EAAE,kBAAuE,CAAC;AAG5F,eAAO,MAAM,OAAO,EAAE,kBAAqF,CAAC"}
1
+ {"version":3,"file":"jakarta.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/jakarta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7E,eAAO,MAAM,SAAS,EAAE,kBAA2E,CAAC;AAGpG,eAAO,MAAM,KAAK,EAAE,kBAAuE,CAAC;AAG5F,eAAO,MAAM,OAAO,EAAE,kBAAqF,CAAC;AAC5G,eAAO,MAAM,GAAG,EAAE,kBAAiF,CAAC;AACpG,eAAO,MAAM,GAAG,EAAE,kBAAiF,CAAC;AACpG,eAAO,MAAM,QAAQ,EAAE,kBAAsF,CAAC;AAC9G,eAAO,MAAM,IAAI,EAAE,kBAAkF,CAAC"}
package/esm/src/ast/references/jakarta.js CHANGED
@@ -5,3 +5,7 @@ export const generated = ktReference.factory('Generated', 'jakarta.annotation');
5
5
  export const valid = ktReference.factory('Valid', 'jakarta.validation');
6
6
  // jakarta.validation.constraints
7
7
  export const pattern = ktReference.factory('Pattern', 'jakarta.validation.constraints');
8
+ export const min = ktReference.factory('Min', 'jakarta.validation.constraints');
9
+ export const max = ktReference.factory('Max', 'jakarta.validation.constraints');
10
+ export const notEmpty = ktReference.factory('NotEmpty', 'jakarta.validation.constraints');
11
+ export const size = ktReference.factory('Size', 'jakarta.validation.constraints');
package/esm/src/generators/models/args.d.ts CHANGED
@@ -59,11 +59,7 @@ export type GetJacksonJsonIncludeAnnotation = {
59
59
  schema: ApiSchema;
60
60
  property: ApiSchemaProperty;
61
61
  };
62
- export type GetJakartaPatternAnnotation = {
63
- schema: ApiSchema;
64
- property: ApiSchemaProperty;
65
- };
66
- export type GetJakartaValidAnnotation = {
62
+ export type GetJakartaValidationAnnotations = {
67
63
  schema: ApiSchema;
68
64
  property: ApiSchemaProperty;
69
65
  };
package/esm/src/generators/models/args.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/args.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/args.ts"],"names":[],"mappings":"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"}
package/esm/src/generators/models/model-generator.d.ts CHANGED
@@ -30,8 +30,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
30
30
  protected getJacksonJsonSubTypesAnnotation(ctx: Context, args: Args.GetJacksonJsonSubTypesAnnotation): kt.Annotation<Builder> | null;
31
31
  protected getJacksonJsonPropertyAnnotation(ctx: Context, args: Args.GetJacksonJsonPropertyAnnotation): kt.Annotation<Builder> | null;
32
32
  protected getJacksonJsonIncludeAnnotation(ctx: Context, args: Args.GetJacksonJsonIncludeAnnotation): kt.Annotation<Builder> | null;
33
- protected getJakartaPatternAnnotation(ctx: Context, args: Args.GetJakartaPatternAnnotation): kt.Annotation<Builder> | null;
34
- protected getJakartaValidAnnotation(ctx: Context, args: Args.GetJakartaValidAnnotation): kt.Annotation<Builder> | null;
33
+ protected getJakartaValidationAnnotations(ctx: Context, args: Args.GetJakartaValidationAnnotations): kt.Annotation<Builder>[];
35
34
  protected getSwaggerSchemaAnnotation(ctx: Context, args: Args.GetSwaggerSchemaAnnotation): kt.Annotation<Builder> | null;
36
35
  protected getPackageName(ctx: Context, args: Args.GetPackageName): string;
37
36
  protected shouldGenerateTypeDeclaration(ctx: Context, args: Args.ShouldGenerateTypeDeclaration): boolean;
package/esm/src/generators/models/model-generator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/model-generator.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAIrB,KAAK,YAAY,EAKjB,KAAK,aAAa,EAEnB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,+BAA+B,IAAI,IAAI,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE3F,KAAK,OAAO,GAAG,2BAA2B,CAAC;AAC3C,KAAK,MAAM,GAAG,0BAA0B,CAAC;AACzC,KAAK,OAAO,GAAG,iBAAiB,CAAC;AAEjC,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IACnE,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;CAC/C;AAED,qBAAa,2BAA4B,SAAQ,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAE,YAAW,oBAAoB;IAC5G,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,0BAA0B,CAAC;IAwBvE,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAO7F,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC,OAAO,CAAC;IAYnG,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IAyBxE,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAgBpF,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IAuBrE,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC;IAmDhF,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI;IAUzG,SAAS,CAAC,2BAA2B,CACnC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,2BAA2B,GACrC,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC;IAQ9B,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IA4BtF,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAyB9F,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAoBnG,SAAS,CAAC,+BAA+B,CACvC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,+BAA+B,GACzC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAYvB,SAAS,CAAC,6BAA6B,CACrC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,6BAA6B,GACvC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAgBvB,SAAS,CAAC,6BAA6B,CACrC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,6BAA6B,GACvC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAYvB,SAAS,CAAC,gCAAgC,CACxC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,gCAAgC,GAC1C,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAkBhC,SAAS,CAAC,gCAAgC,CACxC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,gCAAgC,GAC1C,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IA0BhC,SAAS,CAAC,gCAAgC,CACxC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,gCAAgC,GAC1C,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAWhC,SAAS,CAAC,+BAA+B,CACvC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,+BAA+B,GACzC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAUhC,SAAS,CAAC,2BAA2B,CACnC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,2BAA2B,GACrC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAUhC,SAAS,CAAC,yBAAyB,CACjC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,yBAAyB,GACnC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAShC,SAAS,CAAC,0BAA0B,CAClC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,0BAA0B,GACpC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAkBhC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,GAAG,MAAM;IASzE,SAAS,CAAC,6BAA6B,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,6BAA6B,GAAG,OAAO;IAiDxG,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,sBAAsB,GAAG,MAAM;IAIzF,SAAS,CAAC,mBAAmB,CAC3B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,mBAAmB,GAC7B,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG;QAAE,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;KAAE,CAAC,EAAE;IAM5F,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,EAAE;IA4B9F,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,GAAG,iBAAiB,EAAE;IAUvF,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,GAAG,SAAS;IAqB9E,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,GAAG,OAAO;CASrE"}
1
+ {"version":3,"file":"model-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/model-generator.ts"],"names":[],"mappings":"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"}
package/esm/src/generators/models/model-generator.js CHANGED
@@ -179,8 +179,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
179
179
  return kt.parameter.class(toCasing(property.name, ctx.config.propertyNameCasing), this.getType(ctx, { schema: property.schema, nullable: schema.required.has(property.name) ? undefined : true }), {
180
180
  description: (_a = property.schema.description) === null || _a === void 0 ? void 0 : _a.trim(),
181
181
  annotations: [
182
- this.getJakartaPatternAnnotation(ctx, { schema, property }),
183
- this.getJakartaValidAnnotation(ctx, { schema, property }),
182
+ ...this.getJakartaValidationAnnotations(ctx, { schema, property }),
184
183
  this.getSwaggerSchemaAnnotation(ctx, { schema, property }),
185
184
  this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
186
185
  modify(this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }), (x) => (x.target = 'get')),
@@ -282,20 +281,52 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
282
281
  ])
283
282
  : null;
284
283
  }
285
- getJakartaPatternAnnotation(ctx, args) {
284
+ getJakartaValidationAnnotations(ctx, args) {
286
285
  const { property } = args;
287
- return ctx.config.addJakartaValidationAnnotations && property.schema.kind === 'string' && property.schema.pattern
288
- ? kt.annotation(kt.refs.jakarta.pattern(), [kt.argument.named('regexp', kt.string(property.schema.pattern))], {
289
- target: 'get',
290
- })
291
- : null;
292
- }
293
- getJakartaValidAnnotation(ctx, args) {
294
- const { property } = args;
295
- return ctx.config.addJakartaValidationAnnotations &&
296
- this.shouldGenerateTypeDeclaration(ctx, { schema: property.schema })
297
- ? kt.annotation(kt.refs.jakarta.valid(), [], { target: 'field' })
298
- : null;
286
+ const annotations = [];
287
+ if (!ctx.config.addJakartaValidationAnnotations) {
288
+ return annotations;
289
+ }
290
+ if (property.schema.kind === 'string') {
291
+ if (property.schema.pattern) {
292
+ annotations.push(kt.annotation(kt.refs.jakarta.pattern(), [kt.argument.named('regexp', kt.string(property.schema.pattern))], {
293
+ target: 'get',
294
+ }));
295
+ }
296
+ if (property.schema.minLength === 1 && property.schema.maxLength === undefined) {
297
+ annotations.push(kt.annotation(kt.refs.jakarta.notEmpty(), [], { target: 'get' }));
298
+ }
299
+ else if (property.schema.minLength !== undefined || property.schema.maxLength !== undefined) {
300
+ annotations.push(kt.annotation(kt.refs.jakarta.size(), [
301
+ property.schema.minLength !== undefined ? kt.argument.named('min', property.schema.minLength) : null,
302
+ property.schema.maxLength !== undefined ? kt.argument.named('max', property.schema.maxLength) : null,
303
+ ], { target: 'get' }));
304
+ }
305
+ }
306
+ else if (property.schema.kind === 'number' || property.schema.kind === 'integer') {
307
+ if (property.schema.minimum !== undefined) {
308
+ annotations.push(kt.annotation(kt.refs.jakarta.min(), [kt.argument.named('value', property.schema.minimum)], {
309
+ target: 'get',
310
+ }));
311
+ }
312
+ if (property.schema.maximum !== undefined) {
313
+ annotations.push(kt.annotation(kt.refs.jakarta.max(), [kt.argument.named('value', property.schema.maximum)], {
314
+ target: 'get',
315
+ }));
316
+ }
317
+ }
318
+ else if (property.schema.kind === 'array') {
319
+ if (property.schema.minItems !== undefined || property.schema.maxItems !== undefined) {
320
+ annotations.push(kt.annotation(kt.refs.jakarta.size(), [
321
+ property.schema.minItems !== undefined ? kt.argument.named('min', property.schema.minItems) : null,
322
+ property.schema.maxItems !== undefined ? kt.argument.named('max', property.schema.maxItems) : null,
323
+ ], { target: 'get' }));
324
+ }
325
+ }
326
+ if (this.shouldGenerateTypeDeclaration(ctx, { schema: property.schema })) {
327
+ annotations.push(kt.annotation(kt.refs.jakarta.valid(), [], { target: 'field' }));
328
+ }
329
+ return annotations;
299
330
  }
300
331
  getSwaggerSchemaAnnotation(ctx, args) {
301
332
  const { schema, property } = args;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goast/kotlin",
3
- "version": "0.4.10",
3
+ "version": "0.4.11",
4
4
  "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
5
5
  "author": {
6
6
  "name": "Marc Schmidt (MaSch0212)",
package/script/src/ast/references/jakarta.d.ts CHANGED
@@ -2,4 +2,8 @@ import { type KtReferenceFactory } from '../nodes/reference.js';
2
2
  export declare const generated: KtReferenceFactory;
3
3
  export declare const valid: KtReferenceFactory;
4
4
  export declare const pattern: KtReferenceFactory;
5
+ export declare const min: KtReferenceFactory;
6
+ export declare const max: KtReferenceFactory;
7
+ export declare const notEmpty: KtReferenceFactory;
8
+ export declare const size: KtReferenceFactory;
5
9
  //# sourceMappingURL=jakarta.d.ts.map
package/script/src/ast/references/jakarta.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jakarta.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/jakarta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7E,eAAO,MAAM,SAAS,EAAE,kBAA2E,CAAC;AAGpG,eAAO,MAAM,KAAK,EAAE,kBAAuE,CAAC;AAG5F,eAAO,MAAM,OAAO,EAAE,kBAAqF,CAAC"}
1
+ {"version":3,"file":"jakarta.d.ts","sourceRoot":"","sources":["../../../../src/src/ast/references/jakarta.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAG7E,eAAO,MAAM,SAAS,EAAE,kBAA2E,CAAC;AAGpG,eAAO,MAAM,KAAK,EAAE,kBAAuE,CAAC;AAG5F,eAAO,MAAM,OAAO,EAAE,kBAAqF,CAAC;AAC5G,eAAO,MAAM,GAAG,EAAE,kBAAiF,CAAC;AACpG,eAAO,MAAM,GAAG,EAAE,kBAAiF,CAAC;AACpG,eAAO,MAAM,QAAQ,EAAE,kBAAsF,CAAC;AAC9G,eAAO,MAAM,IAAI,EAAE,kBAAkF,CAAC"}
package/script/src/ast/references/jakarta.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.pattern = exports.valid = exports.generated = void 0;
3
+ exports.size = exports.notEmpty = exports.max = exports.min = exports.pattern = exports.valid = exports.generated = void 0;
4
4
  const reference_js_1 = require("../nodes/reference.js");
5
5
  // jakarta.annotation
6
6
  exports.generated = reference_js_1.ktReference.factory('Generated', 'jakarta.annotation');
@@ -8,3 +8,7 @@ exports.generated = reference_js_1.ktReference.factory('Generated', 'jakarta.ann
8
8
  exports.valid = reference_js_1.ktReference.factory('Valid', 'jakarta.validation');
9
9
  // jakarta.validation.constraints
10
10
  exports.pattern = reference_js_1.ktReference.factory('Pattern', 'jakarta.validation.constraints');
11
+ exports.min = reference_js_1.ktReference.factory('Min', 'jakarta.validation.constraints');
12
+ exports.max = reference_js_1.ktReference.factory('Max', 'jakarta.validation.constraints');
13
+ exports.notEmpty = reference_js_1.ktReference.factory('NotEmpty', 'jakarta.validation.constraints');
14
+ exports.size = reference_js_1.ktReference.factory('Size', 'jakarta.validation.constraints');
package/script/src/generators/models/args.d.ts CHANGED
@@ -59,11 +59,7 @@ export type GetJacksonJsonIncludeAnnotation = {
59
59
  schema: ApiSchema;
60
60
  property: ApiSchemaProperty;
61
61
  };
62
- export type GetJakartaPatternAnnotation = {
63
- schema: ApiSchema;
64
- property: ApiSchemaProperty;
65
- };
66
- export type GetJakartaValidAnnotation = {
62
+ export type GetJakartaValidationAnnotations = {
67
63
  schema: ApiSchema;
68
64
  property: ApiSchemaProperty;
69
65
  };
package/script/src/generators/models/args.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/args.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"args.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/args.ts"],"names":[],"mappings":"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"}
package/script/src/generators/models/model-generator.d.ts CHANGED
@@ -30,8 +30,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
30
30
  protected getJacksonJsonSubTypesAnnotation(ctx: Context, args: Args.GetJacksonJsonSubTypesAnnotation): kt.Annotation<Builder> | null;
31
31
  protected getJacksonJsonPropertyAnnotation(ctx: Context, args: Args.GetJacksonJsonPropertyAnnotation): kt.Annotation<Builder> | null;
32
32
  protected getJacksonJsonIncludeAnnotation(ctx: Context, args: Args.GetJacksonJsonIncludeAnnotation): kt.Annotation<Builder> | null;
33
- protected getJakartaPatternAnnotation(ctx: Context, args: Args.GetJakartaPatternAnnotation): kt.Annotation<Builder> | null;
34
- protected getJakartaValidAnnotation(ctx: Context, args: Args.GetJakartaValidAnnotation): kt.Annotation<Builder> | null;
33
+ protected getJakartaValidationAnnotations(ctx: Context, args: Args.GetJakartaValidationAnnotations): kt.Annotation<Builder>[];
35
34
  protected getSwaggerSchemaAnnotation(ctx: Context, args: Args.GetSwaggerSchemaAnnotation): kt.Annotation<Builder> | null;
36
35
  protected getPackageName(ctx: Context, args: Args.GetPackageName): string;
37
36
  protected shouldGenerateTypeDeclaration(ctx: Context, args: Args.ShouldGenerateTypeDeclaration): boolean;
package/script/src/generators/models/model-generator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/model-generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model-generator.d.ts","sourceRoot":"","sources":["../../../../src/src/generators/models/model-generator.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAIrB,KAAK,YAAY,EAKjB,KAAK,aAAa,EAEnB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,+BAA+B,IAAI,IAAI,EAAE,MAAM,YAAY,CAAC;AAC1E,OAAO,KAAK,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AAE3F,KAAK,OAAO,GAAG,2BAA2B,CAAC;AAC3C,KAAK,MAAM,GAAG,0BAA0B,CAAC;AACzC,KAAK,OAAO,GAAG,iBAAiB,CAAC;AAEjC,MAAM,WAAW,oBAAoB,CAAC,OAAO,SAAS,MAAM,GAAG,MAAM;IACnE,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;CAC/C;AAED,qBAAa,2BAA4B,SAAQ,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAE,YAAW,oBAAoB;IAC5G,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAAC,0BAA0B,CAAC;IAwBvE,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,cAAc,GAAG,gBAAgB,CAAC,OAAO,CAAC;IAO7F,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC,OAAO,CAAC;IAYnG,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IAyBxE,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAgBpF,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;IAuBrE,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC;IAmDhF,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI;IAUzG,SAAS,CAAC,2BAA2B,CACnC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,2BAA2B,GACrC,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC;IAQ9B,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC;IA4BtF,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC;IAwB9F,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAoBnG,SAAS,CAAC,+BAA+B,CACvC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,+BAA+B,GACzC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAYvB,SAAS,CAAC,6BAA6B,CACrC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,6BAA6B,GACvC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAgBvB,SAAS,CAAC,6BAA6B,CACrC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,6BAA6B,GACvC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;IAYvB,SAAS,CAAC,gCAAgC,CACxC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,gCAAgC,GAC1C,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAkBhC,SAAS,CAAC,gCAAgC,CACxC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,gCAAgC,GAC1C,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IA0BhC,SAAS,CAAC,gCAAgC,CACxC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,gCAAgC,GAC1C,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAWhC,SAAS,CAAC,+BAA+B,CACvC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,+BAA+B,GACzC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAUhC,SAAS,CAAC,+BAA+B,CACvC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,+BAA+B,GACzC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;IAsD3B,SAAS,CAAC,0BAA0B,CAClC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,0BAA0B,GACpC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI;IAkBhC,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,GAAG,MAAM;IASzE,SAAS,CAAC,6BAA6B,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,6BAA6B,GAAG,OAAO;IAiDxG,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,sBAAsB,GAAG,MAAM;IAIzF,SAAS,CAAC,mBAAmB,CAC3B,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,IAAI,CAAC,mBAAmB,GAC7B,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG;QAAE,aAAa,EAAE,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAA;KAAE,CAAC,EAAE;IAM5F,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,EAAE;IA4B9F,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,cAAc,GAAG,iBAAiB,EAAE;IAUvF,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,GAAG,SAAS;IAqB9E,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,GAAG,OAAO;CASrE"}
package/script/src/generators/models/model-generator.js CHANGED
@@ -183,8 +183,7 @@ class DefaultKotlinModelGenerator extends file_generator_js_1.KotlinFileGenerato
183
183
  return index_js_1.kt.parameter.class((0, core_1.toCasing)(property.name, ctx.config.propertyNameCasing), this.getType(ctx, { schema: property.schema, nullable: schema.required.has(property.name) ? undefined : true }), {
184
184
  description: (_a = property.schema.description) === null || _a === void 0 ? void 0 : _a.trim(),
185
185
  annotations: [
186
- this.getJakartaPatternAnnotation(ctx, { schema, property }),
187
- this.getJakartaValidAnnotation(ctx, { schema, property }),
186
+ ...this.getJakartaValidationAnnotations(ctx, { schema, property }),
188
187
  this.getSwaggerSchemaAnnotation(ctx, { schema, property }),
189
188
  this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
190
189
  (0, core_1.modify)(this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }), (x) => (x.target = 'get')),
@@ -286,20 +285,52 @@ class DefaultKotlinModelGenerator extends file_generator_js_1.KotlinFileGenerato
286
285
  ])
287
286
  : null;
288
287
  }
289
- getJakartaPatternAnnotation(ctx, args) {
288
+ getJakartaValidationAnnotations(ctx, args) {
290
289
  const { property } = args;
291
- return ctx.config.addJakartaValidationAnnotations && property.schema.kind === 'string' && property.schema.pattern
292
- ? index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.pattern(), [index_js_1.kt.argument.named('regexp', index_js_1.kt.string(property.schema.pattern))], {
293
- target: 'get',
294
- })
295
- : null;
296
- }
297
- getJakartaValidAnnotation(ctx, args) {
298
- const { property } = args;
299
- return ctx.config.addJakartaValidationAnnotations &&
300
- this.shouldGenerateTypeDeclaration(ctx, { schema: property.schema })
301
- ? index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.valid(), [], { target: 'field' })
302
- : null;
290
+ const annotations = [];
291
+ if (!ctx.config.addJakartaValidationAnnotations) {
292
+ return annotations;
293
+ }
294
+ if (property.schema.kind === 'string') {
295
+ if (property.schema.pattern) {
296
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.pattern(), [index_js_1.kt.argument.named('regexp', index_js_1.kt.string(property.schema.pattern))], {
297
+ target: 'get',
298
+ }));
299
+ }
300
+ if (property.schema.minLength === 1 && property.schema.maxLength === undefined) {
301
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.notEmpty(), [], { target: 'get' }));
302
+ }
303
+ else if (property.schema.minLength !== undefined || property.schema.maxLength !== undefined) {
304
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.size(), [
305
+ property.schema.minLength !== undefined ? index_js_1.kt.argument.named('min', property.schema.minLength) : null,
306
+ property.schema.maxLength !== undefined ? index_js_1.kt.argument.named('max', property.schema.maxLength) : null,
307
+ ], { target: 'get' }));
308
+ }
309
+ }
310
+ else if (property.schema.kind === 'number' || property.schema.kind === 'integer') {
311
+ if (property.schema.minimum !== undefined) {
312
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.min(), [index_js_1.kt.argument.named('value', property.schema.minimum)], {
313
+ target: 'get',
314
+ }));
315
+ }
316
+ if (property.schema.maximum !== undefined) {
317
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.max(), [index_js_1.kt.argument.named('value', property.schema.maximum)], {
318
+ target: 'get',
319
+ }));
320
+ }
321
+ }
322
+ else if (property.schema.kind === 'array') {
323
+ if (property.schema.minItems !== undefined || property.schema.maxItems !== undefined) {
324
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.size(), [
325
+ property.schema.minItems !== undefined ? index_js_1.kt.argument.named('min', property.schema.minItems) : null,
326
+ property.schema.maxItems !== undefined ? index_js_1.kt.argument.named('max', property.schema.maxItems) : null,
327
+ ], { target: 'get' }));
328
+ }
329
+ }
330
+ if (this.shouldGenerateTypeDeclaration(ctx, { schema: property.schema })) {
331
+ annotations.push(index_js_1.kt.annotation(index_js_1.kt.refs.jakarta.valid(), [], { target: 'field' }));
332
+ }
333
+ return annotations;
303
334
  }
304
335
  getSwaggerSchemaAnnotation(ctx, args) {
305
336
  const { schema, property } = args;
package/src/src/ast/references/jakarta.ts CHANGED
@@ -8,3 +8,7 @@ export const valid: KtReferenceFactory = ktReference.factory('Valid', 'jakarta.v
8
8
 
9
9
  // jakarta.validation.constraints
10
10
  export const pattern: KtReferenceFactory = ktReference.factory('Pattern', 'jakarta.validation.constraints');
11
+ export const min: KtReferenceFactory = ktReference.factory('Min', 'jakarta.validation.constraints');
12
+ export const max: KtReferenceFactory = ktReference.factory('Max', 'jakarta.validation.constraints');
13
+ export const notEmpty: KtReferenceFactory = ktReference.factory('NotEmpty', 'jakarta.validation.constraints');
14
+ export const size: KtReferenceFactory = ktReference.factory('Size', 'jakarta.validation.constraints');
package/src/src/generators/models/args.ts CHANGED
@@ -78,12 +78,7 @@ export type GetJacksonJsonIncludeAnnotation = {
78
78
  property: ApiSchemaProperty;
79
79
  };
80
80
 
81
- export type GetJakartaPatternAnnotation = {
82
- schema: ApiSchema;
83
- property: ApiSchemaProperty;
84
- };
85
-
86
- export type GetJakartaValidAnnotation = {
81
+ export type GetJakartaValidationAnnotations = {
87
82
  schema: ApiSchema;
88
83
  property: ApiSchemaProperty;
89
84
  };
package/src/src/generators/models/model-generator.ts CHANGED
@@ -252,8 +252,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator<Context, Ou
252
252
  {
253
253
  description: property.schema.description?.trim(),
254
254
  annotations: [
255
- this.getJakartaPatternAnnotation(ctx, { schema, property }),
256
- this.getJakartaValidAnnotation(ctx, { schema, property }),
255
+ ...this.getJakartaValidationAnnotations(ctx, { schema, property }),
257
256
  this.getSwaggerSchemaAnnotation(ctx, { schema, property }),
258
257
  this.getJacksonJsonPropertyAnnotation(ctx, { schema, property }),
259
258
  modify(this.getJacksonJsonIncludeAnnotation(ctx, { schema, property }), (x) => (x.target = 'get')),
@@ -414,29 +413,61 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator<Context, Ou
414
413
  : null;
415
414
  }
416
415
 
417
- protected getJakartaPatternAnnotation(
416
+ protected getJakartaValidationAnnotations(
418
417
  ctx: Context,
419
- args: Args.GetJakartaPatternAnnotation,
420
- ): kt.Annotation<Builder> | null {
418
+ args: Args.GetJakartaValidationAnnotations,
419
+ ): kt.Annotation<Builder>[] {
421
420
  const { property } = args;
421
+ const annotations: kt.Annotation<Builder>[] = [];
422
+ if (!ctx.config.addJakartaValidationAnnotations) {
423
+ return annotations;
424
+ }
422
425
 
423
- return ctx.config.addJakartaValidationAnnotations && property.schema.kind === 'string' && property.schema.pattern
424
- ? kt.annotation(kt.refs.jakarta.pattern(), [kt.argument.named('regexp', kt.string(property.schema.pattern))], {
425
- target: 'get',
426
- })
427
- : null;
428
- }
426
+ if (property.schema.kind === 'string') {
427
+ if (property.schema.pattern) {
428
+ annotations.push(
429
+ kt.annotation(kt.refs.jakarta.pattern(), [kt.argument.named('regexp', kt.string(property.schema.pattern))], {
430
+ target: 'get',
431
+ }),
432
+ );
433
+ }
434
+ if (property.schema.minLength === 1 && property.schema.maxLength === undefined) {
435
+ annotations.push(kt.annotation(kt.refs.jakarta.notEmpty(), [], { target: 'get' }));
436
+ } else if (property.schema.minLength !== undefined || property.schema.maxLength !== undefined) {
437
+ annotations.push(kt.annotation(kt.refs.jakarta.size(), [
438
+ property.schema.minLength !== undefined ? kt.argument.named('min', property.schema.minLength) : null,
439
+ property.schema.maxLength !== undefined ? kt.argument.named('max', property.schema.maxLength) : null,
440
+ ], { target: 'get' }));
441
+ }
442
+ } else if (property.schema.kind === 'number' || property.schema.kind === 'integer') {
443
+ if (property.schema.minimum !== undefined) {
444
+ annotations.push(
445
+ kt.annotation(kt.refs.jakarta.min(), [kt.argument.named('value', property.schema.minimum)], {
446
+ target: 'get',
447
+ }),
448
+ );
449
+ }
450
+ if (property.schema.maximum !== undefined) {
451
+ annotations.push(
452
+ kt.annotation(kt.refs.jakarta.max(), [kt.argument.named('value', property.schema.maximum)], {
453
+ target: 'get',
454
+ }),
455
+ );
456
+ }
457
+ } else if (property.schema.kind === 'array') {
458
+ if (property.schema.minItems !== undefined || property.schema.maxItems !== undefined) {
459
+ annotations.push(kt.annotation(kt.refs.jakarta.size(), [
460
+ property.schema.minItems !== undefined ? kt.argument.named('min', property.schema.minItems) : null,
461
+ property.schema.maxItems !== undefined ? kt.argument.named('max', property.schema.maxItems) : null,
462
+ ], { target: 'get' }));
463
+ }
464
+ }
429
465
 
430
- protected getJakartaValidAnnotation(
431
- ctx: Context,
432
- args: Args.GetJakartaValidAnnotation,
433
- ): kt.Annotation<Builder> | null {
434
- const { property } = args;
466
+ if (this.shouldGenerateTypeDeclaration(ctx, { schema: property.schema })) {
467
+ annotations.push(kt.annotation(kt.refs.jakarta.valid(), [], { target: 'field' }));
468
+ }
435
469
 
436
- return ctx.config.addJakartaValidationAnnotations &&
437
- this.shouldGenerateTypeDeclaration(ctx, { schema: property.schema })
438
- ? kt.annotation(kt.refs.jakarta.valid(), [], { target: 'field' })
439
- : null;
470
+ return annotations;
440
471
  }
441
472
 
442
473
  protected getSwaggerSchemaAnnotation(