@goast/kotlin 0.1.13 → 0.1.15

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/cjs/lib/generators/models/model-generator.js +2 -2
  2. package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js +10 -5
  3. package/esm/lib/generators/models/model-generator.js +2 -2
  4. package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js +10 -5
  5. package/package.json +1 -1
  6. package/types/lib/generators/services/spring-controllers/spring-controller-generator.d.ts +1 -1
package/cjs/lib/generators/models/model-generator.js CHANGED
@@ -130,7 +130,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
130
130
  .ensureCurrentLineEmpty()
131
131
  .append(`val ${(0, core_1.toCasing)(property.name, 'camel')}: `)
132
132
  .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
133
- .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')));
133
+ .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?')));
134
134
  }
135
135
  generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property) {
136
136
  builder
@@ -149,7 +149,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
149
149
  .append((builder) => this.generateDocumentation(ctx, builder, schema))
150
150
  .append(params.length === 0 ? 'class' : 'data class', ' ')
151
151
  .append(this.getDeclarationTypeName(ctx, schema))
152
- .parenthesizeIf(params.length > 0, '()', (builder) => builder.forEach(this.sortProperties(ctx, schema, params), (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
152
+ .parenthesizeIf(params.length > 0, '()', (builder) => builder.forEach(params, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
153
153
  .if(inheritedSchemas.length > 0, (builder) => builder
154
154
  .append(' : ')
155
155
  .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js CHANGED
@@ -171,7 +171,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
171
171
  builder
172
172
  .append((0, core_1.toCasing)(parameter.name, 'camel'))
173
173
  .append(': ')
174
- .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
174
+ .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema, parameter.target === 'body'))
175
175
  .append(!parameter.required && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) === undefined && !((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? '?' : '');
176
176
  }
177
177
  generateApiInterfaceMethodContent(ctx, builder, endpoint) {
@@ -321,7 +321,7 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
321
321
  builder
322
322
  .append((0, core_1.toCasing)(parameter.name, 'camel'))
323
323
  .append(': ')
324
- .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
324
+ .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema, parameter.target === 'body'))
325
325
  .append(!parameter.required && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) === undefined && !((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? '?' : '');
326
326
  }
327
327
  generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint) {
@@ -334,12 +334,17 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
334
334
  builder
335
335
  .append('ResponseEntity')
336
336
  .addImport('ResponseEntity', 'org.springframework.http')
337
- .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, schema, 'Unit'));
337
+ .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, schema, true, 'Unit'));
338
338
  }
