Rename closures to actions

Author: kudoleh

ExampleMVVM/Application/DIContainer/MoviesSceneDIContainer.swift

@@ -52,14 +52,14 @@ final class MoviesSceneDIContainer {
     }
 
     // MARK: - Movies List
-    func makeMoviesListViewController(closures: MoviesListViewModelClosures) -> MoviesListViewController {
-        return MoviesListViewController.create(with: makeMoviesListViewModel(closures: closures),
+    func makeMoviesListViewController(actions: MoviesListViewModelActions) -> MoviesListViewController {
+        return MoviesListViewController.create(with: makeMoviesListViewModel(actions: actions),
                                                posterImagesRepository: makePosterImagesRepository())
     }
 
-    func makeMoviesListViewModel(closures: MoviesListViewModelClosures) -> MoviesListViewModel {
+    func makeMoviesListViewModel(actions: MoviesListViewModelActions) -> MoviesListViewModel {
         return DefaultMoviesListViewModel(searchMoviesUseCase: makeSearchMoviesUseCase(),
-                                          closures: closures)
+                                          actions: actions)
     }
 
     // MARK: - Movie Details
@@ -73,7 +73,7 @@ final class MoviesSceneDIContainer {
     }
 
     // MARK: - Movies Queries Suggestions List
-    func makeMoviesQueriesSuggestionsListViewController(didSelect: @escaping MoviesQueryListViewModelDidSelectClosure) -> UIViewController {
+    func makeMoviesQueriesSuggestionsListViewController(didSelect: @escaping MoviesQueryListViewModelDidSelectAction) -> UIViewController {
         if #available(iOS 13.0, *) { // SwiftUI
             let view = MoviesQueryListView(viewModelWrapper: makeMoviesQueryListViewModelWrapper(didSelect: didSelect))
             return UIHostingController(rootView: view)
@@ -82,14 +82,14 @@ final class MoviesSceneDIContainer {
         }
     }
 
-    func makeMoviesQueryListViewModel(didSelect: @escaping MoviesQueryListViewModelDidSelectClosure) -> MoviesQueryListViewModel {
+    func makeMoviesQueryListViewModel(didSelect: @escaping MoviesQueryListViewModelDidSelectAction) -> MoviesQueryListViewModel {
         return DefaultMoviesQueryListViewModel(numberOfQueriesToShow: 10,
                                                fetchRecentMovieQueriesUseCaseFactory: makeFetchRecentMovieQueriesUseCase,
                                                didSelect: didSelect)
     }
 
     @available(iOS 13.0, *)
-    func makeMoviesQueryListViewModelWrapper(didSelect: @escaping MoviesQueryListViewModelDidSelectClosure) -> MoviesQueryListViewModelWrapper {
+    func makeMoviesQueryListViewModelWrapper(didSelect: @escaping MoviesQueryListViewModelDidSelectAction) -> MoviesQueryListViewModelWrapper {
         return MoviesQueryListViewModelWrapper(viewModel: makeMoviesQueryListViewModel(didSelect: didSelect))
     }
 

ExampleMVVM/Presentation/MoviesScene/Flows/MoviesSearchFlowCoordinator.swift

@@ -8,9 +8,9 @@
 import UIKit
 
 protocol MoviesSearchFlowCoordinatorDependencies  {
-    func makeMoviesListViewController(closures: MoviesListViewModelClosures) -> MoviesListViewController
+    func makeMoviesListViewController(actions: MoviesListViewModelActions) -> MoviesListViewController
     func makeMoviesDetailsViewController(movie: Movie) -> UIViewController
-    func makeMoviesQueriesSuggestionsListViewController(didSelect: @escaping MoviesQueryListViewModelDidSelectClosure) -> UIViewController
+    func makeMoviesQueriesSuggestionsListViewController(didSelect: @escaping MoviesQueryListViewModelDidSelectAction) -> UIViewController
 }
 
 class MoviesSearchFlowCoordinator {
@@ -28,11 +28,11 @@ class MoviesSearchFlowCoordinator {
     }
 
     func start() {
-        // Note: here we keep strong reference with closures, this way this flow do not need to be strong referenced
-        let closures = MoviesListViewModelClosures(showMovieDetails: showMovieDetails,
-                                                   showMovieQueriesSuggestions: showMovieQueriesSuggestions,
-                                                   closeMovieQueriesSuggestions: closeMovieQueriesSuggestions)
-        let vc = dependencies.makeMoviesListViewController(closures: closures)
+        // Note: here we keep strong reference with actions, this way this flow do not need to be strong referenced
+        let actions = MoviesListViewModelActions(showMovieDetails: showMovieDetails,
+                                                 showMovieQueriesSuggestions: showMovieQueriesSuggestions,
+                                                 closeMovieQueriesSuggestions: closeMovieQueriesSuggestions)
+        let vc = dependencies.makeMoviesListViewController(actions: actions)
 
         navigationController?.pushViewController(vc, animated: false)
         moviesListVC = vc

ExampleMVVM/Presentation/MoviesScene/MoviesList/ViewModel/MoviesListViewModel.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-struct MoviesListViewModelClosures {
+struct MoviesListViewModelActions {
     /// Note: if you would need to edit movie inside Details screen and update this Movies List screen with updated movie then you would need this closure:
     /// showMovieDetails: (Movie, @escaping (_ updated: Movie) -> Void) -> Void
     let showMovieDetails: (Movie) -> Void
@@ -47,7 +47,7 @@ protocol MoviesListViewModel: MoviesListViewModelInput, MoviesListViewModelOutpu
 final class DefaultMoviesListViewModel: MoviesListViewModel {
 
     private let searchMoviesUseCase: SearchMoviesUseCase
-    private let closures: MoviesListViewModelClosures?
+    private let actions: MoviesListViewModelActions?
 
     var currentPage: Int = 0
     var totalPageCount: Int = 1
@@ -72,9 +72,9 @@ final class DefaultMoviesListViewModel: MoviesListViewModel {
     // MARK: - Init
 
     init(searchMoviesUseCase: SearchMoviesUseCase,
-         closures: MoviesListViewModelClosures? = nil) {
+         actions: MoviesListViewModelActions? = nil) {
         self.searchMoviesUseCase = searchMoviesUseCase
-        self.closures = closures
+        self.actions = actions
     }
 
     // MARK: - Private
@@ -149,15 +149,15 @@ extension DefaultMoviesListViewModel {
     }
 
     func showQueriesSuggestions() {
-        closures?.showMovieQueriesSuggestions(update(movieQuery:))
+        actions?.showMovieQueriesSuggestions(update(movieQuery:))
     }
 
     func closeQueriesSuggestions() {
-        closures?.closeMovieQueriesSuggestions()
+        actions?.closeMovieQueriesSuggestions()
     }
 
     func didSelectItem(at index: Int) {
-        closures?.showMovieDetails(pages.movies[index])
+        actions?.showMovieDetails(pages.movies[index])
     }
 }
 

ExampleMVVM/Presentation/MoviesScene/MoviesQueriesList/ViewModel/MoviesQueryListViewModel.swift

@@ -7,7 +7,7 @@
 
 import Foundation
 
-typealias MoviesQueryListViewModelDidSelectClosure = (MovieQuery) -> Void
+typealias MoviesQueryListViewModelDidSelectAction = (MovieQuery) -> Void
 
 protocol MoviesQueryListViewModelInput {
     func viewWillAppear()
@@ -29,14 +29,14 @@ final class DefaultMoviesQueryListViewModel: MoviesQueryListViewModel {
 
     private let numberOfQueriesToShow: Int
     private let fetchRecentMovieQueriesUseCaseFactory: FetchRecentMovieQueriesUseCaseFactory
-    private let didSelect: MoviesQueryListViewModelDidSelectClosure?
+    private let didSelect: MoviesQueryListViewModelDidSelectAction?
 
     // MARK: - OUTPUT
     let items: Observable<[MoviesQueryListItemViewModel]> = Observable([])
 
     init(numberOfQueriesToShow: Int,
          fetchRecentMovieQueriesUseCaseFactory: @escaping FetchRecentMovieQueriesUseCaseFactory,
-         didSelect: MoviesQueryListViewModelDidSelectClosure? = nil) {
+         didSelect: MoviesQueryListViewModelDidSelectAction? = nil) {
         self.numberOfQueriesToShow = numberOfQueriesToShow
         self.fetchRecentMovieQueriesUseCaseFactory = fetchRecentMovieQueriesUseCaseFactory
         self.didSelect = didSelect

ExampleMVVMTests/Presentation/MoviesScene/MoviesQueriesListViewModelTests.swift

@@ -77,12 +77,12 @@ class MoviesQueriesListViewModelTests: XCTestCase {
         XCTAssertTrue(viewModel.items.value.isEmpty)
     }
 
-    func test_whenDidSelectQueryEventIsReceived_thenCallDidSelectClosure() {
+    func test_whenDidSelectQueryEventIsReceived_thenCallDidSelectAction() {
         // given
         let selectedQueryItem = MovieQuery(query: "query1")
         var actionMovieQuery: MovieQuery?
         let expectation = self.expectation(description: "Delegate notified")
-        let didSelect: MoviesQueryListViewModelDidSelectClosure = { movieQuery in
+        let didSelect: MoviesQueryListViewModelDidSelectAction = { movieQuery in
             actionMovieQuery = movieQuery
             expectation.fulfill()
         }