feat: MultiSearcher, HitsSearcher and FacetsSearcher

build.gradle

@@ -1,10 +1,10 @@
 buildscript {
-    ext.kotlin_version = "1.5.31"
+    ext.kotlin_version = "1.6.10"
     ext.lifecycle_version = "2.2.0"
-    ext.build_tools_version = "31.0.0"
-    ext.instantsearch = '2.11.4'
-    ext.canary = '2.7'
-    ext.compose_version = '1.0.5'
+    ext.build_tools_version = "32.0.0"
+    ext.instantsearch = '3.0.0-SNAPSHOT'
+    ext.canary = '2.8.1'
+    ext.compose_version = '1.1.1'
     repositories {
         mavenCentral()
         google()

exchange/categories-hits/src/main/kotlin/com/algolia/exchange/query/categories/hits/MainViewModel.kt

@@ -5,30 +5,26 @@ import com.algolia.instantsearch.compose.hits.HitsState
 import com.algolia.instantsearch.compose.searchbox.SearchBoxState
 import com.algolia.instantsearch.core.connection.ConnectionHandler
 import com.algolia.instantsearch.core.hits.connectHitsView
-import com.algolia.instantsearch.helper.searchbox.SearchBoxConnector
-import com.algolia.instantsearch.helper.searchbox.connectView
-import com.algolia.instantsearch.helper.searcher.facets.addFacetsSearcher
-import com.algolia.instantsearch.helper.searcher.hits.addHitsSearcher
-import com.algolia.instantsearch.helper.searcher.multi.MultiSearcher
-import com.algolia.search.client.ClientSearch
+import com.algolia.instantsearch.searchbox.SearchBoxConnector
+import com.algolia.instantsearch.searchbox.connectView
+import com.algolia.instantsearch.searcher.facets.addFacetsSearcher
+import com.algolia.instantsearch.searcher.hits.addHitsSearcher
+import com.algolia.instantsearch.searcher.multi.MultiSearcher
 import com.algolia.search.helper.deserialize
 import com.algolia.search.model.APIKey
 import com.algolia.search.model.ApplicationID
 import com.algolia.search.model.Attribute
 import com.algolia.search.model.IndexName
 import com.algolia.search.model.search.Facet
-import io.ktor.client.features.logging.*
 
 class MainViewModel : ViewModel() {
 
-    private val client = ClientSearch(
-        ApplicationID("latency"),
-        APIKey("afc3dd66dd1293e2e2736a5a51b05c0a"),
-        LogLevel.ALL
+    private val multiSearcher = MultiSearcher(
+        applicationID = ApplicationID("latency"),
+        apiKey = APIKey("1f6fd3a6fb973cb08419fe7d288fa4db")
     )
     private val indexName = IndexName("instant_search")
     private val attribute = Attribute("categories")
-    private val multiSearcher = MultiSearcher(client)
     private val suggestionsSearcher = multiSearcher.addHitsSearcher(indexName)
     private val categoriesSearcher = multiSearcher.addFacetsSearcher(indexName, attribute)
     private val searchBoxConnector = SearchBoxConnector(multiSearcher)

exchange/multi-index/src/main/kotlin/com/algolia/exchange/multi/index/Actor.kt

@@ -1,6 +1,6 @@
 package com.algolia.exchange.multi.index
 
-import com.algolia.instantsearch.helper.highlighting.Highlightable
+import com.algolia.instantsearch.highlighting.Highlightable
 import com.algolia.search.model.Attribute
 import com.algolia.search.model.ObjectID
 import com.algolia.search.model.indexing.Indexable

exchange/multi-index/src/main/kotlin/com/algolia/exchange/multi/index/MainViewModel.kt

@@ -5,26 +5,22 @@ import com.algolia.instantsearch.compose.hits.HitsState
 import com.algolia.instantsearch.compose.searchbox.SearchBoxState
 import com.algolia.instantsearch.core.connection.ConnectionHandler
 import com.algolia.instantsearch.core.hits.connectHitsView
-import com.algolia.instantsearch.helper.searchbox.SearchBoxConnector
-import com.algolia.instantsearch.helper.searchbox.connectView
-import com.algolia.instantsearch.helper.searcher.hits.addHitsSearcher
-import com.algolia.instantsearch.helper.searcher.multi.MultiSearcher
-import com.algolia.search.client.ClientSearch
+import com.algolia.instantsearch.searchbox.SearchBoxConnector
+import com.algolia.instantsearch.searchbox.connectView
+import com.algolia.instantsearch.searcher.hits.addHitsSearcher
+import com.algolia.instantsearch.searcher.multi.MultiSearcher
 import com.algolia.search.helper.deserialize
 import com.algolia.search.model.APIKey
 import com.algolia.search.model.ApplicationID
 import com.algolia.search.model.IndexName
 import com.algolia.search.model.search.Query
-import io.ktor.client.features.logging.*
 
 class MainViewModel : ViewModel() {
 
-    private val client = ClientSearch(
-        ApplicationID("latency"),
-        APIKey("1f6fd3a6fb973cb08419fe7d288fa4db"),
-        LogLevel.ALL
+    private val multiSearcher = MultiSearcher(
+        applicationID = ApplicationID("latency"),
+        apiKey = APIKey("1f6fd3a6fb973cb08419fe7d288fa4db")
     )
-    private val multiSearcher = MultiSearcher(client)
     private val actorsSearcher = multiSearcher.addHitsSearcher(IndexName("mobile_demo_actors"), Query(hitsPerPage = 5))
     private val moviesSearcher = multiSearcher.addHitsSearcher(IndexName("mobile_demo_movies"))
     private val searchBoxConnector = SearchBoxConnector(multiSearcher)

exchange/multi-index/src/main/kotlin/com/algolia/exchange/multi/index/Movie.kt

@@ -1,6 +1,6 @@
 package com.algolia.exchange.multi.index
 
-import com.algolia.instantsearch.helper.highlighting.Highlightable
+import com.algolia.instantsearch.highlighting.Highlightable
 import com.algolia.search.model.Attribute
 import com.algolia.search.model.ObjectID
 import com.algolia.search.model.indexing.Indexable

exchange/query-suggestions-categories/src/main/kotlin/com/algolia/exchange/query/suggestions/categories/MainViewModel.kt

@@ -1,38 +1,28 @@
 package com.algolia.exchange.query.suggestions.categories
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import com.algolia.instantsearch.compose.hits.HitsState
 import com.algolia.instantsearch.compose.searchbox.SearchBoxState
 import com.algolia.instantsearch.core.connection.ConnectionHandler
 import com.algolia.instantsearch.core.hits.connectHitsView
-import com.algolia.instantsearch.core.selectable.list.SelectionMode
-import com.algolia.instantsearch.helper.filter.facet.FacetListConnector
-import com.algolia.instantsearch.helper.filter.state.FilterState
-import com.algolia.instantsearch.helper.searchbox.SearchBoxConnector
-import com.algolia.instantsearch.helper.searchbox.connectSearcher
-import com.algolia.instantsearch.helper.searchbox.connectView
-import com.algolia.instantsearch.helper.searcher.connectFilterState
-import com.algolia.instantsearch.helper.searcher.facets.addFacetsSearcher
-import com.algolia.instantsearch.helper.searcher.hits.addHitsSearcher
-import com.algolia.instantsearch.helper.searcher.multi.MultiSearcher
-import com.algolia.search.client.ClientSearch
+import com.algolia.instantsearch.searchbox.SearchBoxConnector
+import com.algolia.instantsearch.searchbox.connectView
+import com.algolia.instantsearch.searcher.facets.addFacetsSearcher
+import com.algolia.instantsearch.searcher.hits.addHitsSearcher
+import com.algolia.instantsearch.searcher.multi.MultiSearcher
 import com.algolia.search.helper.deserialize
 import com.algolia.search.model.APIKey
 import com.algolia.search.model.ApplicationID
 import com.algolia.search.model.Attribute
 import com.algolia.search.model.IndexName
 import com.algolia.search.model.search.Facet
-import io.ktor.client.features.logging.*
 
 class MainViewModel : ViewModel() {
 
-    private val client = ClientSearch(
-        ApplicationID("latency"),
-        APIKey("afc3dd66dd1293e2e2736a5a51b05c0a"),
-        LogLevel.ALL
+    private val multiSearcher = MultiSearcher(
+        applicationID = ApplicationID("latency"),
+        apiKey = APIKey("afc3dd66dd1293e2e2736a5a51b05c0a"),
     )
-    private val multiSearcher = MultiSearcher(client)
     private val suggestionsSearcher = multiSearcher.addHitsSearcher(
         indexName = IndexName("instantsearch_query_suggestions")
     )
@@ -52,7 +42,11 @@ class MainViewModel : ViewModel() {
     init {
         connections += searchBoxConnector.connectView(searchBoxState)
         connections += categoriesSearcher.connectHitsView(categoriesState) { it.facets }
-        connections += suggestionsSearcher.connectHitsView(suggestionsState) { it.hits.deserialize(Suggestion.serializer()) }
+        connections += suggestionsSearcher.connectHitsView(suggestionsState) {
+            it.hits.deserialize(
+                Suggestion.serializer()
+            )
+        }
         multiSearcher.searchAsync()
     }