#130: added default values

lib/config/yml_generator_config.dart

@@ -96,17 +96,21 @@ class YmlGeneratorConfig {
         final fields = <EnumField>[];
         final enumProperties = <EnumProperty>[];
         properties?.forEach((propertyKey, propertyValue) {
-          final ItemType itemType;
-          final String type;
           final bool isJsonKey;
+          final String type;
+          final String? defaultValue;
+          final ItemType itemType;
+
           final String name = propertyKey;
 
           if (propertyValue is YamlMap) {
             type = propertyValue['type'];
             isJsonKey = propertyValue['is_json_key'] == true;
+            defaultValue = propertyValue['default_value'];
           } else {
             type = propertyValue;
-            isJsonKey = false;  
+            isJsonKey = false;
+            defaultValue = null;
           }
 
           final optional = type.endsWith('?');
@@ -123,6 +127,7 @@ class YmlGeneratorConfig {
             type: itemType,
             isJsonKey: isJsonKey,
             isOptional: optional,
+            defaultValue: defaultValue,
           ));
         });
 

lib/model/model/enum_model.dart

@@ -57,12 +57,14 @@ class EnumProperty {
   final bool isJsonKey;
   final bool isOptional;
   final String name;
+  String? defaultValue;
   ItemType type;
 
   EnumProperty({
     required this.name,
     required this.type,
     required this.isOptional,
+    this.defaultValue,
     this.isJsonKey = false,
   });
 }

lib/writer/enum_model_writer.dart

@@ -1,5 +1,4 @@
 import 'package:model_generator/model/item_type/double_type.dart';
-import 'package:model_generator/model/item_type/item_type.dart';
 import 'package:model_generator/model/item_type/string_type.dart';
 import 'package:model_generator/model/model/enum_model.dart';
 import 'package:model_generator/util/case_util.dart';
