WIP

Author: Andras

instantsearch/src/commonMain/kotlin/com/algolia/instantsearch/filter/range/internal/FilterRangeConnectionSearcherImpl.kt

@@ -23,7 +23,7 @@ internal class FilterRangeConnectionSearcherImpl<T>(
     private val viewModel: FilterRangeViewModel<T>,
     private val searcher: SearcherForHits<*>,
     private val attribute: String,
-    private val mapper: (Number?) -> T,
+    private val mapper: (Number) -> T,
 ) : AbstractConnection() where T : Number, T : Comparable<T> {
 
     private val responseSubscription: (SearchResponse?) -> Unit = { response ->
@@ -39,11 +39,11 @@ internal class FilterRangeConnectionSearcherImpl<T>(
     private fun <T> FilterRangeViewModel<T>.computeBoundsFromFacetStats(
         attribute: String,
         facetStats: Map<String, FacetStats>?,
-        mapper: (Number?) -> T,
+        mapper: (Number) -> T,
     ) where T : Number, T : Comparable<T> {
         bounds.value = facetStats?.get(attribute)?.let {
-            val min = mapper(it.min)
-            val max = mapper(it.max)
+            val min = mapper(it.min ?: 0)
+            val max = mapper(it.max ?: 0)
             Range(min, max)
         }
         if (range.value == null) { // if no range is specified, match the bounds.

instantsearch/src/commonMain/kotlin/com/algolia/instantsearch/hierarchical/HierarchicalViewModel.kt

@@ -13,7 +13,7 @@ import com.algolia.instantsearch.filter.Facet
  */
 public open class HierarchicalViewModel(
     public val attribute: String,
-    public val hierarchicalAttributes: List<Attribute>,
+    public val hierarchicalAttributes: List<String>,
     public val separator: String,
     tree: HierarchicalTree = HierarchicalTree(),
 ) : TreeViewModel<String, Facet>(tree) {

instantsearch/src/commonMain/kotlin/com/algolia/instantsearch/hierarchical/internal/HierarchicalConnectionSearcher.kt

@@ -3,6 +3,7 @@ package com.algolia.instantsearch.hierarchical.internal
 import com.algolia.client.model.search.SearchResponse
 import com.algolia.instantsearch.core.Callback
 import com.algolia.instantsearch.core.connection.AbstractConnection
+import com.algolia.instantsearch.filter.Facet
 import com.algolia.instantsearch.hierarchical.HierarchicalViewModel
 import com.algolia.instantsearch.searcher.SearcherForHits
 import com.algolia.instantsearch.searcher.addFacet
@@ -14,8 +15,7 @@ internal data class HierarchicalConnectionSearcher(
 
     private val updateTree: Callback<SearchResponse?> = { response ->
         if (response != null) {
-            val facets = response.hierarchicalFacetsOrNull
-                ?: response.facetsOrNull?.filter { it.key == viewModel.hierarchicalAttributes.first() } ?: mapOf()
+            val facets = response.facets?.filter { it.key == viewModel.hierarchicalAttributes.first() } ?: mapOf()
 
             viewModel.tree.value = viewModel.hierarchicalAttributes
                 .mapNotNull { facets[it]?.toMutableList() }

instantsearch/src/commonMain/kotlin/com/algolia/instantsearch/relateditems/internal/extensions/MatchingPattern.kt

@@ -4,6 +4,7 @@ import com.algolia.instantsearch.filter.state.FilterState
 import com.algolia.instantsearch.filter.state.groupAnd
 import com.algolia.instantsearch.filter.state.groupOr
 import com.algolia.instantsearch.filter.Filter
+import com.algolia.instantsearch.filter.FilterGroupsConverter
 import com.algolia.instantsearch.relateditems.MatchingPattern
 import com.algolia.instantsearch.relateditems.internal.FilterFacetAndID
 

instantsearch/src/commonMain/kotlin/com/algolia/instantsearch/searcher/Extensions.kt

@@ -1,15 +1,14 @@
 package com.algolia.instantsearch.searcher
 
-import com.algolia.search.model.Attribute
-import com.algolia.search.model.params.CommonSearchParameters
+import com.algolia.client.model.search.SearchParamsObject
 
-public fun CommonSearchParameters.addFacet(vararg attribute: String) {
+public fun SearchParamsObject.addFacet(vararg attribute: String) {
     facets = facets.orEmpty().toMutableSet().also {
         it += attribute
     }
 }
 
-public fun CommonSearchParameters.removeFacet(attribute: String) {
+public fun SearchParamsObject.removeFacet(attribute: String) {
     facets = facets.orEmpty().toMutableSet().also {
         it -= attribute
     }