[go_router_builder] Include required and positional query parameters …

…in the location (flutter#4163) Fixes flutter#128483
engine-flutter-autoroll · Jun 9, 2023 · cdb9bc6 · cdb9bc6
1 parent afe2f05
commit cdb9bc6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/packages/go_router_builder/CHANGELOG.md b/packages/go_router_builder/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.1
+
+* Fixes a bug that the required/positional parameters are not added to query parameters correctly.
+
 ## 2.1.0
 
 * Supports required/positional parameters that are not in the path.

diff --git a/packages/go_router_builder/lib/src/route_config.dart b/packages/go_router_builder/lib/src/route_config.dart
@@ -441,15 +441,15 @@ GoRouteData.\$route(
 
   late final List<ParameterElement> _ctorParams =
       _ctor.parameters.where((ParameterElement element) {
-    if (element.isRequired && !element.isExtraField) {
+    if (_pathParams.contains(element.name)) {
       return true;
     }
     return false;
   }).toList();
 
   late final List<ParameterElement> _ctorQueryParams = _ctor.parameters
       .where((ParameterElement element) =>
-          element.isOptional && !element.isExtraField)
+          !_pathParams.contains(element.name) && !element.isExtraField)
       .toList();
 
   ConstructorElement get _ctor {

diff --git a/packages/go_router_builder/pubspec.yaml b/packages/go_router_builder/pubspec.yaml
@@ -2,7 +2,7 @@ name: go_router_builder
 description: >-
   A builder that supports generated strongly-typed route helpers for
   package:go_router
-version: 2.1.0
+version: 2.1.1
 repository: https://github.com/flutter/packages/tree/main/packages/go_router_builder
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router_builder%22
 

diff --git a/packages/go_router_builder/test/test_inputs/_go_router_builder_test_input.dart b/packages/go_router_builder/test/test_inputs/_go_router_builder_test_input.dart
@@ -68,6 +68,9 @@ extension $NullableRequiredParamNotInPathExtension
 
   String get location => GoRouteData.$location(
         'bob',
+        queryParams: {
+          if (id != null) 'id': id!.toString(),
+        },
       );
 
   void go(BuildContext context) => context.go(location);
@@ -108,6 +111,9 @@ extension $NonNullableRequiredParamNotInPathExtension
 
   String get location => GoRouteData.$location(
         'bob',
+        queryParams: {
+          'id': id.toString(),
+        },
       );
 
   void go(BuildContext context) => context.go(location);