@@ -21,8 +21,8 @@ abstract class RouteData {
21
21
22
22
/// A base class for [GoRouteData] and [RelativeGoRouteData] that provides
23
23
/// common functionality for type-safe routing.
24
- abstract class _GoRouteData extends RouteData {
25
- const _GoRouteData ();
24
+ abstract class _GoRouteDataBase extends RouteData {
25
+ const _GoRouteDataBase ();
26
26
27
27
/// Creates the [Widget] for `this` route.
28
28
///
@@ -65,13 +65,13 @@ abstract class _GoRouteData extends RouteData {
65
65
/// The error thrown when a user-facing method is not implemented by the
66
66
/// generated code.
67
67
static UnimplementedError get shouldBeGeneratedError => UnimplementedError (
68
- 'Should be generated using [Type-safe routing](https://pub.dev/documentation/go_router/latest/topics/Type-safe%20routes-topic.html).' ,
69
- );
68
+ 'Should be generated using [Type-safe routing](https://pub.dev/documentation/go_router/latest/topics/Type-safe%20routes-topic.html).' ,
69
+ );
70
70
71
- /// Used to cache [_GoRouteData ] that corresponds to a given [GoRouterState]
71
+ /// Used to cache [_GoRouteDataBase ] that corresponds to a given [GoRouterState]
72
72
/// to minimize the number of times it has to be deserialized.
73
- static final Expando <_GoRouteData > stateObjectExpando =
74
- Expando <_GoRouteData >('GoRouteState to _GoRouteData expando' );
73
+ static final Expando <_GoRouteDataBase > stateObjectExpando =
74
+ Expando <_GoRouteDataBase >('GoRouteState to _GoRouteDataBase expando' );
75
75
}
76
76
77
77
/// Helper to build a location string from a path and query parameters.
@@ -100,9 +100,9 @@ class _GoRouteParameters {
100
100
}
101
101
102
102
/// Helper to create [GoRoute] parameters from a factory function and an Expando.
103
- _GoRouteParameters _createGoRouteParameters <T extends _GoRouteData >({
103
+ _GoRouteParameters _createGoRouteParameters <T extends _GoRouteDataBase >({
104
104
required T Function (GoRouterState ) factory ,
105
- required Expando <_GoRouteData > expando,
105
+ required Expando <_GoRouteDataBase > expando,
106
106
}) {
107
107
T factoryImpl (GoRouterState state) {
108
108
final Object ? extra = state.extra;
@@ -117,14 +117,18 @@ _GoRouteParameters _createGoRouteParameters<T extends _GoRouteData>({
117
117
}
118
118
119
119
return _GoRouteParameters (
120
- builder: (BuildContext context, GoRouterState state) =>
121
- factoryImpl (state).build (context, state),
122
- pageBuilder: (BuildContext context, GoRouterState state) =>
123
- factoryImpl (state).buildPage (context, state),
124
- redirect: (BuildContext context, GoRouterState state) =>
125
- factoryImpl (state).redirect (context, state),
126
- onExit: (BuildContext context, GoRouterState state) =>
127
- factoryImpl (state).onExit (context, state),
120
+ builder:
121
+ (BuildContext context, GoRouterState state) =>
122
+ factoryImpl (state).build (context, state),
123
+ pageBuilder:
124
+ (BuildContext context, GoRouterState state) =>
125
+ factoryImpl (state).buildPage (context, state),
126
+ redirect:
127
+ (BuildContext context, GoRouterState state) =>
128
+ factoryImpl (state).redirect (context, state),
129
+ onExit:
130
+ (BuildContext context, GoRouterState state) =>
131
+ factoryImpl (state).onExit (context, state),
128
132
);
129
133
}
130
134
@@ -134,7 +138,7 @@ _GoRouteParameters _createGoRouteParameters<T extends _GoRouteData>({
134
138
/// Subclasses must override one of [build] , [buildPage] , or
135
139
/// [redirect] .
136
140
/// {@category Type-safe routes}
137
- abstract class GoRouteData extends _GoRouteData {
141
+ abstract class GoRouteData extends _GoRouteDataBase {
138
142
/// Allows subclasses to have `const` constructors.
139
143
///
140
144
/// [GoRouteData] is abstract and cannot be instantiated directly.
@@ -159,7 +163,7 @@ abstract class GoRouteData extends _GoRouteData {
159
163
}) {
160
164
final _GoRouteParameters params = _createGoRouteParameters <T >(
161
165
factory : factory ,
162
- expando: _GoRouteData .stateObjectExpando,
166
+ expando: _GoRouteDataBase .stateObjectExpando,
163
167
);
164
168
165
169
return GoRoute (
@@ -176,18 +180,19 @@ abstract class GoRouteData extends _GoRouteData {
176
180
}
177
181
178
182
/// The location of this route, e.g. /family/f2/person/p1
179
- String get location => throw _GoRouteData .shouldBeGeneratedError;
183
+ String get location => throw _GoRouteDataBase .shouldBeGeneratedError;
180
184
181
185
/// Navigate to the route.
182
- void go (BuildContext context) => throw _GoRouteData .shouldBeGeneratedError;
186
+ void go (BuildContext context) =>
187
+ throw _GoRouteDataBase .shouldBeGeneratedError;
183
188
184
189
/// Push the route onto the page stack.
185
190
Future <T ?> push <T >(BuildContext context) =>
186
- throw _GoRouteData .shouldBeGeneratedError;
191
+ throw _GoRouteDataBase .shouldBeGeneratedError;
187
192
188
193
/// Replaces the top-most page of the page stack with the route.
189
194
void pushReplacement (BuildContext context) =>
190
- throw _GoRouteData .shouldBeGeneratedError;
195
+ throw _GoRouteDataBase .shouldBeGeneratedError;
191
196
192
197
/// Replaces the top-most page of the page stack with the route but treats
193
198
/// it as the same page.
@@ -196,7 +201,7 @@ abstract class GoRouteData extends _GoRouteData {
196
201
/// page animation.
197
202
///
198
203
void replace (BuildContext context) =>
199
- throw _GoRouteData .shouldBeGeneratedError;
204
+ throw _GoRouteDataBase .shouldBeGeneratedError;
200
205
}
201
206
202
207
/// A class to represent a relative [GoRoute] in
@@ -205,7 +210,7 @@ abstract class GoRouteData extends _GoRouteData {
205
210
/// Subclasses must override one of [build] , [buildPage] , or
206
211
/// [redirect] .
207
212
/// {@category Type-safe routes}
208
- abstract class RelativeGoRouteData extends _GoRouteData {
213
+ abstract class RelativeGoRouteData extends _GoRouteDataBase {
209
214
/// Allows subclasses to have `const` constructors.
210
215
///
211
216
/// [RelativeGoRouteData] is abstract and cannot be instantiated directly.
@@ -229,7 +234,7 @@ abstract class RelativeGoRouteData extends _GoRouteData {
229
234
}) {
230
235
final _GoRouteParameters params = _createGoRouteParameters <T >(
231
236
factory : factory ,
232
- expando: _GoRouteData .stateObjectExpando,
237
+ expando: _GoRouteDataBase .stateObjectExpando,
233
238
);
234
239
235
240
return GoRoute (
@@ -245,22 +250,22 @@ abstract class RelativeGoRouteData extends _GoRouteData {
245
250
}
246
251
247
252
/// The sub-location of this route, e.g. person/p1
248
- String get subLocation => throw _GoRouteData .shouldBeGeneratedError;
253
+ String get subLocation => throw _GoRouteDataBase .shouldBeGeneratedError;
249
254
250
255
/// The relative location of this route, e.g. ./person/p1
251
- String get relativeLocation => throw _GoRouteData .shouldBeGeneratedError;
256
+ String get relativeLocation => throw _GoRouteDataBase .shouldBeGeneratedError;
252
257
253
258
/// Navigate to the route.
254
259
void goRelative (BuildContext context) =>
255
- throw _GoRouteData .shouldBeGeneratedError;
260
+ throw _GoRouteDataBase .shouldBeGeneratedError;
256
261
257
262
/// Push the route onto the page stack.
258
263
Future <T ?> pushRelative <T >(BuildContext context) =>
259
- throw _GoRouteData .shouldBeGeneratedError;
264
+ throw _GoRouteDataBase .shouldBeGeneratedError;
260
265
261
266
/// Replaces the top-most page of the page stack with the route.
262
267
void pushReplacementRelative (BuildContext context) =>
263
- throw _GoRouteData .shouldBeGeneratedError;
268
+ throw _GoRouteDataBase .shouldBeGeneratedError;
264
269
265
270
/// Replaces the top-most page of the page stack with the route but treats
266
271
/// it as the same page.
@@ -269,7 +274,7 @@ abstract class RelativeGoRouteData extends _GoRouteData {
269
274
/// page animation.
270
275
///
271
276
void replaceRelative (BuildContext context) =>
272
- throw _GoRouteData .shouldBeGeneratedError;
277
+ throw _GoRouteDataBase .shouldBeGeneratedError;
273
278
}
274
279
275
280
/// A class to represent a [ShellRoute] in
0 commit comments