@goast/kotlin 0.1.3 → 0.1.4

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

@@ -146,7 +146,8 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             .appendIf(inheritedSchemas.some((x) => this.hasProperty(ctx, x, property.name)), 'override ')
             .append(`val ${(0, core_1.toCasing)(property.name, 'camel')}: `)
             .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
-            .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')), { separator: ',\n' }), { multiline: true })
+            .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?'))
+            .appendIf(property.schema.default !== undefined || !schema.required.has(property.name), ' = ', (builder) => this.generateDefaultValue(ctx, builder, property.schema)), { separator: ',\n' }), { multiline: true })
             .if(inheritedSchemas.length > 0, (builder) => builder
             .append(' : ')
             .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
@@ -175,6 +176,28 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             .append(' ')
             .parenthesize('{}', 'return this.additionalProperties', { multiline: true })), { multiline: true });
     }
+    generateDefaultValue(ctx, builder, schema) {
+        if (schema.default === null || schema.default === undefined) {
+            builder.append('null');
+        }
+        else {
+            switch (schema.kind) {
+                case 'boolean':
+                    builder.append(Boolean(schema.default) || String(schema.default).toLowerCase() === 'true' ? 'true' : 'false');
+                    break;
+                case 'integer':
+                case 'number':
+                    builder.append(String(schema.default));
+                    break;
+                case 'string':
+                    builder.append(this.toStringLiteral(ctx, String(schema.default)));
+                    break;
+                default:
+                    builder.append('null');
+                    break;
+            }
+        }
+    }
     generateObjectDataClassParameterAnnotations(ctx, builder, schema, property) {
         this.generatePropertyValidationAnnotations(ctx, builder, schema, property);
         this.generatePropertySchemaAnnotation(ctx, builder, schema, property);
@@ -255,7 +278,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
                 }
                 break;
             case 'null':
-                builder.append('null');
+                builder.append('Nothing');
                 break;
             case 'unknown':
                 builder.append('Any');

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

@@ -143,7 +143,8 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .appendIf(inheritedSchemas.some((x) => this.hasProperty(ctx, x, property.name)), 'override ')
             .append(`val ${toCasing(property.name, 'camel')}: `)
             .append((builder) => this.generateTypeUsage(ctx, builder, property.schema))
-            .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?').append(' = null')), { separator: ',\n' }), { multiline: true })
+            .if(!schema.required.has(property.name), (builder) => builder.appendIf(!property.schema.nullable, '?'))
+            .appendIf(property.schema.default !== undefined || !schema.required.has(property.name), ' = ', (builder) => this.generateDefaultValue(ctx, builder, property.schema)), { separator: ',\n' }), { multiline: true })
             .if(inheritedSchemas.length > 0, (builder) => builder
             .append(' : ')
             .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
@@ -172,6 +173,28 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append(' ')
             .parenthesize('{}', 'return this.additionalProperties', { multiline: true })), { multiline: true });
     }
+    generateDefaultValue(ctx, builder, schema) {
+        if (schema.default === null || schema.default === undefined) {
+            builder.append('null');
+        }
+        else {
+            switch (schema.kind) {
+                case 'boolean':
+                    builder.append(Boolean(schema.default) || String(schema.default).toLowerCase() === 'true' ? 'true' : 'false');
+                    break;
+                case 'integer':
+                case 'number':
+                    builder.append(String(schema.default));
+                    break;
+                case 'string':
+                    builder.append(this.toStringLiteral(ctx, String(schema.default)));
+                    break;
+                default:
+                    builder.append('null');
+                    break;
+            }
+        }
+    }
     generateObjectDataClassParameterAnnotations(ctx, builder, schema, property) {
         this.generatePropertyValidationAnnotations(ctx, builder, schema, property);
         this.generatePropertySchemaAnnotation(ctx, builder, schema, property);
@@ -252,7 +275,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
                 }
                 break;
             case 'null':
-                builder.append('null');
+                builder.append('Nothing');
                 break;
             case 'unknown':
                 builder.append('Any');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goast/kotlin",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "repository": "https://github.com/MaSch0212/goast.git",
   "author": {
     "name": "Marc Schmidt (MaSch0212)",
@@ -12,7 +12,7 @@
     "fs-extra": "^11.1.1",
     "node-fetch": "^2.6.11",
     "yaml": "^2.3.1",
-    "@goast/core": "0.1.0",
+    "@goast/core": "0.1.1",
     "tslib": "^2.3.0"
   },
   "module": "./esm/index.js",

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

@@ -19,6 +19,7 @@ export declare class DefaultKotlinModelGenerator extends KotlinFileGenerator<Con
     protected generateObjectInterfaceSignature(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateObjectInterfaceMembers(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
     protected generateObjectDataClass(ctx: Context, builder: Builder, schema: ApiSchema<'object'>): void;
+    protected generateDefaultValue(ctx: Context, builder: Builder, schema: ApiSchema): void;
     protected generateObjectDataClassParameterAnnotations(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
     protected generatePropertyValidationAnnotations(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;
     protected generatePropertySchemaAnnotation(ctx: Context, builder: Builder, schema: ApiSchema, property: ApiSchemaProperty): void;