From 75b5adabe47440991d70be152d6a21f4bcd91605 Mon Sep 17 00:00:00 2001
From: Matt Ramotar <mramotar@dropbox.com>
Date: Fri, 31 Mar 2023 11:41:22 -0400
Subject: [PATCH 1/4] Separate MutableStoreBuilder from StoreBuilder

Signed-off-by: Matt Ramotar <mramotar@dropbox.com>
---
 .../store/store5/MutableStoreBuilder.kt       | 52 +++++++++++++
 .../store/store5/StoreBuilder.kt              | 36 ++++-----
 .../store5/impl/RealMutableStoreBuilder.kt    | 76 +++++++++++++++++++
 .../store/store5/impl/RealStoreBuilder.kt     | 44 ++++-------
 4 files changed, 156 insertions(+), 52 deletions(-)
 create mode 100644 store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
 create mode 100644 store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt

diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
new file mode 100644
index 000000000..b40b86cc6
--- /dev/null
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
@@ -0,0 +1,52 @@
+package org.mobilenativefoundation.store.store5
+
+import kotlinx.coroutines.CoroutineScope
+import org.mobilenativefoundation.store.store5.impl.mutableStoreBuilderFromFetcherAndSourceOfTruth
+
+interface MutableStoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any> {
+
+    fun <Response : Any> build(
+        updater: Updater<Key, Output, Response>,
+        bookkeeper: Bookkeeper<Key>? = null
+    ): MutableStore<Key, Output>
+
+    /**
+     * A store multicasts same [Output] value to many consumers (Similar to RxJava.share()), by default
+     *  [Store] will open a global scope for management of shared responses, if instead you'd like to control
+     *  the scope that sharing/multicasting happens in you can pass a @param [scope]
+     *
+     *   @param scope - scope to use for sharing
+     */
+    fun scope(scope: CoroutineScope): MutableStoreBuilder<Key, Network, Output, Local>
+
+    /**
+     * controls eviction policy for a store cache, use [MemoryPolicy.MemoryPolicyBuilder] to configure a TTL
+     *  or size based eviction
+     *  Example: MemoryPolicy.builder().setExpireAfterWrite(10.seconds).build()
+     */
+    fun cachePolicy(memoryPolicy: MemoryPolicy<Key, Output>?): MutableStoreBuilder<Key, Network, Output, Local>
+
+    /**
+     * by default a Store caches in memory with a default policy of max items = 100
+     */
+    fun disableCache(): MutableStoreBuilder<Key, Network, Output, Local>
+
+    fun converter(converter: Converter<Network, Output, Local>):
+            MutableStoreBuilder<Key, Network, Output, Local>
+
+    fun validator(validator: Validator<Output>): MutableStoreBuilder<Key, Network, Output, Local>
+
+    companion object {
+        /**
+         * Creates a new [MutableStoreBuilder] from a [Fetcher] and a [SourceOfTruth].
+         *
+         * @param fetcher a function for fetching a flow of network records.
+         * @param sourceOfTruth a [SourceOfTruth] for the store.
+         */
+        fun <Key : Any, Network : Any, Output : Any> from(
+            fetcher: Fetcher<Key, Network>,
+            sourceOfTruth: SourceOfTruth<Key, Output>
+        ): MutableStoreBuilder<Key, Network, Output, Output> =
+            mutableStoreBuilderFromFetcherAndSourceOfTruth(fetcher = fetcher, sourceOfTruth = sourceOfTruth)
+    }
+}
\ No newline at end of file
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
index da467d3c8..d61cfe00f 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
@@ -22,14 +22,9 @@ import org.mobilenativefoundation.store.store5.impl.storeBuilderFromFetcherAndSo
 /**
  * Main entry point for creating a [Store].
  */
