Skip to content

Generate proper route names when using custom names #29

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Generate proper route names when using custom names #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8b1f98
generating proper parameter names for constructor
kkalisz Jul 6, 2024
853908c
Merge branch 'main' into bugfix/propper_constructor_parameters
kkalisz Jul 8, 2024
69b0c6c
Merge branch 'main' into bugfix/propper_constructor_parameters
kkalisz Jul 10, 2024
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
14 changes: 14 additions & 0 deletions lib/src/generators/router_2/code_builder/root_router_builder.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,20 @@ Expression getUrlParamAssignment(ParamConfig p) {
}
}

Expression getConstructorParamAssignment(ParamConfig p) {
if (p.isPathParam) {
return refer('data').property('pathParams').property(p.getterMethodName).call([
literalString(p.paramName),
if (p.defaultValueCode != null && p.type.isNullable) refer(p.defaultValueCode!),
]);
} else {
return refer('data').property('pathParams').property(p.getterMethodName).call([
literalString(p.paramName),
if (p.defaultValueCode != null && p.type.isNullable) refer(p.defaultValueCode!),
]);
}
}

Iterable<Object> buildRoutes(List<RouteConfig> routes, {Reference? parent}) =>
routes.map(
(r) {
Expand Down
9 changes: 5 additions & 4 deletions lib/src/generators/router_common/models/route_config.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:code_builder/code_builder.dart';
import 'package:dart_style/dart_style.dart';

import '../../../../utils.dart';
import '../../router_2/code_builder/root_router_builder.dart';
import 'importable_type.dart';
import 'route_parameter_config.dart';
import 'router_config.dart';
Expand Down Expand Up @@ -206,12 +208,11 @@ class RouteConfig {
Iterable<String> _extractViewConstructerParametersNames() {
return parameters.map<String>((param) {
String getterName;
final emitter = DartEmitter();
if (param.isPathParam) {
getterName =
"data.pathParams['${param.paramName}'].${param.getterName}(${param.defaultValueCode != null ? '${param.defaultValueCode}' : ''})";
getterName = getConstructorParamAssignment(param).code.accept(emitter).toString();
} else if (param.isQueryParam) {
getterName =
"data.queryParams['${param.paramName}'].${param.getterName}(${param.defaultValueCode != null ? '${param.defaultValueCode}' : ''})";
getterName = getConstructorParamAssignment(param).code.accept(emitter).toString();
} else {
getterName = "args.${param.name}";
}
Expand Down