[go_router_builder] Cleans up builder code.

packages/go_router_builder/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2.1
+
+* Cleans up go_router_builder code.
+
 ## 2.2.0
 
 * Adds replace methods to the generated routes.

packages/go_router_builder/README.md

@@ -379,3 +379,9 @@ class MyGoRouteData extends GoRouteData {
 ```
 
 An example is available [here](https://github.com/flutter/packages/blob/main/packages/go_router_builder/example/lib/shell_route_with_keys_example.dart).
+
+## Run tests
+
+To run unit tests, run command `dart tool/run_tests.dart` from `packages/go_router_builder/`.
+
+To run tests in examples, run `flutter test` from `packages/go_router_builder/example`.

packages/go_router_builder/lib/src/go_router_generator.dart

@@ -19,12 +19,11 @@ const Map<String, String> _annotations = <String, String>{
 };
 
 /// A [Generator] for classes annotated with a typed go route annotation.
-class GoRouterGenerator extends GeneratorForAnnotation<void> {
+class GoRouterGenerator extends Generator {
   /// Creates a new instance of [GoRouterGenerator].
   const GoRouterGenerator();
 
-  @override
-  TypeChecker get typeChecker => TypeChecker.any(
+  TypeChecker get _typeChecker => TypeChecker.any(
         _annotations.keys.map((String annotation) =>
             TypeChecker.fromUrl('$_routeDataUrl#$annotation')),
       );
@@ -34,11 +33,7 @@ class GoRouterGenerator extends GeneratorForAnnotation<void> {
     final Set<String> values = <String>{};
     final Set<String> getters = <String>{};
 
-    for (final String annotation in _annotations.keys) {
-      final TypeChecker typeChecker =
-          TypeChecker.fromUrl('$_routeDataUrl#$annotation');
-      _generateForAnnotation(library, typeChecker, buildStep, values, getters);
-    }
+    generateForAnnotation(library, values, getters);
 
     if (values.isEmpty) {
       return '';
@@ -54,19 +49,20 @@ ${getters.map((String e) => "$e,").join('\n')}
     ].join('\n\n');
   }
 
-  void _generateForAnnotation(
+  /// Generates code for the `library` based on annotation.
+  ///
+  /// This public method is for testing purposes and should not be called
+  /// directly.
+  void generateForAnnotation(
     LibraryReader library,
-    TypeChecker typeChecker,
-    BuildStep buildStep,
     Set<String> values,
     Set<String> getters,
   ) {
     for (final AnnotatedElement annotatedElement
-        in library.annotatedWith(typeChecker)) {
-      final InfoIterable generatedValue = generateForAnnotatedElement(
+        in library.annotatedWith(_typeChecker)) {
+      final InfoIterable generatedValue = _generateForAnnotatedElement(
         annotatedElement.element,
         annotatedElement.annotation,
-        buildStep,
       );
       getters.add(generatedValue.routeGetterName);
       for (final String value in generatedValue) {
@@ -76,11 +72,9 @@ ${getters.map((String e) => "$e,").join('\n')}
     }
   }
 
-  @override
-  InfoIterable generateForAnnotatedElement(
+  InfoIterable _generateForAnnotatedElement(
     Element element,
     ConstantReader annotation,
-    BuildStep buildStep,
   ) {
     final String typedAnnotation =
         annotation.objectValue.type!.getDisplayString(withNullability: false);
@@ -105,6 +99,7 @@ ${getters.map((String e) => "$e,").join('\n')}
       );
     }
 
-    return RouteConfig.fromAnnotation(annotation, element).generateMembers();
+    return RouteBaseConfig.fromAnnotation(annotation, element)
+        .generateMembers();
   }
 }