From 17ff0f8ba18a3c8c309ac3051b47892c0879c418 Mon Sep 17 00:00:00 2001 From: AN12345 Date: Tue, 13 Dec 2022 13:52:49 -0500 Subject: [PATCH] clean(packages): apply dart fix (close #106) --- .../remote/album_api_data_source_impl.dart | 3 +- .../remote/photo_api_data_source_impl.dart | 3 +- .../repositories/photo_repository_impl.dart | 6 +- .../photos/add_photo_to_favorites.dart | 2 +- .../check_if_photo_is_in_favorites.dart | 2 +- .../usecases/photos/display_favorites.dart | 2 +- .../domain/usecases/photos/display_photo.dart | 2 +- .../domain/usecases/photos/open_album.dart | 2 +- .../photos/params/query_parameters.dart | 4 +- .../photos/remove_photo_from_favorites.dart | 2 +- .../usecases/photos/retrieve_all_albums.dart | 2 +- .../albums/blocs/album/album_bloc.dart | 2 +- .../photo_details/photo_details_state.dart | 6 +- .../favorite_checker_cubit.dart | 2 +- .../favorite_checker_state.dart | 6 +- .../photos/blocs/photo/photo_bloc.dart | 2 +- .../photos/blocs/photo/photo_event.dart | 2 +- .../lib/src/core/exceptions/exceptions.dart | 2 +- .../lib/src/core/exceptions/exceptions.dart | 8 +-- ...authentication_cache_data_source_impl.dart | 4 +- ...hentication_firebase_data_source_impl.dart | 4 +- .../authentication_mock_data_source_impl.dart | 10 +-- .../authentication_repository_impl.dart | 26 +++---- .../cubit/authentication_cubit.dart | 2 +- .../cubit/authentication_state.dart | 4 +- .../cubit/email_verification_cubit.dart | 2 +- .../cubit/password_reset_cubit.dart | 6 +- .../cubit/password_reset_state.dart | 2 +- .../features/sign_in/cubit/sign_in_cubit.dart | 6 +- .../features/sign_in/cubit/sign_in_state.dart | 8 +-- .../features/sign_up/cubit/sign_up_cubit.dart | 6 +- .../features/sign_up/cubit/sign_up_state.dart | 8 +-- .../crud_in_memory_data_source_impl.dart | 6 +- .../crud_firestore_data_source_impl.dart | 8 +-- .../repositories/crud_repository_impl.dart | 2 +- .../lib/src/domain/entities/query.dart | 10 +-- .../lib/src/domain/usecases/delete.dart | 2 +- .../lib/src/domain/usecases/delete_all.dart | 2 +- .../lib/src/domain/usecases/get.dart | 2 +- .../lib/src/domain/usecases/get_all.dart | 2 +- .../lib/src/domain/usecases/query.dart | 2 +- .../lib/src/domain/usecases/update.dart | 2 +- .../lib/src/domain/usecases/update_all.dart | 2 +- .../src/features/crud/cubit/crud_cubit.dart | 4 +- .../src/features/crud/cubit/crud_state.dart | 6 +- .../lib/src/data/form/wyatt_form_impl.dart | 18 ++--- .../features/form_data/form_data_state.dart | 12 ++-- .../form_data_impl/form_data_cubit_impl.dart | 4 +- .../example/http_client_example.dart | 4 +- .../example/http_client_fastapi_example.dart | 70 +++++-------------- .../lib/src/middleware_client.dart | 8 +-- .../middlewares/basic_auth_middleware.dart | 6 +- .../middlewares/digest_auth_middleware.dart | 12 ++-- .../refresh_token_auth_middleware.dart | 22 +++--- .../middlewares/unsafe_auth_middleware.dart | 10 +-- .../middlewares/uri_prefix_middleware.dart | 4 +- .../lib/src/models/middleware_context.dart | 8 +-- .../lib/src/models/middleware_request.dart | 21 +++--- .../lib/src/models/middleware_response.dart | 4 +- .../lib/src/models/unfreezed_request.dart | 18 ++--- .../wyatt_http_client/lib/src/pipeline.dart | 6 +- .../lib/src/utils/convert.dart | 2 +- .../lib/src/utils/crypto.dart | 4 +- .../lib/src/utils/delay.dart | 6 +- .../lib/src/utils/digest_auth.dart | 20 +++--- .../lib/src/utils/http_status.dart | 24 ++----- .../wyatt_type_utils/example/lib/error.dart | 2 +- .../lib/src/either/either_base.dart | 2 +- .../lib/src/either/option.dart | 2 +- .../lib/src/either/result.dart | 4 +- .../wyatt_type_utils/lib/src/pair/pair.dart | 4 +- .../presentation/layouts/app_bar_layout.dart | 4 +- .../layouts/bottom_navigation_bar_layout.dart | 4 +- .../presentation/layouts/frame_layout.dart | 6 +- 74 files changed, 222 insertions(+), 287 deletions(-) diff --git a/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_api_data_source_impl.dart b/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_api_data_source_impl.dart index 435ee052..3c4cdcdf 100644 --- a/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_api_data_source_impl.dart +++ b/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_api_data_source_impl.dart @@ -24,9 +24,8 @@ import 'package:wyatt_http_client/wyatt_http_client.dart'; import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class AlbumApiDataSourceImpl extends AlbumRemoteDataSource { - final MiddlewareClient _client; - AlbumApiDataSourceImpl(this._client); + final MiddlewareClient _client; @override Future getAlbum(int id) async { diff --git a/packages/wyatt_architecture/example/lib/data/data_sources/remote/photo_api_data_source_impl.dart b/packages/wyatt_architecture/example/lib/data/data_sources/remote/photo_api_data_source_impl.dart index 425ab652..3f559fe8 100644 --- a/packages/wyatt_architecture/example/lib/data/data_sources/remote/photo_api_data_source_impl.dart +++ b/packages/wyatt_architecture/example/lib/data/data_sources/remote/photo_api_data_source_impl.dart @@ -24,9 +24,8 @@ import 'package:wyatt_http_client/wyatt_http_client.dart'; import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class PhotoApiDataSourceImpl extends PhotoRemoteDataSource { - final MiddlewareClient _client; - PhotoApiDataSourceImpl(this._client); + final MiddlewareClient _client; @override Future getPhoto(int id) async { diff --git a/packages/wyatt_architecture/example/lib/data/repositories/photo_repository_impl.dart b/packages/wyatt_architecture/example/lib/data/repositories/photo_repository_impl.dart index 7cec10fa..d30d74ba 100644 --- a/packages/wyatt_architecture/example/lib/data/repositories/photo_repository_impl.dart +++ b/packages/wyatt_architecture/example/lib/data/repositories/photo_repository_impl.dart @@ -24,15 +24,15 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class PhotoRepositoryImpl extends PhotoRepository { - final PhotoRemoteDataSource _photoRemoteDataSource; - final AlbumRemoteDataSource _albumRemoteDataSource; - final FavoriteLocalDataSource _favoriteLocalDataSource; PhotoRepositoryImpl( this._photoRemoteDataSource, this._albumRemoteDataSource, this._favoriteLocalDataSource, ); + final PhotoRemoteDataSource _photoRemoteDataSource; + final AlbumRemoteDataSource _albumRemoteDataSource; + final FavoriteLocalDataSource _favoriteLocalDataSource; @override FutureOrResult addPhotoToFavorites(Photo photo) => Result.tryCatchAsync( diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/add_photo_to_favorites.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/add_photo_to_favorites.dart index da2bbf17..f84969a3 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/add_photo_to_favorites.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/add_photo_to_favorites.dart @@ -21,9 +21,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart'; import 'package:wyatt_architecture/wyatt_architecture.dart'; class AddPhotoToFavorites extends AsyncUseCase> { - final PhotoRepository _photoRepository; AddPhotoToFavorites(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult> execute(Photo? params) async { diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/check_if_photo_is_in_favorites.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/check_if_photo_is_in_favorites.dart index 9417f9fd..d208f554 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/check_if_photo_is_in_favorites.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/check_if_photo_is_in_favorites.dart @@ -20,9 +20,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart'; import 'package:wyatt_architecture/wyatt_architecture.dart'; class CheckIfPhotoIsInFavorites extends AsyncUseCase { - final PhotoRepository _photoRepository; CheckIfPhotoIsInFavorites(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult execute(int? params) async => diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_favorites.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_favorites.dart index f8c387cb..4d7bb3d9 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_favorites.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_favorites.dart @@ -19,9 +19,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart'; import 'package:wyatt_architecture/wyatt_architecture.dart'; class DisplayFavorites extends AsyncUseCase> { - final PhotoRepository _photoRepository; DisplayFavorites(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult> execute(void params) { diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_photo.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_photo.dart index 6a9e84eb..82b3ecce 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_photo.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/display_photo.dart @@ -21,9 +21,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart'; import 'package:wyatt_architecture/wyatt_architecture.dart'; class DisplayPhoto extends AsyncUseCase { - final PhotoRepository _photoRepository; DisplayPhoto(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult execute(int? params) { diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/open_album.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/open_album.dart index beab95f8..ca59d1b5 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/open_album.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/open_album.dart @@ -22,9 +22,9 @@ import 'package:architecture_example/domain/usecases/photos/params/query_paramet import 'package:wyatt_architecture/wyatt_architecture.dart'; class OpenAlbum extends AsyncUseCase> { - final PhotoRepository _photoRepository; OpenAlbum(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult> execute(QueryParameters? params) { diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/params/query_parameters.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/params/query_parameters.dart index e6fb7f30..525dd438 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/params/query_parameters.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/params/query_parameters.dart @@ -15,9 +15,9 @@ // along with this program. If not, see . class QueryParameters { + + QueryParameters(this.start, this.limit, {this.albumId = -1}); final int albumId; final int? start; final int? limit; - - QueryParameters(this.start, this.limit, {this.albumId = -1}); } diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/remove_photo_from_favorites.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/remove_photo_from_favorites.dart index d2e5bbb1..9e361137 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/remove_photo_from_favorites.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/remove_photo_from_favorites.dart @@ -21,9 +21,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart'; import 'package:wyatt_architecture/wyatt_architecture.dart'; class RemovePhotoFromFavorites extends AsyncUseCase> { - final PhotoRepository _photoRepository; RemovePhotoFromFavorites(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult> execute(int? params) async { diff --git a/packages/wyatt_architecture/example/lib/domain/usecases/photos/retrieve_all_albums.dart b/packages/wyatt_architecture/example/lib/domain/usecases/photos/retrieve_all_albums.dart index 548cdd53..286de15b 100644 --- a/packages/wyatt_architecture/example/lib/domain/usecases/photos/retrieve_all_albums.dart +++ b/packages/wyatt_architecture/example/lib/domain/usecases/photos/retrieve_all_albums.dart @@ -22,9 +22,9 @@ import 'package:architecture_example/domain/usecases/photos/params/query_paramet import 'package:wyatt_architecture/wyatt_architecture.dart'; class RetrieveAllAlbums extends AsyncUseCase> { - final PhotoRepository _photoRepository; RetrieveAllAlbums(this._photoRepository); + final PhotoRepository _photoRepository; @override FutureOrResult> execute(QueryParameters? params) { diff --git a/packages/wyatt_architecture/example/lib/presentation/features/albums/blocs/album/album_bloc.dart b/packages/wyatt_architecture/example/lib/presentation/features/albums/blocs/album/album_bloc.dart index 9cb62860..ae79c30d 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/albums/blocs/album/album_bloc.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/albums/blocs/album/album_bloc.dart @@ -33,7 +33,6 @@ EventTransformer throttleDroppable(Duration duration) => (events, mapper) => droppable().call(events.throttle(duration), mapper); class AlbumBloc extends Bloc { - final RetrieveAllAlbums _retrieveAllAlbums; AlbumBloc(this._retrieveAllAlbums) : super(const AlbumState()) { on( @@ -41,6 +40,7 @@ class AlbumBloc extends Bloc { transformer: throttleDroppable(throttleDuration), ); } + final RetrieveAllAlbums _retrieveAllAlbums; Future _onAlbumFetched( AlbumFetched event, diff --git a/packages/wyatt_architecture/example/lib/presentation/features/photo_details/blocs/photo_details/photo_details_state.dart b/packages/wyatt_architecture/example/lib/presentation/features/photo_details/blocs/photo_details/photo_details_state.dart index 251c54d4..c8da9232 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/photo_details/blocs/photo_details/photo_details_state.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/photo_details/blocs/photo_details/photo_details_state.dart @@ -26,19 +26,19 @@ abstract class PhotoDetailsState extends Equatable { class PhotoDetailsInitial extends PhotoDetailsState {} class PhotoDetailsSuccess extends PhotoDetailsState { - final Photo photo; - final bool isFavorite; const PhotoDetailsSuccess(this.photo, {required this.isFavorite}); + final Photo photo; + final bool isFavorite; @override List get props => [photo, isFavorite]; } class PhotoDetailsFailure extends PhotoDetailsState { - final String error; const PhotoDetailsFailure(this.error); + final String error; @override List get props => [error]; diff --git a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_cubit.dart b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_cubit.dart index 75b34d4a..1a15f123 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_cubit.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_cubit.dart @@ -23,10 +23,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; part 'favorite_checker_state.dart'; class FavoriteCheckerCubit extends Cubit { - final CheckIfPhotoIsInFavorites _checkIfPhotoIsInFavorites; FavoriteCheckerCubit(this._checkIfPhotoIsInFavorites) : super(FavoriteCheckerInitial()); + final CheckIfPhotoIsInFavorites _checkIfPhotoIsInFavorites; FutureOr checkIfPhotoIsInFavorites(int photoId) async { final response = await _checkIfPhotoIsInFavorites.call(photoId); diff --git a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_state.dart b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_state.dart index 30f545c6..ca762080 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_state.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_state.dart @@ -10,19 +10,19 @@ abstract class FavoriteCheckerState extends Equatable { class FavoriteCheckerInitial extends FavoriteCheckerState {} class FavoriteCheckerSuccess extends FavoriteCheckerState { - final int photoId; - final bool isFavorite; const FavoriteCheckerSuccess(this.photoId, {required this.isFavorite}); + final int photoId; + final bool isFavorite; @override List get props => [photoId, isFavorite]; } class FavoriteCheckerFailure extends FavoriteCheckerState { - final String error; const FavoriteCheckerFailure(this.error); + final String error; @override List get props => [error]; diff --git a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_bloc.dart b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_bloc.dart index 9c76b8d8..c82c84c5 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_bloc.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_bloc.dart @@ -33,7 +33,6 @@ EventTransformer throttleDroppable(Duration duration) => (events, mapper) => droppable().call(events.throttle(duration), mapper); class PhotoBloc extends Bloc { - final OpenAlbum _openAlbum; PhotoBloc(this._openAlbum) : super(const PhotoState()) { on( @@ -41,6 +40,7 @@ class PhotoBloc extends Bloc { transformer: throttleDroppable(throttleDuration), ); } + final OpenAlbum _openAlbum; Future _onPhotoFetched( PhotoFetched event, diff --git a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_event.dart b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_event.dart index ea167d0d..c9a6bfab 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_event.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_event.dart @@ -24,7 +24,7 @@ abstract class PhotoEvent extends Equatable { } class PhotoFetched extends PhotoEvent { - final int albumId; const PhotoFetched(this.albumId); + final int albumId; } diff --git a/packages/wyatt_architecture/lib/src/core/exceptions/exceptions.dart b/packages/wyatt_architecture/lib/src/core/exceptions/exceptions.dart index 96a3bf8c..5f568cd5 100644 --- a/packages/wyatt_architecture/lib/src/core/exceptions/exceptions.dart +++ b/packages/wyatt_architecture/lib/src/core/exceptions/exceptions.dart @@ -17,9 +17,9 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; abstract class AppException implements Exception { - final String? message; AppException([this.message]); + final String? message; @override String toString() { diff --git a/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart index cfcfba68..ba71af54 100644 --- a/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart @@ -20,15 +20,15 @@ part 'exceptions_firebase.dart'; abstract class AuthenticationFailureInterface extends AppException implements Exception { + + AuthenticationFailureInterface(this.code, this.msg); + AuthenticationFailureInterface.fromCode(this.code) + : msg = 'An unknown error occurred.'; String code; String msg; @override String get message => msg; - - AuthenticationFailureInterface(this.code, this.msg); - AuthenticationFailureInterface.fromCode(this.code) - : msg = 'An unknown error occurred.'; } /// {@template apply_action_code_failure} diff --git a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_cache_data_source_impl.dart b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_cache_data_source_impl.dart index 57b1191a..b224575a 100644 --- a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_cache_data_source_impl.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_cache_data_source_impl.dart @@ -20,10 +20,10 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class AuthenticationCacheDataSourceImpl extends AuthenticationCacheDataSource { - Account? _account; - T? _data; AuthenticationCacheDataSourceImpl(); + Account? _account; + T? _data; @override Future storeAccount(Account? account) async { diff --git a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_firebase_data_source_impl.dart b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_firebase_data_source_impl.dart index 131e160a..0118776b 100644 --- a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_firebase_data_source_impl.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_firebase_data_source_impl.dart @@ -20,11 +20,11 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class AuthenticationFirebaseDataSourceImpl extends AuthenticationRemoteDataSource { - final FirebaseAuth _firebaseAuth; - UserCredential? _latestCreds; AuthenticationFirebaseDataSourceImpl({FirebaseAuth? firebaseAuth}) : _firebaseAuth = firebaseAuth ?? FirebaseAuth.instance; + final FirebaseAuth _firebaseAuth; + UserCredential? _latestCreds; Account _mapper(User user) => AccountModel( uid: user.uid, diff --git a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_mock_data_source_impl.dart b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_mock_data_source_impl.dart index 67ef28cd..a73b1913 100644 --- a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_mock_data_source_impl.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_mock_data_source_impl.dart @@ -21,6 +21,11 @@ import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart'; import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class AuthenticationMockDataSourceImpl extends AuthenticationRemoteDataSource { + + AuthenticationMockDataSourceImpl({ + this.idToken = 'fake-id-token', + this.registeredAccounts, + }); Pair? _connectedMock; Pair? _registeredMock; DateTime _lastSignInTime = DateTime.now(); @@ -30,11 +35,6 @@ class AuthenticationMockDataSourceImpl extends AuthenticationRemoteDataSource { final List>? registeredAccounts; final String idToken; - AuthenticationMockDataSourceImpl({ - this.idToken = 'fake-id-token', - this.registeredAccounts, - }); - Future _randomDelay() async { await Future.delayed( Duration(milliseconds: Random().nextInt(400) + 200), diff --git a/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart b/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart index c0f2c8e1..425d16a1 100644 --- a/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart @@ -41,19 +41,7 @@ typedef OnAuthChange = FutureOrResult Function( ); class AuthenticationRepositoryImpl - extends AuthenticationRepository { - final AuthenticationCacheDataSource _authenticationLocalDataSource; - final AuthenticationRemoteDataSource _authenticationRemoteDataSource; - - late FormRepository _formRepository; - - final OnSignUpSuccess? _onSignUpSuccess; - - final OnAuthChange? _onAccountChanges; - final StreamController>> _signUpStream = - StreamController(); - - bool _pause = false; // Semaphore + extends AuthenticationRepository { // Semaphore AuthenticationRepositoryImpl({ required AuthenticationCacheDataSource authenticationCacheDataSource, @@ -106,6 +94,18 @@ class AuthenticationRepositoryImpl ), ); } + final AuthenticationCacheDataSource _authenticationLocalDataSource; + final AuthenticationRemoteDataSource _authenticationRemoteDataSource; + + late FormRepository _formRepository; + + final OnSignUpSuccess? _onSignUpSuccess; + + final OnAuthChange? _onAccountChanges; + final StreamController>> _signUpStream = + StreamController(); + + bool _pause = false; @override FormRepository get formRepository => _formRepository; diff --git a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart index cf648917..5db96018 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart @@ -26,7 +26,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; part 'authentication_state.dart'; class AuthenticationCubit extends Cubit> { - final AuthenticationRepository _authenticationRepository; AuthenticationCubit({ required AuthenticationRepository authenticationRepository, @@ -34,6 +33,7 @@ class AuthenticationCubit extends Cubit> { super(const AuthenticationState.unknown()) { _listenForAuthenticationChanges(); } + final AuthenticationRepository _authenticationRepository; void _listenForAuthenticationChanges() { _authenticationRepository.streamAccount().listen((accountFutureResult) { diff --git a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart index bfd1e871..9529ef2d 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart @@ -17,8 +17,6 @@ part of 'authentication_cubit.dart'; class AuthenticationState extends Equatable { - final AuthenticationStatus status; - final AccountWrapper? accountWrapper; const AuthenticationState._({required this.status, this.accountWrapper}); @@ -33,6 +31,8 @@ class AuthenticationState extends Equatable { const AuthenticationState.unauthenticated() : this._(status: AuthenticationStatus.unauthenticated); + final AuthenticationStatus status; + final AccountWrapper? accountWrapper; @override List get props => [status, accountWrapper]; diff --git a/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart index ea829bb5..02c1f100 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart @@ -24,12 +24,12 @@ import 'package:wyatt_form_bloc/wyatt_form_bloc.dart'; part 'email_verification_state.dart'; class EmailVerificationCubit extends Cubit { - final AuthenticationRepository _authenticationRepository; EmailVerificationCubit({ required AuthenticationRepository authenticationRepository, }) : _authenticationRepository = authenticationRepository, super(const EmailVerificationState()); + final AuthenticationRepository _authenticationRepository; FutureOr sendEmailVerification() async { emit(state.copyWith(status: FormStatus.submissionInProgress)); diff --git a/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart index 8b793973..63a7b6a3 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart @@ -25,9 +25,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; part 'password_reset_state.dart'; class PasswordResetCubit extends FormDataCubit { - final AuthenticationRepository _authenticationRepository; - FormRepository get _formRepository => - _authenticationRepository.formRepository; PasswordResetCubit({ required AuthenticationRepository authenticationRepository, @@ -38,6 +35,9 @@ class PasswordResetCubit extends FormDataCubit { .accessForm(AuthFormName.passwordResetForm), ), ); + final AuthenticationRepository _authenticationRepository; + FormRepository get _formRepository => + _authenticationRepository.formRepository; @override String get formName => AuthFormName.passwordResetForm; diff --git a/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart index 8a11957d..bc94c01d 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart @@ -17,13 +17,13 @@ part of 'password_reset_cubit.dart'; class PasswordResetState extends FormDataState { - Email get email => form.validatorOf(AuthFormField.email); const PasswordResetState({ required super.form, super.status = FormStatus.pure, super.errorMessage, }); + Email get email => form.validatorOf(AuthFormField.email); PasswordResetState copyWith({ WyattForm? form, diff --git a/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart index 5db99b5f..9343fa91 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart @@ -23,9 +23,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; part 'sign_in_state.dart'; class SignInCubit extends FormDataCubit { - final AuthenticationRepository _authenticationRepository; - FormRepository get _formRepository => - _authenticationRepository.formRepository; SignInCubit({ required AuthenticationRepository authenticationRepository, @@ -36,6 +33,9 @@ class SignInCubit extends FormDataCubit { .accessForm(AuthFormName.signInForm), ), ); + final AuthenticationRepository _authenticationRepository; + FormRepository get _formRepository => + _authenticationRepository.formRepository; @override String get formName => AuthFormName.signInForm; diff --git a/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart index 8c65fe0f..85892205 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart @@ -17,16 +17,16 @@ part of 'sign_in_cubit.dart'; class SignInState extends FormDataState { - FormInputValidator get email => - form.validatorOf(AuthFormField.email); - FormInputValidator get password => - form.validatorOf(AuthFormField.password); const SignInState({ required super.form, super.status = FormStatus.pure, super.errorMessage, }); + FormInputValidator get email => + form.validatorOf(AuthFormField.email); + FormInputValidator get password => + form.validatorOf(AuthFormField.password); SignInState copyWith({ WyattForm? form, diff --git a/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart index 38e719a1..72c69397 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart @@ -25,9 +25,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; part 'sign_up_state.dart'; class SignUpCubit extends FormDataCubit { - final AuthenticationRepository _authenticationRepository; - FormRepository get _formRepository => - _authenticationRepository.formRepository; SignUpCubit({ required AuthenticationRepository authenticationRepository, @@ -38,6 +35,9 @@ class SignUpCubit extends FormDataCubit { .accessForm(AuthFormName.signUpForm), ), ); + final AuthenticationRepository _authenticationRepository; + FormRepository get _formRepository => + _authenticationRepository.formRepository; @override String get formName => AuthFormName.signUpForm; diff --git a/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart index 8203c293..414e9916 100644 --- a/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart +++ b/packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart @@ -17,16 +17,16 @@ part of 'sign_up_cubit.dart'; class SignUpState extends FormDataState { - FormInputValidator get email => - form.validatorOf(AuthFormField.email); - FormInputValidator get password => - form.validatorOf(AuthFormField.password); const SignUpState({ required super.form, super.status = FormStatus.pure, super.errorMessage, }); + FormInputValidator get email => + form.validatorOf(AuthFormField.email); + FormInputValidator get password => + form.validatorOf(AuthFormField.password); SignUpState copyWith({ WyattForm? form, diff --git a/packages/wyatt_crud_bloc/lib/src/data/data_sources/local/crud_in_memory_data_source_impl.dart b/packages/wyatt_crud_bloc/lib/src/data/data_sources/local/crud_in_memory_data_source_impl.dart index 63fe3de4..5ed56791 100644 --- a/packages/wyatt_crud_bloc/lib/src/data/data_sources/local/crud_in_memory_data_source_impl.dart +++ b/packages/wyatt_crud_bloc/lib/src/data/data_sources/local/crud_in_memory_data_source_impl.dart @@ -24,14 +24,14 @@ import 'package:wyatt_crud_bloc/src/domain/entities/query.dart'; class CrudInMemoryDataSourceImpl extends CrudDataSource { + + CrudInMemoryDataSourceImpl({required this.toMap, Map? data}) + : _data = data ?? {}; final Map _data; final StreamController> _streamData = StreamController(); final Map Function(Model) toMap; - CrudInMemoryDataSourceImpl({required this.toMap, Map? data}) - : _data = data ?? {}; - @override Future create(Model object, {String? id}) async { _data[id ?? object.id ?? ''] = object; diff --git a/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart b/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart index 2b8fd504..4059dcb6 100644 --- a/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart +++ b/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart @@ -22,10 +22,6 @@ import 'package:wyatt_crud_bloc/src/domain/entities/query.dart'; class CrudFirestoreDataSourceImpl extends CrudDataSource { - final FirebaseFirestore _firestore; - - final Map Function(Model, SetOptions?) _toFirestore; - late CollectionReference _collectionReference; CrudFirestoreDataSourceImpl( String collection, { @@ -44,6 +40,10 @@ class CrudFirestoreDataSourceImpl toFirestore: toFirestore, ); } + final FirebaseFirestore _firestore; + + final Map Function(Model, SetOptions?) _toFirestore; + late CollectionReference _collectionReference; @override Future create(Model object, {String? id}) { diff --git a/packages/wyatt_crud_bloc/lib/src/data/repositories/crud_repository_impl.dart b/packages/wyatt_crud_bloc/lib/src/data/repositories/crud_repository_impl.dart index 1a62f179..7b8b6fe3 100644 --- a/packages/wyatt_crud_bloc/lib/src/data/repositories/crud_repository_impl.dart +++ b/packages/wyatt_crud_bloc/lib/src/data/repositories/crud_repository_impl.dart @@ -23,11 +23,11 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class CrudRepositoryImpl extends CrudRepository { - final CrudDataSource _crudDataSource; CrudRepositoryImpl({ required CrudDataSource crudDataSource, }) : _crudDataSource = crudDataSource; + final CrudDataSource _crudDataSource; @override FutureOrResult create(Model object, {String? id}) => diff --git a/packages/wyatt_crud_bloc/lib/src/domain/entities/query.dart b/packages/wyatt_crud_bloc/lib/src/domain/entities/query.dart index c95d1cda..fbb55c9a 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/entities/query.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/entities/query.dart @@ -25,22 +25,22 @@ abstract class QueryParser { abstract class QueryInterface extends Entity {} class WhereQuery extends QueryInterface { + + WhereQuery(this.type, this.field, this.value); final WhereQueryType type; final String field; final Value value; - - WhereQuery(this.type, this.field, this.value); } class LimitQuery extends QueryInterface { - final int limit; LimitQuery(this.limit); + final int limit; } class OrderByQuery extends QueryInterface { - final String field; - final bool ascending; OrderByQuery(this.field, {this.ascending = true}); + final String field; + final bool ascending; } diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete.dart index 83e49331..f8a5446c 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete.dart @@ -21,9 +21,9 @@ import 'package:wyatt_crud_bloc/src/domain/entities/object_model.dart'; import 'package:wyatt_crud_bloc/src/domain/repositories/crud_repository.dart'; class Delete extends AsyncUseCase { - final CrudRepository _crudRepository; Delete(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOr onStart(String? params) { diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete_all.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete_all.dart index 75fde6ee..8310f267 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete_all.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/delete_all.dart @@ -19,9 +19,9 @@ import 'package:wyatt_crud_bloc/src/domain/entities/object_model.dart'; import 'package:wyatt_crud_bloc/src/domain/repositories/crud_repository.dart'; class DeleteAll extends AsyncUseCase { - final CrudRepository _crudRepository; DeleteAll(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOrResult execute(void params) => _crudRepository.deleteAll(); diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/get.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/get.dart index 491323d5..520609a3 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/get.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/get.dart @@ -21,9 +21,9 @@ import 'package:wyatt_crud_bloc/src/domain/entities/object_model.dart'; import 'package:wyatt_crud_bloc/src/domain/repositories/crud_repository.dart'; class Get extends AsyncUseCase { - final CrudRepository _crudRepository; Get(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOr onStart(String? params) { diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/get_all.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/get_all.dart index f7de0385..3d91ab65 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/get_all.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/get_all.dart @@ -20,9 +20,9 @@ import 'package:wyatt_crud_bloc/src/domain/repositories/crud_repository.dart'; class GetAll extends AsyncUseCase> { - final CrudRepository _crudRepository; GetAll(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOrResult> execute(void params) => _crudRepository.getAll(); diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/query.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/query.dart index 586e3189..d36035c8 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/query.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/query.dart @@ -23,9 +23,9 @@ import 'package:wyatt_crud_bloc/src/domain/repositories/crud_repository.dart'; class Query extends AsyncUseCase, List> { - final CrudRepository _crudRepository; Query(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOr onStart(List? params) { diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/update.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/update.dart index 5379f43e..bbc29d0f 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/update.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/update.dart @@ -23,9 +23,9 @@ import 'package:wyatt_crud_bloc/src/domain/usecases/params/update_parameters.dar class Update extends AsyncUseCase, void> { - final CrudRepository _crudRepository; Update(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOr onStart(UpdateParameters? params) { diff --git a/packages/wyatt_crud_bloc/lib/src/domain/usecases/update_all.dart b/packages/wyatt_crud_bloc/lib/src/domain/usecases/update_all.dart index f61ebd18..c9c4505f 100644 --- a/packages/wyatt_crud_bloc/lib/src/domain/usecases/update_all.dart +++ b/packages/wyatt_crud_bloc/lib/src/domain/usecases/update_all.dart @@ -22,9 +22,9 @@ import 'package:wyatt_crud_bloc/src/domain/repositories/crud_repository.dart'; class UpdateAll extends AsyncUseCase, void> { - final CrudRepository _crudRepository; UpdateAll(this._crudRepository); + final CrudRepository _crudRepository; @override FutureOr onStart(Map? params) { diff --git a/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_cubit.dart b/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_cubit.dart index 67f43c1b..807cf77a 100644 --- a/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_cubit.dart +++ b/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_cubit.dart @@ -35,6 +35,8 @@ import 'package:wyatt_crud_bloc/src/domain/usecases/update_all.dart'; part 'crud_state.dart'; abstract class CrudCubit extends Cubit { + + CrudCubit() : super(CrudInitial()); Create? get crudCreate; DeleteAll? get crudDeleteAll; Delete? get crudDelete; @@ -44,8 +46,6 @@ abstract class CrudCubit extends Cubit { UpdateAll? get crudUpdateAll; Update? get crudUpdate; - CrudCubit() : super(CrudInitial()); - FutureOr create(Model model) async { if (crudCreate != null) { final stateCopy = state; diff --git a/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_state.dart b/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_state.dart index 2506b7bb..8541a664 100644 --- a/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_state.dart +++ b/packages/wyatt_crud_bloc/lib/src/features/crud/cubit/crud_state.dart @@ -36,27 +36,27 @@ class CrudOkReturn extends CrudState { } class CrudError extends CrudState { - final String? message; const CrudError(this.message); + final String? message; @override List get props => [message]; } class CrudLoaded extends CrudSuccess { - final T? data; const CrudLoaded(this.data); + final T? data; @override List get props => [data]; } class CrudListLoaded extends CrudSuccess { - final List data; const CrudListLoaded(this.data); + final List data; @override List get props => [data]; diff --git a/packages/wyatt_form_bloc/lib/src/data/form/wyatt_form_impl.dart b/packages/wyatt_form_bloc/lib/src/data/form/wyatt_form_impl.dart index e6a08758..5cf16e28 100644 --- a/packages/wyatt_form_bloc/lib/src/data/form/wyatt_form_impl.dart +++ b/packages/wyatt_form_bloc/lib/src/data/form/wyatt_form_impl.dart @@ -26,15 +26,6 @@ import 'package:wyatt_form_bloc/src/domain/input_validators/form_input_validator // ignore: must_be_immutable class WyattFormImpl extends WyattForm { - final List< - FormInput, - dynamic>> _inputs; - final FormValidator _validator; - final String _name; - - late List< - FormInput, - dynamic>> _inputsInitial; WyattFormImpl( this._inputs, { @@ -44,6 +35,15 @@ class WyattFormImpl extends WyattForm { _validator = validationStrategy { _inputsInitial = _inputs.map((input) => input.clone()).toList(); } + final List< + FormInput, + dynamic>> _inputs; + final FormValidator _validator; + final String _name; + + late List< + FormInput, + dynamic>> _inputsInitial; @override List< diff --git a/packages/wyatt_form_bloc/lib/src/presentation/features/form_data/form_data_state.dart b/packages/wyatt_form_bloc/lib/src/presentation/features/form_data/form_data_state.dart index 57ab4c95..ec07d6fc 100644 --- a/packages/wyatt_form_bloc/lib/src/presentation/features/form_data/form_data_state.dart +++ b/packages/wyatt_form_bloc/lib/src/presentation/features/form_data/form_data_state.dart @@ -17,6 +17,12 @@ part of 'form_data_cubit.dart'; abstract class FormDataState extends Equatable { + + const FormDataState({ + required this.form, + this.status = FormStatus.pure, + this.errorMessage, + }); /// Global status of a form. final FormStatus status; @@ -26,12 +32,6 @@ abstract class FormDataState extends Equatable { /// Optional error message. final String? errorMessage; - const FormDataState({ - required this.form, - this.status = FormStatus.pure, - this.errorMessage, - }); - @override List get props => [status, form, errorMessage]; } diff --git a/packages/wyatt_form_bloc/lib/src/presentation/features/form_data_impl/form_data_cubit_impl.dart b/packages/wyatt_form_bloc/lib/src/presentation/features/form_data_impl/form_data_cubit_impl.dart index 2eb50aa7..1894e478 100644 --- a/packages/wyatt_form_bloc/lib/src/presentation/features/form_data_impl/form_data_cubit_impl.dart +++ b/packages/wyatt_form_bloc/lib/src/presentation/features/form_data_impl/form_data_cubit_impl.dart @@ -27,11 +27,11 @@ import 'package:wyatt_form_bloc/src/presentation/features/form_data/form_data_cu part 'form_data_state_impl.dart'; abstract class FormDataCubitImpl extends FormDataCubit { - final FormRepository _formRepository; - final String _formName; FormDataCubitImpl(this._formRepository, this._formName) : super(FormDataStateImpl(form: _formRepository.accessForm(_formName))); + final FormRepository _formRepository; + final String _formName; @override String get formName => _formName; diff --git a/packages/wyatt_http_client/example/http_client_example.dart b/packages/wyatt_http_client/example/http_client_example.dart index 57b16bee..3787f1c8 100644 --- a/packages/wyatt_http_client/example/http_client_example.dart +++ b/packages/wyatt_http_client/example/http_client_example.dart @@ -115,7 +115,7 @@ Future server() async { final server = await HttpServer.bind(InternetAddress.anyIPv6, 8080); var error = 0; var token = 0; - await server.forEach((HttpRequest request) { + await server.forEach((request) { print('[${request.method}] ${request.uri}'); switch (request.uri.path) { case '/test/basic-test': @@ -196,7 +196,7 @@ Future server() async { Future main() async { unawaited(server()); - final base = 'localhost:8080'; + const base = 'localhost:8080'; final uriPrefix = UriPrefixMiddleware( protocol: Protocols.http, authority: base, diff --git a/packages/wyatt_http_client/example/http_client_fastapi_example.dart b/packages/wyatt_http_client/example/http_client_fastapi_example.dart index 5393611c..9aa2be25 100644 --- a/packages/wyatt_http_client/example/http_client_fastapi_example.dart +++ b/packages/wyatt_http_client/example/http_client_fastapi_example.dart @@ -31,19 +31,15 @@ enum EmailVerificationAction { resetPassword, changeEmail; - String toSnakeCase() { - return name.splitMapJoin( + String toSnakeCase() => name.splitMapJoin( RegExp('[A-Z]'), onMatch: (m) => '_${m[0]?.toLowerCase()}', onNonMatch: (n) => n, ); - } - factory EmailVerificationAction.fromString(String str) { - return EmailVerificationAction.values.firstWhere( - (EmailVerificationAction element) => element.toSnakeCase() == str, + factory EmailVerificationAction.fromString(String str) => EmailVerificationAction.values.firstWhere( + (element) => element.toSnakeCase() == str, ); - } } class VerifyCode { @@ -60,29 +56,23 @@ class VerifyCode { String? email, String? verificationCode, EmailVerificationAction? action, - }) { - return VerifyCode( + }) => VerifyCode( email: email ?? this.email, verificationCode: verificationCode ?? this.verificationCode, action: action ?? this.action, ); - } - Map toMap() { - return { + Map toMap() => { 'email': email, 'verification_code': verificationCode, 'action': action.toSnakeCase(), }; - } - factory VerifyCode.fromMap(Map map) { - return VerifyCode( + factory VerifyCode.fromMap(Map map) => VerifyCode( email: map['email'] as String, verificationCode: map['verification_code'] as String, action: EmailVerificationAction.fromString(map['action'] as String), ); - } String toJson() => json.encode(toMap()); @@ -105,26 +95,20 @@ class Account { Account copyWith({ String? email, String? sessionId, - }) { - return Account( + }) => Account( email: email ?? this.email, sessionId: sessionId ?? this.sessionId, ); - } - Map toMap() { - return { + Map toMap() => { 'email': email, 'session_id': sessionId, }; - } - factory Account.fromMap(Map map) { - return Account( + factory Account.fromMap(Map map) => Account( email: map['email'] as String, sessionId: map['session_id'] != null ? map['session_id'] as String : null, ); - } String toJson() => json.encode(toMap()); @@ -146,26 +130,20 @@ class SignUp { SignUp copyWith({ String? sessionId, String? password, - }) { - return SignUp( + }) => SignUp( sessionId: sessionId ?? this.sessionId, password: password ?? this.password, ); - } - Map toMap() { - return { + Map toMap() => { 'session_id': sessionId, 'password': password, }; - } - factory SignUp.fromMap(Map map) { - return SignUp( + factory SignUp.fromMap(Map map) => SignUp( sessionId: map['session_id'] as String, password: map['password'] as String, ); - } String toJson() => json.encode(toMap()); @@ -190,29 +168,23 @@ class TokenSuccess { String? accessToken, String? refreshToken, Account? account, - }) { - return TokenSuccess( + }) => TokenSuccess( accessToken: accessToken ?? this.accessToken, refreshToken: refreshToken ?? this.refreshToken, account: account ?? this.account, ); - } - Map toMap() { - return { + Map toMap() => { 'access_token': accessToken, 'refresh_token': refreshToken, 'account': account.toMap(), }; - } - factory TokenSuccess.fromMap(Map map) { - return TokenSuccess( + factory TokenSuccess.fromMap(Map map) => TokenSuccess( accessToken: map['access_token'] as String, refreshToken: map['refresh_token'] as String, account: Account.fromMap(map['account'] as Map), ); - } String toJson() => json.encode(toMap()); @@ -235,26 +207,20 @@ class Login { Login copyWith({ String? email, String? password, - }) { - return Login( + }) => Login( email: email ?? this.email, password: password ?? this.password, ); - } - Map toMap() { - return { + Map toMap() => { 'email': email, 'password': password, }; - } - factory Login.fromMap(Map map) { - return Login( + factory Login.fromMap(Map map) => Login( email: map['email'] as String, password: map['password'] as String, ); - } String toJson() => json.encode(toMap()); diff --git a/packages/wyatt_http_client/lib/src/middleware_client.dart b/packages/wyatt_http_client/lib/src/middleware_client.dart index 0f646f70..389b6fce 100644 --- a/packages/wyatt_http_client/lib/src/middleware_client.dart +++ b/packages/wyatt_http_client/lib/src/middleware_client.dart @@ -25,8 +25,6 @@ import 'package:wyatt_http_client/src/pipeline.dart'; import 'package:wyatt_http_client/src/utils/http_methods.dart'; class MiddlewareClient extends BaseClient { - final Client inner; - final Pipeline pipeline; MiddlewareClient({ Pipeline? pipeline, @@ -35,6 +33,8 @@ class MiddlewareClient extends BaseClient { inner = inner ?? Client() { print('Using Pipeline:\n$pipeline'); } + final Client inner; + final Pipeline pipeline; @override Future head(Uri url, {Map? headers}) => @@ -81,9 +81,7 @@ class MiddlewareClient extends BaseClient { _sendUnstreamed(HttpMethods.delete.method, url, headers, body, encoding); @override - Future send(BaseRequest request) { - return inner.send(request); - } + Future send(BaseRequest request) => inner.send(request); Future _sendUnstreamed( String method, diff --git a/packages/wyatt_http_client/lib/src/middlewares/basic_auth_middleware.dart b/packages/wyatt_http_client/lib/src/middlewares/basic_auth_middleware.dart index 027ad964..432a33a2 100644 --- a/packages/wyatt_http_client/lib/src/middlewares/basic_auth_middleware.dart +++ b/packages/wyatt_http_client/lib/src/middlewares/basic_auth_middleware.dart @@ -23,15 +23,15 @@ import 'package:wyatt_http_client/src/utils/authentication_methods.dart'; import 'package:wyatt_http_client/src/utils/header_keys.dart'; class BasicAuthMiddleware with OnRequestMiddleware implements Middleware { - String? username; - String? password; - final String authenticationHeader; BasicAuthMiddleware({ this.username, this.password, this.authenticationHeader = HeaderKeys.authorization, }); + String? username; + String? password; + final String authenticationHeader; @override String getName() => 'BasicAuth'; diff --git a/packages/wyatt_http_client/lib/src/middlewares/digest_auth_middleware.dart b/packages/wyatt_http_client/lib/src/middlewares/digest_auth_middleware.dart index 538f6eb2..64dd5020 100644 --- a/packages/wyatt_http_client/lib/src/middlewares/digest_auth_middleware.dart +++ b/packages/wyatt_http_client/lib/src/middlewares/digest_auth_middleware.dart @@ -25,12 +25,6 @@ import 'package:wyatt_http_client/src/utils/http_status.dart'; class DigestAuthMiddleware with OnRequestMiddleware, OnResponseMiddleware implements Middleware { - final String username; - final String password; - final DigestAuth _digestAuth; - final String authenticationHeader; - final String wwwAuthenticateHeader; - final HttpStatus unauthorized; DigestAuthMiddleware({ required this.username, @@ -39,6 +33,12 @@ class DigestAuthMiddleware this.wwwAuthenticateHeader = HeaderKeys.wwwAuthenticate, this.unauthorized = HttpStatus.unauthorized, }) : _digestAuth = DigestAuth(username, password); + final String username; + final String password; + final DigestAuth _digestAuth; + final String authenticationHeader; + final String wwwAuthenticateHeader; + final HttpStatus unauthorized; @override String getName() => 'DigestAuth'; diff --git a/packages/wyatt_http_client/lib/src/middlewares/refresh_token_auth_middleware.dart b/packages/wyatt_http_client/lib/src/middlewares/refresh_token_auth_middleware.dart index f470699a..fc6937e6 100644 --- a/packages/wyatt_http_client/lib/src/middlewares/refresh_token_auth_middleware.dart +++ b/packages/wyatt_http_client/lib/src/middlewares/refresh_token_auth_middleware.dart @@ -31,6 +31,17 @@ typedef TokenParser = String Function(Map); class RefreshTokenAuthMiddleware with OnRequestMiddleware, OnResponseMiddleware implements Middleware { + + RefreshTokenAuthMiddleware({ + required this.authorizationEndpoint, + required this.tokenEndpoint, + required this.accessTokenParser, + required this.refreshTokenParser, + this.authenticationHeader = HeaderKeys.authorization, + this.authenticationMethod = AuthenticationMethods.bearer, + this.unauthorized = HttpStatus.unauthorized, + this.maxAttempts = 8, + }); final String authorizationEndpoint; final String tokenEndpoint; @@ -44,17 +55,6 @@ class RefreshTokenAuthMiddleware final HttpStatus unauthorized; final int maxAttempts; - RefreshTokenAuthMiddleware({ - required this.authorizationEndpoint, - required this.tokenEndpoint, - required this.accessTokenParser, - required this.refreshTokenParser, - this.authenticationHeader = HeaderKeys.authorization, - this.authenticationMethod = AuthenticationMethods.bearer, - this.unauthorized = HttpStatus.unauthorized, - this.maxAttempts = 8, - }); - @override String getName() => 'RefreshToken'; diff --git a/packages/wyatt_http_client/lib/src/middlewares/unsafe_auth_middleware.dart b/packages/wyatt_http_client/lib/src/middlewares/unsafe_auth_middleware.dart index f929f623..4b43359a 100644 --- a/packages/wyatt_http_client/lib/src/middlewares/unsafe_auth_middleware.dart +++ b/packages/wyatt_http_client/lib/src/middlewares/unsafe_auth_middleware.dart @@ -20,11 +20,6 @@ import 'package:wyatt_http_client/src/models/middleware_request.dart'; import 'package:wyatt_http_client/src/utils/convert.dart'; class UnsafeAuthMiddleware with OnRequestMiddleware implements Middleware { - String? username; - String? password; - - final String usernameField; - final String passwordField; UnsafeAuthMiddleware({ this.username, @@ -32,6 +27,11 @@ class UnsafeAuthMiddleware with OnRequestMiddleware implements Middleware { this.usernameField = 'username', this.passwordField = 'password', }); + String? username; + String? password; + + final String usernameField; + final String passwordField; @override String getName() => 'UnsafeAuth'; diff --git a/packages/wyatt_http_client/lib/src/middlewares/uri_prefix_middleware.dart b/packages/wyatt_http_client/lib/src/middlewares/uri_prefix_middleware.dart index c52f3fdf..1eec0fe4 100644 --- a/packages/wyatt_http_client/lib/src/middlewares/uri_prefix_middleware.dart +++ b/packages/wyatt_http_client/lib/src/middlewares/uri_prefix_middleware.dart @@ -20,13 +20,13 @@ import 'package:wyatt_http_client/src/models/middleware_request.dart'; import 'package:wyatt_http_client/src/utils/protocols.dart'; class UriPrefixMiddleware with OnRequestMiddleware implements Middleware { - final Protocols protocol; - final String? authority; UriPrefixMiddleware({ required this.protocol, required this.authority, }); + final Protocols protocol; + final String? authority; @override String getName() => 'UriPrefix'; diff --git a/packages/wyatt_http_client/lib/src/models/middleware_context.dart b/packages/wyatt_http_client/lib/src/models/middleware_context.dart index 19877109..9fb1db30 100644 --- a/packages/wyatt_http_client/lib/src/models/middleware_context.dart +++ b/packages/wyatt_http_client/lib/src/models/middleware_context.dart @@ -44,8 +44,7 @@ class MiddlewareContext { MiddlewareRequest? lastRequest, MiddlewareResponse? originalResponse, MiddlewareResponse? lastResponse, - }) { - return MiddlewareContext( + }) => MiddlewareContext( pipeline: pipeline ?? this.pipeline, client: client ?? this.client, originalRequest: originalRequest ?? this.originalRequest, @@ -53,10 +52,7 @@ class MiddlewareContext { originalResponse: originalResponse ?? this.originalResponse, lastResponse: lastResponse ?? this.lastResponse, ); - } @override - String toString() { - return 'MiddlewareContext(pipeline: $pipeline, client: $client, originalRequest: $originalRequest, lastRequest: $lastRequest, originalResponse: $originalResponse, lastResponse: $lastResponse)'; - } + String toString() => 'MiddlewareContext(pipeline: $pipeline, client: $client, originalRequest: $originalRequest, lastRequest: $lastRequest, originalResponse: $originalResponse, lastResponse: $lastResponse)'; } diff --git a/packages/wyatt_http_client/lib/src/models/middleware_request.dart b/packages/wyatt_http_client/lib/src/models/middleware_request.dart index 42c9ac34..333d3177 100644 --- a/packages/wyatt_http_client/lib/src/models/middleware_request.dart +++ b/packages/wyatt_http_client/lib/src/models/middleware_request.dart @@ -42,22 +42,21 @@ class MiddlewareRequest { MiddlewareRequest copyWith({ UnfreezedRequest? unfreezedRequest, - }) { - return MiddlewareRequest( - unfreezedRequest: unfreezedRequest ?? this.unfreezedRequest, - ); - } + }) => + MiddlewareRequest( + unfreezedRequest: unfreezedRequest ?? this.unfreezedRequest, + ); void modifyRequest(UnfreezedRequest unfreezedRequest) { - String? _body; + String? body; if (unfreezedRequest.body != null) { - final body = unfreezedRequest.body; + var body = unfreezedRequest.body; if (body is String) { - _body = body; + body = body; } else if (body is List) { - _body = String.fromCharCodes(body.cast()); + body = String.fromCharCodes(body.cast()); } else if (body is Map) { - _body = Convert.mapToQuery(body.cast()); + body = Convert.mapToQuery(body.cast()); } } _httpRequest = RequestUtils.copyRequestWith( @@ -65,7 +64,7 @@ class MiddlewareRequest { method: unfreezedRequest.method, url: unfreezedRequest.url, headers: unfreezedRequest.headers, - body: _body, + body: body, ) as Request; if (unfreezedRequest.encoding != null) { _httpRequest.encoding = unfreezedRequest.encoding!; diff --git a/packages/wyatt_http_client/lib/src/models/middleware_response.dart b/packages/wyatt_http_client/lib/src/models/middleware_response.dart index 9404fa3a..d58a2591 100644 --- a/packages/wyatt_http_client/lib/src/models/middleware_response.dart +++ b/packages/wyatt_http_client/lib/src/models/middleware_response.dart @@ -40,11 +40,9 @@ class MiddlewareResponse { MiddlewareResponse copyWith({ BaseResponse? httpResponse, - }) { - return MiddlewareResponse( + }) => MiddlewareResponse( httpResponse: httpResponse ?? this.httpResponse, ); - } @override String toString() => diff --git a/packages/wyatt_http_client/lib/src/models/unfreezed_request.dart b/packages/wyatt_http_client/lib/src/models/unfreezed_request.dart index 9aa9790f..437b21d3 100644 --- a/packages/wyatt_http_client/lib/src/models/unfreezed_request.dart +++ b/packages/wyatt_http_client/lib/src/models/unfreezed_request.dart @@ -17,11 +17,6 @@ import 'dart:convert'; class UnfreezedRequest { - final String method; - final Uri url; - final Map? headers; - final Object? body; - final Encoding? encoding; UnfreezedRequest({ required this.method, @@ -30,6 +25,11 @@ class UnfreezedRequest { this.body, this.encoding, }); + final String method; + final Uri url; + final Map? headers; + final Object? body; + final Encoding? encoding; UnfreezedRequest copyWith({ String? method, @@ -37,19 +37,15 @@ class UnfreezedRequest { Map? headers, Object? body, Encoding? encoding, - }) { - return UnfreezedRequest( + }) => UnfreezedRequest( method: method ?? this.method, url: url ?? this.url, headers: headers ?? this.headers, body: body ?? this.body, encoding: encoding ?? this.encoding, ); - } @override - String toString() { - return 'UnfreezedRequest(method: $method, url: $url, headers: ' + String toString() => 'UnfreezedRequest(method: $method, url: $url, headers: ' '$headers, body: $body, encoding: $encoding)'; - } } diff --git a/packages/wyatt_http_client/lib/src/pipeline.dart b/packages/wyatt_http_client/lib/src/pipeline.dart index aa0b8a1b..bf0b2107 100644 --- a/packages/wyatt_http_client/lib/src/pipeline.dart +++ b/packages/wyatt_http_client/lib/src/pipeline.dart @@ -20,13 +20,13 @@ import 'package:wyatt_http_client/src/models/middleware_request.dart'; import 'package:wyatt_http_client/src/models/middleware_response.dart'; class Pipeline { - final List _middlewares; - - int get length => _middlewares.length; Pipeline() : _middlewares = []; Pipeline.fromIterable(Iterable middlewares) : _middlewares = middlewares.toList(); + final List _middlewares; + + int get length => _middlewares.length; /// Add a [Middleware] to this [Pipeline] Pipeline addMiddleware(Middleware middleware) { diff --git a/packages/wyatt_http_client/lib/src/utils/convert.dart b/packages/wyatt_http_client/lib/src/utils/convert.dart index 96746448..059b20a5 100644 --- a/packages/wyatt_http_client/lib/src/utils/convert.dart +++ b/packages/wyatt_http_client/lib/src/utils/convert.dart @@ -21,7 +21,7 @@ class Convert { final buffer = StringBuffer(); for (final int part in bytes) { if (part & 0xff != part) { - throw FormatException('Non-byte integer detected'); + throw const FormatException('Non-byte integer detected'); } buffer.write('${part < 16 ? '0' : ''}${part.toRadixString(16)}'); } diff --git a/packages/wyatt_http_client/lib/src/utils/crypto.dart b/packages/wyatt_http_client/lib/src/utils/crypto.dart index 319b9299..f27d08a7 100644 --- a/packages/wyatt_http_client/lib/src/utils/crypto.dart +++ b/packages/wyatt_http_client/lib/src/utils/crypto.dart @@ -21,8 +21,8 @@ import 'package:crypto/crypto.dart'; class Crypto { /// Hash a string using MD5 static String md5Hash(String data) { - final content = Utf8Encoder().convert(data); - final md5Crypto = md5; + final content = const Utf8Encoder().convert(data); + const md5Crypto = md5; final digest = md5Crypto.convert(content).toString(); return digest; } diff --git a/packages/wyatt_http_client/lib/src/utils/delay.dart b/packages/wyatt_http_client/lib/src/utils/delay.dart index af89f3ac..3ca50947 100644 --- a/packages/wyatt_http_client/lib/src/utils/delay.dart +++ b/packages/wyatt_http_client/lib/src/utils/delay.dart @@ -24,9 +24,9 @@ abstract class Delay { return Duration.zero; } final rand = Random(); - final Duration delayFactor = const Duration(milliseconds: 200); - final double randomizationFactor = 0.25; - final Duration maxDelay = const Duration(seconds: 30); + const Duration delayFactor = Duration(milliseconds: 200); + const double randomizationFactor = 0.25; + const Duration maxDelay = Duration(seconds: 30); final rf = randomizationFactor * (rand.nextDouble() * 2 - 1) + 1; final exp = min(attempt, 31); // prevent overflows. diff --git a/packages/wyatt_http_client/lib/src/utils/digest_auth.dart b/packages/wyatt_http_client/lib/src/utils/digest_auth.dart index 41581dfb..1a8ee9f1 100644 --- a/packages/wyatt_http_client/lib/src/utils/digest_auth.dart +++ b/packages/wyatt_http_client/lib/src/utils/digest_auth.dart @@ -19,7 +19,9 @@ import 'dart:math'; import 'package:wyatt_http_client/src/utils/convert.dart'; import 'package:wyatt_http_client/src/utils/crypto.dart'; -class DigestAuth { +class DigestAuth { // request counter + + DigestAuth(this.username, this.password); String username; String password; @@ -30,9 +32,7 @@ class DigestAuth { String? _nonce; String? _opaque; - int _nc = 0; // request counter - - DigestAuth(this.username, this.password); + int _nc = 0; /// Splits WWW-Authenticate header into a map. Map? splitWWWAuthenticateHeader(String header) { @@ -61,9 +61,7 @@ class DigestAuth { return Convert.toHex(values); } - String _formatNonceCount(int nc) { - return nc.toRadixString(16).padLeft(8, '0'); - } + String _formatNonceCount(int nc) => nc.toRadixString(16).padLeft(8, '0'); String _computeHA1( String realm, @@ -148,7 +146,7 @@ class DigestAuth { } String getAuthString(String method, Uri url) { - final _cnonce = _computeNonce(); + final cnonce = _computeNonce(); _nc += 1; // if url has query parameters, append query to path final path = url.hasQuery ? '${url.path}?${url.query}' : url.path; @@ -162,7 +160,7 @@ class DigestAuth { _qop, _opaque, _realm!, - _cnonce, + cnonce, _nonce, _nc, username, @@ -192,7 +190,5 @@ class DigestAuth { } } - bool isReady() { - return _nonce != null && (_nc == 0 || _qop != null); - } + bool isReady() => _nonce != null && (_nc == 0 || _qop != null); } diff --git a/packages/wyatt_http_client/lib/src/utils/http_status.dart b/packages/wyatt_http_client/lib/src/utils/http_status.dart index c5715c70..2714b5ba 100644 --- a/packages/wyatt_http_client/lib/src/utils/http_status.dart +++ b/packages/wyatt_http_client/lib/src/utils/http_status.dart @@ -95,29 +95,17 @@ enum HttpStatus { return false; } - bool isInfo() { - return statusCode >= 100 && statusCode < 200; - } + bool isInfo() => statusCode >= 100 && statusCode < 200; - bool isSuccess() { - return statusCode >= 200 && statusCode < 300; - } + bool isSuccess() => statusCode >= 200 && statusCode < 300; - bool isRedirection() { - return statusCode >= 300 && statusCode < 400; - } + bool isRedirection() => statusCode >= 300 && statusCode < 400; - bool isClientError() { - return statusCode >= 400 && statusCode < 500; - } + bool isClientError() => statusCode >= 400 && statusCode < 500; - bool isServerError() { - return statusCode >= 500 && statusCode < 600; - } + bool isServerError() => statusCode >= 500 && statusCode < 600; - factory HttpStatus.from(int status) { - return HttpStatus.values + factory HttpStatus.from(int status) => HttpStatus.values .firstWhere((element) => element.statusCode == status); - } } diff --git a/packages/wyatt_type_utils/example/lib/error.dart b/packages/wyatt_type_utils/example/lib/error.dart index 67008d6d..945855bf 100644 --- a/packages/wyatt_type_utils/example/lib/error.dart +++ b/packages/wyatt_type_utils/example/lib/error.dart @@ -15,9 +15,9 @@ // along with this program. If not, see . class AppError { - final String message; const AppError(this.message); + final String message; @override // ignore: no_runtimetype_tostring diff --git a/packages/wyatt_type_utils/lib/src/either/either_base.dart b/packages/wyatt_type_utils/lib/src/either/either_base.dart index f8b3546f..2f06414e 100644 --- a/packages/wyatt_type_utils/lib/src/either/either_base.dart +++ b/packages/wyatt_type_utils/lib/src/either/either_base.dart @@ -28,8 +28,8 @@ mixin _Left on _EitherBase {} mixin _Right on _EitherBase {} class _EitherBaseException implements Exception { - final String message; const _EitherBaseException(this.message); + final String message; @override String toString() => '_EitherException: $message'; diff --git a/packages/wyatt_type_utils/lib/src/either/option.dart b/packages/wyatt_type_utils/lib/src/either/option.dart index b86a510b..3f8e9a74 100644 --- a/packages/wyatt_type_utils/lib/src/either/option.dart +++ b/packages/wyatt_type_utils/lib/src/either/option.dart @@ -172,10 +172,10 @@ abstract class Option extends _EitherBase { } class Value extends Option with _Left { - final T value; /// {@macro ok} const Value(this.value) : super._(); + final T value; @override _EitherBase _and(_EitherBase res) => res as Option; diff --git a/packages/wyatt_type_utils/lib/src/either/result.dart b/packages/wyatt_type_utils/lib/src/either/result.dart index 4756f970..6333e46d 100644 --- a/packages/wyatt_type_utils/lib/src/either/result.dart +++ b/packages/wyatt_type_utils/lib/src/either/result.dart @@ -203,10 +203,10 @@ abstract class Result extends _EitherBase { /// {@macro result} /// {@endtemplate} class Ok extends Result with _Left { - final T value; /// {@macro ok} const Ok(this.value) : super._(); + final T value; @override U _fold(U Function(T left) fnL, U Function(E right) fnR) => fnL(value); @@ -268,10 +268,10 @@ class Ok extends Result with _Left { /// {@macro result} /// {@endtemplate} class Err extends Result with _Right { - final E error; /// {@macro err} const Err(this.error) : super._(); + final E error; @override U _fold(U Function(T left) fnL, U Function(E right) fnR) => fnR(error); diff --git a/packages/wyatt_type_utils/lib/src/pair/pair.dart b/packages/wyatt_type_utils/lib/src/pair/pair.dart index e32b94bb..ca66961d 100644 --- a/packages/wyatt_type_utils/lib/src/pair/pair.dart +++ b/packages/wyatt_type_utils/lib/src/pair/pair.dart @@ -22,11 +22,11 @@ extension PairExtension on Pair { /// [Pair] is a simple object which contains pair of two values. /// {@endtemplate} class Pair { - final L? left; - final R? right; /// {@macro pair} const Pair(this.left, this.right); + final L? left; + final R? right; @override String toString() => '($left, $right)'; diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart index 1bf8f571..93a5c6b4 100644 --- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart +++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/app_bar_layout.dart @@ -19,13 +19,13 @@ import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart'; import 'package:wyatt_ui_layout/src/presentation/layouts/layout.dart'; class AppBarLayout extends Layout { - final String title; - final Widget body; const AppBarLayout({ required this.title, required this.body, super.key, }); + final String title; + final Widget body; @override Widget build(BuildContext context) => Scaffold( diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart index 58ee146f..cb7b9900 100644 --- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart +++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/bottom_navigation_bar_layout.dart @@ -3,14 +3,14 @@ import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart'; import 'package:wyatt_ui_layout/src/presentation/layouts/layout.dart'; class BottomNavigationBarLayout extends Layout { - final Widget body; - final int currentIndex; const BottomNavigationBarLayout({ required this.currentIndex, required this.body, super.key, }); + final Widget body; + final int currentIndex; @override Widget build(BuildContext context) => Scaffold( body: body, diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/frame_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/frame_layout.dart index 355716d3..2414c2fb 100644 --- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/frame_layout.dart +++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/frame_layout.dart @@ -19,9 +19,6 @@ import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart'; import 'package:wyatt_ui_layout/src/presentation/layouts/layout.dart'; class FrameLayout extends Layout { - final String title; - final Widget body; - final int currentIndex; const FrameLayout({ required this.title, @@ -29,6 +26,9 @@ class FrameLayout extends Layout { required this.currentIndex, super.key, }); + final String title; + final Widget body; + final int currentIndex; @override Widget build(BuildContext context) => Scaffold(