339
- generateTypeUsage(ctx, builder, schema, fallback) {
339
+ generateTypeUsage(ctx, builder, schema, arrayAsFlux, fallback) {
340
340
  if (schema && schema.kind === 'array') {
341
341
  const schemaInfo = this.getSchemaInfo(ctx, schema.items);
342
- builder.append(`Flux<${schemaInfo.typeName}>`).addImport('Flux', 'reactor.core.publisher');
342
+ if (arrayAsFlux) {
343
+ builder.append(`Flux<${schemaInfo.typeName}>`).addImport('Flux', 'reactor.core.publisher');
344
+ }
345
+ else {
346
+ builder.append(`List<${schemaInfo.typeName}>`);
347
+ }
343
348
  builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
344
349
  }
345
350
  else if (schema || !fallback) {
package/esm/lib/generators/models/model-generator.js CHANGED
@@ -127,7 +127,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
127
127
  .ensureCurrentLineEmpty()
128
128
  .append(`val ${toCasing(property.name, 'camel')}: `)
129
129
  .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
130
- .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')));
130
+ .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?')));
131
131
  }
132
132
  generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property) {
133
133
  builder
@@ -146,7 +146,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
146
146
  .append((builder) => this.generateDocumentation(ctx, builder, schema))
147
147
  .append(params.length === 0 ? 'class' : 'data class', ' ')
148
148
  .append(this.getDeclarationTypeName(ctx, schema))
149
- .parenthesizeIf(params.length > 0, '()', (builder) => builder.forEach(this.sortProperties(ctx, schema, params), (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
149
+ .parenthesizeIf(params.length > 0, '()', (builder) => builder.forEach(params, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
150
150
  .if(inheritedSchemas.length > 0, (builder) => builder
151
151
  .append(' : ')
152
152
  .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js CHANGED
@@ -168,7 +168,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
168
168
  builder
169
169
  .append(toCasing(parameter.name, 'camel'))
170
170
  .append(': ')
171
- .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
171
+ .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema, parameter.target === 'body'))
172
172
  .append(!parameter.required && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) === undefined && !((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? '?' : '');
173
173
  }
174
174
  generateApiInterfaceMethodContent(ctx, builder, endpoint) {
@@ -318,7 +318,7 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
318
318
  builder
319
319
  .append(toCasing(parameter.name, 'camel'))
320
320
  .append(': ')
321
- .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema))
321
+ .append((builder) => this.generateTypeUsage(ctx, builder, parameter.schema, parameter.target === 'body'))
322
322
  .append(!parameter.required && ((_a = parameter.schema) === null || _a === void 0 ? void 0 : _a.default) === undefined && !((_b = parameter.schema) === null || _b === void 0 ? void 0 : _b.nullable) ? '?' : '');
323
323
  }
324
324
  generateApiDelegateInterfaceMethodContent(ctx, builder, endpoint) {
@@ -331,12 +331,17 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
331
331
  builder
332
332
  .append('ResponseEntity')
333
333
  .addImport('ResponseEntity', 'org.springframework.http')
334
- .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, schema, 'Unit'));
334
+ .parenthesize('<>', (builder) => this.generateTypeUsage(ctx, builder, schema, true, 'Unit'));
335
335
  }
336
- generateTypeUsage(ctx, builder, schema, fallback) {
336
+ generateTypeUsage(ctx, builder, schema, arrayAsFlux, fallback) {
337
337
  if (schema && schema.kind === 'array') {
338
338
  const schemaInfo = this.getSchemaInfo(ctx, schema.items);
339
- builder.append(`Flux<${schemaInfo.typeName}>`).addImport('Flux', 'reactor.core.publisher');
339
+ if (arrayAsFlux) {
340
+ builder.append(`Flux<${schemaInfo.typeName}>`).addImport('Flux', 'reactor.core.publisher');
341
+ }
342
+ else {
343
+ builder.append(`List<${schemaInfo.typeName}>`);
344
+ }
340
345
  builder.imports.addImports([schemaInfo, ...schemaInfo.additionalImports]);
341
346
  }
342
347
  else if (schema || !fallback) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goast/kotlin",
3
- "version": "0.1.13",
3
+ "version": "0.1.15",
4
4
  "repository": "https://github.com/MaSch0212/goast.git",
5
5
  "author": {
6
6
  "name": "Marc Schmidt (MaSch0212)",
package/types/lib/generators/services/spring-controllers/spring-controller-generator.d.ts CHANGED
@@ -49,7 +49,7 @@ export declare class DefaultKotlinSpringControllerGenerator extends KotlinFileGe
49
49
  protected generateApiDelegateInterfaceMethodParameterSignature(ctx: Context, builder: Builder, endpoint: ApiEndpoint, parameter: ApiParameter): void;
50
50
  protected generateApiDelegateInterfaceMethodContent(ctx: Context, builder: Builder, endpoint: ApiEndpoint): void;
51
51
  protected generateResponseEntityType(ctx: Context, builder: Builder, schema: ApiSchema | undefined): void;
52
- protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema | undefined, fallback?: string): void;
52
+ protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema | undefined, arrayAsFlux: boolean, fallback?: string): void;
53
53
  protected getControllerRequestMapping(ctx: Context, prefix?: string): string;
54
54
  protected getBasePath(ctx: Context): string;
55
55
  protected getEndpointPath(ctx: Context, endpoint: ApiEndpoint): string;