Fix everything except toppoki tests

Author: klntsky

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

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

spago.dhall

@@ -39,10 +39,9 @@
   , "profunctor"
   , "profunctor-lenses"
   , "search-trie"
+  , "spec"
   , "string-parsers"
   , "strings"
-  , "test-unit"
-  , "toppokki"
   , "transformers"
   , "tuples"
   , "unfoldable"

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)

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

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_

src/Docs/Search/App/Sidebar.purs

@@ -17,14 +17,14 @@ 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)
 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,15 +131,15 @@ 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
              ]
 
   , 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")

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) {

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);
   };
 };

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,15 +370,15 @@ 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
 
 
 fileExists :: String -> Aff Boolean
 fileExists path = do
-  doesExist <- exists path
+  doesExist <- liftEffect $ exists path
   case doesExist of
     false -> pure false
     true -> isFile <$> stat path