enum name pascal casing fix

comigor · Jul 10, 2020 · 79bc83b · 79bc83b
1 parent 0cb309c
commit 79bc83b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 6.5.1-beta.1
+- enum name pascal casing.
+
 ## 6.5.0-beta.1
 - Add deprecated annotations in fields.
 

diff --git a/lib/generator/data/enum_definition.dart b/lib/generator/data/enum_definition.dart
@@ -3,6 +3,7 @@ import 'package:artemis/generator/data/enum_value_definition.dart';
 import 'package:artemis/generator/data_printer.dart';
 import 'package:artemis/generator/helpers.dart';
 import 'package:meta/meta.dart';
+import 'package:recase/recase.dart';
 
 /// Define a Dart enum parsed from GraphQL schema.
 class EnumDefinition extends Definition with DataPrinter {
@@ -31,6 +32,11 @@ class EnumName extends Name with DataPrinter {
   /// Instantiate a enum name definition.
   EnumName({String name}) : super(name: name);
 
+  @override
+  String normalize(String name) {
+    return ReCase(super.normalize(name)).pascalCase;
+  }
+
   @override
   Map<String, Object> get namedProps => {
         'name': name,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 6.5.0-beta.1
+version: 6.5.1-beta.1
 
 authors:
   - Igor Borges <igor@borges.dev>

diff --git a/test/query_generator/enums/filter_enum_test.dart b/test/query_generator/enums/filter_enum_test.dart
@@ -16,7 +16,7 @@ void main() {
           }
 
           type QueryRoot {
-            q(e: InputEnum!, i: Input!): QueryResponse
+            q(e: input_enum!, i: Input!): QueryResponse
           }
 
           input Input {
@@ -32,7 +32,7 @@ void main() {
             B
           }
 
-          enum InputEnum {
+          enum input_enum {
             C
             D
           }
@@ -65,7 +65,7 @@ void main() {
 }
 
 const query = r'''
-  query custom($e: InputEnum!, $i: Input!) {
+  query custom($e: input_enum!, $i: Input!) {
     q(e: $e, i: $i) {
       e
     }
@@ -79,46 +79,21 @@ final LibraryDefinition libraryDefinition =
       operationName: r'custom',
       classes: [
         EnumDefinition(name: EnumName(name: r'MyEnum'), values: [
-          EnumValueDefinition(
-            name: EnumValueName(name: r'A'),
-          ),
-          EnumValueDefinition(
-            name: EnumValueName(name: r'B'),
-          ),
-          EnumValueDefinition(
-              name: EnumValueName(
-            name: r'ARTEMIS_UNKNOWN',
-          ))
+          EnumValueDefinition(name: EnumValueName(name: r'A')),
+          EnumValueDefinition(name: EnumValueName(name: r'B')),
+          EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN'))
         ]),
-        EnumDefinition(name: EnumName(name: r'InputEnum'), values: [
-          EnumValueDefinition(
-            name: EnumValueName(name: r'C'),
-          ),
-          EnumValueDefinition(
-            name: EnumValueName(name: r'D'),
-          ),
-          EnumValueDefinition(
-              name: EnumValueName(
-            name: r'ARTEMIS_UNKNOWN',
-          ))
+        EnumDefinition(name: EnumName(name: r'input_enum'), values: [
+          EnumValueDefinition(name: EnumValueName(name: r'C')),
+          EnumValueDefinition(name: EnumValueName(name: r'D')),
+          EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN'))
         ]),
         EnumDefinition(name: EnumName(name: r'_InputInputEnum'), values: [
-          EnumValueDefinition(
-            name: EnumValueName(name: r'_E'),
-          ),
-          EnumValueDefinition(
-            name: EnumValueName(name: r'_F'),
-          ),
-          EnumValueDefinition(
-            name: EnumValueName(name: r'_new'),
-          ),
-          EnumValueDefinition(
-            name: EnumValueName(name: r'new'),
-          ),
-          EnumValueDefinition(
-              name: EnumValueName(
-            name: r'ARTEMIS_UNKNOWN',
-          ))
+          EnumValueDefinition(name: EnumValueName(name: r'_E')),
+          EnumValueDefinition(name: EnumValueName(name: r'_F')),
+          EnumValueDefinition(name: EnumValueName(name: r'_new')),
+          EnumValueDefinition(name: EnumValueName(name: r'new')),
+          EnumValueDefinition(name: EnumValueName(name: r'ARTEMIS_UNKNOWN'))
         ]),
         ClassDefinition(
             name: ClassName(name: r'Custom$_QueryRoot$_QueryResponse'),
@@ -165,7 +140,7 @@ final LibraryDefinition libraryDefinition =
       ],
       inputs: [
         QueryInput(
-            type: TypeName(name: r'InputEnum'),
+            type: TypeName(name: r'input_enum'),
             name: QueryInputName(name: r'e'),
             isNonNull: true,
             annotations: [