Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[go_router_builder] Include required and positional query parameters in the location #4163

Merged
merged 5 commits into from
Jun 9, 2023
Merged

[go_router_builder] Include required and positional query parameters in the location #4163

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78cbd5a
bug: Include required query parameters in location
ValentinVignal Jun 8, 2023
b8b3ede
test: Update the tests
ValentinVignal Jun 8, 2023
fd4a2c4
doc: Increase version number
ValentinVignal Jun 8, 2023
099710b
Update packages/go_router_builder/CHANGELOG.md
ValentinVignal Jun 9, 2023
7c53956
Merge branch 'main' into go-router-builder/Add-required-query-paramet…
ValentinVignal Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/go_router_builder/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.1.1

* Includes the required/positional parameters in the route location.

## 2.1.0

* Supports required/positional parameters that are not in the path.
Expand Down
4 changes: 2 additions & 2 deletions packages/go_router_builder/lib/src/route_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packages/go_router_builder/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions packages/go_router_builder/test/test_inputs/_go_router_builder_test_input.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -108,6 +111,9 @@ extension $NonNullableRequiredParamNotInPathExtension

String get location => GoRouteData.$location(
'bob',
queryParams: {
'id': id.toString(),
},
);

void go(BuildContext context) => context.go(location);
Expand Down