Merge searchbar engines

Author: KacperFKorban

scaladoc-js/src/searchbar/Searchbar.scala

@@ -2,9 +2,8 @@ package dotty.tools.scaladoc
 
 class Searchbar {
   val pages = SearchbarGlobals.pages.toList.map(PageEntry.apply)
-  val engine = SearchbarEngine(pages)
   val parser = QueryParser()
-  // val component = SearchbarComponent(q => engine.query(parser.parse(q)))
-  val inkuireEngine = InkuireJSSearchEngine()
-  val component = SearchbarComponent(inkuireEngine.query)
+  val searchEngine = SearchbarEngine(pages)
+  val inkuireEngine = InkuireDelegateSearchEngine()
+  val component = SearchbarComponent(searchEngine, inkuireEngine, parser)
 }

scaladoc-js/src/searchbar/SearchbarComponent.scala

@@ -3,7 +3,7 @@ package dotty.tools.scaladoc
 import org.scalajs.dom._
 import org.scalajs.dom.html.Input
 
-class SearchbarComponent(val callback: (String) => (PageEntry => Node) => Unit):
+class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireDelegateSearchEngine, parser: QueryParser):
   val resultsChunkSize = 100
   extension (p: PageEntry)
     def toHTML =
@@ -12,7 +12,7 @@ class SearchbarComponent(val callback: (String) => (PageEntry => Node) => Unit):
       wrapper.classList.add("monospace")
 
       val resultA = document.createElement("a").asInstanceOf[html.Anchor]
-      resultA.href = Globals.pathToRoot + p.location
+      resultA.href = Globals.pathToRoot + p.location.drop(21) //TODO change when generating XD
       resultA.text = s"${p.fullName}"
 
       val location = document.createElement("span")
@@ -27,12 +27,37 @@ class SearchbarComponent(val callback: (String) => (PageEntry => Node) => Unit):
       })
       wrapper
 
+  def handleNewFluffQuery(matchers: List[Matchers]) =
+    val result = engine.query(matchers).map(_.toHTML)
+    resultsDiv.scrollTop = 0
+    while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
+    val fragment = document.createDocumentFragment()
+    result.take(resultsChunkSize).foreach(fragment.appendChild)
+    resultsDiv.appendChild(fragment)
+    def loadMoreResults(result: List[raw.HTMLElement]): Unit = {
+      resultsDiv.onscroll = (event: Event) => {
+          if (resultsDiv.scrollHeight - resultsDiv.scrollTop == resultsDiv.clientHeight)
+          {
+              val fragment = document.createDocumentFragment()
+              result.take(resultsChunkSize).foreach(fragment.appendChild)
+              resultsDiv.appendChild(fragment)
+              loadMoreResults(result.drop(resultsChunkSize))
+          }
+      }
+    }
+    loadMoreResults(result.drop(resultsChunkSize))
+
   def handleNewQuery(query: String) =
     resultsDiv.scrollTop = 0
     while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
     val fragment = document.createDocumentFragment()