-interface StoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any> {
+interface StoreBuilder<Key : Any, Output : Any> {
     fun build(): Store<Key, Output>
 
-    fun <Response : Any> build(
-        updater: Updater<Key, Output, Response>,
-        bookkeeper: Bookkeeper<Key>? = null
-    ): MutableStore<Key, Output>
-
     /**
      * A store multicasts same [Output] value to many consumers (Similar to RxJava.share()), by default
      *  [Store] will open a global scope for management of shared responses, if instead you'd like to control
@@ -37,35 +32,31 @@ interface StoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any> {
      *
      *   @param scope - scope to use for sharing
      */
-    fun scope(scope: CoroutineScope): StoreBuilder<Key, Network, Output, Local>
+    fun scope(scope: CoroutineScope): StoreBuilder<Key, Output>
 
     /**
      * controls eviction policy for a store cache, use [MemoryPolicy.MemoryPolicyBuilder] to configure a TTL
      *  or size based eviction
      *  Example: MemoryPolicy.builder().setExpireAfterWrite(10.seconds).build()
      */
-    fun cachePolicy(memoryPolicy: MemoryPolicy<Key, Output>?): StoreBuilder<Key, Network, Output, Local>
+    fun cachePolicy(memoryPolicy: MemoryPolicy<Key, Output>?): StoreBuilder<Key, Output>
 
     /**
      * by default a Store caches in memory with a default policy of max items = 100
      */
-    fun disableCache(): StoreBuilder<Key, Network, Output, Local>
-
-    fun converter(converter: Converter<Network, Output, Local>):
-        StoreBuilder<Key, Network, Output, Local>
+    fun disableCache(): StoreBuilder<Key, Output>
 
-    fun validator(validator: Validator<Output>): StoreBuilder<Key, Network, Output, Local>
+    fun validator(validator: Validator<Output>): StoreBuilder<Key, Output>
 
     companion object {
-
         /**
          * Creates a new [StoreBuilder] from a [Fetcher].
          *
          * @param fetcher a [Fetcher] flow of network records.
          */
-        fun <Key : Any, Network : Any, Output : Any> from(
-            fetcher: Fetcher<Key, Network>,
-        ): StoreBuilder<Key, Network, Output, *> = storeBuilderFromFetcher(fetcher = fetcher)
+        fun <Key : Any, Input : Any, Output : Any> from(
+            fetcher: Fetcher<Key, Input>,
+        ): StoreBuilder<Key, Output> = storeBuilderFromFetcher(fetcher = fetcher)
 
         /**
          * Creates a new [StoreBuilder] from a [Fetcher] and a [SourceOfTruth].
@@ -73,10 +64,11 @@ interface StoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any> {
          * @param fetcher a function for fetching a flow of network records.
          * @param sourceOfTruth a [SourceOfTruth] for the store.
          */
-        fun <Key : Any, Network : Any, Output : Any, Local : Any> from(
-            fetcher: Fetcher<Key, Network>,
-            sourceOfTruth: SourceOfTruth<Key, Local>
-        ): StoreBuilder<Key, Network, Output, Local> =
-            storeBuilderFromFetcherAndSourceOfTruth(fetcher = fetcher, sourceOfTruth = sourceOfTruth)
+        fun <Key : Any, Input : Any, Output : Any> from(
+            fetcher: Fetcher<Key, Input>,
+            sourceOfTruth: SourceOfTruth<Key, Input>
+        ): StoreBuilder<Key, Output> = storeBuilderFromFetcherAndSourceOfTruth(fetcher = fetcher, sourceOfTruth = sourceOfTruth)
     }
 }
+
+
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
new file mode 100644
index 000000000..3edd67bf2
--- /dev/null
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
@@ -0,0 +1,76 @@
+package org.mobilenativefoundation.store.store5.impl
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.GlobalScope
+import org.mobilenativefoundation.store.store5.Bookkeeper
+import org.mobilenativefoundation.store.store5.Converter
+import org.mobilenativefoundation.store.store5.Fetcher
+import org.mobilenativefoundation.store.store5.MemoryPolicy
+import org.mobilenativefoundation.store.store5.MutableStore
+import org.mobilenativefoundation.store.store5.MutableStoreBuilder
+import org.mobilenativefoundation.store.store5.SourceOfTruth
+import org.mobilenativefoundation.store.store5.Store
+import org.mobilenativefoundation.store.store5.StoreDefaults
+import org.mobilenativefoundation.store.store5.Updater
+import org.mobilenativefoundation.store.store5.Validator
+import org.mobilenativefoundation.store.store5.impl.extensions.asMutableStore
+
+
+fun <Key : Any, Output : Any, Network : Any, Local : Any> mutableStoreBuilderFromFetcherAndSourceOfTruth(
+    fetcher: Fetcher<Key, Network>,
+    sourceOfTruth: SourceOfTruth<Key, Local>,
+): MutableStoreBuilder<Key, Network, Output, Local> = RealMutableStoreBuilder(fetcher, sourceOfTruth)
+
+
+internal class RealMutableStoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any>(
+    private val fetcher: Fetcher<Key, Network>,
+    private val sourceOfTruth: SourceOfTruth<Key, Local>? = null,
+) : MutableStoreBuilder<Key, Network, Output, Local> {
+    private var scope: CoroutineScope? = null
+    private var cachePolicy: MemoryPolicy<Key, Output>? = StoreDefaults.memoryPolicy
+    private var converter: Converter<Network, Output, Local>? = null
+    private var validator: Validator<Output>? = null
+
+    override fun scope(scope: CoroutineScope): MutableStoreBuilder<Key, Network, Output, Local> {
+        this.scope = scope
+        return this
+    }
+
+    override fun cachePolicy(memoryPolicy: MemoryPolicy<Key, Output>?): MutableStoreBuilder<Key, Network, Output, Local> {
+        cachePolicy = memoryPolicy
+        return this
+    }
+
+    override fun disableCache(): MutableStoreBuilder<Key, Network, Output, Local> {
+        cachePolicy = null
+        return this
+    }
+
+    override fun validator(validator: Validator<Output>): MutableStoreBuilder<Key, Network, Output, Local> {
+        this.validator = validator
+        return this
+    }
+
+    override fun converter(converter: Converter<Network, Output, Local>): MutableStoreBuilder<Key, Network, Output, Local> {
+        this.converter = converter
+        return this
+    }
+
+    fun build(): Store<Key, Output> = RealStore(
+        scope = scope ?: GlobalScope,
+        sourceOfTruth = sourceOfTruth,
+        fetcher = fetcher,
+        memoryPolicy = cachePolicy,
+        converter = converter,
+        validator = validator
+    )
+
+    override fun <UpdaterResult : Any> build(
+        updater: Updater<Key, Output, UpdaterResult>,
+        bookkeeper: Bookkeeper<Key>?
+    ): MutableStore<Key, Output> =
+        build().asMutableStore<Key, Network, Output, Local, UpdaterResult>(
+            updater = updater,
+            bookkeeper = bookkeeper
+        )
+}
\ No newline at end of file
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
index e0cdbc80b..0158069a3 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
@@ -2,63 +2,56 @@ package org.mobilenativefoundation.store.store5.impl
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.GlobalScope
-import org.mobilenativefoundation.store.store5.Bookkeeper
 import org.mobilenativefoundation.store.store5.Converter
 import org.mobilenativefoundation.store.store5.Fetcher
 import org.mobilenativefoundation.store.store5.MemoryPolicy
-import org.mobilenativefoundation.store.store5.MutableStore
 import org.mobilenativefoundation.store.store5.SourceOfTruth
 import org.mobilenativefoundation.store.store5.Store
 import org.mobilenativefoundation.store.store5.StoreBuilder
 import org.mobilenativefoundation.store.store5.StoreDefaults
-import org.mobilenativefoundation.store.store5.Updater
 import org.mobilenativefoundation.store.store5.Validator
-import org.mobilenativefoundation.store.store5.impl.extensions.asMutableStore
 
-fun <Key : Any, Network : Any, Output : Any> storeBuilderFromFetcher(
-    fetcher: Fetcher<Key, Network>,
+
+fun <Key : Any, Input : Any, Output : Any> storeBuilderFromFetcher(
+    fetcher: Fetcher<Key, Input>,
     sourceOfTruth: SourceOfTruth<Key, *>? = null,
-): StoreBuilder<Key, Network, Output, *> = RealStoreBuilder(fetcher, sourceOfTruth)
+): StoreBuilder<Key, Output> = RealStoreBuilder(fetcher, sourceOfTruth)
+
+fun <Key : Any, Input : Any, Output : Any> storeBuilderFromFetcherAndSourceOfTruth(
+    fetcher: Fetcher<Key, Input>,
+    sourceOfTruth: SourceOfTruth<Key, *>,
+): StoreBuilder<Key, Output> = RealStoreBuilder(fetcher, sourceOfTruth)
 
-fun <Key : Any, Output : Any, Network : Any, Local : Any> storeBuilderFromFetcherAndSourceOfTruth(
-    fetcher: Fetcher<Key, Network>,
-    sourceOfTruth: SourceOfTruth<Key, Local>,
-): StoreBuilder<Key, Network, Output, Local> = RealStoreBuilder(fetcher, sourceOfTruth)
 
 internal class RealStoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any>(
     private val fetcher: Fetcher<Key, Network>,
     private val sourceOfTruth: SourceOfTruth<Key, Local>? = null
-) : StoreBuilder<Key, Network, Output, Local> {
+) : StoreBuilder<Key, Output> {
     private var scope: CoroutineScope? = null
     private var cachePolicy: MemoryPolicy<Key, Output>? = StoreDefaults.memoryPolicy
     private var converter: Converter<Network, Output, Local>? = null
     private var validator: Validator<Output>? = null
 
-    override fun scope(scope: CoroutineScope): StoreBuilder<Key, Network, Output, Local> {
+    override fun scope(scope: CoroutineScope): StoreBuilder<Key, Output> {
         this.scope = scope
         return this
     }
 
-    override fun cachePolicy(memoryPolicy: MemoryPolicy<Key, Output>?): StoreBuilder<Key, Network, Output, Local> {
+    override fun cachePolicy(memoryPolicy: MemoryPolicy<Key, Output>?): StoreBuilder<Key, Output> {
         cachePolicy = memoryPolicy
         return this
     }
 
-    override fun disableCache(): StoreBuilder<Key, Network, Output, Local> {
+    override fun disableCache(): StoreBuilder<Key, Output> {
         cachePolicy = null
         return this
     }
 
-    override fun validator(validator: Validator<Output>): StoreBuilder<Key, Network, Output, Local> {
+    override fun validator(validator: Validator<Output>): StoreBuilder<Key, Output> {
         this.validator = validator
         return this
     }
 
-    override fun converter(converter: Converter<Network, Output, Local>): StoreBuilder<Key, Network, Output, Local> {
-        this.converter = converter
-        return this
-    }
-
     override fun build(): Store<Key, Output> = RealStore(
         scope = scope ?: GlobalScope,
         sourceOfTruth = sourceOfTruth,
@@ -67,13 +60,4 @@ internal class RealStoreBuilder<Key : Any, Network : Any, Output : Any, Local :
         converter = converter,
         validator = validator
     )
-
-    override fun <UpdaterResult : Any> build(
-        updater: Updater<Key, Output, UpdaterResult>,
-        bookkeeper: Bookkeeper<Key>?
-    ): MutableStore<Key, Output> =
-        build().asMutableStore<Key, Network, Output, Local, UpdaterResult>(
-            updater = updater,
-            bookkeeper = bookkeeper
-        )
 }

From 36c8be8cca2aca956bcd71adbdfd258eeb766fd4 Mon Sep 17 00:00:00 2001
From: Matt Ramotar <mramotar@dropbox.com>
Date: Fri, 31 Mar 2023 14:22:37 -0400
Subject: [PATCH 2/4] Enable conversion from StoreBuilder to
 MutableStoreBuilder

Signed-off-by: Matt Ramotar <mramotar@dropbox.com>
---
 .../store/store5/MutableStoreBuilder.kt       |  6 +--
 .../store/store5/StoreBuilder.kt              |  3 ++
 .../store5/impl/RealMutableStoreBuilder.kt    |  8 +++-
 .../store/store5/impl/RealStoreBuilder.kt     | 38 +++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
index b40b86cc6..860b80c64 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
@@ -43,10 +43,10 @@ interface MutableStoreBuilder<Key : Any, Network : Any, Output : Any, Local : An
          * @param fetcher a function for fetching a flow of network records.
          * @param sourceOfTruth a [SourceOfTruth] for the store.
          */
-        fun <Key : Any, Network : Any, Output : Any> from(
+        fun <Key : Any, Network : Any, Output : Any, Local : Any> from(
             fetcher: Fetcher<Key, Network>,
-            sourceOfTruth: SourceOfTruth<Key, Output>
-        ): MutableStoreBuilder<Key, Network, Output, Output> =
+            sourceOfTruth: SourceOfTruth<Key, Local>
+        ): MutableStoreBuilder<Key, Network, Output, Local> =
             mutableStoreBuilderFromFetcherAndSourceOfTruth(fetcher = fetcher, sourceOfTruth = sourceOfTruth)
     }
 }
\ No newline at end of file
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
index d61cfe00f..a5a8407b7 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
@@ -25,6 +25,9 @@ import org.mobilenativefoundation.store.store5.impl.storeBuilderFromFetcherAndSo
 interface StoreBuilder<Key : Any, Output : Any> {
     fun build(): Store<Key, Output>
 
+
+    fun <Network : Any, Local : Any> toMutableStoreBuilder(): MutableStoreBuilder<Key, Network, Output, Local>
+
     /**
      * A store multicasts same [Output] value to many consumers (Similar to RxJava.share()), by default
      *  [Store] will open a global scope for management of shared responses, if instead you'd like to control
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
index 3edd67bf2..b532e10b7 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
@@ -16,12 +16,16 @@ import org.mobilenativefoundation.store.store5.Validator
 import org.mobilenativefoundation.store.store5.impl.extensions.asMutableStore
 
 
-fun <Key : Any, Output : Any, Network : Any, Local : Any> mutableStoreBuilderFromFetcherAndSourceOfTruth(
+fun <Key : Any, Network : Any, Output : Any, Local : Any> mutableStoreBuilderFromFetcher(
+    fetcher: Fetcher<Key, Network>,
+): MutableStoreBuilder<Key, Network, Output, Local> = RealMutableStoreBuilder(fetcher)
+
+
+fun <Key : Any, Network : Any, Output : Any, Local : Any> mutableStoreBuilderFromFetcherAndSourceOfTruth(
     fetcher: Fetcher<Key, Network>,
     sourceOfTruth: SourceOfTruth<Key, Local>,
 ): MutableStoreBuilder<Key, Network, Output, Local> = RealMutableStoreBuilder(fetcher, sourceOfTruth)
 
-
 internal class RealMutableStoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any>(
     private val fetcher: Fetcher<Key, Network>,
     private val sourceOfTruth: SourceOfTruth<Key, Local>? = null,
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
index 0158069a3..b07b5ff01 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNCHECKED_CAST")
+
 package org.mobilenativefoundation.store.store5.impl
 
 import kotlinx.coroutines.CoroutineScope
@@ -5,6 +7,7 @@ import kotlinx.coroutines.GlobalScope
 import org.mobilenativefoundation.store.store5.Converter
 import org.mobilenativefoundation.store.store5.Fetcher
 import org.mobilenativefoundation.store.store5.MemoryPolicy
+import org.mobilenativefoundation.store.store5.MutableStoreBuilder
 import org.mobilenativefoundation.store.store5.SourceOfTruth
 import org.mobilenativefoundation.store.store5.Store
 import org.mobilenativefoundation.store.store5.StoreBuilder
@@ -60,4 +63,39 @@ internal class RealStoreBuilder<Key : Any, Network : Any, Output : Any, Local :
         converter = converter,
         validator = validator
     )
+
+    override fun <Network : Any, Local : Any> toMutableStoreBuilder(): MutableStoreBuilder<Key, Network, Output, Local> {
+        val storeBuilder = this
+        fetcher as Fetcher<Key, Network>
+        return if (sourceOfTruth == null) {
+            mutableStoreBuilderFromFetcher<Key, Network, Output, Local>(fetcher).apply {
+                if (storeBuilder.scope != null) {
+                    scope(storeBuilder.scope!!)
+                }
+
+                if (storeBuilder.cachePolicy != null) {
+                    cachePolicy(storeBuilder.cachePolicy)
+                }
+
+                if (storeBuilder.validator != null) {
+                    validator(storeBuilder.validator!!)
+                }
+            }
+        } else {
+            sourceOfTruth as SourceOfTruth<Key, Local>
+            mutableStoreBuilderFromFetcherAndSourceOfTruth<Key, Network, Output, Local>(fetcher, sourceOfTruth).apply {
+                if (storeBuilder.scope != null) {
+                    scope(storeBuilder.scope!!)
+                }
+
+                if (storeBuilder.cachePolicy != null) {
+                    cachePolicy(storeBuilder.cachePolicy)
+                }
+
+                if (storeBuilder.validator != null) {
+                    validator(storeBuilder.validator!!)
+                }
+            }
+        }
+    }
 }

From 441de88ebd0f2937790466fe5cf4f7198d9a6ef3 Mon Sep 17 00:00:00 2001
From: Matt Ramotar <mramotar@dropbox.com>
Date: Fri, 31 Mar 2023 14:26:13 -0400
Subject: [PATCH 3/4] Clean up

Signed-off-by: Matt Ramotar <mramotar@dropbox.com>
---
 .../store/store5/impl/RealStoreBuilder.kt     | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
index b07b5ff01..e4dae7da3 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
@@ -65,36 +65,22 @@ internal class RealStoreBuilder<Key : Any, Network : Any, Output : Any, Local :
     )
 
     override fun <Network : Any, Local : Any> toMutableStoreBuilder(): MutableStoreBuilder<Key, Network, Output, Local> {
-        val storeBuilder = this
         fetcher as Fetcher<Key, Network>
         return if (sourceOfTruth == null) {
-            mutableStoreBuilderFromFetcher<Key, Network, Output, Local>(fetcher).apply {
-                if (storeBuilder.scope != null) {
-                    scope(storeBuilder.scope!!)
-                }
-
-                if (storeBuilder.cachePolicy != null) {
-                    cachePolicy(storeBuilder.cachePolicy)
-                }
-
-                if (storeBuilder.validator != null) {
-                    validator(storeBuilder.validator!!)
-                }
-            }
+            mutableStoreBuilderFromFetcher(fetcher)
         } else {
-            sourceOfTruth as SourceOfTruth<Key, Local>
-            mutableStoreBuilderFromFetcherAndSourceOfTruth<Key, Network, Output, Local>(fetcher, sourceOfTruth).apply {
-                if (storeBuilder.scope != null) {
-                    scope(storeBuilder.scope!!)
-                }
+            mutableStoreBuilderFromFetcherAndSourceOfTruth<Key, Network, Output, Local>(fetcher, sourceOfTruth as SourceOfTruth<Key, Local>)
+        }.apply {
+            if (this@RealStoreBuilder.scope != null) {
+                scope(this@RealStoreBuilder.scope!!)
+            }
 
-                if (storeBuilder.cachePolicy != null) {
-                    cachePolicy(storeBuilder.cachePolicy)
-                }
+            if (this@RealStoreBuilder.cachePolicy != null) {
+                cachePolicy(this@RealStoreBuilder.cachePolicy)
+            }
 
-                if (storeBuilder.validator != null) {
-                    validator(storeBuilder.validator!!)
-                }
+            if (this@RealStoreBuilder.validator != null) {
+                validator(this@RealStoreBuilder.validator!!)
             }
         }
     }

From 6599d390de78bfb3866d6d54438763f45cdc0f10 Mon Sep 17 00:00:00 2001
From: Matt Ramotar <mramotar@dropbox.com>
Date: Fri, 31 Mar 2023 16:20:49 -0400
Subject: [PATCH 4/4] Fix tests

Signed-off-by: Matt Ramotar <mramotar@dropbox.com>
---
 .../store/store5/MutableStoreBuilder.kt       |  4 ++--
 .../store/store5/StoreBuilder.kt              |  3 ---
 .../store5/impl/RealMutableStoreBuilder.kt    |  4 +---
 .../store/store5/impl/RealStoreBuilder.kt     |  2 --
 .../store/store5/ClearAllStoreTests.kt        |  2 +-
 .../store/store5/ClearStoreByKeyTests.kt      |  4 ++--
 .../store/store5/FetcherResponseTests.kt      |  2 +-
 .../store/store5/FlowStoreTests.kt            | 20 +++++++++----------
 .../store/store5/SourceOfTruthErrorsTests.kt  | 10 +++++-----
 .../store/store5/UpdaterTests.kt              |  6 +++---
 10 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
index 860b80c64..b665f40cf 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/MutableStoreBuilder.kt
@@ -32,7 +32,7 @@ interface MutableStoreBuilder<Key : Any, Network : Any, Output : Any, Local : An
     fun disableCache(): MutableStoreBuilder<Key, Network, Output, Local>
 
     fun converter(converter: Converter<Network, Output, Local>):
-            MutableStoreBuilder<Key, Network, Output, Local>
+        MutableStoreBuilder<Key, Network, Output, Local>
 
     fun validator(validator: Validator<Output>): MutableStoreBuilder<Key, Network, Output, Local>
 
@@ -49,4 +49,4 @@ interface MutableStoreBuilder<Key : Any, Network : Any, Output : Any, Local : An
         ): MutableStoreBuilder<Key, Network, Output, Local> =
             mutableStoreBuilderFromFetcherAndSourceOfTruth(fetcher = fetcher, sourceOfTruth = sourceOfTruth)
     }
-}
\ No newline at end of file
+}
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
index a5a8407b7..e46cb52d0 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/StoreBuilder.kt
@@ -25,7 +25,6 @@ import org.mobilenativefoundation.store.store5.impl.storeBuilderFromFetcherAndSo
 interface StoreBuilder<Key : Any, Output : Any> {
     fun build(): Store<Key, Output>
 
-
     fun <Network : Any, Local : Any> toMutableStoreBuilder(): MutableStoreBuilder<Key, Network, Output, Local>
 
     /**
@@ -73,5 +72,3 @@ interface StoreBuilder<Key : Any, Output : Any> {
         ): StoreBuilder<Key, Output> = storeBuilderFromFetcherAndSourceOfTruth(fetcher = fetcher, sourceOfTruth = sourceOfTruth)
     }
 }
-
-
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
index b532e10b7..a62c97f92 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealMutableStoreBuilder.kt
@@ -15,12 +15,10 @@ import org.mobilenativefoundation.store.store5.Updater
 import org.mobilenativefoundation.store.store5.Validator
 import org.mobilenativefoundation.store.store5.impl.extensions.asMutableStore
 
-
 fun <Key : Any, Network : Any, Output : Any, Local : Any> mutableStoreBuilderFromFetcher(
     fetcher: Fetcher<Key, Network>,
 ): MutableStoreBuilder<Key, Network, Output, Local> = RealMutableStoreBuilder(fetcher)
 
-
 fun <Key : Any, Network : Any, Output : Any, Local : Any> mutableStoreBuilderFromFetcherAndSourceOfTruth(
     fetcher: Fetcher<Key, Network>,
     sourceOfTruth: SourceOfTruth<Key, Local>,
@@ -77,4 +75,4 @@ internal class RealMutableStoreBuilder<Key : Any, Network : Any, Output : Any, L
             updater = updater,
             bookkeeper = bookkeeper
         )
-}
\ No newline at end of file
+}
diff --git a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
index e4dae7da3..8e4f7e9a7 100644
--- a/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
+++ b/store/src/commonMain/kotlin/org/mobilenativefoundation/store/store5/impl/RealStoreBuilder.kt
@@ -14,7 +14,6 @@ import org.mobilenativefoundation.store.store5.StoreBuilder
 import org.mobilenativefoundation.store.store5.StoreDefaults
 import org.mobilenativefoundation.store.store5.Validator
 
-
 fun <Key : Any, Input : Any, Output : Any> storeBuilderFromFetcher(
     fetcher: Fetcher<Key, Input>,
     sourceOfTruth: SourceOfTruth<Key, *>? = null,
@@ -25,7 +24,6 @@ fun <Key : Any, Input : Any, Output : Any> storeBuilderFromFetcherAndSourceOfTru
     sourceOfTruth: SourceOfTruth<Key, *>,
 ): StoreBuilder<Key, Output> = RealStoreBuilder(fetcher, sourceOfTruth)
 
-
 internal class RealStoreBuilder<Key : Any, Network : Any, Output : Any, Local : Any>(
     private val fetcher: Fetcher<Key, Network>,
     private val sourceOfTruth: SourceOfTruth<Key, Local>? = null
diff --git a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearAllStoreTests.kt b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearAllStoreTests.kt
index 25fdc5897..c89c47dab 100644
--- a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearAllStoreTests.kt
+++ b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearAllStoreTests.kt
@@ -43,7 +43,7 @@ class ClearAllStoreTests {
 
     @Test
     fun callingClearAllOnStoreWithPersisterAndNoInMemoryCacheDeletesAllEntriesFromThePersister() = testScope.runTest {
-        val store = StoreBuilder.from<String, Int, Int, Int>(
+        val store = StoreBuilder.from<String, Int, Int>(
             fetcher = fetcher,
             sourceOfTruth = persister.asSourceOfTruth()
         ).scope(testScope)
diff --git a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearStoreByKeyTests.kt b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearStoreByKeyTests.kt
index ef9fc8608..083015928 100644
--- a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearStoreByKeyTests.kt
+++ b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/ClearStoreByKeyTests.kt
@@ -24,7 +24,7 @@ class ClearStoreByKeyTests {
     fun callingClearWithKeyOnStoreWithPersisterWithNoInMemoryCacheDeletesTheEntryAssociatedWithTheKeyFromThePersister() = testScope.runTest {
         val key = "key"
         val value = 1
-        val store = StoreBuilder.from<String, Int, Int, Int>(
+        val store = StoreBuilder.from<String, Int, Int>(
             fetcher = Fetcher.of { value },
             sourceOfTruth = persister.asSourceOfTruth()
         ).scope(testScope)
@@ -107,7 +107,7 @@ class ClearStoreByKeyTests {
         val key2 = "key2"
         val value1 = 1
         val value2 = 2
-        val store = StoreBuilder.from<String, Int, Int, Int>(
+        val store = StoreBuilder.from<String, Int, Int>(
             fetcher = Fetcher.of { key ->
                 when (key) {
                     key1 -> value1
diff --git a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FetcherResponseTests.kt b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FetcherResponseTests.kt
index 1b7156c72..e1c36c968 100644
--- a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FetcherResponseTests.kt
+++ b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FetcherResponseTests.kt
@@ -211,6 +211,6 @@ class FetcherResponseTests {
         )
     }
 
-    private fun <Key : Any, Network : Any, Output : Any, Local : Any> StoreBuilder<Key, Network, Output, Local>.buildWithTestScope() =
+    private fun <Key : Any, Output : Any> StoreBuilder<Key, Output>.buildWithTestScope() =
         scope(testScope).build()
 }
diff --git a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FlowStoreTests.kt b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FlowStoreTests.kt
index c6008ddd9..68fa92cb0 100644
--- a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FlowStoreTests.kt
+++ b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/FlowStoreTests.kt
@@ -113,7 +113,7 @@ class FlowStoreTests {
             3 to "three-2"
         )
         val persister = InMemoryPersister<Int, String>()
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             fetcher = fetcher,
             sourceOfTruth = persister.asSourceOfTruth()
         ).buildWithTestScope()
@@ -184,7 +184,7 @@ class FlowStoreTests {
         )
         val persister = InMemoryPersister<Int, String>()
 
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             fetcher = fetcher,
             sourceOfTruth = persister.asSourceOfTruth()
         ).buildWithTestScope()
@@ -309,7 +309,7 @@ class FlowStoreTests {
         )
         val persister = InMemoryPersister<Int, String>()
 
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             fetcher = fetcher,
             sourceOfTruth = persister.asSourceOfTruth()
         )
@@ -357,7 +357,7 @@ class FlowStoreTests {
     @Test
     fun diskChangeWhileNetworkIsFlowing_simple() = testScope.runTest {
         val persister = InMemoryPersister<Int, String>().asFlowable()
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             Fetcher.ofFlow {
                 flow {
                     delay(20)
@@ -395,7 +395,7 @@ class FlowStoreTests {
     @Test
     fun diskChangeWhileNetworkIsFlowing_overwrite() = testScope.runTest {
         val persister = InMemoryPersister<Int, String>().asFlowable()
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             fetcher = Fetcher.ofFlow {
                 flow {
                     delay(10)
@@ -445,7 +445,7 @@ class FlowStoreTests {
     fun errorTest() = testScope.runTest {
         val exception = IllegalArgumentException("wow")
         val persister = InMemoryPersister<Int, String>().asFlowable()
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             Fetcher.of {
                 throw exception
             },
@@ -496,7 +496,7 @@ class FlowStoreTests {
     fun givenSourceOfTruthWhenStreamFreshDataReturnsNoDataFromFetcherThenFetchReturnsNoDataAndCachedValuesAreReceived() =
         testScope.runTest {
             val persister = InMemoryPersister<Int, String>().asFlowable()
-            val pipeline = StoreBuilder.from<Int, String, String, String>(
+            val pipeline = StoreBuilder.from<Int, String, String>(
                 fetcher = Fetcher.ofFlow { flow {} },
                 sourceOfTruth = persister.asSourceOfTruth()
             )
@@ -530,7 +530,7 @@ class FlowStoreTests {
     @Test
     fun givenSourceOfTruthWhenStreamCachedDataWithRefreshReturnsNoNewDataThenCachedValuesAreReceivedAndFetchReturnsNoData() = testScope.runTest {
         val persister = InMemoryPersister<Int, String>().asFlowable()
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             fetcher = Fetcher.ofFlow { flow {} },
             sourceOfTruth = persister.asSourceOfTruth()
         )
@@ -687,7 +687,7 @@ class FlowStoreTests {
             3 to "three-2"
         )
         val persister = InMemoryPersister<Int, String>()
-        val pipeline = StoreBuilder.from<Int, String, String, String>(
+        val pipeline = StoreBuilder.from<Int, String, String>(
             fetcher = fetcher,
             sourceOfTruth = persister.asSourceOfTruth()
         ).buildWithTestScope()
@@ -865,6 +865,6 @@ class FlowStoreTests {
         )
     )
 
-    private fun <Key : Any, Network : Any, Output : Any, Local : Any> StoreBuilder<Key, Network, Output, Local>.buildWithTestScope() =
+    private fun <Key : Any, Output : Any> StoreBuilder<Key, Output>.buildWithTestScope() =
         scope(testScope).build()
 }
diff --git a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/SourceOfTruthErrorsTests.kt b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/SourceOfTruthErrorsTests.kt
index c1660075f..3c235060c 100644
--- a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/SourceOfTruthErrorsTests.kt
+++ b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/SourceOfTruthErrorsTests.kt
@@ -31,7 +31,7 @@ class SourceOfTruthErrorsTests {
             3 to "b"
         )
         val pipeline = StoreBuilder
-            .from<Int, String, String, String>(
+            .from<Int, String, String>(
                 fetcher = fetcher,
                 sourceOfTruth = persister.asSourceOfTruth()
             )
@@ -65,7 +65,7 @@ class SourceOfTruthErrorsTests {
             3 to "b"
         )
         val pipeline = StoreBuilder
-            .from<Int, String, String, String>(
+            .from<Int, String, String>(
                 fetcher = fetcher,
                 sourceOfTruth = persister.asSourceOfTruth()
             )
@@ -110,7 +110,7 @@ class SourceOfTruthErrorsTests {
             flowOf("a", "b", "c", "d")
         }
         val pipeline = StoreBuilder
-            .from<Int, String, String, String>(
+            .from<Int, String, String>(
                 fetcher = fetcher,
                 sourceOfTruth = persister.asSourceOfTruth()
             )
@@ -240,7 +240,7 @@ class SourceOfTruthErrorsTests {
             }
         }
         val pipeline = StoreBuilder
-            .from<Int, String, String, String>(
+            .from<Int, String, String>(
                 fetcher = fetcher,
                 sourceOfTruth = persister.asSourceOfTruth()
             )
@@ -334,7 +334,7 @@ class SourceOfTruthErrorsTests {
             val persister = InMemoryPersister<Int, String>()
             val fetcher = Fetcher.of { _: Int -> "a" }
             val pipeline = StoreBuilder
-                .from<Int, String, String, String>(
+                .from<Int, String, String>(
                     fetcher = fetcher,
                     sourceOfTruth = persister.asSourceOfTruth()
                 )
diff --git a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/UpdaterTests.kt b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/UpdaterTests.kt
index ce49efcbb..a5502a1a3 100644
--- a/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/UpdaterTests.kt
+++ b/store/src/commonTest/kotlin/org/mobilenativefoundation/store/store5/UpdaterTests.kt
@@ -55,7 +55,7 @@ class UpdaterTests {
             clearAll = bookkeeping::clear
         )
 
-        val store = StoreBuilder.from<String, NetworkNote, CommonNote, SOTNote>(
+        val store = MutableStoreBuilder.from<String, NetworkNote, CommonNote, SOTNote>(
             fetcher = Fetcher.of { key -> api.get(key, ttl = ttl) },
             sourceOfTruth = SourceOfTruth.of(
                 nonFlowReader = { key -> notes.get(key) },
@@ -130,7 +130,7 @@ class UpdaterTests {
             clearAll = bookkeeping::clear
         )
 
-        val store = StoreBuilder.from<String, NetworkNote, CommonNote, SOTNote>(
+        val store = MutableStoreBuilder.from<String, NetworkNote, CommonNote, SOTNote>(
             fetcher = Fetcher.of { key -> api.get(key, ttl = ttl) },
             sourceOfTruth = SourceOfTruth.of(
                 nonFlowReader = { key -> notes.get(key) },
@@ -187,7 +187,7 @@ class UpdaterTests {
             clearAll = bookkeeping::clear
         )
 
-        val store = StoreBuilder.from<String, NetworkNote, CommonNote, SOTNote>(
+        val store = MutableStoreBuilder.from<String, NetworkNote, CommonNote, SOTNote>(
             fetcher = Fetcher.ofFlow { key ->
                 val network = api.get(key)
                 flow { emit(network) }