Fix generation across multiple files, allow reuse of generated identifiers.

Author: David Morgan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.5
+
+ - Fix generation across multiple files, allow reuse of generated identifiers.
+
 ## 0.0.4
 
  - Fail on dynamic fields.

enum_class/pubspec.yaml

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

enum_class_generator/lib/enum_class_generator.dart

@@ -18,6 +18,11 @@ class EnumClassGenerator extends Generator {
   Set<String> _usedGeneratedIdentifiers = new Set<String>();
 
   Future<String> generate(Element element) async {
+    // Generated identifiers only have to be unique per library, reset for
+    // each new library.
+    if (element is LibraryElement) {
+      _usedGeneratedIdentifiers = new Set<String>();
+    }
     if (element is! ClassElement) {
       return null;
     }

enum_class_generator/pubspec.yaml

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

enum_class_generator/test/enum_class_generator_test.dart

@@ -63,6 +63,13 @@ void main() {
       expect(await generate(correctInput), endsWith(correctOutput));
     });
 
+    test('produces two correct output for two correct inputs', () async {
+      expect(
+          await generateTwo(correctInput,
+              correctInput.replaceAll('test_enum', 'test_enum_two')),
+          endsWith(correctOutput.replaceAll('test_enum', 'test_enum_two')));
+    });
+
     test('allows part statement with double quotes', () async {
       expect(
           await generate(correctInput.replaceAll(
@@ -570,6 +577,30 @@ Future<String> generate(String source) async {
   return outputFile.existsSync() ? outputFile.readAsStringSync() : '';
 }
 
+Future<String> generateTwo(String source, String source2) async {
+  final tempDir =
+      Directory.systemTemp.createTempSync('enum_class_generator.dart.');
+  final packageDir = new Directory(tempDir.path + '/packages')..createSync();
+  final enumClassDir = new Directory(packageDir.path + '/enum_class')
+    ..createSync();
+  final enumClassFile = new File(enumClassDir.path + '/enum_class.dart')
+    ..createSync();
+  enumClassFile.writeAsStringSync(enumClassSource);
+
+  final libDir = new Directory(tempDir.path + '/lib')..createSync();
+  final sourceFile = new File(libDir.path + '/test_enum.dart');
+  sourceFile.writeAsStringSync(source);
+  final sourceFile2 = new File(libDir.path + '/test_enum_two.dart');
+  sourceFile2.writeAsStringSync(source2);
+
+  await build([], [new EnumClassGenerator()],
+      projectPath: tempDir.path, librarySearchPaths: <String>['lib']);
+  final outputFile = new File(libDir.path + '/test_enum.g.dart');
+  final outputFile2 = new File(libDir.path + '/test_enum_two.g.dart');
+  return (outputFile.existsSync() ? outputFile.readAsStringSync() : '') +
+      (outputFile2.existsSync() ? outputFile2.readAsStringSync() : '');
+}
+
 const String enumClassSource = r'''
 library enum_class;