renaming and working urnary operator

Author: Patrick Jackson

common/src/commonMain/kotlin/com/willowtreeapps/common/builders.kt

@@ -5,8 +5,11 @@ import org.reduxkotlin.Store
 import org.reduxkotlin.StoreSubscriber
 import kotlin.reflect.KProperty1
 
-typealias ViewUpdater<View> = (View) -> (Store) -> StoreSubscriber
-typealias ViewUpdaterBuilder<State, View> = ((View.() -> ((SelectorSubscriberBuilder<State>.() -> Unit))))
+typealias Presenter<View> = (View) -> (Store) -> StoreSubscriber
+/**
+ *
+ */
+typealias PresenterBuilder<State, View> = ((View.() -> ((SelectorSubscriberBuilder<State>.() -> Unit))))
 
 class SelectorSubscriberBuilder<S : Any>(val store: Store, val view: View<S>) {
     //available to lambda with receiver in DSL
@@ -36,30 +39,14 @@ class SelectorSubscriberBuilder<S : Any>(val store: Store, val view: View<S>) {
     fun tmp(selector: ((S) -> Any)-> AbstractSelector<S, Any>) {
 
     }
-    operator fun (((AppState) -> Unit).()-> Unit).unaryPlus() {
 
+    operator fun (()-> Any).unaryPlus():AbstractSelector<S, Any>  {
+        val that = this
+        val selBuilder = SelectorBuilder<S>()
+        val sel = selBuilder.withSingleField{ that() }
+        return sel
     }
 
-//    operator fun <R> ((S) -> R).unaryPlus() {
-//        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-//    }
-//    operator fun SelectorSubscriberBuilder<S, View>.unaryPlus(): ()->AbstractSelector<S, Any> {
-//
-//    }
-
-//operator fun <R> ((() -> R).()->Unit).unaryPlus() {
-//        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-//    }
-//    operator fun <R> (() -> R).unaryPlus() {
-//        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-//    }
-//    operator fun SelectorSubscriberBuilder<S, View>.unaryPlus(): ((S)-> Any)->AbstractSelector<S, Any> {
-//        val selBuilder
-//        = SelectorBuilder<S>()
-//        val sel = selBuilder.withSingleField(selector)
-//        return sel
-//    }
-
     infix operator fun AbstractSelector<S, Any>.plus(action: (Any) -> Unit) {
         selectorList[this] = action
     }
@@ -145,7 +132,15 @@ fun <State : Any > selectFun(store: Store, actions: (SelectorSubscriberBuilder<S
 }
  */
 
-fun <State : Any, V: View<State>> viewUpdater(actions: ViewUpdaterBuilder<State, V>): ViewUpdater<V> {
+/**
+ * @param actions - a PresenterBuilder describing actions to be taken on state changes.
+ *              usage:
+ *                 val myPresenter = createGenericPresenter {{
+ *                      //TODO
+ *                 }}
+ * @return a Presenter function
+ */
+fun <State : Any, V: View<State>> createGenericPresenter(actions: PresenterBuilder<State, V>): Presenter<V> {
     return { view: V ->
         { store: Store ->
             val actions2 = actions(view)//(store)
@@ -172,7 +167,7 @@ val searchPresenterSubscriberD2: SelectorSubscriberD<AppState, SearchView> = {
         }//(store)
     }
 }
-val searchPresenterSubscriberD3 = viewUpdater<AppState, SearchView> {
+val searchPresenterSubscriberD3 = createGenericPresenter<AppState, SearchView> {
     {
         plus { it.isLoadingItems } + { showLoading() }
     }

common/src/commonMain/kotlin/com/willowtreeapps/common/reselect.kt

@@ -138,6 +138,10 @@ fun <S,O> S.whenChangeOf(selector: Selector<S, O>, blockfn: (O) -> Unit) {
  * abstract base class for all selectors
  */
 abstract class AbstractSelector<S, O> : Selector<S, O> {
+    fun invoke(tmp: ()-> Unit): O {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
     @JvmField protected var recomputationsLastChanged = 0L
     @JvmField protected var _recomputations = 0L
     override val recomputations: Long get() = _recomputations

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/DetailsPresenter.kt

@@ -1,6 +1,5 @@
 package com.willowtreeapps.common.ui
 
-import com.willowtreeapps.common.ViewUpdater
 import com.willowtreeapps.common.boundary.toBookListViewState
 
 val detailsPresenter = presenter<DetailsView> {

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/Presenter.kt

@@ -0,0 +1,11 @@
+package com.willowtreeapps.common.ui
+
+import com.willowtreeapps.common.AppState
+import com.willowtreeapps.common.Presenter
+import com.willowtreeapps.common.PresenterBuilder
+import com.willowtreeapps.common.createGenericPresenter
+
+//a Presenter typed to our app's State type for convenience
+fun <V : LibraryView> presenter(actions: PresenterBuilder<AppState, V>): Presenter<View<AppState>> {
+    return createGenericPresenter(actions) as Presenter<View<AppState>>
+}

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/PresenterFactory.kt

@@ -94,7 +94,7 @@ interface LibraryProvider {
 interface View<S : Any> {
     var dispatch: Dispatcher
     var selectorBuilder: SelectorSubscriberBuilder<S>
-    fun viewUpdater(): ViewUpdater<View<AppState>> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
+    fun viewUpdater(): Presenter<View<AppState>> = throw NotImplementedError("Must implement this method to provide a presenterBuilder for ${this::class}")
 
 }
 

common/src/commonMain/kotlin/com/willowtreeapps/common/ui/SearchPresenter.kt

@@ -1,43 +1,20 @@
 package com.willowtreeapps.common.ui
 
-import com.willowtreeapps.common.*
 import com.willowtreeapps.common.boundary.toBookListViewState
 
-//a viewupdater typed to our app's AppState for convenience
-fun <V: LibraryView> presenter(actions: ViewUpdaterBuilder<AppState,V>): ViewUpdater<View<AppState>> {
-    return viewUpdater(actions) as ViewUpdater<View<AppState>>
-}
 
 val searchPresenter = presenter<SearchView> {
     {
-
-        on{it.isLoadingItems} + { showLoading() }
-
-        on{ it.isLoadingItems} + {
+        +{ state.isLoadingItems } + {
             if (state.isLoadingItems) {
                 showLoading()
             } else {
                 hideLoading()
             }
         }
 
+        +{ state.errorLoadingItems } + { showError(state.errorMsg) }
 
-        withSingleField({ it.isLoadingItems }) {
-            if (state.isLoadingItems) {
-                showLoading()
-            } else {
-                hideLoading()
-            }
-        }
-
-        withSingleField({ it.errorLoadingItems }) {
-            showError(state.errorMsg)
-        }
-
-        withSingleField({it.searchBooks}) {
-            showResults(state.searchBooks.toBookListViewState())
-        }
+        +{ state.searchBooks }+{ showResults(state.searchBooks.toBookListViewState()) }
     }
 }
-
-