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<Album> getAlbum(int id) async {

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<Photo> getPhoto(int id) async {

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<void> addPhotoToFavorites(Photo photo) => Result.tryCatchAsync(

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<Photo, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   AddPhotoToFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(Photo? params) async {

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<int, bool> {
-  final PhotoRepository _photoRepository;
 
   CheckIfPhotoIsInFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<bool> execute(int? params) async =>

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<NoParam, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   DisplayFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(void params) {

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<int, Photo> {
-  final PhotoRepository _photoRepository;
 
   DisplayPhoto(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<Photo> execute(int? params) {

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<QueryParameters, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   OpenAlbum(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(QueryParameters? params) {

packages/wyatt_architecture/example/lib/domain/usecases/photos/params/query_parameters.dart

@@ -15,9 +15,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 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});
 }

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<int, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   RemovePhotoFromFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(int? params) async {

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<QueryParameters, List<Album>> {
-  final PhotoRepository _photoRepository;
 
   RetrieveAllAlbums(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Album>> execute(QueryParameters? params) {

packages/wyatt_architecture/example/lib/presentation/features/albums/blocs/album/album_bloc.dart

@@ -33,7 +33,6 @@ EventTransformer<E> throttleDroppable<E>(Duration duration) =>
     (events, mapper) => droppable<E>().call(events.throttle(duration), mapper);
 
 class AlbumBloc extends Bloc<AlbumEvent, AlbumState> {
-  final RetrieveAllAlbums _retrieveAllAlbums;
 
   AlbumBloc(this._retrieveAllAlbums) : super(const AlbumState()) {
     on<AlbumFetched>(
@@ -41,6 +40,7 @@ class AlbumBloc extends Bloc<AlbumEvent, AlbumState> {
       transformer: throttleDroppable(throttleDuration),
     );
   }
+  final RetrieveAllAlbums _retrieveAllAlbums;
 
   Future<void> _onAlbumFetched(
     AlbumFetched event,

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<Object> get props => [photo, isFavorite];
 }
 
 class PhotoDetailsFailure extends PhotoDetailsState {
-  final String error;
 
   const PhotoDetailsFailure(this.error);
+  final String error;
 
   @override
   List<Object> get props => [error];

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<FavoriteCheckerState> {
-  final CheckIfPhotoIsInFavorites _checkIfPhotoIsInFavorites;
 
   FavoriteCheckerCubit(this._checkIfPhotoIsInFavorites)
       : super(FavoriteCheckerInitial());
+  final CheckIfPhotoIsInFavorites _checkIfPhotoIsInFavorites;
 
   FutureOr<void> checkIfPhotoIsInFavorites(int photoId) async {
     final response = await _checkIfPhotoIsInFavorites.call(photoId);

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<Object> get props => [photoId, isFavorite];
 }
 
 class FavoriteCheckerFailure extends FavoriteCheckerState {
-  final String error;
 
   const FavoriteCheckerFailure(this.error);
+  final String error;
 
   @override
   List<Object> get props => [error];

packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_bloc.dart

@@ -33,7 +33,6 @@ EventTransformer<E> throttleDroppable<E>(Duration duration) =>
     (events, mapper) => droppable<E>().call(events.throttle(duration), mapper);
 
 class PhotoBloc extends Bloc<PhotoEvent, PhotoState> {
-  final OpenAlbum _openAlbum;
 
   PhotoBloc(this._openAlbum) : super(const PhotoState()) {
     on<PhotoFetched>(
@@ -41,6 +40,7 @@ class PhotoBloc extends Bloc<PhotoEvent, PhotoState> {
       transformer: throttleDroppable(throttleDuration),
     );
   }
+  final OpenAlbum _openAlbum;
 
   Future<void> _onPhotoFetched(
     PhotoFetched event,

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;
 }

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() {

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}

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<T extends Object>
     extends AuthenticationCacheDataSource<T> {
-  Account? _account;
-  T? _data;
 
   AuthenticationCacheDataSourceImpl();
+  Account? _account;
+  T? _data;
 
   @override
   Future<void> storeAccount(Account? account) async {

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,

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<Account, String>? _connectedMock;
   Pair<Account, String>? _registeredMock;
   DateTime _lastSignInTime = DateTime.now();
@@ -30,11 +35,6 @@ class AuthenticationMockDataSourceImpl extends AuthenticationRemoteDataSource {
   final List<Pair<Account, String>>? registeredAccounts;
   final String idToken;
 
-  AuthenticationMockDataSourceImpl({
-    this.idToken = 'fake-id-token',
-    this.registeredAccounts,
-  });
-
   Future<void> _randomDelay() async {
     await Future<void>.delayed(
       Duration(milliseconds: Random().nextInt(400) + 200),

packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart

@@ -41,19 +41,7 @@ typedef OnAuthChange<T> = FutureOrResult<T?> Function(
 );
 
 class AuthenticationRepositoryImpl<T extends Object>
-    extends AuthenticationRepository<T> {
+    extends AuthenticationRepository<T> { // Semaphore
-  final AuthenticationCacheDataSource<T> _authenticationLocalDataSource;
-  final AuthenticationRemoteDataSource _authenticationRemoteDataSource;
-
-  late FormRepository _formRepository;
-
-  final OnSignUpSuccess<T>? _onSignUpSuccess;
-
-  final OnAuthChange<T>? _onAccountChanges;
-  final StreamController<FutureOrResult<AccountWrapper<T>>> _signUpStream =
-      StreamController();
-
-  bool _pause = false; // Semaphore
 
   AuthenticationRepositoryImpl({
     required AuthenticationCacheDataSource<T> authenticationCacheDataSource,
@@ -106,6 +94,18 @@ class AuthenticationRepositoryImpl<T extends Object>
         ),
       );
   }
+  final AuthenticationCacheDataSource<T> _authenticationLocalDataSource;
+  final AuthenticationRemoteDataSource _authenticationRemoteDataSource;
+
+  late FormRepository _formRepository;
+
+  final OnSignUpSuccess<T>? _onSignUpSuccess;
+
+  final OnAuthChange<T>? _onAccountChanges;
+  final StreamController<FutureOrResult<AccountWrapper<T>>> _signUpStream =
+      StreamController();
+
+  bool _pause = false;
 
   @override
   FormRepository get formRepository => _formRepository;

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<Extra> extends Cubit<AuthenticationState<Extra>> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
 
   AuthenticationCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
@@ -34,6 +33,7 @@ class AuthenticationCubit<Extra> extends Cubit<AuthenticationState<Extra>> {
         super(const AuthenticationState.unknown()) {
     _listenForAuthenticationChanges();
   }
+  final AuthenticationRepository<Extra> _authenticationRepository;
 
   void _listenForAuthenticationChanges() {
     _authenticationRepository.streamAccount().listen((accountFutureResult) {

packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart

@@ -17,8 +17,6 @@
 part of 'authentication_cubit.dart';
 
 class AuthenticationState<Extra> extends Equatable {
-  final AuthenticationStatus status;
-  final AccountWrapper<Extra>? accountWrapper;
 
   const AuthenticationState._({required this.status, this.accountWrapper});
 
@@ -33,6 +31,8 @@ class AuthenticationState<Extra> extends Equatable {
 
   const AuthenticationState.unauthenticated()
       : this._(status: AuthenticationStatus.unauthenticated);
+  final AuthenticationStatus status;
+  final AccountWrapper<Extra>? accountWrapper;
 
   @override
   List<Object?> get props => [status, accountWrapper];

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<Extra> extends Cubit<EmailVerificationState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
 
   EmailVerificationCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
   })  : _authenticationRepository = authenticationRepository,
         super(const EmailVerificationState());
+  final AuthenticationRepository<Extra> _authenticationRepository;
 
   FutureOr<void> sendEmailVerification() async {
     emit(state.copyWith(status: FormStatus.submissionInProgress));

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<Extra> extends FormDataCubit<PasswordResetState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-  FormRepository get _formRepository =>
-      _authenticationRepository.formRepository;
 
   PasswordResetCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
@@ -38,6 +35,9 @@ class PasswordResetCubit<Extra> extends FormDataCubit<PasswordResetState> {
                 .accessForm(AuthFormName.passwordResetForm),
           ),
         );
+  final AuthenticationRepository<Extra> _authenticationRepository;
+  FormRepository get _formRepository =>
+      _authenticationRepository.formRepository;
 
   @override
   String get formName => AuthFormName.passwordResetForm;

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,

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<Extra> extends FormDataCubit<SignInState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-  FormRepository get _formRepository =>
-      _authenticationRepository.formRepository;
 
   SignInCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
@@ -36,6 +33,9 @@ class SignInCubit<Extra> extends FormDataCubit<SignInState> {
                 .accessForm(AuthFormName.signInForm),
           ),
         );
+  final AuthenticationRepository<Extra> _authenticationRepository;
+  FormRepository get _formRepository =>
+      _authenticationRepository.formRepository;
 
   @override
   String get formName => AuthFormName.signInForm;

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<String?, ValidationError> get email =>
-      form.validatorOf(AuthFormField.email);
-  FormInputValidator<String?, ValidationError> get password =>
-      form.validatorOf(AuthFormField.password);
 
   const SignInState({
     required super.form,
     super.status = FormStatus.pure,
     super.errorMessage,
   });
+  FormInputValidator<String?, ValidationError> get email =>
+      form.validatorOf(AuthFormField.email);
+  FormInputValidator<String?, ValidationError> get password =>
+      form.validatorOf(AuthFormField.password);
 
   SignInState copyWith({
     WyattForm? form,

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<Extra> extends FormDataCubit<SignUpState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-  FormRepository get _formRepository =>
-      _authenticationRepository.formRepository;
 
   SignUpCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
@@ -38,6 +35,9 @@ class SignUpCubit<Extra> extends FormDataCubit<SignUpState> {
                 .accessForm(AuthFormName.signUpForm),
           ),
         );
+  final AuthenticationRepository<Extra> _authenticationRepository;
+  FormRepository get _formRepository =>
+      _authenticationRepository.formRepository;
 
   @override
   String get formName => AuthFormName.signUpForm;

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<String?, ValidationError> get email =>
-      form.validatorOf(AuthFormField.email);
-  FormInputValidator<String?, ValidationError> get password =>
-      form.validatorOf(AuthFormField.password);
 
   const SignUpState({
     required super.form,
     super.status = FormStatus.pure,
     super.errorMessage,
   });
+  FormInputValidator<String?, ValidationError> get email =>
+      form.validatorOf(AuthFormField.email);
+  FormInputValidator<String?, ValidationError> get password =>
+      form.validatorOf(AuthFormField.password);
 
   SignUpState copyWith({
     WyattForm? form,

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<Model extends ObjectModel>
     extends CrudDataSource<Model> {
+
+  CrudInMemoryDataSourceImpl({required this.toMap, Map<String, Model>? data})
+      : _data = data ?? {};
   final Map<String, Model> _data;
   final StreamController<List<Model?>> _streamData = StreamController();
 
   final Map<String, Object?> Function(Model) toMap;
 
-  CrudInMemoryDataSourceImpl({required this.toMap, Map<String, Model>? data})
-      : _data = data ?? {};
-
   @override
   Future<void> create(Model object, {String? id}) async {
     _data[id ?? object.id ?? ''] = object;

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<Model extends ObjectModel, Entity>
     extends CrudDataSource<Model> {
-  final FirebaseFirestore _firestore;
-
-  final Map<String, Object?> Function(Model, SetOptions?) _toFirestore;
-  late CollectionReference<Model> _collectionReference;
 
   CrudFirestoreDataSourceImpl(
     String collection, {
@@ -44,6 +40,10 @@ class CrudFirestoreDataSourceImpl<Model extends ObjectModel, Entity>
               toFirestore: toFirestore,
             );
   }
+  final FirebaseFirestore _firestore;
+
+  final Map<String, Object?> Function(Model, SetOptions?) _toFirestore;
+  late CollectionReference<Model> _collectionReference;
 
   @override
   Future<void> create(Model object, {String? id}) {

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<Model extends ObjectModel>
     extends CrudRepository<Model> {
-  final CrudDataSource<Model> _crudDataSource;
 
   CrudRepositoryImpl({
     required CrudDataSource<Model> crudDataSource,
   }) : _crudDataSource = crudDataSource;
+  final CrudDataSource<Model> _crudDataSource;
 
   @override
   FutureOrResult<void> create(Model object, {String? id}) =>

packages/wyatt_crud_bloc/lib/src/domain/entities/query.dart

@@ -25,22 +25,22 @@ abstract class QueryParser<Q> {
 abstract class QueryInterface extends Entity {}
 
 class WhereQuery<Value> 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;
 }

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<Model extends ObjectModel> extends AsyncUseCase<String, void> {
-  final CrudRepository<Model> _crudRepository;
 
   Delete(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOr<void> onStart(String? params) {

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<Model extends ObjectModel> extends AsyncUseCase<void, void> {
-  final CrudRepository<Model> _crudRepository;
 
   DeleteAll(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOrResult<void> execute(void params) => _crudRepository.deleteAll();

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<Model extends ObjectModel> extends AsyncUseCase<String, Model?> {
-  final CrudRepository<Model> _crudRepository;
 
   Get(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOr<void> onStart(String? params) {

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<Model extends ObjectModel>
     extends AsyncUseCase<void, List<Model?>> {
-  final CrudRepository<Model> _crudRepository;
 
   GetAll(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOrResult<List<Model?>> execute(void params) => _crudRepository.getAll();

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<Model extends ObjectModel>
     extends AsyncUseCase<List<QueryInterface>, List<Model?>> {
-  final CrudRepository<Model> _crudRepository;
 
   Query(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOr<void> onStart(List<QueryInterface>? params) {

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<Model extends ObjectModel>
     extends AsyncUseCase<UpdateParameters<Model>, void> {
-  final CrudRepository<Model> _crudRepository;
 
   Update(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOr<void> onStart(UpdateParameters<Model>? params) {

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<Model extends ObjectModel>
     extends AsyncUseCase<Map<String, Object?>, void> {
-  final CrudRepository<Model> _crudRepository;
 
   UpdateAll(this._crudRepository);
+  final CrudRepository<Model> _crudRepository;
 
   @override
   FutureOr<void> onStart(Map<String, Object?>? params) {

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<Model extends ObjectModel> extends Cubit<CrudState> {
+
+  CrudCubit() : super(CrudInitial());
   Create<Model>? get crudCreate;
   DeleteAll<Model>? get crudDeleteAll;
   Delete<Model>? get crudDelete;
@@ -44,8 +46,6 @@ abstract class CrudCubit<Model extends ObjectModel> extends Cubit<CrudState> {
   UpdateAll<Model>? get crudUpdateAll;
   Update<Model>? get crudUpdate;
 
-  CrudCubit() : super(CrudInitial());
-
   FutureOr<void> create(Model model) async {
     if (crudCreate != null) {
       final stateCopy = state;

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<Object?> get props => [message];
 }
 
 class CrudLoaded<T> extends CrudSuccess {
-  final T? data;
 
   const CrudLoaded(this.data);
+  final T? data;
 
   @override
   List<Object?> get props => [data];
 }
 
 class CrudListLoaded<T> extends CrudSuccess {
-  final List<T?> data;
 
   const CrudListLoaded(this.data);
+  final List<T?> data;
 
   @override
   List<Object> get props => [data];

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, FormInputValidator<dynamic, ValidationError>,
-          dynamic>> _inputs;
-  final FormValidator _validator;
-  final String _name;
-
-  late List<
-      FormInput<dynamic, FormInputValidator<dynamic, ValidationError>,
-          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, FormInputValidator<dynamic, ValidationError>,
+          dynamic>> _inputs;
+  final FormValidator _validator;
+  final String _name;
+
+  late List<
+      FormInput<dynamic, FormInputValidator<dynamic, ValidationError>,
+          dynamic>> _inputsInitial;
 
   @override
   List<

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<Object?> get props => [status, form, errorMessage];
 }

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<FormDataStateImpl> {
-  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;

packages/wyatt_http_client/example/http_client_example.dart

@@ -115,7 +115,7 @@ Future<void> 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<void> server() async {
 
 Future<void> main() async {
   unawaited(server());
-  final base = 'localhost:8080';
+  const base = 'localhost:8080';
   final uriPrefix = UriPrefixMiddleware(
     protocol: Protocols.http,
     authority: base,

packages/wyatt_http_client/example/http_client_fastapi_example.dart

@@ -31,20 +31,16 @@ enum EmailVerificationAction {
   resetPassword,
   changeEmail;
 
-  String toSnakeCase() {
+  String toSnakeCase() => name.splitMapJoin(
-    return name.splitMapJoin(
       RegExp('[A-Z]'),
       onMatch: (m) => '_${m[0]?.toLowerCase()}',
       onNonMatch: (n) => n,
     );
-  }
 
-  factory EmailVerificationAction.fromString(String str) {
+  factory EmailVerificationAction.fromString(String str) => EmailVerificationAction.values.firstWhere(
-    return EmailVerificationAction.values.firstWhere(
+      (element) => element.toSnakeCase() == str,
-      (EmailVerificationAction element) => element.toSnakeCase() == str,
     );
 }
-}
 
 class VerifyCode {
   final String email;
@@ -60,29 +56,23 @@ class VerifyCode {
     String? email,
     String? verificationCode,
     EmailVerificationAction? action,
-  }) {
+  }) => VerifyCode(
-    return VerifyCode(
       email: email ?? this.email,
       verificationCode: verificationCode ?? this.verificationCode,
       action: action ?? this.action,
     );
-  }
 
-  Map<String, dynamic> toMap() {
+  Map<String, dynamic> toMap() => <String, dynamic>{
-    return <String, dynamic>{
       'email': email,
       'verification_code': verificationCode,
       'action': action.toSnakeCase(),
     };
-  }
 
-  factory VerifyCode.fromMap(Map<String, dynamic> map) {
+  factory VerifyCode.fromMap(Map<String, dynamic> map) => VerifyCode(
-    return 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,
-  }) {
+  }) => Account(
-    return Account(
       email: email ?? this.email,
       sessionId: sessionId ?? this.sessionId,
     );
-  }
 
-  Map<String, dynamic> toMap() {
+  Map<String, dynamic> toMap() => <String, dynamic>{
-    return <String, dynamic>{
       'email': email,
       'session_id': sessionId,
     };
-  }
 
-  factory Account.fromMap(Map<String, dynamic> map) {
+  factory Account.fromMap(Map<String, dynamic> map) => Account(
-    return 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,
-  }) {
+  }) => SignUp(
-    return SignUp(
       sessionId: sessionId ?? this.sessionId,
       password: password ?? this.password,
     );
-  }
 
-  Map<String, dynamic> toMap() {
+  Map<String, dynamic> toMap() => <String, dynamic>{
-    return <String, dynamic>{
       'session_id': sessionId,
       'password': password,
     };
-  }
 
-  factory SignUp.fromMap(Map<String, dynamic> map) {
+  factory SignUp.fromMap(Map<String, dynamic> map) => SignUp(
-    return 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,
-  }) {
+  }) => TokenSuccess(
-    return TokenSuccess(
       accessToken: accessToken ?? this.accessToken,
       refreshToken: refreshToken ?? this.refreshToken,
       account: account ?? this.account,
     );
-  }
 
-  Map<String, dynamic> toMap() {
+  Map<String, dynamic> toMap() => <String, dynamic>{
-    return <String, dynamic>{
       'access_token': accessToken,
       'refresh_token': refreshToken,
       'account': account.toMap(),
     };
-  }
 
-  factory TokenSuccess.fromMap(Map<String, dynamic> map) {
+  factory TokenSuccess.fromMap(Map<String, dynamic> map) => TokenSuccess(
-    return TokenSuccess(
       accessToken: map['access_token'] as String,
       refreshToken: map['refresh_token'] as String,
       account: Account.fromMap(map['account'] as Map<String, dynamic>),
     );
-  }
 
   String toJson() => json.encode(toMap());
 
@@ -235,26 +207,20 @@ class Login {
   Login copyWith({
     String? email,
     String? password,
-  }) {
+  }) => Login(
-    return Login(
       email: email ?? this.email,
       password: password ?? this.password,
     );
-  }
 
-  Map<String, dynamic> toMap() {
+  Map<String, dynamic> toMap() => <String, dynamic>{
-    return <String, dynamic>{
       'email': email,
       'password': password,
     };
-  }
 
-  factory Login.fromMap(Map<String, dynamic> map) {
+  factory Login.fromMap(Map<String, dynamic> map) => Login(
-    return Login(
       email: map['email'] as String,
       password: map['password'] as String,
     );
-  }
 
   String toJson() => json.encode(toMap());
 

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<Response> head(Uri url, {Map<String, String>? headers}) =>
@@ -81,9 +81,7 @@ class MiddlewareClient extends BaseClient {
       _sendUnstreamed(HttpMethods.delete.method, url, headers, body, encoding);
 
   @override
-  Future<StreamedResponse> send(BaseRequest request) {
+  Future<StreamedResponse> send(BaseRequest request) => inner.send(request);
-    return inner.send(request);
-  }
 
   Future<Response> _sendUnstreamed(
     String method,

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';

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';

packages/wyatt_http_client/lib/src/middlewares/refresh_token_auth_middleware.dart

@@ -31,6 +31,17 @@ typedef TokenParser = String Function(Map<String, dynamic>);
 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';
 

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';

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';

packages/wyatt_http_client/lib/src/models/middleware_context.dart

@@ -44,8 +44,7 @@ class MiddlewareContext {
     MiddlewareRequest? lastRequest,
     MiddlewareResponse? originalResponse,
     MiddlewareResponse? lastResponse,
-  }) {
+  }) => MiddlewareContext(
-    return 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() {
+  String toString() => 'MiddlewareContext(pipeline: $pipeline, client: $client, originalRequest: $originalRequest, lastRequest: $lastRequest, originalResponse: $originalResponse, lastResponse: $lastResponse)';
-    return 'MiddlewareContext(pipeline: $pipeline, client: $client, originalRequest: $originalRequest, lastRequest: $lastRequest, originalResponse: $originalResponse, lastResponse: $lastResponse)';
-  }
 }

packages/wyatt_http_client/lib/src/models/middleware_request.dart

@@ -42,22 +42,21 @@ class MiddlewareRequest {
 
   MiddlewareRequest copyWith({
     UnfreezedRequest? unfreezedRequest,
-  }) {
+  }) =>
-    return MiddlewareRequest(
+      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<int>());
+        body = String.fromCharCodes(body.cast<int>());
       } else if (body is Map) {
-        _body = Convert.mapToQuery(body.cast<String, String>());
+        body = Convert.mapToQuery(body.cast<String, String>());
       }
     }
     _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!;

packages/wyatt_http_client/lib/src/models/middleware_response.dart

@@ -40,11 +40,9 @@ class MiddlewareResponse {
 
   MiddlewareResponse copyWith({
     BaseResponse? httpResponse,
-  }) {
+  }) => MiddlewareResponse(
-    return MiddlewareResponse(
       httpResponse: httpResponse ?? this.httpResponse,
     );
-  }
 
   @override
   String toString() =>

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<String, String>? 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<String, String>? headers;
+  final Object? body;
+  final Encoding? encoding;
 
   UnfreezedRequest copyWith({
     String? method,
@@ -37,19 +37,15 @@ class UnfreezedRequest {
     Map<String, String>? headers,
     Object? body,
     Encoding? encoding,
-  }) {
+  }) => UnfreezedRequest(
-    return UnfreezedRequest(
       method: method ?? this.method,
       url: url ?? this.url,
       headers: headers ?? this.headers,
       body: body ?? this.body,
       encoding: encoding ?? this.encoding,
     );
-  }
 
   @override
-  String toString() {
+  String toString() => 'UnfreezedRequest(method: $method, url: $url, headers: '
-    return 'UnfreezedRequest(method: $method, url: $url, headers: '
         '$headers, body: $body, encoding: $encoding)';
 }
-}

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<Middleware> _middlewares;
-
-  int get length => _middlewares.length;
 
   Pipeline() : _middlewares = <Middleware>[];
   Pipeline.fromIterable(Iterable<Middleware> middlewares)
       : _middlewares = middlewares.toList();
+  final List<Middleware> _middlewares;
+
+  int get length => _middlewares.length;
 
   /// Add a [Middleware] to this [Pipeline]
   Pipeline addMiddleware(Middleware middleware) {

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)}');
     }

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 content = const Utf8Encoder().convert(data);
-    final md5Crypto = md5;
+    const md5Crypto = md5;
     final digest = md5Crypto.convert(content).toString();
     return digest;
   }

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);
+    const Duration delayFactor = Duration(milliseconds: 200);
-    final double randomizationFactor = 0.25;
+    const double randomizationFactor = 0.25;
-    final Duration maxDelay = const Duration(seconds: 30);
+    const Duration maxDelay = Duration(seconds: 30);
 
     final rf = randomizationFactor * (rand.nextDouble() * 2 - 1) + 1;
     final exp = min(attempt, 31); // prevent overflows.

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
+  int _nc = 0;
-
-  DigestAuth(this.username, this.password);
 
   /// Splits WWW-Authenticate header into a map.
   Map<String, String>? splitWWWAuthenticateHeader(String header) {
@@ -61,9 +61,7 @@ class DigestAuth {
     return Convert.toHex(values);
   }
 
-  String _formatNonceCount(int nc) {
+  String _formatNonceCount(int nc) => nc.toRadixString(16).padLeft(8, '0');
-    return 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() {
+  bool isReady() => _nonce != null && (_nc == 0 || _qop != null);
-    return _nonce != null && (_nc == 0 || _qop != null);
-  }
 }

packages/wyatt_http_client/lib/src/utils/http_status.dart

@@ -95,29 +95,17 @@ enum HttpStatus {
     return false;
   }
 
-  bool isInfo() {
+  bool isInfo() => statusCode >= 100 && statusCode < 200;
-    return statusCode >= 100 && statusCode < 200; 
-  }
 
-  bool isSuccess() {
+  bool isSuccess() => statusCode >= 200 && statusCode < 300;
-    return statusCode >= 200 && statusCode < 300; 
-  }
 
-  bool isRedirection() {
+  bool isRedirection() => statusCode >= 300 && statusCode < 400;
-    return statusCode >= 300 && statusCode < 400; 
-  }
 
-  bool isClientError() {
+  bool isClientError() => statusCode >= 400 && statusCode < 500;
-    return statusCode >= 400 && statusCode < 500; 
-  }
 
-  bool isServerError() {
+  bool isServerError() => statusCode >= 500 && statusCode < 600;
-    return statusCode >= 500 && statusCode < 600; 
-  }
 
-  factory HttpStatus.from(int status) {
+  factory HttpStatus.from(int status) => HttpStatus.values
-    return HttpStatus.values
         .firstWhere((element) => element.statusCode == status);
-  }
 
 }

packages/wyatt_type_utils/example/lib/error.dart

@@ -15,9 +15,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 class AppError {
-  final String message;
 
   const AppError(this.message);
+  final String message;
 
   @override
   // ignore: no_runtimetype_tostring

packages/wyatt_type_utils/lib/src/either/either_base.dart

@@ -28,8 +28,8 @@ mixin _Left<LeftType, RightType> on _EitherBase<LeftType, RightType> {}
 mixin _Right<LeftType, RightType> on _EitherBase<LeftType, RightType> {}
 
 class _EitherBaseException implements Exception {
-  final String message;
   const _EitherBaseException(this.message);
+  final String message;
 
   @override
   String toString() => '_EitherException: $message';

packages/wyatt_type_utils/lib/src/either/option.dart

@@ -172,10 +172,10 @@ abstract class Option<T> extends _EitherBase<T, void> {
 }
 
 class Value<T> extends Option<T> with _Left<T, void> {
-  final T value;
 
   /// {@macro ok}
   const Value(this.value) : super._();
+  final T value;
 
   @override
   _EitherBase<U, void> _and<U>(_EitherBase<U, void> res) => res as Option<U>;

packages/wyatt_type_utils/lib/src/either/result.dart

@@ -203,10 +203,10 @@ abstract class Result<T, E> extends _EitherBase<T, E> {
 /// {@macro result}
 /// {@endtemplate}
 class Ok<T, E> extends Result<T, E> with _Left<T, E> {
-  final T value;
 
   /// {@macro ok}
   const Ok(this.value) : super._();
+  final T value;
 
   @override
   U _fold<U>(U Function(T left) fnL, U Function(E right) fnR) => fnL(value);
@@ -268,10 +268,10 @@ class Ok<T, E> extends Result<T, E> with _Left<T, E> {
 /// {@macro result}
 /// {@endtemplate}
 class Err<T, E> extends Result<T, E> with _Right<T, E> {
-  final E error;
 
   /// {@macro err}
   const Err(this.error) : super._();
+  final E error;
 
   @override
   U _fold<U>(U Function(T left) fnL, U Function(E right) fnR) => fnR(error);

packages/wyatt_type_utils/lib/src/pair/pair.dart

@@ -22,11 +22,11 @@ extension PairExtension<T> on Pair<T, T> {
 /// [Pair] is a simple object which contains pair of two values.
 /// {@endtemplate}
 class Pair<L, R> {
-  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)';

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(

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,

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(