@goast/kotlin 0.3.1 → 0.3.3

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

@@ -14,24 +14,6 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             // Do not generate types that are only used for anyOf and/or allOf
             return { type: ast_1.kt.refs.any({ nullable: true }) };
         }
-        if (ctx.schema.id === ctx.schema.name) {
-            // TODO: Add this to @goast/core
-            const match = ctx.schema.$src.path.match(/\/components\/responses\/([^/]+)\/content\/.+\/schema/);
-            if (match) {
-                ctx.schema.name = match[1].toLowerCase().endsWith('response') ? match[1] : match[1] + 'Response';
-            }
-        }
-        if (ctx.schema.isNameGenerated) {
-            // TODO: Change this in @goast/core
-            const match = ctx.schema.$src.path.match(/\/paths\/(?<path>.+)\/(?<method>.+)\/responses\/(?<status>\d+)\//);
-            if (match && match.groups) {
-                const { path, method, status } = match.groups;
-                const endpoint = ctx.data.endpoints.find((e) => e.path === path && e.method === method);
-                if (endpoint) {
-                    ctx.schema.name = `${endpoint.name}${status}Response`;
-                }
-            }
-        }
         if (this.shouldGenerateTypeDeclaration(ctx, { schema: ctx.schema })) {
             const typeName = this.getDeclarationTypeName(ctx, { schema: ctx.schema });
             const packageName = this.getPackageName(ctx, { schema: ctx.schema });
@@ -187,6 +169,8 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                     return schema.enum && schema.enum.length > 0
                         ? ast_1.kt.call([this.getType(ctx, { schema }), (0, core_1.toCasing)(String(schema.default), ctx.config.enumValueNameCasing)])
                         : ast_1.kt.string(String(schema.default));
+                case 'array':
+                    return ast_1.kt.call(ast_1.kt.refs.listOf.infer(), Array.isArray(schema.default) ? schema.default.map((x) => ast_1.kt.toNode(x)) : []);
                 default:
                     return 'null';
             }
@@ -361,6 +345,9 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         if (schema.kind === 'object' && schema.properties.size === 0 && schema.additionalProperties) {
             return false;
         }
+        if (schema.kind === 'object' && ctx.config.emptyObjectTypeBehavior === 'use-any' && schema.properties.size === 0) {
+            return false;
+        }
         // Dynamically generated schemas do not have its own type declaration
         if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
             return false;

package/cjs/lib/generators/models/models.js

@@ -7,6 +7,7 @@ exports.defaultKotlinModelsGeneratorConfig = {
     packageName: 'com.openapi.generated',
     packageSuffix: '.model',
     oneOfBehavior: 'treat-as-any-of',
+    emptyObjectTypeBehavior: 'generate-empty-class',
     addJacksonAnnotations: true,
     addJakartaValidationAnnotations: true,
     addSwaggerAnnotations: true,

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

@@ -11,24 +11,6 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             // Do not generate types that are only used for anyOf and/or allOf
             return { type: kt.refs.any({ nullable: true }) };
         }
-        if (ctx.schema.id === ctx.schema.name) {
-            // TODO: Add this to @goast/core
-            const match = ctx.schema.$src.path.match(/\/components\/responses\/([^/]+)\/content\/.+\/schema/);
-            if (match) {
-                ctx.schema.name = match[1].toLowerCase().endsWith('response') ? match[1] : match[1] + 'Response';
-            }
-        }
-        if (ctx.schema.isNameGenerated) {
-            // TODO: Change this in @goast/core
-            const match = ctx.schema.$src.path.match(/\/paths\/(?<path>.+)\/(?<method>.+)\/responses\/(?<status>\d+)\//);
-            if (match && match.groups) {
-                const { path, method, status } = match.groups;
-                const endpoint = ctx.data.endpoints.find((e) => e.path === path && e.method === method);
-                if (endpoint) {
-                    ctx.schema.name = `${endpoint.name}${status}Response`;
-                }
-            }
-        }
         if (this.shouldGenerateTypeDeclaration(ctx, { schema: ctx.schema })) {
             const typeName = this.getDeclarationTypeName(ctx, { schema: ctx.schema });
             const packageName = this.getPackageName(ctx, { schema: ctx.schema });
@@ -184,6 +166,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                     return schema.enum && schema.enum.length > 0
                         ? kt.call([this.getType(ctx, { schema }), toCasing(String(schema.default), ctx.config.enumValueNameCasing)])
                         : kt.string(String(schema.default));
+                case 'array':
+                    return kt.call(kt.refs.listOf.infer(), Array.isArray(schema.default) ? schema.default.map((x) => kt.toNode(x)) : []);
                 default:
                     return 'null';
             }
@@ -358,6 +342,9 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         if (schema.kind === 'object' && schema.properties.size === 0 && schema.additionalProperties) {
             return false;
         }
+        if (schema.kind === 'object' && ctx.config.emptyObjectTypeBehavior === 'use-any' && schema.properties.size === 0) {
+            return false;
+        }
         // Dynamically generated schemas do not have its own type declaration
         if (!ctx.data.schemas.some((x) => x.id === schema.id)) {
             return false;

package/esm/lib/generators/models/models.js

@@ -4,6 +4,7 @@ export const defaultKotlinModelsGeneratorConfig = {
     packageName: 'com.openapi.generated',
     packageSuffix: '.model',
     oneOfBehavior: 'treat-as-any-of',
+    emptyObjectTypeBehavior: 'generate-empty-class',
     addJacksonAnnotations: true,
     addJakartaValidationAnnotations: true,
     addSwaggerAnnotations: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "repository": "https://github.com/MaSch0212/goast.git",
   "description": "Provides gOAst generators for generating Kotlin code from OpenAPI specifications.",
   "keywords": [
@@ -23,9 +23,9 @@
   "type": "module",
   "dependencies": {
     "fs-extra": "^11.2.0",
-    "node-fetch": "^3.3.2",
+    "node-fetch": "^2.7.0",
     "yaml": "^2.4.5",
-    "@goast/core": "0.3.1",
+    "@goast/core": "0.3.3",
     "tslib": "2.6.3"
   },
   "packageManager": "pnpm@9.5.0",

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

@@ -2,11 +2,44 @@ import { ApiSchema, DefaultGenerationProviderConfig, OpenApiSchemasGenerationPro
 import { kt } from '../../ast';
 import { KotlinGeneratorConfig } from '../../config';
 export type KotlinModelsGeneratorConfig = KotlinGeneratorConfig & {
+    /**
+     * The package name for generated models.
+     * @default 'com.openapi.generated'
+     */
     packageName: string;
+    /**
+     * The suffix to append to the package name for generated models.
+     * @default '.model'
+     */
     packageSuffix: string | ((schema: ApiSchema) => string);
+    /**
+     * Determines how `oneOf` schemas should be treated.
+     * - `treat-as-any-of`: Treat `oneOf` schemas as `anyOf` schemas.
+     * - `treat-as-all-of`: Treat `oneOf` schemas as `allOf` schemas.
+     * @default 'treat-as-any-of'
+     */
     oneOfBehavior: 'treat-as-any-of' | 'treat-as-all-of';
+    /**
+     * Determines how schemas of type `object` without properties should be treated.
+     * - `use-any`: Generate `Any` type for empty object schemas.
+     * - `generate-empty-class`: Generate an empty class for empty object schemas.
+     * @default 'generate-empty-class'
+     */
+    emptyObjectTypeBehavior: 'use-any' | 'generate-empty-class';
+    /**
+     * Whether to add Jackson annotations to generated models.
+     * @default true
+     */
     addJacksonAnnotations: boolean;
+    /**
+     * Whether to add Jakarta Validation annotations to generated models.
+     * @default true
+     */
     addJakartaValidationAnnotations: boolean;
+    /**
+     * Whether to add Swagger annotations to generated models.
+     * @default true
+     */
     addSwaggerAnnotations: boolean;
 };
 export declare const defaultKotlinModelsGeneratorConfig: DefaultGenerationProviderConfig<KotlinModelsGeneratorConfig>;