Kotbot 1.6.0

Author: IRus

README.md

@@ -5,12 +5,12 @@
 * [Tgkotbot](https://github.com/Heapy/kotbot/tree/main/tgkotbot#readme) – Bot implementation for needs
   of [Kotlin Community](https://t.me/kotlin_lang) in the telegram
 
-## Bot API 9.4
+## Bot API 9.5
 
 ### Install the library
 
 ```kotlin
-implementation("io.heapy.kotbot:core:1.5.0")
+implementation("io.heapy.kotbot:core:1.6.0")
 ```
 
 ### Example

api-parser/src/main/kotlin/io/heapy/kotbot/apiparser/HtmlExtractor.kt

@@ -45,8 +45,6 @@ data class RawField(
 )
 
 object HtmlExtractor {
-    private val RELEVANT_TAGS = setOf("h3", "h4", "p", "table", "ul")
-
     fun extract(html: String): ExtractedApi {
         val doc = Jsoup.parse(html)
         val content = doc.select("#dev_page_content").first()
@@ -118,7 +116,7 @@ object HtmlExtractor {
                     i++
                 }
                 is State.GetDescription -> {
-                    val s = state as State.GetDescription
+                    val s = state
                     if (tag == "p" || tag == "ul") {
                         s.description.add(elem)
                         i++
@@ -136,7 +134,7 @@ object HtmlExtractor {
                         } else {
                             // For objects with a UL as last description + elements UL
                             if (hasNextUl && !isMethod) {
-                                s.description.add(nextElem!!)
+                                s.description.add(nextElem)
                             }
 
                             when {
@@ -176,7 +174,7 @@ object HtmlExtractor {
                     }
                 }
                 is State.GetObjectFields -> {
-                    val s = state as State.GetObjectFields
+                    val s = state
                     if (tag == "table") {
                         val fields = extractFields(elem)
                         objects.add(RawObject(
@@ -190,7 +188,7 @@ object HtmlExtractor {
                     i++
                 }
                 is State.GetMethodFields -> {
-                    val s = state as State.GetMethodFields
+                    val s = state
                     if (tag == "table") {
                         val args = extractArguments(elem)
                         methods.add(RawMethod(
@@ -204,7 +202,7 @@ object HtmlExtractor {
                     i++
                 }
                 is State.GetObjectElements -> {
-                    val s = state as State.GetObjectElements
+                    val s = state
                     if (tag == "ul") {
                         val elems = elem.select("li").map { it.plainText() }
                         objects.add(RawObject(

core-gen/src/main/kotlin/Generate.kt

@@ -38,7 +38,7 @@ import io.heapy.kotbot.apiparser.model.nullable
 import kotlin.io.path.Path
 
 fun main() {
-    val apiResource = "api940"
+    val apiResource = "api950"
     val apiHtml = {}::class.java
         .getResource(apiResource)
         ?.readText()

core-gen/src/main/kotlin/Parse.kt

@@ -2,7 +2,6 @@
 
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Element
-import org.jsoup.select.Elements
 import kotlin.io.path.Path
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
@@ -31,6 +30,7 @@ fun main() {
         "api900",
         "api920",
         "api940",
+        "api950",
     ).forEach { v ->
         val input = rootPath.resolve(v).readText()
         val output = processVersion(input)
@@ -96,48 +96,3 @@ fun processVersion(input: String): String {
         }
     }
 }
-
-fun buildGraph(children: Elements) {
-    val root = Element("h0")
-    val tree = mutableMapOf<Element, MutableList<Element>>(root to mutableListOf())
-    val stack = ArrayDeque(listOf(root))
-
-    children.forEach { el ->
-        when (el.tagName()) {
-            "h1", "h2", "h3", "h4", "h5", "h6" -> {
-                stack.lastOrNull()?.let { last ->
-                    when {
-                        last.level == el.level -> {
-                            stack.removeLast()
-                            stack.add(el)
-                            tree[el] = mutableListOf()
-                        }
-
-                        last.level < el.level -> {
-                            stack.add(el)
-                            tree[el] = mutableListOf()
-                        }
-
-                        last.level > el.level -> {
-                            stack.removeLast()
-                            stack.removeLast()
-                            stack.add(el)
-                            tree[el] = mutableListOf()
-                        }
-
-                        else -> error("Unhandled case")
-                    }
-                } ?: run {
-                    tree[el] = mutableListOf()
-                    stack.add(el)
-                }
-            }
-
-            "p", "ul", "table", "hr", "pre", "ol", "blockquote" -> {
-                tree[stack.last()]!!.add(el)
-            }
-
-            else -> println("Unknown tag: ${el.tagName()}")
-        }
-    }
-}