#130: fix naming

icapps · ikbendewilliam · Oct 26, 2023 · Sep 1, 2023 · Sep 4, 2023 · Sep 4, 2023
commit 523e7ec0b244489842ec25283a808d0750dca3bf
diff --git a/example/lib/model/status/double_status.dart b/example/lib/model/status/double_status.dart
diff --git a/example/lib/model/status/status.dart b/example/lib/model/status/status.dart
diff --git a/example/lib/model/user/person/gender.dart b/example/lib/model/user/person/gender.dart
diff --git a/example/lib/model/user/person/person.g.dart b/example/lib/model/user/person/person.g.dart
diff --git a/example/lib/model/user/project/project.dart b/example/lib/model/user/project/project.dart
diff --git a/example/lib/model/user/project/project.g.dart b/example/lib/model/user/project/project.g.dart
diff --git a/example/model_generator/config.yaml b/example/model_generator/config.yaml
@@ -149,7 +149,7 @@ Project:
       default_value: 0.2
     status:
       type: Status?
-      unknown_enum_value: status_0
+      unknown_enum_value: status0
 
 ProjectWrapper:
   path: user/project/

diff --git a/lib/config/yml_generator_config.dart b/lib/config/yml_generator_config.dart
@@ -16,6 +16,7 @@ import 'package:model_generator/model/model/enum_model.dart';
 import 'package:model_generator/model/model/json_converter_model.dart';
 import 'package:model_generator/model/model/model.dart';
 import 'package:model_generator/model/model/object_model.dart';
+import 'package:model_generator/util/case_util.dart';
 import 'package:model_generator/util/generic_type.dart';
 import 'package:model_generator/util/list_extensions.dart';
 import 'package:model_generator/util/type_checker.dart';
@@ -174,7 +175,9 @@ class YmlGeneratorConfig {
             );
           });
           fields.add(EnumField(
-            name: uppercaseEnums ? key.toUpperCase() : key.toLowerCase(),
+            name: uppercaseEnums
+                ? key.toUpperCase()
+                : CaseUtil(key.toLowerCase()).camelCase,
             rawName: key,
             values: enumValues,
             description: description,

diff --git a/test/writer/enum_model_writer/default_values/output.txt b/test/writer/enum_model_writer/default_values/output.txt
@@ -4,19 +4,19 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
     firstName: 'firstName',
     lastName: 'lastName',
   ),
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: 'MY_VALUE_2',
     firstName: 'firstName',
     lastName: 'lastName',
   ),
   @JsonValue('MY_VALUE_3')
-  my_value_3(
+  myValue3(
     jsonValue: 'MY_VALUE_3',
     firstName: 'firstName',
     lastName: 'specifiedLastName',

diff --git a/test/writer/enum_model_writer/description/output.txt b/test/writer/enum_model_writer/description/output.txt
@@ -5,11 +5,11 @@ import 'package:json_annotation/json_annotation.dart';
 ///A good description of this enum
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
   ),
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: 'MY_VALUE_2',
   );
 

diff --git a/test/writer/enum_model_writer/double_type/output.txt b/test/writer/enum_model_writer/double_type/output.txt
@@ -4,11 +4,11 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue(1.2)
-  my_value_1(
+  myValue1(
     value: 1.2,
   ),
   @JsonValue(2.2)
-  my_value_2(
+  myValue2(
     value: 2.2,
   );
 

diff --git a/test/writer/enum_model_writer/field_description/output.txt b/test/writer/enum_model_writer/field_description/output.txt
@@ -5,12 +5,12 @@ import 'package:json_annotation/json_annotation.dart';
 enum MyEnumModel {
   ///This is value 1
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
   ),
   ///This is value 2
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: 'MY_VALUE_2',
   );
 

diff --git a/test/writer/enum_model_writer/generate_extension_normal/output.txt b/test/writer/enum_model_writer/generate_extension_normal/output.txt
@@ -5,11 +5,11 @@ import 'package:model_generator/util/extension/list_extension.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
   ),
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: 'MY_VALUE_2',
   );
 

diff --git a/test/writer/enum_model_writer/int_type/output.txt b/test/writer/enum_model_writer/int_type/output.txt
@@ -4,11 +4,11 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue(1)
-  my_value_1(
+  myValue1(
     value: 1,
   ),
   @JsonValue(2)
-  my_value_2(
+  myValue2(
     value: 2,
   );
 

diff --git a/test/writer/enum_model_writer/normal/output.txt b/test/writer/enum_model_writer/normal/output.txt
@@ -4,11 +4,11 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
   ),
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: '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
@@ -4,7 +4,7 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1,
+  myValue1,
   @JsonValue('MY_VALUE_2')
-  my_value_2,
+  myValue2,
 }
diff --git a/test/writer/enum_model_writer/optional_values/output.txt b/test/writer/enum_model_writer/optional_values/output.txt
@@ -4,13 +4,13 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
     firstName: 'firstName',
     lastName: 'lastName',
   ),
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: 'MY_VALUE_2',
     firstName: 'firstName',
     lastName: 'lastName',

diff --git a/test/writer/enum_model_writer/optional_values_default/output.txt b/test/writer/enum_model_writer/optional_values_default/output.txt
@@ -4,13 +4,13 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('MY_VALUE_1')
-  my_value_1(
+  myValue1(
     jsonValue: 'MY_VALUE_1',
     firstName: 'firstName',
     lastName: null,
   ),
   @JsonValue('MY_VALUE_2')
-  my_value_2(
+  myValue2(
     jsonValue: 'MY_VALUE_2',
     firstName: 'firstName',
     lastName: null,

diff --git a/test/writer/enum_model_writer/string_type/output.txt b/test/writer/enum_model_writer/string_type/output.txt
@@ -4,11 +4,11 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum MyEnumModel {
   @JsonValue('my_value1')
-  my_value_1(
+  myValue1(
     value: 'my_value1',
   ),
   @JsonValue('my_value2')
-  my_value_2(
+  myValue2(
     value: 'my_value2',
   );
 

diff --git a/test/writer/enum_model_writer/use_default_json_value/output.txt b/test/writer/enum_model_writer/use_default_json_value/output.txt
@@ -4,19 +4,19 @@ import 'package:json_annotation/json_annotation.dart';
 
 enum DoubleStatus {
   @JsonValue('customValue')
-  status_0(
+  status0(
     value: 'customValue',
   ),
   @JsonValue('status_1')
-  status_1(
+  status1(
     value: 'status_1',
   ),
   @JsonValue('status_2')
-  status_2(
+  status2(
     value: 'status_2',
   ),
   @JsonValue('status_3')
-  status_3(
+  status3(
     value: 'status_3',
   );