Merge pull request #85 from comigor/small-fixes

Consider unknownEnumValue only on non-list and fix inclusion of meta package

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 4.0.2
+- Only add unknownEnumValue on non-list enums
+- Consider all classes to include reference to meta package
+
 ## 4.0.1
 - Look at mutation root when generating a mutation
 

lib/generator.dart

@@ -230,7 +230,9 @@ Make sure your query is correct and your schema is updated.''');
       ),
       options,
     );
-    annotation = 'JsonKey(unknownEnumValue: $dartTypeStr.$ARTEMIS_UNKNOWN)';
+    if (!fieldType.isList()) {
+      annotation = 'JsonKey(unknownEnumValue: $dartTypeStr.$ARTEMIS_UNKNOWN)';
+    }
   }
 
   return ClassProperty(

lib/generator/graphql_helpers.dart

@@ -26,6 +26,18 @@ GraphQLType followType(GraphQLType type) {
   }
 }
 
+/// Find if this type is eventually a list.
+bool isEventuallyList(GraphQLType type) {
+  switch (type.kind) {
+    case GraphQLTypeKind.LIST:
+      return true;
+    case GraphQLTypeKind.NON_NULL:
+      return isEventuallyList(type.ofType);
+    default:
+      return false;
+  }
+}
+
 /// Build a string repesenting a Dart type, given a GraphQL type.
 String buildTypeString(GraphQLType type, GeneratorOptions options,
     {bool dartType = true, String replaceLeafWith}) {

lib/generator/helpers.dart

@@ -40,6 +40,13 @@ extension ExtensionsOnIterable<T, U> on Iterable<T> {
 /// checks if the passed queries contain at least one non nullable field
 bool hasNonNullableInput(Iterable<QueryDefinition> queries) {
   for (final query in queries) {
+    for (final clazz in query.classes.whereType<ClassDefinition>()) {
+      for (final property in clazz.properties) {
+        if (property.isNonNull) {
+          return true;
+        }
+      }
+    }
     for (final input in query.inputs) {
       if (input.isNonNull) {
         return true;

lib/schema/graphql.dart

@@ -208,6 +208,9 @@ class GraphQLType {
   /// Get this leaf type.
   GraphQLType follow() => followType(this);
 
+  /// Get if this type is a list.
+  bool isList() => isEventuallyList(this);
+
   /// Upgrade this type to the full type definition from schema.
   GraphQLType upgrade(GraphQLSchema schema, {String context}) =>
       getTypeByName(schema, name, context: context);

pubspec.yaml

@@ -1,5 +1,5 @@
 name: artemis
-version: 4.0.1
+version: 4.0.2
 
 authors:
   - Igor Borges <[email protected]>

test/query_generator/enums/enum_list_test.dart

@@ -0,0 +1,139 @@
+import 'package:artemis/generator/data.dart';
+import 'package:artemis/schema/graphql.dart';
+import 'package:test/test.dart';
+
+import '../../helpers.dart';
+
+void main() {
+  group('On enum list', () {
+    test(
+      'Enums as lists are generated correctly',
+      () async => testGenerator(
+        query: query,
+        libraryDefinition: libraryDefinition,
+        generatedFile: generatedFile,
+        typedSchema: schema,
+      ),
+    );
+  });
+}
+
+const query = r'''
+query custom {
+  q {
+    le
+  }
+}
+''';
+
+final schema = GraphQLSchema(
+    queryType: GraphQLType(name: 'QueryRoot', kind: GraphQLTypeKind.OBJECT),
+    types: [
+      GraphQLType(name: 'MyEnum', kind: GraphQLTypeKind.ENUM, enumValues: [
+        GraphQLEnumValue(name: 'A'),
+        GraphQLEnumValue(name: 'B'),
+      ]),
+      GraphQLType(
+        name: 'QueryResponse',
+        kind: GraphQLTypeKind.OBJECT,
+        fields: [
+          GraphQLField(
+              name: 'le',
+              type: GraphQLType(
+                  kind: GraphQLTypeKind.LIST,
+                  ofType:
+                      GraphQLType(name: 'MyEnum', kind: GraphQLTypeKind.ENUM))),
+        ],
+      ),
+      GraphQLType(
+        name: 'QueryRoot',
+        kind: GraphQLTypeKind.OBJECT,
+        fields: [
+          GraphQLField(
+              name: 'q',
+              type: GraphQLType(
+                  name: 'QueryResponse', kind: GraphQLTypeKind.OBJECT)),
+        ],
+      ),
+    ]);
+
+final libraryDefinition = LibraryDefinition(basename: r'query', queries: [
+  QueryDefinition(
+      queryName: r'custom',
+      queryType: r'Custom$QueryRoot',
+      classes: [
+        EnumDefinition(
+            name: r'Custom$QueryRoot$QueryResponse$MyEnum',
+            values: [r'A', r'B', r'ARTEMIS_UNKNOWN']),
+        ClassDefinition(
+            name: r'Custom$QueryRoot$QueryResponse',
+            properties: [
+              ClassProperty(
+                  type: r'List<Custom$QueryRoot$QueryResponse$MyEnum>',
+                  name: r'le',
+                  isOverride: false,
+                  isNonNull: false,
+                  isResolveType: false)
+            ],
+            factoryPossibilities: {},
+            typeNameField: r'__typename',
+            isInput: false),
+        ClassDefinition(
+            name: r'Custom$QueryRoot',
+            properties: [
+              ClassProperty(
+                  type: r'Custom$QueryRoot$QueryResponse',
+                  name: r'q',
+                  isOverride: false,
+                  isNonNull: false,
+                  isResolveType: false)
+            ],
+            factoryPossibilities: {},
+            typeNameField: r'__typename',
+            isInput: false)
+      ],
+      generateHelpers: false,
+      suffix: r'Query')
+]);
+
+const generatedFile = r'''// GENERATED CODE - DO NOT MODIFY BY HAND
+
+import 'package:json_annotation/json_annotation.dart';
+import 'package:equatable/equatable.dart';
+import 'package:gql/ast.dart';
+part 'query.g.dart';
+
+@JsonSerializable(explicitToJson: true)
+class Custom$QueryRoot$QueryResponse with EquatableMixin {
+  Custom$QueryRoot$QueryResponse();
+
+  factory Custom$QueryRoot$QueryResponse.fromJson(Map<String, dynamic> json) =>
+      _$Custom$QueryRoot$QueryResponseFromJson(json);
+
+  List<Custom$QueryRoot$QueryResponse$MyEnum> le;
+
+  @override
+  List<Object> get props => [le];
+  Map<String, dynamic> toJson() => _$Custom$QueryRoot$QueryResponseToJson(this);
+}
+
+@JsonSerializable(explicitToJson: true)
+class Custom$QueryRoot with EquatableMixin {
+  Custom$QueryRoot();
+
+  factory Custom$QueryRoot.fromJson(Map<String, dynamic> json) =>
+      _$Custom$QueryRootFromJson(json);
+
+  Custom$QueryRoot$QueryResponse q;
+
+  @override
+  List<Object> get props => [q];
+  Map<String, dynamic> toJson() => _$Custom$QueryRootToJson(this);
+}
+
+enum Custom$QueryRoot$QueryResponse$MyEnum {
+  A,
+  B,
+  ARTEMIS_UNKNOWN,
+}
+''';