Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Git = "d7ba0133-e1db-5d97-8f8c-041e4b3a1eb2"
Gumbo = "708ec375-b3d6-5a57-a7ce-8257bf98657a"
HypertextLiteral = "ac1192a8-f4b3-4bfe-ba22-af5b92cd3ab2"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
NodeJS = "2bd173c7-0d6d-553b-b6af-13a54713934c"
NodeJS_22_jll = "8fca9ca2-e7a1-5ccf-8c05-43be5a78664f"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

[compat]
Expand All @@ -18,7 +18,7 @@ Git = "1"
Gumbo = "0.8.2"
HypertextLiteral = "0.9"
JSON = "0.20,0.21"
NodeJS = "1, 2"
NodeJS_22_jll = "22.15.0"
julia = "1"

[extras]
Expand Down
152 changes: 152 additions & 0 deletions assets/default/pagefind.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
#multi-page-nav .search {
margin-left: auto;
font-size: 16px;
}

#multi-page-nav .search .search-keybinding {
float: right;
width: 0;
transform: translateX(-1em);
color: #999;
}

#multi-page-nav .search:focus-within .search-keybinding {
display: none;
}

#multi-page-nav .search #search-input {
border: 1px solid #666;
border-radius: 3.2px;
color: #999;
background-color: unset;
height: 28px;
font-family: inherit;
width: 20em;
font-size: 14px;
padding: 0 8px;
}

#multi-page-nav .search #search-input::placeholder {
color: #999;
opacity: 1;
}

#multi-page-nav .search:focus-within #search-input {
background-color: #fff;
outline: none;
box-shadow: none;
color: #000;
}

.theme--documenter-dark #multi-page-nav .search:focus-within #search-input {
background-color: #202227;
color: #eee;
}

#multi-page-nav .search:focus-within .suggestions {
display: block;
}

#multi-page-nav .hidden {
display: none !important;
}

#multi-page-nav .suggestions {
margin: -5px 1.5rem 0 0;
display: none;
background: #fff;
min-width: 20em;
max-width: 50vw;
position: absolute;
border: 1px solid #cfd4db;
border-radius: 6px;
padding: .4rem;
list-style-type: none;
z-index: 10;
right: 0;
max-height: max(50vh, 250px);
overflow-y: auto;
}

.theme--documenter-dark #multi-page-nav .suggestions {
background: #2e3138;
border: 1px solid #5e6d6f;
}

#multi-page-nav .suggestions mark {
background-color: inherit;
color: #000;
}
.theme--documenter-dark #multi-page-nav .suggestions mark {
color: #fff;
}

#multi-page-nav .suggestions .suggestion {
line-height: 1.3;
border-radius: 4px;

overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
}
#multi-page-nav .suggestions .sub-suggestions .suggestion {
margin-left: 1rem;
}

#multi-page-nav .suggestions .suggestion-header {
padding: .4rem .6rem;
}
#multi-page-nav .suggestions .suggestion-header:focus-visible {
outline: none;
}
.theme--documenter-dark #multi-page-nav .suggestions .suggestion-header:hover,
.theme--documenter-dark #multi-page-nav .suggestions .suggestion-header:focus {
background-color: #202227;
}
#multi-page-nav .suggestions .suggestion-header:hover,
#multi-page-nav .suggestions .suggestion-header:focus {
background-color: #eee;
}

#multi-page-nav .suggestions .suggestion .suggestion-excerpt {
font-size: small;
color: #666;
}
.theme--documenter-dark #multi-page-nav .suggestions .suggestion .suggestion-excerpt {
color: #aaa;
}

#multi-page-nav .suggestion .suggestion-title {
font-size: 1.2rem;
font-weight: bold;
}

#multi-page-nav .suggestion .sub-suggestions .suggestion-title {
font-size: 1rem;
}

#multi-page-nav .suggestion a {
display: block;
overflow: hidden;
text-overflow: ellipsis;
color: black;
}

.theme--documenter-dark #multi-page-nav .suggestion a {
color: white;
}

#multi-page-nav .suggestions .suggestion .page-title {
font-weight: bold;
}

