srid · srid · Aug 21, 2022 · Jul 28, 2022 · Jul 28, 2022 · Jul 28, 2022
diff --git a/default/templates/base.tpl b/default/templates/base.tpl
@@ -34,6 +34,7 @@
   <apply template="/templates/hooks/more-head" />
 
   <head-main />
+  <apply template="components/stork/stork-search-head" />
 </head>
 
 <!-- DoNotFormat -->
@@ -44,6 +45,7 @@
 
 <body class="${bodyClass}">
   <body-main />
+  <apply template="components/stork/stork-search" />
 </body>
 
 </html>
diff --git a/default/templates/components/breadcrumbs.tpl b/default/templates/components/breadcrumbs.tpl
@@ -25,6 +25,10 @@
         </ema:breadcrumbs>
       </ul>
     </div>
+    <button class="inline px-2 py-1 bg-gray-50 outline-none cursor-pointer focus:outline-none"
+      title="Search (Ctrl+K)" type="button" onclick="toggleSearch()">
+      <apply template="stork/stork-icon" />
+    </button>
     <button
       class="inline px-2 py-1 text-white bg-${theme}-600 outline-none cursor-pointer focus:outline-none"
       title="Toggle sidebar" type="button" onclick="toggleHidden('sidebar')">

diff --git a/default/templates/components/stork/stork-icon.tpl b/default/templates/components/stork/stork-icon.tpl
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" style="width: 1rem;" class="hover:text-${theme}-700" f
+  fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2">
+  <path stroke-linecap="round" stroke-linejoin="round"
+    d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+</svg>
diff --git a/default/templates/components/stork/stork-search-head.tpl b/default/templates/components/stork/stork-search-head.tpl
@@ -0,0 +1,63 @@
+<link rel="stylesheet" href="https://files.stork-search.net/releases/v1.5.0/flat.css" />
+<!-- Custom Stork-search styling for Emanote -->
+<style>
+  #stork-search-container {
+    z-index: 1000;
+    background-color: rgb(15 23 42/.8);
+  }
+
+  .stork-overflow-hidden-important {
+    overflow: hidden !important;
+  }
+</style>
+
+
+<script src="https://files.stork-search.net/releases/v1.5.0/stork.js"></script>
+<ema:metadata>
+  <with var="template">
+    <script data-emanote-base-url="${value:baseUrl}">
+      window.emanote = {};
+      window.emanote.stork = {
+        searchShown: false,
+        toggleSearch: function () {
+          document.getElementById('stork-search-container').classList.toggle('hidden');
+          window.emanote.stork.searchShown = document.body.classList.toggle('stork-overflow-hidden-important');
+          if (window.emanote.stork.searchShown) {
+            document.getElementById('stork-search-input').focus();
+          }
+        },
+        clearSearch: function () {
+          document.getElementById('stork-search-container').classList.add('hidden');
+          document.body.classList.remove('stork-overflow-hidden-important');
+          window.emanote.stork.searchShown = false;
+        },
+
+        init: function () {
+          const indexName = 'emanote-search'; // used to match input[data-stork] attribute value
+          const baseUrl = document.currentScript.getAttribute('data-emanote-base-url') || '/';
+          const indexUrl = baseUrl + '-/stork.st';
+          if (document.readyState !== 'complete') {
+            window.addEventListener('load', function () {
+              stork.register(indexName, indexUrl);
+            });
+
+            document.addEventListener('keydown', event => {
+              if (window.emanote.stork.searchShown && event.key === 'Escape') {
+                window.emanote.stork.clearSearch();
+                event.preventDefault();
+              } else if ((event.key == 'k' || event.key == 'K') && (event.ctrlKey || event.metaKey)) {
+                window.emanote.stork.toggleSearch();
+                event.preventDefault();
+              }
+            });
+          } else {
+            // Override existing on Ema's hot-reload
+            stork.register(indexName, indexUrl, { forceOverwrite: true });
+          }
+        }
+      };
+
+      window.emanote.stork.init();
+    </script>
+  </with>
+</ema:metadata>
diff --git a/default/templates/components/stork/stork-search.tpl b/default/templates/components/stork/stork-search.tpl
@@ -0,0 +1,12 @@
+<div id="stork-search-container"
+  class="hidden fixed w-screen h-screen inset-0 backdrop-filter backdrop-blur-sm">
+  <div class="fixed w-screen h-screen inset-0" onclick="window.emanote.stork.toggleSearch()"></div>
+
+  <div class="container mx-auto p-10 mt-10">
+    <div class="stork-wrapper-flat container mx-auto">
+      <input id="stork-search-input" data-stork="emanote-search" class="stork-input"
+        placeholder="Search (Ctrl+K) ..." />
+      <div data-stork="emanote-search-output" class="stork-output"></div>
+    </div>
+  </div>
+</div>
diff --git a/default/templates/layouts/book.tpl b/default/templates/layouts/book.tpl
@@ -11,7 +11,6 @@
         <nav id="sidebar"
           class="flex-shrink hidden leading-relaxed md:block md:sticky md:top-0 md:h-full md:w-48 xl:w-64">
           <div class="px-2 py-2 text-gray-800">