-    callback(query) { (p: PageEntry) =>
-      resultsDiv.appendChild(p.toHTML)
+    parser.parse(query) match {
+      case EngineMatchersQuery(matchers) =>
+        handleNewFluffQuery(matchers)
+      case BySignature(signature) =>
+        inkuireEngine.query(query) { (p: PageEntry) =>
+          resultsDiv.appendChild(p.toHTML)
+        }
     }
 
   private val searchIcon: html.Div =

scaladoc-js/src/searchbar/engine/InkuireDelegateSearchEngine.scala

@@ -27,7 +27,6 @@ case class OutputFormat(
   matches: List[Match]
 )
 
-//TODO CORS problems
 class InkuireDelegateSearchEngine {
 
   given ec: ExecutionContext = global
@@ -53,38 +52,3 @@ class InkuireDelegateSearchEngine {
   }
 
 }
-
-class InkuireJSSearchEngine {
-
-  val scriptPath = Globals.pathToRoot + "scripts/"
-  val worker     = new Worker(s"${scriptPath}inkuire-worker.js")
-
-  def dynamicToPageEntry(d: Dynamic): PageEntry = {
-    PageEntry(
-      d.functionName.asInstanceOf[String],
-      d.prettifiedSignature.asInstanceOf[String],
-      d.pageLocation.asInstanceOf[String],
-      d.functionName.asInstanceOf[String],
-      List.empty
-    )
-  }
-
-  def query(s: String)(callback: PageEntry => Node): List[PageEntry] = {
-    worker.onmessage = _ => ()
-    val res = ListBuffer[PageEntry]()
-    val func = (msg: MessageEvent) => {
-      msg.data.asInstanceOf[String] match {
-        case "engine_ready" =>
-        case "new_query" =>
-        case q =>
-          val matches = JSON.parse(q).matches
-          val actualMatches = matches.asInstanceOf[js.Array[Dynamic]].map(dynamicToPageEntry)
-          actualMatches.foreach(callback)
-      }
-    }
-    worker.onmessage = func
-    worker.postMessage(s)
-    res.toList
-  }
-
-}

scaladoc-js/src/searchbar/engine/InkuireJSSearchEngine.scala

@@ -0,0 +1,47 @@
+package dotty.tools.scaladoc
+
+import scala.io.Source
+import dotty.tools.scaladoc.PageEntry
+import org.scalajs.dom.webworkers.Worker
+import org.scalajs.dom._
+import scala.scalajs.js.{ JSON, Dynamic }
+import scala.collection.mutable.ListBuffer
+import scala.scalajs.js
+import scala.scalajs.js.timers._
+import org.scalajs.dom.ext.Ajax
+import scala.scalajs.js.URIUtils
+
+class InkuireJSSearchEngine {
+
+  val scriptPath = Globals.pathToRoot + "scripts/"
+  val worker     = new Worker(s"${scriptPath}inkuire-worker.js")
+
+  def dynamicToPageEntry(d: Dynamic): PageEntry = {
+    PageEntry(
+      d.functionName.asInstanceOf[String],
+      d.prettifiedSignature.asInstanceOf[String],
+      d.pageLocation.asInstanceOf[String],
+      d.functionName.asInstanceOf[String],
+      List.empty
+    )
+  }
+
+  def query(s: String)(callback: PageEntry => Node): List[PageEntry] = {
+    worker.onmessage = _ => ()
+    val res = ListBuffer[PageEntry]()
+    val func = (msg: MessageEvent) => {
+      msg.data.asInstanceOf[String] match {
+        case "engine_ready" =>
+        case "new_query" =>
+        case q =>
+          val matches = JSON.parse(q).matches
+          val actualMatches = matches.asInstanceOf[js.Array[Dynamic]].map(dynamicToPageEntry)
+          actualMatches.foreach(callback)
+      }
+    }
+    worker.onmessage = func
+    worker.postMessage(s)
+    res.toList
+  }
+
+}

scaladoc-js/src/searchbar/engine/Matchers.scala

@@ -1,5 +1,9 @@
 package dotty.tools.scaladoc
 
+sealed trait EngineQuery
+case class EngineMatchersQuery(matchers: List[Matchers]) extends EngineQuery
+case class BySignature(signature: String) extends EngineQuery
+
 sealed trait Matchers extends Function1[PageEntry, Int]
 
 case class ByName(query: String) extends Matchers:

scaladoc-js/src/searchbar/engine/QueryParser.scala

@@ -19,10 +19,16 @@ class QueryParser:
   val kindRegex = ("(?i)" + kinds.mkString("(","|",")") + " (.*)").r
   val restRegex = raw"(.*)".r
   val escapedRegex = raw"`(.*)`".r
+  val signatureRegex = raw"([^=>]+=>.*)".r
 
-  def parse(query: String): List[Matchers] = query match {
+  def parseMatchers(query: String): List[Matchers] = query match {
     case escapedRegex(rest) => List(ByName(rest))
-    case kindRegex(kind, rest) => List(ByKind(kind)) ++ parse(rest)
+    case kindRegex(kind, rest) => List(ByKind(kind)) ++ parseMatchers(rest)
     case restRegex(name) => List(ByName(name))
     case _ => List()
+  }
+
+  def parse(query: String): EngineQuery = query match {
+    case signatureRegex(signature) => BySignature(signature)
+    case other => EngineMatchersQuery(parseMatchers(other))
   }

scaladoc-js/src/searchbar/engine/SearchbarEngine.scala

@@ -1,6 +1,7 @@
 package dotty.tools.scaladoc
 
 import math.Ordering.Implicits.seqOrdering
+import org.scalajs.dom.Node
 
 class SearchbarEngine(pages: List[PageEntry]):
   def query(query: List[Matchers]): List[PageEntry] =