Move DSL builder functions out of the companion objects (#93)

91 files changed, 1649 insertions, 1787 deletions

diff --git a/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt b/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt
index b7cf18ec..3170e462 100644
--- a/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt
+++ b/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTime.kt
@@ -267,19 +267,19 @@ open class DateTime(
 
     companion object {
         internal var counter = 0
-
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.dateTime(
-            value: Date? = null, name: String? = null, format: String = "YYYY-MM-DD HH:mm", label: String? = null,
-            rich: Boolean = false, init: (DateTime.() -> Unit)? = null
-        ): DateTime {
-            val dateTime = DateTime(value, name, format, label, rich).apply { init?.invoke(this) }
-            this.add(dateTime)
-            return dateTime
-        }
     }
 }
+
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.dateTime(
+    value: Date? = null, name: String? = null, format: String = "YYYY-MM-DD HH:mm", label: String? = null,
+    rich: Boolean = false, init: (DateTime.() -> Unit)? = null
+): DateTime {
+    val dateTime = DateTime(value, name, format, label, rich).apply { init?.invoke(this) }
+    this.add(dateTime)
+    return dateTime
+}
diff --git a/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTimeInput.kt b/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTimeInput.kt
index 626346b1..178fbeaa 100644
--- a/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTimeInput.kt
+++ b/kvision-modules/kvision-bootstrap-datetime/src/main/kotlin/pl/treksoft/kvision/form/time/DateTimeInput.kt
@@ -28,8 +28,8 @@ import pl.treksoft.kvision.form.FormInput
 import pl.treksoft.kvision.form.text.TextInput
 import pl.treksoft.kvision.html.Div
 import pl.treksoft.kvision.html.Icon
-import pl.treksoft.kvision.html.Icon.Companion.icon
-import pl.treksoft.kvision.html.Span.Companion.span
+import pl.treksoft.kvision.html.icon
+import pl.treksoft.kvision.html.span
 import pl.treksoft.kvision.i18n.I18n
 import pl.treksoft.kvision.panel.SimplePanel
 import pl.treksoft.kvision.types.toDateF
@@ -358,20 +358,18 @@ open class DateTimeInput(
     override fun blur() {
         input.blur()
     }
+}
 
-    companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun Container.dateTimeInput(
-            value: Date? = null, format: String = "YYYY-MM-DD HH:mm", classes: Set<String> = setOf(),
-            init: (DateTimeInput.() -> Unit)? = null
-        ): DateTimeInput {
-            val dateTimeInput = DateTimeInput(value, format, classes).apply { init?.invoke(this) }
-            this.add(dateTimeInput)
-            return dateTimeInput
-        }
-    }
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun Container.dateTimeInput(
+    value: Date? = null, format: String = "YYYY-MM-DD HH:mm", classes: Set<String> = setOf(),
+    init: (DateTimeInput.() -> Unit)? = null
+): DateTimeInput {
+    val dateTimeInput = DateTimeInput(value, format, classes).apply { init?.invoke(this) }
+    this.add(dateTimeInput)
+    return dateTimeInput
 }
diff --git a/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemote.kt b/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemote.kt
index de823280..930bea32 100644
--- a/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemote.kt
+++ b/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemote.kt
@@ -245,32 +245,32 @@ open class SelectRemote<T : Any>(
 
     companion object {
         internal var counter = 0
-
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun <T : Any> Container.selectRemote(
-            value: String? = null,
-            serviceManager: KVServiceManager<T>,
-            function: T.(String?, String?) -> List<RemoteOption>, name: String? = null,
-            multiple: Boolean = false, ajaxOptions: AjaxOptions? = null, label: String? = null,
-            rich: Boolean = false, init: (SelectRemote<T>.() -> Unit)? = null
-        ): SelectRemote<T> {
-            val selectRemote =
-                SelectRemote(
-                    value,
-                    serviceManager,
-                    function,
-                    name,
-                    multiple,
-                    ajaxOptions,
-                    label,
-                    rich
-                ).apply { init?.invoke(this) }
-            this.add(selectRemote)
-            return selectRemote
-        }
     }
 }
+
+/**
+ * DSL builder extension function.
+ *
+ * It takes the same parameters as the constructor of the built component.
+ */
+fun <T : Any> Container.selectRemote(
+    value: String? = null,
+    serviceManager: KVServiceManager<T>,
+    function: T.(String?, String?) -> List<RemoteOption>, name: String? = null,
+    multiple: Boolean = false, ajaxOptions: AjaxOptions? = null, label: String? = null,
+    rich: Boolean = false, init: (SelectRemote<T>.() -> Unit)? = null
+): SelectRemote<T> {
+    val selectRemote =
+        SelectRemote(
+            value,
+            serviceManager,
+            function,
+            name,
+            multiple,
+            ajaxOptions,
+            label,
+            rich
+        ).apply { init?.invoke(this) }
+    this.add(selectRemote)
+    return selectRemote
+}
diff --git a/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt b/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt
index 4c891d30..5a795c9c 100644
--- a/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt
+++ b/kvision-modules/kvision-bootstrap-select-remote/src/main/kotlin/pl/treksoft/kvision/form/select/SelectRemoteInput.kt
@@ -113,28 +113,25 @@ open class SelectRemoteInput<T : Any>(
 
         }
     }
+}
 
-    companion object {
-        /**
-         * DSL builder extension function.
-         *
-         * It takes the same parameters as the constructor of the built component.
-         */
-        fun <T : Any> Container.selectRemoteInput(
-            value: String? = null,
-            serviceManager: KVServiceManager<T>,
-            function: T.(String?, String?) -> List<RemoteOption>,
-            multiple: Boolean = false,
-            ajaxOptions: AjaxOptions? = null,
-            classes: Set<String> = setOf(), init: (SelectRemoteInput<T>.() -> Unit)? = null
-        ): SelectRemoteInput<T> {
-            val selectRemoteInput =
-                SelectRemoteInput(value, serviceManager, function, multiple, ajaxOptions, classes).apply {
-