-
             <div id="indexing-links" class="flex flex-row float-right p-2 space-x-2 text-gray-500">
               <a href="${ema:tagIndexUrl}" title="View tags">
                 <svg style="width: 1rem;" class="hover:text-${theme}-700" fill="none"
@@ -29,6 +28,10 @@
                   </path>
                 </svg>
               </a>
+              <a title="Search (Ctrl+K)" class="cursor-pointer"
+                onclick="window.emanote.stork.toggleSearch()">
+                <apply template="components/stork/stork-icon" />
+              </a>
             </div>
 
             <div id="site-logo" class="pl-2">

diff --git a/default/templates/layouts/note.tpl b/default/templates/layouts/note.tpl
@@ -12,7 +12,15 @@
     <div class="${containerClass}">
       <div class="mt-2 md:mt-4">
         <apply template="components/note-uptree" />
-        <div class="md:shadow-2xl md:mb-8">
+
+        <div class="relative md:shadow-2xl md:mb-8">
+
+          <div class="absolute -top-6 right-1 md:right-0 flex flex-row items-center justify-center">
+            <a title="Search (Ctrl+K)" class="cursor-pointer"
+              onclick="window.emanote.stork.toggleSearch()">
+              <apply template="components/stork/stork-icon" />
+            </a>
+          </div>
           <div class="flex-1 w-full overflow-x-auto bg-white">
             <main class="px-4 py-4">
               <apply template="components/note-title" />