@media screen and (max-width: 1055px) {
#multi-page-nav .search #search-input {
width: 100%;
}
#multi-page-nav .suggestions {
max-width: 100vw;
width: calc(100% - 3.5rem);
margin: 10px 2.5em 4.5em 0;
}
}
150 changes: 150 additions & 0 deletions assets/default/pagefind_integration.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
// custom search widget
(async function() {
const MAX_RESULTS = 20
let FOCUSABLE_ELEMENTS = []
let FOCUSED_ELEMENT_INDEX = 0

const pagefind = await import(window.MULTIDOCUMENTER_ROOT_PATH + "pagefind/pagefind.js")

function initialize() {
pagefind.init()
registerSearchListener()

document.body.addEventListener('keydown', ev => {
if (document.activeElement === document.body && (ev.key === '/' || ev.key === 's')) {
document.getElementById('search-input').focus()
ev.preventDefault()
}
})
}

function registerSearchListener() {
const input = document.getElementById('search-input')
const suggestions = document.getElementById('search-result-container')

async function runSearch() {
const query = input.value

const search = await pagefind.debouncedSearch(query, {}, 300);

if (search) {
buildResults(search.results)
}
}

input.addEventListener('keyup', ev => {
runSearch()
})

input.addEventListener('keydown', ev => {
if (ev.key === 'ArrowDown') {
FOCUSED_ELEMENT_INDEX = 0
FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
ev.preventDefault()
return
} else if (ev.key === 'ArrowUp') {
FOCUSED_ELEMENT_INDEX = FOCUSABLE_ELEMENTS.length - 1
FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
ev.preventDefault()
return
}
})

suggestions.addEventListener('keydown', ev => {
if (ev.key === 'ArrowDown') {
FOCUSED_ELEMENT_INDEX += 1
if (FOCUSED_ELEMENT_INDEX < FOCUSABLE_ELEMENTS.length) {
FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
} else {
FOCUSED_ELEMENT_INDEX = -1
input.focus()
}
ev.preventDefault()
} else if (ev.key === 'ArrowUp') {
FOCUSED_ELEMENT_INDEX -= 1
if (FOCUSED_ELEMENT_INDEX >= 0) {
FOCUSABLE_ELEMENTS[FOCUSED_ELEMENT_INDEX].focus()
} else {
FOCUSED_ELEMENT_INDEX = -1
input.focus()
}
ev.preventDefault()
}
})

input.addEventListener('focus', ev => {
runSearch()
})
}

function renderResult(result) {
const entry = document.createElement('li')
entry.classList.add('suggestion')

const linkContainer = document.createElement('a')
linkContainer.classList.add('suggestion-header')
linkContainer.setAttribute('href', result.url)

const page = document.createElement('p')
page.classList.add('suggestion-title')

const pageTitle = document.createElement('span')
pageTitle.innerText = result.title ?? result.meta.title

page.appendChild(pageTitle)

const excerpt = document.createElement('p')
excerpt.classList.add('suggestion-excerpt')
excerpt.innerHTML = result.excerpt

linkContainer.appendChild(page)
linkContainer.appendChild(excerpt)

entry.appendChild(linkContainer)

return entry
}

async function buildResults(results) {
const suggestions = document.getElementById('search-result-container')

const children = await Promise.all(results.slice(0, MAX_RESULTS - 1).map(async (r, i) => {
const data = await r.data()

const entry = renderResult(data)

if (data.sub_results.length > 0) {
const subResults = document.createElement('ol')
subResults.classList.add('sub-suggestions')

data.sub_results.forEach(subresult => {
const entry = renderResult(subresult)
subResults.appendChild(entry)
})
entry.appendChild(subResults)
}

return entry
}))

if (results.length > 0) {
suggestions.classList.remove('hidden')
} else {
suggestions.classList.add('hidden')
}


suggestions.replaceChildren(
...children
)

FOCUSED_ELEMENT_INDEX = -1
FOCUSABLE_ELEMENTS = [...suggestions.querySelectorAll('a')]
}

if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', initialize)
} else {
initialize()
};
})()
18 changes: 6 additions & 12 deletions src/MultiDocumenter.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ include("documentertools/canonical_urls.jl")
end

