[WIP] conversion of classes & interfaces to typealiases

Author: Patrick Jackson

common/src/commonMain/kotlin/com/beyondeye/reduks/DispatcherFn.kt

@@ -1,12 +1,7 @@
 package com.beyondeye.reduks
 
 /**
- * single method interface, mainly used because kotlin does not support yet type alias for function types
  * see also https://github.com/reactjs/redux/blob/master/docs/Glossary.md#middleware
  */
 
 typealias Middleware<State> = (store: Store<State>, nextDispatcher: (Any) -> Any, action: Any) -> Any
-
-//interface Middleware<S> {
-//    fun dispatch(store: Store<S>, nextDispatcher:  (Any)->Any, action: Any): Any
-//}

common/src/commonMain/kotlin/com/beyondeye/reduks/Middleware.kt

@@ -1,7 +1,6 @@
 package com.beyondeye.reduks
 
 /**
- * single method interface, mainly used because kotlin does not support yet type alias for function types
  * see also https://github.com/reactjs/redux/blob/master/docs/Glossary.md#reducer
  */
 

common/src/commonMain/kotlin/com/beyondeye/reduks/Reducer.kt

@@ -2,10 +2,10 @@ package com.beyondeye.reduks
 
 object ReduksInternalLogUtils {
     fun reportErrorInReducer(s:Store<*>, e:Throwable) {
-        s.errorLogFn?.invoke("REDUKS: exception while running reducer: ${e}")
+        s.errorLogFn?.invoke("REDUKS: exception while running reducer: $e")
     }
 
     fun reportErrorInSubscriber(s:Store<*>, e:Throwable) {
-        s.errorLogFn?.invoke("REDUKS: exception while notifying subscriber: ${e}")
+        s.errorLogFn?.invoke("REDUKS: exception while notifying subscriber: $e")
     }
 }

common/src/commonMain/kotlin/com/beyondeye/reduks/Reduks.kt

@@ -9,19 +9,9 @@ class SimpleStore<S>(initialState: S, private var reducer: Reducer<S>) : Store<S
         dispatch(INIT())
     }
 
-    class Creator<S>(val withStandardMiddlewares: Boolean = true) : StoreCreator<S> {
-        override fun create(reducer: Reducer<S>, initialState: S): Store<S> {
-            val res = SimpleStore<S>(initialState, reducer)
-            return if (!withStandardMiddlewares)
-                res
-            else
-                res.applyMiddleware(::thunkMiddleware)
-        }
-    }
-
     override var errorLogFn: ((String) -> Unit)? = null
     override var state: S = initialState
