Add Options builder

kable-core/src/jsMain/kotlin/Bluetooth.kt

@@ -103,7 +103,7 @@ private fun Options.filters(): List<BluetoothLEScanFilterInit> =
     if (filterSets?.isNotEmpty() == true) {
         filterSets.toBluetoothLEScanFilterInit()
     } else {
-        FiltersBuilder().apply(filters).build().toBluetoothLEScanFilterInit()
+        filterPredicates.toBluetoothLEScanFilterInit()
     }
 
 // Note: Web Bluetooth requires that UUIDs be provided as lowercase strings.

kable-core/src/jsMain/kotlin/Options.kt

@@ -3,10 +3,19 @@ package com.juul.kable
 import com.benasher44.uuid.Uuid
 
 /** https://developer.mozilla.org/en-US/docs/Web/API/Bluetooth/requestDevice */
-public data class Options(
+public fun Options(builder: OptionsBuilder.() -> Unit): Options =
+    OptionsBuilder().apply(builder).build()
+
+// Deprecation notice acts to inform consumer, `Options` class itself is not intended to be removed.
+@Deprecated(
+    message = "Use Options builder instead.",
+    replaceWith = ReplaceWith("Options { }"),
+)
+public data class Options internal constructor(
+
     @Deprecated(
         message = "Replaced with filters builder DSL",
-        replaceWith = ReplaceWith("filters = { }"),
+        replaceWith = ReplaceWith("Options { filters { } }"),
         level = DeprecationLevel.WARNING,
     )
     val filterSets: List<FilterSet>? = null,
@@ -17,17 +26,11 @@ public data class Options(
      *
      * https://webbluetoothcg.github.io/web-bluetooth/#device-discovery
      */
+    @Deprecated(
+        message = "Use Options builder instead.",
+        replaceWith = ReplaceWith("Options { optionalServices = listOf() }"),
+    )
     val optionalServices: List<Uuid>? = null,
 
-    /**
-     * Filters to apply when requesting devices. If predicates are non-empty, then only devices
-     * that match at least one of the predicates will appear in the `requestDevice` picker.
-     *
-     * Filtering on Service Data is not supported because it is not implemented:
-     * https://github.com/WebBluetoothCG/web-bluetooth/blob/main/implementation-status.md
-     *
-     * Filtering on Manufacturer Data is supported and a good explanation can be found here:
-     * https://github.com/WebBluetoothCG/web-bluetooth/blob/main/data-filters-explainer.md
-     */
-    val filters: FiltersBuilder.() -> Unit = { },
+    internal val filterPredicates: List<FilterPredicate>,
 )

kable-core/src/jsMain/kotlin/OptionsBuilder.kt

@@ -0,0 +1,32 @@
+package com.juul.kable
+
+import com.benasher44.uuid.Uuid
+
+public class OptionsBuilder internal constructor() {
+
+    private var filterPredicates: List<FilterPredicate> = emptyList()
+
+    /**
+     * Filters to apply when requesting devices. If predicates are non-empty, then only devices
+     * that match at least one of the predicates will appear in the `requestDevice` picker.
+     *
+     * Filtering on Service Data is not supported because it is not implemented:
+     * https://github.com/WebBluetoothCG/web-bluetooth/blob/main/implementation-status.md
+     *
+     * Filtering on Manufacturer Data is supported and a good explanation can be found here:
+     * https://github.com/WebBluetoothCG/web-bluetooth/blob/main/data-filters-explainer.md
+     */
+    public fun filters(builder: FiltersBuilder.() -> Unit) {
+        filterPredicates = FiltersBuilder().apply(builder).build()
+    }
+
+    /**
+     * Access is only granted to services listed as [service filters][Filter.Service] in [filters].
+     * If any additional services need to be accessed, they must be specified in [optionalServices].
+     *
+     * https://webbluetoothcg.github.io/web-bluetooth/#device-discovery
+     */
+    public var optionalServices: List<Uuid>? = null
+
+    internal fun build() = Options(null, optionalServices, filterPredicates)
+}