Updates for v0.14 (#46)

Co-authored-by: Fabrizio Ferrai <[email protected]>

Author: klntsky

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"
   }
 }

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

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
 }

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,20 +85,21 @@ 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
 
         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)
 

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