@goast/kotlin 0.1.7 → 0.1.8

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

@@ -149,7 +149,7 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
             .append((builder) => this.generateDocumentation(ctx, builder, schema))
             .append('data class ')
             .append(this.getDeclarationTypeName(ctx, schema))
-            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(params, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
+            .parenthesizeIf(schema.properties.size > 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
             .append(' : ')
             .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
@@ -441,11 +441,14 @@ class DefaultKotlinModelGenerator extends file_generator_1.KotlinFileGenerator {
         return result;
     }
     sortProperties(ctx, schema, properties) {
-        return [...properties].sort((a, b) => {
-            const aRequired = schema.required.has(a.name) || schema.default ? 1 : 0;
-            const bRequired = schema.required.has(b.name) || schema.default ? 1 : 0;
-            return bRequired - aRequired;
-        });
+        return [...properties].sort((a, b) => classify(a) - classify(b));
+        function classify(p) {
+            if (p.schema.default !== undefined)
+                return 1;
+            if (schema.required.has(p.name))
+                return 0;
+            return 2;
+        }
     }
     normalizeSchema(ctx, schema) {
         if (schema.kind === 'oneOf') {

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

@@ -146,7 +146,7 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
             .append((builder) => this.generateDocumentation(ctx, builder, schema))
             .append('data class ')
             .append(this.getDeclarationTypeName(ctx, schema))
-            .parenthesizeIf(schema.properties.size > 0, '()', (builder) => builder.forEach(params, (builder, property) => this.generateObjectDataClassProperty(ctx, builder, schema, inheritedSchemas, property), { separator: ',\n' }), { multiline: true })
+            .parenthesizeIf(schema.properties.size > 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
             .append(' : ')
             .forEach(inheritedSchemas, (builder, schema) => this.generateTypeUsage(ctx, builder, schema), {
@@ -438,11 +438,14 @@ export class DefaultKotlinModelGenerator extends KotlinFileGenerator {
         return result;
     }
     sortProperties(ctx, schema, properties) {
-        return [...properties].sort((a, b) => {
-            const aRequired = schema.required.has(a.name) || schema.default ? 1 : 0;
-            const bRequired = schema.required.has(b.name) || schema.default ? 1 : 0;
-            return bRequired - aRequired;
-        });
+        return [...properties].sort((a, b) => classify(a) - classify(b));
+        function classify(p) {
+            if (p.schema.default !== undefined)
+                return 1;
+            if (schema.required.has(p.name))
+                return 0;
+            return 2;
+        }
     }
     normalizeSchema(ctx, schema) {
         if (schema.kind === 'oneOf') {

package/package.json

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