diff --git a/docs/guide/search.md b/docs/guide/search.md
@@ -0,0 +1,5 @@
+# Full-text search
+
+Emanote provides client-side full-text search using [Stork](https://stork-search.net/)[^1]. The keyboard shortcut `Ctrl+K` (or `⌘K` on macOS) can be used to access the search input. Search should work in both live server and the statically generated site.
+
+[^1]: The Stork index file can be accessed at [`-/stork.st`](-/stork.st). 
diff --git a/emanote.cabal b/emanote.cabal
@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               emanote
-version:            0.6.23.1
+version:            0.7.0.0
 license:            AGPL-3.0-only
 copyright:          2021 Sridhar Ratnakumar
 maintainer:         [email protected]
@@ -103,7 +103,7 @@ common library-common
     , data-default
     , dependent-sum
     , directory
-    , ema                    >=0.7.2
+    , ema                    >=0.8
     , filepath
     , filepattern
     , fsnotify
@@ -126,15 +126,18 @@ common library-common
     , pandoc-types
     , parsec
     , path-tree              >=0.2
+    , process-extras
     , profunctors
     , relude                 >=1.0
     , shower
     , some
+    , stm
     , tagged
     , tagtree
     , tailwind               >=0.3
     , text
     , time
+    , tomland
     , unionmount             >=0.2
     , unliftio
     , unordered-containers
@@ -167,6 +170,8 @@ library
     Emanote.Model.QuerySpec
     Emanote.Model.SData
     Emanote.Model.StaticFile
+    Emanote.Model.Stork
+    Emanote.Model.Stork.Index
     Emanote.Model.Task
     Emanote.Model.Title
     Emanote.Model.Type

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -22,6 +22,7 @@
         haskell-flake.flakeModule
         ./nix/emanote.nix
         ./nix/docker.nix
+        ./nix/stork.nix
       ];
       perSystem = { pkgs, inputs', self', ... }: {
         haskellProjects.default = {
@@ -35,6 +36,7 @@
               ormolu;
             inherit (inputs'.tailwind-haskell.packages)
               tailwind;
+            inherit (self'.packages) stork;
           };
           source-overrides = {
             inherit (inputs)
@@ -48,6 +50,8 @@
             inherit (inputs'.tailwind-haskell.packages)
               tailwind;
           };
+          modifier = drv: with pkgs.haskell.lib;
+            addBuildDepends drv [ self'.packages.stork ];
         };
         packages.test =
           pkgs.runCommand "emanote-test" { } ''

diff --git a/nix/stork.nix b/nix/stork.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  perSystem = { system, pkgs, ... }: {
+    packages.stork =
+      # Stork is marked as broken on intel mac, but it does work.
+      # Unfortunately we cannot test this code PATH due to lack of CI for intel mac (#335).
+      if system == "x86_64-darwin" then pkgs.stork.overrideAttrs (_oa: { meta.broken = false; }) else pkgs.stork;
+  };
+}
diff --git a/src/Emanote.hs b/src/Emanote.hs
@@ -50,7 +50,7 @@ instance IsRoute SiteRoute where
 instance EmaSite SiteRoute where
   type SiteArg SiteRoute = EmanoteConfig
   siteInput = emanoteSiteInput
-  siteOutput rp m r = pure $ View.emanoteSiteOutput rp m r
+  siteOutput = View.emanoteSiteOutput
 
 defaultEmanoteConfig :: CLI.Cli -> EmanoteConfig
 defaultEmanoteConfig cli =

diff --git a/src/Emanote/Model/Stork.hs b/src/Emanote/Model/Stork.hs
@@ -0,0 +1,30 @@
+module Emanote.Model.Stork
+  ( renderStorkIndex,
+  )
+where
+
+import Control.Monad.Logger (MonadLoggerIO)
+import Data.IxSet.Typed qualified as Ix
+import Emanote.Model.Note qualified as N
+import Emanote.Model.Stork.Index (File (File), Input (Input), readOrBuildStorkIndex)
+import Emanote.Model.Title qualified as Tit
+import Emanote.Model.Type (Model)
+import Emanote.Model.Type qualified as M
+import Emanote.Route qualified as R
+import Emanote.Source.Loc qualified as Loc
+import Optics.Core ((^.))
+import Relude
+import System.FilePath ((</>))
+
+renderStorkIndex :: (MonadIO m, MonadLoggerIO m) => Model -> m LByteString
+renderStorkIndex model = do
+  readOrBuildStorkIndex (model ^. M.modelStorkIndex) (Input $ storkFiles model)
+
+storkFiles :: Model -> [File]
+storkFiles model =
+  let baseDir = Loc.locPath . Loc.primaryLayer $ model ^. M.modelLayers
+   in Ix.toList (model ^. M.modelNotes) <&> \note ->
+        File
+          ((baseDir </>) $ R.withLmlRoute R.encodeRoute $ note ^. N.noteRoute)
+          (toText $ R.encodeRoute $ N.noteHtmlRoute note)
+          (Tit.toPlain $ note ^. N.noteTitle)