@@ -53,13 +52,14 @@ class EnumModelWriter {
         if (addDefaultJsonKey) {
           sb.writeln('    jsonValue: \'$jsonValue\',');
         }
-        for (var value in key.values) {
-          final type = itemTypeForProperty(value.propertyName, properties);
-          sb.write('    ${value.propertyName}: ');
-          if (type is StringType) {
-            sb.writeln('\'${value.value}\',');
+        for (var property in properties) {
+          final enumValue = valueForProperty(property.name, key.values);
+          final value = enumValue?.value ?? property.defaultValue;
+          sb.write('    ${property.name}: ');
+          if (property.type is StringType && value != null) {
+            sb.writeln('\'$value\',');
           } else {
-            sb.writeln('${value.value},');
+            sb.writeln('$value,');
           }
         }
         if (isLast) {
@@ -94,7 +94,7 @@ class EnumModelWriter {
       }
       for (var property in properties) {
         sb.write('    ');
-        if(!property.isOptional){
+        if (!property.isOptional) {
           sb.write('required ');
         }
         sb.writeln('this.${property.name},');
@@ -107,6 +107,9 @@ class EnumModelWriter {
     return sb.toString();
   }
 
-  ItemType itemTypeForProperty(String propertyName, List<EnumProperty> properties) =>
-      properties.firstWhereOrNull((property) => property.name == propertyName)?.type ?? StringType();
+  EnumValue? valueForProperty(
+    String propertyName,
+    List<EnumValue> values,
+  ) =>
+      values.firstWhereOrNull((value) => value.propertyName == propertyName);
 }

test/writer/enum_model_writer/default_values/config.txt

@@ -0,0 +1,19 @@
+MyEnumModel:
+  path: test/enum/
+  type: enum
+  properties:
+    firstName: String
+    lastName:
+        type: String
+        default_value: lastName
+  values:
+    MY_VALUE_1:
+      properties:
+        firstName: firstName
+    MY_VALUE_2:
+      properties:
+        firstName: firstName
+    MY_VALUE_3:
+      properties:
+        firstName: firstName
+        lastName: specifiedLastName

test/writer/enum_model_writer/default_values/output.txt

@@ -0,0 +1,34 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+import 'package:json_annotation/json_annotation.dart';
+
+enum MyEnumModel {
+  @JsonValue('MY_VALUE_1')
+  MY_VALUE_1(
+    jsonValue: 'MY_VALUE_1',
+    firstName: 'firstName',
+    lastName: 'lastName',
+  ),
+  @JsonValue('MY_VALUE_2')
+  MY_VALUE_2(
+    jsonValue: 'MY_VALUE_2',
+    firstName: 'firstName',
+    lastName: 'lastName',
+  ),
+  @JsonValue('MY_VALUE_3')
+  MY_VALUE_3(
+    jsonValue: 'MY_VALUE_3',
+    firstName: 'firstName',
+    lastName: 'specifiedLastName',
+  );
+
+  final String jsonValue;
+  final String firstName;
+  final String lastName;
+
+  const MyEnumModel({
+    required this.jsonValue,
+    required this.firstName,
+    required this.lastName,
+  });
+}

test/writer/enum_model_writer/full_enum/config.txt

@@ -7,23 +7,29 @@ Person:
       is_json_key: true
       type: int
     firstName: String
-    lastName: String
-    age: int
-    height: double
+    lastName:
+        type: String
+        default_value: lastName
+    age: int?
+    height: double?
   values:
     MAN:
       description: enum of a man
       properties:
         jsonKey: 1
         firstName: firstName1
-        lastName: lastName1
         age: 12
         height: 12.4
     WOMAN:
       description: enum of a woman
       properties:
         jsonKey: 2
         firstName: firstName2
-        lastName: lastName2
         age: 16
         height: 22
+    OTHER:
+      description: enum of a other
+      properties:
+        jsonKey: 3
+        firstName: firstName3
+        lastName: SpecifiedLastName

test/writer/enum_model_writer/full_enum/output.txt

@@ -2,27 +2,47 @@
 
 import 'package:json_annotation/json_annotation.dart';
 
+///This is a enum of a person
 enum Person {
+  ///enum of a man
   @JsonValue(1)
-  MY_VALUE_1(
+  MAN(
     jsonKey: 1,
     firstName: 'firstName1',
-    lastName: 'lastName1',
+    lastName: 'lastName',
+    age: 12,
+    height: 12.4,
   ),
+  ///enum of a woman
   @JsonValue(2)
-  MY_VALUE_2(
+  WOMAN(
     jsonKey: 2,
     firstName: 'firstName2',
-    lastName: 'lastName2',
+    lastName: 'lastName',
+    age: 16,
+    height: 22,
+  ),
+  ///enum of a other
+  @JsonValue(3)
+  OTHER(
+    jsonKey: 3,
+    firstName: 'firstName3',
+    lastName: 'SpecifiedLastName',
+    age: null,
+    height: null,
   );
 
   final int jsonKey;
   final String firstName;
   final String lastName;
+  final int? age;
+  final double? height;
 
   const Person({
     required this.jsonKey,
     required this.firstName,
     required this.lastName,
+    this.age,
+    this.height,
   });
 }

test/writer/enum_model_writer/optional_values_default/config.txt

@@ -0,0 +1,13 @@
+MyEnumModel:
+  path: test/enum/
+  type: enum
+  properties:
+    firstName: String
+    lastName: String?
+  values:
+    MY_VALUE_1:
+      properties:
+        firstName: firstName
+    MY_VALUE_2:
+      properties:
+        firstName: firstName

test/writer/enum_model_writer/optional_values_default/output.txt

@@ -0,0 +1,28 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+import 'package:json_annotation/json_annotation.dart';
+
+enum MyEnumModel {
+  @JsonValue('MY_VALUE_1')
+  MY_VALUE_1(
+    jsonValue: 'MY_VALUE_1',
+    firstName: 'firstName',
+    lastName: null,
+  ),
+  @JsonValue('MY_VALUE_2')
+  MY_VALUE_2(
+    jsonValue: 'MY_VALUE_2',
+    firstName: 'firstName',
+    lastName: null,
+  );
+
+  final String jsonValue;
+  final String firstName;
+  final String? lastName;
+
+  const MyEnumModel({
+    required this.jsonValue,
+    required this.firstName,
+    this.lastName,
+  });
+}