-    private val subscribers = mutableListOf<StoreSubscriber<S>>()
+    private val subscribers = mutableListOf<StoreSubscriber>()
     private fun mainDispatcher(store: Store<S>, nextDispatcher: (Any) -> Any, action: Any): Any {
         //Todo consider how accessing from multiple threads affects this.
         try {
@@ -32,7 +22,7 @@ class SimpleStore<S>(initialState: S, private var reducer: Reducer<S>) : Store<S
 
         subscribers.forEach {
             try {
-                it.onStateChange()
+                it()
             } catch (e: Throwable) {
                 ReduksInternalLogUtils.reportErrorInSubscriber(this@SimpleStore, e)
             }
@@ -55,17 +45,21 @@ class SimpleStore<S>(initialState: S, private var reducer: Reducer<S>) : Store<S
                 action)
     }
 
-    override fun subscribe(storeSubscriber: StoreSubscriber<S>): StoreSubscription {
+    override fun subscribe(storeSubscriber: StoreSubscriber): StoreSubscription {
         this.subscribers.add(storeSubscriber)
-        return object : StoreSubscription {
-            override fun unsubscribe() {
-                subscribers.remove(storeSubscriber)
-            }
-        }
+        return { subscribers.remove(storeSubscriber) }
     }
 
     companion object {
         val redukstag = "rdks"
+
+        fun <S> create(withStandardMiddlewares: Boolean = true): StoreCreator<S> = { reducer, initialState ->
+            val res = SimpleStore(initialState, reducer)
+            if (!withStandardMiddlewares)
+                res
+            else
+                res.applyMiddleware(::thunkMiddleware)
+        }
     }
 }
 

common/src/commonMain/kotlin/com/beyondeye/reduks/ReduksInternalLogUtils.kt

@@ -16,7 +16,7 @@ interface Store<S> {
     /**
      * return a subscription
      */
-    fun subscribe(storeSubscriber: StoreSubscriber<S>): StoreSubscription
+    fun subscribe(storeSubscriber: StoreSubscriber): StoreSubscription
 
     /**
      * replace current reducer with new one
@@ -44,12 +44,12 @@ operator fun ((action:Any) -> Any)?.invoke(action:Any):Any? =
 /**
  * extension method for directly provide a lambda as argument for store subscribe
  */
-fun <S> Store<S>.subscribe(lambda: () -> Unit) = this.subscribe(StoreSubscriberFn<S> { lambda() })
+fun <S> Store<S>.subscribe(lambda: () -> Unit) = this.subscribe { lambda() }
 
 /**
  * extension method for directly subscribing using a store subscriber builder
  */
-fun <S> Store<S>.subscribe(sb: StoreSubscriberBuilder<S>?) =if(sb!=null) this.subscribe(sb.build(this)) else null
+fun <S> Store<S>.subscribe(sb: StoreSubscriberBuilder<S>?) =if(sb!=null) this.subscribe(sb(this)) else null
 
 /**
  * extension method for checking at compile time that we only dispatch objects derived from
@@ -64,7 +64,3 @@ fun <S> Store<S>.dispatch_a(action: Action) = dispatch(action)
 fun <S> Store<S>.dispatch_sa(action: StandardAction) = dispatch(action)
 
 
-/**
- * extension method for obtained encapsulated [DispatcherFn] reference to the store [dispatch] method
- */
-fun <S> Store<S>.getDispatcherFn() =DispatcherFn(this.dispatch)

common/src/commonMain/kotlin/com/beyondeye/reduks/SimpleStore.kt

@@ -6,33 +6,29 @@ import com.beyondeye.reduks.middlewares.applyMiddleware
  * Factory for some specific Store type
  * Created by daely on 7/31/2016.
  */
-interface StoreCreator<S> {
-    /**
-     * create a new store associated to this specific factory type
-     */
-    fun create(reducer: Reducer<S>, initialState: S):Store<S>
-}
-fun<S> StoreCreator<S>.enhancedWith(vararg enhancers: StoreEnhancer<S>):StoreCreator<S> {
-    return combineEnhancers(*enhancers).enhance(this)
+typealias StoreCreator<S> = (reducer: Reducer<S>, initialState: S) -> Store<S>
+
+fun <S> StoreCreator<S>.enhancedWith(vararg enhancers: StoreEnhancer<S>): StoreCreator<S> {
+    return combineEnhancers(*enhancers)(this)
 }
 
-fun <S> StoreCreator<S>.withMiddlewares(vararg middlewares: Middleware<S>):StoreCreator<S> = StoreCreatorWithMiddlewares(this,*middlewares)
+fun <S> StoreCreator<S>.withMiddlewares(vararg middlewares: Middleware<S>): StoreCreator<S> = StoreCreatorWithMiddlewares(this, *middlewares)
 
-class StoreCreatorWithMiddlewares<S>(val creator:StoreCreator<S>,vararg middlewares_: Middleware<S>):StoreCreator<S> {
-    val middlewares=middlewares_
-    override fun create(reducer: Reducer<S>, initialState: S): Store<S> {
-        val res=creator.create(reducer,initialState)
-        return res.applyMiddleware(*middlewares)
+fun <S> StoreCreatorWithMiddlewares(creator: StoreCreator<S>, vararg middlewares: Middleware<S>): StoreCreator<S> {
+    return { reducer: Reducer<S>, initialState: S ->
+        val res = creator(reducer, initialState)
+        val store = res.applyMiddleware(*middlewares)
+        store
     }
 }
 
 /**
  * create an enhanced store
  * extension method, so we save on method count
  */
-fun<S> StoreCreator<S>.create(
+fun <S> StoreCreator<S>.create(
         reducer: Reducer<S>,
         initialState: S,
         enhancer: StoreEnhancer<S>): Store<S> {
-    return enhancer.enhance(this).create(reducer, initialState)
+    return enhancer(this)(reducer, initialState)
 }

common/src/commonMain/kotlin/com/beyondeye/reduks/Store.kt

@@ -3,10 +3,6 @@ package com.beyondeye.reduks
 /**
  * get a store creator and return a new enhanced one
  * see https://github.com/reactjs/redux/blob/master/docs/Glossary.md#store-enhancer
-
- * single method interface, mainly used because kotlin does not support yet type alias for function types
- * Created by daely on 8/23/2016.
  */
-interface StoreEnhancer<S> {
-    fun enhance(next: StoreCreator<S>): StoreCreator<S>
-}
+typealias StoreEnhancer<S> = (next: StoreCreator<S>) -> StoreCreator<S>
+

common/src/commonMain/kotlin/com/beyondeye/reduks/StoreCreator.kt

@@ -1,8 +1,3 @@
 package com.beyondeye.reduks
 
-/**
- * single method interface, mainly used because kotlin does not support yet type alias for function types
- */
-interface StoreSubscriber<S> {
-    fun onStateChange()
-}
+typealias StoreSubscriber = ()-> Unit