"""
SearchConfig(index_versions = ["stable"], engine = MultiDocumenter.FlexSearch, lowfi = false)
SearchConfig(index_versions = ["stable"], engine = MultiDocumenter.PageFind, lowfi = false)

`index_versions` is a vector of relative paths used for generating the search index. Only
the first matching path is considered.
`engine` may be `MultiDocumenter.FlexSearch`, `MultiDocumenter.Stork`, or a module that conforms
to the expected API (which is currently undocumented).
`engine` may be `MultiDocumenter.PageFind`, `MultiDocumenter.FlexSearch`, `MultiDocumenter.Stork`,
or a module that conforms to the expected API (which is currently undocumented).
`lowfi = true` will try to minimize search index size. Only relevant for flexsearch.
"""
Base.@kwdef mutable struct SearchConfig
index_versions = ["stable", "dev"]
engine = FlexSearch
engine = PageFind
lowfi = false
end

Expand Down Expand Up @@ -131,12 +131,13 @@ function walk_outputs(f, root, docs::Vector, dirs::Vector{String})
end

include("renderers.jl")
include("search/pagefind.jl")
include("search/flexsearch.jl")
include("search/stork.jl")
include("canonical.jl")
include("sitemap.jl")

const DEFAULT_ENGINE = SearchConfig(index_versions = ["stable", "dev"], engine = FlexSearch)
const DEFAULT_ENGINE = SearchConfig(; index_versions = ["stable", "dev"], engine = PageFind)

"""
make(
Expand Down Expand Up @@ -246,13 +247,6 @@ function make(
isdir(out_assets) || mkpath(out_assets)
cp(joinpath(@__DIR__, "..", "assets", "default"), joinpath(out_assets, "default"))

if search_engine != false
if search_engine.engine == Stork && !Stork.has_stork()
@warn "stork binary not found. Falling back to flexsearch as search_engine."
search_engine = DEFAULT_ENGINE
end
end

inject_styles_and_global_navigation(
dir,
docs,
Expand Down
5 changes: 3 additions & 2 deletions src/search/flexsearch.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module FlexSearch
import Gumbo, JSON, AbstractTrees, NodeJS
import Gumbo, JSON, AbstractTrees
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Semgrep identified an issue in your code:
Loading an entire module instead of only the necessary identifiers might clutter the namespace unnecessarily.

To resolve this comment:

✨ Commit Assistant fix suggestion

Suggested change
import Gumbo, JSON, AbstractTrees
import Gumbo: parsehtml
import JSON: parse
import AbstractTrees: children
View step-by-step instructions
  1. Update the import statement to only import the specific functions, types, or identifiers you need from each module. For example, replace import Gumbo, JSON, AbstractTrees with something like import Gumbo: parsehtml, JSON: parse, AbstractTrees: children, depending on what you use in this file.
  2. Scan the current file and note down which functions or types are referenced from Gumbo, JSON, or AbstractTrees.
  3. Replace each module in the import statement with only the identifiers you actually use, using the syntax import Module: identifier1, identifier2.
  4. Save the updated import line and remove the general import Module form.

This helps keep the namespace clean and makes it clear which parts of each module your code depends on.

💬 Ignore this finding

Reply with Semgrep commands to ignore this finding.

  • /fp <comment> for false positive
  • /ar <comment> for acceptable risk
  • /other <comment> for all other reasons

Alternatively, triage in [Semgrep AppSec Platform](https://semgrep.dev/orgs/JuliaHub, Inc/findings/186022405) to ignore the finding created by unspecific-using-or-import.

You can view more details about [this finding](https://semgrep.dev/orgs/JuliaHub, Inc/findings/186022405) in the Semgrep AppSec Platform.

using NodeJS_22_jll: node
using HypertextLiteral
import ..walk_outputs

Expand Down Expand Up @@ -151,7 +152,7 @@ function build_search_index(root, docs, config, rootpath)
file = config.lowfi ? "gensearch-lowfi.js" : "gensearch.js"
println("Writing $(config.lowfi ? "lowfi" : "") flexsearch index:")
cd(root) do
run(`$(NodeJS.nodejs_cmd()) $(joinpath(@__DIR__, "..", "..", "flexsearch", file))`)
run(`$(node()) $(joinpath(@__DIR__, "..", "..", "flexsearch", file))`)
end
return nothing
end
Expand Down
Loading
Loading