@goast/kotlin 0.1.10 → 0.1.12

package/cjs/lib/generators/models/model-generator.js

@@ -32,7 +32,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         }
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
             const typeName = this.getDeclarationTypeName(ctx, ctx.schema);
-            const packageName = ctx.config.packageName + ctx.config.packageSuffix;
+            const packageName = this.getPackageName(ctx, ctx.schema);
             const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
             console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
             (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
@@ -65,7 +65,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         schema = (0, core_1.getSchemaReference)(schema, ['description']);
         if (this.shouldGenerateTypeDeclaration(ctx, schema)) {
             const name = this.getDeclarationTypeName(ctx, schema);
-            const packageName = ctx.config.packageName + ctx.config.packageSuffix;
+            const packageName = this.getPackageName(ctx, schema);
             if (packageName) {
                 builder.addImport(name, packageName);
             }
@@ -147,7 +147,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         const { params, properties } = this.classifyClassProperties(ctx, schema);
         builder
             .append((builder) => this.generateDocumentation(ctx, builder, schema))
-            .append(params.length === 0 ? 'class' : 'data class ')
+            .append(params.length === 0 ? 'class' : 'data class', ' ')
             .append(this.getDeclarationTypeName(ctx, schema))
             .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 })
             .if(inheritedSchemas.length > 0, (builder) => builder
@@ -382,6 +382,10 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                 .appendLine(' */');
         }
     }
