From 668870462d7846086d9a3ef356d44164474de2c4 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Wed, 8 Jul 2020 19:50:29 +0300
Subject: [PATCH 01/45] Update dependencies (#37)

---
 package.json   | 6 +++---
 packages.dhall | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index f4b7f9d..7817f70 100644
--- a/package.json
+++ b/package.json
@@ -44,9 +44,9 @@
   "homepage": "https://github.com/spacchetti/purescript-docs-search#readme",
   "dependencies": {},
   "devDependencies": {
-    "glob": "^7.1.4",
-    "markdown-it": "^10.0.0",
+    "glob": "^7.1.6",
+    "markdown-it": "^11.0.0",
     "parcel": "^1.12.4",
-    "spago": "^0.12.1"
+    "spago": "^0.15.3"
   }
 }
diff --git a/packages.dhall b/packages.dhall
index 29ed14f..e57d76a 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -2,7 +2,7 @@ let mkPackage =
       https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.5-20191127/packages.dhall sha256:654e8427ff1f9830542f491623cd5d89b1648774a765520554f98f41d3d1b3b3
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8/packages.dhall sha256:0e95ec11604dc8afc1b129c4d405dcc17290ce56d7d0665a0ff15617e32bbf03
 
 let overrides = { metadata = upstream.metadata // { version = "v0.13.0" } }
 

From 71f8a7591b53bc949c33a09fbc165f7f6addd794 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Wed, 29 Jul 2020 20:16:59 +0300
Subject: [PATCH 02/45] Fix CLI autocompleter (now works correctly with capital
 letters).

---
 src/Docs/Search/Interactive.purs | 17 ++++++++---------
 test/Main.purs                   |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 40c62b4..549523b 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -5,7 +5,7 @@ import Docs.Search.Declarations (Declarations, mkDeclarations)
 import Docs.Search.DocsJson (DataDeclType(..))
 import Docs.Search.Engine (mkEngineState, packageInfoToString, Result(..))
 import Docs.Search.Engine as Engine
-import Docs.Search.Extra (listToString, stringToList, (>#>))
+import Docs.Search.Extra (stringToList, (>#>))
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.ModuleIndex (ModuleResult, mkPackedModuleIndex, unpackModuleIndex)
 import Docs.Search.NodeEngine (nodeEngine)
@@ -22,12 +22,12 @@ import Prelude
 
 import Data.Array as Array
 import Data.Identity (Identity(..))
+import Data.List as List
 import Data.Maybe (fromMaybe)
 import Data.Newtype (un, unwrap, wrap)
 import Data.Search.Trie as Trie
 import Data.String (length) as String
-import Data.String.Common (split, trim) as String
-import Data.Tuple (fst)
+import Data.String.Common (split, toLower, trim) as String
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
@@ -105,14 +105,13 @@ mkCompleter
   -> Effect { completions :: Array String
             , matched :: String }
 mkCompleter index input = do
-  let path = stringToList input
-  let paths =
+  let path = stringToList $ String.toLower input
+      paths =
         Array.fromFoldable $
-        listToString <$>
-        (fst <$> Trie.query path (unwrap index))
+        (\result -> unwrap (unwrap result).name) <$>
+        List.concat (Trie.queryValues path (unwrap index))
 
-  pure { completions: paths
-       , matched: input }
+  pure { completions: paths, matched: input }
 
 
 showResult :: Result -> String
diff --git a/test/Main.purs b/test/Main.purs
index 695744a..84157a1 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -3,7 +3,7 @@ module Test.Main where
 import Prelude
 
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..))
-import Docs.Search.Types
+import Docs.Search.Types (Identifier(..))
 import Test.TypeQuery as TypeQuery
 import Test.IndexBuilder as IndexBuilder
 import Test.Declarations as Declarations

From 9631afa01015ad85ff174b074c7382f2cd927077 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Wed, 29 Jul 2020 20:17:31 +0300
Subject: [PATCH 03/45] Update changelog, bump version

---
 CHANGELOG.md                | 20 ++++++++++++++++++++
 package.json                |  2 +-
 src/Docs/Search/Config.purs |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 305f63a..ac8cad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.9 - 2020-07-29]
+
+New features:
+- Implement sorting by package popularity for declarations.
+- Add app version info to the footer.
+- Scroll to document top when search bar gets focus.
+- Group modules by package in the sidebar (#34)
+
+Bugfixes:
+- Fix CLI autocompleter (now works correctly with capital letters).
+
+## [0.0.8 - 2020-01-18]
+
+Skipped due to failed deployment.
+
+## [0.0.7 - 2020-01-18]
+
+Changes:
+- Consider something a builtin when there's no `sourceSpan` (#32)
+
 ## [0.0.6 - 2019-11-29]
 
 New features:
diff --git a/package.json b/package.json
index 7817f70..45b5abd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-docs-search",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Search frontend for the documentation generated by the PureScript compiler.",
   "directories": {
     "test": "test"
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 4c3c6f9..caaf454 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -30,7 +30,7 @@ config ::
   , typeIndexDirectory :: String
   }
 config =
-  { version: "0.0.8"
+  { version: "0.0.9"
   , outputDirectory: "output"
   , requiredDirectories:
     [ "generated-docs"

From 17ad192f7188a4f73c5328ad2f0b9c11a275a935 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Thu, 9 Jul 2020 11:11:56 +0300
Subject: [PATCH 04/45] Add app version info to the footer.

---
 src/Docs/Search/App.purs    | 34 ++++++++++++++++++++++++++++------
 src/Docs/Search/Config.purs |  6 ++++--
 src/Docs/Search/Main.purs   |  3 ++-
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index ce014e9..b796da4 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -1,17 +1,18 @@
 -- | This is the main module of the client-side Halogen app.
 module Docs.Search.App where
 
+import Prelude
+
+import Control.Coroutine as Coroutine
+import Data.Maybe (Maybe(..))
+import Data.Newtype (wrap)
 import Docs.Search.App.SearchField as SearchField
 import Docs.Search.App.SearchResults as SearchResults
 import Docs.Search.App.Sidebar as Sidebar
+import Docs.Search.Config (config)
 import Docs.Search.Extra (whenJust)
 import Docs.Search.ModuleIndex as ModuleIndex
 import Docs.Search.PackageIndex as PackageIndex
-
-import Prelude
-import Control.Coroutine as Coroutine
-import Data.Maybe (Maybe(..))
-import Data.Newtype (wrap)
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Halogen as H
@@ -26,11 +27,11 @@ import Web.DOM.ParentNode as ParentNode
 import Web.DOM.Text as Text
 import Web.Event.EventTarget (addEventListener, eventListener)
 import Web.HTML as HTML
+import Web.HTML.Event.EventTypes (focus)
 import Web.HTML.Event.HashChangeEvent.EventTypes (hashchange)
 import Web.HTML.HTMLDocument as HTMLDocument
 import Web.HTML.HTMLElement (fromElement)
 import Web.HTML.Window as Window
-import Web.HTML.Event.EventTypes (focus)
 
 
 main :: Effect Unit
@@ -39,6 +40,7 @@ main = do
   doc <- HTMLDocument.toDocument <$> Window.document win
 
   insertStyle doc
+  insertVersionInfo doc
   mbContainers <- getContainers doc
 
   -- Initialize a `markdown-it` instance (we need it to render the docs as markdown)
@@ -163,6 +165,26 @@ insertStyle doc = do
     void $ Node.appendChild (Element.toNode style) (Element.toNode head)
 
 
+insertVersionInfo :: Document.Document -> Effect Unit
+insertVersionInfo doc = do
+  let docPN = Document.toParentNode doc
+  mbVersionInfo <-
+    ParentNode.querySelector (wrap ".footer > p") docPN
+  whenJust (mbVersionInfo <#> Element.toNode)
+    \versionInfo -> do
+      prefix      <- Document.createTextNode " - patched by "        doc <#> Text.toNode
+      linkElement <- Document.createElement  "a"                     doc
+      let linkNode = Element.toNode linkElement
+      Element.setAttribute "href" "https://github.com/spacchetti/purescript-docs-search" linkElement
+      Element.setAttribute "target" "_blank"  linkElement
+      linkText    <- Document.createTextNode ("docs-search")         doc <#> Text.toNode
+      suffix      <- Document.createTextNode (" " <> config.version) doc <#> Text.toNode
+      void $ Node.appendChild prefix versionInfo
+      void $ Node.appendChild linkNode versionInfo
+      void $ Node.appendChild linkText linkNode
+      void $ Node.appendChild suffix versionInfo
+
+
 -- | Query the DOM for specific elements that should always be present.
 getContainers
   :: Document.Document
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 86b9fab..4c3c6f9 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -4,7 +4,8 @@ import Prelude
 
 -- | Some magic constants.
 config ::
-  { declIndexDirectory :: String
+  { version :: String
+  , declIndexDirectory :: String
   , mkIndexPartLoadPath :: Int -> String
   , mkIndexPartPath :: Int -> String
   , moduleIndexPath :: String
@@ -29,7 +30,8 @@ config ::
   , typeIndexDirectory :: String
   }
 config =
-  { outputDirectory: "output"
+  { version: "0.0.8"
+  , outputDirectory: "output"
   , requiredDirectories:
     [ "generated-docs"
     , "generated-docs/html"
diff --git a/src/Docs/Search/Main.purs b/src/Docs/Search/Main.purs
index 3bab686..81ce10a 100644
--- a/src/Docs/Search/Main.purs
+++ b/src/Docs/Search/Main.purs
@@ -5,6 +5,7 @@ import Prelude
 
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.Interactive as Interactive
+import Docs.Search.Config (config)
 
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
@@ -27,7 +28,7 @@ main = do
   case fromMaybe defaultCommands args of
     BuildIndex cfg -> IndexBuilder.run cfg
     Search cfg -> Interactive.run cfg
-    Version -> log "0.0.8"
+    Version -> log config.version
 
 
 getArgs :: Effect (Maybe Commands)

From 80d005944ab558ca8f6bd85351657f20a9803aea Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sat, 18 Jul 2020 00:14:54 +0300
Subject: [PATCH 05/45] Implement sort by package popularity for declarations

Allow searching for modules
---
 src/Docs/Search/App.purs               | 49 +++++++++++-----
 src/Docs/Search/App/SearchResults.purs | 35 +++++++++--
 src/Docs/Search/App/Sidebar.purs       | 25 ++++++--
 src/Docs/Search/BrowserEngine.purs     |  2 +
 src/Docs/Search/Declarations.purs      |  3 +-
 src/Docs/Search/Engine.purs            | 71 ++++++++++++++++------
 src/Docs/Search/IndexBuilder.purs      |  9 +--
 src/Docs/Search/Interactive.purs       | 42 +++++++------
 src/Docs/Search/ModuleIndex.purs       | 81 ++++++++++++++++++++++++--
 src/Docs/Search/NodeEngine.purs        |  2 +
 src/Docs/Search/PackageIndex.purs      | 57 +++++-------------
 src/Docs/Search/Score.purs             | 47 +++++++++++++++
 src/Docs/Search/TypeIndex.purs         |  2 +-
 test/Main.purs                         |  2 +
 test/Test/ModuleIndex.purs             | 24 ++++++++
 15 files changed, 337 insertions(+), 114 deletions(-)
 create mode 100644 src/Docs/Search/Score.purs
 create mode 100644 test/Test/ModuleIndex.purs

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index b796da4..7f7eb55 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -3,9 +3,12 @@ module Docs.Search.App where
 
 import Prelude
 
+import Control.Alt (alt)
 import Control.Coroutine as Coroutine
 import Data.Maybe (Maybe(..))
 import Data.Newtype (wrap)
+import Data.Tuple (Tuple(..))
+import Data.Tuple.Nested ((/\))
 import Docs.Search.App.SearchField as SearchField
 import Docs.Search.App.SearchResults as SearchResults
 import Docs.Search.App.Sidebar as Sidebar
@@ -50,28 +53,29 @@ main = do
                           , searchResults
                           , pageContents
                           , sidebarContainer
-                          , realSidebar } -> do
+                          , realSidebar
+                          , isIndexHTML
+                          } -> do
 
     -- Hide real sidebar completely - we are going to recreate it as Halogen component.
     ChildNode.remove $ Element.toChildNode realSidebar
 
     HA.runHalogenAff do
       packageIndex <- PackageIndex.loadPackageIndex
-      moduleIndex <- ModuleIndex.loadModuleIndex
+      moduleIndex <- ModuleIndex.unpackModuleIndex <$> ModuleIndex.loadModuleIndex
+      let scores = PackageIndex.mkScoresFromPackageIndex packageIndex
 
-      let initialSearchEngineState = { packageIndex: packageIndex
-                                     , moduleIndex: moduleIndex
+      let initialSearchEngineState = { packageIndex
+                                     , moduleIndex
                                      , index: mempty
                                      , typeIndex: mempty
+                                     , scores
                                      }
 
           resultsComponent =
             SearchResults.mkComponent initialSearchEngineState pageContents markdownIt
 
       sfio <- runUI SearchField.component unit searchField
-      sbio <- do
-              component <- Sidebar.mkComponent moduleIndex
-              runUI component unit sidebarContainer
       srio <- runUI resultsComponent unit searchResults
 
       sfio.subscribe $
@@ -91,6 +95,10 @@ main = do
 
         addEventListener hashchange listener true (Window.toEventTarget win)
 
+      sbio <- do
+              component <- Sidebar.mkComponent moduleIndex.packageModules isIndexHTML
+              runUI component unit sidebarContainer
+
       -- Subscribe to window focus events
       H.liftEffect do
 
@@ -131,11 +139,14 @@ insertStyle doc = do
     /* Add a margin between badge icons and package/module names. */
     margin-right: 0.25em;
   }
-  .li-package {
+  .li-package > details > summary {
     font-weight: bold;
     cursor: pointer;
     color: #c4953a;
   }
+  .li-package > details > summary:hover {
+    color: #7b5904;
+  }
   /* Make spaces narrower in the sidebar */
   .li-package > details > ul {
     margin-top: auto;
@@ -185,7 +196,8 @@ insertVersionInfo doc = do
       void $ Node.appendChild suffix versionInfo
 
 
--- | Query the DOM for specific elements that should always be present.
+-- | Query the DOM for specific elements that should always be present and determine if we are on
+-- | `index.html` or not.
 getContainers
   :: Document.Document
   -> Effect (Maybe { searchField :: HTML.HTMLElement
@@ -193,6 +205,7 @@ getContainers
                    , pageContents :: Element.Element
                    , sidebarContainer :: HTML.HTMLElement
                    , realSidebar :: Element.Element
+                   , isIndexHTML :: Sidebar.IsIndexHTML
                    })
 getContainers doc = do
   let docPN = Document.toParentNode doc
@@ -204,19 +217,29 @@ getContainers doc = do
     ParentNode.querySelector (wrap ".everything-except-footer > .container") docPN
   mbMainContainer <-
     ParentNode.querySelector (wrap ".everything-except-footer > main") docPN
-  mbRealSidebar <-
-    ParentNode.querySelector (wrap ".col--aside") docPN
+  mbSidebarStatus <-
+    alt <$> (map (Tuple Sidebar.NotIndexHTML) <$>
+             ParentNode.querySelector (wrap ".col--aside") docPN)
+        -- If there's no sidebar, that means we are currently on `index.html`.
+        <*> (map (Tuple Sidebar.IsIndexHTML)  <$>
+             ParentNode.querySelector (wrap ".col--main") docPN)
   case unit of
     _ | Just banner        <- mbBanner
       , Just everything    <- mbEverything
       , Just pageContents  <- mbContainer
       , Just mainContainer <- mbMainContainer
-      , Just realSidebar   <- mbRealSidebar -> do
+      , Just (isIndexHTML /\ realSidebar)   <- mbSidebarStatus -> do
       search <- Document.createElement "div" doc
       void $ Node.appendChild (Element.toNode search) (Element.toNode banner)
       pure do
         searchField <- fromElement search
         searchResults <- fromElement everything
         sidebarContainer <- fromElement mainContainer
-        pure { searchField, searchResults, pageContents, realSidebar, sidebarContainer }
+        pure { searchField
+             , searchResults
+             , pageContents
+             , realSidebar
+             , sidebarContainer
+             , isIndexHTML
+             }
       | otherwise -> pure Nothing
diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index 11c6d45..7025238 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -6,10 +6,11 @@ import Docs.Search.BrowserEngine (PartialIndex, browserSearchEngine)
 import Docs.Search.Config (config)
 import Docs.Search.Declarations (DeclLevel(..), declLevelToHashAnchor)
 import Docs.Search.DocsJson (DataDeclType(..))
-import Docs.Search.Extra (homePageFromRepository, (>#>))
-import Docs.Search.PackageIndex (PackageResult)
 import Docs.Search.Engine (Result(..))
 import Docs.Search.Engine as Engine
+import Docs.Search.Extra (homePageFromRepository, (>#>))
+import Docs.Search.ModuleIndex (ModuleResult)
+import Docs.Search.PackageIndex (PackageResult)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
 import Docs.Search.TypeIndex (TypeIndex)
@@ -230,9 +231,10 @@ renderResult
   .  MD.MarkdownIt
   -> Result
   -> Array (HH.HTML a Action)
-renderResult markdownIt (DeclResult sr) = renderSearchResult markdownIt sr
-renderResult markdownIt (TypeResult sr) = renderSearchResult markdownIt sr
-renderResult markdownIt (PackResult sr) = renderPackageResult sr
+renderResult markdownIt (DeclResult r) = renderSearchResult markdownIt r
+renderResult markdownIt (TypeResult r) = renderSearchResult markdownIt r
+renderResult markdownIt (PackResult r) = renderPackageResult r
+renderResult markdownIt (MdlResult r)  = renderModuleResult r
 
 
 renderPackageResult
@@ -263,6 +265,29 @@ renderPackageResult { name, description, repository } =
   ]
 
 
+renderModuleResult
+  :: forall a
+  .  ModuleResult
+  -> Array (HH.HTML a Action)
+renderModuleResult { name, package } =
+  [ HH.div [ HP.class_ (wrap "result") ]
+    [ HH.h3 [ HP.class_ (wrap "result__title") ]
+      [ HH.span [ HP.classes [ wrap "result__badge"
+                             , wrap "badge"
+                             , wrap "badge--module" ]
+                , HP.title "Module"
+                ]
+        [ HH.text "M" ]
+
+      , HH.a [ HP.class_ (wrap "result__link")
+             , HP.href $ name <> ".html"
+             ]
+        [ HH.text name ]
+      ]
+    ]
+  ]
+
+
 renderSearchResult
   :: forall a
   .  MD.MarkdownIt
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index c69b510..58cec82 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -1,7 +1,7 @@
 module Docs.Search.App.Sidebar where
 
 import Docs.Search.Config (config)
-import Docs.Search.ModuleIndex (ModuleIndex)
+import Docs.Search.ModuleIndex (PackedModuleIndex)
 import Docs.Search.Types (ModuleName, PackageName)
 
 import Prelude
@@ -36,24 +36,32 @@ data GroupingMode = GroupByPackage | DontGroup
 
 derive instance groupingModeEq :: Eq GroupingMode
 
+-- | Whether current page is `index.html` or not. `index.html` is special, it
+-- | has no sidebar, hence the difference must be taken into account.
+data IsIndexHTML = IsIndexHTML | NotIndexHTML
+
+derive instance isIndexHTMLEq :: Eq IsIndexHTML
 
 type State = { moduleIndex :: Map PackageName (Set ModuleName)
              , groupingMode :: GroupingMode
              , moduleNames :: Array ModuleName
+             , isIndexHTML :: IsIndexHTML
              }
 
 
 mkComponent
   :: forall i
-  .  ModuleIndex
+  .  PackedModuleIndex
+  -> IsIndexHTML
   -> Aff (H.Component HH.HTML Query i Action Aff)
-mkComponent moduleIndex = do
+mkComponent moduleIndex isIndexHTML = do
   groupingMode <- H.liftEffect loadGroupingModeFromLocalStorage
   pure $
     H.mkComponent
       { initialState: const { moduleIndex
                             , groupingMode
                             , moduleNames
+                            , isIndexHTML
                             }
       , render
       , eval: H.mkEval $ H.defaultEval { handleAction = handleAction
@@ -96,9 +104,14 @@ render
   :: forall m
   .  State
   -> H.ComponentHTML Action () m
-render { moduleIndex, groupingMode, moduleNames } =
-
-  HH.div [ HP.classes [ wrap "col", wrap "col--aside" ] ]
+render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
+
+  HH.div [ HP.classes [ wrap "col"
+                      , wrap $ if isIndexHTML == IsIndexHTML
+                               then "col--main"
+                               else "col--aside"
+                      ]
+         ]
 
   [ HH.h3_ [ HH.text "Modules" ]
   , HH.input [ HP.id_ "group-modules__input"
diff --git a/src/Docs/Search/BrowserEngine.purs b/src/Docs/Search/BrowserEngine.purs
index a79fc64..8063e9b 100644
--- a/src/Docs/Search/BrowserEngine.purs
+++ b/src/Docs/Search/BrowserEngine.purs
@@ -7,6 +7,7 @@ import Docs.Search.Engine (Engine, EngineState, Index)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeIndex (TypeIndex)
 import Docs.Search.TypeIndex as TypeIndex
+import Docs.Search.ModuleIndex as ModuleIndex
 
 import Prelude
 
@@ -112,6 +113,7 @@ browserSearchEngine =
   { queryIndex: query
   , queryTypeIndex: TypeIndex.query
   , queryPackageIndex
+  , queryModuleIndex: ModuleIndex.queryModuleIndex
   }
 
 
diff --git a/src/Docs/Search/Declarations.purs b/src/Docs/Search/Declarations.purs
index de17249..ab2bb4c 100644
--- a/src/Docs/Search/Declarations.purs
+++ b/src/Docs/Search/Declarations.purs
@@ -1,12 +1,13 @@
 module Docs.Search.Declarations where
 
 import Docs.Search.DocsJson (ChildDeclType(..), ChildDeclaration(..), DeclType(..), Declaration(..), DocsJson(..), SourceSpan)
-import Docs.Search.PackageIndex (Scores)
+import Docs.Search.Score (Scores)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), QualifiedName(..), Type(..), Kind, joinForAlls)
 import Docs.Search.Types (ModuleName, PackageName)
 
 import Prelude
+
 import Control.Alt ((<|>))
 import Data.Array ((!!))
 import Data.Array as Array
diff --git a/src/Docs/Search/Engine.purs b/src/Docs/Search/Engine.purs
index 5e0b376..db2f6a3 100644
--- a/src/Docs/Search/Engine.purs
+++ b/src/Docs/Search/Engine.purs
@@ -1,19 +1,22 @@
 module Docs.Search.Engine where
 
+import Docs.Search.ModuleIndex (ModuleIndex, ModuleResult)
 import Docs.Search.PackageIndex (PackageIndex, PackageResult)
-import Docs.Search.ModuleIndex (ModuleIndex)
+import Docs.Search.Score (Scores)
 import Docs.Search.SearchResult (SearchResult, typeOfResult)
 import Docs.Search.TypeQuery (TypeQuery(..), parseTypeQuery, penalty)
+import Docs.Search.Types (PackageName, ModuleName)
 
 import Prelude
 
-import Data.Newtype (unwrap)
 import Data.Array as Array
 import Data.Either (hush)
+import Data.Function (on)
+import Data.List (List)
 import Data.Maybe (Maybe(..))
+import Data.Newtype (unwrap)
 import Data.Search.Trie (Trie)
 import Data.String.Common (toLower) as String
-import Data.List (List)
 
 
 type Index = Trie Char (List SearchResult)
@@ -30,6 +33,8 @@ type Engine m index typeIndex =
     :: Query m typeIndex TypeQuery SearchResult
   , queryPackageIndex
     :: Query m PackageIndex String PackageResult
+  , queryModuleIndex
+    :: Scores -> ModuleIndex -> String -> Array ModuleResult
   }
 
 
@@ -38,6 +43,7 @@ type EngineState index typeIndex
     , typeIndex :: typeIndex
     , packageIndex :: PackageIndex
     , moduleIndex :: ModuleIndex
+    , scores :: Scores
     }
 
 
@@ -47,27 +53,51 @@ mkEngineState
   -> typeIndex
   -> PackageIndex
   -> ModuleIndex
+  -> Scores
   -> EngineState index typeIndex
-mkEngineState index typeIndex packageIndex moduleIndex =
-  { index, typeIndex, packageIndex, moduleIndex }
+mkEngineState index typeIndex packageIndex moduleIndex scores =
+  { index, typeIndex, packageIndex, moduleIndex, scores }
 
 
 data Result
   = DeclResult SearchResult
   | TypeResult SearchResult
   | PackResult PackageResult
+  | MdlResult  ModuleResult
+
+
+getResultScore :: Result -> Int
+getResultScore (DeclResult r) = (unwrap r).score
+getResultScore (TypeResult r) = (unwrap r).score
+getResultScore (PackResult r) = r.score
+getResultScore (MdlResult r) = r.score
 
 
-sortByPopularity :: Array Result -> Array Result
-sortByPopularity =
-  Array.sortWith
-  \result ->
-    -- Sort by popularity, show packages before
-    -- ordinary definitions.
-    - case result of
-        DeclResult r -> 2 * (unwrap r).score
-        TypeResult r -> 2 * (unwrap r).score
-        PackResult r -> 2 * r.score + 1
+getResultPackageName :: Result -> PackageName
+getResultPackageName (DeclResult r) = (unwrap r).packageName
+getResultPackageName (TypeResult r) = (unwrap r).packageName
+getResultPackageName (PackResult r) = r.name
+getResultPackageName (MdlResult r) = r.package
+
+
+getResultModuleName :: Result -> ModuleName
+getResultModuleName (DeclResult r) = (unwrap r).moduleName
+getResultModuleName (TypeResult r) = (unwrap r).moduleName
+getResultModuleName (PackResult r) = ""
+getResultModuleName (MdlResult r) = r.name
+
+
+sortByPopularity
+  :: forall index typeIndex
+  .  EngineState index typeIndex
+  -> Array Result
+  -> Array Result
+sortByPopularity { packageIndex } =
+  Array.sortBy (
+    compare `on` (getResultScore >>> negate) <>
+    compare `on` getResultPackageName <>
+    compare `on` getResultModuleName
+  )
 
 
 query
@@ -80,13 +110,16 @@ query engine state input =
 
     -- A declaration/package query
     Nothing -> do
-      let lower = String.toLower input
+      let lowerCased = String.toLower input
 
-      response        <- engine.queryIndex        state.index        lower
-      packageResponse <- engine.queryPackageIndex state.packageIndex lower
+      response        <- engine.queryIndex         state.index        lowerCased
+      packageResponse <- engine.queryPackageIndex  state.packageIndex lowerCased
+      let moduleResponse =
+            engine.queryModuleIndex state.scores state.moduleIndex lowerCased
 
-      pure { results: sortByPopularity $
+      pure { results: sortByPopularity state $
              (packageResponse.results <#> PackResult) <>
+             (moduleResponse          <#> MdlResult) <>
              (response.results        <#> DeclResult)
 
              -- No need to update package index (it never changes).
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 0200d02..eee80d3 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -5,8 +5,9 @@ import Docs.Search.Config (config)
 import Docs.Search.Declarations (Declarations(..), mkDeclarations)
 import Docs.Search.DocsJson (DocsJson)
 import Docs.Search.Extra ((>#>))
-import Docs.Search.ModuleIndex (ModuleIndex, mkModuleIndex)
-import Docs.Search.PackageIndex (PackageInfo, mkPackageInfo, mkScores)
+import Docs.Search.ModuleIndex (PackedModuleIndex, mkPackedModuleIndex)
+import Docs.Search.PackageIndex (PackageInfo, mkPackageInfo)
+import Docs.Search.Score (mkScores)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeIndex (TypeIndex, mkTypeIndex)
 
@@ -78,7 +79,7 @@ run' cfg = do
       index       = mkDeclarations scores docsJsons
       typeIndex   = mkTypeIndex scores docsJsons
       packageInfo = mkPackageInfo packageMetas
-      moduleIndex = mkModuleIndex index
+      moduleIndex = mkPackedModuleIndex index
 
   createDirectories cfg
 
@@ -223,7 +224,7 @@ writePackageInfo packageInfo = do
     header = "window.DocsSearchPackageIndex = "
 
 
-writeModuleIndex :: ModuleIndex -> Aff Unit
+writeModuleIndex :: PackedModuleIndex -> Aff Unit
 writeModuleIndex moduleIndex = do
   writeTextFile UTF8 config.moduleIndexPath $
     header <> stringify (encodeJson moduleIndex)
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index e3fd65e..fd3560d 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -1,36 +1,36 @@
 -- | Definitions for the "search REPL".
 module Docs.Search.Interactive where
 
+import Prelude
+
+import Data.Array as Array
+import Data.Identity (Identity(..))
+import Data.Maybe (fromMaybe)
+import Data.Newtype (un, unwrap, wrap)
+import Data.Search.Trie as Trie
+import Data.String (length) as String
+import Data.String.Common (split, trim) as String
+import Data.Tuple (fst)
 import Docs.Search.Declarations (Declarations, mkDeclarations)
-import Docs.Search.ModuleIndex (mkModuleIndex)
 import Docs.Search.DocsJson (DataDeclType(..))
 import Docs.Search.Engine (mkEngineState, Result(..))
 import Docs.Search.Engine as Engine
 import Docs.Search.Extra (listToString, stringToList, (>#>))
 import Docs.Search.IndexBuilder as IndexBuilder
+import Docs.Search.ModuleIndex (ModuleResult, mkPackedModuleIndex, unpackModuleIndex)
 import Docs.Search.NodeEngine (nodeEngine)
-import Docs.Search.PackageIndex (PackageResult, mkPackageIndex, mkPackageInfo, mkScores)
+import Docs.Search.PackageIndex (PackageResult, mkPackageIndex, mkPackageInfo)
+import Docs.Search.Score (mkScores)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.Terminal (bold, cyan, green, yellow)
 import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
 import Docs.Search.TypeIndex (resultsWithTypes)
 import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showKind, showType, showTypeArgument, space, syntax)
-
-import Prelude
-
-import Data.Identity (Identity(..))
-import Data.Array as Array
-import Data.Maybe (fromMaybe)
-import Data.Search.Trie as Trie
-import Data.String (length) as String
-import Data.String.Common (split, trim) as String
-import Data.Tuple (fst)
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
 import Effect.Console (log)
 import Node.ReadLine (createConsoleInterface, question)
-import Data.Newtype (un, unwrap, wrap)
 
 
 type Config =
@@ -52,8 +52,8 @@ run cfg = launchAff_ $ do
       index        = mkDeclarations scores docsJsons
       typeIndex    = docsJsons >>= resultsWithTypes scores
       packageIndex = mkPackageIndex $ mkPackageInfo packageMetas
-      moduleIndex  = mkModuleIndex index
-      engineState  = mkEngineState (unwrap index) typeIndex packageIndex moduleIndex
+      moduleIndex  = unpackModuleIndex $ mkPackedModuleIndex index
+      engineState  = mkEngineState (unwrap index) typeIndex packageIndex moduleIndex scores
 
   let countOfDefinitions     = Trie.size $ unwrap index
       countOfTypeDefinitions = Array.length typeIndex
@@ -115,9 +115,10 @@ mkCompleter index input = do
 
 showResult :: Result -> String
 showResult = case _ of
-  DeclResult sr -> showSearchResult sr
-  TypeResult sr -> showSearchResult sr
-  PackResult pr -> showPackageResult pr
+  DeclResult r -> showSearchResult r
+  TypeResult r -> showSearchResult r
+  PackResult r -> showPackageResult r
+  MdlResult r -> showModuleResult r
 
 
 showSearchResult :: SearchResult -> String
@@ -138,6 +139,11 @@ showPackageResult { name, description } =
   (description >#> \text -> "\n\n" <> leftShift 3 text <> "\n")
 
 
+showModuleResult :: ModuleResult -> String
+showModuleResult { name, package } =
+  bold (cyan "module") <> " " <> bold (green name)
+
+
 showSignature ::
   forall rest.
   { name :: String
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index bf61eea..efa5ee8 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -4,30 +4,92 @@ import Docs.Search.Config (config)
 import Docs.Search.Declarations (Declarations(..))
 import Docs.Search.SearchResult (SearchResult(..))
 import Docs.Search.Types (ModuleName, PackageName)
+import Docs.Search.Extra (stringToList)
+import Docs.Search.Score (Scores, normalizePackageName)
 
 import Prelude
+
+import Control.Monad.State (execState, modify_)
 import Control.Promise (Promise, toAffE)
 import Data.Argonaut.Core (Json)
 import Data.Argonaut.Decode (decodeJson)
+import Data.Array as Array
 import Data.Either (hush)
-import Data.Foldable (foldr)
-import Data.List (List)
+import Data.Foldable (foldl)
+import Data.Lens ((%~))
+import Data.Lens.Record (prop)
+import Data.List (List, (:))
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (fromMaybe)
+import Data.Search.Trie (Trie)
 import Data.Search.Trie as Trie
 import Data.Set (Set)
 import Data.Set as Set
+import Data.String.CodeUnits (toCharArray) as String
+import Data.String.Common (split, toLower) as String
+import Data.String.Pattern (Pattern(..))
+import Data.Symbol (SProxy(..))
+import Data.Traversable (foldr, for_)
+import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff)
 
 
-type ModuleIndex = Map PackageName (Set ModuleName)
+-- | Module index that is actually stored in a JS file.
+type PackedModuleIndex = Map PackageName (Set ModuleName)
+
+-- | "Expanded" module index that can be queried quickly.
+type ModuleIndex = { packageModules :: Map PackageName (Set ModuleName)
+                   , modulePackages :: Map ModuleName PackageName
+                   , index :: Trie Char ModuleName
+                   }
+
+
+type ModuleResult
+  = { name :: ModuleName
+    , package :: PackageName
+    , score :: Int
+    }
+
+
+unpackModuleIndex :: PackedModuleIndex -> ModuleIndex
+unpackModuleIndex packageModules =
+  flip execState { packageModules, modulePackages: mempty, index: mempty } do
+    for_ (Map.toUnfoldableUnordered packageModules :: Array _)
+      \(packageName /\ moduleNames) -> do
+        for_ moduleNames \moduleName -> do
+          modify_ $ _modulePackages %~ Map.insert moduleName packageName
+          for_ (extractModuleNameParts moduleName) \part -> do
+            let partPath = Array.toUnfoldable $ String.toCharArray part
+            modify_ $ _index %~ Trie.insert partPath moduleName
+
+
+-- | E.g. `"Data.Array.ST" -> ["data.array.st", "array.st", "st"]`.
+extractModuleNameParts :: ModuleName -> List String
+extractModuleNameParts =
+  foldl (\acc el -> el : map (_ <> "." <> el) acc) mempty <<< String.split (Pattern ".") <<< String.toLower
+
+
+queryModuleIndex
+  :: Scores
+  -> ModuleIndex
+  -> String
+  -> Array ModuleResult
+queryModuleIndex scores { index, modulePackages } query =
+  let path = stringToList $ String.toLower query in
+  Trie.queryValues path index #
+  Array.fromFoldable #
+  Array.nub <#>
+  (\name -> do
+      package <- Map.lookup name modulePackages
+      pure { name, package, score: fromMaybe 0 $ Map.lookup (normalizePackageName package) scores  }) #
+  Array.catMaybes
 
 
 -- | Constructs a mapping from packages to modules
-mkModuleIndex :: Declarations -> ModuleIndex
-mkModuleIndex (Declarations trie) =
+mkPackedModuleIndex :: Declarations -> PackedModuleIndex
+mkPackedModuleIndex (Declarations trie) =
   foldr (Map.unionWith Set.union) mempty $ extract <$> Trie.values trie
   where
     extract
@@ -39,7 +101,7 @@ mkModuleIndex (Declarations trie) =
           Map.singleton packageName (Set.singleton moduleName)
 
 
-loadModuleIndex :: Aff ModuleIndex
+loadModuleIndex :: Aff PackedModuleIndex
 loadModuleIndex = do
   json <- toAffE $ load config.moduleIndexLoadPath
   pure $ fromMaybe mempty $ hush $ decodeJson json
@@ -48,3 +110,10 @@ loadModuleIndex = do
 foreign import load
   :: String
   -> Effect (Promise Json)
+
+
+_modulePackages :: forall a b rest.  (a -> b) -> { modulePackages :: a | rest } -> { modulePackages :: b | rest }
+_modulePackages = prop (SProxy :: SProxy "modulePackages")
+
+_index :: forall a b rest.  (a -> b) -> { index :: a | rest } -> { index :: b | rest }
+_index = prop (SProxy :: SProxy "index")
diff --git a/src/Docs/Search/NodeEngine.purs b/src/Docs/Search/NodeEngine.purs
index 0c79f6a..5345c60 100644
--- a/src/Docs/Search/NodeEngine.purs
+++ b/src/Docs/Search/NodeEngine.purs
@@ -3,6 +3,7 @@ module Docs.Search.NodeEngine where
 
 import Docs.Search.Extra (stringToList)
 import Docs.Search.PackageIndex as PackageIndex
+import Docs.Search.ModuleIndex as ModuleIndex
 import Docs.Search.Engine (Engine, Query, Index, sortByDistance)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeQuery (TypeQuery)
@@ -24,6 +25,7 @@ nodeEngine =
   { queryIndex
   , queryTypeIndex
   , queryPackageIndex: PackageIndex.queryPackageIndex
+  , queryModuleIndex: ModuleIndex.queryModuleIndex
   }
 
 
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index 1db1fbc..34674a9 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -2,24 +2,24 @@ module Docs.Search.PackageIndex where
 
 import Docs.Search.Config (config)
 import Docs.Search.Extra (stringToList)
+import Docs.Search.Score (Scores, getPackageScore, mkScores, normalizePackageName)
 
 import Prelude
 
-import Data.Either (hush)
-import Data.Maybe (Maybe, fromMaybe)
-import Data.Newtype (unwrap, wrap)
-import Effect (Effect)
-import Effect.Aff (Aff)
-import Web.Bower.PackageMeta (Dependencies, PackageMeta(..))
 import Control.Promise (Promise, toAffE)
 import Data.Argonaut.Core (Json)
 import Data.Argonaut.Decode (decodeJson)
 import Data.Array as Array
+import Data.Either (hush)
 import Data.Map (Map)
 import Data.Map as Map
+import Data.Maybe (Maybe, fromMaybe)
+import Data.Newtype (unwrap)
 import Data.Search.Trie (Trie)
 import Data.Search.Trie as Trie
-import Data.String.CodeUnits as String
+import Effect (Effect)
+import Effect.Aff (Aff)
+import Web.Bower.PackageMeta (PackageMeta(..))
 
 
 type PackageResult
@@ -30,33 +30,11 @@ type PackageResult
     , repository :: Maybe String
     }
 
-type Scores = Map String Int
-
 type PackageIndex = Trie Char PackageResult
 
 type PackageInfo = Array PackageResult
 
 
--- | Construct a mapping from package names to their scores, based on number
--- of reverse dependencies.
-mkScores :: Array PackageMeta -> Scores
-mkScores =
-  Array.foldr
-  (\pm ->
-    updateScoresFor (unwrap pm).dependencies >>>
-    updateScoresFor (unwrap pm).devDependencies
-  )
-  mempty
-
-  where
-    updateScoresFor :: Dependencies -> Scores -> Scores
-    updateScoresFor deps scores =
-      Array.foldr
-      (\dep -> Map.insertWith add dep 1)
-      scores
-      (deps # unwrap >>> map (_.packageName))
-
-
 mkPackageInfo :: Array PackageMeta -> PackageInfo
 mkPackageInfo pms =
   Array.fromFoldable $
@@ -66,7 +44,6 @@ mkPackageInfo pms =
   where
     packageScores = mkScores pms
 
-
     insert
       :: PackageMeta
       -> Map String PackageResult
@@ -82,12 +59,17 @@ mkPackageInfo pms =
           name
           { name
           , description: description
-          , score: fromMaybe 0 $ Map.lookup name packageScores
+          , score: getPackageScore packageScores name
           , dependencies: unwrap dependencies <#> (_.packageName)
           , repository: repository <#> (_.url)
           }
 
 
+mkScoresFromPackageIndex :: PackageIndex -> Scores
+mkScoresFromPackageIndex =
+  Trie.values >>> Array.foldr (\ { name, score } -> Map.insert name score) mempty
+
+
 loadPackageIndex :: Aff PackageIndex
 loadPackageIndex = do
   json <- toAffE (load config.packageInfoLoadPath)
@@ -97,17 +79,10 @@ loadPackageIndex = do
 
 mkPackageIndex :: PackageInfo -> PackageIndex
 mkPackageIndex =
-
   Array.foldr
-  (\package -> Trie.insert (shortNamePath package.name) package)
+  (\package -> Trie.insert (stringToList $ normalizePackageName package.name) package)
   mempty
 
-  where
-    shortNamePath name =
-      stringToList $
-      fromMaybe name $
-      String.stripPrefix (wrap "purescript-") name
-
 
 queryPackageIndex
   :: forall m
@@ -117,9 +92,9 @@ queryPackageIndex
   -> m { index :: PackageIndex
        , results :: Array PackageResult
        }
-queryPackageIndex index q =
+queryPackageIndex index query =
   pure { index
-       , results: Array.fromFoldable $ Trie.queryValues (stringToList q) index
+       , results: Array.fromFoldable $ Trie.queryValues (stringToList query) index
        }
 
 
diff --git a/src/Docs/Search/Score.purs b/src/Docs/Search/Score.purs
new file mode 100644
index 0000000..7304470
--- /dev/null
+++ b/src/Docs/Search/Score.purs
@@ -0,0 +1,47 @@
+module Docs.Search.Score where
+
+import Docs.Search.Types (PackageName)
+
+import Prelude
+
+import Data.Array as Array
+import Data.Map (Map)
+import Data.Map as Map
+import Data.Maybe (fromMaybe)
+import Data.Newtype (unwrap, wrap)
+import Data.String.CodeUnits as String
+import Web.Bower.PackageMeta (Dependencies, PackageMeta)
+
+
+type Scores = Map PackageName Int
+
+
+getPackageScore :: Scores -> PackageName -> Int
+getPackageScore _      "<builtin>" = 1000000
+getPackageScore _      "<local package>" = 2000000
+getPackageScore scores name = fromMaybe 0 $ Map.lookup name scores
+
+
+normalizePackageName :: PackageName -> PackageName
+normalizePackageName packageName =
+  fromMaybe packageName $ String.stripPrefix (wrap "purescript-") packageName
+
+
+-- | Construct a mapping from package names to their scores, based on number
+-- of reverse dependencies.
+mkScores :: Array PackageMeta -> Scores
+mkScores =
+  Array.foldr
+  (\pm ->
+    updateScoresFor (unwrap pm).dependencies >>>
+    updateScoresFor (unwrap pm).devDependencies
+  )
+  mempty
+
+  where
+    updateScoresFor :: Dependencies -> Scores -> Scores
+    updateScoresFor deps scores =
+      Array.foldr
+      (\dep -> Map.insertWith add dep 1)
+      scores
+      (deps # unwrap >>> map (_.packageName >>> normalizePackageName))
diff --git a/src/Docs/Search/TypeIndex.purs b/src/Docs/Search/TypeIndex.purs
index 4aede14..ae8e5a5 100644
--- a/src/Docs/Search/TypeIndex.purs
+++ b/src/Docs/Search/TypeIndex.purs
@@ -4,7 +4,7 @@ module Docs.Search.TypeIndex where
 import Docs.Search.Config (config)
 import Docs.Search.Declarations (resultsForDeclaration)
 import Docs.Search.DocsJson (DocsJson(..))
-import Docs.Search.PackageIndex (Scores)
+import Docs.Search.Score (Scores)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Type)
 import Docs.Search.TypeQuery (TypeQuery)
diff --git a/test/Main.purs b/test/Main.purs
index ac2b506..f7c435c 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -6,6 +6,7 @@ import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..
 import Test.TypeQuery as TypeQuery
 import Test.IndexBuilder as IndexBuilder
 import Test.Declarations as Declarations
+import Test.ModuleIndex as ModuleIndex
 
 import Test.Extra (assertRight)
 
@@ -28,6 +29,7 @@ mainTest = do
   TypeQuery.tests
   IndexBuilder.tests
   Declarations.tests
+  ModuleIndex.tests
 
   let mkJson x = unsafePartial $ fromRight $ jsonParser x
   suite "FunDeps decoder" do
diff --git a/test/Test/ModuleIndex.purs b/test/Test/ModuleIndex.purs
new file mode 100644
index 0000000..c6a4e6e
--- /dev/null
+++ b/test/Test/ModuleIndex.purs
@@ -0,0 +1,24 @@
+module Test.ModuleIndex where
+
+import Docs.Search.ModuleIndex (extractModuleNameParts)
+
+import Prelude
+
+import Data.List as List
+import Test.Unit (TestSuite, suite, test)
+import Test.Unit.Assert as Assert
+
+
+tests :: TestSuite
+tests = do
+  suite "ModuleIndex" do
+
+    test "test #0" do
+      Assert.equal (extractModuleNameParts "Data.Array.ST") (
+        List.fromFoldable [ "st", "array.st", "data.array.st" ]
+      )
+
+    test "test #1" do
+      Assert.equal (extractModuleNameParts "Foo") (
+        List.fromFoldable [ "foo" ]
+      )

From 557bb712c50fd87e6fffda43e68b0c27ffcb011f Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Fri, 24 Jul 2020 17:47:53 +0300
Subject: [PATCH 06/45] Remove unnecessary FFI

---
 src/Docs/Search/Interactive.js   |  5 -----
 src/Docs/Search/Interactive.purs | 21 +++++++++------------
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 src/Docs/Search/Interactive.js

diff --git a/src/Docs/Search/Interactive.js b/src/Docs/Search/Interactive.js
deleted file mode 100644
index 7dc4807..0000000
--- a/src/Docs/Search/Interactive.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* global exports */
-
-exports.consoleClear = function () {
-  console.clear();
-};
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index fd3560d..0fd2d04 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -29,7 +29,7 @@ import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showKind,
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
-import Effect.Console (log)
+import Effect.Console (log, clear) as Console
 import Node.ReadLine (createConsoleInterface, question)
 
 
@@ -43,7 +43,7 @@ run :: Config -> Effect Unit
 run cfg = launchAff_ $ do
 
   liftEffect do
-    log "Loading search index..."
+    Console.log "Loading search index..."
 
   docsJsons    <- IndexBuilder.decodeDocsJsons cfg
   packageMetas <- IndexBuilder.decodeBowerJsons cfg
@@ -60,7 +60,7 @@ run cfg = launchAff_ $ do
       countOfPackages        = Array.length packageMetas
 
   liftEffect do
-    log $
+    Console.log $
       "Loaded " <>
       show countOfDefinitions <>
       " definitions and " <>
@@ -81,15 +81,15 @@ run cfg = launchAff_ $ do
 
         let total = Array.length results
 
-        consoleClear
+        Console.clear
 
-        if total > 0 then do
-          log $
+        Console.log $
+          if total > 0 then do
             Array.intercalate "\n\n\n" $
-            showResult <$> Array.reverse results
-        else do
-          log $
+              showResult <$> Array.reverse results
+          else
             "Your search for " <> bold input <> " did not yield any results."
+
         call inputHandler interface
 
     interface <- createConsoleInterface (mkCompleter index)
@@ -296,6 +296,3 @@ leftPad w str = Array.fold (Array.replicate w " ") <> str
 
 rightPad :: Int -> String -> String
 rightPad w str = str <> Array.fold (Array.replicate (w - String.length str) " ")
-
-
-foreign import consoleClear :: Effect Unit

From 2effbda58bc8430c5cf6488fe04ce574d829b458 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sat, 25 Jul 2020 13:53:39 +0300
Subject: [PATCH 07/45] Scroll to document top on window focus;

Minor refactoring.
---
 src/Docs/Search/App/SearchField.purs | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/Docs/Search/App/SearchField.purs b/src/Docs/Search/App/SearchField.purs
index f3f64c8..10631c5 100644
--- a/src/Docs/Search/App/SearchField.purs
+++ b/src/Docs/Search/App/SearchField.purs
@@ -18,12 +18,10 @@ import Halogen.HTML.Properties as HP
 import Halogen.Query.EventSource as ES
 import Web.DOM.Document as Document
 import Web.DOM.ParentNode as ParentNode
-import Web.HTML (window) as Web
 import Web.HTML as HTML
 import Web.HTML.HTMLDocument as HTMLDocument
-import Web.HTML.HTMLElement (blur, focus) as Web
+import Web.HTML.HTMLElement as HTMLElement
 import Web.HTML.HTMLInputElement as HTMLInputElement
-import Web.HTML.Window (document) as Web
 import Web.HTML.Window as Window
 import Web.UIEvent.KeyboardEvent (KeyboardEvent)
 import Web.UIEvent.KeyboardEvent as KE
@@ -78,7 +76,7 @@ handleAction = case _ of
 
   InitKeyboardListener -> do
 
-    document <- H.liftEffect $ Web.document =<< Web.window
+    document <- H.liftEffect $ Window.document =<< HTML.window
     H.subscribe' \sid ->
       ES.eventListenerEventSource
         KET.keyup
@@ -92,14 +90,14 @@ handleAction = case _ of
       when (not state.focused) do
         H.liftEffect do
           withSearchField HTMLInputElement.select
-          withSearchField (HTMLInputElement.toHTMLElement >>> Web.focus)
+          withSearchField (HTMLInputElement.toHTMLElement >>> HTMLElement.focus)
 
     when (KE.code ev == "Escape") do
       state <- H.get
       if state.focused
       then do
         H.liftEffect do
-          withSearchField (HTMLInputElement.toHTMLElement >>> Web.blur)
+          withSearchField (HTMLInputElement.toHTMLElement >>> HTMLElement.blur)
       else clearInput
 
   InputAction input -> do
@@ -108,16 +106,22 @@ handleAction = case _ of
   EnterPressed -> do
     state <- H.get
     H.liftEffect do
-      withSearchField (HTMLInputElement.toHTMLElement >>> Web.blur)
+      withSearchField (HTMLInputElement.toHTMLElement >>> HTMLElement.blur)
     H.liftEffect (URIHash.setInput state.input)
     H.raise $ InputUpdated state.input
 
-  FocusChanged status -> do
-    H.modify_ (_ { focused = status })
+  FocusChanged isFocused -> do
+    H.modify_ (_ { focused = isFocused })
     H.raise
-      if status
+      if isFocused
       then Focused
       else LostFocus
+    when isFocused scrollToTop
+
+scrollToTop :: H.HalogenM State Action () SearchFieldMessage Aff Unit
+scrollToTop = do
+  H.liftEffect do
+    HTML.window >>= Window.scroll 0 0
 
 clearInput :: H.HalogenM State Action () SearchFieldMessage Aff Unit
 clearInput = do

From 26bc704b55f074e78c79d40bae005e4f4281aad0 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sun, 26 Jul 2020 00:28:02 +0300
Subject: [PATCH 08/45] Refactor sorting by package popularity

---
 src/Docs/Search/IndexBuilder.purs |  2 +-
 src/Docs/Search/Interactive.purs  |  2 +-
 src/Docs/Search/PackageIndex.purs | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index eee80d3..07f2835 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -78,7 +78,7 @@ run' cfg = do
   let scores      = mkScores packageMetas
       index       = mkDeclarations scores docsJsons
       typeIndex   = mkTypeIndex scores docsJsons
-      packageInfo = mkPackageInfo packageMetas
+      packageInfo = mkPackageInfo scores packageMetas
       moduleIndex = mkPackedModuleIndex index
 
   createDirectories cfg
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 0fd2d04..6433543 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -51,7 +51,7 @@ run cfg = launchAff_ $ do
   let scores       = mkScores packageMetas
       index        = mkDeclarations scores docsJsons
       typeIndex    = docsJsons >>= resultsWithTypes scores
-      packageIndex = mkPackageIndex $ mkPackageInfo packageMetas
+      packageIndex = mkPackageIndex $ mkPackageInfo scores packageMetas
       moduleIndex  = unpackModuleIndex $ mkPackedModuleIndex index
       engineState  = mkEngineState (unwrap index) typeIndex packageIndex moduleIndex scores
 
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index 34674a9..09503d7 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -2,7 +2,7 @@ module Docs.Search.PackageIndex where
 
 import Docs.Search.Config (config)
 import Docs.Search.Extra (stringToList)
-import Docs.Search.Score (Scores, getPackageScore, mkScores, normalizePackageName)
+import Docs.Search.Score (Scores, getPackageScore, normalizePackageName)
 
 import Prelude
 
@@ -35,15 +35,13 @@ type PackageIndex = Trie Char PackageResult
 type PackageInfo = Array PackageResult
 
 
-mkPackageInfo :: Array PackageMeta -> PackageInfo
-mkPackageInfo pms =
+mkPackageInfo :: Scores -> Array PackageMeta -> PackageInfo
+mkPackageInfo packageScores pms =
   Array.fromFoldable $
   Map.values $
   Array.foldr insert mempty pms
 
   where
-    packageScores = mkScores pms
-
     insert
       :: PackageMeta
       -> Map String PackageResult
@@ -59,7 +57,7 @@ mkPackageInfo pms =
           name
           { name
           , description: description
-          , score: getPackageScore packageScores name
+          , score: getPackageScore packageScores $ normalizePackageName name
           , dependencies: unwrap dependencies <#> (_.packageName)
           , repository: repository <#> (_.url)
           }

From 16e1a4b28079a6cb2d949b88e210c3d8a63ede6d Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sun, 26 Jul 2020 00:47:20 +0300
Subject: [PATCH 09/45] Make results ordering stable.

---
 src/Docs/Search/Engine.purs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Docs/Search/Engine.purs b/src/Docs/Search/Engine.purs
index db2f6a3..93b253d 100644
--- a/src/Docs/Search/Engine.purs
+++ b/src/Docs/Search/Engine.purs
@@ -87,6 +87,13 @@ getResultModuleName (PackResult r) = ""
 getResultModuleName (MdlResult r) = r.name
 
 
+getResultName :: Result -> String
+getResultName (DeclResult r) = (unwrap r).name
+getResultName (TypeResult r) = (unwrap r).name
+getResultName (PackResult r) = r.name
+getResultName (MdlResult r) = r.name
+
+
 sortByPopularity
   :: forall index typeIndex
   .  EngineState index typeIndex
@@ -96,7 +103,10 @@ sortByPopularity { packageIndex } =
   Array.sortBy (
     compare `on` (getResultScore >>> negate) <>
     compare `on` getResultPackageName <>
-    compare `on` getResultModuleName
+    compare `on` getResultModuleName <>
+    -- Identifier name comes last: we want to make sure no `Result`s are
+    -- equal, to avoid having unstable ordering.
+    compare `on` getResultName
   )
 
 

From 5bf02c20992ca23cc828282f7b533683f4c7d422 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sun, 26 Jul 2020 22:30:42 +0300
Subject: [PATCH 10/45] Wrap ModuleName and PackageName strings into newtypes

---
 src/Docs/Search/App/SearchResults.purs | 50 +++++++--------
 src/Docs/Search/App/Sidebar.purs       | 13 ++--
 src/Docs/Search/Declarations.purs      | 84 ++++++++++++++------------
 src/Docs/Search/Engine.purs            | 20 +++---
 src/Docs/Search/Interactive.purs       | 40 ++++++------
 src/Docs/Search/ModuleIndex.purs       | 15 +++--
 src/Docs/Search/PackageIndex.purs      | 27 +++++----
 src/Docs/Search/Score.purs             | 29 +++++----
 src/Docs/Search/SearchResult.purs      |  5 +-
 src/Docs/Search/TypeDecoder.purs       |  8 +--
 src/Docs/Search/TypeIndex.purs         |  4 +-
 src/Docs/Search/TypePrinter.purs       |  4 +-
 src/Docs/Search/TypeQuery.purs         |  6 +-
 src/Docs/Search/TypeShape.purs         |  2 +-
 src/Docs/Search/Types.purs             | 58 +++++++++++++++++-
 test/Main.purs                         | 32 +++++-----
 test/Test/Declarations.purs            | 25 ++++----
 test/Test/ModuleIndex.purs             |  5 +-
 test/Test/TypeQuery.purs               |  6 +-
 19 files changed, 258 insertions(+), 175 deletions(-)

diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index 7025238..16159e3 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -14,6 +14,7 @@ import Docs.Search.PackageIndex (PackageResult)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
 import Docs.Search.TypeIndex (TypeIndex)
+import Docs.Search.Types (ModuleName(..), packageInfoToString)
 
 import Prelude
 
@@ -21,7 +22,7 @@ import Data.Array ((!!))
 import Data.Array as Array
 import Data.List as List
 import Data.Maybe (Maybe(..), isJust, fromMaybe)
-import Data.Newtype (wrap)
+import Data.Newtype (wrap, unwrap)
 import Data.String.CodeUnits (stripSuffix) as String
 import Data.String.Common (null, trim) as String
 import Data.String.Pattern (Pattern(..)) as String
@@ -63,7 +64,7 @@ data Query a
 
 
 data Action
-  = SearchResultClicked String
+  = SearchResultClicked ModuleName
   | MoreResultsRequested
 
 
@@ -145,7 +146,7 @@ handleAction = case _ of
       location <- Window.location window
       pathname <- Location.pathname location
       pure $ isJust $
-        String.stripSuffix (String.Pattern $ moduleName <> ".html") pathname
+        String.stripSuffix (String.Pattern $ unwrap moduleName <> ".html") pathname
 
     when onThisPage do
       showPageContents
@@ -254,7 +255,7 @@ renderPackageResult { name, description, repository } =
       , HH.a [ HP.class_ (wrap "result__link")
              , HP.href $ fromMaybe "" repository # homePageFromRepository
              ]
-        [ HH.text name ]
+        [ HH.text $ unwrap name ]
       ]
     ]
   ] <>
@@ -280,9 +281,9 @@ renderModuleResult { name, package } =
         [ HH.text "M" ]
 
       , HH.a [ HP.class_ (wrap "result__link")
-             , HP.href $ name <> ".html"
+             , HP.href $ unwrap name <> ".html"
              ]
-        [ HH.text name ]
+        [ HH.text $ unwrap name ]
       ]
     ]
   ]
@@ -300,7 +301,7 @@ renderSearchResult markdownIt (SearchResult result) =
       [ HH.a [ HP.class_ (wrap "result__link")
              , HE.onClick $ const $ Just $ SearchResultClicked result.moduleName
              , HP.href $
-               result.moduleName <> ".html#" <>
+               unwrap result.moduleName <> ".html#" <>
                result.hashAnchor <> ":" <> result.name
              ]
         [ HH.text result.name ]
@@ -321,7 +322,7 @@ renderSearchResult markdownIt (SearchResult result) =
                 , HP.title "Package"
                 ]
         [ HH.text "P" ]
-      , HH.text result.packageName
+      , HH.text $ packageInfoToString result.packageInfo
       ]
 
     , HH.span [ HP.class_ (wrap "result__actions__item") ]
@@ -331,7 +332,7 @@ renderSearchResult markdownIt (SearchResult result) =
                 , HP.title "Module"
                 ]
         [ HH.text "M" ]
-      , HH.text result.moduleName
+      , HH.text $ unwrap result.moduleName
       ]
     ]
   ]
@@ -341,7 +342,7 @@ renderResultType
   :: forall a rest
   .  { info :: ResultInfo
      , name :: String
-     , moduleName :: String
+     , moduleName :: ModuleName
      | rest
      }
  -> Array (HH.HTML a Action)
@@ -371,7 +372,7 @@ renderResultType result =
 
 renderValueSignature
   :: forall a rest
-  .  { moduleName :: String
+  .  { moduleName :: ModuleName
      , name :: String
      | rest
      }
@@ -391,7 +392,7 @@ renderTypeClassSignature
      , arguments :: Array TypeArgument
      , superclasses :: Array Constraint
      }
-  -> { name :: String, moduleName :: String | rest }
+  -> { name :: String, moduleName :: ModuleName | rest }
   -> Array (HH.HTML a Action)
 renderTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName } =
   [ keyword "class"
@@ -520,14 +521,14 @@ renderType = case _ of
   TypeOp qname -> renderQualifiedName true TypeLevel qname
 
   TypeApp (TypeApp (TypeConstructor
-                    (QualifiedName { moduleName: [ "Prim" ]
+                    (QualifiedName { moduleNameParts: [ "Prim" ]
                                    , name: "Function" })) t1) t2 ->
     HH.span_ [ renderType t1
              , syntax " -> "
              , renderType t2
              ]
 
-  TypeApp (TypeConstructor (QualifiedName { moduleName: [ "Prim" ]
+  TypeApp (TypeConstructor (QualifiedName { moduleNameParts: [ "Prim" ]
                                           , name: "Record" }))
           row ->
     renderRow false row
@@ -635,6 +636,9 @@ renderRow asRow =
       opening = if asRow then "( " else "{ "
       closing = if asRow then " )" else " }"
 
+      primRecord :: QualifiedName
+      primRecord = QualifiedName { moduleNameParts: [ "Prim" ], name: "Record" }
+
 
 renderConstraint
   :: forall a
@@ -652,18 +656,18 @@ renderQualifiedName
   -> DeclLevel
   -> QualifiedName
   -> HH.HTML a Action
-renderQualifiedName isInfix level (QualifiedName { moduleName, name })
+renderQualifiedName isInfix level (QualifiedName { moduleNameParts, name })
   = if isBuiltIn then
       HH.text name
     else
       HH.a [ HE.onClick $ const $ Just $
-             SearchResultClicked moduleNameString
-           , makeHref level isInfix moduleNameString name
+             SearchResultClicked $ moduleName
+           , makeHref level isInfix moduleName name
            ]
       [ HH.text name ]
       where
-        moduleNameString = Array.intercalate "." moduleName
-        isBuiltIn = moduleName !! 0 == Just "Prim"
+        moduleName = ModuleName $ Array.intercalate "." $ moduleNameParts
+        isBuiltIn = moduleNameParts !! 0 == Just "Prim"
 
 
 renderKind
@@ -681,20 +685,16 @@ makeHref
   :: forall t rest
   .  DeclLevel
   -> Boolean
-  -> String
+  -> ModuleName
   -> String
   -> HH.IProp ( href :: String | rest ) t
 makeHref level isInfix moduleName name =
   HP.href $
-  moduleName <> ".html#" <>
+  unwrap moduleName <> ".html#" <>
   declLevelToHashAnchor level <> ":" <>
   if isInfix then "type (" <> name <> ")" else name
 
 
-primRecord :: QualifiedName
-primRecord = QualifiedName { moduleName: [ "Prim" ], name: "Record" }
-
-
 keyword
   :: forall a
   .  String
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index 58cec82..2f3b36f 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -2,9 +2,10 @@ module Docs.Search.App.Sidebar where
 
 import Docs.Search.Config (config)
 import Docs.Search.ModuleIndex (PackedModuleIndex)
-import Docs.Search.Types (ModuleName, PackageName)
+import Docs.Search.Types (ModuleName, PackageName(..))
 
 import Prelude
+
 import Data.Array as Array
 import Data.Lens ((.~))
 import Data.Lens.Record (prop)
@@ -12,7 +13,7 @@ import Data.List (foldr)
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..), isJust)
-import Data.Newtype (wrap)
+import Data.Newtype (wrap, unwrap)
 import Data.Set (Set)
 import Data.Set as Set
 import Data.Symbol (SProxy(..))
@@ -132,7 +133,7 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
   ]
   where
 
-    renderPackageEntry (packageName /\ modules) =
+    renderPackageEntry (PackageName packageName /\ modules) =
       HH.li [ HP.classes [ wrap "li-package" ] ]
       [ HH.details_
         [ HH.summary_ [ HH.text packageName ]
@@ -142,11 +143,11 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
 
     renderModuleName moduleName =
       HH.li_
-      [ HH.a [ HP.href (moduleName <> ".html") ]
-        [ HH.text moduleName ]
+      [ HH.a [ HP.href (unwrap moduleName <> ".html") ]
+        [ HH.text $ unwrap moduleName ]
       ]
 
-    packageList :: Array (String /\ Set ModuleName)
+    packageList :: Array (PackageName /\ Set ModuleName)
     packageList = Map.toUnfoldable moduleIndex
 
 
diff --git a/src/Docs/Search/Declarations.purs b/src/Docs/Search/Declarations.purs
index ab2bb4c..82e7483 100644
--- a/src/Docs/Search/Declarations.purs
+++ b/src/Docs/Search/Declarations.purs
@@ -1,10 +1,10 @@
 module Docs.Search.Declarations where
 
 import Docs.Search.DocsJson (ChildDeclType(..), ChildDeclaration(..), DeclType(..), Declaration(..), DocsJson(..), SourceSpan)
-import Docs.Search.Score (Scores)
+import Docs.Search.Score (Scores, getPackageScore, getPackageScoreForPackageName)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), QualifiedName(..), Type(..), Kind, joinForAlls)
-import Docs.Search.Types (ModuleName, PackageName)
+import Docs.Search.Types (ModuleName(..), PackageName(..), PackageInfo(..))
 
 import Prelude
 
@@ -14,7 +14,6 @@ import Data.Array as Array
 import Data.Foldable (foldr)
 import Data.List (List, (:))
 import Data.List as List
-import Data.Map as Map
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Newtype (class Newtype, unwrap, wrap)
 import Data.Search.Trie (Trie, alter)
@@ -24,8 +23,7 @@ import Data.String.Common (toLower)
 import Data.String.Pattern (Pattern(..))
 
 
-newtype Declarations
-  = Declarations (Trie Char (List SearchResult))
+newtype Declarations = Declarations (Trie Char (List SearchResult))
 
 derive instance newtypeDeclarations :: Newtype Declarations _
 derive newtype instance semigroupDeclarations :: Semigroup Declarations
@@ -42,7 +40,7 @@ insertDocsJson
   -> Trie Char (List SearchResult)
   -> Trie Char (List SearchResult)
 insertDocsJson scores (DocsJson { name, declarations }) trie
-  = foldr (insertDeclaration scores name) trie declarations
+  = foldr (insertDeclaration scores $ ModuleName name) trie declarations
 
 
 insertDeclaration
@@ -63,13 +61,13 @@ insertSearchResult
   -> Trie Char (List SearchResult)
 insertSearchResult { path, result } trie =
   let path' = List.fromFoldable $ toCharArray $ toLower path in
-    alter path' (Just <<< updateResults) trie
-    where
-      updateResults mbOldResults
-        | Just oldResults <- mbOldResults =
-            result : oldResults
-        | otherwise =
-            List.singleton result
+  alter path' (Just <<< updateResults) trie
+  where
+    updateResults mbOldResults
+      | Just oldResults <- mbOldResults =
+        result : oldResults
+      | otherwise =
+        List.singleton result
 
 
 -- | For each declaration, extract its own `SearchResult` and `SearchResult`s
@@ -82,19 +80,17 @@ resultsForDeclaration
           , result :: SearchResult
           }
 resultsForDeclaration scores moduleName indexEntry@(Declaration entry) =
-  let { info, title, sourceSpan, comments, children } = entry
-      { name, declLevel } = getLevelAndName info.declType title
-      packageName = extractPackageName moduleName sourceSpan
-  in case mkInfo declLevel indexEntry of
-       Nothing -> mempty
-       Just info' ->
+  case mkInfo declLevel indexEntry of
+    Nothing -> mempty
+    Just info' ->
          let result = SearchResult { name: title
                                    , comments
                                    , hashAnchor: declLevelToHashAnchor declLevel
                                    , moduleName
                                    , sourceSpan
-                                   , packageName
-                                   , score: fromMaybe 0 $ Map.lookup packageName scores
+                                   , packageInfo
+                                   , score:
+                                     fromMaybe 0 $ getPackageScoreForPackageName scores <$> mbPackageName
                                    , info: info'
                                    }
          in
@@ -104,8 +100,16 @@ resultsForDeclaration scores moduleName indexEntry@(Declaration entry) =
                }
            ) <>
            ( List.fromFoldable children >>=
-             resultsForChildDeclaration scores packageName moduleName result
+             resultsForChildDeclaration scores packageInfo moduleName result
            )
+  where
+    { info, title, sourceSpan, comments, children } = entry
+    { name, declLevel } = getLevelAndName info.declType title
+    packageInfo = extractPackageName moduleName sourceSpan
+    mbPackageName =
+      case packageInfo of
+        Package packageName -> Just packageName
+        _                   -> Nothing
 
 
 mkInfo :: DeclLevel -> Declaration -> Maybe ResultInfo
@@ -188,31 +192,30 @@ getLevelAndName DeclExternKind  name = { name, declLevel: KindLevel }
 -- | Extract package name from `sourceSpan.name`, which contains path to
 -- | the source file. If `ModuleName` string starts with `Prim.`, it's a
 -- | built-in (guaranteed by the compiler).
-extractPackageName :: ModuleName -> Maybe SourceSpan -> PackageName
-extractPackageName moduleName _
-  | String.split (Pattern ".") moduleName !! 0 == Just "Prim" = "<builtin>"
-extractPackageName _ Nothing = "<unknown>"
+extractPackageName :: ModuleName -> Maybe SourceSpan -> PackageInfo
+extractPackageName (ModuleName moduleName) _
+  | String.split (Pattern ".") moduleName !! 0 == Just "Prim" = Builtin
+extractPackageName _ Nothing = UnknownPackage
 extractPackageName _ (Just { name }) =
-  let dirs = String.split (Pattern "/") name
-  in
-    fromMaybe "<local package>" do
-      topLevelDir <- dirs !! 0
-      if topLevelDir == ".spago"
-      then dirs !! 1
-      else do
-        bowerDirIx <- Array.findIndex (_ == "bower_components") dirs
-        dirs !! (bowerDirIx + 1)
+  fromMaybe LocalPackage do
+    topLevelDir <- dirs !! 0
+    if topLevelDir == ".spago"
+    then Package <<< PackageName <$> dirs !! 1
+    else do
+      bowerDirIx <- Array.findIndex (_ == "bower_components") dirs
+      Package <<< PackageName <$> dirs !! (bowerDirIx + 1)
+  where dirs = String.split (Pattern "/") name
 
 
 -- | Extract `SearchResults` from a `ChildDeclaration`.
 resultsForChildDeclaration
   :: Scores
-  -> PackageName
+  -> PackageInfo
   -> ModuleName
   -> SearchResult
   -> ChildDeclaration
   -> List { path :: String, result :: SearchResult }
-resultsForChildDeclaration scores packageName moduleName parentResult
+resultsForChildDeclaration scores packageInfo moduleName parentResult
   child@(ChildDeclaration { title, info, comments, mbSourceSpan })
   | Just resultInfo <- mkChildInfo parentResult child =
         { path: title
@@ -225,8 +228,8 @@ resultsForChildDeclaration scores packageName moduleName parentResult
                                , hashAnchor: "v"
                                , moduleName
                                , sourceSpan: mbSourceSpan
-                               , packageName
-                               , score: fromMaybe 0 $ Map.lookup packageName scores
+                               , packageInfo
+                               , score: getPackageScore scores packageInfo
                                , info: resultInfo
                                }
         } # List.singleton
@@ -261,7 +264,8 @@ mkChildInfo
 
         -- Then we construct a qualified name of the type class.
         constraintClass =
-          QualifiedName { moduleName: String.split (wrap ".") moduleName
+          QualifiedName { moduleNameParts:
+                          String.split (wrap ".") $ unwrap moduleName
                         , name: resultName }
 
         -- We concatenate two lists:
diff --git a/src/Docs/Search/Engine.purs b/src/Docs/Search/Engine.purs
index 93b253d..d4d4eb2 100644
--- a/src/Docs/Search/Engine.purs
+++ b/src/Docs/Search/Engine.purs
@@ -5,7 +5,7 @@ import Docs.Search.PackageIndex (PackageIndex, PackageResult)
 import Docs.Search.Score (Scores)
 import Docs.Search.SearchResult (SearchResult, typeOfResult)
 import Docs.Search.TypeQuery (TypeQuery(..), parseTypeQuery, penalty)
-import Docs.Search.Types (PackageName, ModuleName)
+import Docs.Search.Types (PackageInfo(..), PackageName(..), ModuleName(..))
 
 import Prelude
 
@@ -73,25 +73,25 @@ getResultScore (PackResult r) = r.score
 getResultScore (MdlResult r) = r.score
 
 
-getResultPackageName :: Result -> PackageName
-getResultPackageName (DeclResult r) = (unwrap r).packageName
-getResultPackageName (TypeResult r) = (unwrap r).packageName
-getResultPackageName (PackResult r) = r.name
-getResultPackageName (MdlResult r) = r.package
+getResultPackageInfo :: Result -> PackageInfo
+getResultPackageInfo (DeclResult r) = (unwrap r).packageInfo
+getResultPackageInfo (TypeResult r) = (unwrap r).packageInfo
+getResultPackageInfo (PackResult r) = Package r.name
+getResultPackageInfo (MdlResult r) = Package $ r.package
 
 
 getResultModuleName :: Result -> ModuleName
 getResultModuleName (DeclResult r) = (unwrap r).moduleName
 getResultModuleName (TypeResult r) = (unwrap r).moduleName
-getResultModuleName (PackResult r) = ""
+getResultModuleName (PackResult r) = ModuleName ""
 getResultModuleName (MdlResult r) = r.name
 
 
 getResultName :: Result -> String
 getResultName (DeclResult r) = (unwrap r).name
 getResultName (TypeResult r) = (unwrap r).name
-getResultName (PackResult r) = r.name
-getResultName (MdlResult r) = r.name
+getResultName (PackResult r) = unwrap r.name
+getResultName (MdlResult r) = unwrap r.name
 
 
 sortByPopularity
@@ -102,7 +102,7 @@ sortByPopularity
 sortByPopularity { packageIndex } =
   Array.sortBy (
     compare `on` (getResultScore >>> negate) <>
-    compare `on` getResultPackageName <>
+    compare `on` getResultPackageInfo <>
     compare `on` getResultModuleName <>
     -- Identifier name comes last: we want to make sure no `Result`s are
     -- equal, to avoid having unstable ordering.
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 6433543..771fd7f 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -1,16 +1,6 @@
 -- | Definitions for the "search REPL".
 module Docs.Search.Interactive where
 
-import Prelude
-
-import Data.Array as Array
-import Data.Identity (Identity(..))
-import Data.Maybe (fromMaybe)
-import Data.Newtype (un, unwrap, wrap)
-import Data.Search.Trie as Trie
-import Data.String (length) as String
-import Data.String.Common (split, trim) as String
-import Data.Tuple (fst)
 import Docs.Search.Declarations (Declarations, mkDeclarations)
 import Docs.Search.DocsJson (DataDeclType(..))
 import Docs.Search.Engine (mkEngineState, Result(..))
@@ -26,6 +16,18 @@ import Docs.Search.Terminal (bold, cyan, green, yellow)
 import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
 import Docs.Search.TypeIndex (resultsWithTypes)
 import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showKind, showType, showTypeArgument, space, syntax)
+import Docs.Search.Types (PackageName, ModuleName, PackageInfo, packageInfoToString)
+
+import Prelude
+
+import Data.Array as Array
+import Data.Identity (Identity(..))
+import Data.Maybe (fromMaybe)
+import Data.Newtype (un, unwrap, wrap)
+import Data.Search.Trie as Trie
+import Data.String (length) as String
+import Data.String.Common (split, trim) as String
+import Data.Tuple (fst)
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
@@ -122,33 +124,37 @@ showResult = case _ of
 
 
 showSearchResult :: SearchResult -> String
-showSearchResult (SearchResult result@{ name, comments, moduleName, packageName }) =
+showSearchResult (SearchResult result@{ name, comments, moduleName, packageInfo }) =
   showSignature result <> "\n" <>
 
   (fromMaybe "\n" $
    comments <#> \comment ->
    "\n" <> leftShift 3 (String.trim comment) <> "\n\n") <>
 
-  bold (cyan (rightPad 40 packageName)) <> space <> bold (green moduleName)
+  bold (
+    cyan (rightPad 40 $ packageInfoToString packageInfo)
+  ) <>
+  space <>
+  bold (green $ unwrap moduleName)
 
 
 showPackageResult :: PackageResult -> String
 showPackageResult { name, description } =
-  bold (cyan "package") <> " " <> bold (yellow name) <>
+  bold (cyan "package") <> " " <> bold (yellow $ unwrap name) <>
 
   (description >#> \text -> "\n\n" <> leftShift 3 text <> "\n")
 
 
 showModuleResult :: ModuleResult -> String
 showModuleResult { name, package } =
-  bold (cyan "module") <> " " <> bold (green name)
+  bold (cyan "module") <> " " <> bold (green $ unwrap name)
 
 
 showSignature ::
   forall rest.
   { name :: String
-  , moduleName :: String
-  , packageName :: String
+  , moduleName :: ModuleName
+  , packageInfo :: PackageInfo
   , info :: ResultInfo
   | rest
   }
@@ -185,7 +191,7 @@ showTypeClassSignature
      , arguments :: Array TypeArgument
      , superclasses :: Array Constraint
      }
-  -> { name :: String, moduleName :: String | rest }
+  -> { name :: String, moduleName :: ModuleName | rest }
   -> String
 showTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName } =
 
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index efa5ee8..b057b96 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -3,9 +3,9 @@ module Docs.Search.ModuleIndex where
 import Docs.Search.Config (config)
 import Docs.Search.Declarations (Declarations(..))
 import Docs.Search.SearchResult (SearchResult(..))
-import Docs.Search.Types (ModuleName, PackageName)
+import Docs.Search.Types (ModuleName, PackageName, PackageInfo(..))
 import Docs.Search.Extra (stringToList)
-import Docs.Search.Score (Scores, normalizePackageName)
+import Docs.Search.Score (Scores)
 
 import Prelude
 
@@ -22,6 +22,7 @@ import Data.List (List, (:))
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (fromMaybe)
+import Data.Newtype (unwrap)
 import Data.Search.Trie (Trie)
 import Data.Search.Trie as Trie
 import Data.Set (Set)
@@ -68,7 +69,9 @@ unpackModuleIndex packageModules =
 -- | E.g. `"Data.Array.ST" -> ["data.array.st", "array.st", "st"]`.
 extractModuleNameParts :: ModuleName -> List String
 extractModuleNameParts =
-  foldl (\acc el -> el : map (_ <> "." <> el) acc) mempty <<< String.split (Pattern ".") <<< String.toLower
+  unwrap >>> String.toLower >>>
+  String.split (Pattern ".") >>>
+  foldl (\acc el -> el : map (_ <> "." <> el) acc) mempty
 
 
 queryModuleIndex
@@ -83,7 +86,7 @@ queryModuleIndex scores { index, modulePackages } query =
   Array.nub <#>
   (\name -> do
       package <- Map.lookup name modulePackages
-      pure { name, package, score: fromMaybe 0 $ Map.lookup (normalizePackageName package) scores  }) #
+      pure { name, package, score: fromMaybe 0 $ Map.lookup package scores }) #
   Array.catMaybes
 
 
@@ -97,9 +100,9 @@ mkPackedModuleIndex (Declarations trie) =
       -> Map PackageName (Set ModuleName)
     extract = foldr (Map.unionWith Set.union) mempty <<< map mkEntry
       where
-        mkEntry (SearchResult { packageName, moduleName }) =
+        mkEntry (SearchResult { packageInfo: Package packageName, moduleName }) =
           Map.singleton packageName (Set.singleton moduleName)
-
+        mkEntry _ = mempty
 
 loadModuleIndex :: Aff PackedModuleIndex
 loadModuleIndex = do
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index 09503d7..8f3685a 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -2,7 +2,8 @@ module Docs.Search.PackageIndex where
 
 import Docs.Search.Config (config)
 import Docs.Search.Extra (stringToList)
-import Docs.Search.Score (Scores, getPackageScore, normalizePackageName)
+import Docs.Search.Score (Scores, getPackageScoreForPackageName, normalizePackageName)
+import Docs.Search.Types (PackageName, RawPackageName(..))
 
 import Prelude
 
@@ -23,10 +24,10 @@ import Web.Bower.PackageMeta (PackageMeta(..))
 
 
 type PackageResult
-  = { name :: String
+  = { name :: PackageName
     , description :: Maybe String
     , score :: Int
-    , dependencies :: Array String
+    , dependencies :: Array PackageName
     , repository :: Maybe String
     }
 
@@ -44,24 +45,26 @@ mkPackageInfo packageScores pms =
   where
     insert
       :: PackageMeta
-      -> Map String PackageResult
-      -> Map String PackageResult
+      -> Map PackageName PackageResult
+      -> Map PackageName PackageResult
     insert
       (PackageMeta { name
                    , description
                    , dependencies
                    , devDependencies
                    , repository }) =
-
-          Map.insert
-          name
-          { name
+        Map.insert
+          packageName
+          { name: packageName
           , description: description
-          , score: getPackageScore packageScores $ normalizePackageName name
-          , dependencies: unwrap dependencies <#> (_.packageName)
+          , score: getPackageScoreForPackageName packageScores packageName
+          , dependencies:
+            unwrap dependencies <#>
+            (_.packageName >>> RawPackageName >>> normalizePackageName)
           , repository: repository <#> (_.url)
           }
 
+      where packageName = normalizePackageName $ RawPackageName name
 
 mkScoresFromPackageIndex :: PackageIndex -> Scores
 mkScoresFromPackageIndex =
@@ -78,7 +81,7 @@ loadPackageIndex = do
 mkPackageIndex :: PackageInfo -> PackageIndex
 mkPackageIndex =
   Array.foldr
-  (\package -> Trie.insert (stringToList $ normalizePackageName package.name) package)
+  (\package -> Trie.insert (stringToList $ unwrap package.name) package)
   mempty
 
 
diff --git a/src/Docs/Search/Score.purs b/src/Docs/Search/Score.purs
index 7304470..03e276d 100644
--- a/src/Docs/Search/Score.purs
+++ b/src/Docs/Search/Score.purs
@@ -1,6 +1,6 @@
 module Docs.Search.Score where
 
-import Docs.Search.Types (PackageName)
+import Docs.Search.Types (RawPackageName(..), PackageName(..), PackageInfo(..))
 
 import Prelude
 
@@ -15,16 +15,9 @@ import Web.Bower.PackageMeta (Dependencies, PackageMeta)
 
 type Scores = Map PackageName Int
 
-
-getPackageScore :: Scores -> PackageName -> Int
-getPackageScore _      "<builtin>" = 1000000
-getPackageScore _      "<local package>" = 2000000
-getPackageScore scores name = fromMaybe 0 $ Map.lookup name scores
-
-
-normalizePackageName :: PackageName -> PackageName
-normalizePackageName packageName =
-  fromMaybe packageName $ String.stripPrefix (wrap "purescript-") packageName
+normalizePackageName :: RawPackageName -> PackageName
+normalizePackageName (RawPackageName p) =
+  fromMaybe (PackageName p) $ map wrap $ String.stripPrefix (wrap "purescript-") p
 
 
 -- | Construct a mapping from package names to their scores, based on number
@@ -44,4 +37,16 @@ mkScores =
       Array.foldr
       (\dep -> Map.insertWith add dep 1)
       scores
-      (deps # unwrap >>> map (_.packageName >>> normalizePackageName))
+      (deps # unwrap >>> map (_.packageName >>> RawPackageName >>> normalizePackageName))
+
+
+getPackageScore :: Scores -> PackageInfo -> Int
+getPackageScore scores = case _ of
+  Package p      -> getPackageScoreForPackageName scores p
+  Builtin        -> 100000
+  LocalPackage   -> 200000
+  UnknownPackage -> 0
+
+
+getPackageScoreForPackageName :: Scores -> PackageName -> Int
+getPackageScoreForPackageName scores p = fromMaybe 0 $ Map.lookup p scores
diff --git a/src/Docs/Search/SearchResult.purs b/src/Docs/Search/SearchResult.purs
index 6739184..8d5af24 100644
--- a/src/Docs/Search/SearchResult.purs
+++ b/src/Docs/Search/SearchResult.purs
@@ -2,6 +2,7 @@ module Docs.Search.SearchResult where
 
 import Docs.Search.DocsJson (DataDeclType)
 import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
+import Docs.Search.Types (PackageName, PackageInfo, ModuleName)
 
 import Prelude
 
@@ -59,8 +60,8 @@ newtype SearchResult
     { name :: String
     , comments :: Maybe String
     , hashAnchor :: String
-    , moduleName :: String
-    , packageName :: String
+    , moduleName :: ModuleName
+    , packageInfo :: PackageInfo
     , score :: Int
     , sourceSpan :: Maybe { start :: Array Int
                           , end :: Array Int
diff --git a/src/Docs/Search/TypeDecoder.purs b/src/Docs/Search/TypeDecoder.purs
index f7c7ff1..89f2138 100644
--- a/src/Docs/Search/TypeDecoder.purs
+++ b/src/Docs/Search/TypeDecoder.purs
@@ -25,20 +25,20 @@ instance showQualifiedName :: Show QualifiedName where
   show = genericShow
 
 newtype QualifiedName
-  = QualifiedName { moduleName :: Array String
+  = QualifiedName { moduleNameParts :: Array String
                   , name :: String
                   }
 
 instance decodeJsonQualifiedName :: DecodeJson QualifiedName where
   decodeJson json = do
     decodeTuple
-      (\moduleName name -> QualifiedName { moduleName, name })
+      (\moduleNameParts name -> QualifiedName { moduleNameParts, name })
       (mkJsonError "QualifiedName" json)
       json
 
 instance encodeJsonQualifiedName :: EncodeJson QualifiedName where
-  encodeJson (QualifiedName { moduleName, name }) =
-    encodeTuple moduleName name
+  encodeJson (QualifiedName { moduleNameParts, name }) =
+    encodeTuple moduleNameParts name
 
 mkJsonError :: String -> Json -> (forall i. i -> String)
 mkJsonError name json _ =
diff --git a/src/Docs/Search/TypeIndex.purs b/src/Docs/Search/TypeIndex.purs
index ae8e5a5..bd0c1a3 100644
--- a/src/Docs/Search/TypeIndex.purs
+++ b/src/Docs/Search/TypeIndex.purs
@@ -8,6 +8,7 @@ import Docs.Search.Score (Scores)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Type)
 import Docs.Search.TypeQuery (TypeQuery)
+import Docs.Search.Types (ModuleName(..))
 import Docs.Search.TypeShape (shapeOfType, shapeOfTypeQuery, stringifyShape)
 
 import Prelude
@@ -48,7 +49,8 @@ mkTypeIndex scores docsJsons =
 
 allResults :: Scores -> DocsJson -> Array SearchResult
 allResults scores (DocsJson { name, declarations }) =
-  declarations >>= (resultsForDeclaration scores name >>> map (_.result) >>> Array.fromFoldable)
+  declarations >>= (resultsForDeclaration scores (ModuleName name) >>>
+                    map (_.result) >>> Array.fromFoldable)
 
 
 resultsWithTypes :: Scores -> DocsJson -> Array SearchResult
diff --git a/src/Docs/Search/TypePrinter.purs b/src/Docs/Search/TypePrinter.purs
index 346a646..b98867c 100644
--- a/src/Docs/Search/TypePrinter.purs
+++ b/src/Docs/Search/TypePrinter.purs
@@ -21,13 +21,13 @@ showType = case _ of
   TypeOp qname -> showQualifiedName qname
 
   TypeApp (TypeApp (TypeConstructor
-                    (QualifiedName { moduleName: [ "Prim" ]
+                    (QualifiedName { moduleNameParts: [ "Prim" ]
                                    , name: "Function" }))
                    t1)
           t2 ->
     showType t1 <> syntax " -> " <> showType t2
 
-  TypeApp (TypeConstructor (QualifiedName { moduleName: [ "Prim" ]
+  TypeApp (TypeConstructor (QualifiedName { moduleNameParts: [ "Prim" ]
                                           , name: "Record" }))
           row ->
     showRow false row
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index 5b68946..1c170b0 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -248,7 +248,7 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
     -- * Functions
     go acc ({ q: QFun q1 q2
             , t: TypeApp (TypeApp (TypeConstructor
-                                    (QualifiedName { moduleName: [ "Prim" ]
+                                    (QualifiedName { moduleNameParts: [ "Prim" ]
                                                    , name: "Function" })) t1) t2 } : rest) =
       go acc ({ q: q1, t: t1 } : { q: q2, t: t2 } : rest)
     go acc ({ q: q@(QFun q1 q2), t } : rest) =
@@ -257,7 +257,7 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
     -- * Rows
     go acc ({ q: QApp (QConst "Record") (QRow qRows)
             , t: TypeApp (TypeConstructor
-                           (QualifiedName { moduleName: [ "Prim" ]
+                           (QualifiedName { moduleNameParts: [ "Prim" ]
                                           , name: "Record" })) row } : rest) =
       let { rows, ty } = joinRows row
           qRowsLength = List.length qRows
@@ -407,7 +407,7 @@ typeSize = go 0 <<< List.singleton
     go n (TypeOp _ : rest) =
       go (n + 1) rest
     go n (TypeApp (TypeApp (TypeConstructor
-                    (QualifiedName { moduleName: [ "Prim" ]
+                    (QualifiedName { moduleNameParts: [ "Prim" ]
                                    , name: "Function" })) t1) t2 : rest) =
       go (n + 1) (t1 : t2 : rest)
     go n (TypeApp q1 q2 : rest) =
diff --git a/src/Docs/Search/TypeShape.purs b/src/Docs/Search/TypeShape.purs
index d7741a6..7a38798 100644
--- a/src/Docs/Search/TypeShape.purs
+++ b/src/Docs/Search/TypeShape.purs
@@ -101,7 +101,7 @@ shapeOfType ty = List.reverse $ go (pure ty) Nil
         TypeWildcard ->
           go rest (PVar : acc)
 
-        TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Prim"]
+        TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"]
                                                          , name: "Function" })) t1) t2 ->
           go (t1 : t2 : rest) (PFun : acc)
 
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index 1f65654..9c1b979 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -1,5 +1,59 @@
 module Docs.Search.Types where
 
-type ModuleName = String
+import Prelude
 
-type PackageName = String
+import Data.Argonaut.Decode (class DecodeJson)
+import Data.Argonaut.Decode.Generic.Rep (genericDecodeJson)
+import Data.Argonaut.Encode (class EncodeJson)
+import Data.Argonaut.Encode.Generic.Rep (genericEncodeJson)
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Show (genericShow)
+import Data.Newtype (class Newtype)
+
+
+newtype ModuleName = ModuleName String
+
+derive instance newtypeModuleName :: Newtype ModuleName _
+derive instance genericModuleName :: Generic ModuleName _
+derive newtype instance eqModuleName :: Eq ModuleName
+derive newtype instance ordModuleName :: Ord ModuleName
+derive newtype instance decodeJsonModuleName :: DecodeJson ModuleName
+derive newtype instance encodeJsonModuleName :: EncodeJson ModuleName
+
+
+-- | Non-normalized package name, e.g. `purescript-prelude` or just `prelude`.
+newtype RawPackageName = RawPackageName String
+
+derive instance newtypeRawPackageName :: Newtype RawPackageName _
+
+
+-- | Normalized package name without "purescript-" prefix.
+newtype PackageName = PackageName String
+
+derive instance newtypePackageName :: Newtype PackageName _
+derive newtype instance eqPackageName :: Eq PackageName
+derive newtype instance ordPackageName :: Ord PackageName
+derive newtype instance showPackageName :: Show PackageName
+derive newtype instance decodeJsonPackageName :: DecodeJson PackageName
+derive newtype instance encodeJsonPackageName :: EncodeJson PackageName
+derive instance genericPackageName :: Generic PackageName _
+
+
+data PackageInfo = Package PackageName | Builtin | LocalPackage | UnknownPackage
+
+derive instance eqPackageInfo :: Eq PackageInfo
+derive instance ordPackageInfo :: Ord PackageInfo
+derive instance genericPackageInfo :: Generic PackageInfo _
+instance showPackageInfo :: Show PackageInfo where
+  show = genericShow
+
+instance decodeJsonPackageInfo :: DecodeJson PackageInfo where
+  decodeJson = genericDecodeJson
+instance encodeJsonPackageInfo :: EncodeJson PackageInfo where
+  encodeJson = genericEncodeJson
+
+packageInfoToString :: PackageInfo -> String
+packageInfoToString (Package (PackageName p)) = p
+packageInfoToString Builtin = "<builtin>"
+packageInfoToString LocalPackage = "<local package>"
+packageInfoToString UnknownPackage = "<unknown package>"
diff --git a/test/Main.purs b/test/Main.purs
index f7c435c..fa4c96b 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -67,7 +67,7 @@ mainTest = do
       """
 
       assertRight (decodeJson qualifiedName)
-        (QualifiedName { moduleName: ["Prim"]
+        (QualifiedName { moduleNameParts: ["Prim"]
                        , name: "Type"
                        }
         )
@@ -87,7 +87,7 @@ mainTest = do
       """
 
       assertRight (decodeJson namedKind)
-        (NamedKind $ QualifiedName { moduleName: ["Prim"]
+        (NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
                                    , name: "Type"
                                    }
         )
@@ -111,7 +111,7 @@ mainTest = do
       """
 
       assertRight (decodeJson row)
-        (Row $ NamedKind $ QualifiedName { moduleName: ["Prim"]
+        (Row $ NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
                                          , name: "Type"
                                          }
         )
@@ -154,11 +154,11 @@ mainTest = do
         }
         """
       assertRight (decodeJson funKind)
-        (FunKind (Row $ NamedKind $ QualifiedName { moduleName: ["Prim"]
+        (FunKind (Row $ NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
                                                   , name: "Type"
                                                   }
                  )
-                 (Row $ NamedKind $ QualifiedName { moduleName: ["Prim"]
+                 (Row $ NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
                                                   , name: "Type"
                                                   }
                  )
@@ -181,7 +181,7 @@ mainTest = do
       }
       """
       assertRight (decodeJson constraint)
-        (Constraint { constraintClass: QualifiedName { moduleName: ["Prim"]
+        (Constraint { constraintClass: QualifiedName { moduleNameParts: ["Prim"]
                                                      , name: "Partial"
                                                      }
                     , constraintArgs: []
@@ -230,7 +230,7 @@ mainTest = do
 
       assertRight (decodeJson typeApp1) $
         TypeApp
-          (TypeConstructor (QualifiedName { moduleName:
+          (TypeConstructor (QualifiedName { moduleNameParts:
                                             [ "Control"
                                             , "Monad"
                                             , "ST"
@@ -256,7 +256,7 @@ mainTest = do
           }
       """
       assertRight (decodeJson typeOp) $
-        TypeOp $ QualifiedName { moduleName: [ "Data", "NaturalTransformation" ]
+        TypeOp $ QualifiedName { moduleNameParts: [ "Data", "NaturalTransformation" ]
                                , name: "~>"
                                }
 
@@ -293,7 +293,7 @@ mainTest = do
 
       assertRight (decodeJson binaryNoParens) $
         BinaryNoParensType
-        (TypeOp $ QualifiedName { moduleName: ["Data", "NaturalTransformation"], name: "~>" })
+        (TypeOp $ QualifiedName { moduleNameParts: ["Data", "NaturalTransformation"], name: "~>" })
         (TypeVar "m")
         (TypeVar "n")
 
@@ -335,14 +335,14 @@ mainTest = do
       assertRight (decodeJson parensInType) $
         ParensInType $
           TypeApp
-          (TypeConstructor (QualifiedName { moduleName:
+          (TypeConstructor (QualifiedName { moduleNameParts:
                                             [ "Data"
                                             , "Maybe"
                                             ],
                                             name: "Maybe"
                                           }
                            ))
-          (TypeConstructor (QualifiedName { moduleName:
+          (TypeConstructor (QualifiedName { moduleNameParts:
                                             [ "Prim"
                                             ],
                                             name: "String"
@@ -389,7 +389,7 @@ mainTest = do
       assertRight (decodeJson rcons) $
         RCons
           "tail"
-          (TypeApp (TypeConstructor $ QualifiedName { moduleName: [ "Data", "Symbol" ], name: "SProxy" })
+          (TypeApp (TypeConstructor $ QualifiedName { moduleNameParts: [ "Data", "Symbol" ], name: "SProxy" })
                    (TypeVar "t"))
           REmpty
 
@@ -545,8 +545,8 @@ mainTest = do
       """
       assertRight (decodeJson forallJson) $
         ForAll "f"
-        (Just (FunKind (NamedKind (QualifiedName { moduleName: ["Prim","RowList"], name: "RowList" })) (NamedKind (QualifiedName { moduleName: ["Prim"], name: "Type" }))))
-        (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Prim"], name: "Function" })) (TypeApp (TypeVar "f") (TypeVar "l"))) (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Data","List","Types"], name: "List" })) (ParensInType (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Data","Tuple"], name: "Tuple" })) (TypeConstructor (QualifiedName { moduleName: ["Prim"], name: "String" }))) (TypeConstructor (QualifiedName { moduleName: ["Prim"], name: "String" }))))))
+        (Just (FunKind (NamedKind (QualifiedName { moduleNameParts: ["Prim","RowList"], name: "RowList" })) (NamedKind (QualifiedName { moduleNameParts: ["Prim"], name: "Type" }))))
+        (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "Function" })) (TypeApp (TypeVar "f") (TypeVar "l"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","List","Types"], name: "List" })) (ParensInType (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","Tuple"], name: "Tuple" })) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "String" }))) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "String" }))))))
 
 
 
@@ -558,7 +558,7 @@ mainTest = do
 {"annotation":[],"tag":"ForAll","contents":["o",{"annotation":[],"tag":"ForAll","contents":["r",{"annotation":[],"tag":"ForAll","contents":["l",{"annotation":[],"tag":"ConstrainedType","contents":[{"constraintAnn":[],"constraintClass":[["Type","Data","Boolean"],"And"],"constraintArgs":[{"annotation":[],"tag":"TypeVar","contents":"l"},{"annotation":[],"tag":"TypeVar","contents":"r"},{"annotation":[],"tag":"TypeVar","contents":"o"}],"constraintData":null},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"l"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"r"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"o"}]}]}]}]},null]},null]},null]}
       """
 
-      assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleName: ["Type","Data","Boolean"], name: "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Prim"], name: "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Prim"], name: "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "o"))))))))
+      assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "o"))))))))
 
   suite "Kind encoder" do
     test "FunKind" do
@@ -570,4 +570,4 @@ mainTest = do
 
 
 qualified :: Array String -> String -> QualifiedName
-qualified moduleName name = QualifiedName { moduleName, name }
+qualified moduleNameParts name = QualifiedName { moduleNameParts, name }
diff --git a/test/Test/Declarations.purs b/test/Test/Declarations.purs
index fe3d9a3..60ea61d 100644
--- a/test/Test/Declarations.purs
+++ b/test/Test/Declarations.purs
@@ -2,8 +2,11 @@ module Test.Declarations where
 
 import Prelude
 
-import Data.Maybe (Maybe(..))
 import Docs.Search.Declarations (extractPackageName)
+import Docs.Search.Types (PackageName(..), PackageInfo(..))
+
+import Data.Maybe (Maybe(..))
+import Data.Newtype (wrap)
 
 import Test.Unit (TestSuite, suite, test)
 import Test.Unit.Assert as Assert
@@ -12,26 +15,26 @@ tests :: TestSuite
 tests = do
   suite "Declarations" do
     test "extractPackageName" do
-      Assert.equal "<builtin>" (extractPackageName "Prim" Nothing)
-      Assert.equal "<builtin>" (extractPackageName "Prim.Foo" Nothing)
-      Assert.equal "<builtin>" (extractPackageName "Prim.Foo.Bar" Nothing)
-      Assert.equal "<unknown>" (extractPackageName "Primitive" Nothing)
-      Assert.equal "foo"
-        (extractPackageName "Foo" $
+      Assert.equal Builtin (extractPackageName (wrap "Prim") Nothing)
+      Assert.equal Builtin (extractPackageName (wrap "Prim.Foo") Nothing)
+      Assert.equal Builtin (extractPackageName (wrap "Prim.Foo.Bar") Nothing)
+      Assert.equal UnknownPackage (extractPackageName (wrap "Primitive") Nothing)
+      Assert.equal (Package $ PackageName "foo")
+        (extractPackageName (wrap "Foo") $
          Just { start: []
               , end: []
               , name: ".spago/foo/src/Foo.purs"
               }
         )
-      Assert.equal "bar"
-        (extractPackageName "Bar" $
+      Assert.equal (Package $ PackageName "bar")
+        (extractPackageName (wrap "Bar") $
          Just { start: []
               , end: []
               , name: "/path/to/somewhere/bower_components/bar/src/Bar.purs"
               }
         )
-      Assert.equal "<local package>"
-        (extractPackageName "Bar" $
+      Assert.equal LocalPackage
+        (extractPackageName (wrap "Bar") $
          Just { start: []
               , end: []
               , name: "/path/to/somewhere/src/Bar.purs"
diff --git a/test/Test/ModuleIndex.purs b/test/Test/ModuleIndex.purs
index c6a4e6e..df4a59d 100644
--- a/test/Test/ModuleIndex.purs
+++ b/test/Test/ModuleIndex.purs
@@ -5,6 +5,7 @@ import Docs.Search.ModuleIndex (extractModuleNameParts)
 import Prelude
 
 import Data.List as List
+import Data.Newtype (wrap)
 import Test.Unit (TestSuite, suite, test)
 import Test.Unit.Assert as Assert
 
@@ -14,11 +15,11 @@ tests = do
   suite "ModuleIndex" do
 
     test "test #0" do
-      Assert.equal (extractModuleNameParts "Data.Array.ST") (
+      Assert.equal (extractModuleNameParts $ wrap "Data.Array.ST") (
         List.fromFoldable [ "st", "array.st", "data.array.st" ]
       )
 
     test "test #1" do
-      Assert.equal (extractModuleNameParts "Foo") (
+      Assert.equal (extractModuleNameParts $ wrap "Foo") (
         List.fromFoldable [ "foo" ]
       )
diff --git a/test/Test/TypeQuery.purs b/test/Test/TypeQuery.purs
index 4afaafa..f508269 100644
--- a/test/Test/TypeQuery.purs
+++ b/test/Test/TypeQuery.purs
@@ -245,7 +245,7 @@ tests = do
           c2 = constr (qname [""] "GenericEq") [TypeVar "rep"]
 
           fun t1 t2 =
-            TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleName: ["Prim"]
+            TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"]
                                                              , name: "Function" })) t1) t2
           type_ =
             ForAll "a" Nothing $
@@ -391,7 +391,7 @@ nl :: forall t5 t6. Foldable t6 => t5 -> t6 t5 -> NonEmptyList t5
 nl x rst = NonEmptyList.cons' x $ List.fromFoldable rst
 
 unitType :: Type
-unitType = TypeConstructor (QualifiedName { moduleName: []
+unitType = TypeConstructor (QualifiedName { moduleNameParts: []
                                           , name: "Unit"
                                           })
 
@@ -399,7 +399,7 @@ countFreeVars :: TypeQuery -> Int
 countFreeVars = getFreeVariables >>> Set.size
 
 qname :: Array String -> String -> QualifiedName
-qname m n = QualifiedName { moduleName: m, name: n }
+qname m n = QualifiedName { moduleNameParts: m, name: n }
 
 constr :: QualifiedName -> Array Type -> Constraint
 constr c a = Constraint { constraintClass: c, constraintArgs: a }

From fee7abefc0bf7e2d742939c9794dfa89341acb53 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Mon, 27 Jul 2020 22:24:32 +0300
Subject: [PATCH 11/45] Wrap package scores and identifiers in newtypes

---
 src/Docs/Search/App/SearchResults.purs |  50 +++---
 src/Docs/Search/Declarations.purs      |   8 +-
 src/Docs/Search/Engine.purs            |  15 +-
 src/Docs/Search/Interactive.purs       |  50 +++---
 src/Docs/Search/ModuleIndex.purs       |   9 +-
 src/Docs/Search/PackageIndex.purs      |   4 +-
 src/Docs/Search/Score.purs             |  18 +-
 src/Docs/Search/SearchResult.purs      |   6 +-
 src/Docs/Search/TypeDecoder.purs       |  10 +-
 src/Docs/Search/TypePrinter.purs       |  12 +-
 src/Docs/Search/TypeQuery.purs         |  61 +++----
 src/Docs/Search/TypeShape.purs         |   3 +-
 src/Docs/Search/Types.purs             |  27 ++-
 test/Main.purs                         |  78 +++------
 test/Test/TypeQuery.purs               | 223 ++++++++++++++-----------
 15 files changed, 299 insertions(+), 275 deletions(-)

diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index 16159e3..c5f9e82 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -6,7 +6,7 @@ import Docs.Search.BrowserEngine (PartialIndex, browserSearchEngine)
 import Docs.Search.Config (config)
 import Docs.Search.Declarations (DeclLevel(..), declLevelToHashAnchor)
 import Docs.Search.DocsJson (DataDeclType(..))
-import Docs.Search.Engine (Result(..))
+import Docs.Search.Engine (Result(..), packageInfoToString)
 import Docs.Search.Engine as Engine
 import Docs.Search.Extra (homePageFromRepository, (>#>))
 import Docs.Search.ModuleIndex (ModuleResult)
@@ -14,7 +14,7 @@ import Docs.Search.PackageIndex (PackageResult)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
 import Docs.Search.TypeIndex (TypeIndex)
-import Docs.Search.Types (ModuleName(..), packageInfoToString)
+import Docs.Search.Types (ModuleName(..), Identifier(..))
 
 import Prelude
 
@@ -302,9 +302,9 @@ renderSearchResult markdownIt (SearchResult result) =
              , HE.onClick $ const $ Just $ SearchResultClicked result.moduleName
              , HP.href $
                unwrap result.moduleName <> ".html#" <>
-               result.hashAnchor <> ":" <> result.name
+               result.hashAnchor <> ":" <> unwrap result.name
              ]
-        [ HH.text result.name ]
+        [ HH.text $ unwrap result.name ]
       ]
     ]
 
@@ -341,7 +341,7 @@ renderSearchResult markdownIt (SearchResult result) =
 renderResultType
   :: forall a rest
   .  { info :: ResultInfo
-     , name :: String
+     , name :: Identifier
      , moduleName :: ModuleName
      | rest
      }
@@ -373,7 +373,7 @@ renderResultType result =
 renderValueSignature
   :: forall a rest
   .  { moduleName :: ModuleName
-     , name :: String
+     , name :: Identifier
      | rest
      }
   -> Type
@@ -381,7 +381,7 @@ renderValueSignature
 renderValueSignature result ty =
   [ HH.a [ makeHref ValueLevel false result.moduleName result.name
          , HE.onClick $ const $ Just $ SearchResultClicked result.moduleName ]
-    [ HH.text result.name ]
+    [ HH.text $ unwrap result.name ]
   , HH.text " :: "
   , renderType ty ]
 
@@ -392,7 +392,7 @@ renderTypeClassSignature
      , arguments :: Array TypeArgument
      , superclasses :: Array Constraint
      }
-  -> { name :: String, moduleName :: ModuleName | rest }
+  -> { name :: Identifier, moduleName :: ModuleName | rest }
   -> Array (HH.HTML a Action)
 renderTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName } =
   [ keyword "class"
@@ -414,7 +414,7 @@ renderTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName
          , HE.onClick $ const $ Just $
            SearchResultClicked moduleName
          ]
-    [ HH.text name ]
+    [ HH.text $ unwrap name ]
   , space
   ] <> (
     Array.intercalate [ space ] $
@@ -444,10 +444,10 @@ renderTypeClassMemberSignature
      , typeClass :: QualifiedName
      , typeClassArguments :: Array TypeArgument
      }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> Array (HH.HTML a Action)
 renderTypeClassMemberSignature { type: ty, typeClass, typeClassArguments } result =
-  [ HH.text result.name
+  [ HH.text $ unwrap result.name
   , HH.text " :: "
   , renderType ty
   ]
@@ -457,7 +457,7 @@ renderDataSignature
   :: forall a rest
   .  { typeArguments :: Array TypeArgument
      , dataDeclType :: DataDeclType }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> Array (HH.HTML a Action)
 renderDataSignature { typeArguments, dataDeclType } { name } =
   [ keyword
@@ -465,7 +465,7 @@ renderDataSignature { typeArguments, dataDeclType } { name } =
       NewtypeDataDecl -> "newtype"
       DataDataDecl    -> "data"
   , space
-  , HH.text name
+  , HH.text $ unwrap name
   , space
   , HH.span_ $
     Array.intercalate [ space ] $
@@ -478,12 +478,12 @@ renderTypeSynonymSignature
   .  { type :: Type
      , arguments :: Array TypeArgument
      }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> Array (HH.HTML a Action)
 renderTypeSynonymSignature { type: ty, arguments } { name } =
   [ keyword "type"
   , space
-  , HH.text name
+  , HH.text $ unwrap name
   , space
   , HH.span_ $
     Array.intercalate [ space ] $
@@ -499,10 +499,10 @@ renderTypeArgument :: forall a. TypeArgument -> Array (HH.HTML a Action)
 renderTypeArgument (TypeArgument { name, mbKind }) =
   case mbKind of
     Nothing ->
-      [ HH.text name ]
+      [ HH.text $ name ]
     Just kind ->
       [ HH.text "("
-      , HH.text name
+      , HH.text $ name
       , HH.text " :: "
       , renderKind kind
       , HH.text ")"
@@ -522,14 +522,14 @@ renderType = case _ of
 
   TypeApp (TypeApp (TypeConstructor
                     (QualifiedName { moduleNameParts: [ "Prim" ]
-                                   , name: "Function" })) t1) t2 ->
+                                   , name: Identifier "Function" })) t1) t2 ->
     HH.span_ [ renderType t1
              , syntax " -> "
              , renderType t2
              ]
 
   TypeApp (TypeConstructor (QualifiedName { moduleNameParts: [ "Prim" ]
-                                          , name: "Record" }))
+                                          , name: Identifier "Record" }))
           row ->
     renderRow false row
 
@@ -624,7 +624,7 @@ renderRow asRow =
 
     ( Array.intercalate [ HH.text ", " ] $ Array.fromFoldable $ rows <#>
       \entry ->
-      [ HH.span_ [ HH.text $ entry.row <> " :: "
+      [ HH.span_ [ HH.text $ unwrap entry.row <> " :: "
                  , renderType entry.ty ] ]
     ) <>
 
@@ -637,7 +637,7 @@ renderRow asRow =
       closing = if asRow then " )" else " }"
 
       primRecord :: QualifiedName
-      primRecord = QualifiedName { moduleNameParts: [ "Prim" ], name: "Record" }
+      primRecord = QualifiedName { moduleNameParts: [ "Prim" ], name: Identifier "Record" }
 
 
 renderConstraint
@@ -658,13 +658,13 @@ renderQualifiedName
   -> HH.HTML a Action
 renderQualifiedName isInfix level (QualifiedName { moduleNameParts, name })
   = if isBuiltIn then
-      HH.text name
+      HH.text $ unwrap name
     else
       HH.a [ HE.onClick $ const $ Just $
              SearchResultClicked $ moduleName
            , makeHref level isInfix moduleName name
            ]
-      [ HH.text name ]
+      [ HH.text $ unwrap name ]
       where
         moduleName = ModuleName $ Array.intercalate "." $ moduleNameParts
         isBuiltIn = moduleNameParts !! 0 == Just "Prim"
@@ -686,13 +686,13 @@ makeHref
   .  DeclLevel
   -> Boolean
   -> ModuleName
-  -> String
+  -> Identifier
   -> HH.IProp ( href :: String | rest ) t
 makeHref level isInfix moduleName name =
   HP.href $
   unwrap moduleName <> ".html#" <>
   declLevelToHashAnchor level <> ":" <>
-  if isInfix then "type (" <> name <> ")" else name
+  if isInfix then "type (" <> unwrap name <> ")" else unwrap name
 
 
 keyword
diff --git a/src/Docs/Search/Declarations.purs b/src/Docs/Search/Declarations.purs
index 82e7483..ff36bdb 100644
--- a/src/Docs/Search/Declarations.purs
+++ b/src/Docs/Search/Declarations.purs
@@ -4,7 +4,7 @@ import Docs.Search.DocsJson (ChildDeclType(..), ChildDeclaration(..), DeclType(.
 import Docs.Search.Score (Scores, getPackageScore, getPackageScoreForPackageName)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), QualifiedName(..), Type(..), Kind, joinForAlls)
-import Docs.Search.Types (ModuleName(..), PackageName(..), PackageInfo(..))
+import Docs.Search.Types (ModuleName(..), PackageName(..), PackageInfo(..), Identifier(..))
 
 import Prelude
 
@@ -83,14 +83,14 @@ resultsForDeclaration scores moduleName indexEntry@(Declaration entry) =
   case mkInfo declLevel indexEntry of
     Nothing -> mempty
     Just info' ->
-         let result = SearchResult { name: title
+         let result = SearchResult { name: Identifier title
                                    , comments
                                    , hashAnchor: declLevelToHashAnchor declLevel
                                    , moduleName
                                    , sourceSpan
                                    , packageInfo
                                    , score:
-                                     fromMaybe 0 $ getPackageScoreForPackageName scores <$> mbPackageName
+                                     fromMaybe zero $ getPackageScoreForPackageName scores <$> mbPackageName
                                    , info: info'
                                    }
          in
@@ -219,7 +219,7 @@ resultsForChildDeclaration scores packageInfo moduleName parentResult
   child@(ChildDeclaration { title, info, comments, mbSourceSpan })
   | Just resultInfo <- mkChildInfo parentResult child =
         { path: title
-        , result: SearchResult { name: title
+        , result: SearchResult { name: Identifier title
                                , comments
                                  -- `ChildDeclaration`s are always either data
                                  -- constructors, type class members or instances.
diff --git a/src/Docs/Search/Engine.purs b/src/Docs/Search/Engine.purs
index d4d4eb2..8c338d8 100644
--- a/src/Docs/Search/Engine.purs
+++ b/src/Docs/Search/Engine.purs
@@ -5,7 +5,7 @@ import Docs.Search.PackageIndex (PackageIndex, PackageResult)
 import Docs.Search.Score (Scores)
 import Docs.Search.SearchResult (SearchResult, typeOfResult)
 import Docs.Search.TypeQuery (TypeQuery(..), parseTypeQuery, penalty)
-import Docs.Search.Types (PackageInfo(..), PackageName(..), ModuleName(..))
+import Docs.Search.Types (PackageInfo(..), ModuleName(..), PackageName(..), PackageScore)
 
 import Prelude
 
@@ -66,7 +66,7 @@ data Result
   | MdlResult  ModuleResult
 
 
-getResultScore :: Result -> Int
+getResultScore :: Result -> PackageScore
 getResultScore (DeclResult r) = (unwrap r).score
 getResultScore (TypeResult r) = (unwrap r).score
 getResultScore (PackResult r) = r.score
@@ -88,8 +88,8 @@ getResultModuleName (MdlResult r) = r.name
 
 
 getResultName :: Result -> String
-getResultName (DeclResult r) = (unwrap r).name
-getResultName (TypeResult r) = (unwrap r).name
+getResultName (DeclResult r) = unwrap (unwrap r).name
+getResultName (TypeResult r) = unwrap (unwrap r).name
 getResultName (PackResult r) = unwrap r.name
 getResultName (MdlResult r) = unwrap r.name
 
@@ -158,3 +158,10 @@ sortByDistance
   -> Array SearchResult
 sortByDistance typeQuery =
   Array.sortWith (map (penalty typeQuery) <<< typeOfResult)
+
+
+packageInfoToString :: PackageInfo -> String
+packageInfoToString (Package (PackageName p)) = p
+packageInfoToString Builtin = "<builtin>"
+packageInfoToString LocalPackage = "<local package>"
+packageInfoToString UnknownPackage = "<unknown package>"
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 771fd7f..40c62b4 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -3,7 +3,7 @@ module Docs.Search.Interactive where
 
 import Docs.Search.Declarations (Declarations, mkDeclarations)
 import Docs.Search.DocsJson (DataDeclType(..))
-import Docs.Search.Engine (mkEngineState, Result(..))
+import Docs.Search.Engine (mkEngineState, packageInfoToString, Result(..))
 import Docs.Search.Engine as Engine
 import Docs.Search.Extra (listToString, stringToList, (>#>))
 import Docs.Search.IndexBuilder as IndexBuilder
@@ -16,7 +16,7 @@ import Docs.Search.Terminal (bold, cyan, green, yellow)
 import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
 import Docs.Search.TypeIndex (resultsWithTypes)
 import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showKind, showType, showTypeArgument, space, syntax)
-import Docs.Search.Types (PackageName, ModuleName, PackageInfo, packageInfoToString)
+import Docs.Search.Types (ModuleName, PackageInfo, Identifier)
 
 import Prelude
 
@@ -150,19 +150,19 @@ showModuleResult { name, package } =
   bold (cyan "module") <> " " <> bold (green $ unwrap name)
 
 
-showSignature ::
-  forall rest.
-  { name :: String
-  , moduleName :: ModuleName
-  , packageInfo :: PackageInfo
-  , info :: ResultInfo
-  | rest
-  }
+showSignature
+  :: forall rest
+  . { name :: Identifier
+    , moduleName :: ModuleName
+    , packageInfo :: PackageInfo
+    , info :: ResultInfo
+    | rest
+    }
   -> String
 showSignature result@{ name, info } =
   case info of
     ValueResult { type: ty } ->
-      yellow name <> syntax " :: " <> showType ty
+      yellow (unwrap name) <> syntax " :: " <> showType ty
 
     TypeClassResult info' ->
       showTypeClassSignature info' result
@@ -180,9 +180,9 @@ showSignature result@{ name, info } =
       showExternDataSignature info' result
 
     ValueAliasResult ->
-      yellow ("(" <> name <> ")")
+      yellow ("(" <> unwrap name <> ")")
 
-    _ -> yellow name
+    _ -> yellow $ unwrap name
 
 
 showTypeClassSignature
@@ -191,7 +191,7 @@ showTypeClassSignature
      , arguments :: Array TypeArgument
      , superclasses :: Array Constraint
      }
-  -> { name :: String, moduleName :: ModuleName | rest }
+  -> { name :: Identifier, moduleName :: ModuleName | rest }
   -> String
 showTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName } =
 
@@ -210,7 +210,7 @@ showTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName }
       syntax "<="
   ) <>
   space <>
-  yellow name <>
+  yellow (unwrap name) <>
   space <> (
     Array.intercalate space $
       arguments <#> showTypeArgument
@@ -221,14 +221,14 @@ showTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName }
 
 showTypeClassMemberSignature
   :: forall rest
-  .  { type :: Type
+  .  { "type" :: Type
      , typeClass :: QualifiedName
      , typeClassArguments :: Array TypeArgument
      }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> String
-showTypeClassMemberSignature { type: ty, typeClass, typeClassArguments } result =
-  yellow result.name <>
+showTypeClassMemberSignature { "type": ty, typeClass, typeClassArguments } result =
+  yellow (unwrap result.name) <>
   syntax " :: " <>
   showType ty
 
@@ -237,7 +237,7 @@ showDataSignature
   :: forall rest
   .  { typeArguments :: Array TypeArgument
      , dataDeclType :: DataDeclType }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> String
 showDataSignature { typeArguments, dataDeclType } { name } =
   ( keyword
@@ -246,7 +246,7 @@ showDataSignature { typeArguments, dataDeclType } { name } =
       DataDataDecl    -> "data"
   ) <>
   space <>
-  yellow name <>
+  yellow (unwrap name) <>
   space <> (
     Array.intercalate space $
       typeArguments <#> showTypeArgument
@@ -258,12 +258,12 @@ showTypeSynonymSignature
   .  { type :: Type
      , arguments :: Array TypeArgument
      }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> String
 showTypeSynonymSignature { type: ty, arguments } { name } =
   keyword "type" <>
   space <>
-  yellow name <>
+  yellow (unwrap name) <>
   space <> (
     Array.intercalate space $
       arguments <#> showTypeArgument
@@ -277,12 +277,12 @@ showTypeSynonymSignature { type: ty, arguments } { name } =
 showExternDataSignature
   :: forall rest
   .  { kind :: Kind }
-  -> { name :: String | rest }
+  -> { name :: Identifier | rest }
   -> String
 showExternDataSignature { kind } { name } =
   keyword "foreign data" <>
   space <>
-  yellow name <>
+  yellow (unwrap name) <>
   space <>
   syntax " :: " <>
   showKind kind
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index b057b96..81906cd 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -3,9 +3,9 @@ module Docs.Search.ModuleIndex where
 import Docs.Search.Config (config)
 import Docs.Search.Declarations (Declarations(..))
 import Docs.Search.SearchResult (SearchResult(..))
-import Docs.Search.Types (ModuleName, PackageName, PackageInfo(..))
+import Docs.Search.Types (ModuleName, PackageName, PackageInfo(..), PackageScore)
 import Docs.Search.Extra (stringToList)
-import Docs.Search.Score (Scores)
+import Docs.Search.Score (Scores, getPackageScoreForPackageName)
 
 import Prelude
 
@@ -50,7 +50,7 @@ type ModuleIndex = { packageModules :: Map PackageName (Set ModuleName)
 type ModuleResult
   = { name :: ModuleName
     , package :: PackageName
-    , score :: Int
+    , score :: PackageScore
     }
 
 
@@ -86,7 +86,8 @@ queryModuleIndex scores { index, modulePackages } query =
   Array.nub <#>
   (\name -> do
       package <- Map.lookup name modulePackages
-      pure { name, package, score: fromMaybe 0 $ Map.lookup package scores }) #
+      pure { name, package
+           , score: getPackageScoreForPackageName scores package }) #
   Array.catMaybes
 
 
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index 8f3685a..dddbd71 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -3,7 +3,7 @@ module Docs.Search.PackageIndex where
 import Docs.Search.Config (config)
 import Docs.Search.Extra (stringToList)
 import Docs.Search.Score (Scores, getPackageScoreForPackageName, normalizePackageName)
-import Docs.Search.Types (PackageName, RawPackageName(..))
+import Docs.Search.Types (PackageName, RawPackageName(..), PackageScore)
 
 import Prelude
 
@@ -26,7 +26,7 @@ import Web.Bower.PackageMeta (PackageMeta(..))
 type PackageResult
   = { name :: PackageName
     , description :: Maybe String
-    , score :: Int
+    , score :: PackageScore
     , dependencies :: Array PackageName
     , repository :: Maybe String
     }
diff --git a/src/Docs/Search/Score.purs b/src/Docs/Search/Score.purs
index 03e276d..633cea1 100644
--- a/src/Docs/Search/Score.purs
+++ b/src/Docs/Search/Score.purs
@@ -1,6 +1,6 @@
 module Docs.Search.Score where
 
-import Docs.Search.Types (RawPackageName(..), PackageName(..), PackageInfo(..))
+import Docs.Search.Types (RawPackageName(..), PackageName(..), PackageInfo(..), PackageScore(..))
 
 import Prelude
 
@@ -13,7 +13,7 @@ import Data.String.CodeUnits as String
 import Web.Bower.PackageMeta (Dependencies, PackageMeta)
 
 
-type Scores = Map PackageName Int
+type Scores = Map PackageName PackageScore
 
 normalizePackageName :: RawPackageName -> PackageName
 normalizePackageName (RawPackageName p) =
@@ -35,18 +35,18 @@ mkScores =
     updateScoresFor :: Dependencies -> Scores -> Scores
     updateScoresFor deps scores =
       Array.foldr
-      (\dep -> Map.insertWith add dep 1)
+      (\dep -> Map.insertWith add dep one)
       scores
       (deps # unwrap >>> map (_.packageName >>> RawPackageName >>> normalizePackageName))
 
 
-getPackageScore :: Scores -> PackageInfo -> Int
+getPackageScore :: Scores -> PackageInfo -> PackageScore
 getPackageScore scores = case _ of
   Package p      -> getPackageScoreForPackageName scores p
-  Builtin        -> 100000
-  LocalPackage   -> 200000
-  UnknownPackage -> 0
+  Builtin        -> PackageScore 100000
+  LocalPackage   -> PackageScore 200000
+  UnknownPackage -> zero
 
 
-getPackageScoreForPackageName :: Scores -> PackageName -> Int
-getPackageScoreForPackageName scores p = fromMaybe 0 $ Map.lookup p scores
+getPackageScoreForPackageName :: Scores -> PackageName -> PackageScore
+getPackageScoreForPackageName scores p = fromMaybe zero $ Map.lookup p scores
diff --git a/src/Docs/Search/SearchResult.purs b/src/Docs/Search/SearchResult.purs
index 8d5af24..11ff65d 100644
--- a/src/Docs/Search/SearchResult.purs
+++ b/src/Docs/Search/SearchResult.purs
@@ -2,7 +2,7 @@ module Docs.Search.SearchResult where
 
 import Docs.Search.DocsJson (DataDeclType)
 import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
-import Docs.Search.Types (PackageName, PackageInfo, ModuleName)
+import Docs.Search.Types (ModuleName, PackageInfo, Identifier, PackageScore)
 
 import Prelude
 
@@ -57,12 +57,12 @@ typeOf _ = Nothing
 -- | Common metadata for all types of search results.
 newtype SearchResult
   = SearchResult
-    { name :: String
+    { name :: Identifier
     , comments :: Maybe String
     , hashAnchor :: String
     , moduleName :: ModuleName
     , packageInfo :: PackageInfo
-    , score :: Int
+    , score :: PackageScore
     , sourceSpan :: Maybe { start :: Array Int
                           , end :: Array Int
                           , name :: String
diff --git a/src/Docs/Search/TypeDecoder.purs b/src/Docs/Search/TypeDecoder.purs
index 89f2138..c49ad71 100644
--- a/src/Docs/Search/TypeDecoder.purs
+++ b/src/Docs/Search/TypeDecoder.purs
@@ -1,5 +1,7 @@
 module Docs.Search.TypeDecoder where
 
+import Docs.Search.Types (Identifier)
+
 import Prelude
 
 import Control.Alt ((<|>))
@@ -26,7 +28,7 @@ instance showQualifiedName :: Show QualifiedName where
 
 newtype QualifiedName
   = QualifiedName { moduleNameParts :: Array String
-                  , name :: String
+                  , name :: Identifier
                   }
 
 instance decodeJsonQualifiedName :: DecodeJson QualifiedName where
@@ -149,7 +151,7 @@ data Type
   -- | An empty row
   | REmpty
   -- | A non-empty row
-  | RCons String Type Type
+  | RCons Identifier Type Type
   {-
   -- | A type with a kind annotation
   | Kinded Type Kind
@@ -412,7 +414,7 @@ joinForAlls ty = go Nil ty
       go ({ name, mbKind } : acc) ty'
     go acc ty' = { binders: acc, ty: ty' }
 
-joinRows :: Type -> { rows :: List { row :: String
+joinRows :: Type -> { rows :: List { row :: Identifier
                                    , ty :: Type
                                    }
                     , ty :: Maybe Type }
@@ -428,7 +430,7 @@ joinRows = go Nil
                 }
 
 -- | Only returns a list of type class names (lists of arguments are omitted).
-joinConstraints :: Type -> { constraints :: List String
+joinConstraints :: Type -> { constraints :: List Identifier
                            , ty :: Type }
 joinConstraints = go Nil
   where
diff --git a/src/Docs/Search/TypePrinter.purs b/src/Docs/Search/TypePrinter.purs
index b98867c..34c8ae9 100644
--- a/src/Docs/Search/TypePrinter.purs
+++ b/src/Docs/Search/TypePrinter.purs
@@ -5,10 +5,12 @@ import Prelude
 import Docs.Search.Extra ((>#>))
 import Docs.Search.Terminal (cyan)
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
+import Docs.Search.Types (Identifier(..))
 
-import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Array as Array
 import Data.List as List
+import Data.Maybe (Maybe(..), fromMaybe)
+import Data.Newtype (unwrap)
 
 
 -- | A pretty-printer for types, for TTY with colors.
@@ -22,13 +24,13 @@ showType = case _ of
 
   TypeApp (TypeApp (TypeConstructor
                     (QualifiedName { moduleNameParts: [ "Prim" ]
-                                   , name: "Function" }))
+                                   , name: Identifier "Function" }))
                    t1)
           t2 ->
     showType t1 <> syntax " -> " <> showType t2
 
   TypeApp (TypeConstructor (QualifiedName { moduleNameParts: [ "Prim" ]
-                                          , name: "Record" }))
+                                          , name: Identifier "Record" }))
           row ->
     showRow false row
 
@@ -89,7 +91,7 @@ showQualifiedName
   :: QualifiedName
   -> String
 showQualifiedName (QualifiedName { name })
-  = name
+  = unwrap name
 
 
 showRow
@@ -107,7 +109,7 @@ showRow asRow =
     opening <>
     ( Array.intercalate ", " $ Array.fromFoldable $ rows <#>
       \entry ->
-      entry.row <> syntax " :: " <> showType entry.ty
+      unwrap entry.row <> syntax " :: " <> showType entry.ty
     ) <>
 
     (ty >#> \ty' -> " | " <> showType ty') <>
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index 1c170b0..a52c4c3 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -13,6 +13,7 @@ where
 import Docs.Search.Config (config)
 import Docs.Search.Extra (foldl1, foldr1)
 import Docs.Search.TypeDecoder (QualifiedName(..), Type(..), joinConstraints, joinRows)
+import Docs.Search.Types (Identifier(..))
 
 import Prelude
 
@@ -41,13 +42,13 @@ import Text.Parsing.StringParser.Combinators (fix, sepBy, sepBy1, sepEndBy, sepE
 -- | We need type queries because we don't have a full-featured type parser
 -- | available.
 data TypeQuery
-  = QVar String
-  | QConst String
+  = QVar Identifier
+  | QConst Identifier
   | QFun TypeQuery TypeQuery
   | QApp TypeQuery TypeQuery
-  | QForAll (NonEmptyList String) TypeQuery
-  | QConstraint String (List TypeQuery) TypeQuery
-  | QRow (List (Tuple String TypeQuery))
+  | QForAll (NonEmptyList Identifier) TypeQuery
+  | QConstraint Identifier (List TypeQuery) TypeQuery
+  | QRow (List (Tuple Identifier TypeQuery))
 
 derive instance eqTypeQuery :: Eq TypeQuery
 derive instance genericTypeQuery :: Generic TypeQuery _
@@ -69,7 +70,8 @@ typeQueryParser = fix \typeQuery ->
 
       row = string "(" *> rowFields <* string ")"
 
-      record = QApp (QConst "Record") <$> (string "{" *> rowFields <* string "}")
+      record = QApp (QConst $ Identifier "Record") <$>
+               (string "{" *> rowFields <* string "}")
 
       binders =
         string "forall" *> some space *> sepEndBy1 ident skipSpaces <* string "." <* skipSpaces
@@ -111,32 +113,32 @@ concrete :: Parser TypeQuery
 concrete =
   QConst <$> upperCaseIdent
 
-ident :: Parser String
+ident :: Parser Identifier
 ident = do
   head <- anyLetter
   rest <- Array.many (alphaNum <|> char '\'')
-  pure $ fromCharArray $ pure head <> rest
+  pure $ Identifier <$> fromCharArray $ pure head <> rest
 
-upperCaseIdent :: Parser String
+upperCaseIdent :: Parser Identifier
 upperCaseIdent = do
   head <- upperCaseChar
   rest <- Array.many (alphaNum <|> char '\'')
-  pure $ fromCharArray $ pure head <> rest
+  pure $ Identifier $ fromCharArray $ pure head <> rest
 
-lowerCaseIdent :: Parser String
+lowerCaseIdent :: Parser Identifier
 lowerCaseIdent = do
   head <- lowerCaseChar
   rest <- Array.many (alphaNum <|> char '\'')
-  pure $ fromCharArray $ pure head <> rest
+  pure $ Identifier $ fromCharArray $ pure head <> rest
 
 space :: Parser Char
 space = char ' '
 
 
 -- | Used only in `getFreeVariables`.
-data FreeVarCounterQueueEntry = Unbind (Set.Set String) | Next TypeQuery
+data FreeVarCounterQueueEntry = Unbind (Set.Set Identifier) | Next TypeQuery
 
-getFreeVariables :: TypeQuery -> Set.Set String
+getFreeVariables :: TypeQuery -> Set.Set Identifier
 getFreeVariables query = go Set.empty Set.empty (List.singleton $ Next query)
   where
     insertIfUnbound bound var free =
@@ -172,11 +174,11 @@ getFreeVariables query = go Set.empty Set.empty (List.singleton $ Next query)
 
 
 data Substitution
-  = Instantiate String Type
-  | Match String String
-  | Generalize TypeQuery String
-  | Substitute String String
-  | MatchConstraints (Set String) (Set String)
+  = Instantiate Identifier Type
+  | Match Identifier Identifier
+  | Generalize TypeQuery Identifier
+  | Substitute Identifier Identifier
+  | MatchConstraints (Set Identifier) (Set Identifier)
   | MissingConstraint
   | ExcessiveConstraint
   | RowsMismatch Int Int
@@ -225,9 +227,9 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
 
     -- * Type variables
     go acc ({ q: QVar q, t: TypeVar v } : rest) =
-      go (Substitute q v : acc) rest
+      go (Substitute q (Identifier v) : acc) rest
     go acc ({ q, t: TypeVar v } : rest ) =
-      go (Generalize q v : acc) rest
+      go (Generalize q (Identifier v) : acc) rest
     go acc ({ q: QVar v, t } : rest) =
       go (Instantiate v t : acc) rest
 
@@ -249,16 +251,16 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
     go acc ({ q: QFun q1 q2
             , t: TypeApp (TypeApp (TypeConstructor
                                     (QualifiedName { moduleNameParts: [ "Prim" ]
-                                                   , name: "Function" })) t1) t2 } : rest) =
+                                                   , name: Identifier "Function" })) t1) t2 } : rest) =
       go acc ({ q: q1, t: t1 } : { q: q2, t: t2 } : rest)
     go acc ({ q: q@(QFun q1 q2), t } : rest) =
       go (Mismatch q t : acc) rest
 
     -- * Rows
-    go acc ({ q: QApp (QConst "Record") (QRow qRows)
+    go acc ({ q: QApp (QConst (Identifier "Record")) (QRow qRows)
             , t: TypeApp (TypeConstructor
                            (QualifiedName { moduleNameParts: [ "Prim" ]
-                                          , name: "Record" })) row } : rest) =
+                                          , name: Identifier "Record" })) row } : rest) =
       let { rows, ty } = joinRows row
           qRowsLength = List.length qRows
           rowsLength = List.length rows in
@@ -319,8 +321,11 @@ typeVarPenalty substs =
       insertion v1 v2 = Map.insertWith append v1 (Set.singleton v2)
 
       varSubstMapWith
-        :: (String -> String -> Map String (Set String) -> Map String (Set String))
-        -> Map String (Set String)
+        :: (Identifier ->
+            Identifier ->
+            Map Identifier (Set Identifier) ->
+            Map Identifier (Set Identifier))
+        -> Map Identifier (Set Identifier)
       varSubstMapWith f =
         List.foldr (case _ of
                       Substitute v1 v2 ->
@@ -363,7 +368,7 @@ mismatchPenalty = go 0
 
 
 -- | Only returns a list of type class names (lists of arguments are omitted).
-joinQueryConstraints :: TypeQuery -> { constraints :: List String
+joinQueryConstraints :: TypeQuery -> { constraints :: List Identifier
                                      , ty :: TypeQuery }
 joinQueryConstraints = go Nil
   where
@@ -408,7 +413,7 @@ typeSize = go 0 <<< List.singleton
       go (n + 1) rest
     go n (TypeApp (TypeApp (TypeConstructor
                     (QualifiedName { moduleNameParts: [ "Prim" ]
-                                   , name: "Function" })) t1) t2 : rest) =
+                                   , name: Identifier "Function" })) t1) t2 : rest) =
       go (n + 1) (t1 : t2 : rest)
     go n (TypeApp q1 q2 : rest) =
       go (n + 1) (q1 : q2 : rest)
diff --git a/src/Docs/Search/TypeShape.purs b/src/Docs/Search/TypeShape.purs
index 7a38798..fc4b3bf 100644
--- a/src/Docs/Search/TypeShape.purs
+++ b/src/Docs/Search/TypeShape.purs
@@ -5,6 +5,7 @@ module Docs.Search.TypeShape where
 
 import Docs.Search.TypeDecoder (QualifiedName(..), Type(..), joinForAlls, joinRows)
 import Docs.Search.TypeQuery (TypeQuery(..), getFreeVariables)
+import Docs.Search.Types (Identifier(..))
 
 import Prelude
 
@@ -102,7 +103,7 @@ shapeOfType ty = List.reverse $ go (pure ty) Nil
           go rest (PVar : acc)
 
         TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"]
-                                                         , name: "Function" })) t1) t2 ->
+                                                         , name: Identifier "Function" })) t1) t2 ->
           go (t1 : t2 : rest) (PFun : acc)
 
         TypeConstructor (QualifiedName { name }) ->
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index 9c1b979..deacb07 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -11,6 +11,17 @@ import Data.Generic.Rep.Show (genericShow)
 import Data.Newtype (class Newtype)
 
 
+newtype Identifier = Identifier String
+
+derive instance newtypeIdentifier :: Newtype Identifier _
+derive instance genericIdentifier :: Generic Identifier _
+derive newtype instance eqIdentifier :: Eq Identifier
+derive newtype instance ordIdentifier :: Ord Identifier
+derive newtype instance showIdentifier :: Show Identifier
+derive newtype instance decodeJsonIdentifier :: DecodeJson Identifier
+derive newtype instance encodeJsonIdentifier :: EncodeJson Identifier
+
+
 newtype ModuleName = ModuleName String
 
 derive instance newtypeModuleName :: Newtype ModuleName _
@@ -52,8 +63,14 @@ instance decodeJsonPackageInfo :: DecodeJson PackageInfo where
 instance encodeJsonPackageInfo :: EncodeJson PackageInfo where
   encodeJson = genericEncodeJson
 
-packageInfoToString :: PackageInfo -> String
-packageInfoToString (Package (PackageName p)) = p
-packageInfoToString Builtin = "<builtin>"
-packageInfoToString LocalPackage = "<local package>"
-packageInfoToString UnknownPackage = "<unknown package>"
+newtype PackageScore = PackageScore Int
+
+derive instance newtypePackageScore :: Newtype PackageScore _
+derive instance genericPackageScore :: Generic PackageScore _
+derive newtype instance eqPackageScore :: Eq PackageScore
+derive newtype instance ordPackageScore :: Ord PackageScore
+derive newtype instance semiringPackageScore :: Semiring PackageScore
+derive newtype instance ringPackageScore :: Ring PackageScore
+derive newtype instance showPackageScore :: Show PackageScore
+derive newtype instance decodeJsonPackageScore :: DecodeJson PackageScore
+derive newtype instance encodeJsonPackageScore :: EncodeJson PackageScore
diff --git a/test/Main.purs b/test/Main.purs
index fa4c96b..695744a 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -3,6 +3,7 @@ module Test.Main where
 import Prelude
 
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..))
+import Docs.Search.Types
 import Test.TypeQuery as TypeQuery
 import Test.IndexBuilder as IndexBuilder
 import Test.Declarations as Declarations
@@ -67,10 +68,7 @@ mainTest = do
       """
 
       assertRight (decodeJson qualifiedName)
-        (QualifiedName { moduleNameParts: ["Prim"]
-                       , name: "Type"
-                       }
-        )
+        (qualified ["Prim"] "Type")
 
     test "NamedKind" do
       let namedKind = mkJson """
@@ -87,10 +85,7 @@ mainTest = do
       """
 
       assertRight (decodeJson namedKind)
-        (NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
-                                   , name: "Type"
-                                   }
-        )
+        (NamedKind $ qualified ["Prim"] "Type")
 
     test "Row" do
       let row = mkJson """
@@ -110,11 +105,7 @@ mainTest = do
             }
       """
 
-      assertRight (decodeJson row)
-        (Row $ NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
-                                         , name: "Type"
-                                         }
-        )
+      assertRight (decodeJson row) (Row $ NamedKind $ qualified ["Prim"] "Type")
 
     test "FunKind" do
       let funKind = mkJson """
@@ -154,14 +145,8 @@ mainTest = do
         }
         """
       assertRight (decodeJson funKind)
-        (FunKind (Row $ NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
-                                                  , name: "Type"
-                                                  }
-                 )
-                 (Row $ NamedKind $ QualifiedName { moduleNameParts: ["Prim"]
-                                                  , name: "Type"
-                                                  }
-                 )
+        (FunKind (Row $ NamedKind $ qualified ["Prim"] "Type")
+                 (Row $ NamedKind $ qualified ["Prim"] "Type")
         )
 
 
@@ -181,9 +166,7 @@ mainTest = do
       }
       """
       assertRight (decodeJson constraint)
-        (Constraint { constraintClass: QualifiedName { moduleNameParts: ["Prim"]
-                                                     , name: "Partial"
-                                                     }
+        (Constraint { constraintClass: qualified ["Prim"] "Partial"
                     , constraintArgs: []
                     })
 
@@ -230,14 +213,12 @@ mainTest = do
 
       assertRight (decodeJson typeApp1) $
         TypeApp
-          (TypeConstructor (QualifiedName { moduleNameParts:
-                                            [ "Control"
-                                            , "Monad"
-                                            , "ST"
-                                            , "Internal"
-                                            ],
-                                            name: "ST"
-                                          }
+          (TypeConstructor (qualified [ "Control"
+                                      , "Monad"
+                                      , "ST"
+                                      , "Internal"
+                                      ]
+                            "ST"
                            ))
           (TypeVar "h")
 
@@ -256,9 +237,7 @@ mainTest = do
           }
       """
       assertRight (decodeJson typeOp) $
-        TypeOp $ QualifiedName { moduleNameParts: [ "Data", "NaturalTransformation" ]
-                               , name: "~>"
-                               }
+        TypeOp $ qualified [ "Data", "NaturalTransformation" ] "~>"
 
     test "BinaryNoParens" do
       let binaryNoParens = mkJson """
@@ -293,7 +272,7 @@ mainTest = do
 
       assertRight (decodeJson binaryNoParens) $
         BinaryNoParensType
-        (TypeOp $ QualifiedName { moduleNameParts: ["Data", "NaturalTransformation"], name: "~>" })
+        (TypeOp $ qualified ["Data", "NaturalTransformation"] "~>")
         (TypeVar "m")
         (TypeVar "n")
 
@@ -335,19 +314,8 @@ mainTest = do
       assertRight (decodeJson parensInType) $
         ParensInType $
           TypeApp
-          (TypeConstructor (QualifiedName { moduleNameParts:
-                                            [ "Data"
-                                            , "Maybe"
-                                            ],
-                                            name: "Maybe"
-                                          }
-                           ))
-          (TypeConstructor (QualifiedName { moduleNameParts:
-                                            [ "Prim"
-                                            ],
-                                            name: "String"
-                                          }
-                           ))
+          (TypeConstructor (qualified [ "Data", "Maybe" ] "Maybe"))
+          (TypeConstructor (qualified [ "Prim" ] "String"))
     test "RCons" do
 
       let rcons = mkJson """
@@ -388,8 +356,8 @@ mainTest = do
 
       assertRight (decodeJson rcons) $
         RCons
-          "tail"
-          (TypeApp (TypeConstructor $ QualifiedName { moduleNameParts: [ "Data", "Symbol" ], name: "SProxy" })
+          (Identifier "tail")
+          (TypeApp (TypeConstructor $ qualified [ "Data", "Symbol" ] "SProxy")
                    (TypeVar "t"))
           REmpty
 
@@ -545,8 +513,8 @@ mainTest = do
       """
       assertRight (decodeJson forallJson) $
         ForAll "f"
-        (Just (FunKind (NamedKind (QualifiedName { moduleNameParts: ["Prim","RowList"], name: "RowList" })) (NamedKind (QualifiedName { moduleNameParts: ["Prim"], name: "Type" }))))
-        (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "Function" })) (TypeApp (TypeVar "f") (TypeVar "l"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","List","Types"], name: "List" })) (ParensInType (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","Tuple"], name: "Tuple" })) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "String" }))) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "String" }))))))
+        (Just (FunKind (NamedKind (QualifiedName { moduleNameParts: ["Prim","RowList"], name: Identifier "RowList" })) (NamedKind (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Type" }))))
+        (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeVar "f") (TypeVar "l"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","List","Types"], name: Identifier "List" })) (ParensInType (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","Tuple"], name: Identifier "Tuple" })) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "String" }))) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "String" }))))))
 
 
 
@@ -558,7 +526,7 @@ mainTest = do
 {"annotation":[],"tag":"ForAll","contents":["o",{"annotation":[],"tag":"ForAll","contents":["r",{"annotation":[],"tag":"ForAll","contents":["l",{"annotation":[],"tag":"ConstrainedType","contents":[{"constraintAnn":[],"constraintClass":[["Type","Data","Boolean"],"And"],"constraintArgs":[{"annotation":[],"tag":"TypeVar","contents":"l"},{"annotation":[],"tag":"TypeVar","contents":"r"},{"annotation":[],"tag":"TypeVar","contents":"o"}],"constraintData":null},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"l"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"r"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"o"}]}]}]}]},null]},null]},null]}
       """
 
-      assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: "BProxy" })) (TypeVar "o"))))))))
+      assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "o"))))))))
 
   suite "Kind encoder" do
     test "FunKind" do
@@ -570,4 +538,4 @@ mainTest = do
 
 
 qualified :: Array String -> String -> QualifiedName
-qualified moduleNameParts name = QualifiedName { moduleNameParts, name }
+qualified moduleNameParts name = QualifiedName { moduleNameParts, name: Identifier name }
diff --git a/test/Test/TypeQuery.purs b/test/Test/TypeQuery.purs
index f508269..540acf2 100644
--- a/test/Test/TypeQuery.purs
+++ b/test/Test/TypeQuery.purs
@@ -3,6 +3,7 @@ module Test.TypeQuery where
 import Docs.Search.TypeDecoder (Constraint(..), QualifiedName(..), Type(..))
 import Docs.Search.TypeQuery (Substitution(..), TypeQuery(..), getFreeVariables, parseTypeQuery, penalty, typeVarPenalty)
 import Docs.Search.TypeShape (ShapeChunk(..), shapeOfType, shapeOfTypeQuery)
+import Docs.Search.Types (Identifier(..))
 
 import Prelude
 
@@ -25,193 +26,195 @@ tests = do
 
     test "test #0" do
       let input = "a"
-      assertRight (parseTypeQuery input) (QVar "a")
+      assertRight (parseTypeQuery input) (qVar "a")
 
     test "test #1" do
       let input = "ab"
-      assertRight (parseTypeQuery input) (QVar "ab")
+      assertRight (parseTypeQuery input) (qVar "ab")
 
     test "test #2" do
       let input = "a b"
-      assertRight (parseTypeQuery input) (QApp (QVar "a") (QVar "b"))
+      assertRight (parseTypeQuery input) (QApp (qVar "a") (qVar "b"))
 
     test "test #3" do
       let input = "a b c"
-      assertRight (parseTypeQuery input) (QApp (QApp (QVar "a") (QVar "b")) (QVar "c"))
+      assertRight (parseTypeQuery input) (QApp (QApp (qVar "a") (qVar "b")) (qVar "c"))
 
     test "test #4" do
       let input = "a -> b"
-      assertRight (parseTypeQuery input) (QFun (QVar "a") (QVar "b"))
+      assertRight (parseTypeQuery input) (QFun (qVar "a") (qVar "b"))
 
     test "test #5" do
       let input = "a -> b c"
-      assertRight (parseTypeQuery input) (QFun (QVar "a") (QApp (QVar "b") (QVar "c")))
+      assertRight (parseTypeQuery input) (QFun (qVar "a") (QApp (qVar "b") (qVar "c")))
 
     test "test #6" do
       let input = "a b -> c"
-      assertRight (parseTypeQuery input) (QFun (QApp (QVar "a") (QVar "b")) (QVar "c"))
+      assertRight (parseTypeQuery input) (QFun (QApp (qVar "a") (qVar "b")) (qVar "c"))
 
     test "test #7" do
       let input = "a b"
-      assertRight (parseTypeQuery input) (QApp (QVar "a") (QVar "b"))
+      assertRight (parseTypeQuery input) (QApp (qVar "a") (qVar "b"))
 
     test "test #8" do
       let input = "a (b c)"
-      assertRight (parseTypeQuery input) (QApp (QVar "a") (QApp (QVar "b") (QVar "c")))
+      assertRight (parseTypeQuery input) (QApp (qVar "a") (QApp (qVar "b") (qVar "c")))
 
     test "test #9" do
       let input = "(a b) (c d)"
       assertRight (parseTypeQuery input)
-        (QApp (QApp (QVar "a") (QVar "b"))
-              (QApp (QVar "c") (QVar "d")))
+        (QApp (QApp (qVar "a") (qVar "b"))
+              (QApp (qVar "c") (qVar "d")))
 
     test "test #10" do
       let input = "a ( b c )"
-      assertRight (parseTypeQuery input) (QApp (QVar "a") (QApp (QVar "b") (QVar "c")))
+      assertRight (parseTypeQuery input) (QApp (qVar "a") (QApp (qVar "b") (qVar "c")))
 
     test "test #11" do
       let input = "aaa"
-      assertRight (parseTypeQuery input) (QVar "aaa")
+      assertRight (parseTypeQuery input) (qVar "aaa")
 
     test "test #12" do
       let input = "aaa ( bbb ccc )"
-      assertRight (parseTypeQuery input) (QApp (QVar "aaa") (QApp (QVar "bbb") (QVar "ccc")))
+      assertRight (parseTypeQuery input) (QApp (qVar "aaa") (QApp (qVar "bbb") (qVar "ccc")))
 
     test "test #13" do
       let input = "(a -> b) ->  (c -> d)"
-      assertRight (parseTypeQuery input) (QFun (QFun (QVar "a") (QVar "b"))
-                                                  (QFun (QVar "c") (QVar "d")))
+      assertRight (parseTypeQuery input) (QFun (QFun (qVar "a") (qVar "b"))
+                                                  (QFun (qVar "c") (qVar "d")))
 
     test "test #14" do
       let input = "a -> b -> c -> d"
-      assertRight (parseTypeQuery input) (QFun (QVar "a")
-                                          (QFun (QVar "b")
-                                           (QFun (QVar "c") (QVar "d"))))
+      assertRight (parseTypeQuery input) (QFun (qVar "a")
+                                          (QFun (qVar "b")
+                                           (QFun (qVar "c") (qVar "d"))))
 
     test "test #15" do
       let input = "a -> b -> c"
-      assertRight (parseTypeQuery input) (QFun (QVar "a")
-                                          (QFun (QVar "b")
-                                           (QVar "c")))
+      assertRight (parseTypeQuery input) (QFun (qVar "a")
+                                          (QFun (qVar "b")
+                                           (qVar "c")))
 
     test "test #16" do
       let input = "forall a b c. c"
-      assertRight (parseTypeQuery input) (QForAll (nl "a" ["b", "c"]) (QVar "c"))
+      assertRight (parseTypeQuery input) (QForAll (nl "a" ["b", "c"]) (qVar "c"))
 
     test "test #17" do
       let input = "forall a. Maybe a"
-      assertRight (parseTypeQuery input) (QForAll (nl "a" $ []) (QApp (QConst "Maybe") (QVar "a")))
+      assertRight (parseTypeQuery input) (QForAll (nl "a" $ []) (QApp (qConst "Maybe") (qVar "a")))
 
     test "test #18" do
       let input = "forall m a. Monad m => a -> m a"
       assertRight (parseTypeQuery input)
         (QForAll (nl "m" ["a"])
-                 (QConstraint "Monad" (l [QVar "m"])
-                  (QFun (QVar "a")
-                        (QApp (QVar "m") (QVar "a")))))
+                 (qConstraint "Monad" (l [qVar "m"])
+                  (QFun (qVar "a")
+                        (QApp (qVar "m") (qVar "a")))))
 
     test "test #19" do
       let input = "{ a :: Int }"
       assertRight (parseTypeQuery input)
-        (QApp (QConst "Record") (QRow (pure (Tuple "a" (QConst "Int")))))
+        (QApp (qConst "Record") (QRow (pure (Tuple (Identifier "a") (qConst "Int")))))
 
     test "test #20" do
       let input = "{a::Int}"
       assertRight (parseTypeQuery input)
-        (QApp (QConst "Record") (QRow (pure (Tuple "a" (QConst "Int")))))
+        (QApp (qConst "Record") (QRow (pure (Tuple (Identifier "a") (qConst "Int")))))
 
     test "test #21" do
       let input = "Int"
-      assertRight (parseTypeQuery input) (QConst "Int")
+      assertRight (parseTypeQuery input) (qConst "Int")
 
     test "test #22" do
       let input = "a->b"
-      assertRight (parseTypeQuery input) (QFun (QVar "a") (QVar "b"))
+      assertRight (parseTypeQuery input) (QFun (qVar "a") (qVar "b"))
 
     test "test #23" do
       let input = "forall m a. MonadRec m => Process m a -> m a"
       assertRight (parseTypeQuery input) (QForAll (nl "m" ("a" : Nil))
-                                          (QConstraint "MonadRec" (l [QVar "m"])
-                                           (QFun (QApp (QApp (QConst "Process")
-                                                        (QVar "m")) (QVar "a"))
-                                            (QApp (QVar "m") (QVar "a")))))
+                                          (qConstraint "MonadRec" (l [qVar "m"])
+                                           (QFun (QApp (QApp (qConst "Process")
+                                                        (qVar "m")) (qVar "a"))
+                                            (QApp (qVar "m") (qVar "a")))))
 
     test "test #24" do
       let input = "forall t f a. Foldable1 t => Apply f => f"
       assertRight (parseTypeQuery input) (QForAll (nl "t" ["f", "a"])
-                                          (QConstraint "Foldable1" (l [QVar "t"])
-                                           (QConstraint "Apply" (l [QVar "f"]) (QVar "f"))))
+                                          (qConstraint "Foldable1" (l [qVar "t"])
+                                           (qConstraint "Apply" (l [qVar "f"]) (qVar "f"))))
 
     test "test #25" do
       let input = "forall m a.MonadRec m=>Process m a->m a"
       assertRight (parseTypeQuery input) ((QForAll (nl "m" ("a" : Nil))
-                                           (QConstraint "MonadRec" (l [QVar "m"])
-                                            (QFun (QApp (QApp (QConst "Process")
-                                                         (QVar "m")) (QVar "a"))
-                                             (QApp (QVar "m") (QVar "a"))))))
+                                           (qConstraint "MonadRec" (l [qVar "m"])
+                                            (QFun (QApp (QApp (qConst "Process")
+                                                         (qVar "m")) (qVar "a"))
+                                             (QApp (qVar "m") (qVar "a"))))))
 
     test "test #26" do
       let input = "m a -> (a -> m b) -> m b"
-      assertRight (parseTypeQuery input) (QFun (QApp (QVar "m") (QVar "a")) (QFun (QFun (QVar "a") (QApp (QVar "m") (QVar "b"))) (QApp (QVar "m") (QVar "b"))))
+      assertRight (parseTypeQuery input) (QFun (QApp (qVar "m") (qVar "a")) (QFun (QFun (qVar "a") (QApp (qVar "m") (qVar "b"))) (QApp (qVar "m") (qVar "b"))))
 
     test "test #27" do
       let input = "forall f a. Alternative f => Lazy (f (List a)) => f a -> f (List a)"
       assertRight (parseTypeQuery input) ((QForAll (nl "f" ["a"]))
-                                          (QConstraint "Alternative" (l [QVar "f"])
-                                           (QConstraint "Lazy" (l [QApp (QVar "f")
-                                                                   (QApp (QConst "List") (QVar "a"))])
-                                            (QFun (QApp (QVar "f") (QVar "a"))
-                                             (QApp (QVar "f")
-                                              (QApp (QConst "List") (QVar "a")))))))
+                                          (qConstraint "Alternative" (l [qVar "f"])
+                                           (qConstraint "Lazy" (l [QApp (qVar "f")
+                                                                   (QApp (qConst "List") (qVar "a"))])
+                                            (QFun (QApp (qVar "f") (qVar "a"))
+                                             (QApp (qVar "f")
+                                              (QApp (qConst "List") (qVar "a")))))))
 
     test "test #28" do
       let input = "forall f a. Alternative f => Lazy(f (List a))=>f a -> f (List a)"
       assertRight (parseTypeQuery input) ((QForAll (nl "f" ["a"]))
-                                          (QConstraint "Alternative" (l [QVar "f"])
-                                           (QConstraint "Lazy" (l [QApp (QVar "f")
-                                                                   (QApp (QConst "List") (QVar "a"))])
-                                            (QFun (QApp (QVar "f") (QVar "a"))
-                                             (QApp (QVar "f")
-                                              (QApp (QConst "List") (QVar "a")))))))
+                                          (qConstraint "Alternative" (l [qVar "f"])
+                                           (qConstraint "Lazy" (l [QApp (qVar "f")
+                                                                   (QApp (qConst "List") (qVar "a"))])
+                                            (QFun (QApp (qVar "f") (qVar "a"))
+                                             (QApp (qVar "f")
+                                              (QApp (qConst "List") (qVar "a")))))))
 
     test "test #29" do
       let input = "{a::Int,b::Int}"
       assertRight (parseTypeQuery input)
-        (QApp (QConst "Record") (QRow (List.fromFoldable [ Tuple "a" (QConst "Int"), Tuple "b" (QConst "Int")])))
+        (QApp (qConst "Record") (QRow (List.fromFoldable
+                                       [ Tuple (Identifier "a") (qConst "Int")
+                                       , Tuple (Identifier "b") (qConst "Int")])))
 
     test "test #30" do
       let input = "{record''' :: Int}"
       assertRight (parseTypeQuery input)
-        (QApp (QConst "Record") (QRow (List.fromFoldable [ Tuple "record'''" (QConst "Int")])))
+        (QApp (qConst "Record") (QRow (List.fromFoldable [ Tuple (Identifier "record'''") (qConst "Int")])))
 
     test "test #31" do
       let input = "(row''' :: Int)"
       assertRight (parseTypeQuery input)
-        (QRow (List.fromFoldable [ Tuple "row'''" (QConst "Int")]))
+        (QRow (List.fromFoldable [ Tuple (Identifier "row'''") (qConst "Int")]))
 
     test "test #32" do
       let input = "(row1 :: Int, row2 :: (),row3::(row4::{}))"
       assertRight (parseTypeQuery input)
-        (QRow (l [ Tuple "row1" (QConst "Int")
-                 , Tuple "row2" (QRow Nil)
-                 , Tuple "row3" (QRow (l [ Tuple "row4" (QApp (QConst "Record") (QRow Nil)) ])) ]))
+        (QRow (l [ Tuple (Identifier "row1") (qConst "Int")
+                 , Tuple (Identifier "row2") (QRow Nil)
+                 , Tuple (Identifier "row3") (QRow (l [ Tuple (Identifier "row4") (QApp (qConst "Record") (QRow Nil)) ])) ]))
 
     test "test #33" do
       let input = "Foldable1 t => Apply f => t (f a) -> f Unit"
       assertRight (parseTypeQuery input)
-        (QConstraint "Foldable1" ((QVar "t") : Nil) (QConstraint "Apply" ((QVar "f") : Nil) (QFun (QApp (QVar "t") (QApp (QVar "f") (QVar "a"))) (QApp (QVar "f") (QConst "Unit")))))
+        (qConstraint "Foldable1" ((qVar "t") : Nil) (qConstraint "Apply" ((qVar "f") : Nil) (QFun (QApp (qVar "t") (QApp (qVar "f") (qVar "a"))) (QApp (qVar "f") (qConst "Unit")))))
 
     test "test #34" do
       let input = "Foldable1 t => Apply f => t (f a) -> f a"
       assertRight (parseTypeQuery input)
-        (QConstraint "Foldable1" ((QVar "t") : Nil) (QConstraint "Apply" ((QVar "f") : Nil) (QFun (QApp (QVar "t") (QApp (QVar "f") (QVar "a"))) (QApp (QVar "f") (QVar "a")))))
+        (qConstraint "Foldable1" ((qVar "t") : Nil) (qConstraint "Apply" ((qVar "f") : Nil) (QFun (QApp (qVar "t") (QApp (qVar "f") (qVar "a"))) (QApp (qVar "f") (qVar "a")))))
 
     test "test #35" do
       let input = "Generic a rep => GenericEq rep => a -> a -> Boolean"
       assertRight (parseTypeQuery input)
-        (QConstraint "Generic" ((QVar "a") : (QVar "rep") : Nil)
-         (QConstraint "GenericEq" ((QVar "rep") : Nil)
-          (QFun (QVar "a") (QFun (QVar "a") (QConst "Boolean")))))
+        (qConstraint "Generic" ((qVar "a") : (qVar "rep") : Nil)
+         (qConstraint "GenericEq" ((qVar "rep") : Nil)
+          (QFun (qVar "a") (QFun (qVar "a") (qConst "Boolean")))))
 
   suite "polish notation" do
 
@@ -246,7 +249,7 @@ tests = do
 
           fun t1 t2 =
             TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"]
-                                                             , name: "Function" })) t1) t2
+                                                             , name: Identifier "Function" })) t1) t2
           type_ =
             ForAll "a" Nothing $
             ForAll "rep" Nothing $
@@ -314,70 +317,70 @@ tests = do
       Assert.equal 0 (typeVarPenalty mempty)
 
     test "#1" do
-      Assert.equal 0 (typeVarPenalty $ l [ Substitute "a" "b"
-                                         , Substitute "b" "a"
+      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "b"
+                                         , substitute "b" "a"
                                          ])
 
     test "#2" do
-      Assert.equal 0 (typeVarPenalty $ l [ Substitute "a" "b"
-                                         , Substitute "a" "b"
-                                         , Substitute "a" "b"
+      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "b"
+                                         , substitute "a" "b"
+                                         , substitute "a" "b"
                                          ])
 
     test "#3" do
-      Assert.equal 1 (typeVarPenalty $ l [ Substitute "a" "b"
-                                         , Substitute "a" "c"
+      Assert.equal 1 (typeVarPenalty $ l [ substitute "a" "b"
+                                         , substitute "a" "c"
                                          ])
 
     test "#4" do
-      Assert.equal 1 (typeVarPenalty $ l [ Substitute "a" "b"
-                                         , Substitute "b" "a"
-                                         , Substitute "b" "c"
+      Assert.equal 1 (typeVarPenalty $ l [ substitute "a" "b"
+                                         , substitute "b" "a"
+                                         , substitute "b" "c"
                                          ])
 
     test "#5" do
-      Assert.equal 0 (typeVarPenalty $ l [ Substitute "a" "b"
-                                         , Substitute "b" "c"
-                                         , Substitute "c" "a"
+      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "b"
+                                         , substitute "b" "c"
+                                         , substitute "c" "a"
                                          ])
 
     test "#6" do
-      Assert.equal 2 (typeVarPenalty $ l [ Substitute "a" "b"
-                                         , Substitute "a" "c"
-                                         , Substitute "a" "a"
+      Assert.equal 2 (typeVarPenalty $ l [ substitute "a" "b"
+                                         , substitute "a" "c"
+                                         , substitute "a" "a"
                                          ])
 
     test "#7" do
-      Assert.equal 2 (typeVarPenalty $ l [ Substitute "a" "a"
-                                         , Substitute "b" "a"
-                                         , Substitute "c" "a"
+      Assert.equal 2 (typeVarPenalty $ l [ substitute "a" "a"
+                                         , substitute "b" "a"
+                                         , substitute "c" "a"
                                          ])
 
     test "#8" do
-      Assert.equal 4 (typeVarPenalty $ l [ Substitute "a" "a"
-                                         , Substitute "b" "a"
-                                         , Substitute "c" "a"
-                                         , Substitute "a" "b"
-                                         , Substitute "a" "c"
-                                         , Substitute "a" "a"
+      Assert.equal 4 (typeVarPenalty $ l [ substitute "a" "a"
+                                         , substitute "b" "a"
+                                         , substitute "c" "a"
+                                         , substitute "a" "b"
+                                         , substitute "a" "c"
+                                         , substitute "a" "a"
                                          ])
 
     test "#9" do
-      Assert.equal 0 (typeVarPenalty $ l [ Substitute "a" "e"
-                                         , Substitute "b" "d"
-                                         , Substitute "c" "f"
+      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "e"
+                                         , substitute "b" "d"
+                                         , substitute "c" "f"
                                          ])
 
   suite "unification" do
     test "instantiation #0" do
-      let mVarQuery = QVar "m"
-          unitConstQuery = QConst "Unit"
+      let mVarQuery = qVar "m"
+          unitConstQuery = qConst "Unit"
 
       Assert.assert "instantiation #0" $
         (penalty unitConstQuery unitType < penalty mVarQuery unitType)
 
     test "generalization #0" do
-      let query = QVar "m"
+      let query = qVar "m"
           t1 = TypeVar "m"
 
       Assert.assert "qeneralization #0" $
@@ -387,19 +390,37 @@ tests = do
 l :: forall f. Foldable f => (forall a. f a -> List a)
 l = List.fromFoldable
 
-nl :: forall t5 t6. Foldable t6 => t5 -> t6 t5 -> NonEmptyList t5
-nl x rst = NonEmptyList.cons' x $ List.fromFoldable rst
+nl
+  :: forall t
+  .  Foldable t
+  => Functor t
+  => String
+  -> t String
+  -> NonEmptyList Identifier
+nl x rst = NonEmptyList.cons' (Identifier x) $ List.fromFoldable (rst <#> Identifier)
 
 unitType :: Type
 unitType = TypeConstructor (QualifiedName { moduleNameParts: []
-                                          , name: "Unit"
+                                          , name: Identifier "Unit"
                                           })
 
 countFreeVars :: TypeQuery -> Int
 countFreeVars = getFreeVariables >>> Set.size
 
 qname :: Array String -> String -> QualifiedName
-qname m n = QualifiedName { moduleNameParts: m, name: n }
+qname m n = QualifiedName { moduleNameParts: m, name: Identifier n }
 
 constr :: QualifiedName -> Array Type -> Constraint
 constr c a = Constraint { constraintClass: c, constraintArgs: a }
+
+qVar :: String -> TypeQuery
+qVar = QVar <<< Identifier
+
+qConst :: String -> TypeQuery
+qConst = QConst <<< Identifier
+
+qConstraint :: String -> List TypeQuery -> TypeQuery -> TypeQuery
+qConstraint = QConstraint <<< Identifier
+
+substitute :: String -> String -> Substitution
+substitute a b = Substitute (Identifier a) (Identifier b)

From 93091a612e0395842479b099f968ebdd20b7dd14 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Wed, 29 Jul 2020 20:16:59 +0300
Subject: [PATCH 12/45] Fix CLI autocompleter (now works correctly with capital
 letters).

---
 src/Docs/Search/Interactive.purs | 17 ++++++++---------
 test/Main.purs                   |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 40c62b4..549523b 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -5,7 +5,7 @@ import Docs.Search.Declarations (Declarations, mkDeclarations)
 import Docs.Search.DocsJson (DataDeclType(..))
 import Docs.Search.Engine (mkEngineState, packageInfoToString, Result(..))
 import Docs.Search.Engine as Engine
-import Docs.Search.Extra (listToString, stringToList, (>#>))
+import Docs.Search.Extra (stringToList, (>#>))
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.ModuleIndex (ModuleResult, mkPackedModuleIndex, unpackModuleIndex)
 import Docs.Search.NodeEngine (nodeEngine)
@@ -22,12 +22,12 @@ import Prelude
 
 import Data.Array as Array
 import Data.Identity (Identity(..))
+import Data.List as List
 import Data.Maybe (fromMaybe)
 import Data.Newtype (un, unwrap, wrap)
 import Data.Search.Trie as Trie
 import Data.String (length) as String
-import Data.String.Common (split, trim) as String
-import Data.Tuple (fst)
+import Data.String.Common (split, toLower, trim) as String
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
@@ -105,14 +105,13 @@ mkCompleter
   -> Effect { completions :: Array String
             , matched :: String }
 mkCompleter index input = do
-  let path = stringToList input
-  let paths =
+  let path = stringToList $ String.toLower input
+      paths =
         Array.fromFoldable $
-        listToString <$>
-        (fst <$> Trie.query path (unwrap index))
+        (\result -> unwrap (unwrap result).name) <$>
+        List.concat (Trie.queryValues path (unwrap index))
 
-  pure { completions: paths
-       , matched: input }
+  pure { completions: paths, matched: input }
 
 
 showResult :: Result -> String
diff --git a/test/Main.purs b/test/Main.purs
index 695744a..84157a1 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -3,7 +3,7 @@ module Test.Main where
 import Prelude
 
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..))
-import Docs.Search.Types
+import Docs.Search.Types (Identifier(..))
 import Test.TypeQuery as TypeQuery
 import Test.IndexBuilder as IndexBuilder
 import Test.Declarations as Declarations

From 68e36ead7b15033df48973c12be1076995f9dfc9 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Wed, 29 Jul 2020 20:17:31 +0300
Subject: [PATCH 13/45] Update changelog, bump version

---
 CHANGELOG.md                | 20 ++++++++++++++++++++
 package.json                |  2 +-
 src/Docs/Search/Config.purs |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 305f63a..ac8cad1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.9 - 2020-07-29]
+
+New features:
+- Implement sorting by package popularity for declarations.
+- Add app version info to the footer.
+- Scroll to document top when search bar gets focus.
+- Group modules by package in the sidebar (#34)
+
+Bugfixes:
+- Fix CLI autocompleter (now works correctly with capital letters).
+
+## [0.0.8 - 2020-01-18]
+
+Skipped due to failed deployment.
+
+## [0.0.7 - 2020-01-18]
+
+Changes:
+- Consider something a builtin when there's no `sourceSpan` (#32)
+
 ## [0.0.6 - 2019-11-29]
 
 New features:
diff --git a/package.json b/package.json
index 7817f70..45b5abd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-docs-search",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Search frontend for the documentation generated by the PureScript compiler.",
   "directories": {
     "test": "test"
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 4c3c6f9..caaf454 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -30,7 +30,7 @@ config ::
   , typeIndexDirectory :: String
   }
 config =
-  { version: "0.0.8"
+  { version: "0.0.9"
   , outputDirectory: "output"
   , requiredDirectories:
     [ "generated-docs"

From 5fa7580d755fe4daf74b5e2a3a61c71b4defb383 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Fri, 31 Jul 2020 11:53:33 +0300
Subject: [PATCH 14/45] Change sidebar title to "Packages" when grouping
 modules by package name (#39)

---
 src/Docs/Search/App/Sidebar.purs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index 2f3b36f..c6859c0 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -114,7 +114,7 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
                       ]
          ]
 
-  [ HH.h3_ [ HH.text "Modules" ]
+  [ HH.h3_ [ HH.text $ if groupingMode == DontGroup then "Modules" else "Packages" ]
   , HH.input [ HP.id_ "group-modules__input"
              , HP.type_ HP.InputCheckbox
              , HP.checked (groupingMode == GroupByPackage)

From 635056150fce23a829f5370490cfeae3954b62c7 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Fri, 31 Jul 2020 12:13:13 +0300
Subject: [PATCH 15/45] Group modules by default (#39)

---
 src/Docs/Search/App/Sidebar.purs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index c6859c0..5b1b589 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -84,9 +84,9 @@ handleAction (ToggleGrouping groupingMode) = do
     window <- HTML.window
     localStorage <- Window.localStorage window
 
-    if groupingMode == GroupByPackage
-    then Storage.setItem    config.groupModulesItem "true" localStorage
-    else Storage.removeItem config.groupModulesItem        localStorage
+    if groupingMode == DontGroup
+    then Storage.setItem    config.groupModulesItem "false" localStorage
+    else Storage.removeItem config.groupModulesItem         localStorage
 
 
 handleQuery
@@ -156,8 +156,8 @@ loadGroupingModeFromLocalStorage :: Effect GroupingMode
 loadGroupingModeFromLocalStorage = do
   window <- HTML.window
   localStorage <- Window.localStorage window
-  mbGroupModules <- Storage.getItem config.groupModulesItem localStorage
-  pure $ if isJust mbGroupModules then GroupByPackage else DontGroup
+  mbDontGroupModules <- Storage.getItem config.groupModulesItem localStorage
+  pure $ if isJust mbDontGroupModules then DontGroup else GroupByPackage
 
 
 -- | Convert checkbox status to sidebar mode

From 86304888a4991ef7f1e36e0587ff3622f51cfdff Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Mon, 3 Aug 2020 13:59:21 +0300
Subject: [PATCH 16/45] Add --package-name flag:   - Allows to specify current
 package name that will be used in the results; Add Meta:   - Allows to store
 some static info, as for now - just local package name; Code style
 improvements.

---
 src/Docs/Search/App.purs               |  8 +++++-
 src/Docs/Search/App/SearchResults.purs | 34 +++++++++++++----------
 src/Docs/Search/Config.purs            | 10 +++++++
 src/Docs/Search/Engine.purs            | 10 +++----
 src/Docs/Search/IndexBuilder.purs      | 24 ++++++++++++-----
 src/Docs/Search/Interactive.purs       | 30 ++++++++++++---------
 src/Docs/Search/Loader.js              | 26 ++++++++++++++++++
 src/Docs/Search/Loader.purs            | 37 ++++++++++++++++++++++++++
 src/Docs/Search/Main.purs              | 37 +++++++++++++++++---------
 src/Docs/Search/Meta.purs              | 21 +++++++++++++++
 src/Docs/Search/Types.purs             |  6 +++++
 11 files changed, 191 insertions(+), 52 deletions(-)
 create mode 100644 src/Docs/Search/Loader.js
 create mode 100644 src/Docs/Search/Loader.purs
 create mode 100644 src/Docs/Search/Meta.purs

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index 7f7eb55..9bc2a75 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -16,6 +16,7 @@ import Docs.Search.Config (config)
 import Docs.Search.Extra (whenJust)
 import Docs.Search.ModuleIndex as ModuleIndex
 import Docs.Search.PackageIndex as PackageIndex
+import Docs.Search.Meta as Meta
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Halogen as H
@@ -63,6 +64,7 @@ main = do
     HA.runHalogenAff do
       packageIndex <- PackageIndex.loadPackageIndex
       moduleIndex <- ModuleIndex.unpackModuleIndex <$> ModuleIndex.loadModuleIndex
+      meta <- Meta.load
       let scores = PackageIndex.mkScoresFromPackageIndex packageIndex
 
       let initialSearchEngineState = { packageIndex
@@ -73,7 +75,11 @@ main = do
                                      }
 
           resultsComponent =
-            SearchResults.mkComponent initialSearchEngineState pageContents markdownIt
+            SearchResults.mkComponent
+            initialSearchEngineState
+            pageContents
+            markdownIt
+            meta
 
       sfio <- runUI SearchField.component unit searchField
       srio <- runUI resultsComponent unit searchResults
diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index c5f9e82..1714eed 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -14,7 +14,8 @@ import Docs.Search.PackageIndex (PackageResult)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
 import Docs.Search.TypeIndex (TypeIndex)
-import Docs.Search.Types (ModuleName(..), Identifier(..))
+import Docs.Search.Types (Identifier(..), ModuleName(..), PackageName)
+import Docs.Search.Meta (Meta)
 
 import Prelude
 
@@ -56,6 +57,7 @@ type State = { engineState :: EngineState
              , resultsCount :: Int
              , mode :: Mode
              , markdownIt :: MD.MarkdownIt
+             , localPackageName :: PackageName
              }
 
 
@@ -73,8 +75,9 @@ mkComponent
   .  EngineState
   -> Element
   -> MD.MarkdownIt
+  -> Meta
   -> H.Component HH.HTML Query i o Aff
-mkComponent initialEngineState contents markdownIt =
+mkComponent initialEngineState contents markdownIt { localPackageName } =
   H.mkComponent
     { initialState: const { engineState: initialEngineState
                           , results: []
@@ -83,6 +86,7 @@ mkComponent initialEngineState contents markdownIt =
                           , resultsCount: config.resultsCount
                           , mode: Off
                           , markdownIt
+                          , localPackageName
                           }
     , render
     , eval: H.mkEval $ H.defaultEval { handleQuery = handleQuery
@@ -191,13 +195,12 @@ render state@{ mode: Active, results: [] } =
     , HH.text " did not yield any results."
     ]
   ]
-
 render state@{ mode: Active } =
   renderContainer $
   [ HH.h1_ [ HH.text "Search results" ]
 
   , HH.div_ $
-    Array.concat $ shownResults <#> renderResult state.markdownIt
+    Array.concat $ shownResults <#> renderResult state
 
   , HH.div [ HP.class_ (wrap "load_more"), HP.id_ "load-more" ]
     [ if Array.length shownResults < Array.length state.results
@@ -211,7 +214,6 @@ render state@{ mode: Active } =
   where
     shownResults = Array.take state.resultsCount state.results
 
-
 renderContainer :: forall a b. Array (HH.HTML b a) -> HH.HTML b a
 renderContainer =
   HH.div [ HP.classes [ wrap "container", wrap "clearfix" ] ] <<<
@@ -229,13 +231,17 @@ renderSummary text =
 
 renderResult
   :: forall a
-  .  MD.MarkdownIt
+  .  State
   -> Result
   -> Array (HH.HTML a Action)
-renderResult markdownIt (DeclResult r) = renderSearchResult markdownIt r
-renderResult markdownIt (TypeResult r) = renderSearchResult markdownIt r
-renderResult markdownIt (PackResult r) = renderPackageResult r
-renderResult markdownIt (MdlResult r)  = renderModuleResult r
+renderResult state (DeclResult r) =
+  renderSearchResult state r
+renderResult state (TypeResult r) =
+  renderSearchResult state  r
+renderResult state (PackResult r) =
+  renderPackageResult r
+renderResult state (MdlResult r) =
+  renderModuleResult r
 
 
 renderPackageResult
@@ -291,10 +297,10 @@ renderModuleResult { name, package } =
 
 renderSearchResult
   :: forall a
-  .  MD.MarkdownIt
+  .  State
   -> SearchResult
   -> Array (HH.HTML a Action)
-renderSearchResult markdownIt (SearchResult result) =
+renderSearchResult state (SearchResult result) =
   -- class names here and below are from Pursuit.
   [ HH.div [ HP.class_ (wrap "result") ]
     [ HH.h3 [ HP.class_ (wrap "result__title") ]
@@ -311,7 +317,7 @@ renderSearchResult markdownIt (SearchResult result) =
   , HH.div [ HP.class_ (wrap "result__body") ] $
     renderResultType result <>
 
-    result.comments >#> pure <<< MDH.render_ markdownIt
+    result.comments >#> pure <<< MDH.render_ state.markdownIt
 
   , HH.div [ HP.class_ (wrap "result__actions") ]
 
@@ -322,7 +328,7 @@ renderSearchResult markdownIt (SearchResult result) =
                 , HP.title "Package"
                 ]
         [ HH.text "P" ]
-      , HH.text $ packageInfoToString result.packageInfo
+      , HH.text $ packageInfoToString state.localPackageName result.packageInfo
       ]
 
     , HH.span [ HP.class_ (wrap "result__actions__item") ]
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index caaf454..1ecbc3c 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -2,6 +2,8 @@ module Docs.Search.Config where
 
 import Prelude
 
+import Docs.Search.Types (PackageName(..))
+
 -- | Some magic constants.
 config ::
   { version :: String
@@ -10,6 +12,9 @@ config ::
   , mkIndexPartPath :: Int -> String
   , moduleIndexPath :: String
   , moduleIndexLoadPath :: String
+  , metaPath :: String
+  , metaLoadPath :: String
+  , metaItem :: String
   , groupModulesItem :: String
   , packageInfoPath :: String
   , packageInfoLoadPath :: String
@@ -28,6 +33,7 @@ config ::
   , requiredDirectories :: Array String
   , resultsCount :: Int
   , typeIndexDirectory :: String
+  , defaultPackageName :: PackageName
   }
 config =
   { version: "0.0.9"
@@ -51,6 +57,9 @@ config =
   , moduleIndexPath: "generated-docs/html/index/modules.js"
   , moduleIndexLoadPath: "./index/modules.js"
   -- ^ Used to load mode index to the browser scope.
+  , metaPath: "generated-docs/html/index/meta.js"
+  , metaLoadPath: "./index/meta.js"
+  , metaItem: "DocsSearchMeta"
   , groupModulesItem: "PureScriptDocsSearchGroupModules"
   -- ^ localStorage key to save sidebar checkbox value to.
   , packageInfoPath: "generated-docs/html/index/packages.js"
@@ -69,4 +78,5 @@ config =
                }
   -- ^ Penalties used to determine how "far" a type query is from a given type.
   -- See Docs.Search.TypeQuery
+  , defaultPackageName: PackageName "<local package>"
   }
diff --git a/src/Docs/Search/Engine.purs b/src/Docs/Search/Engine.purs
index 8c338d8..c5e4cec 100644
--- a/src/Docs/Search/Engine.purs
+++ b/src/Docs/Search/Engine.purs
@@ -160,8 +160,8 @@ sortByDistance typeQuery =
   Array.sortWith (map (penalty typeQuery) <<< typeOfResult)
 
 
-packageInfoToString :: PackageInfo -> String
-packageInfoToString (Package (PackageName p)) = p
-packageInfoToString Builtin = "<builtin>"
-packageInfoToString LocalPackage = "<local package>"
-packageInfoToString UnknownPackage = "<unknown package>"
+packageInfoToString :: PackageName -> PackageInfo -> String
+packageInfoToString _ (Package (PackageName p)) = p
+packageInfoToString _ Builtin = "<builtin>"
+packageInfoToString localPackageName LocalPackage = unwrap localPackageName
+packageInfoToString _ UnknownPackage = "<unknown package>"
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 07f2835..14137cc 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -10,6 +10,8 @@ import Docs.Search.PackageIndex (PackageInfo, mkPackageInfo)
 import Docs.Search.Score (mkScores)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeIndex (TypeIndex, mkTypeIndex)
+import Docs.Search.Types (PackageName)
+import Docs.Search.Meta (Meta)
 
 import Prelude
 import Data.Argonaut.Core (stringify)
@@ -49,6 +51,7 @@ type Config =
   , bowerFiles :: Array String
   , generatedDocs :: String
   , noPatch :: Boolean
+  , packageName :: PackageName
   }
 
 
@@ -67,12 +70,15 @@ run' cfg = do
   docsJsons    <- decodeDocsJsons cfg
   packageMetas <- decodeBowerJsons cfg
 
+  let countOfPackages = Array.length packageMetas
+      countOfModules  = Array.length docsJsons
+
   liftEffect do
     log $
       "Indexing " <>
-      show (Array.length docsJsons) <>
+      show countOfModules <>
       " modules from " <>
-      show (Array.length packageMetas) <>
+      show countOfPackages <>
       " packages..."
 
   let scores      = mkScores packageMetas
@@ -80,6 +86,7 @@ run' cfg = do
       typeIndex   = mkTypeIndex scores docsJsons
       packageInfo = mkPackageInfo scores packageMetas
       moduleIndex = mkPackedModuleIndex index
+      meta        = { localPackageName: cfg.packageName }
 
   createDirectories cfg
 
@@ -88,15 +95,13 @@ run' cfg = do
            <*> parallel (writeTypeIndex cfg typeIndex)
            <*> parallel (writePackageInfo packageInfo)
            <*> parallel (writeModuleIndex moduleIndex)
-           <*> parallel (if cfg.noPatch
-                         then pure unit
-                         else patchDocs cfg)
+           <*> parallel (writeMeta meta)
+           <*> parallel (when (not cfg.noPatch) $ patchDocs cfg)
            <*> parallel (copyAppFile cfg)
 
   let countOfDefinitions = Trie.size $ unwrap index
       countOfTypeDefinitions =
         sum $ fromMaybe 0 <$> map Array.length <$> Map.values (unwrap typeIndex)
-      countOfPackages = Array.length packageMetas
 
   liftEffect do
     log $
@@ -231,6 +236,13 @@ writeModuleIndex moduleIndex = do
   where
     header = "window.DocsSearchModuleIndex = "
 
+writeMeta :: Meta -> Aff Unit
+writeMeta meta = do
+  writeTextFile UTF8 config.metaPath $
+    header <> stringify (encodeJson meta)
+  where
+    header = "window." <> config.metaItem <> " = "
+
 -- | Get a mapping from index parts to index contents.
 getIndex :: Declarations -> Map Int (Array (Tuple String (Array SearchResult)))
 getIndex (Declarations trie) =
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 549523b..3cb4617 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -16,7 +16,7 @@ import Docs.Search.Terminal (bold, cyan, green, yellow)
 import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
 import Docs.Search.TypeIndex (resultsWithTypes)
 import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showKind, showType, showTypeArgument, space, syntax)
-import Docs.Search.Types (ModuleName, PackageInfo, Identifier)
+import Docs.Search.Types (ModuleName, PackageName, PackageInfo, Identifier)
 
 import Prelude
 
@@ -38,6 +38,7 @@ import Node.ReadLine (createConsoleInterface, question)
 type Config =
   { docsFiles :: Array String
   , bowerFiles :: Array String
+  , packageName :: PackageName
   }
 
 
@@ -88,7 +89,7 @@ run cfg = launchAff_ $ do
         Console.log $
           if total > 0 then do
             Array.intercalate "\n\n\n" $
-              showResult <$> Array.reverse results
+              showResult cfg <$> Array.reverse results
           else
             "Your search for " <> bold input <> " did not yield any results."
 
@@ -114,16 +115,16 @@ mkCompleter index input = do
   pure { completions: paths, matched: input }
 
 
-showResult :: Result -> String
-showResult = case _ of
-  DeclResult r -> showSearchResult r
-  TypeResult r -> showSearchResult r
+showResult :: Config -> Result -> String
+showResult cfg = case _ of
+  DeclResult r -> showSearchResult cfg r
+  TypeResult r -> showSearchResult cfg r
   PackResult r -> showPackageResult r
   MdlResult r -> showModuleResult r
 
 
-showSearchResult :: SearchResult -> String
-showSearchResult (SearchResult result@{ name, comments, moduleName, packageInfo }) =
+showSearchResult :: Config -> SearchResult -> String
+showSearchResult cfg (SearchResult result@{ name, comments, moduleName, packageInfo }) =
   showSignature result <> "\n" <>
 
   (fromMaybe "\n" $
@@ -131,10 +132,10 @@ showSearchResult (SearchResult result@{ name, comments, moduleName, packageInfo
    "\n" <> leftShift 3 (String.trim comment) <> "\n\n") <>
 
   bold (
-    cyan (rightPad 40 $ packageInfoToString packageInfo)
+    cyan (rightPad 40 $ packageInfoToString cfg.packageName packageInfo)
   ) <>
   space <>
-  bold (green $ unwrap moduleName)
+  showModuleName moduleName
 
 
 showPackageResult :: PackageResult -> String
@@ -146,7 +147,11 @@ showPackageResult { name, description } =
 
 showModuleResult :: ModuleResult -> String
 showModuleResult { name, package } =
-  bold (cyan "module") <> " " <> bold (green $ unwrap name)
+  bold (cyan "module") <> " " <> showModuleName name
+
+
+showModuleName :: ModuleName -> String
+showModuleName = bold <<< green <<< unwrap
 
 
 showSignature
@@ -204,8 +209,7 @@ showTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName }
           superclasses <#> showConstraint
         )
       ) <>
-      syntax ")" <>
-      space <>
+      syntax ") " <>
       syntax "<="
   ) <>
   space <>
diff --git a/src/Docs/Search/Loader.js b/src/Docs/Search/Loader.js
new file mode 100644
index 0000000..0dfd479
--- /dev/null
+++ b/src/Docs/Search/Loader.js
@@ -0,0 +1,26 @@
+/* global exports */
+
+exports.loadFromScript = function (globalIdentifier) {
+  return function (url) {
+    return function () {
+      return new Promise(function (resolve, reject) {
+        if (typeof window[globalIdentifier] === 'undefined') {
+          var script = document.createElement('script');
+          script.type = 'text/javascript';
+          script.src = url;
+          script.addEventListener('load', function () {
+            if (typeof window[globalIdentifier] === 'undefined') {
+              reject(new Error("Couldn't load package index."));
+            } else {
+              resolve(window[globalIdentifier]);
+            }
+          });
+          script.addEventListener('error', reject);
+          document.body.appendChild(script);
+        } else {
+          resolve(window[globalIdentifier]);
+        }
+      });
+    };
+  };
+};
diff --git a/src/Docs/Search/Loader.purs b/src/Docs/Search/Loader.purs
new file mode 100644
index 0000000..2ce1ff5
--- /dev/null
+++ b/src/Docs/Search/Loader.purs
@@ -0,0 +1,37 @@
+module Docs.Search.Loader where
+
+import Docs.Search.Types (GlobalIdentifier, URL)
+
+import Prelude
+
+import Control.Monad.Error.Class (throwError)
+import Control.Promise (Promise, toAffE)
+import Data.Argonaut.Core (Json)
+import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
+import Data.Either (either)
+import Data.Newtype (unwrap)
+import Effect (Effect)
+import Effect.Aff (Aff)
+import Effect.Exception (error)
+
+
+
+load
+ :: forall a
+ .  DecodeJson a
+ => GlobalIdentifier
+ -> URL
+ -> Aff a
+load globalIdentifier url = do
+  json <- toAffE (loadFromScript globalIdentifier url)
+  either throw pure $ decodeJson json
+  where
+    throw err = throwError $ error $
+      "Couldn't load content from window." <>
+      unwrap globalIdentifier <> ": " <> err
+
+
+foreign import loadFromScript
+  :: GlobalIdentifier
+  -> URL
+  -> Effect (Promise Json)
diff --git a/src/Docs/Search/Main.purs b/src/Docs/Search/Main.purs
index 81ce10a..2699e64 100644
--- a/src/Docs/Search/Main.purs
+++ b/src/Docs/Search/Main.purs
@@ -6,12 +6,14 @@ import Prelude
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.Interactive as Interactive
 import Docs.Search.Config (config)
+import Docs.Search.Types (PackageName(..))
 
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.List as List
 import Data.List.NonEmpty as NonEmpty
 import Data.Maybe (Maybe, fromMaybe, optional)
+import Data.Newtype (unwrap)
 import Data.Unfoldable (class Unfoldable)
 import Effect (Effect)
 import Effect.Console (log)
@@ -23,7 +25,10 @@ main :: Effect Unit
 main = do
 
   args <- getArgs
-  let defaultCommands = Search { docsFiles: defaultDocsFiles, bowerFiles: defaultBowerFiles }
+  let defaultCommands = Search { docsFiles: defaultDocsFiles
+                               , bowerFiles: defaultBowerFiles
+                               , packageName: config.defaultPackageName
+                               }
 
   case fromMaybe defaultCommands args of
     BuildIndex cfg -> IndexBuilder.run cfg
@@ -42,16 +47,8 @@ getArgs = execParser opts
 
 
 data Commands
-  = BuildIndex
-    { docsFiles :: Array String
-    , bowerFiles :: Array String
-    , generatedDocs :: String
-    , noPatch :: Boolean
-    }
-  | Search
-    { docsFiles :: Array String
-    , bowerFiles :: Array String
-    }
+  = BuildIndex IndexBuilder.Config
+  | Search Interactive.Config
   | Version
 
 
@@ -88,6 +85,8 @@ buildIndex = ado
 
   bowerFiles <- bowerFilesOption
 
+  packageName <- packageNameOption
+
   generatedDocs <- strOption
     ( long "generated-docs"
    <> metavar "DIR"
@@ -99,7 +98,8 @@ buildIndex = ado
    <> help "Do not patch the HTML docs, only build indices"
     )
 
-  in BuildIndex { docsFiles, bowerFiles, generatedDocs, noPatch }
+
+  in BuildIndex { docsFiles, bowerFiles, generatedDocs, noPatch, packageName }
 
 
 startInteractive :: Parser Commands
@@ -109,7 +109,9 @@ startInteractive = ado
 
   bowerFiles <- bowerFilesOption
 
-  in Search { docsFiles, bowerFiles }
+  packageName <- packageNameOption
+
+  in Search { docsFiles, bowerFiles, packageName }
 
 
 docsFilesOption :: Parser (Array String)
@@ -136,6 +138,15 @@ bowerFilesOption = fromMaybe defaultBowerFiles <$>
    )
 
 
+packageNameOption :: Parser PackageName
+packageNameOption =
+  PackageName <$> strOption
+  ( long "package-name"
+ <> metavar "PACKAGE"
+ <> value (unwrap $ config.defaultPackageName)
+  )
+
+
 defaultDocsFiles :: Array String
 defaultDocsFiles = [ "output/**/docs.json" ]
 
diff --git a/src/Docs/Search/Meta.purs b/src/Docs/Search/Meta.purs
new file mode 100644
index 0000000..bc17f78
--- /dev/null
+++ b/src/Docs/Search/Meta.purs
@@ -0,0 +1,21 @@
+module Docs.Search.Meta where
+
+import Docs.Search.Config (config)
+import Docs.Search.Loader as Loader
+import Docs.Search.Types (GlobalIdentifier(..), PackageName)
+
+import Prelude
+
+import Effect.Aff (Aff, catchError)
+
+
+type Meta =
+  { localPackageName :: PackageName
+  }
+
+
+load :: Aff Meta
+load =
+  Loader.load (GlobalIdentifier config.metaItem) config.metaLoadPath
+    `catchError` const (pure defaultMeta)
+  where defaultMeta = { localPackageName: config.defaultPackageName }
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index deacb07..0e2c023 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -74,3 +74,9 @@ derive newtype instance ringPackageScore :: Ring PackageScore
 derive newtype instance showPackageScore :: Show PackageScore
 derive newtype instance decodeJsonPackageScore :: DecodeJson PackageScore
 derive newtype instance encodeJsonPackageScore :: EncodeJson PackageScore
+
+type URL = String
+
+newtype GlobalIdentifier = GlobalIdentifier String
+
+derive instance newtypeGlobalIdentifier :: Newtype GlobalIdentifier _

From 73a6c092a0377408b7390d6d8fb71fb56e1ced42 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Mon, 3 Aug 2020 18:35:14 +0300
Subject: [PATCH 17/45] Refactor `Docs.Search.Config`

---
 src/Docs/Search/App.purs               |  19 ++--
 src/Docs/Search/App/SearchResults.purs |   6 +-
 src/Docs/Search/App/Sidebar.purs       |   8 +-
 src/Docs/Search/BrowserEngine.purs     |   8 +-
 src/Docs/Search/Config.purs            | 150 ++++++++++++-------------
 src/Docs/Search/IndexBuilder.purs      |  14 +--
 src/Docs/Search/Main.purs              |   8 +-
 src/Docs/Search/Meta.purs              |   6 +-
 src/Docs/Search/ModuleIndex.purs       |   4 +-
 src/Docs/Search/PackageIndex.purs      |   4 +-
 src/Docs/Search/TypeIndex.purs         |   8 +-
 src/Docs/Search/TypeQuery.purs         |  18 +--
 src/Docs/Search/Types.purs             |   7 +-
 13 files changed, 132 insertions(+), 128 deletions(-)

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index 9bc2a75..ca87d25 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -1,6 +1,15 @@
 -- | This is the main module of the client-side Halogen app.
 module Docs.Search.App where
 
+import Docs.Search.App.SearchField as SearchField
+import Docs.Search.App.SearchResults as SearchResults
+import Docs.Search.App.Sidebar as Sidebar
+import Docs.Search.Config as Config
+import Docs.Search.Extra (whenJust)
+import Docs.Search.ModuleIndex as ModuleIndex
+import Docs.Search.PackageIndex as PackageIndex
+import Docs.Search.Meta as Meta
+
 import Prelude
 
 import Control.Alt (alt)
@@ -9,14 +18,6 @@ import Data.Maybe (Maybe(..))
 import Data.Newtype (wrap)
 import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
-import Docs.Search.App.SearchField as SearchField
-import Docs.Search.App.SearchResults as SearchResults
-import Docs.Search.App.Sidebar as Sidebar
-import Docs.Search.Config (config)
-import Docs.Search.Extra (whenJust)
-import Docs.Search.ModuleIndex as ModuleIndex
-import Docs.Search.PackageIndex as PackageIndex
-import Docs.Search.Meta as Meta
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Halogen as H
@@ -195,7 +196,7 @@ insertVersionInfo doc = do
       Element.setAttribute "href" "https://github.com/spacchetti/purescript-docs-search" linkElement
       Element.setAttribute "target" "_blank"  linkElement
       linkText    <- Document.createTextNode ("docs-search")         doc <#> Text.toNode
-      suffix      <- Document.createTextNode (" " <> config.version) doc <#> Text.toNode
+      suffix      <- Document.createTextNode (" " <> Config.version) doc <#> Text.toNode
       void $ Node.appendChild prefix versionInfo
       void $ Node.appendChild linkNode versionInfo
       void $ Node.appendChild linkText linkNode
diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index 1714eed..0369209 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -3,7 +3,7 @@ module Docs.Search.App.SearchResults where
 
 import Docs.Search.App.SearchField (SearchFieldMessage(..))
 import Docs.Search.BrowserEngine (PartialIndex, browserSearchEngine)
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Declarations (DeclLevel(..), declLevelToHashAnchor)
 import Docs.Search.DocsJson (DataDeclType(..))
 import Docs.Search.Engine (Result(..), packageInfoToString)
@@ -83,7 +83,7 @@ mkComponent initialEngineState contents markdownIt { localPackageName } =
                           , results: []
                           , input: ""
                           , contents
-                          , resultsCount: config.resultsCount
+                          , resultsCount: Config.resultsCount
                           , mode: Off
                           , markdownIt
                           , localPackageName
@@ -116,7 +116,7 @@ handleQuery (MessageFromSearchField (InputUpdated input_) next) = do
       H.modify_ (_ { mode = Off })
       showPageContents
   else do
-    H.modify_ (_ { mode = Loading, resultsCount = config.resultsCount })
+    H.modify_ (_ { mode = Loading, resultsCount = Config.resultsCount })
 
     void $ H.fork do
       { index, results } <- H.liftAff $
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index 5b1b589..5d19b27 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -1,6 +1,6 @@
 module Docs.Search.App.Sidebar where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.ModuleIndex (PackedModuleIndex)
 import Docs.Search.Types (ModuleName, PackageName(..))
 
@@ -85,8 +85,8 @@ handleAction (ToggleGrouping groupingMode) = do
     localStorage <- Window.localStorage window
 
     if groupingMode == DontGroup
-    then Storage.setItem    config.groupModulesItem "false" localStorage
-    else Storage.removeItem config.groupModulesItem         localStorage
+    then Storage.setItem    Config.groupModulesItem "false" localStorage
+    else Storage.removeItem Config.groupModulesItem         localStorage
 
 
 handleQuery
@@ -156,7 +156,7 @@ loadGroupingModeFromLocalStorage :: Effect GroupingMode
 loadGroupingModeFromLocalStorage = do
   window <- HTML.window
   localStorage <- Window.localStorage window
-  mbDontGroupModules <- Storage.getItem config.groupModulesItem localStorage
+  mbDontGroupModules <- Storage.getItem Config.groupModulesItem localStorage
   pure $ if isJust mbDontGroupModules then DontGroup else GroupByPackage
 
 
diff --git a/src/Docs/Search/BrowserEngine.purs b/src/Docs/Search/BrowserEngine.purs
index 8063e9b..b3af249 100644
--- a/src/Docs/Search/BrowserEngine.purs
+++ b/src/Docs/Search/BrowserEngine.purs
@@ -1,7 +1,7 @@
 -- | A search engine that is used in the browser.
 module Docs.Search.BrowserEngine where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.PackageIndex (queryPackageIndex)
 import Docs.Search.Engine (Engine, EngineState, Index)
 import Docs.Search.SearchResult (SearchResult)
@@ -68,7 +68,7 @@ query index@(PartialIndex indexMap) input = do
 
 
       eiPartJson <-
-        try $ toAffE $ loadIndex_ partId $ config.mkIndexPartLoadPath partId
+        try $ toAffE $ loadIndex_ partId $ Config.mkIndexPartLoadPath partId
 
       let
         mbNewTrie :: Maybe (Trie Char (List SearchResult))
@@ -121,9 +121,9 @@ browserSearchEngine =
 -- | Find in which part of the index this path can be found.
 getPartId :: List Char -> Int
 getPartId (a : b : _) =
-  (Char.toCharCode a + Char.toCharCode b) `mod` config.numberOfIndexParts
+  (Char.toCharCode a + Char.toCharCode b) `mod` Config.numberOfIndexParts
 getPartId (a : _) =
-  Char.toCharCode a `mod` config.numberOfIndexParts
+  Char.toCharCode a `mod` Config.numberOfIndexParts
 getPartId _ = 0
 
 
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 1ecbc3c..5842778 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -2,81 +2,79 @@ module Docs.Search.Config where
 
 import Prelude
 
-import Docs.Search.Types (PackageName(..))
-
--- | Some magic constants.
-config ::
-  { version :: String
-  , declIndexDirectory :: String
-  , mkIndexPartLoadPath :: Int -> String
-  , mkIndexPartPath :: Int -> String
-  , moduleIndexPath :: String
-  , moduleIndexLoadPath :: String
-  , metaPath :: String
-  , metaLoadPath :: String
-  , metaItem :: String
-  , groupModulesItem :: String
-  , packageInfoPath :: String
-  , packageInfoLoadPath :: String
-  , mkShapeScriptPath :: String -> String
-  , numberOfIndexParts :: Int
-  , outputDirectory :: String
-  , penalties :: { excessiveConstraint :: Int
-                 , generalize :: Int
-                 , instantiate :: Int
-                 , match :: Int
-                 , matchConstraint :: Int
-                 , missingConstraint :: Int
-                 , rowsMismatch :: Int
-                 , typeVars :: Int
-                 }
-  , requiredDirectories :: Array String
-  , resultsCount :: Int
-  , typeIndexDirectory :: String
-  , defaultPackageName :: PackageName
+import Docs.Search.Types
+
+version :: String
+version = "0.0.9"
+
+mkShapeScriptPath :: String -> String
+mkShapeScriptPath shape = "./index/types/" <> shape <> ".js"
+
+-- | In how many parts the index should be splitted?
+numberOfIndexParts :: Int
+numberOfIndexParts = 50
+
+mkIndexPartPath :: Int -> String
+mkIndexPartPath partId = "html/index/declarations/" <> show partId <> ".js"
+
+mkIndexPartLoadPath :: Int -> String
+mkIndexPartLoadPath partId = "./index/declarations/" <> show partId <> ".js"
+
+moduleIndexPath :: String
+moduleIndexPath = "generated-docs/html/index/modules.js"
+
+-- | Used to load mode index to the browser scope.
+moduleIndexLoadPath :: String
+moduleIndexLoadPath = "./index/modules.js"
+
+typeIndexDirectory :: String
+typeIndexDirectory = "generated-docs/html/index/types"
+
+metaPath :: String
+metaPath = "generated-docs/html/index/meta.js"
+
+metaLoadPath :: URL
+metaLoadPath = URL "./index/meta.js"
+
+metaItem :: String
+metaItem = "DocsSearchMeta"
+
+-- | localStorage key to save sidebar checkbox value to.
+groupModulesItem :: String
+groupModulesItem = "PureScriptDocsSearchGroupModules"
+
+packageInfoPath :: String
+packageInfoPath = "generated-docs/html/index/packages.js"
+
+packageInfoLoadPath :: String
+packageInfoLoadPath = "./index/packages.js"
+
+-- | How many results to show by default?
+resultsCount :: Int
+resultsCount = 25
+
+-- | Penalties used to determine how "far" a type query is from a given type.
+-- See Docs.Search.TypeQuery
+penalties ::
+  { excessiveConstraint :: Int
+  , generalize :: Int
+  , instantiate :: Int
+  , match :: Int
+  , matchConstraint :: Int
+  , missingConstraint :: Int
+  , rowsMismatch :: Int
+  , typeVars :: Int
   }
-config =
-  { version: "0.0.9"
-  , outputDirectory: "output"
-  , requiredDirectories:
-    [ "generated-docs"
-    , "generated-docs/html"
-    , "output"
-    ]
-  -- ^ Directories required by IndexBuilder
-  , declIndexDirectory: "generated-docs/html/index/declarations"
-  , typeIndexDirectory: "generated-docs/html/index/types"
-  , mkShapeScriptPath:
-    \shape -> "./index/types/" <> shape <> ".js"
-  , numberOfIndexParts: 50
-  -- ^ In how many parts the index should be splitted?
-  , mkIndexPartPath:
-    \(partId :: Int) -> "html/index/declarations/" <> show partId <> ".js"
-  , mkIndexPartLoadPath:
-    \(partId :: Int) -> "./index/declarations/" <> show partId <> ".js"
-  , moduleIndexPath: "generated-docs/html/index/modules.js"
-  , moduleIndexLoadPath: "./index/modules.js"
-  -- ^ Used to load mode index to the browser scope.
-  , metaPath: "generated-docs/html/index/meta.js"
-  , metaLoadPath: "./index/meta.js"
-  , metaItem: "DocsSearchMeta"
-  , groupModulesItem: "PureScriptDocsSearchGroupModules"
-  -- ^ localStorage key to save sidebar checkbox value to.
-  , packageInfoPath: "generated-docs/html/index/packages.js"
-  , packageInfoLoadPath: "./index/packages.js"
-  -- ^ Used to load package index to the browser scope.
-  , resultsCount: 25
-  -- ^ How many results to show by default?
-  , penalties: { typeVars: 2
-               , match: 2
-               , matchConstraint: 1
-               , instantiate: 2
-               , generalize: 2
-               , rowsMismatch: 3
-               , missingConstraint: 1
-               , excessiveConstraint: 1
-               }
-  -- ^ Penalties used to determine how "far" a type query is from a given type.
-  -- See Docs.Search.TypeQuery
-  , defaultPackageName: PackageName "<local package>"
+penalties =
+  { typeVars: 2
+  , match: 2
+  , matchConstraint: 1
+  , instantiate: 2
+  , generalize: 2
+  , rowsMismatch: 3
+  , missingConstraint: 1
+  , excessiveConstraint: 1
   }
+
+defaultPackageName :: PackageName
+defaultPackageName = PackageName "<local package>"
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 14137cc..247adc4 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -1,7 +1,7 @@
 module Docs.Search.IndexBuilder where
 
 import Docs.Search.BrowserEngine (getPartId)
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Declarations (Declarations(..), mkDeclarations)
 import Docs.Search.DocsJson (DocsJson)
 import Docs.Search.Extra ((>#>))
@@ -209,7 +209,7 @@ decodeBowerJsons { bowerFiles } = do
 writeTypeIndex :: Config -> TypeIndex -> Aff Unit
 writeTypeIndex { generatedDocs } typeIndex =
   for_ entries \(Tuple typeShape results) -> do
-    writeTextFile UTF8 (config.typeIndexDirectory <> "/" <> typeShape <> ".js")
+    writeTextFile UTF8 (Config.typeIndexDirectory <> "/" <> typeShape <> ".js")
       (mkHeader typeShape <> stringify (encodeJson results))
   where
     mkHeader typeShape =
@@ -222,7 +222,7 @@ writeTypeIndex { generatedDocs } typeIndex =
 writePackageInfo :: PackageInfo -> Aff Unit
 writePackageInfo packageInfo = do
 
-  writeTextFile UTF8 config.packageInfoPath $
+  writeTextFile UTF8 Config.packageInfoPath $
     header <> stringify (encodeJson packageInfo)
 
   where
@@ -231,17 +231,17 @@ writePackageInfo packageInfo = do
 
 writeModuleIndex :: PackedModuleIndex -> Aff Unit
 writeModuleIndex moduleIndex = do
-  writeTextFile UTF8 config.moduleIndexPath $
+  writeTextFile UTF8 Config.moduleIndexPath $
     header <> stringify (encodeJson moduleIndex)
   where
     header = "window.DocsSearchModuleIndex = "
 
 writeMeta :: Meta -> Aff Unit
 writeMeta meta = do
-  writeTextFile UTF8 config.metaPath $
+  writeTextFile UTF8 Config.metaPath $
     header <> stringify (encodeJson meta)
   where
-    header = "window." <> config.metaItem <> " = "
+    header = "window." <> Config.metaItem <> " = "
 
 -- | Get a mapping from index parts to index contents.
 getIndex :: Declarations -> Map Int (Array (Tuple String (Array SearchResult)))
@@ -285,7 +285,7 @@ writeIndex { generatedDocs } = getIndex >>> \resultsMap -> do
             "// This file was generated by purescript-docs-search.\n" <>
             "window.DocsSearchIndex[\"" <> show indexPartId <> "\"] = "
 
-      writeTextFile UTF8 (generatedDocs <> config.mkIndexPartPath indexPartId) $
+      writeTextFile UTF8 (generatedDocs <> Config.mkIndexPartPath indexPartId) $
         header <> stringify (encodeJson results)
 
 
diff --git a/src/Docs/Search/Main.purs b/src/Docs/Search/Main.purs
index 2699e64..95504c1 100644
--- a/src/Docs/Search/Main.purs
+++ b/src/Docs/Search/Main.purs
@@ -5,7 +5,7 @@ import Prelude
 
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.Interactive as Interactive
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Types (PackageName(..))
 
 import Data.Generic.Rep (class Generic)
@@ -27,13 +27,13 @@ main = do
   args <- getArgs
   let defaultCommands = Search { docsFiles: defaultDocsFiles
                                , bowerFiles: defaultBowerFiles
-                               , packageName: config.defaultPackageName
+                               , packageName: Config.defaultPackageName
                                }
 
   case fromMaybe defaultCommands args of
     BuildIndex cfg -> IndexBuilder.run cfg
     Search cfg -> Interactive.run cfg
-    Version -> log config.version
+    Version -> log Config.version
 
 
 getArgs :: Effect (Maybe Commands)
@@ -143,7 +143,7 @@ packageNameOption =
   PackageName <$> strOption
   ( long "package-name"
  <> metavar "PACKAGE"
- <> value (unwrap $ config.defaultPackageName)
+ <> value (unwrap Config.defaultPackageName)
   )
 
 
diff --git a/src/Docs/Search/Meta.purs b/src/Docs/Search/Meta.purs
index bc17f78..435ddfd 100644
--- a/src/Docs/Search/Meta.purs
+++ b/src/Docs/Search/Meta.purs
@@ -1,6 +1,6 @@
 module Docs.Search.Meta where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Loader as Loader
 import Docs.Search.Types (GlobalIdentifier(..), PackageName)
 
@@ -16,6 +16,6 @@ type Meta =
 
 load :: Aff Meta
 load =
-  Loader.load (GlobalIdentifier config.metaItem) config.metaLoadPath
+  Loader.load (GlobalIdentifier Config.metaItem) Config.metaLoadPath
     `catchError` const (pure defaultMeta)
-  where defaultMeta = { localPackageName: config.defaultPackageName }
+  where defaultMeta = { localPackageName: Config.defaultPackageName }
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index 81906cd..d3162fd 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -1,6 +1,6 @@
 module Docs.Search.ModuleIndex where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Declarations (Declarations(..))
 import Docs.Search.SearchResult (SearchResult(..))
 import Docs.Search.Types (ModuleName, PackageName, PackageInfo(..), PackageScore)
@@ -107,7 +107,7 @@ mkPackedModuleIndex (Declarations trie) =
 
 loadModuleIndex :: Aff PackedModuleIndex
 loadModuleIndex = do
-  json <- toAffE $ load config.moduleIndexLoadPath
+  json <- toAffE $ load Config.moduleIndexLoadPath
   pure $ fromMaybe mempty $ hush $ decodeJson json
 
 
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index dddbd71..9f25786 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -1,6 +1,6 @@
 module Docs.Search.PackageIndex where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Extra (stringToList)
 import Docs.Search.Score (Scores, getPackageScoreForPackageName, normalizePackageName)
 import Docs.Search.Types (PackageName, RawPackageName(..), PackageScore)
@@ -73,7 +73,7 @@ mkScoresFromPackageIndex =
 
 loadPackageIndex :: Aff PackageIndex
 loadPackageIndex = do
-  json <- toAffE (load config.packageInfoLoadPath)
+  json <- toAffE (load Config.packageInfoLoadPath)
   let packageInfo = fromMaybe mempty $ hush $ decodeJson json
   pure $ mkPackageIndex packageInfo
 
diff --git a/src/Docs/Search/TypeIndex.purs b/src/Docs/Search/TypeIndex.purs
index bd0c1a3..a322064 100644
--- a/src/Docs/Search/TypeIndex.purs
+++ b/src/Docs/Search/TypeIndex.purs
@@ -1,7 +1,7 @@
 -- | Partial type index, can be loaded on demand in the browser.
 module Docs.Search.TypeIndex where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Declarations (resultsForDeclaration)
 import Docs.Search.DocsJson (DocsJson(..))
 import Docs.Search.Score (Scores)
@@ -21,7 +21,7 @@ import Data.Either (hush)
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..), fromMaybe', isJust)
-import Data.Newtype (class Newtype, unwrap, wrap)
+import Data.Newtype (class Newtype, over)
 import Effect (Effect)
 import Effect.Aff (Aff, try)
 
@@ -80,7 +80,7 @@ lookup key index@(TypeIndex map) =
   case Map.lookup key map of
     Just results -> pure { index, results: Array.fold results }
     Nothing -> do
-      eiJson <- try (toAffE (lookup_ key $ config.mkShapeScriptPath key))
+      eiJson <- try (toAffE (lookup_ key $ Config.mkShapeScriptPath key))
       pure $ fromMaybe'
         (\_ ->  { index: insert key Nothing index, results: [] })
         do
@@ -94,7 +94,7 @@ lookup key index@(TypeIndex map) =
       -> Maybe (Array SearchResult)
       -> TypeIndex
       -> TypeIndex
-    insert k v = unwrap >>> Map.insert k v >>> wrap
+    insert k v = over TypeIndex (Map.insert k v)
 
 
 query
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index a52c4c3..d3a5953 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -10,7 +10,7 @@ module Docs.Search.TypeQuery
        )
 where
 
-import Docs.Search.Config (config)
+import Docs.Search.Config as Config
 import Docs.Search.Extra (foldl1, foldr1)
 import Docs.Search.TypeDecoder (QualifiedName(..), Type(..), joinConstraints, joinRows)
 import Docs.Search.Types (Identifier(..))
@@ -302,7 +302,7 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
 penalty :: TypeQuery -> Type -> Int
 penalty typeQuery ty =
   let substs = unify typeQuery ty in
-  typeVarPenalty substs * config.penalties.typeVars +
+  typeVarPenalty substs * Config.penalties.typeVars +
   namesPenalty substs +
   mismatchPenalty substs
 
@@ -341,12 +341,12 @@ namesPenalty = go 0
     go p Nil = p
     go p (Match a b : rest)
       | a == b = go p rest
-      | otherwise = go (p + config.penalties.match) rest
+      | otherwise = go (p + Config.penalties.match) rest
     go p (MatchConstraints qcs tcs : rest)
       = let p' = Set.size (Set.union qcs tcs) -
                  Set.size (Set.intersection qcs tcs) in
-        go (p + config.penalties.matchConstraint * p') rest
-    go p (RowsMismatch n m : rest) = go (config.penalties.rowsMismatch * abs (n - m)) rest
+        go (p + Config.penalties.matchConstraint * p') rest
+    go p (RowsMismatch n m : rest) = go (Config.penalties.rowsMismatch * abs (n - m)) rest
     go p (_ : rest) = go p rest
 
 
@@ -356,11 +356,11 @@ mismatchPenalty = go 0
   where
     go n Nil = n
     go n (Instantiate q t     : rest) = go (n + typeSize t *
-                                            config.penalties.instantiate)             rest
+                                            Config.penalties.instantiate)             rest
     go n (Generalize q t      : rest) = go (n + typeQuerySize q *
-                                            config.penalties.generalize)              rest
-    go n (ExcessiveConstraint : rest) = go (n + config.penalties.excessiveConstraint) rest
-    go n (MissingConstraint   : rest) = go (n + config.penalties.missingConstraint)   rest
+                                            Config.penalties.generalize)              rest
+    go n (ExcessiveConstraint : rest) = go (n + Config.penalties.excessiveConstraint) rest
+    go n (MissingConstraint   : rest) = go (n + Config.penalties.missingConstraint)   rest
     go n (Mismatch q t        : rest) = go (n + typeQuerySize q + typeSize t)         rest
     go n (TypeMismatch t      : rest) = go (n + typeSize t)                           rest
     go n (QueryMismatch q     : rest) = go (n + typeQuerySize q)                      rest
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index 0e2c023..83d6d61 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -63,6 +63,7 @@ instance decodeJsonPackageInfo :: DecodeJson PackageInfo where
 instance encodeJsonPackageInfo :: EncodeJson PackageInfo where
   encodeJson = genericEncodeJson
 
+
 newtype PackageScore = PackageScore Int
 
 derive instance newtypePackageScore :: Newtype PackageScore _
@@ -75,7 +76,11 @@ derive newtype instance showPackageScore :: Show PackageScore
 derive newtype instance decodeJsonPackageScore :: DecodeJson PackageScore
 derive newtype instance encodeJsonPackageScore :: EncodeJson PackageScore
 
-type URL = String
+
+newtype URL = URL String
+
+derive instance newtypeURL :: Newtype URL _
+
 
 newtype GlobalIdentifier = GlobalIdentifier String
 

From 853ace81127af90028c0370f6edd322b5f63328f Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Tue, 4 Aug 2020 14:55:31 +0300
Subject: [PATCH 18/45] Add local package modules and Prim* to the sidebar More
 newtype wrappers.

---
 src/Docs/Search/App.purs           |  4 +--
 src/Docs/Search/App/Sidebar.purs   | 26 +++++++++++++------
 src/Docs/Search/BrowserEngine.purs | 17 ++++++-------
 src/Docs/Search/Config.purs        | 41 +++++++++++++++++-------------
 src/Docs/Search/Engine.purs        |  2 +-
 src/Docs/Search/IndexBuilder.purs  | 14 +++++-----
 src/Docs/Search/Meta.purs          |  4 +--
 src/Docs/Search/ModuleIndex.purs   | 25 +++++++++---------
 src/Docs/Search/PackageIndex.js    | 24 -----------------
 src/Docs/Search/PackageIndex.purs  | 19 +++-----------
 src/Docs/Search/Types.purs         | 16 +++++++++++-
 11 files changed, 92 insertions(+), 100 deletions(-)
 delete mode 100644 src/Docs/Search/PackageIndex.js

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index ca87d25..fb0067b 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -103,8 +103,8 @@ main = do
         addEventListener hashchange listener true (Window.toEventTarget win)
 
       sbio <- do
-              component <- Sidebar.mkComponent moduleIndex.packageModules isIndexHTML
-              runUI component unit sidebarContainer
+        component <- Sidebar.mkComponent moduleIndex.packageModules isIndexHTML meta
+        runUI component unit sidebarContainer
 
       -- Subscribe to window focus events
       H.liftEffect do
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index 5d19b27..4b53781 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -1,8 +1,9 @@
 module Docs.Search.App.Sidebar where
 
 import Docs.Search.Config as Config
+import Docs.Search.Meta (Meta)
 import Docs.Search.ModuleIndex (PackedModuleIndex)
-import Docs.Search.Types (ModuleName, PackageName(..))
+import Docs.Search.Types (ModuleName, PackageInfo(..), PackageName)
 
 import Prelude
 
@@ -43,10 +44,11 @@ data IsIndexHTML = IsIndexHTML | NotIndexHTML
 
 derive instance isIndexHTMLEq :: Eq IsIndexHTML
 
-type State = { moduleIndex :: Map PackageName (Set ModuleName)
+type State = { moduleIndex :: Map PackageInfo (Set ModuleName)
              , groupingMode :: GroupingMode
              , moduleNames :: Array ModuleName
              , isIndexHTML :: IsIndexHTML
+             , localPackageName :: PackageName
              }
 
 
@@ -54,8 +56,9 @@ mkComponent
   :: forall i
   .  PackedModuleIndex
   -> IsIndexHTML
+  -> Meta
   -> Aff (H.Component HH.HTML Query i Action Aff)
-mkComponent moduleIndex isIndexHTML = do
+mkComponent moduleIndex isIndexHTML { localPackageName } = do
   groupingMode <- H.liftEffect loadGroupingModeFromLocalStorage
   pure $
     H.mkComponent
@@ -63,6 +66,7 @@ mkComponent moduleIndex isIndexHTML = do
                             , groupingMode
                             , moduleNames
                             , isIndexHTML
+                            , localPackageName
                             }
       , render
       , eval: H.mkEval $ H.defaultEval { handleAction = handleAction
@@ -105,7 +109,7 @@ render
   :: forall m
   .  State
   -> H.ComponentHTML Action () m
-render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
+render { moduleIndex, groupingMode, moduleNames, isIndexHTML, localPackageName } =
 
   HH.div [ HP.classes [ wrap "col"
                       , wrap $ if isIndexHTML == IsIndexHTML
@@ -133,10 +137,16 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
   ]
   where
 
-    renderPackageEntry (PackageName packageName /\ modules) =
+    renderPackageEntry (package /\ modules) =
       HH.li [ HP.classes [ wrap "li-package" ] ]
-      [ HH.details_
-        [ HH.summary_ [ HH.text packageName ]
+      [ HH.details_ $
+        [ HH.summary_ [ HH.text $
+                        case package of
+                          Package packageName -> unwrap packageName
+                          LocalPackage -> unwrap localPackageName
+                          Builtin -> "Built-in"
+                          UnknownPackage -> "Unknown package"
+                      ]
         , HH.ul_ $ Set.toUnfoldable modules <#> renderModuleName
         ]
       ]
@@ -147,7 +157,7 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML } =
         [ HH.text $ unwrap moduleName ]
       ]
 
-    packageList :: Array (PackageName /\ Set ModuleName)
+    packageList :: Array (PackageInfo /\ Set ModuleName)
     packageList = Map.toUnfoldable moduleIndex
 
 
diff --git a/src/Docs/Search/BrowserEngine.purs b/src/Docs/Search/BrowserEngine.purs
index b3af249..d71c212 100644
--- a/src/Docs/Search/BrowserEngine.purs
+++ b/src/Docs/Search/BrowserEngine.purs
@@ -7,6 +7,7 @@ import Docs.Search.Engine (Engine, EngineState, Index)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeIndex (TypeIndex)
 import Docs.Search.TypeIndex as TypeIndex
+import Docs.Search.Types (PartId(..), URL)
 import Docs.Search.ModuleIndex as ModuleIndex
 
 import Prelude
@@ -32,7 +33,7 @@ import Effect.Aff (Aff, try)
 
 
 newtype PartialIndex
-  = PartialIndex (Map Int Index)
+  = PartialIndex (Map PartId Index)
 
 derive instance newtypePartialIndex :: Newtype PartialIndex _
 derive newtype instance semigroupPartialIndex :: Semigroup PartialIndex
@@ -52,13 +53,11 @@ query
   -> Aff { index :: PartialIndex, results :: Array SearchResult }
 query index@(PartialIndex indexMap) input = do
   let
-    path :: List Char
     path =
       List.fromFoldable $
       String.toCharArray $
       input
 
-    partId :: Int
     partId = getPartId path
 
   case Map.lookup partId indexMap of
@@ -119,16 +118,16 @@ browserSearchEngine =
 
 
 -- | Find in which part of the index this path can be found.
-getPartId :: List Char -> Int
+getPartId :: List Char -> PartId
 getPartId (a : b : _) =
-  (Char.toCharCode a + Char.toCharCode b) `mod` Config.numberOfIndexParts
+  PartId $ (Char.toCharCode a + Char.toCharCode b) `mod` Config.numberOfIndexParts
 getPartId (a : _) =
-  Char.toCharCode a `mod` Config.numberOfIndexParts
-getPartId _ = 0
+  PartId $ Char.toCharCode a `mod` Config.numberOfIndexParts
+getPartId _ = PartId 0
 
 
 -- | Load a part of the index by injecting a <script> tag into the DOM.
 foreign import loadIndex_
- :: Int
- -> String
+ :: PartId
+ -> URL
  -> Effect (Promise Json)
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 5842778..5fa6c53 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -1,8 +1,10 @@
 module Docs.Search.Config where
 
+import Docs.Search.Types (GlobalIdentifier, PackageName, PartId, URL, FilePath)
+
 import Prelude
 
-import Docs.Search.Types
+import Data.Newtype (wrap)
 
 version :: String
 version = "0.0.9"
@@ -14,40 +16,43 @@ mkShapeScriptPath shape = "./index/types/" <> shape <> ".js"
 numberOfIndexParts :: Int
 numberOfIndexParts = 50
 
-mkIndexPartPath :: Int -> String
+mkIndexPartPath :: PartId -> String
 mkIndexPartPath partId = "html/index/declarations/" <> show partId <> ".js"
 
-mkIndexPartLoadPath :: Int -> String
-mkIndexPartLoadPath partId = "./index/declarations/" <> show partId <> ".js"
+mkIndexPartLoadPath :: PartId -> URL
+mkIndexPartLoadPath partId = wrap $ "./index/declarations/" <> show partId <> ".js"
 
-moduleIndexPath :: String
-moduleIndexPath = "generated-docs/html/index/modules.js"
+moduleIndexPath :: FilePath
+moduleIndexPath = wrap "generated-docs/html/index/modules.js"
 
 -- | Used to load mode index to the browser scope.
 moduleIndexLoadPath :: String
 moduleIndexLoadPath = "./index/modules.js"
 
-typeIndexDirectory :: String
-typeIndexDirectory = "generated-docs/html/index/types"
+typeIndexDirectory :: FilePath
+typeIndexDirectory = wrap "generated-docs/html/index/types"
 
-metaPath :: String
-metaPath = "generated-docs/html/index/meta.js"
+metaPath :: FilePath
+metaPath = wrap "generated-docs/html/index/meta.js"
 
 metaLoadPath :: URL
-metaLoadPath = URL "./index/meta.js"
+metaLoadPath = wrap "./index/meta.js"
 
-metaItem :: String
-metaItem = "DocsSearchMeta"
+metaItem :: GlobalIdentifier
+metaItem = wrap "DocsSearchMeta"
 
 -- | localStorage key to save sidebar checkbox value to.
 groupModulesItem :: String
 groupModulesItem = "PureScriptDocsSearchGroupModules"
 
-packageInfoPath :: String
-packageInfoPath = "generated-docs/html/index/packages.js"
+packageInfoPath :: FilePath
+packageInfoPath = wrap "generated-docs/html/index/packages.js"
+
+packageInfoItem :: GlobalIdentifier
+packageInfoItem = wrap "DocsSearchPackageIndex"
 
-packageInfoLoadPath :: String
-packageInfoLoadPath = "./index/packages.js"
+packageInfoLoadPath :: URL
+packageInfoLoadPath = wrap "./index/packages.js"
 
 -- | How many results to show by default?
 resultsCount :: Int
@@ -77,4 +82,4 @@ penalties =
   }
 
 defaultPackageName :: PackageName
-defaultPackageName = PackageName "<local package>"
+defaultPackageName = wrap "<local package>"
diff --git a/src/Docs/Search/Engine.purs b/src/Docs/Search/Engine.purs
index c5e4cec..3a6b8f4 100644
--- a/src/Docs/Search/Engine.purs
+++ b/src/Docs/Search/Engine.purs
@@ -77,7 +77,7 @@ getResultPackageInfo :: Result -> PackageInfo
 getResultPackageInfo (DeclResult r) = (unwrap r).packageInfo
 getResultPackageInfo (TypeResult r) = (unwrap r).packageInfo
 getResultPackageInfo (PackResult r) = Package r.name
-getResultPackageInfo (MdlResult r) = Package $ r.package
+getResultPackageInfo (MdlResult r) = r.package
 
 
 getResultModuleName :: Result -> ModuleName
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 247adc4..336550f 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -10,7 +10,7 @@ import Docs.Search.PackageIndex (PackageInfo, mkPackageInfo)
 import Docs.Search.Score (mkScores)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeIndex (TypeIndex, mkTypeIndex)
-import Docs.Search.Types (PackageName)
+import Docs.Search.Types (PackageName, PartId)
 import Docs.Search.Meta (Meta)
 
 import Prelude
@@ -209,7 +209,7 @@ decodeBowerJsons { bowerFiles } = do
 writeTypeIndex :: Config -> TypeIndex -> Aff Unit
 writeTypeIndex { generatedDocs } typeIndex =
   for_ entries \(Tuple typeShape results) -> do
-    writeTextFile UTF8 (Config.typeIndexDirectory <> "/" <> typeShape <> ".js")
+    writeTextFile UTF8 (unwrap Config.typeIndexDirectory <> "/" <> typeShape <> ".js")
       (mkHeader typeShape <> stringify (encodeJson results))
   where
     mkHeader typeShape =
@@ -222,7 +222,7 @@ writeTypeIndex { generatedDocs } typeIndex =
 writePackageInfo :: PackageInfo -> Aff Unit
 writePackageInfo packageInfo = do
 
-  writeTextFile UTF8 Config.packageInfoPath $
+  writeTextFile UTF8 (unwrap Config.packageInfoPath) $
     header <> stringify (encodeJson packageInfo)
 
   where
@@ -231,20 +231,20 @@ writePackageInfo packageInfo = do
 
 writeModuleIndex :: PackedModuleIndex -> Aff Unit
 writeModuleIndex moduleIndex = do
-  writeTextFile UTF8 Config.moduleIndexPath $
+  writeTextFile UTF8 (unwrap Config.moduleIndexPath) $
     header <> stringify (encodeJson moduleIndex)
   where
     header = "window.DocsSearchModuleIndex = "
 
 writeMeta :: Meta -> Aff Unit
 writeMeta meta = do
-  writeTextFile UTF8 Config.metaPath $
+  writeTextFile UTF8 (unwrap Config.metaPath) $
     header <> stringify (encodeJson meta)
   where
-    header = "window." <> Config.metaItem <> " = "
+    header = "window." <> unwrap Config.metaItem <> " = "
 
 -- | Get a mapping from index parts to index contents.
-getIndex :: Declarations -> Map Int (Array (Tuple String (Array SearchResult)))
+getIndex :: Declarations -> Map PartId (Array (Tuple String (Array SearchResult)))
 getIndex (Declarations trie) =
   Array.foldr insert mempty parts
     where
diff --git a/src/Docs/Search/Meta.purs b/src/Docs/Search/Meta.purs
index 435ddfd..40e9d7a 100644
--- a/src/Docs/Search/Meta.purs
+++ b/src/Docs/Search/Meta.purs
@@ -2,7 +2,7 @@ module Docs.Search.Meta where
 
 import Docs.Search.Config as Config
 import Docs.Search.Loader as Loader
-import Docs.Search.Types (GlobalIdentifier(..), PackageName)
+import Docs.Search.Types (PackageName)
 
 import Prelude
 
@@ -16,6 +16,6 @@ type Meta =
 
 load :: Aff Meta
 load =
-  Loader.load (GlobalIdentifier Config.metaItem) Config.metaLoadPath
+  Loader.load Config.metaItem Config.metaLoadPath
     `catchError` const (pure defaultMeta)
   where defaultMeta = { localPackageName: Config.defaultPackageName }
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index d3162fd..aae9fda 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -3,9 +3,9 @@ module Docs.Search.ModuleIndex where
 import Docs.Search.Config as Config
 import Docs.Search.Declarations (Declarations(..))
 import Docs.Search.SearchResult (SearchResult(..))
-import Docs.Search.Types (ModuleName, PackageName, PackageInfo(..), PackageScore)
+import Docs.Search.Types (ModuleName, PackageInfo, PackageScore)
 import Docs.Search.Extra (stringToList)
-import Docs.Search.Score (Scores, getPackageScoreForPackageName)
+import Docs.Search.Score (Scores, getPackageScore)
 
 import Prelude
 
@@ -38,18 +38,18 @@ import Effect.Aff (Aff)
 
 
 -- | Module index that is actually stored in a JS file.
-type PackedModuleIndex = Map PackageName (Set ModuleName)
+type PackedModuleIndex = Map PackageInfo (Set ModuleName)
 
 -- | "Expanded" module index that can be queried quickly.
-type ModuleIndex = { packageModules :: Map PackageName (Set ModuleName)
-                   , modulePackages :: Map ModuleName PackageName
+type ModuleIndex = { packageModules :: Map PackageInfo (Set ModuleName)
+                   , modulePackages :: Map ModuleName PackageInfo
                    , index :: Trie Char ModuleName
                    }
 
 
 type ModuleResult
   = { name :: ModuleName
-    , package :: PackageName
+    , package :: PackageInfo
     , score :: PackageScore
     }
 
@@ -58,9 +58,9 @@ unpackModuleIndex :: PackedModuleIndex -> ModuleIndex
 unpackModuleIndex packageModules =
   flip execState { packageModules, modulePackages: mempty, index: mempty } do
     for_ (Map.toUnfoldableUnordered packageModules :: Array _)
-      \(packageName /\ moduleNames) -> do
+      \(package /\ moduleNames) -> do
         for_ moduleNames \moduleName -> do
-          modify_ $ _modulePackages %~ Map.insert moduleName packageName
+          modify_ $ _modulePackages %~ Map.insert moduleName package
           for_ (extractModuleNameParts moduleName) \part -> do
             let partPath = Array.toUnfoldable $ String.toCharArray part
             modify_ $ _index %~ Trie.insert partPath moduleName
@@ -87,7 +87,7 @@ queryModuleIndex scores { index, modulePackages } query =
   (\name -> do
       package <- Map.lookup name modulePackages
       pure { name, package
-           , score: getPackageScoreForPackageName scores package }) #
+           , score: getPackageScore scores package }) #
   Array.catMaybes
 
 
@@ -98,12 +98,11 @@ mkPackedModuleIndex (Declarations trie) =
   where
     extract
       :: List SearchResult
-      -> Map PackageName (Set ModuleName)
+      -> Map PackageInfo (Set ModuleName)
     extract = foldr (Map.unionWith Set.union) mempty <<< map mkEntry
       where
-        mkEntry (SearchResult { packageInfo: Package packageName, moduleName }) =
-          Map.singleton packageName (Set.singleton moduleName)
-        mkEntry _ = mempty
+        mkEntry (SearchResult { packageInfo, moduleName }) =
+          Map.singleton packageInfo (Set.singleton moduleName)
 
 loadModuleIndex :: Aff PackedModuleIndex
 loadModuleIndex = do
diff --git a/src/Docs/Search/PackageIndex.js b/src/Docs/Search/PackageIndex.js
deleted file mode 100644
index a68a8a6..0000000
--- a/src/Docs/Search/PackageIndex.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/* global exports */
-
-exports.load = function (url) {
-  return function () {
-    return new Promise(function (resolve, reject) {
-      if (typeof window.DocsSearchPackageIndex === 'undefined') {
-        var script = document.createElement('script');
-        script.type = 'text/javascript';
-        script.src = url;
-        script.addEventListener('load', function () {
-          if (typeof window.DocsSearchPackageIndex === 'undefined') {
-            reject(new Error("Couldn't load package index."));
-          } else {
-            resolve(window.DocsSearchPackageIndex);
-          }
-        });
-        script.addEventListener('error', reject);
-        document.body.appendChild(script);
-      } else {
-        resolve(window.DocsSearchPackageIndex);
-      }
-    });
-  };
-};
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index 9f25786..0d16f03 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -4,21 +4,17 @@ import Docs.Search.Config as Config
 import Docs.Search.Extra (stringToList)
 import Docs.Search.Score (Scores, getPackageScoreForPackageName, normalizePackageName)
 import Docs.Search.Types (PackageName, RawPackageName(..), PackageScore)
+import Docs.Search.Loader as Loader
 
 import Prelude
 
-import Control.Promise (Promise, toAffE)
-import Data.Argonaut.Core (Json)
-import Data.Argonaut.Decode (decodeJson)
 import Data.Array as Array
-import Data.Either (hush)
 import Data.Map (Map)
 import Data.Map as Map
-import Data.Maybe (Maybe, fromMaybe)
+import Data.Maybe (Maybe)
 import Data.Newtype (unwrap)
 import Data.Search.Trie (Trie)
 import Data.Search.Trie as Trie
-import Effect (Effect)
 import Effect.Aff (Aff)
 import Web.Bower.PackageMeta (PackageMeta(..))
 
@@ -72,10 +68,8 @@ mkScoresFromPackageIndex =
 
 
 loadPackageIndex :: Aff PackageIndex
-loadPackageIndex = do
-  json <- toAffE (load Config.packageInfoLoadPath)
-  let packageInfo = fromMaybe mempty $ hush $ decodeJson json
-  pure $ mkPackageIndex packageInfo
+loadPackageIndex =
+  mkPackageIndex <$> Loader.load Config.packageInfoItem Config.packageInfoLoadPath
 
 
 mkPackageIndex :: PackageInfo -> PackageIndex
@@ -97,8 +91,3 @@ queryPackageIndex index query =
   pure { index
        , results: Array.fromFoldable $ Trie.queryValues (stringToList query) index
        }
-
-
-foreign import load
-  :: String
-  -> Effect (Promise Json)
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index 83d6d61..6c7c36e 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -50,7 +50,7 @@ derive newtype instance encodeJsonPackageName :: EncodeJson PackageName
 derive instance genericPackageName :: Generic PackageName _
 
 
-data PackageInfo = Package PackageName | Builtin | LocalPackage | UnknownPackage
+data PackageInfo = LocalPackage | Builtin | Package PackageName | UnknownPackage
 
 derive instance eqPackageInfo :: Eq PackageInfo
 derive instance ordPackageInfo :: Ord PackageInfo
@@ -80,8 +80,22 @@ derive newtype instance encodeJsonPackageScore :: EncodeJson PackageScore
 newtype URL = URL String
 
 derive instance newtypeURL :: Newtype URL _
+derive newtype instance showURL :: Show URL
 
+newtype FilePath = FilePath String
+
+derive instance newtypeFilePath :: Newtype FilePath _
+derive newtype instance showFilePath :: Show FilePath
 
 newtype GlobalIdentifier = GlobalIdentifier String
 
 derive instance newtypeGlobalIdentifier :: Newtype GlobalIdentifier _
+derive newtype instance showGlobalIdentifier :: Show GlobalIdentifier
+
+
+newtype PartId = PartId Int
+
+derive instance newtypePartId :: Newtype PartId _
+derive newtype instance eqPartId :: Eq PartId
+derive newtype instance ordPartId :: Ord PartId
+derive newtype instance showPartId :: Show PartId

From 226fc3855571bbe4b04416a3bc02a7d04c397604 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Thu, 6 Aug 2020 11:34:37 +0300
Subject: [PATCH 19/45] Add puppeteer tests

---
 package.json      |  3 ++-
 packages.dhall    | 14 +++++++++-
 spago.dhall       |  1 +
 test/Main.purs    |  2 ++
 test/Test/UI.purs | 67 +++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 test/Test/UI.purs

diff --git a/package.json b/package.json
index 45b5abd..73d6cd6 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "spago test && npm run check-version",
+    "test": "spago docs --no-search && ./dist/purescript-docs-search build-index && spago test && npm run check-version",
     "bundle-app": "spago bundle-app --no-build --no-install -m Docs.Search.App --to dist/docs-search-app.js",
     "parcel-app": "parcel build --no-source-maps --target browser --out-file dist/docs-search-app.js dist/docs-search-app.js",
     "build-app": "npm run bundle-app && npm run parcel-app",
@@ -47,6 +47,7 @@
     "glob": "^7.1.6",
     "markdown-it": "^11.0.0",
     "parcel": "^1.12.4",
+    "puppeteer": "^5.2.1",
     "spago": "^0.15.3"
   }
 }
diff --git a/packages.dhall b/packages.dhall
index e57d76a..d174d25 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -4,7 +4,7 @@ let mkPackage =
 let upstream =
       https://github.com/purescript/package-sets/releases/download/psc-0.13.8/packages.dhall sha256:0e95ec11604dc8afc1b129c4d405dcc17290ce56d7d0665a0ff15617e32bbf03
 
-let overrides = { metadata = upstream.metadata // { version = "v0.13.0" } }
+let overrides = {=}
 
 let additions =
       { halogen =
@@ -89,6 +89,18 @@ let additions =
             ]
             "https://github.com/klntsky/purescript-bower-json.git"
             "v1.0.0"
+      , toppokki =
+          mkPackage
+            [ "prelude"
+            , "record"
+            , "functions"
+            , "node-http"
+            , "aff-promise"
+            , "node-buffer"
+            , "node-fs-aff"
+            ]
+            "https://github.com/justinwoo/purescript-toppokki.git"
+            "v2.4.0"
       }
 
 in  upstream // overrides // additions
diff --git a/spago.dhall b/spago.dhall
index 2504af6..e4ce62e 100644
--- a/spago.dhall
+++ b/spago.dhall
@@ -36,6 +36,7 @@
     , "test-unit"
     , "web-dom"
     , "web-html"
+    , "toppokki"
     , "web-storage"
     ]
 , packages =
diff --git a/test/Main.purs b/test/Main.purs
index 84157a1..240ec82 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -8,6 +8,7 @@ import Test.TypeQuery as TypeQuery
 import Test.IndexBuilder as IndexBuilder
 import Test.Declarations as Declarations
 import Test.ModuleIndex as ModuleIndex
+import Test.UI as UI
 
 import Test.Extra (assertRight)
 
@@ -24,6 +25,7 @@ import Test.Unit.Main (runTest)
 main :: Effect Unit
 main = do
   runTest mainTest
+  UI.main
 
 mainTest :: TestSuite
 mainTest = do
diff --git a/test/Test/UI.purs b/test/Test/UI.purs
new file mode 100644
index 0000000..b290c9d
--- /dev/null
+++ b/test/Test/UI.purs
@@ -0,0 +1,67 @@
+module Test.UI where
+
+import Prelude
+
+import Data.Array as Array
+import Data.Foldable (for_)
+import Data.Newtype (unwrap)
+import Effect (Effect)
+import Effect.Aff (Aff, launchAff_)
+import Effect.Class (liftEffect)
+import Effect.Console as Console
+import Foreign (Foreign)
+import Foreign as Foreign
+import Node.FS.Sync (realpath)
+import Test.Unit.Assert as Assert
+import Toppokki as T
+
+
+main :: Effect Unit
+main = launchAff_ do
+  path <- liftEffect $ realpath "."
+
+  let indexHTML  = T.URL $ "file://" <> path <> "/generated-docs/html/index.html"
+      prim       = T.URL $ "file://" <> path <> "/generated-docs/html/Prim.html"
+      docsSearch = T.URL $ "file://" <> path <> "/generated-docs/html/Docs.Search.App.html"
+
+  for_ [ indexHTML, prim, docsSearch ] \url -> do
+    withPage url \page -> do
+      void $ T.pageWaitForSelector (T.Selector "#group-modules__label") { timeout: 10000 } page
+    log $ "has module grouping:                  " <> unwrap url
+
+    withPage url \page -> do
+      T.keyboardPress (T.KeyboardKey "s") {} page
+      void $ T.keyboardType "slice" {} page
+      T.keyboardPress (T.KeyboardKey "Enter") {} page
+      void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
+    log $ "has working search field:             " <> unwrap url
+
+    withPage url \page -> do
+      T.keyboardPress (T.KeyboardKey "s") {} page
+      void $ T.keyboardType "a -> b" {} page
+      T.keyboardPress (T.KeyboardKey "Enter") {} page
+      void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
+      arr <- readStringArray <$> T.unsafeEvaluateStringFunction getResultTitlesCode page
+      Assert.assert "resulting array contains unsafeCoerce" (Array.elem "unsafeCoerce" arr)
+    log $ "is able to find unsafeCoerce by type: " <> unwrap url
+
+    withPage (T.URL $ unwrap url <> "#search:unsafeCoerce") \page -> do
+      void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
+      arr <- readStringArray <$> T.unsafeEvaluateStringFunction getResultTitlesCode page
+      Assert.assert "resulting array contains unsafeCoerce" (Array.elem "unsafeCoerce" arr)
+    log $ "can read URI hash:                    " <> unwrap url
+
+  where
+    log = liftEffect <<< Console.log
+    getResultTitlesCode = "[].map.call(document.querySelectorAll('.result__title'), el => el.textContent)"
+    readStringArray :: Foreign -> Array String
+    readStringArray = Foreign.unsafeFromForeign
+
+
+withPage :: forall a. T.URL -> (T.Page -> Aff a) -> Aff Unit
+withPage url f = do
+  browser <- T.launch {}
+  page <- T.newPage browser
+  T.goto url page
+  void $ f page
+  T.close browser

From 50777fa3a18f97c2268123ad1ed06be32626bbfa Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Thu, 6 Aug 2020 11:40:17 +0300
Subject: [PATCH 20/45] Update CHANGELOG

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac8cad1..dc68398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+New features:
+- Add `--package-name` flag to allow passing local package name.
+
+Changes:
+- Group modules by default.
+- Add local package modules and `Prim*` modules to the sidebar.
+- UI tests, using [purescript-toppokki](https://github.com/justinwoo/purescript-toppokki/).
+
 ## [0.0.9 - 2020-07-29]
 
 New features:

From abbc2b3e428e84fb5518ac5f030cb8cc989330a1 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Fri, 7 Aug 2020 09:49:39 +0300
Subject: [PATCH 21/45] Expand current package in the sidebar.

---
 src/Docs/Search/App.purs         |  2 +-
 src/Docs/Search/App/Sidebar.purs | 75 ++++++++++++++++++++++++--------
 2 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index fb0067b..1c8f470 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -103,7 +103,7 @@ main = do
         addEventListener hashchange listener true (Window.toEventTarget win)
 
       sbio <- do
-        component <- Sidebar.mkComponent moduleIndex.packageModules isIndexHTML meta
+        component <- Sidebar.mkComponent moduleIndex isIndexHTML meta
         runUI component unit sidebarContainer
 
       -- Subscribe to window focus events
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index 4b53781..dbc82d1 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -2,8 +2,8 @@ module Docs.Search.App.Sidebar where
 
 import Docs.Search.Config as Config
 import Docs.Search.Meta (Meta)
-import Docs.Search.ModuleIndex (PackedModuleIndex)
-import Docs.Search.Types (ModuleName, PackageInfo(..), PackageName)
+import Docs.Search.ModuleIndex (ModuleIndex)
+import Docs.Search.Types (ModuleName(..), PackageInfo(..), PackageName)
 
 import Prelude
 
@@ -13,7 +13,7 @@ import Data.Lens.Record (prop)
 import Data.List (foldr)
 import Data.Map (Map)
 import Data.Map as Map
-import Data.Maybe (Maybe(..), isJust)
+import Data.Maybe (Maybe(..), isJust, fromMaybe)
 import Data.Newtype (wrap, unwrap)
 import Data.Set (Set)
 import Data.Set as Set
@@ -28,6 +28,12 @@ import Halogen.HTML.Properties as HP
 import Web.HTML as HTML
 import Web.HTML.Window as Window
 import Web.Storage.Storage as Storage
+import Web.DOM.Document as Document
+import Web.DOM.Element as Element
+import Web.HTML.HTMLDocument as HTMLDocument
+import Web.DOM.ParentNode as ParentNode
+import Data.Traversable (traverse)
+import Web.DOM.Node as Node
 
 
 data Action = ToggleGrouping GroupingMode
@@ -44,29 +50,33 @@ data IsIndexHTML = IsIndexHTML | NotIndexHTML
 
 derive instance isIndexHTMLEq :: Eq IsIndexHTML
 
-type State = { moduleIndex :: Map PackageInfo (Set ModuleName)
+type State = { packageModules :: Map PackageInfo (Set ModuleName)
              , groupingMode :: GroupingMode
              , moduleNames :: Array ModuleName
              , isIndexHTML :: IsIndexHTML
              , localPackageName :: PackageName
+             , currentPackage :: PackageInfo
              }
 
 
 mkComponent
   :: forall i
-  .  PackedModuleIndex
+  .  ModuleIndex
   -> IsIndexHTML
   -> Meta
   -> Aff (H.Component HH.HTML Query i Action Aff)
-mkComponent moduleIndex isIndexHTML { localPackageName } = do
+mkComponent moduleIndex@{ packageModules } isIndexHTML { localPackageName } = do
   groupingMode <- H.liftEffect loadGroupingModeFromLocalStorage
+  mbModuleName <- H.liftEffect getCurrentModuleName
+  let currentPackage = getCurrentPackage moduleIndex mbModuleName
   pure $
     H.mkComponent
-      { initialState: const { moduleIndex
+      { initialState: const { packageModules
                             , groupingMode
                             , moduleNames
                             , isIndexHTML
                             , localPackageName
+                            , currentPackage
                             }
       , render
       , eval: H.mkEval $ H.defaultEval { handleAction = handleAction
@@ -74,7 +84,9 @@ mkComponent moduleIndex isIndexHTML { localPackageName } = do
                                        }
       }
   where
-    moduleNames = Array.sort $ Array.fromFoldable $ foldr Set.union mempty moduleIndex
+    moduleNames =
+      Array.sort $ Array.fromFoldable $
+      foldr Set.union mempty moduleIndex.packageModules
 
 
 handleAction
@@ -109,10 +121,10 @@ render
   :: forall m
   .  State
   -> H.ComponentHTML Action () m
-render { moduleIndex, groupingMode, moduleNames, isIndexHTML, localPackageName } =
+render state@{ groupingMode, moduleNames, localPackageName } =
 
   HH.div [ HP.classes [ wrap "col"
-                      , wrap $ if isIndexHTML == IsIndexHTML
+                      , wrap $ if state.isIndexHTML == IsIndexHTML
                                then "col--main"
                                else "col--aside"
                       ]
@@ -139,17 +151,26 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML, localPackageName }
 
     renderPackageEntry (package /\ modules) =
       HH.li [ HP.classes [ wrap "li-package" ] ]
-      [ HH.details_ $
-        [ HH.summary_ [ HH.text $
-                        case package of
-                          Package packageName -> unwrap packageName
-                          LocalPackage -> unwrap localPackageName
-                          Builtin -> "Built-in"
-                          UnknownPackage -> "Unknown package"
-                      ]
+      [ HH.details
+        (if isCurrentPackage then [ HP.attr (wrap "open") "" ] else [])
+        [ HH.summary_
+          [ HH.text $
+            case package of
+              Package packageName -> unwrap packageName
+              LocalPackage -> unwrap localPackageName
+              Builtin -> "Built-in"
+              UnknownPackage -> "Unknown package"
+          ]
         , HH.ul_ $ Set.toUnfoldable modules <#> renderModuleName
         ]
       ]
+      where
+
+        isCurrentPackage =
+          state.currentPackage == package &&
+          -- If we don't know which package we are in, we don't want to expand
+          -- "Unknown package" section
+          state.currentPackage /= UnknownPackage
 
     renderModuleName moduleName =
       HH.li_
@@ -158,7 +179,7 @@ render { moduleIndex, groupingMode, moduleNames, isIndexHTML, localPackageName }
       ]
 
     packageList :: Array (PackageInfo /\ Set ModuleName)
-    packageList = Map.toUnfoldable moduleIndex
+    packageList = Map.toUnfoldable state.packageModules
 
 
 -- | Decide whether to group modules by package in the sidebar, using localStorage.
@@ -170,6 +191,22 @@ loadGroupingModeFromLocalStorage = do
   pure $ if isJust mbDontGroupModules then DontGroup else GroupByPackage
 
 
+-- | Extract current module name from page title element.
+getCurrentModuleName :: Effect (Maybe ModuleName)
+getCurrentModuleName = do
+  win <- HTML.window
+  docPN <- Document.toParentNode <$> HTMLDocument.toDocument <$> Window.document win
+  mbPageTitleEl <- ParentNode.querySelector (wrap ".page-title__title") docPN
+  map ModuleName <$> traverse (Node.textContent <<< Element.toNode) mbPageTitleEl
+
+
+-- | Given a module name, get `PackageInfo` for a package this module name belongs to.
+getCurrentPackage :: ModuleIndex -> Maybe ModuleName -> PackageInfo
+getCurrentPackage { modulePackages } (Just moduleName) =
+  fromMaybe UnknownPackage $ Map.lookup moduleName modulePackages
+getCurrentPackage { modulePackages } Nothing = UnknownPackage
+
+
 -- | Convert checkbox status to sidebar mode
 isCheckedToGroupingMode :: Boolean -> GroupingMode
 isCheckedToGroupingMode = if _ then GroupByPackage else DontGroup

From 14ff0105d29a58aee4e58e55f70208905ef15624 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Fri, 7 Aug 2020 17:01:03 +0300
Subject: [PATCH 22/45] Upgrade package-set, use newer bower-json.

---
 packages.dhall                    | 17 +--------------
 src/Docs/Search/DocsJson.purs     | 17 +++++++++------
 src/Docs/Search/IndexBuilder.purs |  7 +++++--
 src/Docs/Search/Loader.purs       |  3 ++-
 src/Docs/Search/TypeDecoder.purs  | 35 +++++++++++++++----------------
 5 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/packages.dhall b/packages.dhall
index d174d25..07d7bab 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -2,7 +2,7 @@ let mkPackage =
       https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8/packages.dhall sha256:0e95ec11604dc8afc1b129c4d405dcc17290ce56d7d0665a0ff15617e32bbf03
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200724/packages.dhall sha256:bb941d30820a49345a0e88937094d2b9983d939c9fd3a46969b85ce44953d7d9
 
 let overrides = {=}
 
@@ -74,21 +74,6 @@ let additions =
             [ "markdown-it", "html-parser-halogen" ]
             "https://github.com/nonbili/purescript-markdown-it-halogen.git"
             "08c9625015bf04214be14e45230e8ce12f3fa2bf"
-      , bower-json =
-          mkPackage
-            [ "prelude"
-            , "generics-rep"
-            , "maybe"
-            , "arrays"
-            , "either"
-            , "newtype"
-            , "tuples"
-            , "foldable-traversable"
-            , "argonaut-codecs"
-            , "foreign-object"
-            ]
-            "https://github.com/klntsky/purescript-bower-json.git"
-            "v1.0.0"
       , toppokki =
           mkPackage
             [ "prelude"
diff --git a/src/Docs/Search/DocsJson.purs b/src/Docs/Search/DocsJson.purs
index 680d98a..b69b1ce 100644
--- a/src/Docs/Search/DocsJson.purs
+++ b/src/Docs/Search/DocsJson.purs
@@ -7,6 +7,7 @@ import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, Type, TypeArgument)
 
 import Data.Argonaut.Core (fromString, stringify, toString)
 import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:), (.:?))
+import Data.Argonaut.Decode.Error (JsonDecodeError(..))
 import Data.Argonaut.Encode (class EncodeJson, encodeJson)
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
@@ -151,7 +152,7 @@ instance encodeJsonDeclType :: EncodeJson DeclType where
 instance decodeJsonDeclType :: DecodeJson DeclType where
   decodeJson json =
     case toString json of
-      Nothing     -> Left $ "Couldn't decode DeclType: " <> stringify json
+      Nothing     -> errorWith $ "Couldn't decode DeclType: " <> stringify json
       Just string ->
         case string of
           "value"       -> Right DeclValue
@@ -161,7 +162,7 @@ instance decodeJsonDeclType :: DecodeJson DeclType where
           "typeClass"   -> Right DeclTypeClass
           "alias"       -> Right DeclAlias
           "kind"        -> Right DeclExternKind
-          _             -> Left $ "Couldn't decode DeclType: " <> string
+          _             -> errorWith $ "Couldn't decode DeclType: " <> string
 
 
 data ChildDeclType
@@ -184,13 +185,13 @@ instance encodeJsonChildDeclType :: EncodeJson ChildDeclType where
 instance decodeJsonChildDeclType :: DecodeJson ChildDeclType where
   decodeJson json =
     case toString json of
-      Nothing     -> Left $ "Couldn't decode ChildDeclType: " <> stringify json
+      Nothing     -> errorWith $ "Couldn't decode ChildDeclType: " <> stringify json
       Just tag ->
         case tag of
           "instance" -> Right ChildDeclInstance
           "dataConstructor" -> Right ChildDeclDataConstructor
           "typeClassMember" -> Right ChildDeclTypeClassMember
-          _                 -> Left $ "Couldn't decode ChildDeclType: " <> tag
+          _                 -> errorWith $ "Couldn't decode ChildDeclType: " <> tag
 
 
 data DataDeclType
@@ -215,5 +216,9 @@ instance decodeJsonDataDeclType :: DecodeJson DataDeclType where
         case tag of
           "newtype" -> Right NewtypeDataDecl
           "data"    -> Right DataDataDecl
-          _         -> Left $ "Couldn't decode DataDeclType: " <> tag
-      Nothing     -> Left $ "Couldn't decode DataDeclType: "   <> stringify json
+          _         -> errorWith $ "Couldn't decode DataDeclType: " <> tag
+      Nothing     -> errorWith $ "Couldn't decode DataDeclType: "   <> stringify json
+
+
+errorWith :: forall a. String -> Either JsonDecodeError a
+errorWith = Left <<< TypeMismatch
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 336550f..3dc9122 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -14,8 +14,10 @@ import Docs.Search.Types (PackageName, PartId)
 import Docs.Search.Meta (Meta)
 
 import Prelude
+
 import Data.Argonaut.Core (stringify)
 import Data.Argonaut.Decode (decodeJson)
+import Data.Argonaut.Decode.Error (printJsonDecodeError)
 import Data.Argonaut.Encode (encodeJson)
 import Data.Argonaut.Parser (jsonParser)
 import Data.Array as Array
@@ -27,6 +29,7 @@ import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Newtype (unwrap)
+import Data.Profunctor.Choice (left)
 import Data.Search.Trie as Trie
 import Data.Set as Set
 import Data.String.CodePoints (contains) as String
@@ -151,7 +154,7 @@ decodeDocsJsons cfg@{ docsFiles } = do
     if doesExist then do
 
       contents <- readTextFile UTF8 jsonFile
-      let eiResult = jsonParser contents >>= decodeJson
+      let eiResult = jsonParser contents >>= left printJsonDecodeError <<< decodeJson
 
       case eiResult of
         Left error -> do
@@ -192,7 +195,7 @@ decodeBowerJsons { bowerFiles } = do
         join <$> withExisting jsonFileName
           \contents ->
             either (logError jsonFileName) pure
-            (jsonParser contents >>= decodeJson)
+            (jsonParser contents >>= left printJsonDecodeError <<< decodeJson)
 
   where
     compareNames
diff --git a/src/Docs/Search/Loader.purs b/src/Docs/Search/Loader.purs
index 2ce1ff5..06e8ec0 100644
--- a/src/Docs/Search/Loader.purs
+++ b/src/Docs/Search/Loader.purs
@@ -7,6 +7,7 @@ import Prelude
 import Control.Monad.Error.Class (throwError)
 import Control.Promise (Promise, toAffE)
 import Data.Argonaut.Core (Json)
+import Data.Argonaut.Decode.Error (printJsonDecodeError)
 import Data.Argonaut.Decode.Class (class DecodeJson, decodeJson)
 import Data.Either (either)
 import Data.Newtype (unwrap)
@@ -28,7 +29,7 @@ load globalIdentifier url = do
   where
     throw err = throwError $ error $
       "Couldn't load content from window." <>
-      unwrap globalIdentifier <> ": " <> err
+      unwrap globalIdentifier <> ": " <> printJsonDecodeError err
 
 
 foreign import loadFromScript
diff --git a/src/Docs/Search/TypeDecoder.purs b/src/Docs/Search/TypeDecoder.purs
index c49ad71..df94dae 100644
--- a/src/Docs/Search/TypeDecoder.purs
+++ b/src/Docs/Search/TypeDecoder.purs
@@ -8,13 +8,13 @@ import Control.Alt ((<|>))
 import Data.Argonaut.Core (Json, caseJsonObject, fromArray, fromObject, jsonEmptyObject, stringify, toArray)
 import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:))
 import Data.Argonaut.Encode (class EncodeJson, encodeJson)
-import Data.Array ((!!))
+import Data.Argonaut.Decode.Error (JsonDecodeError(..))
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.List (List(..), (:))
 import Data.List as List
-import Data.Maybe (Maybe(..), fromMaybe)
+import Data.Maybe (Maybe(..))
 import Data.Newtype (class Newtype)
 import Data.Tuple (Tuple(..))
 import Foreign.Object as Object
@@ -42,11 +42,11 @@ instance encodeJsonQualifiedName :: EncodeJson QualifiedName where
   encodeJson (QualifiedName { moduleNameParts, name }) =
     encodeTuple moduleNameParts name
 
-mkJsonError :: String -> Json -> (forall i. i -> String)
+mkJsonError :: String -> Json -> (forall i. i -> JsonDecodeError)
 mkJsonError name json _ =
-  "Couldn't parse " <> name <> " from " <> stringify json
+  TypeMismatch $ "Couldn't parse " <> name <> " from " <> stringify json
 
-mkJsonError' :: String -> Json -> String
+mkJsonError' :: String -> Json -> JsonDecodeError
 mkJsonError' name json = mkJsonError name json unit
 
 -- | The data type of kinds
@@ -294,17 +294,16 @@ decodeTuple
   .  DecodeJson fst
   => DecodeJson sec
   => (fst -> sec -> res)
-  -> (forall a. a -> String)
+  -> (forall a. a -> JsonDecodeError)
   -> Json
-  -> Either String res
+  -> Either JsonDecodeError res
 decodeTuple cont err json =
-  fromMaybe (Left $ err unit) $
-  toArray json >>= \jsons ->
-  jsons !! 0 >>= \json1 ->
-  jsons !! 1 >>= \json2 -> pure $ do
-    fst <- decodeJson json1
-    sec <- decodeJson json2
-    pure $ cont fst sec
+  case toArray json of
+    Just [ json1, json2 ] -> do
+      fst <- decodeJson json1
+      sec <- decodeJson json2
+      pure $ cont fst sec
+    _ -> Left $ err unit
 
 -- | Decode a heterogeneous triple.
 decodeTriple
@@ -313,9 +312,9 @@ decodeTriple
   => DecodeJson sec
   => DecodeJson trd
   => (fst -> sec -> trd -> res)
-  -> (forall a. a -> String)
+  -> (forall a. a -> JsonDecodeError)
   -> Json
-  -> Either String res
+  -> Either JsonDecodeError res
 decodeTriple cont err json =
   case toArray json of
     Just [ json1, json2, json3 ] -> do
@@ -333,9 +332,9 @@ decodeQuadriple
   => DecodeJson trd
   => DecodeJson frt
   => (fst -> sec -> trd -> frt -> res)
-  -> (forall a. a -> String)
+  -> (forall a. a -> JsonDecodeError)
   -> Json
-  -> Either String res
+  -> Either JsonDecodeError res
 decodeQuadriple cont err json =
   case toArray json of
     Just [ json1, json2, json3, json4 ] -> do

From 9574c0b24068987414aac6d37845b7d9e4b70f76 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Fri, 7 Aug 2020 19:57:03 +0300
Subject: [PATCH 23/45] Refactor `Docs.Search.App`

---
 src/Docs/Search/App.purs | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index 1c8f470..3934710 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -26,6 +26,7 @@ import Halogen.VDom.Driver (runUI)
 import MarkdownIt as MD
 import Web.DOM.ChildNode as ChildNode
 import Web.DOM.Document as Document
+import Web.DOM.Document (Document)
 import Web.DOM.Element as Element
 import Web.DOM.Node as Node
 import Web.DOM.ParentNode as ParentNode
@@ -41,12 +42,11 @@ import Web.HTML.Window as Window
 
 main :: Effect Unit
 main = do
-  win <- HTML.window
-  doc <- HTMLDocument.toDocument <$> Window.document win
+  window <- HTML.window
 
-  insertStyle doc
-  insertVersionInfo doc
-  mbContainers <- getContainers doc
+  insertStyle
+  insertVersionInfo
+  mbContainers <- getContainers
 
   -- Initialize a `markdown-it` instance (we need it to render the docs as markdown)
   markdownIt <- MD.newMarkdownIt MD.Default mempty
@@ -100,7 +100,7 @@ main = do
             launchAff_ do
               sfio.query $ H.tell SearchField.ReadURIHash
 
-        addEventListener hashchange listener true (Window.toEventTarget win)
+        addEventListener hashchange listener true (Window.toEventTarget window)
 
       sbio <- do
         component <- Sidebar.mkComponent moduleIndex isIndexHTML meta
@@ -114,11 +114,13 @@ main = do
             launchAff_ do
               sbio.query $ H.tell Sidebar.UpdateModuleGrouping
 
-        addEventListener focus listener true (Window.toEventTarget win)
+        addEventListener focus listener true (Window.toEventTarget window)
 
 
-insertStyle :: Document.Document -> Effect Unit
-insertStyle doc = do
+insertStyle :: Effect Unit
+insertStyle = do
+  doc <- getDocument
+
   let styleContents = """
   .top-banner__actions {
     width: 10%;
@@ -183,8 +185,9 @@ insertStyle doc = do
     void $ Node.appendChild (Element.toNode style) (Element.toNode head)
 
 
-insertVersionInfo :: Document.Document -> Effect Unit
-insertVersionInfo doc = do
+insertVersionInfo :: Effect Unit
+insertVersionInfo = do
+  doc <- getDocument
   let docPN = Document.toParentNode doc
   mbVersionInfo <-
     ParentNode.querySelector (wrap ".footer > p") docPN
@@ -206,15 +209,15 @@ insertVersionInfo doc = do
 -- | Query the DOM for specific elements that should always be present and determine if we are on
 -- | `index.html` or not.
 getContainers
-  :: Document.Document
-  -> Effect (Maybe { searchField :: HTML.HTMLElement
+  :: Effect (Maybe { searchField :: HTML.HTMLElement
                    , searchResults :: HTML.HTMLElement
                    , pageContents :: Element.Element
                    , sidebarContainer :: HTML.HTMLElement
                    , realSidebar :: Element.Element
                    , isIndexHTML :: Sidebar.IsIndexHTML
                    })
-getContainers doc = do
+getContainers = do
+  doc <- getDocument
   let docPN = Document.toParentNode doc
   mbBanner <-
     ParentNode.querySelector (wrap ".top-banner > .container") docPN
@@ -250,3 +253,7 @@ getContainers doc = do
              , isIndexHTML
              }
       | otherwise -> pure Nothing
+
+
+getDocument :: Effect Document
+getDocument = HTML.window >>= map HTMLDocument.toDocument <<< Window.document

From 622c2e5ea819de65e05a695b9b7203d1eca6a271 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sun, 9 Aug 2020 18:56:39 +0300
Subject: [PATCH 24/45] Apply suggestions

---
 src/Docs/Search/App.purs         | 8 ++++----
 src/Docs/Search/App/Sidebar.purs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index 3934710..1bb6af3 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -77,10 +77,10 @@ main = do
 
           resultsComponent =
             SearchResults.mkComponent
-            initialSearchEngineState
-            pageContents
-            markdownIt
-            meta
+              initialSearchEngineState
+              pageContents
+              markdownIt
+              meta
 
       sfio <- runUI SearchField.component unit searchField
       srio <- runUI resultsComponent unit searchResults
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index dbc82d1..d9fe537 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -158,8 +158,8 @@ render state@{ groupingMode, moduleNames, localPackageName } =
             case package of
               Package packageName -> unwrap packageName
               LocalPackage -> unwrap localPackageName
-              Builtin -> "Built-in"
-              UnknownPackage -> "Unknown package"
+              Builtin -> "<builtins>"
+              UnknownPackage -> "<unknown>"
           ]
         , HH.ul_ $ Set.toUnfoldable modules <#> renderModuleName
         ]

From 3059925f8187484dbda3c286e279479fabfebb38 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Sun, 9 Aug 2020 19:10:53 +0300
Subject: [PATCH 25/45] Get latest purescript from github in .travis.yml

---
 .travis.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f5705ff..03b5349 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,14 +13,15 @@ env:
   matrix:
   - PATH=$HOME/purescript:$PATH
 
-install:
-- export PURS_VERSION=v0.13.3
-- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$PURS_VERSION/linux64.tar.gz
-- tar -xvf $HOME/purescript.tar.gz -C $HOME/
-- chmod a+x $HOME/purescript
-- npm install -g spago
-- npm install
-- spago install
+install: |
+  PURS_VERSION="$(curl -H "Authorization: token $GITHUB_API_TOKEN" --silent "https://api.github.com/repos/purescript/purescript/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')"
+  echo "PureScript version: $PURS_VERSION"
+  wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$PURS_VERSION/linux64.tar.gz
+  tar -xvf $HOME/purescript.tar.gz -C $HOME/
+  chmod a+x $HOME/purescript
+  npm install -g spago
+  npm install
+  spago install
 
 script:
 - npm run build

From 58ce738318fa80891d3af88cb5505391746c61d5 Mon Sep 17 00:00:00 2001
From: klntsky <klntsky@gmail.com>
Date: Tue, 11 Aug 2020 20:18:02 +0300
Subject: [PATCH 26/45] Bump version to v0.0.10

---
 CHANGELOG.md                | 2 +-
 package.json                | 2 +-
 src/Docs/Search/Config.purs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc68398..21ef67c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.0.10 - 2020-08-11]
 
 New features:
 - Add `--package-name` flag to allow passing local package name.
diff --git a/package.json b/package.json
index 73d6cd6..a5a6f78 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-docs-search",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Search frontend for the documentation generated by the PureScript compiler.",
   "directories": {
     "test": "test"
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 5fa6c53..cd2b198 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -7,7 +7,7 @@ import Prelude
 import Data.Newtype (wrap)
 
 version :: String
-version = "0.0.9"
+version = "0.0.10"
 
 mkShapeScriptPath :: String -> String
 mkShapeScriptPath shape = "./index/types/" <> shape <> ".js"

From c22dc0b2a6013bf6c49ae8bc555699734456dfe6 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Thu, 15 Apr 2021 22:15:05 +0300
Subject: [PATCH 27/45] Updates for v0.14 (#46)

Co-authored-by: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
---
 package.json                           |  17 +-
 packages.dhall                         |  61 ++++-
 spago.dhall                            |  96 ++++----
 src/Docs/Search/App.purs               |  19 +-
 src/Docs/Search/App/SearchField.purs   |  19 +-
 src/Docs/Search/App/SearchResults.purs |  30 +--
 src/Docs/Search/App/Sidebar.purs       |   4 +-
 src/Docs/Search/BrowserEngine.purs     |   3 -
 src/Docs/Search/Declarations.purs      |   6 +-
 src/Docs/Search/DocsJson.purs          |   8 +-
 src/Docs/Search/IndexBuilder.purs      |   2 +-
 src/Docs/Search/Interactive.purs       |  10 +-
 src/Docs/Search/Main.purs              |   2 +-
 src/Docs/Search/ModuleIndex.purs       |   8 +-
 src/Docs/Search/PackageIndex.purs      |   5 +-
 src/Docs/Search/Score.purs             |   2 +-
 src/Docs/Search/SearchResult.purs      |  10 +-
 src/Docs/Search/TypeDecoder.purs       |  57 +----
 src/Docs/Search/TypeIndex.purs         |   9 +-
 src/Docs/Search/TypePrinter.purs       |  19 +-
 src/Docs/Search/TypeQuery.purs         |   6 +-
 src/Docs/Search/TypeShape.purs         |   4 +-
 src/Docs/Search/Types.purs             |   6 +-
 src/Docs/Search/URIHash.purs           |   2 +-
 test/Main.purs                         | 307 +++----------------------
 test/Test/TypeQuery.purs               |   2 +-
 26 files changed, 227 insertions(+), 487 deletions(-)

diff --git a/package.json b/package.json
index a5a6f78..2ec6f78 100644
--- a/package.json
+++ b/package.json
@@ -17,15 +17,14 @@
   "scripts": {
     "test": "spago docs --no-search && ./dist/purescript-docs-search build-index && spago test && npm run check-version",
     "bundle-app": "spago bundle-app --no-build --no-install -m Docs.Search.App --to dist/docs-search-app.js",
-    "parcel-app": "parcel build --no-source-maps --target browser --out-file dist/docs-search-app.js dist/docs-search-app.js",
-    "build-app": "npm run bundle-app && npm run parcel-app",
+    "esbuild-app": "esbuild dist/docs-search-app.js --target=es2016 --bundle --minify --outfile=dist/docs-search-app.min.js && mv dist/docs-search-app.min.js dist/docs-search-app.js",
+    "build-app": "npm run bundle-app && npm run esbuild-app",
     "bundle-main": "spago bundle-app --no-build --no-install -m Docs.Search.Main --to dist/main.js",
-    "parcel-main": "parcel build --no-source-maps --target node --bundle-node-modules --out-file dist/main.js dist/main.js",
+    "esbuild-main": "esbuild dist/main.js --platform=node --bundle --minify --outfile=dist/main.min.js && mv dist/main.min.js dist/main.js",
     "add-shebang": "echo \"#!/usr/bin/env node\" > dist/purescript-docs-search && cat dist/main.js >> dist/purescript-docs-search",
     "chmod-main": "chmod +x dist/purescript-docs-search",
-    "build-main": "npm run bundle-main && npm run parcel-main && npm run add-shebang && rm dist/main.js && npm run chmod-main",
+    "build-main": "npm run bundle-main && npm run esbuild-main && npm run add-shebang && rm dist/main.js && npm run chmod-main",
     "build": "spago build && npm run build-app && npm run build-main",
-    "build-dev": "spago build && npm run build-app && npm run bundle-main && npm run add-shebang && rm dist/main.js && npm run chmod-main",
     "clean": "rm -rf dist",
     "check-version": "[ \"$(./dist/purescript-docs-search version)\" = \"$npm_package_version\" ]"
   },
@@ -44,10 +43,10 @@
   "homepage": "https://github.com/spacchetti/purescript-docs-search#readme",
   "dependencies": {},
   "devDependencies": {
+    "esbuild": "^0.11.10",
     "glob": "^7.1.6",
-    "markdown-it": "^11.0.0",
-    "parcel": "^1.12.4",
-    "puppeteer": "^5.2.1",
-    "spago": "^0.15.3"
+    "markdown-it": "^12.0.4",
+    "puppeteer": "^8.0.0",
+    "spago": "^0.20.0"
   }
 }
diff --git a/packages.dhall b/packages.dhall
index 07d7bab..d07e1eb 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -2,7 +2,7 @@ let mkPackage =
       https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20200724/packages.dhall sha256:bb941d30820a49345a0e88937094d2b9983d939c9fd3a46969b85ce44953d7d9
+      https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210409/packages.dhall sha256:e81c2f2ce790c0e0d79869d22f7a37d16caeb5bd81cfda71d46c58f6199fd33f
 
 let overrides = {=}
 
@@ -13,12 +13,13 @@ let additions =
             , "avar"
             , "console"
             , "const"
-            , "coroutines"
             , "dom-indexed"
+            , "effect"
             , "foreign"
             , "fork"
             , "free"
             , "freeap"
+            , "halogen-subscriptions"
             , "halogen-vdom"
             , "media-types"
             , "nullable"
@@ -28,15 +29,29 @@ let additions =
             , "transformers"
             , "unsafe-coerce"
             , "unsafe-reference"
+            , "web-file"
             , "web-uievents"
             ]
-            "https://github.com/slamdata/purescript-halogen.git"
-            "v5.0.0-rc.6"
+            "https://github.com/purescript-halogen/purescript-halogen.git"
+            "v6.1.0"
       , halogen-css =
           mkPackage
-            [ "css", "halogen" ]
+            [ "halogen" ]
             "https://github.com/slamdata/purescript-halogen-css.git"
             "v8.0.0"
+      , memoize =
+          mkPackage
+            [ "prelude"
+            , "lazy"
+            , "either"
+            , "maybe"
+            , "tuples"
+            , "integers"
+            , "lists"
+            , "strings"
+            ]
+            "https://github.com/paf31/purescript-memoize.git"
+            "9960694e82adc212fd89f8ed8778cf55fcb72aeb"
       , optparse =
           mkPackage
             [ "prelude"
@@ -46,14 +61,14 @@ let additions =
             , "ordered-collections"
             , "arrays"
             , "console"
-            , "memoize"
             , "transformers"
             , "exists"
             , "node-process"
             , "free"
+            , "memoize"
             ]
-            "https://github.com/f-o-a-m/purescript-optparse.git"
-            "v3.0.1"
+            "https://github.com/srghma/purescript-optparse.git"
+            "d49b03fcd35f5be167e9c5c44ab1c17ca0956fb1"
       , exitcodes =
           mkPackage
             [ "enums" ]
@@ -66,9 +81,9 @@ let additions =
             "v0.4.0"
       , html-parser-halogen =
           mkPackage
-            [ "string-parsers", "generics-rep", "halogen" ]
+            [ "string-parsers", "halogen" ]
             "https://github.com/rnons/purescript-html-parser-halogen.git"
-            "890da763cdd2a1049ab8837e477c5ba1fcf6d4ce"
+            "458e492e441fcf69a66911b7b64beea5849e0dad"
       , markdown-it-halogen =
           mkPackage
             [ "markdown-it", "html-parser-halogen" ]
@@ -86,6 +101,32 @@ let additions =
             ]
             "https://github.com/justinwoo/purescript-toppokki.git"
             "v2.4.0"
+      , search-trie =
+          mkPackage
+            [ "prelude"
+            , "arrays"
+            , "ordered-collections"
+            , "lists"
+            , "foldable-traversable"
+            , "bifunctors"
+            ]
+            "https://github.com/klntsky/purescript-search-trie.git"
+            "e7f7f22486a1dba22171ec885dbc2149dc815119"
+      , css =
+          mkPackage
+            [ "colors"
+            , "console"
+            , "effect"
+            , "exceptions"
+            , "nonempty"
+            , "profunctor"
+            , "psci-support"
+            , "strings"
+            , "these"
+            , "transformers"
+            ]
+            "https://github.com/purescript-contrib/purescript-css.git"
+            "5c1a44ee95c259352a2b4570b060de14130540bc"
       }
 
 in  upstream // overrides // additions
diff --git a/spago.dhall b/spago.dhall
index e4ce62e..3f4faf9 100644
--- a/spago.dhall
+++ b/spago.dhall
@@ -1,44 +1,56 @@
-{ sources =
-    [ "src/**/*.purs", "test/**/*.purs" ]
-, name =
-    "docs-search"
+{ sources = [ "src/**/*.purs", "test/**/*.purs" ]
+, name = "docs-search"
 , dependencies =
-    [ "aff-promise"
-    , "argonaut-codecs"
-    , "argonaut-core"
-    , "argonaut-generic"
-    , "arrays"
-    , "bower-json"
-    , "console"
-    , "control"
-    , "coroutines"
-    , "effect"
-    , "foldable-traversable"
-    , "generics-rep"
-    , "halogen"
-    , "halogen-css"
-    , "lists"
-    , "markdown-it"
-    , "markdown-it-halogen"
-    , "maybe"
-    , "newtype"
-    , "node-buffer"
-    , "node-fs"
-    , "node-fs-aff"
-    , "node-process"
-    , "node-readline"
-    , "optparse"
-    , "profunctor"
-    , "profunctor-lenses"
-    , "search-trie"
-    , "string-parsers"
-    , "strings"
-    , "test-unit"
-    , "web-dom"
-    , "web-html"
-    , "toppokki"
-    , "web-storage"
-    ]
-, packages =
-    ./packages.dhall
+  [ "aff"
+  , "aff-promise"
+  , "argonaut-codecs"
+  , "argonaut-core"
+  , "argonaut-generic"
+  , "arrays"
+  , "bower-json"
+  , "console"
+  , "control"
+  , "css"
+  , "effect"
+  , "either"
+  , "exceptions"
+  , "foldable-traversable"
+  , "foreign"
+  , "foreign-object"
+  , "halogen"
+  , "halogen-css"
+  , "halogen-subscriptions"
+  , "identity"
+  , "js-uri"
+  , "lists"
+  , "markdown-it"
+  , "markdown-it-halogen"
+  , "maybe"
+  , "newtype"
+  , "node-buffer"
+  , "node-fs"
+  , "node-fs-aff"
+  , "node-process"
+  , "node-readline"
+  , "optparse"
+  , "ordered-collections"
+  , "partial"
+  , "prelude"
+  , "profunctor"
+  , "profunctor-lenses"
+  , "search-trie"
+  , "string-parsers"
+  , "strings"
+  , "test-unit"
+  , "toppokki"
+  , "transformers"
+  , "tuples"
+  , "unfoldable"
+  , "web-dom"
+  , "web-events"
+  , "web-html"
+  , "web-storage"
+  , "web-uievents"
+  ]
+, packages = ./packages.dhall
 }
diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index 1bb6af3..6450edb 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -13,15 +13,16 @@ import Docs.Search.Meta as Meta
 import Prelude
 
 import Control.Alt (alt)
-import Control.Coroutine as Coroutine
 import Data.Maybe (Maybe(..))
 import Data.Newtype (wrap)
+import Data.Map as Map
 import Data.Tuple (Tuple(..))
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Halogen as H
 import Halogen.Aff as HA
+import Halogen.Subscription (subscribe)
 import Halogen.VDom.Driver (runUI)
 import MarkdownIt as MD
 import Web.DOM.ChildNode as ChildNode
@@ -70,11 +71,10 @@ main = do
 
       let initialSearchEngineState = { packageIndex
                                      , moduleIndex
-                                     , index: mempty
-                                     , typeIndex: mempty
+                                     , index: wrap Map.empty
+                                     , typeIndex: wrap Map.empty
                                      , scores
                                      }
-
           resultsComponent =
             SearchResults.mkComponent
               initialSearchEngineState
@@ -85,12 +85,13 @@ main = do
       sfio <- runUI SearchField.component unit searchField
       srio <- runUI resultsComponent unit searchResults
 
-      sfio.subscribe $
-        Coroutine.consumer (srio.query <<< H.tell <<< SearchResults.MessageFromSearchField)
+      void $ H.liftEffect $ subscribe sfio.messages $ \sfm -> do
+        launchAff_ do
+          srio.query (SearchResults.MessageFromSearchField sfm unit)
 
       -- We need to read the URI hash only when both components are initialized and
       -- the search field is subscribed to the main component.
-      void $ sfio.query $ H.tell SearchField.ReadURIHash
+      void $ sfio.query $ SearchField.ReadURIHash unit
 
       -- Subscribe to URI hash updates
       H.liftEffect do
@@ -98,7 +99,7 @@ main = do
         listener <-
           eventListener \event ->
             launchAff_ do
-              sfio.query $ H.tell SearchField.ReadURIHash
+              sfio.query $ SearchField.ReadURIHash unit
 
         addEventListener hashchange listener true (Window.toEventTarget window)
 
@@ -112,7 +113,7 @@ main = do
         listener <-
           eventListener \event ->
             launchAff_ do
-              sbio.query $ H.tell Sidebar.UpdateModuleGrouping
+              sbio.query $ Sidebar.UpdateModuleGrouping unit
 
         addEventListener focus listener true (Window.toEventTarget window)
 
diff --git a/src/Docs/Search/App/SearchField.purs b/src/Docs/Search/App/SearchField.purs
index 10631c5..42e91cc 100644
--- a/src/Docs/Search/App/SearchField.purs
+++ b/src/Docs/Search/App/SearchField.purs
@@ -15,7 +15,7 @@ import Halogen.HTML as HH
 import Halogen.HTML.CSS as HS
 import Halogen.HTML.Events as HE
 import Halogen.HTML.Properties as HP
-import Halogen.Query.EventSource as ES
+import Halogen.Query.Event as ES
 import Web.DOM.Document as Document
 import Web.DOM.ParentNode as ParentNode
 import Web.HTML as HTML
@@ -36,6 +36,7 @@ data Action
   | FocusChanged Boolean
   | InitKeyboardListener
   | HandleKey H.SubscriptionId KeyboardEvent
+  | NoOp
 
 data Query a
   = ReadURIHash a
@@ -46,7 +47,7 @@ data SearchFieldMessage
   | Focused
   | LostFocus
 
-component :: forall i. H.Component HH.HTML Query i SearchFieldMessage Aff
+component :: forall i. H.Component Query i SearchFieldMessage Aff
 component =
   H.mkComponent
     { initialState
@@ -73,12 +74,12 @@ initialState _ = { input: "", focused: false }
 
 handleAction :: Action -> H.HalogenM State Action () SearchFieldMessage Aff Unit
 handleAction = case _ of
-
+  NoOp -> pure unit
   InitKeyboardListener -> do
 
     document <- H.liftEffect $ Window.document =<< HTML.window
     H.subscribe' \sid ->
-      ES.eventListenerEventSource
+      ES.eventListener
         KET.keyup
         (HTMLDocument.toEventTarget document)
         (map (HandleKey sid) <<< KE.fromEvent)
@@ -159,11 +160,11 @@ render state =
     , HP.type_ HP.InputText
     , HE.onKeyUp (\event ->
                    case KeyboardEvent.code event of
-                     "Enter"  -> Just EnterPressed
-                     _        -> Nothing)
-    , HE.onValueInput (Just <<< InputAction)
-    , HE.onFocusIn  $ const $ Just $ FocusChanged true
-    , HE.onFocusOut $ const $ Just $ FocusChanged false
+                     "Enter"  -> EnterPressed
+                     _        -> NoOp)
+    , HE.onValueInput InputAction
+    , HE.onFocusIn  $ const $ FocusChanged true
+    , HE.onFocusOut $ const $ FocusChanged false
     , HS.style do
 
       let pursuitColor = rgb 0x1d 0x22 0x2d
diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index 0369209..9a58d25 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -12,13 +12,13 @@ import Docs.Search.Extra (homePageFromRepository, (>#>))
 import Docs.Search.ModuleIndex (ModuleResult)
 import Docs.Search.PackageIndex (PackageResult)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
-import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
+import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
 import Docs.Search.TypeIndex (TypeIndex)
 import Docs.Search.Types (Identifier(..), ModuleName(..), PackageName)
 import Docs.Search.Meta (Meta)
 
 import Prelude
-
+import Prim hiding (Type, Constraint)
 import Data.Array ((!!))
 import Data.Array as Array
 import Data.List as List
@@ -76,7 +76,7 @@ mkComponent
   -> Element
   -> MD.MarkdownIt
   -> Meta
-  -> H.Component HH.HTML Query i o Aff
+  -> H.Component Query i o Aff
 mkComponent initialEngineState contents markdownIt { localPackageName } =
   H.mkComponent
     { initialState: const { engineState: initialEngineState
@@ -205,7 +205,7 @@ render state@{ mode: Active } =
   , HH.div [ HP.class_ (wrap "load_more"), HP.id_ "load-more" ]
     [ if Array.length shownResults < Array.length state.results
       then HH.a [ HP.id_ "load-more-link"
-                , HE.onClick $ const $ Just MoreResultsRequested ]
+                , HE.onClick $ const MoreResultsRequested ]
            [ HH.text "Show more results" ]
       else HH.p_
            [ HH.text "No further results." ]
@@ -305,7 +305,7 @@ renderSearchResult state (SearchResult result) =
   [ HH.div [ HP.class_ (wrap "result") ]
     [ HH.h3 [ HP.class_ (wrap "result__title") ]
       [ HH.a [ HP.class_ (wrap "result__link")
-             , HE.onClick $ const $ Just $ SearchResultClicked result.moduleName
+             , HE.onClick $ const $ SearchResultClicked result.moduleName
              , HP.href $
                unwrap result.moduleName <> ".html#" <>
                result.hashAnchor <> ":" <> unwrap result.name
@@ -386,7 +386,7 @@ renderValueSignature
   -> Array (HH.HTML a Action)
 renderValueSignature result ty =
   [ HH.a [ makeHref ValueLevel false result.moduleName result.name
-         , HE.onClick $ const $ Just $ SearchResultClicked result.moduleName ]
+         , HE.onClick $ const $ SearchResultClicked result.moduleName ]
     [ HH.text $ unwrap result.name ]
   , HH.text " :: "
   , renderType ty ]
@@ -417,7 +417,7 @@ renderTypeClassSignature { fundeps, arguments, superclasses } { name, moduleName
       ]
   , space
   , HH.a [ makeHref TypeLevel false moduleName name
-         , HE.onClick $ const $ Just $
+         , HE.onClick $ const $
            SearchResultClicked moduleName
          ]
     [ HH.text $ unwrap name ]
@@ -510,7 +510,7 @@ renderTypeArgument (TypeArgument { name, mbKind }) =
       [ HH.text "("
       , HH.text $ name
       , HH.text " :: "
-      , renderKind kind
+      , renderType kind
       , HH.text ")"
       ]
 
@@ -592,7 +592,7 @@ renderForAll ty =
         HH.span_ [ HH.text $ " (" <> name <> " "
                  , syntax "::"
                  , space
-                 , renderKind kind
+                 , renderType kind
                  , HH.text ")" ]
   ) <>
 
@@ -666,7 +666,7 @@ renderQualifiedName isInfix level (QualifiedName { moduleNameParts, name })
   = if isBuiltIn then
       HH.text $ unwrap name
     else
-      HH.a [ HE.onClick $ const $ Just $
+      HH.a [ HE.onClick $ const $
              SearchResultClicked $ moduleName
            , makeHref level isInfix moduleName name
            ]
@@ -676,16 +676,6 @@ renderQualifiedName isInfix level (QualifiedName { moduleNameParts, name })
         isBuiltIn = moduleNameParts !! 0 == Just "Prim"
 
 
-renderKind
-  :: forall a
-  .  Kind
-  -> HH.HTML a Action
-renderKind = case _ of
-  Row k1          -> HH.span_ [ HH.text "# ", renderKind k1 ]
-  FunKind k1 k2   -> HH.span_ [ renderKind k1, syntax " -> ", renderKind k2 ]
-  NamedKind qname -> renderQualifiedName false KindLevel qname
-
-
 -- | Construct a `href` property value w.r.t. `DeclLevel`.
 makeHref
   :: forall t rest
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index d9fe537..35f30b5 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -64,7 +64,7 @@ mkComponent
   .  ModuleIndex
   -> IsIndexHTML
   -> Meta
-  -> Aff (H.Component HH.HTML Query i Action Aff)
+  -> Aff (H.Component Query i Action Aff)
 mkComponent moduleIndex@{ packageModules } isIndexHTML { localPackageName } = do
   groupingMode <- H.liftEffect loadGroupingModeFromLocalStorage
   mbModuleName <- H.liftEffect getCurrentModuleName
@@ -134,7 +134,7 @@ render state@{ groupingMode, moduleNames, localPackageName } =
   , HH.input [ HP.id_ "group-modules__input"
              , HP.type_ HP.InputCheckbox
              , HP.checked (groupingMode == GroupByPackage)
-             , HE.onChecked $ Just <<< ToggleGrouping <<< isCheckedToGroupingMode
+             , HE.onChecked $ ToggleGrouping <<< isCheckedToGroupingMode
              ]
 
   , HH.text " "
diff --git a/src/Docs/Search/BrowserEngine.purs b/src/Docs/Search/BrowserEngine.purs
index d71c212..c5ed11f 100644
--- a/src/Docs/Search/BrowserEngine.purs
+++ b/src/Docs/Search/BrowserEngine.purs
@@ -36,9 +36,6 @@ newtype PartialIndex
   = PartialIndex (Map PartId Index)
 
 derive instance newtypePartialIndex :: Newtype PartialIndex _
-derive newtype instance semigroupPartialIndex :: Semigroup PartialIndex
-derive newtype instance monoidPartialIndex :: Monoid PartialIndex
-
 
 type BrowserEngineState = EngineState PartialIndex TypeIndex
 
diff --git a/src/Docs/Search/Declarations.purs b/src/Docs/Search/Declarations.purs
index ff36bdb..c7272a9 100644
--- a/src/Docs/Search/Declarations.purs
+++ b/src/Docs/Search/Declarations.purs
@@ -3,11 +3,11 @@ module Docs.Search.Declarations where
 import Docs.Search.DocsJson (ChildDeclType(..), ChildDeclaration(..), DeclType(..), Declaration(..), DocsJson(..), SourceSpan)
 import Docs.Search.Score (Scores, getPackageScore, getPackageScoreForPackageName)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
-import Docs.Search.TypeDecoder (Constraint(..), QualifiedName(..), Type(..), Kind, joinForAlls)
+import Docs.Search.TypeDecoder (Constraint(..), QualifiedName(..), Type(..), joinForAlls)
 import Docs.Search.Types (ModuleName(..), PackageName(..), PackageInfo(..), Identifier(..))
 
 import Prelude
-
+import Prim hiding (Type)
 import Control.Alt ((<|>))
 import Data.Array ((!!))
 import Data.Array as Array
@@ -271,7 +271,7 @@ mkChildInfo
         -- We concatenate two lists:
         -- * a list of type parameters of the type class, and
         -- * a list of quantified variables of the unconstrained type
-        allArguments :: Array { name :: String, mbKind :: Maybe Kind }
+        allArguments :: Array { name :: String, mbKind :: Maybe Type }
         allArguments =
           (arguments <#> unwrap) <> List.toUnfoldable binders
 
diff --git a/src/Docs/Search/DocsJson.purs b/src/Docs/Search/DocsJson.purs
index b69b1ce..642be71 100644
--- a/src/Docs/Search/DocsJson.purs
+++ b/src/Docs/Search/DocsJson.purs
@@ -2,8 +2,8 @@
 module Docs.Search.DocsJson where
 
 import Prelude
-
-import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, Type, TypeArgument)
+import Prim hiding (Type, Constraint)
+import Docs.Search.TypeDecoder (Constraint, FunDeps, Type, TypeArgument)
 
 import Data.Argonaut.Core (fromString, stringify, toString)
 import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:), (.:?))
@@ -11,7 +11,7 @@ import Data.Argonaut.Decode.Error (JsonDecodeError(..))
 import Data.Argonaut.Encode (class EncodeJson, encodeJson)
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.Maybe (Maybe(..))
 import Data.Newtype (class Newtype, unwrap)
 
@@ -44,7 +44,7 @@ newtype Declaration
                , comments :: Maybe String
                , info :: { declType      :: DeclType
                          , dataDeclType  :: Maybe DataDeclType
-                         , kind          :: Maybe Kind
+                         , kind          :: Maybe Type
                          , typeArguments :: Maybe (Array TypeArgument)
                          , type          :: Maybe Type
                          , superclasses  :: Maybe (Array Constraint)
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 3dc9122..c03b508 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -249,7 +249,7 @@ writeMeta meta = do
 -- | Get a mapping from index parts to index contents.
 getIndex :: Declarations -> Map PartId (Array (Tuple String (Array SearchResult)))
 getIndex (Declarations trie) =
-  Array.foldr insert mempty parts
+  Array.foldr insert Map.empty parts
     where
       insert part = Map.insertWith append (getPartId part.prefix) part.results
 
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 3cb4617..3616b24 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -13,13 +13,13 @@ import Docs.Search.PackageIndex (PackageResult, mkPackageIndex, mkPackageInfo)
 import Docs.Search.Score (mkScores)
 import Docs.Search.SearchResult (ResultInfo(..), SearchResult(..))
 import Docs.Search.Terminal (bold, cyan, green, yellow)
-import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
+import Docs.Search.TypeDecoder (Constraint, FunDeps, QualifiedName, Type, TypeArgument)
 import Docs.Search.TypeIndex (resultsWithTypes)
-import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showKind, showType, showTypeArgument, space, syntax)
+import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showType, showTypeArgument, space, syntax)
 import Docs.Search.Types (ModuleName, PackageName, PackageInfo, Identifier)
 
 import Prelude
-
+import Prim hiding (Type, Constraint)
 import Data.Array as Array
 import Data.Identity (Identity(..))
 import Data.List as List
@@ -279,7 +279,7 @@ showTypeSynonymSignature { type: ty, arguments } { name } =
 
 showExternDataSignature
   :: forall rest
-  .  { kind :: Kind }
+  .  { kind :: Type }
   -> { name :: Identifier | rest }
   -> String
 showExternDataSignature { kind } { name } =
@@ -288,7 +288,7 @@ showExternDataSignature { kind } { name } =
   yellow (unwrap name) <>
   space <>
   syntax " :: " <>
-  showKind kind
+  showType kind
 
 
 leftShift :: Int -> String -> String
diff --git a/src/Docs/Search/Main.purs b/src/Docs/Search/Main.purs
index 95504c1..44cbc67 100644
--- a/src/Docs/Search/Main.purs
+++ b/src/Docs/Search/Main.purs
@@ -9,7 +9,7 @@ import Docs.Search.Config as Config
 import Docs.Search.Types (PackageName(..))
 
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List as List
 import Data.List.NonEmpty as NonEmpty
 import Data.Maybe (Maybe, fromMaybe, optional)
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index aae9fda..f9913c4 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -56,7 +56,7 @@ type ModuleResult
 
 unpackModuleIndex :: PackedModuleIndex -> ModuleIndex
 unpackModuleIndex packageModules =
-  flip execState { packageModules, modulePackages: mempty, index: mempty } do
+  flip execState { packageModules, modulePackages: Map.empty, index: mempty } do
     for_ (Map.toUnfoldableUnordered packageModules :: Array _)
       \(package /\ moduleNames) -> do
         for_ moduleNames \moduleName -> do
@@ -94,12 +94,12 @@ queryModuleIndex scores { index, modulePackages } query =
 -- | Constructs a mapping from packages to modules
 mkPackedModuleIndex :: Declarations -> PackedModuleIndex
 mkPackedModuleIndex (Declarations trie) =
-  foldr (Map.unionWith Set.union) mempty $ extract <$> Trie.values trie
+  foldr (Map.unionWith Set.union) Map.empty $ extract <$> Trie.values trie
   where
     extract
       :: List SearchResult
       -> Map PackageInfo (Set ModuleName)
-    extract = foldr (Map.unionWith Set.union) mempty <<< map mkEntry
+    extract = foldr (Map.unionWith Set.union) Map.empty <<< map mkEntry
       where
         mkEntry (SearchResult { packageInfo, moduleName }) =
           Map.singleton packageInfo (Set.singleton moduleName)
@@ -107,7 +107,7 @@ mkPackedModuleIndex (Declarations trie) =
 loadModuleIndex :: Aff PackedModuleIndex
 loadModuleIndex = do
   json <- toAffE $ load Config.moduleIndexLoadPath
-  pure $ fromMaybe mempty $ hush $ decodeJson json
+  pure $ fromMaybe Map.empty $ hush $ decodeJson json
 
 
 foreign import load
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index 0d16f03..bac5d3e 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -36,7 +36,7 @@ mkPackageInfo :: Scores -> Array PackageMeta -> PackageInfo
 mkPackageInfo packageScores pms =
   Array.fromFoldable $
   Map.values $
-  Array.foldr insert mempty pms
+  Array.foldr insert Map.empty pms
 
   where
     insert
@@ -64,7 +64,8 @@ mkPackageInfo packageScores pms =
 
 mkScoresFromPackageIndex :: PackageIndex -> Scores
 mkScoresFromPackageIndex =
-  Trie.values >>> Array.foldr (\ { name, score } -> Map.insert name score) mempty
+  Trie.values >>> Array.fromFoldable >>>
+  Array.foldr (\ { name, score } -> Map.insert name score) Map.empty
 
 
 loadPackageIndex :: Aff PackageIndex
diff --git a/src/Docs/Search/Score.purs b/src/Docs/Search/Score.purs
index 633cea1..e2f2d8b 100644
--- a/src/Docs/Search/Score.purs
+++ b/src/Docs/Search/Score.purs
@@ -29,7 +29,7 @@ mkScores =
     updateScoresFor (unwrap pm).dependencies >>>
     updateScoresFor (unwrap pm).devDependencies
   )
-  mempty
+  Map.empty
 
   where
     updateScoresFor :: Dependencies -> Scores -> Scores
diff --git a/src/Docs/Search/SearchResult.purs b/src/Docs/Search/SearchResult.purs
index 11ff65d..62d8757 100644
--- a/src/Docs/Search/SearchResult.purs
+++ b/src/Docs/Search/SearchResult.purs
@@ -1,15 +1,15 @@
 module Docs.Search.SearchResult where
 
 import Docs.Search.DocsJson (DataDeclType)
-import Docs.Search.TypeDecoder (Constraint, FunDeps, Kind, QualifiedName, Type, TypeArgument)
+import Docs.Search.TypeDecoder (Constraint, FunDeps, QualifiedName, Type, TypeArgument)
 import Docs.Search.Types (ModuleName, PackageInfo, Identifier, PackageScore)
 
 import Prelude
-
+import Prim hiding (Type, Constraint)
 import Data.Argonaut.Decode (class DecodeJson)
-import Data.Argonaut.Decode.Generic.Rep (genericDecodeJson)
+import Data.Argonaut.Decode.Generic (genericDecodeJson)
 import Data.Argonaut.Encode (class EncodeJson)
-import Data.Argonaut.Encode.Generic.Rep (genericEncodeJson)
+import Data.Argonaut.Encode.Generic (genericEncodeJson)
 import Data.Generic.Rep (class Generic)
 import Data.Maybe (Maybe(..))
 import Data.Newtype (class Newtype, un)
@@ -19,7 +19,7 @@ import Data.Newtype (class Newtype, un)
 data ResultInfo
   = DataResult            { typeArguments :: Array TypeArgument
                           , dataDeclType :: DataDeclType }
-  | ExternDataResult      { kind :: Kind }
+  | ExternDataResult      { kind :: Type }
   | TypeSynonymResult     { arguments :: Array TypeArgument
                           , type :: Type }
   | DataConstructorResult { arguments :: Array Type }
diff --git a/src/Docs/Search/TypeDecoder.purs b/src/Docs/Search/TypeDecoder.purs
index df94dae..c7444cc 100644
--- a/src/Docs/Search/TypeDecoder.purs
+++ b/src/Docs/Search/TypeDecoder.purs
@@ -1,9 +1,10 @@
+-- | A decoder for types located in 'Language.PureScript.Types'.
 module Docs.Search.TypeDecoder where
 
 import Docs.Search.Types (Identifier)
 
 import Prelude
-
+import Prim hiding (Type, Constraint)
 import Control.Alt ((<|>))
 import Data.Argonaut.Core (Json, caseJsonObject, fromArray, fromObject, jsonEmptyObject, stringify, toArray)
 import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:))
@@ -11,7 +12,7 @@ import Data.Argonaut.Encode (class EncodeJson, encodeJson)
 import Data.Argonaut.Decode.Error (JsonDecodeError(..))
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List (List(..), (:))
 import Data.List as List
 import Data.Maybe (Maybe(..))
@@ -49,49 +50,6 @@ mkJsonError name json _ =
 mkJsonError' :: String -> Json -> JsonDecodeError
 mkJsonError' name json = mkJsonError name json unit
 
--- | The data type of kinds
-data Kind
-  -- | Kinds for labelled, unordered rows without duplicates
-  = Row Kind
-  -- | Function kinds
-  | FunKind Kind Kind
-  -- | A named kind
-  | NamedKind QualifiedName
-
-derive instance eqKind :: Eq Kind
-derive instance genericKind :: Generic Kind _
-
-instance showKind :: Show Kind where
-  show x = genericShow x
-
-instance decodeJsonKind :: DecodeJson Kind where
-  decodeJson json = do
-    handle <- decodeJson json
-    tag <- handle .: "tag"
-    case tag of
-      "NamedKind" -> do
-        contents <- handle .: "contents"
-        pure $ NamedKind contents
-      "Row" -> do
-        contents <- handle .: "contents"
-        pure $ Row contents
-      "FunKind" -> do
-        contents <- handle .: "contents"
-        case contents of
-          [k1, k2] ->
-            Right $ FunKind k1 k2
-          _ -> Left $ mkJsonError' "FunKind" json
-      _ -> Left $ mkJsonError' "Kind" json
-
-instance encodeJsonKind :: EncodeJson Kind where
-  encodeJson = case _ of
-    Row k ->
-      tagged "Row" (encodeJson k)
-    FunKind k1 k2 ->
-      tagged "FunKind" (encodeTuple k1 k2)
-    NamedKind qname ->
-      tagged "NamedKind" (encodeJson qname)
-
 -- | A typeclass constraint
 newtype Constraint = Constraint
   { constraintClass :: QualifiedName
@@ -141,7 +99,7 @@ data Type
   -- | A type application
   | TypeApp Type Type
   -- | Forall quantifier
-  | ForAll String (Maybe Kind) Type
+  | ForAll String (Maybe Type) Type
   -- | A type withset of type class constraints
   | ConstrainedType Constraint Type
   {-
@@ -189,9 +147,10 @@ instance decodeJsonType :: DecodeJson Type where
         (Left $ err unit)
         json
         <|>
+        -- Ignore SkolemScope
         decodeContents
         (decodeQuadriple
-         (\f (k :: Kind) a (_ :: Maybe Int) ->
+         (\f (k :: Type) a (_ :: Maybe Int) ->
            ForAll f (Just k) a)
          err)
         (Left $ err unit)
@@ -270,7 +229,7 @@ instance encodeJsonFunDeps :: EncodeJson FunDeps where
 newtype TypeArgument
   = TypeArgument
     { name :: String
-    , mbKind :: Maybe Kind
+    , mbKind :: Maybe Type
     }
 
 derive newtype instance eqTypeArgument :: Eq TypeArgument
@@ -404,7 +363,7 @@ tagged tag contents =
 joinForAlls
   :: Type
   -> { binders :: List { name :: String
-                       , mbKind :: Maybe Kind }
+                       , mbKind :: Maybe Type }
      , ty :: Type
      }
 joinForAlls ty = go Nil ty
diff --git a/src/Docs/Search/TypeIndex.purs b/src/Docs/Search/TypeIndex.purs
index a322064..09a9500 100644
--- a/src/Docs/Search/TypeIndex.purs
+++ b/src/Docs/Search/TypeIndex.purs
@@ -12,12 +12,13 @@ import Docs.Search.Types (ModuleName(..))
 import Docs.Search.TypeShape (shapeOfType, shapeOfTypeQuery, stringifyShape)
 
 import Prelude
-
+import Prim hiding (Type)
 import Control.Promise (Promise, toAffE)
 import Data.Argonaut.Core (Json)
 import Data.Argonaut.Decode (decodeJson)
 import Data.Array as Array
 import Data.Either (hush)
+import Data.Foldable (fold, foldr)
 import Data.Map (Map)
 import Data.Map as Map
 import Data.Maybe (Maybe(..), fromMaybe', isJust)
@@ -28,14 +29,12 @@ import Effect.Aff (Aff, try)
 
 newtype TypeIndex = TypeIndex (Map String (Maybe (Array SearchResult)))
 
-derive newtype instance semigroupTypeIndex :: Semigroup TypeIndex
-derive newtype instance monoidTypeIndex :: Monoid TypeIndex
 derive instance newtypeTypeIndex :: Newtype TypeIndex _
 
 
 mkTypeIndex :: Scores -> Array DocsJson -> TypeIndex
 mkTypeIndex scores docsJsons =
-  TypeIndex $ map Just $ Array.foldr insert mempty docsJsons
+  TypeIndex $ map Just $ foldr insert Map.empty docsJsons
   where
     insert :: DocsJson -> Map String (Array SearchResult) -> Map String (Array SearchResult)
     insert docsJson mp =
@@ -78,7 +77,7 @@ lookup
   -> Aff { index :: TypeIndex, results :: Array SearchResult }
 lookup key index@(TypeIndex map) =
   case Map.lookup key map of
-    Just results -> pure { index, results: Array.fold results }
+    Just results -> pure { index, results: fold results }
     Nothing -> do
       eiJson <- try (toAffE (lookup_ key $ Config.mkShapeScriptPath key))
       pure $ fromMaybe'
diff --git a/src/Docs/Search/TypePrinter.purs b/src/Docs/Search/TypePrinter.purs
index 34c8ae9..6b3cfb5 100644
--- a/src/Docs/Search/TypePrinter.purs
+++ b/src/Docs/Search/TypePrinter.purs
@@ -1,10 +1,10 @@
 module Docs.Search.TypePrinter where
 
 import Prelude
-
+import Prim hiding (Type, Constraint)
 import Docs.Search.Extra ((>#>))
 import Docs.Search.Terminal (cyan)
-import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
+import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), QualifiedName(..), Type(..), TypeArgument(..), joinForAlls, joinRows)
 import Docs.Search.Types (Identifier(..))
 
 import Data.Array as Array
@@ -70,7 +70,7 @@ showTypeArgument (TypeArgument { name, mbKind }) =
       "(" <>
       name <>
       " :: " <>
-      showKind kind <>
+      showType kind <>
       ")"
 
 
@@ -127,7 +127,7 @@ showForAll
 showForAll ty =
   keyword "forall" <>
 
-  ( Array.fold $ foralls.binders <#>
+  ( Array.fold $ Array.fromFoldable $ foralls.binders <#>
     \ { name, mbKind } ->
     case mbKind of
       Nothing -> " " <> name
@@ -135,7 +135,7 @@ showForAll ty =
         " (" <> name <> " "
         <> syntax "::"
         <> space
-        <> showKind kind
+        <> showType kind
         <> ")"
   ) <>
 
@@ -146,15 +146,6 @@ showForAll ty =
     foralls = joinForAlls ty
 
 
-showKind
-  :: Kind
-  -> String
-showKind = case _ of
-  Row k1          -> "# " <> showKind k1
-  FunKind k1 k2   -> showKind k1 <> syntax " -> " <> showKind k2
-  NamedKind qname -> showQualifiedName qname
-
-
 showConstraint
   :: Constraint
   -> String
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index d3a5953..a102a1b 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -16,12 +16,12 @@ import Docs.Search.TypeDecoder (QualifiedName(..), Type(..), joinConstraints, jo
 import Docs.Search.Types (Identifier(..))
 
 import Prelude
-
+import Prim hiding (Type)
 import Control.Alt ((<|>))
 import Data.Array as Array
 import Data.Either (Either)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List (List(..), many, some, (:))
 import Data.List as List
 import Data.List.NonEmpty (NonEmptyList)
@@ -331,7 +331,7 @@ typeVarPenalty substs =
                       Substitute v1 v2 ->
                         f v1 v2
                       _ -> identity
-                   ) mempty substs
+                   ) Map.empty substs
 
 
 -- | Penalty for name mismatches.
diff --git a/src/Docs/Search/TypeShape.purs b/src/Docs/Search/TypeShape.purs
index fc4b3bf..69df8ec 100644
--- a/src/Docs/Search/TypeShape.purs
+++ b/src/Docs/Search/TypeShape.purs
@@ -8,9 +8,9 @@ import Docs.Search.TypeQuery (TypeQuery(..), getFreeVariables)
 import Docs.Search.Types (Identifier(..))
 
 import Prelude
-
+import Prim hiding (Type)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.List (List(..), (:))
 import Data.List as List
 import Data.List.NonEmpty as NonEmptyList
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index 6c7c36e..9172edb 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -3,11 +3,11 @@ module Docs.Search.Types where
 import Prelude
 
 import Data.Argonaut.Decode (class DecodeJson)
-import Data.Argonaut.Decode.Generic.Rep (genericDecodeJson)
+import Data.Argonaut.Decode.Generic (genericDecodeJson)
 import Data.Argonaut.Encode (class EncodeJson)
-import Data.Argonaut.Encode.Generic.Rep (genericEncodeJson)
+import Data.Argonaut.Encode.Generic (genericEncodeJson)
 import Data.Generic.Rep (class Generic)
-import Data.Generic.Rep.Show (genericShow)
+import Data.Show.Generic (genericShow)
 import Data.Newtype (class Newtype)
 
 
diff --git a/src/Docs/Search/URIHash.purs b/src/Docs/Search/URIHash.purs
index 64a2fdc..9f65f82 100644
--- a/src/Docs/Search/URIHash.purs
+++ b/src/Docs/Search/URIHash.purs
@@ -10,7 +10,7 @@ import Prelude
 import Data.Maybe (Maybe(Just), fromMaybe)
 import Data.String.CodeUnits as String
 import Effect (Effect)
-import Global (decodeURIComponent, encodeURIComponent)
+import JSURI (decodeURIComponent, encodeURIComponent)
 import Web.HTML as HTML
 import Web.HTML.Location as Location
 import Web.HTML.Window as Window
diff --git a/test/Main.purs b/test/Main.purs
index 240ec82..a2cd0b6 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -2,23 +2,21 @@ module Test.Main where
 
 import Prelude
 
-import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), Kind(..), QualifiedName(..), Type(..))
-import Docs.Search.Types (Identifier(..))
-import Test.TypeQuery as TypeQuery
-import Test.IndexBuilder as IndexBuilder
-import Test.Declarations as Declarations
-import Test.ModuleIndex as ModuleIndex
-import Test.UI as UI
-
-import Test.Extra (assertRight)
-
+import Data.Argonaut.Core (Json)
 import Data.Argonaut.Decode (decodeJson)
-import Data.Argonaut.Encode (encodeJson)
 import Data.Argonaut.Parser (jsonParser)
-import Data.Either (fromRight)
+import Data.Either (Either(..))
 import Data.Maybe (Maybe(..))
+import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), QualifiedName(..), Type(..))
+import Docs.Search.Types (Identifier(..))
 import Effect (Effect)
 import Partial.Unsafe (unsafePartial)
+import Test.Declarations as Declarations
+import Test.Extra (assertRight)
+import Test.IndexBuilder as IndexBuilder
+import Test.ModuleIndex as ModuleIndex
+import Test.TypeQuery as TypeQuery
+import Test.UI as UI
 import Test.Unit (TestSuite, suite, test)
 import Test.Unit.Main (runTest)
 
@@ -27,131 +25,39 @@ main = do
   runTest mainTest
   UI.main
 
+mkJson :: String -> Json
+mkJson str =
+  unsafePartial $ case jsonParser str of
+    Right r -> r
+
 mainTest :: TestSuite
 mainTest = do
   TypeQuery.tests
   IndexBuilder.tests
   Declarations.tests
   ModuleIndex.tests
-
-  let mkJson x = unsafePartial $ fromRight $ jsonParser x
   suite "FunDeps decoder" do
     test "FunDeps" do
-      let funDeps = mkJson """
-       [
+      let
+        funDeps = mkJson """
           [
-            [
-              "lhs",
-              "rhs"
-            ],
-            [
-              "output"
-            ]
-          ]
-        ]
-      """
+             [
+               [
+                 "lhs",
+                 "rhs"
+               ],
+               [
+                 "output"
+               ]
+             ]
+           ]
+          """
       assertRight (decodeJson funDeps)
         (FunDeps [ FunDep { lhs: [ "lhs", "rhs" ]
                           , rhs: [ "output"]
                           }
                  ])
 
-  suite "Kind decoder" do
-
-    test "QualifiedName" do
-
-      let qualifiedName =  mkJson """
-      [
-          [
-            "Prim"
-          ],
-          "Type"
-      ]
-      """
-
-      assertRight (decodeJson qualifiedName)
-        (qualified ["Prim"] "Type")
-
-    test "NamedKind" do
-      let namedKind = mkJson """
-      {
-        "annotation": [],
-        "tag": "NamedKind",
-        "contents": [
-          [
-            "Prim"
-          ],
-          "Type"
-        ]
-      }
-      """
-
-      assertRight (decodeJson namedKind)
-        (NamedKind $ qualified ["Prim"] "Type")
-
-    test "Row" do
-      let row = mkJson """
-            {
-              "annotation": [],
-              "tag": "Row",
-              "contents": {
-                "annotation": [],
-                "tag": "NamedKind",
-                "contents": [
-                  [
-                    "Prim"
-                  ],
-                  "Type"
-                ]
-              }
-            }
-      """
-
-      assertRight (decodeJson row) (Row $ NamedKind $ qualified ["Prim"] "Type")
-
-    test "FunKind" do
-      let funKind = mkJson """
-        {
-          "annotation": [],
-          "tag": "FunKind",
-          "contents": [
-            {
-              "annotation": [],
-              "tag": "Row",
-              "contents": {
-                "annotation": [],
-                "tag": "NamedKind",
-                "contents": [
-                  [
-                    "Prim"
-                  ],
-                  "Type"
-                ]
-              }
-            },
-            {
-              "annotation": [],
-              "tag": "Row",
-              "contents": {
-                "annotation": [],
-                "tag": "NamedKind",
-                "contents": [
-                  [
-                    "Prim"
-                  ],
-                  "Type"
-                ]
-              }
-            }
-          ]
-        }
-        """
-      assertRight (decodeJson funKind)
-        (FunKind (Row $ NamedKind $ qualified ["Prim"] "Type")
-                 (Row $ NamedKind $ qualified ["Prim"] "Type")
-        )
-
-
   suite "Constraint decoder" do
     test "Constraint" do
       let constraint = mkJson """
@@ -372,155 +278,6 @@ mainTest = do
                                      (TypeConstructor $ qualified ["Prim"] "String"))
                             (TypeVar "a"))
 
-    test "ForAll #2" do
-      let forallJson = mkJson """
-{
-  "annotation": [],
-  "tag": "ForAll",
-  "contents": [
-    "f",
-    {
-      "annotation": [],
-      "tag": "FunKind",
-      "contents": [
-        {
-          "annotation": [],
-          "tag": "NamedKind",
-          "contents": [
-            [
-              "Prim",
-              "RowList"
-            ],
-            "RowList"
-          ]
-        },
-        {
-          "annotation": [],
-          "tag": "NamedKind",
-          "contents": [
-            [
-              "Prim"
-            ],
-            "Type"
-          ]
-        }
-      ]
-    },
-    {
-      "annotation": [],
-      "tag": "TypeApp",
-      "contents": [
-        {
-          "annotation": [],
-          "tag": "TypeApp",
-          "contents": [
-            {
-              "annotation": [],
-              "tag": "TypeConstructor",
-              "contents": [
-                [
-                  "Prim"
-                ],
-                "Function"
-              ]
-            },
-            {
-              "annotation": [],
-              "tag": "TypeApp",
-              "contents": [
-                {
-                  "annotation": [],
-                  "tag": "TypeVar",
-                  "contents": "f"
-                },
-                {
-                  "annotation": [],
-                  "tag": "TypeVar",
-                  "contents": "l"
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "annotation": [],
-          "tag": "TypeApp",
-          "contents": [
-            {
-              "annotation": [],
-              "tag": "TypeConstructor",
-              "contents": [
-                [
-                  "Data",
-                  "List",
-                  "Types"
-                ],
-                "List"
-              ]
-            },
-            {
-              "annotation": [],
-              "tag": "ParensInType",
-              "contents": {
-                "annotation": [],
-                "tag": "TypeApp",
-                "contents": [
-                  {
-                    "annotation": [],
-                    "tag": "TypeApp",
-                    "contents": [
-                      {
-                        "annotation": [],
-                        "tag": "TypeConstructor",
-                        "contents": [
-                          [
-                            "Data",
-                            "Tuple"
-                          ],
-                          "Tuple"
-                        ]
-                      },
-                      {
-                        "annotation": [],
-                        "tag": "TypeConstructor",
-                        "contents": [
-                          [
-                            "Prim"
-                          ],
-                          "String"
-                        ]
-                      }
-                    ]
-                  },
-                  {
-                    "annotation": [],
-                    "tag": "TypeConstructor",
-                    "contents": [
-                      [
-                        "Prim"
-                      ],
-                      "String"
-                    ]
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ]
-    },
-    null
-  ]
-}
-      """
-      assertRight (decodeJson forallJson) $
-        ForAll "f"
-        (Just (FunKind (NamedKind (QualifiedName { moduleNameParts: ["Prim","RowList"], name: Identifier "RowList" })) (NamedKind (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Type" }))))
-        (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeVar "f") (TypeVar "l"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","List","Types"], name: Identifier "List" })) (ParensInType (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Data","Tuple"], name: Identifier "Tuple" })) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "String" }))) (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "String" }))))))
-
-
-
-
   suite "jsons" do
 
     test "jsons #1" do
@@ -530,14 +287,6 @@ mainTest = do
 
       assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "o"))))))))
 
-  suite "Kind encoder" do
-    test "FunKind" do
-      let k1 =
-            FunKind (Row (NamedKind $ qualified [] "a"))
-                    (FunKind (NamedKind $ qualified [] "b")
-                             (NamedKind $ qualified [] "b"))
-      assertRight (decodeJson $ encodeJson $ k1) k1
-
 
 qualified :: Array String -> String -> QualifiedName
 qualified moduleNameParts name = QualifiedName { moduleNameParts, name: Identifier name }
diff --git a/test/Test/TypeQuery.purs b/test/Test/TypeQuery.purs
index 540acf2..029ca7c 100644
--- a/test/Test/TypeQuery.purs
+++ b/test/Test/TypeQuery.purs
@@ -6,7 +6,7 @@ import Docs.Search.TypeShape (ShapeChunk(..), shapeOfType, shapeOfTypeQuery)
 import Docs.Search.Types (Identifier(..))
 
 import Prelude
-
+import Prim hiding (Constraint, Type)
 import Data.Foldable (class Foldable)
 import Data.List (List(..), (:))
 import Data.List as List

From 962fa47f25c5a2883b2348dfb0b76536d2b85174 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Thu, 15 Apr 2021 22:24:55 +0300
Subject: [PATCH 28/45] Bump version to v0.0.11 (#47)

---
 CHANGELOG.md                | 5 +++++
 package.json                | 2 +-
 src/Docs/Search/Config.purs | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21ef67c..b86c7a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.11 - 2021-04-15]
+
+Changes:
+- Adapt JSON API for use with PureScript v0.14.
+
 ## [0.0.10 - 2020-08-11]
 
 New features:
diff --git a/package.json b/package.json
index 2ec6f78..9408b69 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "purescript-docs-search",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "Search frontend for the documentation generated by the PureScript compiler.",
   "directories": {
     "test": "test"
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index cd2b198..2cf7d5e 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -7,7 +7,7 @@ import Prelude
 import Data.Newtype (wrap)
 
 version :: String
-version = "0.0.10"
+version = "0.0.11"
 
 mkShapeScriptPath :: String -> String
 mkShapeScriptPath shape = "./index/types/" <> shape <> ".js"

From 8925f21cb201cdb8de9c958c90005788bb988440 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Fri, 16 Apr 2021 22:36:51 +0300
Subject: [PATCH 29/45] Switch CI to GitHub Actions (#48)

Co-authored-by: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
---
 .github/workflows/build.yml   |  44 ++
 .github/workflows/release.yml |  52 ++
 .travis.yml                   |  52 --
 package-lock.json             | 990 ++++++++++++++++++++++++++++++++++
 4 files changed, 1086 insertions(+), 52 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/release.yml
 delete mode 100644 .travis.yml
 create mode 100644 package-lock.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..28f5bcd
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: build
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+
+      - uses: purescript-contrib/setup-purescript@main
+
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('./**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Cache PureScript dependencies
+        uses: actions/cache@v2
+        with:
+          key: ${{ runner.os }}-spago-${{ hashFiles('./**/*.dhall') }}
+          path: |
+            .spago
+            output
+
+      - name: Install
+        run: |
+          npm ci
+          spago install
+
+      - name: Build
+        run: |
+          npm run build
+          npm test
+          spago docs --no-search
+          ./dist/purescript-docs-search build-index
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..aad67e7
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,52 @@
+name: release
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "14"
+
+      - uses: purescript-contrib/setup-purescript@main
+
+      - uses: actions/cache@v2
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('./**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Cache PureScript dependencies
+        uses: actions/cache@v2
+        with:
+          key: ${{ runner.os }}-spago-${{ hashFiles('./**/*.dhall') }}
+          path: |
+            .spago
+            output
+
+      - name: Build
+        run: |
+          npm ci
+          spago install
+          npm run build
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            dist/docs-search-app.js
+            dist/purescript-docs-search
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Publish to NPM
+        shell: bash
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_API_TOKEN }}
+        run: npm publish --non-interactive --access public
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 03b5349..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-language: node_js
-dist: trusty
-sudo: required
-node_js: stable
-
-# Build only master and release tags
-branches:
-  only:
-  - master
-  - /^v\d+\.\d+\.\d+(\.\d+)?$/
-
-env:
-  matrix:
-  - PATH=$HOME/purescript:$PATH
-
-install: |
-  PURS_VERSION="$(curl -H "Authorization: token $GITHUB_API_TOKEN" --silent "https://api.github.com/repos/purescript/purescript/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')"
-  echo "PureScript version: $PURS_VERSION"
-  wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$PURS_VERSION/linux64.tar.gz
-  tar -xvf $HOME/purescript.tar.gz -C $HOME/
-  chmod a+x $HOME/purescript
-  npm install -g spago
-  npm install
-  spago install
-
-script:
-- npm run build
-- npm test
-# Check if it the app is able to build the search index for itself.
-- spago docs
-- ./dist/purescript-docs-search build-index
-
-deploy:
-  - provider: releases
-    api_key: $API_KEY
-    file:
-      - dist/docs-search-app.js
-      - dist/purescript-docs-search
-    skip_cleanup: true
-    on:
-      tags: true
-    script:
-      - echo 'done'
-  - provider: npm
-    api_token:
-      secure: $NPM_API_TOKEN
-    email: klntsky@gmail.com
-    skip_cleanup: true
-    edge: true
-    on:
-      tags: true
-      branch: master
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..f981064
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,990 @@
+{
+  "name": "purescript-docs-search",
+  "version": "0.0.11",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/node": {
+      "version": "14.14.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
+      "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw==",
+      "dev": true,
+      "optional": true
+    },
+    "@types/yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "requires": {
+        "debug": "4"
+      }
+    },
+    "ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "debug": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
+      "requires": {
+        "ms": "2.1.2"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "devtools-protocol": {
+      "version": "0.0.854822",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz",
+      "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==",
+      "dev": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "requires": {
+        "once": "^1.4.0"
+      }
+    },
+    "entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true
+    },
+    "esbuild": {
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.11.tgz",
+      "integrity": "sha512-iq5YdV63vY/nUAFIvY92BXVkYjMbOchnofLKoLKMPZIa4uuIJAJG9WRA+ZRjQBZbrsORUwvZcANeG2d3p46PJQ==",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "requires": {
+        "@types/yauzl": "^2.9.1",
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
+    },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "requires": {
+        "pump": "^3.0.0"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "6",
+        "debug": "4"
+      }
+    },
+    "ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "linkify-it": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz",
+      "integrity": "sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==",
+      "dev": true,
+      "requires": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "markdown-it": {
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.5.tgz",
+      "integrity": "sha512-9KB992Yy2TedaoKETgZPL2n3bmqqZxzUsZ4fxe2ho+/AYuQUz+iDKpfjLgKbg/lHcG6cGOj+L3gDrn9S2CxoRg==",
+      "dev": true,
+      "requires": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      }
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.47.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
+      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.30",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
+      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.47.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "requires": {
+        "minimist": "^1.2.5"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        }
+      }
+    },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "requires": {
+        "p-try": "^2.0.0"
+      }
+    },
+    "p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "requires": {
+        "find-up": "^4.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        }
+      }
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
+    },
+    "puppeteer": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz",
+      "integrity": "sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.854822",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "ws": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+          "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+          "dev": true
+        }
+      }
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "spago": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/spago/-/spago-0.20.0.tgz",
+      "integrity": "sha512-B0cvb1g5rjV80ovMT5MuNvUhfcXz0caEa3OPdydvYlvh6/WQZYa0S74or4PUPbRsiwhm9C1FCtfzzEk+yTKaHA==",
+      "dev": true,
+      "requires": {
+        "request": "^2.88.0",
+        "tar": "^4.4.8"
+      }
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "tar": {
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      }
+    },
+    "tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "requires": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
+    "unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "requires": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "dev": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        }
+      }
+    },
+    "uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dev": true,
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "dev": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
+    },
+    "yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  }
+}

From d8624318c4605c4aadc3baef2d77b1bf062c5824 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
Date: Mon, 19 Apr 2021 13:44:58 +0300
Subject: [PATCH 30/45] Add release script (#49)

---
 release.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 release.sh

diff --git a/release.sh b/release.sh
new file mode 100755
index 0000000..aa0f448
--- /dev/null
+++ b/release.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Please use this script to cut new releases.
+# It will create a tag and push it, which will trigger CI to create a release,
+# build release files, push them to the release, and publish a new version on NPM
+
+NEW_TAG=v$(jq -r ".version" package.json)
+
+# Fail if the new tag already exists
+if git rev-parse "${NEW_TAG}" >/dev/null 2>&1; then
+  echo "Tag '${NEW_TAG}' already exists, please bump the version in package.json";
+  exit 1;
+fi
+
+echo "Creating and pushing new tag '${NEW_TAG}'.."
+
+git tag "${NEW_TAG}"
+
+git push origin "${NEW_TAG}"
+
+echo "Done."
+

From b25fc1adce69aa5a79bb784ba664f70f37996af0 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
Date: Tue, 20 Apr 2021 16:10:29 +0300
Subject: [PATCH 31/45] Fix NPM publish in CI (#50)

---
 .github/workflows/release.yml | 5 ++++-
 ci-npmrc.txt                  | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 ci-npmrc.txt

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aad67e7..b612084 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,4 +49,7 @@ jobs:
         shell: bash
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_API_TOKEN }}
-        run: npm publish --non-interactive --access public
\ No newline at end of file
+        run: |
+          mv ci-npmrc.txt .npmrc
+          npm ci
+          npm publish --non-interactive --access public
\ No newline at end of file
diff --git a/ci-npmrc.txt b/ci-npmrc.txt
new file mode 100644
index 0000000..3c64dc6
--- /dev/null
+++ b/ci-npmrc.txt
@@ -0,0 +1,4 @@
+//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}
+registry=https://registry.npmjs.org/
+always-auth=true
+

From ad439e23db1d0547c961aa62997d6df7f774a067 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 10:44:44 +0100
Subject: [PATCH 32/45] Bump markdown-it from 12.0.5 to 12.3.2 (#55)

Bumps [markdown-it](https://github.com/markdown-it/markdown-it) from 12.0.5 to 12.3.2.
- [Release notes](https://github.com/markdown-it/markdown-it/releases)
- [Changelog](https://github.com/markdown-it/markdown-it/blob/master/CHANGELOG.md)
- [Commits](https://github.com/markdown-it/markdown-it/compare/12.0.5...12.3.2)

---
updated-dependencies:
- dependency-name: markdown-it
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f981064..6dad40c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -469,18 +469,18 @@
       }
     },
     "linkify-it": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz",
-      "integrity": "sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
       "dev": true,
       "requires": {
         "uc.micro": "^1.0.1"
       }
     },
     "markdown-it": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.5.tgz",
-      "integrity": "sha512-9KB992Yy2TedaoKETgZPL2n3bmqqZxzUsZ4fxe2ho+/AYuQUz+iDKpfjLgKbg/lHcG6cGOj+L3gDrn9S2CxoRg==",
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
       "dev": true,
       "requires": {
         "argparse": "^2.0.1",

From 2892933748ec34aa05c7db03ee331dfa1700aebe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:22:36 +0100
Subject: [PATCH 33/45] Bump tar from 4.4.13 to 4.4.19 (#53)

Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.13...v4.4.19)

---
updated-dependencies:
- dependency-name: tar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6dad40c..30f5fe8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -821,18 +821,18 @@
       }
     },
     "tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "dev": true,
-      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
+      "version": "4.4.19",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+      "dev": true,
+      "requires": {
+        "chownr": "^1.1.4",
+        "fs-minipass": "^1.2.7",
+        "minipass": "^2.9.0",
+        "minizlib": "^1.3.3",
+        "mkdirp": "^0.5.5",
+        "safe-buffer": "^5.2.1",
+        "yallist": "^3.1.1"
       }
     },
     "tar-fs": {

From 6cc8a7f44baeb71051caf0270cfacb3be3539065 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Sat, 7 May 2022 16:20:08 +0400
Subject: [PATCH 34/45] Add KindApp

---
 src/Docs/Search/App/SearchResults.purs |   3 +
 src/Docs/Search/TypeDecoder.purs       |   6 +
 src/Docs/Search/TypePrinter.purs       |   3 +
 src/Docs/Search/TypeQuery.purs         |   4 +
 src/Docs/Search/TypeShape.purs         |   3 +
 test/Main.purs                         | 272 +----------------------
 test/Test/TypeJson.purs                | 287 +++++++++++++++++++++++++
 7 files changed, 309 insertions(+), 269 deletions(-)
 create mode 100644 test/Test/TypeJson.purs

diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index 9a58d25..eb1f6c4 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -545,6 +545,9 @@ renderType = case _ of
              , renderType t2
              ]
 
+  KindApp t1 t2 ->
+    HH.span_ [ renderType t1, space, renderType t2 ]
+
   ty@(ForAll _ _ _) ->
     renderForAll ty
 
diff --git a/src/Docs/Search/TypeDecoder.purs b/src/Docs/Search/TypeDecoder.purs
index c7444cc..7422cd2 100644
--- a/src/Docs/Search/TypeDecoder.purs
+++ b/src/Docs/Search/TypeDecoder.purs
@@ -98,6 +98,8 @@ data Type
   | TypeOp QualifiedName
   -- | A type application
   | TypeApp Type Type
+  -- | Explicit kind application
+  | KindApp Type Type
   -- | Forall quantifier
   | ForAll String (Maybe Type) Type
   -- | A type withset of type class constraints
@@ -139,6 +141,9 @@ instance decodeJsonType :: DecodeJson Type where
       "TypeApp" ->
         decodeContents (decodeTuple TypeApp (const err)) (Left err) json
         where err = mkJsonError' "TypeApp" json
+      "KindApp" ->
+        decodeContents (decodeTuple KindApp (const err)) (Left err) json
+        where err = mkJsonError' "KindApp" json
       "ForAll" ->
         decodeContents
         (decodeTriple
@@ -180,6 +185,7 @@ instance encodeJsonType :: EncodeJson Type where
     TypeConstructor val    -> tagged "TypeConstructor" (encodeJson val)
     TypeOp          val    -> tagged "TypeOp"          (encodeJson val)
     TypeApp t1 t2          -> tagged "TypeApp"         (encodeTuple t1 t2)
+    KindApp t1 t2          -> tagged "KindApp"         (encodeTuple t1 t2)
     ForAll str Nothing ty  -> tagged "ForAll"          (encodeTriple str ty emptySkolemScope)
     ForAll str (Just k) ty -> tagged "ForAll"          (encodeQuadriple str k ty emptySkolemScope)
     ConstrainedType c t    -> tagged "ConstrainedType" (encodeTuple c t)
diff --git a/src/Docs/Search/TypePrinter.purs b/src/Docs/Search/TypePrinter.purs
index 6b3cfb5..2b6104b 100644
--- a/src/Docs/Search/TypePrinter.purs
+++ b/src/Docs/Search/TypePrinter.purs
@@ -37,6 +37,9 @@ showType = case _ of
   TypeApp t1 t2 ->
     showType t1 <> " " <> showType t2
 
+  KindApp t1 t2 ->
+    showType t1 <> " " <> showType t2
+
   ty@(ForAll _ _ _) ->
     showForAll ty
 
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index a102a1b..b3981ed 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -297,6 +297,9 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
     go acc ({ q, t: REmpty } : rest) =
       go (QueryMismatch q : acc) rest
 
+    go acc ({ q, t: t@(KindApp _ _) } : rest) =
+      go (TypeMismatch t : acc) rest
+
 
 -- | Sum various penalties.
 penalty :: TypeQuery -> Type -> Int
@@ -411,6 +414,7 @@ typeSize = go 0 <<< List.singleton
       go (n + 1) rest
     go n (TypeOp _ : rest) =
       go (n + 1) rest
+    go n (KindApp t1 t2 : res) = go n (t1 : t2 : res)
     go n (TypeApp (TypeApp (TypeConstructor
                     (QualifiedName { moduleNameParts: [ "Prim" ]
                                    , name: Identifier "Function" })) t1) t2 : rest) =
diff --git a/src/Docs/Search/TypeShape.purs b/src/Docs/Search/TypeShape.purs
index 69df8ec..8bec09e 100644
--- a/src/Docs/Search/TypeShape.purs
+++ b/src/Docs/Search/TypeShape.purs
@@ -115,6 +115,9 @@ shapeOfType ty = List.reverse $ go (pure ty) Nil
         TypeApp child1 child2 ->
           go (child1 : child2 : rest) (PApp : acc)
 
+        KindApp child1 child2 ->
+          go (child1 : child2 : rest) (PApp : acc)
+
         forallType@(ForAll _ _ _) ->
           go (foralls.ty : rest) (PForAll (List.length foralls.binders) : acc)
           where foralls = joinForAlls forallType
diff --git a/test/Main.purs b/test/Main.purs
index a2cd0b6..4225fa6 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -2,22 +2,14 @@ module Test.Main where
 
 import Prelude
 
-import Data.Argonaut.Core (Json)
-import Data.Argonaut.Decode (decodeJson)
-import Data.Argonaut.Parser (jsonParser)
-import Data.Either (Either(..))
-import Data.Maybe (Maybe(..))
-import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), QualifiedName(..), Type(..))
-import Docs.Search.Types (Identifier(..))
 import Effect (Effect)
-import Partial.Unsafe (unsafePartial)
 import Test.Declarations as Declarations
-import Test.Extra (assertRight)
 import Test.IndexBuilder as IndexBuilder
 import Test.ModuleIndex as ModuleIndex
 import Test.TypeQuery as TypeQuery
+import Test.TypeJson as TypeJson
 import Test.UI as UI
-import Test.Unit (TestSuite, suite, test)
+import Test.Unit (TestSuite)
 import Test.Unit.Main (runTest)
 
 main :: Effect Unit
@@ -25,268 +17,10 @@ main = do
   runTest mainTest
   UI.main
 
-mkJson :: String -> Json
-mkJson str =
-  unsafePartial $ case jsonParser str of
-    Right r -> r
-
 mainTest :: TestSuite
 mainTest = do
   TypeQuery.tests
+  TypeJson.tests
   IndexBuilder.tests
   Declarations.tests
   ModuleIndex.tests
-  suite "FunDeps decoder" do
-    test "FunDeps" do
-      let
-        funDeps = mkJson """
-          [
-             [
-               [
-                 "lhs",
-                 "rhs"
-               ],
-               [
-                 "output"
-               ]
-             ]
-           ]
-          """
-      assertRight (decodeJson funDeps)
-        (FunDeps [ FunDep { lhs: [ "lhs", "rhs" ]
-                          , rhs: [ "output"]
-                          }
-                 ])
-
-  suite "Constraint decoder" do
-    test "Constraint" do
-      let constraint = mkJson """
-      {
-        "constraintAnn": [],
-        "constraintClass": [
-          [
-            "Prim"
-          ],
-          "Partial"
-        ],
-        "constraintArgs": [],
-        "constraintData": null
-      }
-      """
-      assertRight (decodeJson constraint)
-        (Constraint { constraintClass: qualified ["Prim"] "Partial"
-                    , constraintArgs: []
-                    })
-
-  suite "Type decoder" do
-    test "TypeVar" do
-      let typeVar = mkJson """
-      {
-        "annotation": [],
-        "tag": "TypeVar",
-        "contents": "m"
-      }
-      """
-
-      assertRight (decodeJson typeVar)
-       (TypeVar "m")
-
-    test "TypeApp" do
-      let typeApp1 = mkJson """
-        {
-          "annotation": [],
-          "tag": "TypeApp",
-          "contents": [
-            {
-              "annotation": [],
-              "tag": "TypeConstructor",
-              "contents": [
-                [
-                  "Control",
-                  "Monad",
-                  "ST",
-                  "Internal"
-                ],
-                "ST"
-              ]
-            },
-            {
-              "annotation": [],
-              "tag": "TypeVar",
-              "contents": "h"
-            }
-          ]
-        }
-      """
-
-      assertRight (decodeJson typeApp1) $
-        TypeApp
-          (TypeConstructor (qualified [ "Control"
-                                      , "Monad"
-                                      , "ST"
-                                      , "Internal"
-                                      ]
-                            "ST"
-                           ))
-          (TypeVar "h")
-
-    test "TypeOp" do
-      let typeOp = mkJson """
-          {
-            "annotation": [],
-            "tag": "TypeOp",
-            "contents": [
-              [
-                "Data",
-                "NaturalTransformation"
-              ],
-              "~>"
-            ]
-          }
-      """
-      assertRight (decodeJson typeOp) $
-        TypeOp $ qualified [ "Data", "NaturalTransformation" ] "~>"
-
-    test "BinaryNoParens" do
-      let binaryNoParens = mkJson """
-      {
-        "annotation": [],
-        "tag": "BinaryNoParensType",
-        "contents": [
-          {
-            "annotation": [],
-            "tag": "TypeOp",
-            "contents": [
-              [
-                "Data",
-                "NaturalTransformation"
-              ],
-              "~>"
-            ]
-          },
-          {
-            "annotation": [],
-            "tag": "TypeVar",
-            "contents": "m"
-          },
-          {
-            "annotation": [],
-            "tag": "TypeVar",
-            "contents": "n"
-          }
-        ]
-      }
-      """
-
-      assertRight (decodeJson binaryNoParens) $
-        BinaryNoParensType
-        (TypeOp $ qualified ["Data", "NaturalTransformation"] "~>")
-        (TypeVar "m")
-        (TypeVar "n")
-
-    test "ParensInType" do
-      let parensInType = mkJson """
-        {
-          "annotation": [],
-          "tag": "ParensInType",
-          "contents": {
-            "annotation": [],
-            "tag": "TypeApp",
-            "contents": [
-              {
-                "annotation": [],
-                "tag": "TypeConstructor",
-                "contents": [
-                  [
-                    "Data",
-                    "Maybe"
-                  ],
-                  "Maybe"
-                ]
-              },
-              {
-                "annotation": [],
-                "tag": "TypeConstructor",
-                "contents": [
-                  [
-                    "Prim"
-                  ],
-                  "String"
-                ]
-              }
-            ]
-          }
-        }
-      """
-
-      assertRight (decodeJson parensInType) $
-        ParensInType $
-          TypeApp
-          (TypeConstructor (qualified [ "Data", "Maybe" ] "Maybe"))
-          (TypeConstructor (qualified [ "Prim" ] "String"))
-    test "RCons" do
-
-      let rcons = mkJson """
-      {
-        "annotation": [],
-        "tag": "RCons",
-        "contents": [
-          "tail",
-          {
-            "annotation": [],
-            "tag": "TypeApp",
-            "contents": [
-              {
-                "annotation": [],
-                "tag": "TypeConstructor",
-                "contents": [
-                  [
-                    "Data",
-                    "Symbol"
-                  ],
-                  "SProxy"
-                ]
-              },
-              {
-                "annotation": [],
-                "tag": "TypeVar",
-                "contents": "t"
-              }
-            ]
-          },
-          {
-            "annotation": [],
-            "tag": "REmpty"
-          }
-        ]
-      }
-      """
-
-      assertRight (decodeJson rcons) $
-        RCons
-          (Identifier "tail")
-          (TypeApp (TypeConstructor $ qualified [ "Data", "Symbol" ] "SProxy")
-                   (TypeVar "t"))
-          REmpty
-
-    test "ForAll #1" do
-      let forallJson = mkJson """
-      {"annotation":[],"tag":"ForAll","contents":["a",{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"String"]}]},{"annotation":[],"tag":"TypeVar","contents":"a"}]},null]}
-      """
-      assertRight (decodeJson forallJson) $
-        ForAll "a" Nothing (TypeApp (TypeApp (TypeConstructor $ qualified ["Prim"] "Function")
-                                     (TypeConstructor $ qualified ["Prim"] "String"))
-                            (TypeVar "a"))
-
-  suite "jsons" do
-
-    test "jsons #1" do
-      let json = mkJson """
-{"annotation":[],"tag":"ForAll","contents":["o",{"annotation":[],"tag":"ForAll","contents":["r",{"annotation":[],"tag":"ForAll","contents":["l",{"annotation":[],"tag":"ConstrainedType","contents":[{"constraintAnn":[],"constraintClass":[["Type","Data","Boolean"],"And"],"constraintArgs":[{"annotation":[],"tag":"TypeVar","contents":"l"},{"annotation":[],"tag":"TypeVar","contents":"r"},{"annotation":[],"tag":"TypeVar","contents":"o"}],"constraintData":null},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"l"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"r"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"o"}]}]}]}]},null]},null]},null]}
-      """
-
-      assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "o"))))))))
-
-
-qualified :: Array String -> String -> QualifiedName
-qualified moduleNameParts name = QualifiedName { moduleNameParts, name: Identifier name }
diff --git a/test/Test/TypeJson.purs b/test/Test/TypeJson.purs
new file mode 100644
index 0000000..be721d8
--- /dev/null
+++ b/test/Test/TypeJson.purs
@@ -0,0 +1,287 @@
+module Test.TypeJson
+       ( tests )
+where
+
+import Prelude
+
+import Docs.Search.TypeDecoder (Constraint(..), FunDep(..), FunDeps(..), QualifiedName(..), Type(..))
+import Docs.Search.Types (Identifier(..))
+import Test.Extra (assertRight)
+import Test.TypeQuery as TypeQuery
+
+import Data.Argonaut.Core (Json)
+import Data.Argonaut.Decode (decodeJson)
+import Data.Argonaut.Parser (jsonParser)
+import Data.Either (Either(..))
+import Data.Maybe (Maybe(..))
+import Partial.Unsafe (unsafePartial)
+import Test.Unit (TestSuite, suite, test)
+
+
+tests :: TestSuite
+tests = do
+  suite "FunDeps decoder" do
+    test "FunDeps" do
+      let
+        funDeps = mkJson """
+          [
+             [
+               [
+                 "lhs",
+                 "rhs"
+               ],
+               [
+                 "output"
+               ]
+             ]
+           ]
+          """
+      assertRight (decodeJson funDeps)
+        (FunDeps [ FunDep { lhs: [ "lhs", "rhs" ]
+                          , rhs: [ "output"]
+                          }
+                 ])
+
+  suite "Constraint decoder" do
+    test "Constraint" do
+      let constraint = mkJson """
+      {
+        "constraintAnn": [],
+        "constraintClass": [
+          [
+            "Prim"
+          ],
+          "Partial"
+        ],
+        "constraintArgs": [],
+        "constraintData": null
+      }
+      """
+      assertRight (decodeJson constraint)
+        (Constraint { constraintClass: qualified ["Prim"] "Partial"
+                    , constraintArgs: []
+                    })
+
+  suite "Type decoder" do
+    test "TypeVar" do
+      let typeVar = mkJson """
+      {
+        "annotation": [],
+        "tag": "TypeVar",
+        "contents": "m"
+      }
+      """
+
+      assertRight (decodeJson typeVar)
+       (TypeVar "m")
+
+    test "TypeApp" do
+      let typeApp1 = mkJson """
+        {
+          "annotation": [],
+          "tag": "TypeApp",
+          "contents": [
+            {
+              "annotation": [],
+              "tag": "TypeConstructor",
+              "contents": [
+                [
+                  "Control",
+                  "Monad",
+                  "ST",
+                  "Internal"
+                ],
+                "ST"
+              ]
+            },
+            {
+              "annotation": [],
+              "tag": "TypeVar",
+              "contents": "h"
+            }
+          ]
+        }
+      """
+
+      assertRight (decodeJson typeApp1) $
+        TypeApp
+          (TypeConstructor (qualified [ "Control"
+                                      , "Monad"
+                                      , "ST"
+                                      , "Internal"
+                                      ]
+                            "ST"
+                           ))
+          (TypeVar "h")
+
+    test "TypeOp" do
+      let typeOp = mkJson """
+          {
+            "annotation": [],
+            "tag": "TypeOp",
+            "contents": [
+              [
+                "Data",
+                "NaturalTransformation"
+              ],
+              "~>"
+            ]
+          }
+      """
+      assertRight (decodeJson typeOp) $
+        TypeOp $ qualified [ "Data", "NaturalTransformation" ] "~>"
+
+    test "BinaryNoParens" do
+      let binaryNoParens = mkJson """
+      {
+        "annotation": [],
+        "tag": "BinaryNoParensType",
+        "contents": [
+          {
+            "annotation": [],
+            "tag": "TypeOp",
+            "contents": [
+              [
+                "Data",
+                "NaturalTransformation"
+              ],
+              "~>"
+            ]
+          },
+          {
+            "annotation": [],
+            "tag": "TypeVar",
+            "contents": "m"
+          },
+          {
+            "annotation": [],
+            "tag": "TypeVar",
+            "contents": "n"
+          }
+        ]
+      }
+      """
+
+      assertRight (decodeJson binaryNoParens) $
+        BinaryNoParensType
+        (TypeOp $ qualified ["Data", "NaturalTransformation"] "~>")
+        (TypeVar "m")
+        (TypeVar "n")
+
+    test "ParensInType" do
+      let parensInType = mkJson """
+        {
+          "annotation": [],
+          "tag": "ParensInType",
+          "contents": {
+            "annotation": [],
+            "tag": "TypeApp",
+            "contents": [
+              {
+                "annotation": [],
+                "tag": "TypeConstructor",
+                "contents": [
+                  [
+                    "Data",
+                    "Maybe"
+                  ],
+                  "Maybe"
+                ]
+              },
+              {
+                "annotation": [],
+                "tag": "TypeConstructor",
+                "contents": [
+                  [
+                    "Prim"
+                  ],
+                  "String"
+                ]
+              }
+            ]
+          }
+        }
+      """
+
+      assertRight (decodeJson parensInType) $
+        ParensInType $
+          TypeApp
+          (TypeConstructor (qualified [ "Data", "Maybe" ] "Maybe"))
+          (TypeConstructor (qualified [ "Prim" ] "String"))
+    test "RCons" do
+
+      let rcons = mkJson """
+      {
+        "annotation": [],
+        "tag": "RCons",
+        "contents": [
+          "tail",
+          {
+            "annotation": [],
+            "tag": "TypeApp",
+            "contents": [
+              {
+                "annotation": [],
+                "tag": "TypeConstructor",
+                "contents": [
+                  [
+                    "Data",
+                    "Symbol"
+                  ],
+                  "SProxy"
+                ]
+              },
+              {
+                "annotation": [],
+                "tag": "TypeVar",
+                "contents": "t"
+              }
+            ]
+          },
+          {
+            "annotation": [],
+            "tag": "REmpty"
+          }
+        ]
+      }
+      """
+
+      assertRight (decodeJson rcons) $
+        RCons
+          (Identifier "tail")
+          (TypeApp (TypeConstructor $ qualified [ "Data", "Symbol" ] "SProxy")
+                   (TypeVar "t"))
+          REmpty
+
+    test "ForAll #1" do
+      let forallJson = mkJson """
+      {"annotation":[],"tag":"ForAll","contents":["a",{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"String"]}]},{"annotation":[],"tag":"TypeVar","contents":"a"}]},null]}
+      """
+      assertRight (decodeJson forallJson) $
+        ForAll "a" Nothing (TypeApp (TypeApp (TypeConstructor $ qualified ["Prim"] "Function")
+                                     (TypeConstructor $ qualified ["Prim"] "String"))
+                            (TypeVar "a"))
+
+    test "KindApp" do
+      let kindAppJson = mkJson """
+        {"annotation":[],"tag":"KindApp","contents":[{"annotation":[],"tag":"REmpty"},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Type"]}]}
+      """
+      assertRight (decodeJson kindAppJson) $
+        KindApp REmpty (TypeConstructor (qualified ["Prim"] "Type"))
+  suite "jsons" do
+
+    test "jsons #1" do
+      let json = mkJson """
+{"annotation":[],"tag":"ForAll","contents":["o",{"annotation":[],"tag":"ForAll","contents":["r",{"annotation":[],"tag":"ForAll","contents":["l",{"annotation":[],"tag":"ConstrainedType","contents":[{"constraintAnn":[],"constraintClass":[["Type","Data","Boolean"],"And"],"constraintArgs":[{"annotation":[],"tag":"TypeVar","contents":"l"},{"annotation":[],"tag":"TypeVar","contents":"r"},{"annotation":[],"tag":"TypeVar","contents":"o"}],"constraintData":null},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"l"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"r"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"o"}]}]}]}]},null]},null]},null]}
+      """
+
+      assertRight (decodeJson json) $ (ForAll "o" Nothing (ForAll "r" Nothing (ForAll "l" Nothing (ConstrainedType (Constraint { constraintArgs: [(TypeVar "l"),(TypeVar "r"),(TypeVar "o")], constraintClass: (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "And" }) }) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "l"))) (TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"], name: Identifier "Function" })) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "r"))) (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Type","Data","Boolean"], name: Identifier "BProxy" })) (TypeVar "o"))))))))
+
+
+qualified :: Array String -> String -> QualifiedName
+qualified = TypeQuery.qname
+
+mkJson :: String -> Json
+mkJson str =
+  unsafePartial $ case jsonParser str of
+    Right r -> r

From 66bffd8d29299d4613f8fb2bd1ad6745ef015084 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Sat, 7 May 2022 17:11:21 +0400
Subject: [PATCH 35/45] Add KindedType

---
 src/Docs/Search/App/SearchResults.purs |  3 +++
 src/Docs/Search/TypeDecoder.purs       |  8 +++++---
 src/Docs/Search/TypePrinter.purs       |  2 ++
 src/Docs/Search/TypeQuery.purs         | 17 +++++++++++------
 src/Docs/Search/TypeShape.purs         |  2 ++
 test/Test/TypeJson.purs                | 13 +++++++++++++
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index eb1f6c4..f5fb244 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -561,6 +561,9 @@ renderType = case _ of
   ty@REmpty -> renderRow true ty
   ty@(RCons _ _ _) -> renderRow true ty
 
+  Kinded t1 t2 ->
+    HH.span_ [ renderType t1, space, syntax "::", space, renderType t2 ]
+
   BinaryNoParensType op t1 t2 ->
     HH.span_
     [ renderType t1
diff --git a/src/Docs/Search/TypeDecoder.purs b/src/Docs/Search/TypeDecoder.purs
index 7422cd2..ff49e9b 100644
--- a/src/Docs/Search/TypeDecoder.purs
+++ b/src/Docs/Search/TypeDecoder.purs
@@ -112,10 +112,8 @@ data Type
   | REmpty
   -- | A non-empty row
   | RCons Identifier Type Type
-  {-
   -- | A type with a kind annotation
-  | Kinded Type Kind
-  -}
+  | Kinded Type Type
   -- | Binary operator application. During the rebracketing phase of desugaring,
   -- this data constructor will be removed.
   | BinaryNoParensType Type Type Type
@@ -168,6 +166,9 @@ instance decodeJsonType :: DecodeJson Type where
       "RCons" ->
         decodeContents (decodeTriple RCons (const err)) (Left err) json
         where err = mkJsonError' "RCons" json
+      "KindedType" ->
+        decodeContents (decodeTuple Kinded (const err)) (Left err) json
+        where err = mkJsonError' "KindedType" json
       "BinaryNoParensType" ->
         decodeContents (decodeTriple BinaryNoParensType (const err)) (Left err) json
         where err = mkJsonError' "BinaryNoParens" json
@@ -191,6 +192,7 @@ instance encodeJsonType :: EncodeJson Type where
     ConstrainedType c t    -> tagged "ConstrainedType" (encodeTuple c t)
     REmpty                 -> tagged "REmpty"          jsonEmptyObject
     RCons s t1 t2          -> tagged "RCons"           (encodeTriple s t1 t2)
+    Kinded t1 t2           -> tagged "KindedType"      (encodeTuple t1 t2)
     ParensInType t         -> tagged "ParensInType"    (encodeJson t)
     TypeWildcard           -> tagged "TypeWildcard"    jsonEmptyObject
     BinaryNoParensType t1 t2 t3 ->
diff --git a/src/Docs/Search/TypePrinter.purs b/src/Docs/Search/TypePrinter.purs
index 2b6104b..e48d789 100644
--- a/src/Docs/Search/TypePrinter.purs
+++ b/src/Docs/Search/TypePrinter.purs
@@ -51,6 +51,8 @@ showType = case _ of
   ty@REmpty -> showRow true ty
   ty@(RCons _ _ _) -> showRow true ty
 
+  Kinded t1 t2 -> showType t1 <> " :: " <> showType t2
+
   BinaryNoParensType op t1 t2 ->
     showType t1 <>
     space <>
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index b3981ed..e896949 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -236,13 +236,13 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
     -- * Names
     go acc ({ q: QConst qname, t: TypeConstructor (QualifiedName { name }) } : rest) =
       go (Match qname name : acc) rest
-    go acc ({ q: QConst qname, t } : rest) =
+    go acc ({ q: QConst _, t } : rest) =
       go (TypeMismatch t : acc) rest
-    go acc ({ q, t: TypeConstructor (QualifiedName { name }) } : rest) =
+    go acc ({ q, t: TypeConstructor (QualifiedName _) } : rest) =
       go (QueryMismatch q : acc) rest
 
     -- type operators can't appear in type queries: this is always a mismatch
-    go acc ({ q, t: TypeOp (QualifiedName { name }) } : rest) =
+    go acc ({ q, t: TypeOp (QualifiedName _) } : rest) =
       go (QueryMismatch q : acc) rest
     go acc ({ q, t: t@(BinaryNoParensType _ _ _) } : rest) =
       go (Mismatch q t : acc) rest
@@ -253,7 +253,7 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
                                     (QualifiedName { moduleNameParts: [ "Prim" ]
                                                    , name: Identifier "Function" })) t1) t2 } : rest) =
       go acc ({ q: q1, t: t1 } : { q: q2, t: t2 } : rest)
-    go acc ({ q: q@(QFun q1 q2), t } : rest) =
+    go acc ({ q: q@(QFun _ _), t } : rest) =
       go (Mismatch q t : acc) rest
 
     -- * Rows
@@ -261,7 +261,7 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
             , t: TypeApp (TypeConstructor
                            (QualifiedName { moduleNameParts: [ "Prim" ]
                                           , name: Identifier "Record" })) row } : rest) =
-      let { rows, ty } = joinRows row
+      let { rows } = joinRows row
           qRowsLength = List.length qRows
           rowsLength = List.length rows in
         if rowsLength == qRowsLength then
@@ -297,7 +297,10 @@ unify query type_ = go Nil (List.singleton { q: query, t: type_ })
     go acc ({ q, t: REmpty } : rest) =
       go (QueryMismatch q : acc) rest
 
-    go acc ({ q, t: t@(KindApp _ _) } : rest) =
+    go acc ({ q, t: Kinded _ _} : rest) =
+      go (QueryMismatch q : acc) rest
+
+    go acc ({ t: t@(KindApp _ _) } : rest) =
       go (TypeMismatch t : acc) rest
 
 
@@ -429,6 +432,8 @@ typeSize = go 0 <<< List.singleton
       go (n + 1) (t1 : t2 : rest)
     go n (REmpty : rest) =
       go (n + 1) rest
+    go n (Kinded t1 t2 : rest) =
+      go n (t1 : t2 : rest)
     go n (BinaryNoParensType op t1 t2 : rest) =
       go (n + 1) (t1 : t2 : rest)
     go n (ParensInType t : rest) =
diff --git a/src/Docs/Search/TypeShape.purs b/src/Docs/Search/TypeShape.purs
index 8bec09e..25e1784 100644
--- a/src/Docs/Search/TypeShape.purs
+++ b/src/Docs/Search/TypeShape.purs
@@ -139,6 +139,8 @@ shapeOfType ty = List.reverse $ go (pure ty) Nil
             sorted = List.sortBy (\x y -> compare x.row y.row) joined.rows
             typesInRow = sorted <#> (_.ty)
 
+        Kinded t1 _t2 -> go (t1 : rest) acc
+
         BinaryNoParensType op l r ->
           go (TypeApp (TypeApp op l) r : rest) acc
 
diff --git a/test/Test/TypeJson.purs b/test/Test/TypeJson.purs
index be721d8..34ef1d4 100644
--- a/test/Test/TypeJson.purs
+++ b/test/Test/TypeJson.purs
@@ -268,6 +268,19 @@ tests = do
       """
       assertRight (decodeJson kindAppJson) $
         KindApp REmpty (TypeConstructor (qualified ["Prim"] "Type"))
+    test "KindedType" do
+      let kindedTypeJson = mkJson """
+      {"annotation":[],"tag":"KindedType","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Data","Const"],"Const"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Data","Void"],"Void"]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Type"]}]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Type"]}]}]}
+      """
+      assertRight (decodeJson kindedTypeJson) $
+        Kinded
+        (TypeApp
+         (TypeConstructor (qualified ["Data","Const"] "Const"))
+         (TypeConstructor (qualified ["Data","Void"] "Void")))
+        (TypeApp (TypeApp
+                  (TypeConstructor (qualified ["Prim"] "Function"))
+                  (TypeConstructor (qualified ["Prim"] "Type" )))
+         (TypeConstructor (qualified ["Prim"] "Type")))
   suite "jsons" do
 
     test "jsons #1" do

From 7ef455f041dea9b0fb870fd26dd129618249652d Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Sun, 8 May 2022 21:06:38 +0400
Subject: [PATCH 36/45] Fix everything except toppoki tests

---
 package.json                           |   3 +-
 packages.dhall                         |  74 +--
 spago.dhall                            |   3 +-
 src/Docs/Search/App.purs               |  10 +-
 src/Docs/Search/App/SearchField.purs   |   2 +-
 src/Docs/Search/App/SearchResults.purs |   4 +-
 src/Docs/Search/App/Sidebar.purs       |   8 +-
 src/Docs/Search/BrowserEngine.js       |   2 +-
 src/Docs/Search/IndexBuilder.js        |   9 +-
 src/Docs/Search/IndexBuilder.purs      |   7 +-
 src/Docs/Search/Loader.js              |   2 +-
 src/Docs/Search/ModuleIndex.js         |   2 +-
 src/Docs/Search/ModuleIndex.purs       |   7 +-
 src/Docs/Search/TypeIndex.js           |   2 +-
 src/Docs/Search/TypeQuery.purs         |   6 +-
 src/Docs/Search/TypeShape.js           |   2 +-
 src/Docs/Search/URIHash.js             |   2 +-
 src/Docs/Search/URIHash.purs           |   4 +-
 test/Main.purs                         |  10 +-
 test/Test/Declarations.purs            |  25 +-
 test/Test/Extra.purs                   |  11 +-
 test/Test/IndexBuilder.purs            |  18 +-
 test/Test/ModuleIndex.purs             |  18 +-
 test/Test/TypeJson.purs                |  36 +-
 test/Test/TypeQuery.purs               | 612 ++++++++++++++++---------
 25 files changed, 526 insertions(+), 353 deletions(-)

diff --git a/package.json b/package.json
index 9408b69..9f5307e 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "purescript-docs-search",
+  "type": "module",
   "version": "0.0.11",
   "description": "Search frontend for the documentation generated by the PureScript compiler.",
   "directories": {
@@ -19,7 +20,7 @@
     "bundle-app": "spago bundle-app --no-build --no-install -m Docs.Search.App --to dist/docs-search-app.js",
     "esbuild-app": "esbuild dist/docs-search-app.js --target=es2016 --bundle --minify --outfile=dist/docs-search-app.min.js && mv dist/docs-search-app.min.js dist/docs-search-app.js",
     "build-app": "npm run bundle-app && npm run esbuild-app",
-    "bundle-main": "spago bundle-app --no-build --no-install -m Docs.Search.Main --to dist/main.js",
+    "bundle-main": "spago bundle-app --no-build --no-install --platform node -m Docs.Search.Main --to dist/main.js",
     "esbuild-main": "esbuild dist/main.js --platform=node --bundle --minify --outfile=dist/main.min.js && mv dist/main.min.js dist/main.js",
     "add-shebang": "echo \"#!/usr/bin/env node\" > dist/purescript-docs-search && cat dist/main.js >> dist/purescript-docs-search",
     "chmod-main": "chmod +x dist/purescript-docs-search",
diff --git a/packages.dhall b/packages.dhall
index d07e1eb..edd8fff 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -1,8 +1,10 @@
 let mkPackage =
-      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
+      https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.2-20190725/src/mkPackage.dhall
+        sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210409/packages.dhall sha256:e81c2f2ce790c0e0d79869d22f7a37d16caeb5bd81cfda71d46c58f6199fd33f
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220506/packages.dhall
+        sha256:f83b68ff07cf6557e82379e749118e6ff11eecc6be5754540aae855cd1e46917
 
 let overrides = {=}
 
@@ -33,12 +35,7 @@ let additions =
             , "web-uievents"
             ]
             "https://github.com/purescript-halogen/purescript-halogen.git"
-            "v6.1.0"
-      , halogen-css =
-          mkPackage
-            [ "halogen" ]
-            "https://github.com/slamdata/purescript-halogen-css.git"
-            "v8.0.0"
+            "v7.0.0"
       , memoize =
           mkPackage
             [ "prelude"
@@ -67,8 +64,8 @@ let additions =
             , "free"
             , "memoize"
             ]
-            "https://github.com/srghma/purescript-optparse.git"
-            "d49b03fcd35f5be167e9c5c44ab1c17ca0956fb1"
+            "https://github.com/klntsky/purescript-optparse.git"
+            "2fe4265b7c6b09744c11190a43ca06777c752473"
       , exitcodes =
           mkPackage
             [ "enums" ]
@@ -77,30 +74,42 @@ let additions =
       , markdown-it =
           mkPackage
             [ "prelude", "effect", "options" ]
-            "https://github.com/nonbili/purescript-markdown-it.git"
-            "v0.4.0"
+            "https://github.com/klntsky/purescript-markdown-it.git"
+            "f3b7654783a83a80d7c09b6caaa7cd40b93ddce1"
+      , string-parsers =
+          mkPackage
+            [ "arrays"
+            , "assert"
+            , "bifunctors"
+            , "console"
+            , "control"
+            , "effect"
+            , "either"
+            , "enums"
+            , "foldable-traversable"
+            , "lists"
+            , "maybe"
+            , "minibench"
+            , "nonempty"
+            , "partial"
+            , "prelude"
+            , "strings"
+            , "tailrec"
+            , "transformers"
+            , "unfoldable"
+            ]
+            "https://github.com/purescript-contrib/purescript-string-parsers.git"
+            "v8.0.0"
       , html-parser-halogen =
           mkPackage
             [ "string-parsers", "halogen" ]
-            "https://github.com/rnons/purescript-html-parser-halogen.git"
-            "458e492e441fcf69a66911b7b64beea5849e0dad"
+            "https://github.com/klntsky/purescript-html-parser-halogen.git"
+            "5c31890d060d5abd0038fed6acd3f999a9362369"
       , markdown-it-halogen =
           mkPackage
             [ "markdown-it", "html-parser-halogen" ]
             "https://github.com/nonbili/purescript-markdown-it-halogen.git"
             "08c9625015bf04214be14e45230e8ce12f3fa2bf"
-      , toppokki =
-          mkPackage
-            [ "prelude"
-            , "record"
-            , "functions"
-            , "node-http"
-            , "aff-promise"
-            , "node-buffer"
-            , "node-fs-aff"
-            ]
-            "https://github.com/justinwoo/purescript-toppokki.git"
-            "v2.4.0"
       , search-trie =
           mkPackage
             [ "prelude"
@@ -126,7 +135,18 @@ let additions =
             , "transformers"
             ]
             "https://github.com/purescript-contrib/purescript-css.git"
-            "5c1a44ee95c259352a2b4570b060de14130540bc"
+            "710d6a742beb88299faf08aaeb997ee1e24483ab"
+      , jest =
+          mkPackage
+            [ "aff"
+            , "aff-promise"
+            , "effect"
+            , "prelude"
+            , "psci-support"
+            , "foldable-traversable"
+            ]
+            "https://github.com/klntsky/purescript-jest.git"
+            "7feaa5a880fc75002c4eca312993174e7220252b"
       }
 
 in  upstream // overrides // additions
diff --git a/spago.dhall b/spago.dhall
index 3f4faf9..e1712f8 100644
--- a/spago.dhall
+++ b/spago.dhall
@@ -39,10 +39,9 @@
   , "profunctor"
   , "profunctor-lenses"
   , "search-trie"
+  , "spec"
   , "string-parsers"
   , "strings"
-  , "test-unit"
-  , "toppokki"
   , "transformers"
   , "tuples"
   , "unfoldable"
diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index 6450edb..b5f005b 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -86,7 +86,7 @@ main = do
       srio <- runUI resultsComponent unit searchResults
 
       void $ H.liftEffect $ subscribe sfio.messages $ \sfm -> do
-        launchAff_ do
+        launchAff_ $ void do
           srio.query (SearchResults.MessageFromSearchField sfm unit)
 
       -- We need to read the URI hash only when both components are initialized and
@@ -97,8 +97,8 @@ main = do
       H.liftEffect do
 
         listener <-
-          eventListener \event ->
-            launchAff_ do
+          eventListener \_event ->
+            launchAff_ $ void do
               sfio.query $ SearchField.ReadURIHash unit
 
         addEventListener hashchange listener true (Window.toEventTarget window)
@@ -111,8 +111,8 @@ main = do
       H.liftEffect do
 
         listener <-
-          eventListener \event ->
-            launchAff_ do
+          eventListener \_event ->
+            launchAff_ $ void do
               sbio.query $ Sidebar.UpdateModuleGrouping unit
 
         addEventListener focus listener true (Window.toEventTarget window)
diff --git a/src/Docs/Search/App/SearchField.purs b/src/Docs/Search/App/SearchField.purs
index 42e91cc..708b085 100644
--- a/src/Docs/Search/App/SearchField.purs
+++ b/src/Docs/Search/App/SearchField.purs
@@ -156,7 +156,7 @@ render state =
   [ HH.input
     [ HP.value state.input
     , HP.placeholder "Search for definitions... (S to focus)"
-    , HP.id_ "docs-search-query-field"
+    , HP.id "docs-search-query-field"
     , HP.type_ HP.InputText
     , HE.onKeyUp (\event ->
                    case KeyboardEvent.code event of
diff --git a/src/Docs/Search/App/SearchResults.purs b/src/Docs/Search/App/SearchResults.purs
index f5fb244..2f9868c 100644
--- a/src/Docs/Search/App/SearchResults.purs
+++ b/src/Docs/Search/App/SearchResults.purs
@@ -202,9 +202,9 @@ render state@{ mode: Active } =
   , HH.div_ $
     Array.concat $ shownResults <#> renderResult state
 
-  , HH.div [ HP.class_ (wrap "load_more"), HP.id_ "load-more" ]
+  , HH.div [ HP.class_ (wrap "load_more"), HP.id "load-more" ]
     [ if Array.length shownResults < Array.length state.results
-      then HH.a [ HP.id_ "load-more-link"
+      then HH.a [ HP.id "load-more-link"
                 , HE.onClick $ const MoreResultsRequested ]
            [ HH.text "Show more results" ]
       else HH.p_
diff --git a/src/Docs/Search/App/Sidebar.purs b/src/Docs/Search/App/Sidebar.purs
index 35f30b5..3d7c2d5 100644
--- a/src/Docs/Search/App/Sidebar.purs
+++ b/src/Docs/Search/App/Sidebar.purs
@@ -17,7 +17,6 @@ import Data.Maybe (Maybe(..), isJust, fromMaybe)
 import Data.Newtype (wrap, unwrap)
 import Data.Set (Set)
 import Data.Set as Set
-import Data.Symbol (SProxy(..))
 import Data.Tuple.Nested (type (/\), (/\))
 import Effect (Effect)
 import Effect.Aff (Aff)
@@ -25,6 +24,7 @@ import Halogen as H
 import Halogen.HTML as HH
 import Halogen.HTML.Events as HE
 import Halogen.HTML.Properties as HP
+import Type.Proxy (Proxy(..))
 import Web.HTML as HTML
 import Web.HTML.Window as Window
 import Web.Storage.Storage as Storage
@@ -131,7 +131,7 @@ render state@{ groupingMode, moduleNames, localPackageName } =
          ]
 
   [ HH.h3_ [ HH.text $ if groupingMode == DontGroup then "Modules" else "Packages" ]
-  , HH.input [ HP.id_ "group-modules__input"
+  , HH.input [ HP.id "group-modules__input"
              , HP.type_ HP.InputCheckbox
              , HP.checked (groupingMode == GroupByPackage)
              , HE.onChecked $ ToggleGrouping <<< isCheckedToGroupingMode
@@ -139,7 +139,7 @@ render state@{ groupingMode, moduleNames, localPackageName } =
 
   , HH.text " "
   , HH.label [ HP.for "group-modules__input"
-             , HP.id_ "group-modules__label"
+             , HP.id "group-modules__label"
              ]
     [ HH.text " GROUP BY PACKAGE" ]
 
@@ -215,4 +215,4 @@ isCheckedToGroupingMode = if _ then GroupByPackage else DontGroup
 -- Some optics:
 
 _groupingMode :: forall a b rest.  (a -> b) -> { groupingMode :: a | rest } -> { groupingMode :: b | rest }
-_groupingMode = prop (SProxy :: SProxy "groupingMode")
+_groupingMode = prop (Proxy :: Proxy "groupingMode")
diff --git a/src/Docs/Search/BrowserEngine.js b/src/Docs/Search/BrowserEngine.js
index cb9bd47..3e98f4d 100644
--- a/src/Docs/Search/BrowserEngine.js
+++ b/src/Docs/Search/BrowserEngine.js
@@ -1,6 +1,6 @@
 /* global exports */
 
-exports.loadIndex_ = function (partId) {
+export function loadIndex_ (partId) {
   return function (url) {
     return function () {
       return new Promise(function(resolve, reject) {
diff --git a/src/Docs/Search/IndexBuilder.js b/src/Docs/Search/IndexBuilder.js
index 65f01d1..87d5d61 100644
--- a/src/Docs/Search/IndexBuilder.js
+++ b/src/Docs/Search/IndexBuilder.js
@@ -1,14 +1,13 @@
 /* global __dirname require exports */
 
-var path = require('path');
-var glob = require('glob');
+import globMain from "glob";
 
-exports.getDirname = function () {
+export function getDirname () {
   return __dirname;
 };
 
-exports.glob = function (pattern) {
+export function glob (pattern) {
   return function () {
-    return glob.sync(pattern);
+    return globMain.sync(pattern);
   };
 };
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index c03b508..20f2de9 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -43,7 +43,8 @@ import Effect.Aff (Aff, launchAff_, parallel, sequential)
 import Effect.Class (liftEffect)
 import Effect.Console (log)
 import Node.Encoding (Encoding(UTF8))
-import Node.FS.Aff (exists, mkdir, readFile, readTextFile, readdir, stat, writeFile, writeTextFile)
+import Node.FS.Aff (mkdir, readFile, readTextFile, readdir, stat, writeFile, writeTextFile)
+import Node.FS.Sync (exists)
 import Node.FS.Stats (isDirectory, isFile)
 import Node.Process as Process
 import Web.Bower.PackageMeta (PackageMeta(..))
@@ -369,7 +370,7 @@ copyAppFile { generatedDocs } = do
 
 directoryExists :: String -> Aff Boolean
 directoryExists path = do
-  doesExist <- exists path
+  doesExist <- liftEffect $ exists path
   case doesExist of
     false -> pure false
     true -> isDirectory <$> stat path
@@ -377,7 +378,7 @@ directoryExists path = do
 
 fileExists :: String -> Aff Boolean
 fileExists path = do
-  doesExist <- exists path
+  doesExist <- liftEffect $ exists path
   case doesExist of
     false -> pure false
     true -> isFile <$> stat path
diff --git a/src/Docs/Search/Loader.js b/src/Docs/Search/Loader.js
index 0dfd479..83dcb57 100644
--- a/src/Docs/Search/Loader.js
+++ b/src/Docs/Search/Loader.js
@@ -1,6 +1,6 @@
 /* global exports */
 
-exports.loadFromScript = function (globalIdentifier) {
+export function loadFromScript (globalIdentifier) {
   return function (url) {
     return function () {
       return new Promise(function (resolve, reject) {
diff --git a/src/Docs/Search/ModuleIndex.js b/src/Docs/Search/ModuleIndex.js
index fd74abc..65d31c4 100644
--- a/src/Docs/Search/ModuleIndex.js
+++ b/src/Docs/Search/ModuleIndex.js
@@ -1,6 +1,6 @@
 /* global exports */
 
-exports.load = function (url) {
+export function load (url) {
   return function () {
     return new Promise(function (resolve, reject) {
       if (typeof window.DocsSearchModuleIndex === 'undefined') {
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index f9913c4..f554c55 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -30,12 +30,11 @@ import Data.Set as Set
 import Data.String.CodeUnits (toCharArray) as String
 import Data.String.Common (split, toLower) as String
 import Data.String.Pattern (Pattern(..))
-import Data.Symbol (SProxy(..))
 import Data.Traversable (foldr, for_)
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff)
-
+import Type.Proxy (Proxy(..))
 
 -- | Module index that is actually stored in a JS file.
 type PackedModuleIndex = Map PackageInfo (Set ModuleName)
@@ -116,7 +115,7 @@ foreign import load
 
 
 _modulePackages :: forall a b rest.  (a -> b) -> { modulePackages :: a | rest } -> { modulePackages :: b | rest }
-_modulePackages = prop (SProxy :: SProxy "modulePackages")
+_modulePackages = prop (Proxy :: Proxy "modulePackages")
 
 _index :: forall a b rest.  (a -> b) -> { index :: a | rest } -> { index :: b | rest }
-_index = prop (SProxy :: SProxy "index")
+_index = prop (Proxy :: Proxy "index")
diff --git a/src/Docs/Search/TypeIndex.js b/src/Docs/Search/TypeIndex.js
index ac97073..291d954 100644
--- a/src/Docs/Search/TypeIndex.js
+++ b/src/Docs/Search/TypeIndex.js
@@ -1,6 +1,6 @@
 /* global exports */
 
-exports.lookup_ = function (shape) {
+export function lookup_ (shape) {
   return function (url) {
     return function () {
       return new Promise(function (resolve, reject) {
diff --git a/src/Docs/Search/TypeQuery.purs b/src/Docs/Search/TypeQuery.purs
index e896949..8abd935 100644
--- a/src/Docs/Search/TypeQuery.purs
+++ b/src/Docs/Search/TypeQuery.purs
@@ -34,9 +34,9 @@ import Data.Set as Set
 import Data.String.CodeUnits (fromCharArray)
 import Data.String.Common (trim) as String
 import Data.Tuple (Tuple(..), fst, snd)
-import Text.Parsing.StringParser (ParseError, Parser, runParser, try)
-import Text.Parsing.StringParser.CodePoints (alphaNum, anyLetter, char, eof, lowerCaseChar, skipSpaces, string, upperCaseChar)
-import Text.Parsing.StringParser.Combinators (fix, sepBy, sepBy1, sepEndBy, sepEndBy1)
+import StringParser (ParseError, Parser, runParser, try)
+import StringParser.CodePoints (alphaNum, anyLetter, char, eof, lowerCaseChar, skipSpaces, string, upperCaseChar)
+import StringParser.Combinators (fix, sepBy, sepBy1, sepEndBy, sepEndBy1)
 
 
 -- | We need type queries because we don't have a full-featured type parser
diff --git a/src/Docs/Search/TypeShape.js b/src/Docs/Search/TypeShape.js
index 19ecd86..5aef111 100644
--- a/src/Docs/Search/TypeShape.js
+++ b/src/Docs/Search/TypeShape.js
@@ -1,6 +1,6 @@
 /* global exports */
 
-exports.hash = function (string) {
+export function hash (string) {
   var hash = Math.floor(Number.MAX_SAFE_INTEGER / 2);
   if (string.length == 0) {
     return hash;
diff --git a/src/Docs/Search/URIHash.js b/src/Docs/Search/URIHash.js
index bc61d56..f0c23d4 100644
--- a/src/Docs/Search/URIHash.js
+++ b/src/Docs/Search/URIHash.js
@@ -1,7 +1,7 @@
 /* global exports history */
 
 // https://stackoverflow.com/questions/1397329
-exports.removeHash = function () {
+export function removeHash () {
     var scrollV, scrollH, loc = window.location;
     if ("pushState" in history)
         history.pushState("", document.title, loc.pathname + loc.search);
diff --git a/src/Docs/Search/URIHash.purs b/src/Docs/Search/URIHash.purs
index 9f65f82..40bdcb5 100644
--- a/src/Docs/Search/URIHash.purs
+++ b/src/Docs/Search/URIHash.purs
@@ -7,7 +7,7 @@ where
 
 import Prelude
 
-import Data.Maybe (Maybe(Just), fromMaybe)
+import Data.Maybe (fromMaybe)
 import Data.String.CodeUnits as String
 import Effect (Effect)
 import JSURI (decodeURIComponent, encodeURIComponent)
@@ -31,7 +31,7 @@ getInput = do
   location <- Window.location window
   hash <- Location.hash location
   pure $
-    if String.slice 0 8 hash == Just "#search:"
+    if String.slice 0 8 hash == "#search:"
     then fromMaybe "" $
          decodeURIComponent $
          String.drop 8 hash
diff --git a/test/Main.purs b/test/Main.purs
index 4225fa6..7fb7e27 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -9,15 +9,17 @@ import Test.ModuleIndex as ModuleIndex
 import Test.TypeQuery as TypeQuery
 import Test.TypeJson as TypeJson
 import Test.UI as UI
-import Test.Unit (TestSuite)
-import Test.Unit.Main (runTest)
+import Test.Spec (Spec)
+import Test.Spec.Reporter.Console (consoleReporter)
+import Test.Spec.Runner (runSpec)
+import Effect.Aff (launchAff_)
 
 main :: Effect Unit
 main = do
-  runTest mainTest
+  launchAff_ $ runSpec [consoleReporter] mainTest
   UI.main
 
-mainTest :: TestSuite
+mainTest :: Spec Unit
 mainTest = do
   TypeQuery.tests
   TypeJson.tests
diff --git a/test/Test/Declarations.purs b/test/Test/Declarations.purs
index 60ea61d..ec9de37 100644
--- a/test/Test/Declarations.purs
+++ b/test/Test/Declarations.purs
@@ -7,33 +7,32 @@ import Docs.Search.Types (PackageName(..), PackageInfo(..))
 
 import Data.Maybe (Maybe(..))
 import Data.Newtype (wrap)
+import Test.Spec (Spec, describe, it)
+import Test.Spec.Assertions (shouldEqual)
 
-import Test.Unit (TestSuite, suite, test)
-import Test.Unit.Assert as Assert
-
-tests :: TestSuite
+tests :: Spec Unit
 tests = do
-  suite "Declarations" do
-    test "extractPackageName" do
-      Assert.equal Builtin (extractPackageName (wrap "Prim") Nothing)
-      Assert.equal Builtin (extractPackageName (wrap "Prim.Foo") Nothing)
-      Assert.equal Builtin (extractPackageName (wrap "Prim.Foo.Bar") Nothing)
-      Assert.equal UnknownPackage (extractPackageName (wrap "Primitive") Nothing)
-      Assert.equal (Package $ PackageName "foo")
+  describe "Declarations" do
+    it "extractPackageName works correctly" do
+      Builtin `shouldEqual` (extractPackageName (wrap "Prim") Nothing)
+      Builtin `shouldEqual` (extractPackageName (wrap "Prim.Foo") Nothing)
+      Builtin `shouldEqual` (extractPackageName (wrap "Prim.Foo.Bar") Nothing)
+      UnknownPackage `shouldEqual` (extractPackageName (wrap "Primitive") Nothing)
+      Package (PackageName "foo") `shouldEqual`
         (extractPackageName (wrap "Foo") $
          Just { start: []
               , end: []
               , name: ".spago/foo/src/Foo.purs"
               }
         )
-      Assert.equal (Package $ PackageName "bar")
+      Package (PackageName "bar") `shouldEqual`
         (extractPackageName (wrap "Bar") $
          Just { start: []
               , end: []
               , name: "/path/to/somewhere/bower_components/bar/src/Bar.purs"
               }
         )
-      Assert.equal LocalPackage
+      LocalPackage `shouldEqual`
         (extractPackageName (wrap "Bar") $
          Just { start: []
               , end: []
diff --git a/test/Test/Extra.purs b/test/Test/Extra.purs
index 8f0d56f..ae85744 100644
--- a/test/Test/Extra.purs
+++ b/test/Test/Extra.purs
@@ -4,7 +4,8 @@ import Prelude
 
 import Data.Either (Either(..))
 import Effect.Aff (Aff)
-import Test.Unit.Assert as Assert
+import Test.Spec.Assertions (shouldEqual)
+
 
 assertRight
   :: forall a b
@@ -17,7 +18,7 @@ assertRight
   -> Aff Unit
 assertRight eiActual expected =
   case eiActual of
-    Left string -> do
-      Assert.equal (Right expected) eiActual
-    Right actual -> do
-      Assert.equal (Right expected) eiActual
+    Left _ -> do
+      Right expected `shouldEqual` eiActual
+    Right _ -> do
+      Right expected `shouldEqual` eiActual
diff --git a/test/Test/IndexBuilder.purs b/test/Test/IndexBuilder.purs
index 9c48caf..1215680 100644
--- a/test/Test/IndexBuilder.purs
+++ b/test/Test/IndexBuilder.purs
@@ -5,16 +5,16 @@ import Prelude
 import Docs.Search.IndexBuilder (patchHTML)
 
 import Data.Tuple (snd)
-import Test.Unit (TestSuite, suite, test)
-import Test.Unit.Assert as Assert
+import Test.Spec (Spec, describe, it)
+import Test.Spec.Assertions (shouldEqual, shouldNotSatisfy)
 
-tests :: TestSuite
+tests :: Spec Unit
 tests = do
-  suite "IndexBuilder" do
-    suite "patchHTML" do
-      test "works" do
+  describe "IndexBuilder" do
+    describe "patchHTML" do
+      it "works" do
         let input = "</body>"
-        Assert.assertFalse "patchHTML works" (snd (patchHTML input) == input)
-      test "is idempotent" do
+        shouldNotSatisfy (snd (patchHTML input)) (eq input)
+      it "is idempotent" do
         let input = "</body>"
-        Assert.equal (snd $ patchHTML $ snd $ patchHTML input) (snd $ patchHTML input)
+        shouldEqual (snd $ patchHTML $ snd $ patchHTML input) (snd $ patchHTML input)
diff --git a/test/Test/ModuleIndex.purs b/test/Test/ModuleIndex.purs
index df4a59d..34cb690 100644
--- a/test/Test/ModuleIndex.purs
+++ b/test/Test/ModuleIndex.purs
@@ -6,20 +6,18 @@ import Prelude
 
 import Data.List as List
 import Data.Newtype (wrap)
-import Test.Unit (TestSuite, suite, test)
-import Test.Unit.Assert as Assert
+import Test.Spec (Spec, describe, it)
+import Test.Spec.Assertions (shouldEqual)
 
 
-tests :: TestSuite
+tests :: Spec Unit
 tests = do
-  suite "ModuleIndex" do
+  describe "ModuleIndex" do
 
-    test "test #0" do
-      Assert.equal (extractModuleNameParts $ wrap "Data.Array.ST") (
+    it "test #0" do
+      extractModuleNameParts (wrap "Data.Array.ST") `shouldEqual`
         List.fromFoldable [ "st", "array.st", "data.array.st" ]
-      )
 
-    test "test #1" do
-      Assert.equal (extractModuleNameParts $ wrap "Foo") (
+    it "test #1" do
+      extractModuleNameParts (wrap "Foo") `shouldEqual`
         List.fromFoldable [ "foo" ]
-      )
diff --git a/test/Test/TypeJson.purs b/test/Test/TypeJson.purs
index 34ef1d4..98df2a2 100644
--- a/test/Test/TypeJson.purs
+++ b/test/Test/TypeJson.purs
@@ -15,13 +15,13 @@ import Data.Argonaut.Parser (jsonParser)
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..))
 import Partial.Unsafe (unsafePartial)
-import Test.Unit (TestSuite, suite, test)
+import Test.Spec (Spec, describe, it)
 
 
-tests :: TestSuite
+tests :: Spec Unit
 tests = do
-  suite "FunDeps decoder" do
-    test "FunDeps" do
+  describe "FunDeps decoder" do
+    it "FunDeps" do
       let
         funDeps = mkJson """
           [
@@ -42,8 +42,8 @@ tests = do
                           }
                  ])
 
-  suite "Constraint decoder" do
-    test "Constraint" do
+  describe "Constraint decoder" do
+    it "Constraint" do
       let constraint = mkJson """
       {
         "constraintAnn": [],
@@ -62,8 +62,8 @@ tests = do
                     , constraintArgs: []
                     })
 
-  suite "Type decoder" do
-    test "TypeVar" do
+  describe "Type decoder" do
+    it "TypeVar" do
       let typeVar = mkJson """
       {
         "annotation": [],
@@ -75,7 +75,7 @@ tests = do
       assertRight (decodeJson typeVar)
        (TypeVar "m")
 
-    test "TypeApp" do
+    it "TypeApp" do
       let typeApp1 = mkJson """
         {
           "annotation": [],
@@ -114,7 +114,7 @@ tests = do
                            ))
           (TypeVar "h")
 
-    test "TypeOp" do
+    it "TypeOp" do
       let typeOp = mkJson """
           {
             "annotation": [],
@@ -131,7 +131,7 @@ tests = do
       assertRight (decodeJson typeOp) $
         TypeOp $ qualified [ "Data", "NaturalTransformation" ] "~>"
 
-    test "BinaryNoParens" do
+    it "BinaryNoParens" do
       let binaryNoParens = mkJson """
       {
         "annotation": [],
@@ -168,7 +168,7 @@ tests = do
         (TypeVar "m")
         (TypeVar "n")
 
-    test "ParensInType" do
+    it "ParensInType" do
       let parensInType = mkJson """
         {
           "annotation": [],
@@ -208,7 +208,7 @@ tests = do
           TypeApp
           (TypeConstructor (qualified [ "Data", "Maybe" ] "Maybe"))
           (TypeConstructor (qualified [ "Prim" ] "String"))
-    test "RCons" do
+    it "RCons" do
 
       let rcons = mkJson """
       {
@@ -253,7 +253,7 @@ tests = do
                    (TypeVar "t"))
           REmpty
 
-    test "ForAll #1" do
+    it "ForAll #1" do
       let forallJson = mkJson """
       {"annotation":[],"tag":"ForAll","contents":["a",{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"String"]}]},{"annotation":[],"tag":"TypeVar","contents":"a"}]},null]}
       """
@@ -262,13 +262,13 @@ tests = do
                                      (TypeConstructor $ qualified ["Prim"] "String"))
                             (TypeVar "a"))
 
-    test "KindApp" do
+    it "KindApp" do
       let kindAppJson = mkJson """
         {"annotation":[],"tag":"KindApp","contents":[{"annotation":[],"tag":"REmpty"},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Type"]}]}
       """
       assertRight (decodeJson kindAppJson) $
         KindApp REmpty (TypeConstructor (qualified ["Prim"] "Type"))
-    test "KindedType" do
+    it "KindedType" do
       let kindedTypeJson = mkJson """
       {"annotation":[],"tag":"KindedType","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Data","Const"],"Const"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Data","Void"],"Void"]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Type"]}]},{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Type"]}]}]}
       """
@@ -281,9 +281,9 @@ tests = do
                   (TypeConstructor (qualified ["Prim"] "Function"))
                   (TypeConstructor (qualified ["Prim"] "Type" )))
          (TypeConstructor (qualified ["Prim"] "Type")))
-  suite "jsons" do
+  describe "jsons" do
 
-    test "jsons #1" do
+    it "jsons #1" do
       let json = mkJson """
 {"annotation":[],"tag":"ForAll","contents":["o",{"annotation":[],"tag":"ForAll","contents":["r",{"annotation":[],"tag":"ForAll","contents":["l",{"annotation":[],"tag":"ConstrainedType","contents":[{"constraintAnn":[],"constraintClass":[["Type","Data","Boolean"],"And"],"constraintArgs":[{"annotation":[],"tag":"TypeVar","contents":"l"},{"annotation":[],"tag":"TypeVar","contents":"r"},{"annotation":[],"tag":"TypeVar","contents":"o"}],"constraintData":null},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"l"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Prim"],"Function"]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"r"}]}]},{"annotation":[],"tag":"TypeApp","contents":[{"annotation":[],"tag":"TypeConstructor","contents":[["Type","Data","Boolean"],"BProxy"]},{"annotation":[],"tag":"TypeVar","contents":"o"}]}]}]}]},null]},null]},null]}
       """
diff --git a/test/Test/TypeQuery.purs b/test/Test/TypeQuery.purs
index 029ca7c..19cdf4d 100644
--- a/test/Test/TypeQuery.purs
+++ b/test/Test/TypeQuery.purs
@@ -15,384 +15,535 @@ import Data.List.NonEmpty as NonEmptyList
 import Data.Set as Set
 import Data.Tuple (Tuple(..))
 import Test.Extra (assertRight)
-import Test.Unit (TestSuite, suite, test)
-import Test.Unit.Assert as Assert
+import Test.Spec (Spec, describe, it)
+import Test.Spec.Assertions (shouldEqual, shouldSatisfy)
 import Data.Maybe (Maybe(..))
 
-
-tests :: TestSuite
+tests :: Spec Unit
 tests = do
-  suite "TypeQuery parser" do
+  describe "TypeQuery parser" do
 
-    test "test #0" do
+    it "test #0" do
       let input = "a"
       assertRight (parseTypeQuery input) (qVar "a")
 
-    test "test #1" do
+    it "test #1" do
       let input = "ab"
       assertRight (parseTypeQuery input) (qVar "ab")
 
-    test "test #2" do
+    it "test #2" do
       let input = "a b"
       assertRight (parseTypeQuery input) (QApp (qVar "a") (qVar "b"))
 
-    test "test #3" do
+    it "test #3" do
       let input = "a b c"
       assertRight (parseTypeQuery input) (QApp (QApp (qVar "a") (qVar "b")) (qVar "c"))
 
-    test "test #4" do
+    it "test #4" do
       let input = "a -> b"
       assertRight (parseTypeQuery input) (QFun (qVar "a") (qVar "b"))
 
-    test "test #5" do
+    it "test #5" do
       let input = "a -> b c"
       assertRight (parseTypeQuery input) (QFun (qVar "a") (QApp (qVar "b") (qVar "c")))
 
-    test "test #6" do
+    it "test #6" do
       let input = "a b -> c"
       assertRight (parseTypeQuery input) (QFun (QApp (qVar "a") (qVar "b")) (qVar "c"))
 
-    test "test #7" do
+    it "test #7" do
       let input = "a b"
       assertRight (parseTypeQuery input) (QApp (qVar "a") (qVar "b"))
 
-    test "test #8" do
+    it "test #8" do
       let input = "a (b c)"
       assertRight (parseTypeQuery input) (QApp (qVar "a") (QApp (qVar "b") (qVar "c")))
 
-    test "test #9" do
+    it "test #9" do
       let input = "(a b) (c d)"
       assertRight (parseTypeQuery input)
-        (QApp (QApp (qVar "a") (qVar "b"))
-              (QApp (qVar "c") (qVar "d")))
+        ( QApp (QApp (qVar "a") (qVar "b"))
+            (QApp (qVar "c") (qVar "d"))
+        )
 
-    test "test #10" do
+    it "test #10" do
       let input = "a ( b c )"
       assertRight (parseTypeQuery input) (QApp (qVar "a") (QApp (qVar "b") (qVar "c")))
 
-    test "test #11" do
+    it "test #11" do
       let input = "aaa"
       assertRight (parseTypeQuery input) (qVar "aaa")
 
-    test "test #12" do
+    it "test #12" do
       let input = "aaa ( bbb ccc )"
       assertRight (parseTypeQuery input) (QApp (qVar "aaa") (QApp (qVar "bbb") (qVar "ccc")))
 
-    test "test #13" do
+    it "test #13" do
       let input = "(a -> b) ->  (c -> d)"
-      assertRight (parseTypeQuery input) (QFun (QFun (qVar "a") (qVar "b"))
-                                                  (QFun (qVar "c") (qVar "d")))
+      assertRight (parseTypeQuery input)
+        ( QFun (QFun (qVar "a") (qVar "b"))
+            (QFun (qVar "c") (qVar "d"))
+        )
 
-    test "test #14" do
+    it "test #14" do
       let input = "a -> b -> c -> d"
-      assertRight (parseTypeQuery input) (QFun (qVar "a")
-                                          (QFun (qVar "b")
-                                           (QFun (qVar "c") (qVar "d"))))
+      assertRight (parseTypeQuery input)
+        ( QFun (qVar "a")
+            ( QFun (qVar "b")
+                (QFun (qVar "c") (qVar "d"))
+            )
+        )
 
-    test "test #15" do
+    it "test #15" do
       let input = "a -> b -> c"
-      assertRight (parseTypeQuery input) (QFun (qVar "a")
-                                          (QFun (qVar "b")
-                                           (qVar "c")))
+      assertRight (parseTypeQuery input)
+        ( QFun (qVar "a")
+            ( QFun (qVar "b")
+                (qVar "c")
+            )
+        )
 
-    test "test #16" do
+    it "test #16" do
       let input = "forall a b c. c"
-      assertRight (parseTypeQuery input) (QForAll (nl "a" ["b", "c"]) (qVar "c"))
+      assertRight (parseTypeQuery input) (QForAll (nl "a" [ "b", "c" ]) (qVar "c"))
 
-    test "test #17" do
+    it "test #17" do
       let input = "forall a. Maybe a"
       assertRight (parseTypeQuery input) (QForAll (nl "a" $ []) (QApp (qConst "Maybe") (qVar "a")))
 
-    test "test #18" do
+    it "test #18" do
       let input = "forall m a. Monad m => a -> m a"
       assertRight (parseTypeQuery input)
-        (QForAll (nl "m" ["a"])
-                 (qConstraint "Monad" (l [qVar "m"])
-                  (QFun (qVar "a")
-                        (QApp (qVar "m") (qVar "a")))))
-
-    test "test #19" do
+        ( QForAll (nl "m" [ "a" ])
+            ( qConstraint "Monad" (l [ qVar "m" ])
+                ( QFun (qVar "a")
+                    (QApp (qVar "m") (qVar "a"))
+                )
+            )
+        )
+
+    it "test #19" do
       let input = "{ a :: Int }"
       assertRight (parseTypeQuery input)
         (QApp (qConst "Record") (QRow (pure (Tuple (Identifier "a") (qConst "Int")))))
 
-    test "test #20" do
+    it "test #20" do
       let input = "{a::Int}"
       assertRight (parseTypeQuery input)
         (QApp (qConst "Record") (QRow (pure (Tuple (Identifier "a") (qConst "Int")))))
 
-    test "test #21" do
+    it "test #21" do
       let input = "Int"
       assertRight (parseTypeQuery input) (qConst "Int")
 
-    test "test #22" do
+    it "test #22" do
       let input = "a->b"
       assertRight (parseTypeQuery input) (QFun (qVar "a") (qVar "b"))
 
-    test "test #23" do
+    it "test #23" do
       let input = "forall m a. MonadRec m => Process m a -> m a"
-      assertRight (parseTypeQuery input) (QForAll (nl "m" ("a" : Nil))
-                                          (qConstraint "MonadRec" (l [qVar "m"])
-                                           (QFun (QApp (QApp (qConst "Process")
-                                                        (qVar "m")) (qVar "a"))
-                                            (QApp (qVar "m") (qVar "a")))))
-
-    test "test #24" do
+      assertRight (parseTypeQuery input)
+        ( QForAll (nl "m" ("a" : Nil))
+            ( qConstraint "MonadRec" (l [ qVar "m" ])
+                ( QFun
+                    ( QApp
+                        ( QApp (qConst "Process")
+                            (qVar "m")
+                        )
+                        (qVar "a")
+                    )
+                    (QApp (qVar "m") (qVar "a"))
+                )
+            )
+        )
+
+    it "test #24" do
       let input = "forall t f a. Foldable1 t => Apply f => f"
-      assertRight (parseTypeQuery input) (QForAll (nl "t" ["f", "a"])
-                                          (qConstraint "Foldable1" (l [qVar "t"])
-                                           (qConstraint "Apply" (l [qVar "f"]) (qVar "f"))))
+      assertRight (parseTypeQuery input)
+        ( QForAll (nl "t" [ "f", "a" ])
+            ( qConstraint "Foldable1" (l [ qVar "t" ])
+                (qConstraint "Apply" (l [ qVar "f" ]) (qVar "f"))
+            )
+        )
 
-    test "test #25" do
+    it "test #25" do
       let input = "forall m a.MonadRec m=>Process m a->m a"
-      assertRight (parseTypeQuery input) ((QForAll (nl "m" ("a" : Nil))
-                                           (qConstraint "MonadRec" (l [qVar "m"])
-                                            (QFun (QApp (QApp (qConst "Process")
-                                                         (qVar "m")) (qVar "a"))
-                                             (QApp (qVar "m") (qVar "a"))))))
-
-    test "test #26" do
+      assertRight (parseTypeQuery input)
+        ( ( QForAll (nl "m" ("a" : Nil))
+              ( qConstraint "MonadRec" (l [ qVar "m" ])
+                  ( QFun
+                      ( QApp
+                          ( QApp (qConst "Process")
+                              (qVar "m")
+                          )
+                          (qVar "a")
+                      )
+                      (QApp (qVar "m") (qVar "a"))
+                  )
+              )
+          )
+        )
+
+    it "test #26" do
       let input = "m a -> (a -> m b) -> m b"
       assertRight (parseTypeQuery input) (QFun (QApp (qVar "m") (qVar "a")) (QFun (QFun (qVar "a") (QApp (qVar "m") (qVar "b"))) (QApp (qVar "m") (qVar "b"))))
 
-    test "test #27" do
+    it "test #27" do
       let input = "forall f a. Alternative f => Lazy (f (List a)) => f a -> f (List a)"
-      assertRight (parseTypeQuery input) ((QForAll (nl "f" ["a"]))
-                                          (qConstraint "Alternative" (l [qVar "f"])
-                                           (qConstraint "Lazy" (l [QApp (qVar "f")
-                                                                   (QApp (qConst "List") (qVar "a"))])
-                                            (QFun (QApp (qVar "f") (qVar "a"))
-                                             (QApp (qVar "f")
-                                              (QApp (qConst "List") (qVar "a")))))))
-
-    test "test #28" do
+      assertRight (parseTypeQuery input)
+        ( (QForAll (nl "f" [ "a" ]))
+            ( qConstraint "Alternative" (l [ qVar "f" ])
+                ( qConstraint "Lazy"
+                    ( l
+                        [ QApp (qVar "f")
+                            (QApp (qConst "List") (qVar "a"))
+                        ]
+                    )
+                    ( QFun (QApp (qVar "f") (qVar "a"))
+                        ( QApp (qVar "f")
+                            (QApp (qConst "List") (qVar "a"))
+                        )
+                    )
+                )
+            )
+        )
+
+    it "test #28" do
       let input = "forall f a. Alternative f => Lazy(f (List a))=>f a -> f (List a)"
-      assertRight (parseTypeQuery input) ((QForAll (nl "f" ["a"]))
-                                          (qConstraint "Alternative" (l [qVar "f"])
-                                           (qConstraint "Lazy" (l [QApp (qVar "f")
-                                                                   (QApp (qConst "List") (qVar "a"))])
-                                            (QFun (QApp (qVar "f") (qVar "a"))
-                                             (QApp (qVar "f")
-                                              (QApp (qConst "List") (qVar "a")))))))
-
-    test "test #29" do
+      assertRight (parseTypeQuery input)
+        ( (QForAll (nl "f" [ "a" ]))
+            ( qConstraint "Alternative" (l [ qVar "f" ])
+                ( qConstraint "Lazy"
+                    ( l
+                        [ QApp (qVar "f")
+                            (QApp (qConst "List") (qVar "a"))
+                        ]
+                    )
+                    ( QFun (QApp (qVar "f") (qVar "a"))
+                        ( QApp (qVar "f")
+                            (QApp (qConst "List") (qVar "a"))
+                        )
+                    )
+                )
+            )
+        )
+
+    it "test #29" do
       let input = "{a::Int,b::Int}"
       assertRight (parseTypeQuery input)
-        (QApp (qConst "Record") (QRow (List.fromFoldable
-                                       [ Tuple (Identifier "a") (qConst "Int")
-                                       , Tuple (Identifier "b") (qConst "Int")])))
-
-    test "test #30" do
+        ( QApp (qConst "Record")
+            ( QRow
+                ( List.fromFoldable
+                    [ Tuple (Identifier "a") (qConst "Int")
+                    , Tuple (Identifier "b") (qConst "Int")
+                    ]
+                )
+            )
+        )
+
+    it "test #30" do
       let input = "{record''' :: Int}"
       assertRight (parseTypeQuery input)
-        (QApp (qConst "Record") (QRow (List.fromFoldable [ Tuple (Identifier "record'''") (qConst "Int")])))
+        (QApp (qConst "Record") (QRow (List.fromFoldable [ Tuple (Identifier "record'''") (qConst "Int") ])))
 
-    test "test #31" do
+    it "test #31" do
       let input = "(row''' :: Int)"
       assertRight (parseTypeQuery input)
-        (QRow (List.fromFoldable [ Tuple (Identifier "row'''") (qConst "Int")]))
+        (QRow (List.fromFoldable [ Tuple (Identifier "row'''") (qConst "Int") ]))
 
-    test "test #32" do
+    it "test #32" do
       let input = "(row1 :: Int, row2 :: (),row3::(row4::{}))"
       assertRight (parseTypeQuery input)
-        (QRow (l [ Tuple (Identifier "row1") (qConst "Int")
-                 , Tuple (Identifier "row2") (QRow Nil)
-                 , Tuple (Identifier "row3") (QRow (l [ Tuple (Identifier "row4") (QApp (qConst "Record") (QRow Nil)) ])) ]))
-
-    test "test #33" do
+        ( QRow
+            ( l
+                [ Tuple (Identifier "row1") (qConst "Int")
+                , Tuple (Identifier "row2") (QRow Nil)
+                , Tuple (Identifier "row3") (QRow (l [ Tuple (Identifier "row4") (QApp (qConst "Record") (QRow Nil)) ]))
+                ]
+            )
+        )
+
+    it "test #33" do
       let input = "Foldable1 t => Apply f => t (f a) -> f Unit"
       assertRight (parseTypeQuery input)
         (qConstraint "Foldable1" ((qVar "t") : Nil) (qConstraint "Apply" ((qVar "f") : Nil) (QFun (QApp (qVar "t") (QApp (qVar "f") (qVar "a"))) (QApp (qVar "f") (qConst "Unit")))))
 
-    test "test #34" do
+    it "test #34" do
       let input = "Foldable1 t => Apply f => t (f a) -> f a"
       assertRight (parseTypeQuery input)
         (qConstraint "Foldable1" ((qVar "t") : Nil) (qConstraint "Apply" ((qVar "f") : Nil) (QFun (QApp (qVar "t") (QApp (qVar "f") (qVar "a"))) (QApp (qVar "f") (qVar "a")))))
 
-    test "test #35" do
+    it "test #35" do
       let input = "Generic a rep => GenericEq rep => a -> a -> Boolean"
       assertRight (parseTypeQuery input)
-        (qConstraint "Generic" ((qVar "a") : (qVar "rep") : Nil)
-         (qConstraint "GenericEq" ((qVar "rep") : Nil)
-          (QFun (qVar "a") (QFun (qVar "a") (qConst "Boolean")))))
+        ( qConstraint "Generic" ((qVar "a") : (qVar "rep") : Nil)
+            ( qConstraint "GenericEq" ((qVar "rep") : Nil)
+                (QFun (qVar "a") (QFun (qVar "a") (qConst "Boolean")))
+            )
+        )
 
-  suite "polish notation" do
+  describe "polish notation" do
 
-    test "test #1" do
+    it "test #1" do
       let input = "(a -> b) -> (b -> ((a -> b) -> c))"
       assertRight (shapeOfTypeQuery <$> parseTypeQuery input)
-          (l [ PForAll 3, PFun, PFun, PVar, PVar, PFun, PVar, PFun, PFun
-             , PVar, PVar, PVar ])
-
-    test "test #2" do
+        ( l
+            [ PForAll 3
+            , PFun
+            , PFun
+            , PVar
+            , PVar
+            , PFun
+            , PVar
+            , PFun
+            , PFun
+            , PVar
+            , PVar
+            , PVar
+            ]
+        )
+
+    it "test #2" do
       let input = "forall a. (a -> b) -> (b -> ((a -> b) -> c))"
       assertRight (shapeOfTypeQuery <$> parseTypeQuery input)
-          (l [ PForAll 3, PFun, PFun, PVar, PVar, PFun, PVar, PFun, PFun
-             , PVar, PVar, PVar ])
-
-    test "test #3" do
+        ( l
+            [ PForAll 3
+            , PFun
+            , PFun
+            , PVar
+            , PVar
+            , PFun
+            , PVar
+            , PFun
+            , PFun
+            , PVar
+            , PVar
+            , PVar
+            ]
+        )
+
+    it "test #3" do
       let input = "forall a. (a -> b) -> (b -> ((a -> b) -> c))"
       assertRight (shapeOfTypeQuery <$> parseTypeQuery input)
-          (l [ PForAll 3, PFun, PFun, PVar, PVar, PFun, PVar, PFun, PFun
-             , PVar, PVar, PVar ])
-
-    test "test #4" do
+        ( l
+            [ PForAll 3
+            , PFun
+            , PFun
+            , PVar
+            , PVar
+            , PFun
+            , PVar
+            , PFun
+            , PFun
+            , PVar
+            , PVar
+            , PVar
+            ]
+        )
+
+    it "test #4" do
       let input = "forall a. (forall h. ST h (STArray h a)) -> Array a"
       assertRight (shapeOfTypeQuery <$> parseTypeQuery input)
-          (l [ PForAll 1, PFun, PForAll 1, PApp, PApp, PVar, PVar, PApp, PApp, PVar, PVar, PVar, PApp, PVar, PVar ])
-
-  suite "type shapes" do
-    test "test #1" do
-      let query = "Generic a rep => GenericEq rep => a -> a -> Boolean"
-          c1 = constr (qname [""] "Generic") [TypeVar "a", TypeVar "rep"]
-          c2 = constr (qname [""] "GenericEq") [TypeVar "rep"]
-
-          fun t1 t2 =
-            TypeApp (TypeApp (TypeConstructor (QualifiedName { moduleNameParts: ["Prim"]
-                                                             , name: Identifier "Function" })) t1) t2
-          type_ =
-            ForAll "a" Nothing $
-            ForAll "rep" Nothing $
-            ConstrainedType c1
-            (ConstrainedType c2
-             (fun (TypeVar "a") (fun (TypeVar "b")
-                                 (TypeConstructor $ qname ["Prim", "Boolean"] "Boolean"))))
-          shape = shapeOfTypeQuery <$> parseTypeQuery query
-      Assert.equal (pure $ shapeOfType type_) shape
-
-  suite "free variable counting" do
-
-    test "test #1" do
+        (l [ PForAll 1, PFun, PForAll 1, PApp, PApp, PVar, PVar, PApp, PApp, PVar, PVar, PVar, PApp, PVar, PVar ])
+
+  describe "type shapes" do
+    it "test #1" do
+      let
+        query = "Generic a rep => GenericEq rep => a -> a -> Boolean"
+        c1 = constr (qname [ "" ] "Generic") [ TypeVar "a", TypeVar "rep" ]
+        c2 = constr (qname [ "" ] "GenericEq") [ TypeVar "rep" ]
+
+        fun t1 t2 =
+          TypeApp
+            ( TypeApp
+                ( TypeConstructor
+                    ( QualifiedName
+                        { moduleNameParts: [ "Prim" ]
+                        , name: Identifier "Function"
+                        }
+                    )
+                )
+                t1
+            )
+            t2
+        type_ =
+          ForAll "a" Nothing
+            $ ForAll "rep" Nothing
+            $
+              ConstrainedType c1
+                ( ConstrainedType c2
+                    ( fun (TypeVar "a")
+                        ( fun (TypeVar "b")
+                            (TypeConstructor $ qname [ "Prim", "Boolean" ] "Boolean")
+                        )
+                    )
+                )
+        shape = shapeOfTypeQuery <$> parseTypeQuery query
+      pure (shapeOfType type_) `shouldEqual` shape
+
+  describe "free variable counting" do
+
+    it "test #1" do
       let input = "forall a. (a -> b) -> (b -> ((a -> b) -> c))"
       assertRight (countFreeVars <$> parseTypeQuery input) 2
 
-    test "test #2" do
+    it "test #2" do
       -- `b` is not bound on the left, `a` is not bound on the right
       let input = "(forall a. (a -> b)) -> forall b. (b -> a)"
       assertRight (countFreeVars <$> parseTypeQuery input) 2
 
-    test "test #3" do
+    it "test #3" do
       let input = "a -> forall a. a"
       assertRight (countFreeVars <$> parseTypeQuery input) 1
 
-    test "test #4" do
+    it "test #4" do
       let input = "(forall a. a) -> a"
       assertRight (countFreeVars <$> parseTypeQuery input) 1
 
-    test "test #5" do
+    it "test #5" do
       let input = "forall a. a -> a"
       assertRight (countFreeVars <$> parseTypeQuery input) 0
 
-    test "test #6" do
+    it "test #6" do
       let input = "a -> b -> c"
       assertRight (countFreeVars <$> parseTypeQuery input) 3
 
-    test "test #7" do
+    it "test #7" do
       let input = "forall m a. Monad m => a -> m a"
       assertRight (countFreeVars <$> parseTypeQuery input) 0
 
-    test "test #8" do
+    it "test #8" do
       let input = "Monad m => a -> m a"
       assertRight (countFreeVars <$> parseTypeQuery input) 2
 
-    test "test #9" do
+    it "test #9" do
       let input = "Monad m => a -> a"
       assertRight (countFreeVars <$> parseTypeQuery input) 2
 
-    test "test #10" do
+    it "test #10" do
       let input = "forall a. (forall a. a) a"
       assertRight (countFreeVars <$> parseTypeQuery input) 0
 
-    test "test #11" do
+    it "test #11" do
       let input = "forall a. (forall b. a) a"
       assertRight (countFreeVars <$> parseTypeQuery input) 0
 
-    test "test #12" do
+    it "test #12" do
       let input = "forall a. (forall b. a) a b"
       assertRight (countFreeVars <$> parseTypeQuery input) 1
 
-  suite "typeVarPenalty" do
-
-    test "#0" do
-      Assert.equal 0 (typeVarPenalty mempty)
-
-    test "#1" do
-      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "b"
-                                         , substitute "b" "a"
-                                         ])
-
-    test "#2" do
-      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "b"
-                                         , substitute "a" "b"
-                                         , substitute "a" "b"
-                                         ])
-
-    test "#3" do
-      Assert.equal 1 (typeVarPenalty $ l [ substitute "a" "b"
-                                         , substitute "a" "c"
-                                         ])
-
-    test "#4" do
-      Assert.equal 1 (typeVarPenalty $ l [ substitute "a" "b"
-                                         , substitute "b" "a"
-                                         , substitute "b" "c"
-                                         ])
-
-    test "#5" do
-      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "b"
-                                         , substitute "b" "c"
-                                         , substitute "c" "a"
-                                         ])
-
-    test "#6" do
-      Assert.equal 2 (typeVarPenalty $ l [ substitute "a" "b"
-                                         , substitute "a" "c"
-                                         , substitute "a" "a"
-                                         ])
-
-    test "#7" do
-      Assert.equal 2 (typeVarPenalty $ l [ substitute "a" "a"
-                                         , substitute "b" "a"
-                                         , substitute "c" "a"
-                                         ])
-
-    test "#8" do
-      Assert.equal 4 (typeVarPenalty $ l [ substitute "a" "a"
-                                         , substitute "b" "a"
-                                         , substitute "c" "a"
-                                         , substitute "a" "b"
-                                         , substitute "a" "c"
-                                         , substitute "a" "a"
-                                         ])
-
-    test "#9" do
-      Assert.equal 0 (typeVarPenalty $ l [ substitute "a" "e"
-                                         , substitute "b" "d"
-                                         , substitute "c" "f"
-                                         ])
-
-  suite "unification" do
-    test "instantiation #0" do
-      let mVarQuery = qVar "m"
-          unitConstQuery = qConst "Unit"
-
-      Assert.assert "instantiation #0" $
-        (penalty unitConstQuery unitType < penalty mVarQuery unitType)
-
-    test "generalization #0" do
-      let query = qVar "m"
-          t1 = TypeVar "m"
-
-      Assert.assert "qeneralization #0" $
-        (penalty query unitType > penalty query t1)
-
+  describe "typeVarPenalty" do
+
+    it "#0" do
+      0 `shouldEqual` (typeVarPenalty mempty)
+
+    it "#1" do
+      0 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "b"
+            , substitute "b" "a"
+            ]
+        )
+
+    it "#2" do
+      0 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "b"
+            , substitute "a" "b"
+            , substitute "a" "b"
+            ]
+        )
+
+    it "#3" do
+      1 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "b"
+            , substitute "a" "c"
+            ]
+        )
+
+    it "#4" do
+      1 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "b"
+            , substitute "b" "a"
+            , substitute "b" "c"
+            ]
+        )
+
+    it "#5" do
+      0 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "b"
+            , substitute "b" "c"
+            , substitute "c" "a"
+            ]
+        )
+
+    it "#6" do
+      2 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "b"
+            , substitute "a" "c"
+            , substitute "a" "a"
+            ]
+        )
+
+    it "#7" do
+      2 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "a"
+            , substitute "b" "a"
+            , substitute "c" "a"
+            ]
+        )
+
+    it "#8" do
+      4 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "a"
+            , substitute "b" "a"
+            , substitute "c" "a"
+            , substitute "a" "b"
+            , substitute "a" "c"
+            , substitute "a" "a"
+            ]
+        )
+
+    it "#9" do
+      0 `shouldEqual`
+        ( typeVarPenalty $ l
+            [ substitute "a" "e"
+            , substitute "b" "d"
+            , substitute "c" "f"
+            ]
+        )
+
+  describe "unification" do
+    it "instantiation #0" do
+      let
+        mVarQuery = qVar "m"
+        unitConstQuery = qConst "Unit"
+
+      shouldSatisfy
+        (penalty unitConstQuery unitType)
+        (_ < penalty mVarQuery unitType)
+
+    it "generalization #0" do
+      let
+        query = qVar "m"
+        t1 = TypeVar "m"
+
+      shouldSatisfy
+        (penalty query unitType)
+        (_ > penalty query t1)
 
 l :: forall f. Foldable f => (forall a. f a -> List a)
 l = List.fromFoldable
 
 nl
   :: forall t
-  .  Foldable t
+   . Foldable t
   => Functor t
   => String
   -> t String
@@ -400,9 +551,12 @@ nl
 nl x rst = NonEmptyList.cons' (Identifier x) $ List.fromFoldable (rst <#> Identifier)
 
 unitType :: Type
-unitType = TypeConstructor (QualifiedName { moduleNameParts: []
-                                          , name: Identifier "Unit"
-                                          })
+unitType = TypeConstructor
+  ( QualifiedName
+      { moduleNameParts: []
+      , name: Identifier "Unit"
+      }
+  )
 
 countFreeVars :: TypeQuery -> Int
 countFreeVars = getFreeVariables >>> Set.size

From e92258bdd25dd5e036f0265eeb8131e45a667e28 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Wed, 31 Aug 2022 17:54:35 +0400
Subject: [PATCH 37/45] Upgrade to 0.15.4. Temporary kill the tests, fix repo
 link in the app

---
 packages.dhall           |  38 ++++++++++++--
 spago.dhall              |   1 -
 src/Docs/Search/App.purs |   2 +-
 test/Main.purs           |   4 +-
 test/Test/UI.purs        | 111 ++++++++++++++++++++-------------------
 5 files changed, 93 insertions(+), 63 deletions(-)

diff --git a/packages.dhall b/packages.dhall
index edd8fff..0b0ad5a 100644
--- a/packages.dhall
+++ b/packages.dhall
@@ -3,8 +3,8 @@ let mkPackage =
         sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
 
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220506/packages.dhall
-        sha256:f83b68ff07cf6557e82379e749118e6ff11eecc6be5754540aae855cd1e46917
+      https://github.com/purescript/package-sets/releases/download/psc-0.15.4-20220829/packages.dhall
+        sha256:9ec64ed24ec308770ccdd3d0edb74a814fcfbe34c7df5c28266935f0b5e585d7
 
 let overrides = {=}
 
@@ -103,8 +103,8 @@ let additions =
       , html-parser-halogen =
           mkPackage
             [ "string-parsers", "halogen" ]
-            "https://github.com/klntsky/purescript-html-parser-halogen.git"
-            "5c31890d060d5abd0038fed6acd3f999a9362369"
+            "https://github.com/rnons/purescript-html-parser-halogen.git"
+            "035a51d02ba9f8b70c3ffd9fe31a3f5bed19941c"
       , markdown-it-halogen =
           mkPackage
             [ "markdown-it", "html-parser-halogen" ]
@@ -147,6 +147,36 @@ let additions =
             ]
             "https://github.com/klntsky/purescript-jest.git"
             "7feaa5a880fc75002c4eca312993174e7220252b"
+      , literals =
+          mkPackage
+            [ "assert"
+            , "effect"
+            , "console"
+            , "integers"
+            , "numbers"
+            , "partial"
+            , "psci-support"
+            , "unsafe-coerce"
+            , "typelevel-prelude"
+            ]
+            "https://github.com/jvliwanag/purescript-literals.git"
+            "ae3ef4e9c1ae7c57ec77bd13906fa60ae8abba4a"
+      , untagged-union =
+          mkPackage
+            [ "assert"
+            , "console"
+            , "effect"
+            , "foreign"
+            , "foreign-object"
+            , "literals"
+            , "maybe"
+            , "newtype"
+            , "psci-support"
+            , "tuples"
+            , "unsafe-coerce"
+            ]
+            "https://github.com/jvliwanag/purescript-untagged-union.git"
+            "ed8262a966e15e751322c327e2759a9b9c0ef3f3"
       }
 
 in  upstream // overrides // additions
diff --git a/spago.dhall b/spago.dhall
index e1712f8..16666b9 100644
--- a/spago.dhall
+++ b/spago.dhall
@@ -15,7 +15,6 @@
   , "either"
   , "exceptions"
   , "foldable-traversable"
-  , "foreign"
   , "foreign-object"
   , "halogen"
   , "halogen-css"
diff --git a/src/Docs/Search/App.purs b/src/Docs/Search/App.purs
index b5f005b..98f7de9 100644
--- a/src/Docs/Search/App.purs
+++ b/src/Docs/Search/App.purs
@@ -197,7 +197,7 @@ insertVersionInfo = do
       prefix      <- Document.createTextNode " - patched by "        doc <#> Text.toNode
       linkElement <- Document.createElement  "a"                     doc
       let linkNode = Element.toNode linkElement
-      Element.setAttribute "href" "https://github.com/spacchetti/purescript-docs-search" linkElement
+      Element.setAttribute "href" "https://github.com/purescript/purescript-docs-search" linkElement
       Element.setAttribute "target" "_blank"  linkElement
       linkText    <- Document.createTextNode ("docs-search")         doc <#> Text.toNode
       suffix      <- Document.createTextNode (" " <> Config.version) doc <#> Text.toNode
diff --git a/test/Main.purs b/test/Main.purs
index 7fb7e27..dfc2a63 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -8,7 +8,7 @@ import Test.IndexBuilder as IndexBuilder
 import Test.ModuleIndex as ModuleIndex
 import Test.TypeQuery as TypeQuery
 import Test.TypeJson as TypeJson
-import Test.UI as UI
+-- import Test.UI as UI
 import Test.Spec (Spec)
 import Test.Spec.Reporter.Console (consoleReporter)
 import Test.Spec.Runner (runSpec)
@@ -17,7 +17,7 @@ import Effect.Aff (launchAff_)
 main :: Effect Unit
 main = do
   launchAff_ $ runSpec [consoleReporter] mainTest
-  UI.main
+  -- UI.main
 
 mainTest :: Spec Unit
 mainTest = do
diff --git a/test/Test/UI.purs b/test/Test/UI.purs
index b290c9d..f677ede 100644
--- a/test/Test/UI.purs
+++ b/test/Test/UI.purs
@@ -1,67 +1,68 @@
 module Test.UI where
 
-import Prelude
+-- import Prelude
 
-import Data.Array as Array
-import Data.Foldable (for_)
-import Data.Newtype (unwrap)
-import Effect (Effect)
-import Effect.Aff (Aff, launchAff_)
-import Effect.Class (liftEffect)
-import Effect.Console as Console
-import Foreign (Foreign)
-import Foreign as Foreign
-import Node.FS.Sync (realpath)
-import Test.Unit.Assert as Assert
-import Toppokki as T
+-- import Data.Array as Array
+-- import Data.Foldable (for_)
+-- import Data.Newtype (unwrap)
+-- import Effect (Effect)
+-- import Effect.Aff (Aff, launchAff_)
+-- import Effect.Class (liftEffect)
+-- import Effect.Console as Console
+-- import Foreign (Foreign)
+-- import Foreign as Foreign
+-- import Node.FS.Sync (realpath)
+-- import Test.Spec.Assertions (shouldSatisfy)
+-- -- import Toppokki as T
+-- -- import Playwright as P
 
+-- main :: Effect Unit
+-- main = launchAff_ do
+--   pure unit
+--   path <- liftEffect $ realpath "."
 
-main :: Effect Unit
-main = launchAff_ do
-  path <- liftEffect $ realpath "."
+--   let indexHTML  = T.URL $ "file://" <> path <> "/generated-docs/html/index.html"
+--       prim       = T.URL $ "file://" <> path <> "/generated-docs/html/Prim.html"
+--       docsSearch = T.URL $ "file://" <> path <> "/generated-docs/html/Docs.Search.App.html"
 
-  let indexHTML  = T.URL $ "file://" <> path <> "/generated-docs/html/index.html"
-      prim       = T.URL $ "file://" <> path <> "/generated-docs/html/Prim.html"
-      docsSearch = T.URL $ "file://" <> path <> "/generated-docs/html/Docs.Search.App.html"
+--   for_ [ indexHTML, prim, docsSearch ] \url -> do
+--     withPage url \page -> do
+--       void $ T.pageWaitForSelector (T.Selector "#group-modules__label") { timeout: 10000 } page
+--     log $ "has module grouping:                  " <> unwrap url
 
-  for_ [ indexHTML, prim, docsSearch ] \url -> do
-    withPage url \page -> do
-      void $ T.pageWaitForSelector (T.Selector "#group-modules__label") { timeout: 10000 } page
-    log $ "has module grouping:                  " <> unwrap url
+--     withPage url \page -> do
+--       T.keyboardPress (T.KeyboardKey "s") {} page
+--       void $ T.keyboardType "slice" {} page
+--       T.keyboardPress (T.KeyboardKey "Enter") {} page
+--       void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
+--     log $ "has working search field:             " <> unwrap url
 
-    withPage url \page -> do
-      T.keyboardPress (T.KeyboardKey "s") {} page
-      void $ T.keyboardType "slice" {} page
-      T.keyboardPress (T.KeyboardKey "Enter") {} page
-      void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
-    log $ "has working search field:             " <> unwrap url
+--     withPage url \page -> do
+--       T.keyboardPress (T.KeyboardKey "s") {} page
+--       void $ T.keyboardType "a -> b" {} page
+--       T.keyboardPress (T.KeyboardKey "Enter") {} page
+--       void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
+--       arr <- readStringArray <$> T.unsafeEvaluateStringFunction getResultTitlesCode page
+--       arr `shouldSatisfy` (Array.elem "unsafeCoerce")
+--     log $ "is able to find unsafeCoerce by type: " <> unwrap url
 
-    withPage url \page -> do
-      T.keyboardPress (T.KeyboardKey "s") {} page
-      void $ T.keyboardType "a -> b" {} page
-      T.keyboardPress (T.KeyboardKey "Enter") {} page
-      void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
-      arr <- readStringArray <$> T.unsafeEvaluateStringFunction getResultTitlesCode page
-      Assert.assert "resulting array contains unsafeCoerce" (Array.elem "unsafeCoerce" arr)
-    log $ "is able to find unsafeCoerce by type: " <> unwrap url
+--     withPage (T.URL $ unwrap url <> "#search:unsafeCoerce") \page -> do
+--       void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
+--       arr <- readStringArray <$> T.unsafeEvaluateStringFunction getResultTitlesCode page
+--       arr `shouldSatisfy` (Array.elem "unsafeCoerce")
+--     log $ "can read URI hash:                    " <> unwrap url
 
-    withPage (T.URL $ unwrap url <> "#search:unsafeCoerce") \page -> do
-      void $ T.pageWaitForSelector (T.Selector ".result__actions__item") { timeout: 10000 } page
-      arr <- readStringArray <$> T.unsafeEvaluateStringFunction getResultTitlesCode page
-      Assert.assert "resulting array contains unsafeCoerce" (Array.elem "unsafeCoerce" arr)
-    log $ "can read URI hash:                    " <> unwrap url
+--   where
+--     log = liftEffect <<< Console.log
+--     getResultTitlesCode = "[].map.call(document.querySelectorAll('.result__title'), el => el.textContent)"
+--     readStringArray :: Foreign -> Array String
+--     readStringArray = Foreign.unsafeFromForeign
 
-  where
-    log = liftEffect <<< Console.log
-    getResultTitlesCode = "[].map.call(document.querySelectorAll('.result__title'), el => el.textContent)"
-    readStringArray :: Foreign -> Array String
-    readStringArray = Foreign.unsafeFromForeign
 
-
-withPage :: forall a. T.URL -> (T.Page -> Aff a) -> Aff Unit
-withPage url f = do
-  browser <- T.launch {}
-  page <- T.newPage browser
-  T.goto url page
-  void $ f page
-  T.close browser
+-- withPage :: forall a. T.URL -> (T.Page -> Aff a) -> Aff Unit
+-- withPage url f = do
+--   browser <- T.launch {}
+--   page <- T.newPage browser
+--   T.goto url page
+--   void $ f page
+--   T.close browser

From 7593b0110f0018cf8a4f3f8d88d77d12a42871be Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Wed, 31 Aug 2022 20:16:17 +0400
Subject: [PATCH 38/45] Add a ModuleParser

---
 src/Docs/Search/ModuleParser.purs | 50 +++++++++++++++++++++++++++++++
 src/Docs/Search/Types.purs        |  9 ++++--
 test/Main.purs                    |  9 +++---
 test/Test/ModuleParser.purs       | 42 ++++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 7 deletions(-)
 create mode 100644 src/Docs/Search/ModuleParser.purs
 create mode 100644 test/Test/ModuleParser.purs

diff --git a/src/Docs/Search/ModuleParser.purs b/src/Docs/Search/ModuleParser.purs
new file mode 100644
index 0000000..ab9df3f
--- /dev/null
+++ b/src/Docs/Search/ModuleParser.purs
@@ -0,0 +1,50 @@
+module Docs.Search.ModuleParser where
+
+import Prelude
+
+import Control.Alt ((<|>))
+import Data.Either (hush)
+import Data.Foldable (intercalate)
+import Data.Maybe (Maybe)
+import Data.Newtype (wrap)
+import Docs.Search.Types (ModuleName)
+import StringParser (Parser, char, choice, fix, many, manyTill, noneOf, regex, runParser, sepBy, sepBy1, string, try, whiteSpace)
+
+parseModuleName :: String -> Maybe ModuleName
+parseModuleName = map wrap <<< hush <<< runParser do
+  void $ many whiteSpaceOrComment
+  moduleHeader
+
+whiteSpaceOrComment :: Parser Unit
+whiteSpaceOrComment =
+  choice
+  [ try $ multiLineComment
+  , try $ singleLineComment
+  , try $ void whiteSpace
+  ]
+
+multiLineComment :: Parser Unit
+multiLineComment = do
+  void $ string "{-"
+  void $ manyTill (void $ noneOf []) (string "-}")
+
+singleLineComment :: Parser Unit
+singleLineComment = do
+  void $ string "--"
+  void $ manyTill (void $ noneOf ['\n']) (char '\n')
+
+
+moduleHeader :: Parser String
+moduleHeader = do
+  void $ string "module"
+  void $ many whiteSpaceOrComment
+  moduleName
+
+moduleName :: Parser String
+moduleName = sepBy1 moduleNameWord (string ".") <#> intercalate "."
+
+moduleNameWord :: Parser String
+moduleNameWord = do
+  first <- regex "[A-Z]"
+  rest <- regex "[a-z0-9]*"
+  pure $ first <> rest
diff --git a/src/Docs/Search/Types.purs b/src/Docs/Search/Types.purs
index 9172edb..5cfa11e 100644
--- a/src/Docs/Search/Types.purs
+++ b/src/Docs/Search/Types.purs
@@ -31,6 +31,9 @@ derive newtype instance ordModuleName :: Ord ModuleName
 derive newtype instance decodeJsonModuleName :: DecodeJson ModuleName
 derive newtype instance encodeJsonModuleName :: EncodeJson ModuleName
 
+instance Show ModuleName where
+  show = genericShow
+
 
 -- | Non-normalized package name, e.g. `purescript-prelude` or just `prelude`.
 newtype RawPackageName = RawPackageName String
@@ -55,14 +58,14 @@ data PackageInfo = LocalPackage | Builtin | Package PackageName | UnknownPackage
 derive instance eqPackageInfo :: Eq PackageInfo
 derive instance ordPackageInfo :: Ord PackageInfo
 derive instance genericPackageInfo :: Generic PackageInfo _
-instance showPackageInfo :: Show PackageInfo where
-  show = genericShow
-
 instance decodeJsonPackageInfo :: DecodeJson PackageInfo where
   decodeJson = genericDecodeJson
 instance encodeJsonPackageInfo :: EncodeJson PackageInfo where
   encodeJson = genericEncodeJson
 
+instance showPackageInfo :: Show PackageInfo where
+  show = genericShow
+
 
 newtype PackageScore = PackageScore Int
 
diff --git a/test/Main.purs b/test/Main.purs
index dfc2a63..01a01d8 100644
--- a/test/Main.purs
+++ b/test/Main.purs
@@ -3,16 +3,16 @@ module Test.Main where
 import Prelude
 
 import Effect (Effect)
+import Effect.Aff (launchAff_)
 import Test.Declarations as Declarations
 import Test.IndexBuilder as IndexBuilder
 import Test.ModuleIndex as ModuleIndex
-import Test.TypeQuery as TypeQuery
-import Test.TypeJson as TypeJson
--- import Test.UI as UI
+import Test.ModuleParser as ModuleParser
 import Test.Spec (Spec)
 import Test.Spec.Reporter.Console (consoleReporter)
 import Test.Spec.Runner (runSpec)
-import Effect.Aff (launchAff_)
+import Test.TypeJson as TypeJson
+import Test.TypeQuery as TypeQuery
 
 main :: Effect Unit
 main = do
@@ -21,6 +21,7 @@ main = do
 
 mainTest :: Spec Unit
 mainTest = do
+  ModuleParser.tests
   TypeQuery.tests
   TypeJson.tests
   IndexBuilder.tests
diff --git a/test/Test/ModuleParser.purs b/test/Test/ModuleParser.purs
new file mode 100644
index 0000000..2999355
--- /dev/null
+++ b/test/Test/ModuleParser.purs
@@ -0,0 +1,42 @@
+module Test.ModuleParser where
+
+import Prelude
+
+import Data.Either (Either(..))
+import Data.Maybe (Maybe(..))
+import Docs.Search.ModuleParser (multiLineComment, parseModuleName, singleLineComment)
+import Docs.Search.Types (ModuleName(..))
+import StringParser (runParser)
+import Test.Spec (Spec, describe, it)
+import Test.Spec.Assertions (shouldEqual)
+
+
+tests :: Spec Unit
+tests = do
+  describe "ModuleParser" do
+    it "test #0" do
+      parseModuleName "module Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "test #1" do
+      parseModuleName "module Foo.Bar.B" `shouldEqual` Just (ModuleName "Foo.Bar.B")
+    it "test #2" do
+      parseModuleName "   module Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "test #3" do
+      parseModuleName " {- asdas -} module Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "test #4" do
+      parseModuleName "{--}module Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "test #5" do
+      parseModuleName "--\nmodule Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "test #6" do
+      parseModuleName "--\n-- foo\nmodule Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "test #7" do
+      parseModuleName "-- \n  -- foo\n {- bar -} --baz\n module Foo" `shouldEqual` Just (ModuleName "Foo")
+    it "multiline comment #1" do
+      runParser multiLineComment "{--}" `shouldEqual` Right unit
+    it "multiline comment #1" do
+      runParser multiLineComment "{- foo -}" `shouldEqual` Right unit
+    it "multiline comment #1" do
+      runParser multiLineComment "{- foo\nbar\nbar\n -}" `shouldEqual` Right unit
+    it "single line comment #1" do
+      runParser singleLineComment "-- asd\n" `shouldEqual` Right unit
+    it "single line comment #1" do
+      runParser singleLineComment "--\n" `shouldEqual` Right unit

From d5db431281c351a82d25ee7651a159d7ec6bacdb Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Wed, 31 Aug 2022 21:41:09 +0400
Subject: [PATCH 39/45] Extract module names from sources

---
 package-lock.json                 | 2073 +++++++++++++++++++++++------
 package.json                      |   24 +-
 spago.dhall                       |    1 +
 src/Docs/Search/IndexBuilder.purs |   45 +-
 src/Docs/Search/Interactive.purs  |   16 +-
 src/Docs/Search/Main.purs         |   39 +-
 src/Docs/Search/ModuleIndex.purs  |   15 +-
 src/Docs/Search/ModuleParser.purs |    4 +-
 src/Docs/Search/PackageIndex.purs |    2 +-
 test/Test/ModuleParser.purs       |   25 +-
 10 files changed, 1797 insertions(+), 447 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 30f5fe8..4809965 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,9 +1,1337 @@
 {
   "name": "purescript-docs-search",
   "version": "0.0.11",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "purescript-docs-search",
+      "version": "0.0.11",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "bin": {
+        "purescript-docs-search": "dist/purescript-docs-search.js"
+      },
+      "devDependencies": {
+        "esbuild": "^0.11.10",
+        "glob": "^7.1.6",
+        "markdown-it": "^12.0.4",
+        "puppeteer": "^8.0.0",
+        "spago": "^0.20.9"
+      }
+    },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "dev": true
+    },
+    "node_modules/@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "dev": true,
+      "dependencies": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "dev": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "14.14.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
+      "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
+      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/agentkeepalive": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "dev": true,
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cacache/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.854822",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz",
+      "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==",
+      "dev": true
+    },
+    "node_modules/encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "iconv-lite": "^0.6.2"
+      }
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/entities": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+      "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
+    "node_modules/esbuild": {
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.11.tgz",
+      "integrity": "sha512-iq5YdV63vY/nUAFIvY92BXVkYjMbOchnofLKoLKMPZIa4uuIJAJG9WRA+ZRjQBZbrsORUwvZcANeG2d3p46PJQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "dev": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+      "dev": true
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.0.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "node_modules/ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
+      "dev": true
+    },
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+      "dev": true
+    },
+    "node_modules/linkify-it": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
+      "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==",
+      "dev": true,
+      "dependencies": {
+        "uc.micro": "^1.0.1"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "dev": true,
+      "dependencies": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/markdown-it": {
+      "version": "12.3.2",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
+      "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==",
+      "dev": true,
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "~2.1.0",
+        "linkify-it": "^3.0.1",
+        "mdurl": "^1.0.1",
+        "uc.micro": "^1.0.5"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.js"
+      }
+    },
+    "node_modules/mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
+      "dev": true
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.12"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
+      "dev": true,
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "dev": true
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/puppeteer": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz",
+      "integrity": "sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==",
+      "deprecated": "Version no longer supported. Upgrade to @latest",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.854822",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/puppeteer/node_modules/ws": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz",
+      "integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==",
+      "dev": true,
+      "dependencies": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/spago": {
+      "version": "0.20.9",
+      "resolved": "https://registry.npmjs.org/spago/-/spago-0.20.9.tgz",
+      "integrity": "sha512-r5TUxnYn9HawlQyMswlhIk24BGFSN2KGbqgZFZrn47GjTpMscU14xkt9CqTWgoSQYsoZieG+3dUtOxUQ7GYD7w==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "make-fetch-happen": "^9.1.0",
+        "tar": "^6.1.11"
+      },
+      "bin": {
+        "spago": "spago"
+      }
+    },
+    "node_modules/ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "dev": true,
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/tar": {
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tar-stream/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/tar/node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/uc.micro": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
+      "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==",
+      "dev": true
+    },
+    "node_modules/unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "node_modules/unbzip2-stream/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "dependencies": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  },
   "dependencies": {
+    "@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "dev": true
+    },
+    "@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "dev": true,
+      "requires": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      }
+    },
+    "@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "dev": true,
+      "requires": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true
+    },
     "@types/node": {
       "version": "14.14.39",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
@@ -30,55 +1358,31 @@
         "debug": "4"
       }
     },
-    "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+    "agentkeepalive": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
+        "humanize-ms": "^1.2.1"
       }
     },
-    "argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+    "aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
       "requires": {
-        "safer-buffer": "~2.1.0"
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       }
     },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+    "argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true
     },
     "balanced-match": {
@@ -93,15 +1397,6 @@
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
     "bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -152,11 +1447,39 @@
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
       "dev": true
     },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+    "cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "dev": true,
+      "requires": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        }
+      }
     },
     "chownr": {
       "version": "1.1.4",
@@ -164,14 +1487,11 @@
       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
     },
     "concat-map": {
       "version": "0.0.1",
@@ -179,34 +1499,19 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
     },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true
     },
     "devtools-protocol": {
@@ -215,14 +1520,14 @@
       "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==",
       "dev": true
     },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+    "encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
+        "iconv-lite": "^0.6.2"
       }
     },
     "end-of-stream": {
@@ -240,18 +1545,18 @@
       "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
       "dev": true
     },
+    "err-code": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+      "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+      "dev": true
+    },
     "esbuild": {
       "version": "0.11.11",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.11.tgz",
       "integrity": "sha512-iq5YdV63vY/nUAFIvY92BXVkYjMbOchnofLKoLKMPZIa4uuIJAJG9WRA+ZRjQBZbrsORUwvZcANeG2d3p46PJQ==",
       "dev": true
     },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
     "extract-zip": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -264,24 +1569,6 @@
         "yauzl": "^2.10.0"
       }
     },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
     "fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -291,23 +1578,6 @@
         "pend": "~1.2.0"
       }
     },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -315,12 +1585,12 @@
       "dev": true
     },
     "fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "dev": true,
       "requires": {
-        "minipass": "^2.6.0"
+        "minipass": "^3.0.0"
       }
     },
     "fs.realpath": {
@@ -338,15 +1608,6 @@
         "pump": "^3.0.0"
       }
     },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
     "glob": {
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -361,31 +1622,21 @@
         "path-is-absolute": "^1.0.0"
       }
     },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+    "http-cache-semantics": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
       "dev": true
     },
-    "har-validator": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.3",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       }
     },
     "https-proxy-agent": {
@@ -398,12 +1649,49 @@
         "debug": "4"
       }
     },
+    "humanize-ms": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+      "dev": true,
+      "requires": {
+        "ms": "^2.0.0"
+      }
+    },
+    "iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      }
+    },
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true
     },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -420,54 +1708,18 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+    "ip": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
+      "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==",
       "dev": true
     },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+    "is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true
     },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
     "linkify-it": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz",
@@ -477,6 +1729,39 @@
         "uc.micro": "^1.0.1"
       }
     },
+    "lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "requires": {
+        "yallist": "^4.0.0"
+      }
+    },
+    "make-fetch-happen": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
+      "dev": true,
+      "requires": {
+        "agentkeepalive": "^4.1.3",
+        "cacache": "^15.2.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.3",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.3.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
+        "promise-retry": "^2.0.1",
+        "socks-proxy-agent": "^6.0.0",
+        "ssri": "^8.0.0"
+      }
+    },
     "markdown-it": {
       "version": "12.3.2",
       "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz",
@@ -496,21 +1781,6 @@
       "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=",
       "dev": true
     },
-    "mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.47.0"
-      }
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -521,41 +1791,78 @@
       }
     },
     "minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
+      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
+        "yallist": "^4.0.0"
       }
     },
-    "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+    "minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
       "dev": true,
       "requires": {
-        "minipass": "^2.9.0"
+        "minipass": "^3.0.0"
       }
     },
-    "mkdirp": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+    "minipass-fetch": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.5"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        }
+        "encoding": "^0.1.12",
+        "minipass": "^3.1.0",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      }
+    },
+    "minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
       }
     },
+    "mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "dev": true
+    },
     "mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
@@ -568,18 +1875,18 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
       "dev": true
     },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "dev": true
+    },
     "node-fetch": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
       "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==",
       "dev": true
     },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -598,6 +1905,15 @@
         "p-try": "^2.0.0"
       }
     },
+    "p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
+    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -616,12 +1932,6 @@
       "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
       "dev": true
     },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
     "pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -673,18 +1983,28 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "dev": true
+    },
+    "promise-retry": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+      "dev": true,
+      "requires": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      }
+    },
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "dev": true
     },
-    "psl": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
-      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
-      "dev": true
-    },
     "pump": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@@ -698,8 +2018,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "puppeteer": {
       "version": "8.0.0",
@@ -721,55 +2040,28 @@
         "ws": "^7.2.3"
       },
       "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
         "ws": {
           "version": "7.4.4",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
           "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
-    "request": {
-      "version": "2.88.2",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
-      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.3",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
+    "retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dev": true,
+      "requires": {
+        "glob": "^7.1.3"
       }
     },
     "safe-buffer": {
@@ -782,33 +2074,62 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true,
+      "optional": true
+    },
+    "semver": {
+      "version": "7.3.7",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+      "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+      "dev": true,
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
+    },
+    "smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
+    "socks": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz",
+      "integrity": "sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA==",
+      "dev": true,
+      "requires": {
+        "ip": "^2.0.0",
+        "smart-buffer": "^4.2.0"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      }
+    },
     "spago": {
-      "version": "0.20.0",
-      "resolved": "https://registry.npmjs.org/spago/-/spago-0.20.0.tgz",
-      "integrity": "sha512-B0cvb1g5rjV80ovMT5MuNvUhfcXz0caEa3OPdydvYlvh6/WQZYa0S74or4PUPbRsiwhm9C1FCtfzzEk+yTKaHA==",
+      "version": "0.20.9",
+      "resolved": "https://registry.npmjs.org/spago/-/spago-0.20.9.tgz",
+      "integrity": "sha512-r5TUxnYn9HawlQyMswlhIk24BGFSN2KGbqgZFZrn47GjTpMscU14xkt9CqTWgoSQYsoZieG+3dUtOxUQ7GYD7w==",
       "dev": true,
       "requires": {
-        "request": "^2.88.0",
-        "tar": "^4.4.8"
+        "make-fetch-happen": "^9.1.0",
+        "tar": "^6.1.11"
       }
     },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+    "ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
       "dev": true,
       "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
+        "minipass": "^3.1.1"
       }
     },
     "string_decoder": {
@@ -821,18 +2142,25 @@
       }
     },
     "tar": {
-      "version": "4.4.19",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
-      "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.4",
-        "fs-minipass": "^1.2.7",
-        "minipass": "^2.9.0",
-        "minizlib": "^1.3.3",
-        "mkdirp": "^0.5.5",
-        "safe-buffer": "^5.2.1",
-        "yallist": "^3.1.1"
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        }
       }
     },
     "tar-fs": {
@@ -879,31 +2207,6 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
     "uc.micro": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
@@ -932,13 +2235,22 @@
         }
       }
     },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+    "unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "dev": true,
+      "requires": {
+        "unique-slug": "^2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "dev": true,
       "requires": {
-        "punycode": "^2.1.0"
+        "imurmurhash": "^0.1.4"
       }
     },
     "util-deprecate": {
@@ -947,23 +2259,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -971,9 +2266,9 @@
       "dev": true
     },
     "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
     "yauzl": {
diff --git a/package.json b/package.json
index 9f5307e..e0b6f87 100644
--- a/package.json
+++ b/package.json
@@ -7,31 +7,31 @@
     "test": "test"
   },
   "bin": {
-    "purescript-docs-search": "dist/purescript-docs-search"
+    "purescript-docs-search": "dist/purescript-docs-search.cjs"
   },
   "files": [
-    "dist/purescript-docs-search",
+    "dist/purescript-docs-search.cjs",
     "dist/docs-search-app.js",
     "README.md",
     "CHANGELOG.md"
   ],
   "scripts": {
-    "test": "spago docs --no-search && ./dist/purescript-docs-search build-index && spago test && npm run check-version",
+    "test": "spago docs --no-search && ./dist/purescript-docs-search.cjs build-index && spago test && npm run check-version",
     "bundle-app": "spago bundle-app --no-build --no-install -m Docs.Search.App --to dist/docs-search-app.js",
     "esbuild-app": "esbuild dist/docs-search-app.js --target=es2016 --bundle --minify --outfile=dist/docs-search-app.min.js && mv dist/docs-search-app.min.js dist/docs-search-app.js",
     "build-app": "npm run bundle-app && npm run esbuild-app",
     "bundle-main": "spago bundle-app --no-build --no-install --platform node -m Docs.Search.Main --to dist/main.js",
     "esbuild-main": "esbuild dist/main.js --platform=node --bundle --minify --outfile=dist/main.min.js && mv dist/main.min.js dist/main.js",
-    "add-shebang": "echo \"#!/usr/bin/env node\" > dist/purescript-docs-search && cat dist/main.js >> dist/purescript-docs-search",
-    "chmod-main": "chmod +x dist/purescript-docs-search",
+    "add-shebang": "echo \"#!/usr/bin/env node\" > dist/purescript-docs-search.cjs && cat dist/main.js >> dist/purescript-docs-search.cjs",
+    "chmod-main": "chmod +x dist/purescript-docs-search.cjs",
     "build-main": "npm run bundle-main && npm run esbuild-main && npm run add-shebang && rm dist/main.js && npm run chmod-main",
     "build": "spago build && npm run build-app && npm run build-main",
     "clean": "rm -rf dist",
-    "check-version": "[ \"$(./dist/purescript-docs-search version)\" = \"$npm_package_version\" ]"
+    "check-version": "[ \"$(./dist/purescript-docs-search.cjs version)\" = \"$npm_package_version\" ]"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/spacchetti/purescript-docs-search.git"
+    "url": "git+https://github.com/purescript/purescript-docs-search.git"
   },
   "keywords": [
     "purescript"
@@ -39,15 +39,17 @@
   "author": "Kalnitsky Vladimir <klntsky@gmail.com>",
   "license": "BSD-3-Clause",
   "bugs": {
-    "url": "https://github.com/spacchetti/purescript-docs-search/issues"
+    "url": "https://github.com/purescript/purescript-docs-search/issues"
+  },
+  "homepage": "https://github.com/purescript/purescript-docs-search#readme",
+  "dependencies": {
+    "punycode": "^2.1.1"
   },
-  "homepage": "https://github.com/spacchetti/purescript-docs-search#readme",
-  "dependencies": {},
   "devDependencies": {
     "esbuild": "^0.11.10",
     "glob": "^7.1.6",
     "markdown-it": "^12.0.4",
     "puppeteer": "^8.0.0",
-    "spago": "^0.20.0"
+    "spago": "^0.20.9"
   }
 }
diff --git a/spago.dhall b/spago.dhall
index 16666b9..ccf59f6 100644
--- a/spago.dhall
+++ b/spago.dhall
@@ -33,6 +33,7 @@
   , "node-readline"
   , "optparse"
   , "ordered-collections"
+  , "parallel"
   , "partial"
   , "prelude"
   , "profunctor"
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 20f2de9..812e4b8 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -5,13 +5,14 @@ import Docs.Search.Config as Config
 import Docs.Search.Declarations (Declarations(..), mkDeclarations)
 import Docs.Search.DocsJson (DocsJson)
 import Docs.Search.Extra ((>#>))
+import Docs.Search.Meta (Meta)
 import Docs.Search.ModuleIndex (PackedModuleIndex, mkPackedModuleIndex)
+import Docs.Search.ModuleParser (parseModuleName)
 import Docs.Search.PackageIndex (PackageInfo, mkPackageInfo)
 import Docs.Search.Score (mkScores)
 import Docs.Search.SearchResult (SearchResult)
 import Docs.Search.TypeIndex (TypeIndex, mkTypeIndex)
-import Docs.Search.Types (PackageName, PartId)
-import Docs.Search.Meta (Meta)
+import Docs.Search.Types (ModuleName, PackageName, PartId)
 
 import Prelude
 
@@ -20,6 +21,7 @@ import Data.Argonaut.Decode (decodeJson)
 import Data.Argonaut.Decode.Error (printJsonDecodeError)
 import Data.Argonaut.Encode (encodeJson)
 import Data.Argonaut.Parser (jsonParser)
+import Data.Array (concat)
 import Data.Array as Array
 import Data.Either (Either(..), either)
 import Data.Foldable (sum)
@@ -38,14 +40,15 @@ import Data.String.Common (replace) as String
 import Data.String.Pattern (Pattern(..), Replacement(..))
 import Data.Traversable (for, for_)
 import Data.Tuple (Tuple(..), fst)
+import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff_, parallel, sequential)
 import Effect.Class (liftEffect)
 import Effect.Console (log)
 import Node.Encoding (Encoding(UTF8))
 import Node.FS.Aff (mkdir, readFile, readTextFile, readdir, stat, writeFile, writeTextFile)
-import Node.FS.Sync (exists)
 import Node.FS.Stats (isDirectory, isFile)
+import Node.FS.Sync (exists)
 import Node.Process as Process
 import Web.Bower.PackageMeta (PackageMeta(..))
 
@@ -56,6 +59,7 @@ type Config =
   , generatedDocs :: String
   , noPatch :: Boolean
   , packageName :: PackageName
+  , sourceFiles :: Array String
   }
 
 
@@ -71,8 +75,11 @@ run' cfg = do
   liftEffect do
     log "Building the search index..."
 
-  docsJsons    <- decodeDocsJsons cfg
-  packageMetas <- decodeBowerJsons cfg
+  docsJsons /\ moduleNames /\ packageMetas <- sequential $
+    (\d h m -> d /\ h /\ m)
+      <$> parallel (decodeDocsJsons cfg)
+      <*> parallel (parseModuleHeaders cfg.sourceFiles)
+      <*> parallel (decodeBowerJsons cfg)
 
   let countOfPackages = Array.length packageMetas
       countOfModules  = Array.length docsJsons
@@ -89,14 +96,14 @@ run' cfg = do
       index       = mkDeclarations scores docsJsons
       typeIndex   = mkTypeIndex scores docsJsons
       packageInfo = mkPackageInfo scores packageMetas
-      moduleIndex = mkPackedModuleIndex index
+      moduleIndex = mkPackedModuleIndex index moduleNames
       meta        = { localPackageName: cfg.packageName }
 
   createDirectories cfg
 
   void $ sequential do
     ignore <$> parallel (writeIndex cfg index)
-           <*> parallel (writeTypeIndex cfg typeIndex)
+           <*> parallel (writeTypeIndex typeIndex)
            <*> parallel (writePackageInfo packageInfo)
            <*> parallel (writeModuleIndex moduleIndex)
            <*> parallel (writeMeta meta)
@@ -176,6 +183,24 @@ decodeDocsJsons cfg@{ docsFiles } = do
 
   pure docsJsons
 
+-- | This function accepts an array of globs pointing to project sources
+-- | and returns a list of module names extracted from these files.
+-- | Unfortunately, we can't get all module names from `docs.json`s, because
+-- | reexport-only modules do not have a single declaration in them, so we can't
+-- | count them normally in `mkPackedModuleIndex.extract`, where we only look at
+-- | exported declarations.
+parseModuleHeaders :: Array String -> Aff (Array ModuleName)
+parseModuleHeaders globs = do
+  files <- getPathsByGlobs globs
+  concat <$> for files \filePath -> do
+    fileContents <- readTextFile UTF8 filePath
+    case parseModuleName fileContents of
+      Nothing -> do
+        liftEffect $ log $
+          "Module header decoding failed for " <> filePath <>
+          ", unable to extract module name"
+        pure []
+      Just res -> pure [res]
 
 decodeBowerJsons
   :: forall rest
@@ -210,8 +235,8 @@ decodeBowerJsons { bowerFiles } = do
 
 
 -- | Write type index parts to files.
-writeTypeIndex :: Config -> TypeIndex -> Aff Unit
-writeTypeIndex { generatedDocs } typeIndex =
+writeTypeIndex :: TypeIndex -> Aff Unit
+writeTypeIndex typeIndex =
   for_ entries \(Tuple typeShape results) -> do
     writeTextFile UTF8 (unwrap Config.typeIndexDirectory <> "/" <> typeShape <> ".js")
       (mkHeader typeShape <> stringify (encodeJson results))
@@ -265,7 +290,7 @@ getIndex (Declarations trie) =
                  Trie.query prefix trie
               else
                 -- Entries with path lengths > 1 have been added already.
-                List.filter (\(Tuple path value) -> List.length path == 1) (
+                List.filter (\(Tuple path _value) -> List.length path == 1) (
                   Trie.query prefix trie
                 )
         in
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 3616b24..892ca0d 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -6,6 +6,7 @@ import Docs.Search.DocsJson (DataDeclType(..))
 import Docs.Search.Engine (mkEngineState, packageInfoToString, Result(..))
 import Docs.Search.Engine as Engine
 import Docs.Search.Extra (stringToList, (>#>))
+import Docs.Search.IndexBuilder (parseModuleHeaders)
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.ModuleIndex (ModuleResult, mkPackedModuleIndex, unpackModuleIndex)
 import Docs.Search.NodeEngine (nodeEngine)
@@ -19,7 +20,8 @@ import Docs.Search.TypePrinter (keyword, showConstraint, showFunDeps, showType,
 import Docs.Search.Types (ModuleName, PackageName, PackageInfo, Identifier)
 
 import Prelude
-import Prim hiding (Type, Constraint)
+
+import Control.Parallel (parallel, sequential)
 import Data.Array as Array
 import Data.Identity (Identity(..))
 import Data.List as List
@@ -28,17 +30,20 @@ import Data.Newtype (un, unwrap, wrap)
 import Data.Search.Trie as Trie
 import Data.String (length) as String
 import Data.String.Common (split, toLower, trim) as String
+import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
 import Effect.Console (log, clear) as Console
 import Node.ReadLine (createConsoleInterface, question)
+import Prim hiding (Type, Constraint)
 
 
 type Config =
   { docsFiles :: Array String
   , bowerFiles :: Array String
   , packageName :: PackageName
+  , sourceFiles :: Array String
   }
 
 
@@ -48,14 +53,17 @@ run cfg = launchAff_ $ do
   liftEffect do
     Console.log "Loading search index..."
 
-  docsJsons    <- IndexBuilder.decodeDocsJsons cfg
-  packageMetas <- IndexBuilder.decodeBowerJsons cfg
+  docsJsons /\ moduleNames /\ packageMetas <- sequential $
+    (\d h m -> d /\ h /\ m)
+      <$> parallel (IndexBuilder.decodeDocsJsons cfg)
+      <*> parallel (parseModuleHeaders cfg.sourceFiles)
+      <*> parallel (IndexBuilder.decodeBowerJsons cfg)
 
   let scores       = mkScores packageMetas
       index        = mkDeclarations scores docsJsons
       typeIndex    = docsJsons >>= resultsWithTypes scores
       packageIndex = mkPackageIndex $ mkPackageInfo scores packageMetas
-      moduleIndex  = unpackModuleIndex $ mkPackedModuleIndex index
+      moduleIndex  = unpackModuleIndex $ mkPackedModuleIndex index moduleNames
       engineState  = mkEngineState (unwrap index) typeIndex packageIndex moduleIndex scores
 
   let countOfDefinitions     = Trie.size $ unwrap index
diff --git a/src/Docs/Search/Main.purs b/src/Docs/Search/Main.purs
index 44cbc67..5b3a013 100644
--- a/src/Docs/Search/Main.purs
+++ b/src/Docs/Search/Main.purs
@@ -28,6 +28,7 @@ main = do
   let defaultCommands = Search { docsFiles: defaultDocsFiles
                                , bowerFiles: defaultBowerFiles
                                , packageName: Config.defaultPackageName
+                               , sourceFiles: defaultSourceFiles
                                }
 
   case fromMaybe defaultCommands args of
@@ -35,7 +36,6 @@ main = do
     Search cfg -> Interactive.run cfg
     Version -> log Config.version
 
-
 getArgs :: Effect (Maybe Commands)
 getArgs = execParser opts
   where
@@ -45,19 +45,16 @@ getArgs = execParser opts
      <> progDesc "Search frontend for the documentation generated by the PureScript compiler."
       )
 
-
 data Commands
   = BuildIndex IndexBuilder.Config
   | Search Interactive.Config
   | Version
 
-
 derive instance genericCommands :: Generic Commands _
 
 instance showCommands :: Show Commands where
   show = genericShow
 
-
 commands :: Parser (Maybe Commands)
 commands = optional $ subparser
   ( command "build-index"
@@ -80,39 +77,29 @@ commands = optional $ subparser
 
 buildIndex :: Parser Commands
 buildIndex = ado
-
   docsFiles <- docsFilesOption
-
   bowerFiles <- bowerFilesOption
-
   packageName <- packageNameOption
-
+  sourceFiles <- sourceFilesOption
   generatedDocs <- strOption
     ( long "generated-docs"
    <> metavar "DIR"
    <> value "./generated-docs/"
     )
-
   noPatch <- flag false true
     ( long "no-patch"
    <> help "Do not patch the HTML docs, only build indices"
     )
-
-
-  in BuildIndex { docsFiles, bowerFiles, generatedDocs, noPatch, packageName }
+  in BuildIndex { docsFiles, bowerFiles, generatedDocs, noPatch, packageName, sourceFiles }
 
 
 startInteractive :: Parser Commands
 startInteractive = ado
-
   docsFiles <- docsFilesOption
-
   bowerFiles <- bowerFilesOption
-
   packageName <- packageNameOption
-
-  in Search { docsFiles, bowerFiles, packageName }
-
+  sourceFiles <- sourceFilesOption
+  in Search { docsFiles, bowerFiles, packageName, sourceFiles }
 
 docsFilesOption :: Parser (Array String)
 docsFilesOption = fromMaybe defaultDocsFiles <$>
@@ -125,7 +112,6 @@ docsFilesOption = fromMaybe defaultDocsFiles <$>
      )
    )
 
-
 bowerFilesOption :: Parser (Array String)
 bowerFilesOption = fromMaybe defaultBowerFiles <$>
    optional
@@ -137,7 +123,6 @@ bowerFilesOption = fromMaybe defaultBowerFiles <$>
      )
    )
 
-
 packageNameOption :: Parser PackageName
 packageNameOption =
   PackageName <$> strOption
@@ -146,18 +131,28 @@ packageNameOption =
  <> value (unwrap Config.defaultPackageName)
   )
 
+sourceFilesOption :: Parser (Array String)
+sourceFilesOption = fromMaybe defaultSourceFiles <$>
+   optional
+   ( some
+     ( strOption
+       ( long "source-files"
+      <> metavar "GLOB"
+       )
+     )
+   )
 
 defaultDocsFiles :: Array String
 defaultDocsFiles = [ "output/**/docs.json" ]
 
-
 defaultBowerFiles :: Array String
 defaultBowerFiles = [ ".spago/*/*/bower.json", "bower_components/purescript-*/bower.json" ]
 
+defaultSourceFiles :: Array String
+defaultSourceFiles = [ "src/**/*.purs" ]
 
 many :: forall a f. Unfoldable f => Parser a -> Parser (f a)
 many x = CA.many x <#> List.toUnfoldable
 
-
 some :: forall a f. Unfoldable f => Parser a -> Parser (f a)
 some x = CA.some x <#> NonEmpty.toUnfoldable
diff --git a/src/Docs/Search/ModuleIndex.purs b/src/Docs/Search/ModuleIndex.purs
index f554c55..157df8d 100644
--- a/src/Docs/Search/ModuleIndex.purs
+++ b/src/Docs/Search/ModuleIndex.purs
@@ -2,10 +2,10 @@ module Docs.Search.ModuleIndex where
 
 import Docs.Search.Config as Config
 import Docs.Search.Declarations (Declarations(..))
-import Docs.Search.SearchResult (SearchResult(..))
-import Docs.Search.Types (ModuleName, PackageInfo, PackageScore)
 import Docs.Search.Extra (stringToList)
 import Docs.Search.Score (Scores, getPackageScore)
+import Docs.Search.SearchResult (SearchResult(..))
+import Docs.Search.Types (ModuleName, PackageInfo(..), PackageScore)
 
 import Prelude
 
@@ -21,7 +21,7 @@ import Data.Lens.Record (prop)
 import Data.List (List, (:))
 import Data.Map (Map)
 import Data.Map as Map
-import Data.Maybe (fromMaybe)
+import Data.Maybe (Maybe(..), fromMaybe)
 import Data.Newtype (unwrap)
 import Data.Search.Trie (Trie)
 import Data.Search.Trie as Trie
@@ -91,10 +91,15 @@ queryModuleIndex scores { index, modulePackages } query =
 
 
 -- | Constructs a mapping from packages to modules
-mkPackedModuleIndex :: Declarations -> PackedModuleIndex
-mkPackedModuleIndex (Declarations trie) =
+mkPackedModuleIndex :: Declarations -> Array ModuleName -> PackedModuleIndex
+mkPackedModuleIndex (Declarations trie) moduleNames =
+  addLocalPackageModuleNames $
   foldr (Map.unionWith Set.union) Map.empty $ extract <$> Trie.values trie
   where
+    -- Add modules from src/ that may not contain any definitions, only
+    -- re-exports
+    addLocalPackageModuleNames = flip Map.alter LocalPackage $
+      Just <<< append (Set.fromFoldable moduleNames) <<< fromMaybe Set.empty
     extract
       :: List SearchResult
       -> Map PackageInfo (Set ModuleName)
diff --git a/src/Docs/Search/ModuleParser.purs b/src/Docs/Search/ModuleParser.purs
index ab9df3f..0f9e275 100644
--- a/src/Docs/Search/ModuleParser.purs
+++ b/src/Docs/Search/ModuleParser.purs
@@ -8,6 +8,7 @@ import Data.Foldable (intercalate)
 import Data.Maybe (Maybe)
 import Data.Newtype (wrap)
 import Docs.Search.Types (ModuleName)
+import Effect (Effect)
 import StringParser (Parser, char, choice, fix, many, manyTill, noneOf, regex, runParser, sepBy, sepBy1, string, try, whiteSpace)
 
 parseModuleName :: String -> Maybe ModuleName
@@ -33,7 +34,6 @@ singleLineComment = do
   void $ string "--"
   void $ manyTill (void $ noneOf ['\n']) (char '\n')
 
-
 moduleHeader :: Parser String
 moduleHeader = do
   void $ string "module"
@@ -46,5 +46,5 @@ moduleName = sepBy1 moduleNameWord (string ".") <#> intercalate "."
 moduleNameWord :: Parser String
 moduleNameWord = do
   first <- regex "[A-Z]"
-  rest <- regex "[a-z0-9]*"
+  rest <- regex "[A-Za-z0-9]*"
   pure $ first <> rest
diff --git a/src/Docs/Search/PackageIndex.purs b/src/Docs/Search/PackageIndex.purs
index bac5d3e..28ada7e 100644
--- a/src/Docs/Search/PackageIndex.purs
+++ b/src/Docs/Search/PackageIndex.purs
@@ -56,7 +56,7 @@ mkPackageInfo packageScores pms =
           , score: getPackageScoreForPackageName packageScores packageName
           , dependencies:
             unwrap dependencies <#>
-            (_.packageName >>> RawPackageName >>> normalizePackageName)
+            _.packageName >>> RawPackageName >>> normalizePackageName
           , repository: repository <#> (_.url)
           }
 
diff --git a/test/Test/ModuleParser.purs b/test/Test/ModuleParser.purs
index 2999355..6a14405 100644
--- a/test/Test/ModuleParser.purs
+++ b/test/Test/ModuleParser.purs
@@ -1,16 +1,24 @@
 module Test.ModuleParser where
 
+import Docs.Search.IndexBuilder (getPathsByGlobs)
+import Docs.Search.ModuleParser (multiLineComment, parseModuleName, singleLineComment)
+import Docs.Search.Types (ModuleName(..))
+
 import Prelude
 
+import Data.Array as Array
 import Data.Either (Either(..))
+import Data.Foldable (for_)
 import Data.Maybe (Maybe(..))
-import Docs.Search.ModuleParser (multiLineComment, parseModuleName, singleLineComment)
-import Docs.Search.Types (ModuleName(..))
+import Effect.Class (liftEffect)
+import Effect.Console as Console
+import Effect.Exception (throw)
+import Node.Encoding (Encoding(..))
+import Node.FS.Aff (readTextFile)
 import StringParser (runParser)
 import Test.Spec (Spec, describe, it)
 import Test.Spec.Assertions (shouldEqual)
 
-
 tests :: Spec Unit
 tests = do
   describe "ModuleParser" do
@@ -40,3 +48,14 @@ tests = do
       runParser singleLineComment "-- asd\n" `shouldEqual` Right unit
     it "single line comment #1" do
       runParser singleLineComment "--\n" `shouldEqual` Right unit
+    it "Parses every module in .spago/" do
+      files <- getPathsByGlobs ["./.spago/**/*.purs"]
+      liftEffect $ Console.log $ "Modules in .spago: " <> show (Array.length files)
+      for_ files \filePath -> do
+        fileContents <- readTextFile UTF8 filePath
+        case parseModuleName fileContents of
+          Nothing -> do
+            liftEffect $ throw $
+              "Module header decoding failed for " <> filePath <>
+              ", unable to extract module name"
+          Just _ -> pure unit

From ce23a668a044cfd9e091aab843d47ca462aca3c3 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Wed, 31 Aug 2022 23:18:15 +0400
Subject: [PATCH 40/45] Add help texts for all options, bump version

---
 .github/workflows/build.yml       |  4 ++--
 .github/workflows/release.yml     |  6 +++---
 CHANGELOG.md                      | 13 +++++++++++++
 package.json                      |  2 +-
 src/Docs/Search/Config.purs       |  2 +-
 src/Docs/Search/IndexBuilder.purs |  4 ++++
 src/Docs/Search/Main.purs         | 13 +++++++++----
 7 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 28f5bcd..6318658 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "18"
 
       - uses: purescript-contrib/setup-purescript@main
 
@@ -41,4 +41,4 @@ jobs:
           npm run build
           npm test
           spago docs --no-search
-          ./dist/purescript-docs-search build-index
+          ./dist/purescript-docs-search.cjs build-index
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b612084..f7c3955 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: "14"
+          node-version: "18"
 
       - uses: purescript-contrib/setup-purescript@main
 
@@ -41,7 +41,7 @@ jobs:
         with:
           files: |
             dist/docs-search-app.js
-            dist/purescript-docs-search
+            dist/purescript-docs-search.cjs
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -52,4 +52,4 @@ jobs:
         run: |
           mv ci-npmrc.txt .npmrc
           npm ci
-          npm publish --non-interactive --access public
\ No newline at end of file
+          npm publish --non-interactive --access public
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b86c7a3..86cda9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.12 - 2022-08-31]
+
+Changes:
+- Package structure change: `dist/purescript-docs-search.cjs` has been moved to `dist/purescript-docs-search.cjs` due to NodeJS restrictions for `type: module` packages.
+
+New features:
+- Docs for each CLI option
+- New `--source-files` option that allows to specify `.purs` sources (see below)
+
+Bugfixes:
+- Include modules with only re-exports in the module list ([#62](https://github.com/purescript/purescript-docs-search/issues/62))
+- Fix `docs.json` parser for some types
+
 ## [0.0.11 - 2021-04-15]
 
 Changes:
diff --git a/package.json b/package.json
index e0b6f87..a90d36b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "purescript-docs-search",
   "type": "module",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Search frontend for the documentation generated by the PureScript compiler.",
   "directories": {
     "test": "test"
diff --git a/src/Docs/Search/Config.purs b/src/Docs/Search/Config.purs
index 2cf7d5e..0cf65ea 100644
--- a/src/Docs/Search/Config.purs
+++ b/src/Docs/Search/Config.purs
@@ -7,7 +7,7 @@ import Prelude
 import Data.Newtype (wrap)
 
 version :: String
-version = "0.0.11"
+version = "0.0.12"
 
 mkShapeScriptPath :: String -> String
 mkShapeScriptPath shape = "./index/types/" <> shape <> ".js"
diff --git a/src/Docs/Search/IndexBuilder.purs b/src/Docs/Search/IndexBuilder.purs
index 812e4b8..f252835 100644
--- a/src/Docs/Search/IndexBuilder.purs
+++ b/src/Docs/Search/IndexBuilder.purs
@@ -192,6 +192,10 @@ decodeDocsJsons cfg@{ docsFiles } = do
 parseModuleHeaders :: Array String -> Aff (Array ModuleName)
 parseModuleHeaders globs = do
   files <- getPathsByGlobs globs
+
+  -- we are not checking if the globs match at least one file, because
+  -- we want to support scenarios where there is no "current project"
+
   concat <$> for files \filePath -> do
     fileContents <- readTextFile UTF8 filePath
     case parseModuleName fileContents of
diff --git a/src/Docs/Search/Main.purs b/src/Docs/Search/Main.purs
index 5b3a013..a6cced4 100644
--- a/src/Docs/Search/Main.purs
+++ b/src/Docs/Search/Main.purs
@@ -1,19 +1,19 @@
 -- | The main module of the CLI interface app.
 module Docs.Search.Main where
 
-import Prelude
-
+import Docs.Search.Config as Config
 import Docs.Search.IndexBuilder as IndexBuilder
 import Docs.Search.Interactive as Interactive
-import Docs.Search.Config as Config
 import Docs.Search.Types (PackageName(..))
 
+import Prelude
+
 import Data.Generic.Rep (class Generic)
-import Data.Show.Generic (genericShow)
 import Data.List as List
 import Data.List.NonEmpty as NonEmpty
 import Data.Maybe (Maybe, fromMaybe, optional)
 import Data.Newtype (unwrap)
+import Data.Show.Generic (genericShow)
 import Data.Unfoldable (class Unfoldable)
 import Effect (Effect)
 import Effect.Console (log)
@@ -85,6 +85,7 @@ buildIndex = ado
     ( long "generated-docs"
    <> metavar "DIR"
    <> value "./generated-docs/"
+   <> help "Path to the generated documentation HTML that will be patched. Search app will be injected into each HTML document."
     )
   noPatch <- flag false true
     ( long "no-patch"
@@ -108,6 +109,7 @@ docsFilesOption = fromMaybe defaultDocsFiles <$>
      ( strOption
        ( long "docs-files"
       <> metavar "GLOB"
+      <> help "Glob that captures `docs.json` files that should be used to build the index"
        )
      )
    )
@@ -119,6 +121,7 @@ bowerFilesOption = fromMaybe defaultBowerFiles <$>
      ( strOption
        ( long "bower-jsons"
       <> metavar "GLOB"
+      <> help "Glob that captures `bower.json` files. These files are used to build dependency trees to compute package popularity scores based on how many dependants a package has."
        )
      )
    )
@@ -129,6 +132,7 @@ packageNameOption =
   ( long "package-name"
  <> metavar "PACKAGE"
  <> value (unwrap Config.defaultPackageName)
+ <> help "Local package name as it should appear in the search results"
   )
 
 sourceFilesOption :: Parser (Array String)
@@ -138,6 +142,7 @@ sourceFilesOption = fromMaybe defaultSourceFiles <$>
      ( strOption
        ( long "source-files"
       <> metavar "GLOB"
+      <> help "Path to project source files, used for more precise module indexing (see #62). Default: src/**/*.purs"
        )
      )
    )

From ea33a04b1323ece91a54490b53641ed04af59ea0 Mon Sep 17 00:00:00 2001
From: PureFunctor <purefunctor@gmail.com>
Date: Sun, 7 Nov 2021 02:34:12 +0800
Subject: [PATCH 41/45] Prettify data constructor output

---
 src/Docs/Search/Declarations.purs | 31 ++++++++++++++++++++++++++++---
 src/Docs/Search/Interactive.purs  | 26 ++++++++++++++++++++++++++
 src/Docs/Search/SearchResult.purs |  3 ++-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/Docs/Search/Declarations.purs b/src/Docs/Search/Declarations.purs
index c7272a9..8082031 100644
--- a/src/Docs/Search/Declarations.purs
+++ b/src/Docs/Search/Declarations.purs
@@ -11,7 +11,7 @@ import Prim hiding (Type)
 import Control.Alt ((<|>))
 import Data.Array ((!!))
 import Data.Array as Array
-import Data.Foldable (foldr)
+import Data.Foldable (foldl, foldr)
 import Data.List (List, (:))
 import Data.List as List
 import Data.Maybe (Maybe(..), fromMaybe)
@@ -244,8 +244,33 @@ mkChildInfo
   (SearchResult { info: parentInfo, moduleName, name: resultName })
   (ChildDeclaration { info } )
 
-  | ChildDeclDataConstructor <- info.declType =
-      info.arguments <#> \arguments -> DataConstructorResult { arguments }
+  | ChildDeclDataConstructor <- info.declType
+  , DataResult { dataDeclType, typeArguments } <- parentInfo =
+      let
+        parentTypeCtor :: Type
+        parentTypeCtor = TypeConstructor
+          $ QualifiedName { moduleNameParts:
+                            String.split (wrap ".") (unwrap moduleName)
+                          , name: resultName }
+
+        parentTypeArgs :: Array Type
+        parentTypeArgs = typeArguments <#> unwrap >>> \{ name } -> TypeVar name
+
+        parentType :: Type
+        parentType = foldl TypeApp parentTypeCtor parentTypeArgs
+
+        typeArrow :: Type -> Type
+        typeArrow =
+          TypeApp (TypeConstructor (QualifiedName { moduleNameParts: [ "Prim" ]
+                                                  , name: Identifier "Function" }))
+
+        makeType :: Array Type -> Type
+        makeType = foldr (\a b -> TypeApp (typeArrow a) b) parentType
+      in
+       info.arguments <#> \arguments ->
+         DataConstructorResult { dataDeclType
+                               , "type": makeType arguments
+                               }
 
   | ChildDeclTypeClassMember <- info.declType
   , TypeClassResult { arguments } <- parentInfo =
diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 892ca0d..8c67f72 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -194,6 +194,9 @@ showSignature result@{ name, info } =
     ValueAliasResult ->
       yellow ("(" <> unwrap name <> ")")
 
+    DataConstructorResult info' ->
+      showDataConstructorSignature info' result
+
     _ -> yellow $ unwrap name
 
 
@@ -299,6 +302,29 @@ showExternDataSignature { kind } { name } =
   showType kind
 
 
+showDataConstructorSignature
+  :: forall rest
+  .  { dataDeclType :: DataDeclType
+     , "type" :: Type
+     }
+  -> { name :: Identifier
+     | rest
+     }
+  -> String
+showDataConstructorSignature { dataDeclType, type: ctorType } { name } =
+  ( keyword
+    case dataDeclType of
+      NewtypeDataDecl -> "newtype constructor"
+      DataDataDecl -> "data constructor"
+  ) <>
+  space <>
+  yellow (unwrap name) <>
+  space <>
+  syntax "::" <>
+  space <>
+  showType ctorType
+
+
 leftShift :: Int -> String -> String
 leftShift shift str =
   Array.intercalate "\n" $
diff --git a/src/Docs/Search/SearchResult.purs b/src/Docs/Search/SearchResult.purs
index 62d8757..821903c 100644
--- a/src/Docs/Search/SearchResult.purs
+++ b/src/Docs/Search/SearchResult.purs
@@ -22,7 +22,8 @@ data ResultInfo
   | ExternDataResult      { kind :: Type }
   | TypeSynonymResult     { arguments :: Array TypeArgument
                           , type :: Type }
-  | DataConstructorResult { arguments :: Array Type }
+  | DataConstructorResult { dataDeclType :: DataDeclType
+                          , type :: Type }
   | TypeClassMemberResult { type :: Type
                           , typeClass :: QualifiedName
                           , typeClassArguments :: Array TypeArgument }

From c997fb53d3ce3be57f4855f9ed2b714d93ceea7d Mon Sep 17 00:00:00 2001
From: PureFunctor <purefunctor@gmail.com>
Date: Sun, 7 Nov 2021 02:37:24 +0800
Subject: [PATCH 42/45] Remove erroneous space in extern signatures

---
 src/Docs/Search/Interactive.purs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Docs/Search/Interactive.purs b/src/Docs/Search/Interactive.purs
index 8c67f72..7c38c5b 100644
--- a/src/Docs/Search/Interactive.purs
+++ b/src/Docs/Search/Interactive.purs
@@ -297,7 +297,6 @@ showExternDataSignature { kind } { name } =
   keyword "foreign data" <>
   space <>
   yellow (unwrap name) <>
-  space <>
   syntax " :: " <>
   showType kind
 

From 2e294fb70ce31ce2afa86a889f5ac0d87ffbcf52 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Thu, 1 Sep 2022 00:08:23 +0400
Subject: [PATCH 43/45] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86cda9f..fce3a30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Changes:
 - Package structure change: `dist/purescript-docs-search.cjs` has been moved to `dist/purescript-docs-search.cjs` due to NodeJS restrictions for `type: module` packages.
+- Improve output for data and newtype constuctors ([#58](https://github.com/purescript/purescript-docs-search/pull/58))
 
 New features:
 - Docs for each CLI option

From 57ff86d84c70ad20d300c2bf78d9435da29bb19a Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Thu, 1 Sep 2022 23:15:04 +0400
Subject: [PATCH 44/45] Update badge (#64)

Co-authored-by: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9983496..736ab37 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # purescript-docs-search
 
-[![Build status](https://travis-ci.org/spacchetti/purescript-docs-search.svg?branch=master)](https://travis-ci.org/spacchetti/purescript-docs-search)
+[![Build status](https://github.com/purescript/purescript-docs-search/actions/workflows/build.yml/badge.svg)](https://github.com/purescript/purescript-docs-search/actions/workflows/build.yml)
 
-An app that adds search capabilities to generated documentation for purescript code.
+An app that adds search capabilities to generated documentation for PureScript code.
 
 It supports nearly-all functionality of [Pursuit](https://github.com/purescript/pursuit), including querying by type.
 
@@ -10,7 +10,7 @@ It supports nearly-all functionality of [Pursuit](https://github.com/purescript/
 
 When using [spago](https://github.com/spacchetti/spago), you don't need to install this app manually: run `spago docs` or `spago search`.
 
-Otherwise, use [npx](https://github.com/npm/npx): `npx purescript-docs-search`.
+Otherwise, use NPM (`npm install purescript-docs-search`) or [npx](https://github.com/npm/npx): `npx purescript-docs-search`.
 
 ## Usage
 
@@ -45,4 +45,4 @@ npm install
 npm run build # or build-dev to skip JS compression stage
 ```
 
-Use `spago docs --no-search && ./dist/purescript-docs-search build-index` to generate the docs and patch them using the local version of the app.
+Use `spago docs --no-search && ./dist/purescript-docs-search.cjs build-index` to generate the docs and patch them using the local version of the app.

From 83e10152f1aa9126a55b8b70aa441c0b6ff5ceb5 Mon Sep 17 00:00:00 2001
From: Vladimir Kalnitsky <klntsky@gmail.com>
Date: Fri, 16 Aug 2024 22:37:42 +0400
Subject: [PATCH 45/45] Add a note about the merge with spago (#71)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 736ab37..b7e6092 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 [![Build status](https://github.com/purescript/purescript-docs-search/actions/workflows/build.yml/badge.svg)](https://github.com/purescript/purescript-docs-search/actions/workflows/build.yml)
 
+**This project has been merged into the [spago codebase](https://github.com/purescript/spago/tree/master/docs-search)!**
+
 An app that adds search capabilities to generated documentation for PureScript code.
 
 It supports nearly-all functionality of [Pursuit](https://github.com/purescript/pursuit), including querying by type.