prioritise current section when searching

Author: Rich-Harris

packages/site-kit/src/lib/search/SearchBox.svelte

@@ -10,6 +10,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
 	import Icon from '../components/Icon.svelte';
 	import SearchResults from './SearchResults.svelte';
 	import SearchWorker from './search-worker.js?worker';
+	import { page } from '$app/stores';
 
 	interface Props {
 		placeholder?: string;
@@ -94,7 +95,14 @@ It appears when the user clicks on the `Search` component or presses the corresp
 			const id = uid++;
 			pending.add(id);
 
-			worker.postMessage({ type: 'query', id, payload: $search_query });
+			worker.postMessage({
+				type: 'query',
+				id,
+				payload: {
+					query: $search_query,
+					path: $page.url.pathname
+				}
+			});
 		}
 	});
 

packages/site-kit/src/lib/search/search-worker.ts

@@ -12,8 +12,8 @@ addEventListener('message', async (event) => {
 	}
 
 	if (type === 'query') {
-		const query = payload;
-		const results = search(query);
+		const { query, path } = payload;
+		const results = search(query, path);
 
 		postMessage({ type: 'results', payload: { results, query } });
 	}

packages/site-kit/src/lib/search/search.ts

@@ -47,19 +47,36 @@ export function init(blocks: Block[]) {
 /**
  * Search for a given query in the existing index
  */
-export function search(query: string): BlockGroup[] {
+export function search(query: string, path: string): BlockGroup[] {
 	const escaped = query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
 	const regex = new RegExp(`(^|\\b)${escaped}`, 'i');
 
+	const parts = path.split('/');
+
 	const blocks = indexes
 		.flatMap((index) => index.search(query))
 		// @ts-expect-error flexsearch types are wrong i think?
 		.map(lookup)
 		.map((block, rank) => ({ block: block as Block, rank }))
 		.sort((a, b) => {
-			// If rank is way lower, give that priority
-			if (Math.abs(a.rank - b.rank) > 3) {
-				return a.rank - b.rank;
+			// prioritise current section
+			const a_parts = a.block.href.split('/');
+			const b_parts = b.block.href.split('/');
+
+			for (let i = 0; i < parts.length; i += 1) {
+				const a_part_matches = a_parts[i] === parts[i];
+				const b_part_matches = b_parts[i] === parts[i];
+
+				if (!a_part_matches || !b_part_matches) {
+					if (a_part_matches !== b_part_matches) {
+						if (i > 1) {
+							console.log('here', a, b);
+						}
+						return a_part_matches ? -1 : 1;
+					}
+
+					break;
+				}
 			}
 
 			const a_title_matches = regex.test(a.block.breadcrumbs.at(-1)!);