#130: finished property functionality

icapps · Sep 5, 2023 · db94271 · db94271
1 parent fcf0054
commit db94271
Show file tree

Hide file tree

Showing 13 changed files with 166 additions and 25 deletions.
diff --git a/lib/config/yml_generator_config.dart b/lib/config/yml_generator_config.dart
@@ -144,6 +144,7 @@ class YmlGeneratorConfig {
         });
 
         models.add(EnumModel(
+          addJsonKeyToProperties: value['use_default_json_key'] ?? true,
           name: key,
           path: path,
           baseDirectory: baseDirectory,

diff --git a/lib/model/model/enum_model.dart b/lib/model/model/enum_model.dart
@@ -4,11 +4,13 @@ import 'package:model_generator/model/model/model.dart';
 class EnumModel extends Model {
   final List<EnumField> fields;
   final List<EnumProperty> properties;
+  final bool addJsonKeyToProperties;
 
   EnumModel({
     required String name,
     required this.fields,
     required this.properties,
+    this.addJsonKeyToProperties = true,
     String? path,
     String? baseDirectory,
     List<String>? extraImports,

diff --git a/lib/writer/enum_model_writer.dart b/lib/writer/enum_model_writer.dart
@@ -1,4 +1,5 @@
 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';
@@ -24,10 +25,12 @@ class EnumModelWriter {
 
     final jsonModelName = CaseUtil(jsonModel.name);
     final properties = jsonModel.properties;
+    final keyProperty = properties.firstWhereOrNull((property) => property.isJsonKey);
+    final addDefaultJsonKey = keyProperty == null && jsonModel.addJsonKeyToProperties;
+    final addProperties = properties.isNotEmpty || addDefaultJsonKey;
 
     sb.writeln('enum ${jsonModelName.pascalCase} {');
     for (var key in jsonModel.fields) {
-      final keyProperty = properties.firstWhereOrNull((property) => property.isJsonKey);
       final jsonValue = key.values.firstWhereOrNull((value) => value.propertyName == keyProperty?.name)?.value ?? key.serializedName;
       final propertyType = keyProperty?.type;
       final isLast = jsonModel.fields.indexOf(key) == (jsonModel.fields.length - 1);
@@ -41,30 +44,58 @@ class EnumModelWriter {
         sb.writeln('  @JsonValue($jsonValue)');
       }
       sb.write('  ${key.name}');
-      if (properties.isNotEmpty && isLast) {
-        sb.writeln(';');
+
+      if (addProperties) {
+        sb.writeln('(');
+        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}\',');
+          } else {
+            sb.writeln('${value.value},');
+          }
+        }
+        if (isLast) {
+          sb.writeln('  );');
+        } else {
+          sb.writeln('  ),');
+        }
       } else {
         sb.writeln(',');
       }
     }
 
-    if (properties.isNotEmpty) {
+    if (addProperties) {
       sb.writeln();
     }
 
+    if (addDefaultJsonKey) {
+      sb.writeln('  final String jsonValue;');
+    }
     for (var property in properties) {
-      sb.writeln('final ${property.type.name} ${property.name};');
+      sb.writeln('  final ${property.type.name} ${property.name};');
     }
-    if (properties.isNotEmpty) {
-      sb.write('Const ${jsonModel.name} ({');
+    if (addProperties) {
+      sb.writeln();
+      sb.writeln('  const ${jsonModelName.pascalCase}({');
       for (var property in properties) {
-        sb.write('required this.${property.name}, ');
+        sb.writeln('    required this.${property.name},');
       }
-      sb.writeln('})');
+      if (addDefaultJsonKey) {
+        sb.writeln('    required this.jsonValue,');
+      }
+      sb.writeln('  });');
     }
 
     sb.writeln('}');
 
     return sb.toString();
   }
+
+  ItemType itemTypeForProperty(String propertyName, List<EnumProperty> properties) =>
+      properties.firstWhereOrNull((property) => property.name == propertyName)?.type ?? StringType();
 }
diff --git a/test/writer/enum_model_writer/custom-value/config.txt b/test/writer/enum_model_writer/custom-value/config.txt
@@ -1,14 +1,20 @@
-MyEnumModel:
+Person:
   path: test/enum/
   type: enum
   properties:
     jsonKey: 
       is_json_key: true
       type: int
+    firstName: String
+    lastName: String
   values:
     MY_VALUE_1:
       properties:
         jsonKey: 1
+        firstName: firstName1
+        lastName: lastName1
     MY_VALUE_2:
       properties:
-        jsonKey: 2
+        jsonKey: 2
+        firstName: firstName2
+        lastName: lastName2
diff --git a/test/writer/enum_model_writer/custom-value/output.txt b/test/writer/enum_model_writer/custom-value/output.txt
@@ -2,9 +2,27 @@
 
 import 'package:json_annotation/json_annotation.dart';
 
-enum MyEnumModel {
+enum Person {
   @JsonValue(1)
-  MY_VALUE_1,
+  MY_VALUE_1(
+    jsonKey: 1,
+    firstName: 'firstName1',
+    lastName: 'lastName1',
+  ),
   @JsonValue(2)
-  MY_VALUE_2,
+  MY_VALUE_2(
+    jsonKey: 2,
+    firstName: 'firstName2',
+    lastName: 'lastName2',
+  );
+
+  final int jsonKey;
+  final String firstName;
+  final String lastName;
+
+  const Person({
+    required this.jsonKey,
+    required this.firstName,
+    required this.lastName,
+  });
 }
diff --git a/test/writer/enum_model_writer/normal-description/output.txt b/test/writer/enum_model_writer/normal-description/output.txt
@@ -5,7 +5,17 @@ import 'package:json_annotation/json_annotation.dart';
 ///A good description of this enum
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  MY_VALUE_1,
+  MY_VALUE_1(
+    jsonValue: 'MY_VALUE_1',
+  ),
   @JsonValue('MY_VALUE_2')
-  MY_VALUE_2,
+  MY_VALUE_2(
+    jsonValue: 'MY_VALUE_2',
+  );
+
+  final String jsonValue;
+
+  const MyEnumModel({
+    required this.jsonValue,
+  });
 }
diff --git a/test/writer/enum_model_writer/normal/output.txt b/test/writer/enum_model_writer/normal/output.txt
@@ -4,7 +4,17 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  MY_VALUE_1,
+  MY_VALUE_1(
+    jsonValue: 'MY_VALUE_1',
+  ),
   @JsonValue('MY_VALUE_2')
-  MY_VALUE_2,
+  MY_VALUE_2(
+    jsonValue: 'MY_VALUE_2',
+  );
+
+  final String jsonValue;
+
+  const MyEnumModel({
+    required this.jsonValue,
+  });
 }
diff --git a/test/writer/enum_model_writer/normal_no_default_json_key/config.txt b/test/writer/enum_model_writer/normal_no_default_json_key/config.txt
@@ -0,0 +1,7 @@
+MyEnumModel:
+  path: test/enum/
+  use_default_json_key: false
+  type: enum
+  values:
+    MY_VALUE_1:
+    MY_VALUE_2:
diff --git a/test/writer/enum_model_writer/normal_no_default_json_key/output.txt b/test/writer/enum_model_writer/normal_no_default_json_key/output.txt
@@ -0,0 +1,10 @@
+// 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_2')
+  MY_VALUE_2,
+}
diff --git a/test/writer/enum_model_writer/normal_with_double_type/config.txt b/test/writer/enum_model_writer/normal_with_double_type/config.txt
@@ -0,0 +1,14 @@
+MyEnumModel:
+  path: test/enum/
+  type: enum
+  properties:
+    value:
+      type: double
+      is_json_key: true
+  values:
+    MY_VALUE_1:
+      properties:
+        value: 1.2
+    MY_VALUE_2:
+      properties:
+        value: 2.2
diff --git a/test/writer/enum_model_writer/normal_with_double_type/output.txt b/test/writer/enum_model_writer/normal_with_double_type/output.txt
@@ -3,9 +3,18 @@
 import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
-  ///A good description of this field
-  @JsonValue(1.0)
-  MY_VALUE_1,
+  @JsonValue(1.2)
+  MY_VALUE_1(
+    value: 1.2,
+  ),
   @JsonValue(2.2)
-  MY_VALUE_2,
+  MY_VALUE_2(
+    value: 2.2,
+  );
+
+  final double value;
+
+  const MyEnumModel({
+    required this.value,
+  });
 }
diff --git a/test/writer/enum_model_writer/normal_with_int_type/config.txt b/test/writer/enum_model_writer/normal_with_int_type/config.txt
@@ -0,0 +1,14 @@
+MyEnumModel:
+  path: test/enum/
+  type: enum
+  properties:
+    value:
+      type: int
+      is_json_key: true
+  values:
+    MY_VALUE_1:
+      properties:
+        value: 1
+    MY_VALUE_2:
+      properties:
+        value: 2
diff --git a/test/writer/enum_model_writer/normal_with_int_type/output.txt b/test/writer/enum_model_writer/normal_with_int_type/output.txt
@@ -3,9 +3,18 @@
 import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
-  ///A good description of this field
   @JsonValue(1)
-  MY_VALUE_1,
+  MY_VALUE_1(
+    value: 1,
+  ),
   @JsonValue(2)
-  MY_VALUE_2,
+  MY_VALUE_2(
+    value: 2,
+  );
+
+  final int value;
+
+  const MyEnumModel({
+    required this.value,
+  });
 }