Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.8.2

- Fixes an issue when enum params are not required

## 2.8.1

- Fixes an issue when navigate to router with invalid params
Expand Down
2 changes: 1 addition & 1 deletion packages/go_router_builder/example/lib/all_types.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/go_router_builder/example/lib/main.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/go_router_builder/lib/src/route_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -775,7 +775,7 @@ bool $boolConverterHelperName(String value) {

const String _enumConverterHelper = '''
extension<T extends Enum> on Map<T, String> {
T? $enumExtensionHelperName(String value) =>
T? $enumExtensionHelperName(String? value) =>
entries.where((element) => element.value == value).firstOrNull?.key;
}''';

Expand Down
8 changes: 5 additions & 3 deletions packages/go_router_builder/lib/src/type_helpers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ String _stateValueAccess(ParameterElement element, Set<String> pathParameters) {
}

late String access;
final String suffix =
!element.type.isNullableType && !element.hasDefaultValue ? '!' : '';
if (pathParameters.contains(element.name)) {
access =
'pathParameters[${escapeDartString(element.name)}]${element.isRequired ? '!' : ''}';
access = 'pathParameters[${escapeDartString(element.name)}]$suffix';
} else {
access = 'uri.queryParameters[${escapeDartString(element.name.kebab)}]';
access =
'uri.queryParameters[${escapeDartString(element.name.kebab)}]$suffix';
}

return access;
Expand Down
2 changes: 1 addition & 1 deletion packages/go_router_builder/pubspec.yaml
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.8.1
version: 2.8.2
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ const _$EnumTestEnumMap = {
};

extension<T extends Enum> on Map<T, String> {
T? _$fromName(String value) =>
T? _$fromName(String? value) =>
entries.where((element) => element.value == value).firstOrNull?.key;
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ const _$EnumOnlyUsedInIterableEnumMap = {
};

extension<T extends Enum> on Map<T, String> {
T? _$fromName(String value) =>
T? _$fromName(String? value) =>
entries.where((element) => element.value == value).firstOrNull?.key;
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extension $NonNullableRequiredParamNotInPathExtension
on NonNullableRequiredParamNotInPath {
static NonNullableRequiredParamNotInPath _fromState(GoRouterState state) =>
NonNullableRequiredParamNotInPath(
id: int.parse(state.uri.queryParameters['id'])!,
id: int.parse(state.uri.queryParameters['id']!)!,
);

String get location => GoRouteData.$location(
Expand Down