Skip to content

Commit

Permalink
wip: support client-side search
Browse files Browse the repository at this point in the history
  • Loading branch information
agoose77 committed Sep 13, 2024
1 parent 680059f commit 37d59d7
Show file tree
Hide file tree
Showing 27 changed files with 846 additions and 70 deletions.
119 changes: 72 additions & 47 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,10 @@
"npm": ">=7.0.0",
"node": ">=14.0.0"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"dependencies": {
"@myst-theme/search": "^0.0.0",
"minisearch": "^7.1.0",
"string.prototype.matchall": "^4.0.11"
}
}
1 change: 1 addition & 0 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"build": "npm-run-all -l clean -p build:esm"
},
"dependencies": {
"@myst-theme/search": "^0.0.0",
"myst-common": "^1.6.0",
"myst-config": "^1.5.0",
"myst-spec-ext": "^1.6.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/common/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { Dependency, SourceFileKind } from 'myst-spec-ext';
import type { GenericParent, References } from 'myst-common';
import type { SiteAction, SiteExport, SiteManifest } from 'myst-config';
import type { PageFrontmatter } from 'myst-frontmatter';
import type { MystSearchIndex } from '@myst-theme/search';

export enum Theme {
light = 'light',
Expand All @@ -25,6 +26,7 @@ export type Heading = {
export type SiteLoader = {
theme?: Theme;
config?: SiteManifest;
searchIndex?: MystSearchIndex;
CONTENT_CDN_PORT?: string | number;
MODE?: 'app' | 'static';
BASE_URL?: string;
Expand Down
1 change: 1 addition & 0 deletions packages/providers/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export * from './references.js';
export * from './baseurl.js';
export * from './ui.js';
export * from './site.js';
export * from './search.js';
export * from './tabs.js';
export * from './xref.js';
export * from './renderers.js';
Expand Down
19 changes: 19 additions & 0 deletions packages/providers/src/search.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React, { useContext } from 'react';
import type { ISearch } from '@myst-theme/search';

const SearchContext = React.createContext<ISearch | undefined>(undefined);

export function SearchProvider({
search,
children,
}: {
search?: ISearch;
children: React.ReactNode;
}) {
return <SearchContext.Provider value={search}>{children}</SearchContext.Provider>;
}

export function useSearch() {
const config = useContext(SearchContext);
return config;
}
5 changes: 5 additions & 0 deletions packages/search-minisearch/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
root: true,
extends: ['curvenote'],
ignorePatterns: ['src/**/*.spec.ts'],
};
3 changes: 3 additions & 0 deletions packages/search-minisearch/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# @myst-theme/search-minisearch

A minisearch implementation for client-side searching in MyST sites.
24 changes: 24 additions & 0 deletions packages/search-minisearch/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "@myst-theme/search-minisearch",
"version": "0.0.0",
"type": "module",
"exports": "./dist/index.js",
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"license": "MIT",
"sideEffects": false,
"scripts": {
"clean": "rimraf dist",
"lint": "eslint \"src/**/*.ts*\" -c ./.eslintrc.cjs",
"lint:format": "prettier --check \"src/**/*.{ts,tsx,md}\"",
"test": "vitest run",
"test:watch": "vitest watch",
"build:esm": "tsc --project ./tsconfig.json --module Node16 --outDir dist --declaration",
"build": "npm-run-all -l clean -p build:esm"
},
"dependencies": {
"@myst-theme/search": "^0.0.0"
}
}
80 changes: 80 additions & 0 deletions packages/search-minisearch/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import MiniSearch, { type Options, type SearchResult as MiniSearchResult } from 'minisearch';

Check failure on line 1 in packages/search-minisearch/src/index.ts

View workflow job for this annotation

GitHub Actions / lint

'minisearch' should be listed in the project's dependencies. Run 'npm i -S minisearch' to add it
import type { SearchRecord, SearchResult, ISearch } from '@myst-theme/search';

export type ExtendedOptions = Options & Required<Pick<Options, 'tokenize' | 'processTerm'>>;

export function prepareOptions(options: Options): ExtendedOptions {
return {
...options,
tokenize: MiniSearch.getDefault('tokenize'),
processTerm: MiniSearch.getDefault('processTerm'),
};
}

export type RawSearchResult = SearchRecord & MiniSearchResult;

export function combineResults(results: Map<string, Map<string, RawSearchResult>>) {
const [firstEntry, ...restEntries] = results.entries();

const firstRawResults = firstEntry[1];
const initialValue = new Map<string, SearchResult>(
Array.from(firstRawResults.entries(), ([id, rawResult]) => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { id: _, score, terms, queryTerms, match, ...rest } = rawResult;
return [
id,
{
id,
queries: [
{
term: queryTerms[0],
matches: match,
},
],
...rest,
},
];
}),
);
const mergedResults = restEntries.reduce(
(accumulator: Map<string, SearchResult>, value: [string, Map<string, RawSearchResult>]) => {
const nextAccumulator = new Map<string, SearchResult>();

const rawResults = value[1];
rawResults.forEach((rawResult, docID) => {
const existing = accumulator.get(docID);
if (existing == null) {
return;
}
const { queryTerms, match } = rawResult;
existing.queries.push({
term: queryTerms[0],
matches: match,
});
nextAccumulator.set(docID, existing);
});
return nextAccumulator;
},
initialValue,
);
return Array.from(mergedResults.values());
}

export function createSearch(documents: SearchRecord[], options: Options): ISearch {
const extendedOptions = prepareOptions(options);
const search = new MiniSearch(extendedOptions);
search.addAll(documents.map((doc, index) => ({ ...doc, id: index })));
return (query: string) => {
// Implement executeQuery whilst retaining distinction between terms
// TODO: should we check for unique terms?
const terms = extendedOptions.tokenize(query);
const termResults = new Map(
terms.map((term) => [
term,
new Map(search.search(term).map((doc) => [doc.id, doc as RawSearchResult])),
]),
);

return combineResults(termResults);
};
}
5 changes: 5 additions & 0 deletions packages/search-minisearch/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"extends": "../tsconfig/esm.json",
"include": ["."],
"exclude": ["dist", "node_modules", "src/**/*.spec.ts", "tests"]
}
5 changes: 5 additions & 0 deletions packages/search/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
root: true,
extends: ['curvenote'],
ignorePatterns: ['src/**/*.spec.ts'],
};
3 changes: 3 additions & 0 deletions packages/search/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# @myst-theme/search

An implementation and spec for client-side searching in MyST sites.
22 changes: 22 additions & 0 deletions packages/search/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "@myst-theme/search",
"version": "0.0.0",
"type": "module",
"exports": "./dist/index.js",
"types": "./dist/index.d.ts",
"files": [
"dist"
],
"license": "MIT",
"sideEffects": false,
"scripts": {
"clean": "rimraf dist",
"lint": "eslint \"src/**/*.ts*\" -c ./.eslintrc.cjs",
"lint:format": "prettier --check \"src/**/*.{ts,tsx,md}\"",
"test": "vitest run",
"test:watch": "vitest watch",
"build:esm": "tsc --project ./tsconfig.json --module Node16 --outDir dist --declaration",
"build": "npm-run-all -l clean -p build:esm"
},
"dependencies": {}
}
3 changes: 3 additions & 0 deletions packages/search/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from './types.js';
export * from './rank.js';
export * from './search.js';
Loading

0 comments on commit 37d59d7

Please sign in to comment.