Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
35 changes: 35 additions & 0 deletions src/plugin-catalog.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,39 @@ describe('plugin catalog', () => {
expect(result.plugins.map((plugin) => plugin.name)).toEqual(['flights']);
expect(result.errors).toEqual([{ sourceId: 'bad', manifestUrl: 'https://bad.test/webcmd-plugin.json', message: 'network failed' }]);
});



it('matches multi-word plugin searches while requiring all terms', async () => {
const catalog: PluginCatalog = {
version: 1,
sources: [
{
id: 'test',
source: 'github:test/repo',
manifestUrl: 'https://test.test/webcmd-plugin.json',
},
],
};

const fetchJson = async () => ({
plugins: {
hackernews: {
path: 'plugins/hackernews',
description: 'Tools for technology discussions',
},
},
});

for (const query of ['hacker news', 'hacker-news', 'hackernews']) {
const result = await searchCatalogPlugins(catalog, { query, fetchJson });
expect(result.plugins.map((plugin) => plugin.name)).toEqual(['hackernews']);
}

const negative = await searchCatalogPlugins(catalog, {
query: 'hacker twitter',
fetchJson,
});
expect(negative.plugins).toEqual([]);
});
});
20 changes: 17 additions & 3 deletions src/plugin-catalog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ export function flattenPluginManifest(source: PluginCatalogSource, manifest: Plu
}];
}

function normalizeSearchText(value: string): string {
return value.toLowerCase().replace(/[^a-z0-9]/g, '');
}

export async function searchCatalogPlugins(
catalog: PluginCatalog,
options: { query?: string; fetchJson?: FetchJson } = {},
Expand All @@ -150,9 +154,19 @@ export async function searchCatalogPlugins(
}
}));

const query = options.query?.trim().toLowerCase();
const filtered = query
? plugins.filter((plugin) => `${plugin.name} ${plugin.description ?? ''}`.toLowerCase().includes(query))
const query = options.query?.trim();
const tokens = query
? query.split(/\s+/).map(normalizeSearchText).filter(Boolean)
: [];

const filtered = tokens.length
? plugins.filter((plugin) => {
const haystack = normalizeSearchText(
`${plugin.name} ${plugin.description ?? ''}`,
);

return tokens.every((token) => haystack.includes(token));
})
: plugins;

filtered.sort((a, b) => a.name.localeCompare(b.name));
Expand Down