+    getPackageName(ctx, schema) {
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(schema);
+        return ctx.config.packageName + packageSuffix;
+    }
     shouldGenerateTypeDeclaration(ctx, schema) {
         // All enum types should have its own type declaration
         if (schema.enum !== undefined && schema.enum.length > 0) {

package/cjs/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -11,13 +11,14 @@ const file_generator_1 = require("../../file-generator");
 class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator {
     generate(ctx) {
         const typeName = this.getApiClientName(ctx);
-        const filePath = this.getFilePath(ctx);
+        const packageName = this.getPackageName(ctx, ctx.service);
+        const filePath = this.getFilePath(ctx, packageName);
         (0, fs_extra_1.ensureDirSync)((0, path_1.dirname)(filePath));
         console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
-        const builder = new file_builder_1.KotlinFileBuilder(ctx.packageName, ctx.config);
+        const builder = new file_builder_1.KotlinFileBuilder(packageName, ctx.config);
         this.generateApiClientFileContent(ctx, builder);
         (0, fs_1.writeFileSync)(filePath, builder.toString());
-        return { typeName, packageName: ctx.packageName };
+        return { typeName, packageName };
     }
     generateApiClientFileContent(ctx, builder) {
         builder
@@ -317,6 +318,10 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
             builder.append(this.getTypeNameWithNullability(fallback, nullable));
         }
     }
+    getPackageName(ctx, service) {
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(service);
+        return ctx.config.packageName + packageSuffix;
+    }
     getTypeNameWithNullability(typeName, nullable) {
         if (nullable === undefined)
             return typeName;
@@ -388,8 +393,8 @@ class DefaultKotlinOkHttp3Generator extends file_generator_1.KotlinFileGenerator
     getEndpointPath(ctx, endpoint) {
         return (0, utils_1.modifyString)(endpoint.path, ctx.config.pathModifier, endpoint);
     }
-    getFilePath(ctx) {
-        return `${ctx.config.outputDir}/${ctx.packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
+    getFilePath(ctx, packageName) {
+        return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
     }
     getApiClientName(ctx) {
         return (0, core_1.toCasing)(ctx.service.name, 'pascal') + 'ApiClient';

package/cjs/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js

@@ -32,7 +32,6 @@ class KotlinOkHttp3ClientsGenerator extends core_1.OpenApiServicesGenerationProv
         context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
         const providerContext = this.getProviderContext(context, config, models_1.defaultKotlinOkHttp3ClientsGeneratorConfig);
         return Object.assign(providerContext, {
-            packageName: this.getPackageName(providerContext.config),
             infrastructurePackageName: this.getInfrastructurePackageName(providerContext.config),
         });
     }
@@ -49,7 +48,8 @@ class KotlinOkHttp3ClientsGenerator extends core_1.OpenApiServicesGenerationProv
         return config.infrastructurePackageName.value;
     }
     getPackageName(config) {
-        return config.packageName + config.packageSuffix;
+        const packageSuffix = typeof config.packageSuffix === 'string' ? config.packageSuffix : config.packageSuffix();
+        return config.packageName + packageSuffix;
     }
     copyInfrastructureFiles(ctx) {
         const sourceDir = (0, path_1.resolve)((0, path_1.dirname)(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');

package/cjs/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -367,7 +367,8 @@ class DefaultKotlinSpringControllerGenerator extends file_generator_1.KotlinFile
         return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}`;
     }
     getPackageName(ctx) {
-        return ctx.config.packageName + ctx.config.packageSuffix;
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(ctx.service);
+        return ctx.config.packageName + packageSuffix;
     }
     getApiInterfaceName(ctx) {
         return (0, core_1.toCasing)(ctx.service.name, 'pascal') + 'Api';

package/esm/lib/generators/models/model-generator.js

@@ -29,7 +29,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         }
         if (this.shouldGenerateTypeDeclaration(ctx, ctx.schema)) {
             const typeName = this.getDeclarationTypeName(ctx, ctx.schema);
-            const packageName = ctx.config.packageName + ctx.config.packageSuffix;
+            const packageName = this.getPackageName(ctx, ctx.schema);
             const filePath = `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${typeName}.kt`;
             console.log(`Generating model ${packageName}.${typeName} to ${filePath}...`);
             ensureDirSync(dirname(filePath));
@@ -62,7 +62,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         schema = getSchemaReference(schema, ['description']);
         if (this.shouldGenerateTypeDeclaration(ctx, schema)) {
             const name = this.getDeclarationTypeName(ctx, schema);
-            const packageName = ctx.config.packageName + ctx.config.packageSuffix;
+            const packageName = this.getPackageName(ctx, schema);
             if (packageName) {
                 builder.addImport(name, packageName);
             }
@@ -144,7 +144,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         const { params, properties } = this.classifyClassProperties(ctx, schema);
         builder
             .append((builder) => this.generateDocumentation(ctx, builder, schema))
-            .append(params.length === 0 ? 'class' : 'data class ')
+            .append(params.length === 0 ? 'class' : 'data class', ' ')
             .append(this.getDeclarationTypeName(ctx, schema))
             .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 })
             .if(inheritedSchemas.length > 0, (builder) => builder
@@ -379,6 +379,10 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                 .appendLine(' */');
         }
     }
+    getPackageName(ctx, schema) {
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(schema);
+        return ctx.config.packageName + packageSuffix;
+    }
     shouldGenerateTypeDeclaration(ctx, schema) {
         // All enum types should have its own type declaration
         if (schema.enum !== undefined && schema.enum.length > 0) {

package/esm/lib/generators/services/okhttp3-clients/okhttp3-client-generator.js

@@ -8,13 +8,14 @@ import { KotlinFileGenerator } from '../../file-generator';
 export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     generate(ctx) {
         const typeName = this.getApiClientName(ctx);
-        const filePath = this.getFilePath(ctx);
+        const packageName = this.getPackageName(ctx, ctx.service);
+        const filePath = this.getFilePath(ctx, packageName);
         ensureDirSync(dirname(filePath));
         console.log(`Generating client for service ${ctx.service.name} to ${filePath}...`);
-        const builder = new KotlinFileBuilder(ctx.packageName, ctx.config);
+        const builder = new KotlinFileBuilder(packageName, ctx.config);
         this.generateApiClientFileContent(ctx, builder);
         writeFileSync(filePath, builder.toString());
-        return { typeName, packageName: ctx.packageName };
+        return { typeName, packageName };
     }
     generateApiClientFileContent(ctx, builder) {
         builder
@@ -314,6 +315,10 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
             builder.append(this.getTypeNameWithNullability(fallback, nullable));
         }
     }
+    getPackageName(ctx, service) {
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(service);
+        return ctx.config.packageName + packageSuffix;
+    }
     getTypeNameWithNullability(typeName, nullable) {
         if (nullable === undefined)
             return typeName;
@@ -385,8 +390,8 @@ export class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator {
     getEndpointPath(ctx, endpoint) {
         return modifyString(endpoint.path, ctx.config.pathModifier, endpoint);
     }
-    getFilePath(ctx) {
-        return `${ctx.config.outputDir}/${ctx.packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
+    getFilePath(ctx, packageName) {
+        return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}/${this.getApiClientName(ctx)}.kt`;
     }
     getApiClientName(ctx) {
         return toCasing(ctx.service.name, 'pascal') + 'ApiClient';

package/esm/lib/generators/services/okhttp3-clients/okhttp3-clients-generator.js

@@ -29,7 +29,6 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
         context.data.services = context.data.services.filter((x) => x.name !== 'exclude-from-generation');
         const providerContext = this.getProviderContext(context, config, defaultKotlinOkHttp3ClientsGeneratorConfig);
         return Object.assign(providerContext, {
-            packageName: this.getPackageName(providerContext.config),
             infrastructurePackageName: this.getInfrastructurePackageName(providerContext.config),
         });
     }
@@ -46,7 +45,8 @@ export class KotlinOkHttp3ClientsGenerator extends OpenApiServicesGenerationProv
         return config.infrastructurePackageName.value;
     }
     getPackageName(config) {
-        return config.packageName + config.packageSuffix;
+        const packageSuffix = typeof config.packageSuffix === 'string' ? config.packageSuffix : config.packageSuffix();
+        return config.packageName + packageSuffix;
     }
     copyInfrastructureFiles(ctx) {
         const sourceDir = resolve(dirname(require.resolve('@goast/kotlin')), '../assets/client/okhttp3');

package/esm/lib/generators/services/spring-controllers/spring-controller-generator.js

@@ -364,7 +364,8 @@ export class DefaultKotlinSpringControllerGenerator extends KotlinFileGenerator
         return `${ctx.config.outputDir}/${packageName.replace(/\./g, '/')}`;
     }
     getPackageName(ctx) {
-        return ctx.config.packageName + ctx.config.packageSuffix;
+        const packageSuffix = typeof ctx.config.packageSuffix === 'string' ? ctx.config.packageSuffix : ctx.config.packageSuffix(ctx.service);
+        return ctx.config.packageName + packageSuffix;
     }
     getApiInterfaceName(ctx) {
         return toCasing(ctx.service.name, 'pascal') + 'Api';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",

package/types/lib/generators/models/model-generator.d.ts

@@ -32,6 +32,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     protected generateEnum(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected generateArrayType(ctx: Context, builder: Builder, schema: ApiSchema<'array'>): void;
     protected generateDocumentation(ctx: Context, builder: Builder, schema: ApiSchema): void;
+    protected getPackageName(ctx: Context, schema: ApiSchema): string;
     protected shouldGenerateTypeDeclaration(ctx: Context, schema: ApiSchema): boolean;
     protected getDeclarationTypeName(ctx: Context, schema: ApiSchema): string;
     protected getInheritedSchemas(ctx: KotlinModelGeneratorContext, schema: ApiSchema): ApiSchema<import("@goast/core").ApiSchemaKind>[];

package/types/lib/generators/models/models.d.ts

@@ -3,7 +3,7 @@ import { KotlinImport } from '../../common-results';
 import { KotlinGeneratorConfig } from '../../config';
 export type KotlinModelsGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
-    packageSuffix: string;
+    packageSuffix: string | ((schema: ApiSchema) => string);
     oneOfBehavior: 'treat-as-any-of' | 'treat-as-all-of';
     addJacksonAnnotations: boolean;
     addJakartaValidationAnnotations: boolean;

package/types/lib/generators/services/okhttp3-clients/models.d.ts

@@ -4,7 +4,7 @@ import { KotlinGeneratorConfig } from '../../../config';
 import { KotlinModelsGeneratorOutput } from '../../models';
 export type KotlinOkHttp3ClientsGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
-    packageSuffix: string;
+    packageSuffix: string | ((service?: ApiService) => string);
     infrastructurePackageName: string | {
         mode: 'append-package-name' | 'append-full-package-name' | 'replace';
         value: string;
@@ -21,7 +21,6 @@ export type KotlinOkHttp3ClientsGeneratorOutput = {
 };
 export type KotlinOkHttp3ClientGeneratorOutput = KotlinImport;
 export type KotlinOkHttp3ClientsGeneratorContext = OpenApiServicesGenerationProviderContext<KotlinOkHttp3ClientsGeneratorInput, KotlinOkHttp3ClientsGeneratorOutput, KotlinOkHttp3ClientsGeneratorConfig, KotlinOkHttp3ClientGeneratorOutput> & {
-    packageName: string;
     infrastructurePackageName: string;
 };
 export type KotlinOkHttp3ClientGeneratorContext = KotlinOkHttp3ClientsGeneratorContext & {

package/types/lib/generators/services/okhttp3-clients/okhttp3-client-generator.d.ts

@@ -1,4 +1,4 @@
-import { ApiEndpoint, ApiParameter, ApiSchema } from '@goast/core';
+import { ApiEndpoint, ApiParameter, ApiSchema, ApiService } from '@goast/core';
 import { KotlinOkHttp3ClientGeneratorContext, KotlinOkHttp3ClientGeneratorOutput } from './models';
 import { KotlinImport } from '../../../common-results';
 import { KotlinFileBuilder } from '../../../file-builder';
@@ -45,6 +45,7 @@ export declare class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<C
     protected generateParamDocEntries(ctx: Context, builder: Builder, endpoint: ApiEndpoint): void;
     protected generateParams(ctx: Context, builder: Builder, endpoint: ApiEndpoint, includeTypeDefinition: boolean): void;
     protected generateTypeUsage(ctx: Context, builder: Builder, schema: ApiSchema | undefined, fallback?: string, nullable?: boolean): void;
+    protected getPackageName(ctx: Context, service: ApiService): string;
     protected getTypeNameWithNullability(typeName: string, nullable: boolean | undefined): string;
     protected getDefaultValue(ctx: Context, schema: ApiSchema | undefined): string;
     protected getPathWithInterpolation(ctx: Context, endpoint: ApiEndpoint): string;
@@ -54,7 +55,7 @@ export declare class DefaultKotlinOkHttp3Generator extends KotlinFileGenerator<C
     protected getRequestBodyParamName(ctx: Context, endpoint: ApiEndpoint): string;
     protected getBasePath(ctx: Context): string;
     protected getEndpointPath(ctx: Context, endpoint: ApiEndpoint): string;
-    protected getFilePath(ctx: Context): string;
+    protected getFilePath(ctx: Context, packageName: string): string;
     protected getApiClientName(ctx: Context): string;
 }
 export {};

package/types/lib/generators/services/spring-controllers/models.d.ts

@@ -4,7 +4,7 @@ import { KotlinGeneratorConfig } from '../../../config';
 import { KotlinModelsGeneratorOutput } from '../../models';
 export type KotlinServicesGeneratorConfig = KotlinGeneratorConfig & {
     packageName: string;
-    packageSuffix: string;
+    packageSuffix: string | ((service: ApiService) => string);
     basePath?: string | RegExp | ((basePath: string, service: ApiService) => string);
     pathModifier?: RegExp | ((path: string, endpoint: ApiEndpoint) => string);
     addSwaggerAnnotations: boolean;