@@ -24,10 +24,10 @@ part '_core/reflector.dart';
2424
2525typedef RoutesResolver = List <RouteDefinition > Function ();
2626
27- /// This should really be a mixin but due to a bug in reflectable.dart#324
28- /// TODO:(codekeyz) make this a mixin when reflectable.dart#324 is fixed
29- abstract class AppInstance {
30- Application get app => Application .instance ;
27+ mixin class AppInstance {
28+ Application get app => Application ._instance;
29+
30+ AppConfig get config => app.config ;
3131}
3232
3333/// Use this to override the application exceptiosn handler
@@ -39,7 +39,7 @@ typedef ApplicationExceptionsHandler = FutureOr<Response> Function(
3939abstract interface class Application {
4040 Application (AppConfig config);
4141
42- static late final Application instance ;
42+ static late final Application _instance ;
4343
4444 String get name;
4545
@@ -101,7 +101,7 @@ abstract class ApplicationFactory {
101101 }
102102
103103 Future <void > startServer () async {
104- final app = Application .instance as _PharaohNextImpl ;
104+ final app = Application ._instance as _PharaohNextImpl ;
105105
106106 await app
107107 ._createPharaohInstance (onException: onApplicationException)
@@ -110,7 +110,7 @@ abstract class ApplicationFactory {
110110
111111 Future <void > _bootstrapComponents (AppConfig config) async {
112112 final spanner = Spanner ()..addMiddleware ('/' , bodyParser);
113- Application .instance = _PharaohNextImpl (config, spanner);
113+ Application ._instance = _PharaohNextImpl (config, spanner);
114114
115115 final providerInstances = providers.map (createNewInstance< ServiceProvider > );
116116
@@ -185,7 +185,7 @@ abstract class ApplicationFactory {
185185
186186 @visibleForTesting
187187 Future <spookie.Spookie > get tester {
188- final app = (Application .instance as _PharaohNextImpl );
188+ final app = (Application ._instance as _PharaohNextImpl );
189189 return spookie.request (
190190 app._createPharaohInstance (onException: onApplicationException));
191191 }
0 commit comments