Merge pull request #12 from davidmorgan/master

Check for missing import statement. Fix constraints for source_gen.

Author: davidmorgan

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.0.6
+
+ - Check for missing import statement.
+ - Fix constraints for source_gen.
+
 ## 0.0.5
 
  - Fix generation across multiple files, allow reuse of generated identifiers.

enum_class/pubspec.yaml

@@ -1,5 +1,5 @@
 name: enum_class
-version: 0.0.5
+version: 0.0.6
 description: >
   Dart classes as enums. This library is the runtime dependency.
 authors:

enum_class_generator/lib/enum_class_generator.dart

@@ -29,10 +29,20 @@ class EnumClassGenerator extends Generator {
     final classElement = element as ClassElement;
     final enumName = classElement.displayName;
 
-    // TODO(davidmorgan): do this in a way that works if the import is missing.
-    if (classElement.allSupertypes
-        .where((i) => i.displayName == 'EnumClass')
-        .isEmpty) return null;
+    if (classElement.supertype.displayName != 'EnumClass') {
+      // Maybe they're trying to use EnumClass but forgot to import the library.
+      if (classElement
+          .computeNode()
+          .toSource()
+          .contains('class ${classElement.displayName} extends EnumClass')) {
+        throw new InvalidGenerationSourceError(
+            'Please make changes to use EnumClass.',
+            todo:
+                "Import EnumClass: import 'package:enum_class/enum_class.dart';");
+      } else {
+        return null;
+      }
+    }
 
     final fields = _getApplicableFields(classElement);
     final errors = concat([

enum_class_generator/pubspec.yaml

@@ -1,5 +1,5 @@
 name: enum_class_generator
-version: 0.0.5
+version: 0.0.6
 description: >
   Dart classes as enums. This library is the dev dependency.
 authors:
@@ -12,8 +12,8 @@ environment:
 dependencies:
   analyzer: '>=0.26.1 <1.0.0'
   built_collection: '^1.0.0'
-  enum_class: '^0.0.5'
-  source_gen: '>=0.4.3 <1.0.0'
+  enum_class: '^0.0.6'
+  source_gen: '>=0.4.3 <0.5.0'
   quiver: '>=0.21.0 <0.22.0'
 
 dev_dependencies:

enum_class_generator/test/enum_class_generator_test.dart

@@ -105,8 +105,7 @@ part of test_enum;
 '''));
     });
 
-    // TODO(davidmorgan): it would be better to fail with an error message.
-    test('fails silently on missing enum_class import', () async {
+    test('fails with error on missing enum_class import', () async {
       expect(await generate(r'''
 library test_enum;
 
@@ -122,7 +121,17 @@ class TestEnum extends EnumClass {
   static BuiltSet<TestEnum> get values => _$values;
   static TestEnum valueOf(String name) => _$valueOf(name);
 }
-'''), isEmpty);
+'''), endsWith(r'''
+part of test_enum;
+
+// **************************************************************************
+// Generator: EnumClassGenerator
+// Target: class TestEnum
+// **************************************************************************
+
+// Error: Please make changes to use EnumClass.
+// TODO: Import EnumClass: import 'package:enum_class/enum_class.dart';
+'''));
     });
 
     test('fails with error on missing part statement', () async {

example/pubspec.yaml

@@ -10,7 +10,7 @@ environment:
   sdk: '>=1.8.0 <2.0.0'
 
 dependencies:
-  enum_class: '^0.0.4'
+  enum_class: '^0.0.6'
 
 dev_dependencies:
-  enum_class_generator: '^0.0.4'
+  enum_class_generator: '^0.0.6'