Skip to content
Draft
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
33 changes: 33 additions & 0 deletions src/__tests__/__snapshots__/server.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ exports[`runServer should allow server to be stopped, http stop server: diagnost
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -89,6 +92,9 @@ exports[`runServer should allow server to be stopped, stdio stop server: diagnos
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -157,6 +163,9 @@ exports[`runServer should attempt to run server, create transport, connect, and
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -236,6 +245,9 @@ exports[`runServer should attempt to run server, disable SIGINT handler: diagnos
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -310,6 +322,9 @@ exports[`runServer should attempt to run server, enable SIGINT handler explicitl
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -389,6 +404,9 @@ exports[`runServer should attempt to run server, log warnings for experimental o
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -483,6 +501,9 @@ exports[`runServer should attempt to run server, register a tool: diagnostics 1`
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -570,6 +591,9 @@ exports[`runServer should attempt to run server, register multiple tools: diagno
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -664,6 +688,9 @@ exports[`runServer should attempt to run server, use custom options: diagnostics
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -743,6 +770,9 @@ exports[`runServer should attempt to run server, use default tools, http: diagno
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down Expand Up @@ -831,6 +861,9 @@ exports[`runServer should attempt to run server, use default tools, stdio: diagn
[
"Registered collection: patternfly-component-schemas",
],
[
"Registered collection: patternfly-api",
],
[
"Registered resource: patternfly-context",
],
Expand Down
2 changes: 1 addition & 1 deletion src/docs.filterWords.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @note It's tempting to remove category and section names from this list, don't. Instead, the search
* should be leveraging filters which allow for "section" and "category" specifically.
*/
const INDEX_BLOCKLIST_WORDS = ['patternfly', 'component', 'components', 'documentation', 'example', 'examples', 'view'];
const INDEX_BLOCKLIST_WORDS = ['patternfly', 'component', 'components', 'documentation', 'example', 'examples', 'type', 'types', 'view'];

/**
* Technical terms and acronyms that should be exempt from length and noise filtering.
Expand Down
4 changes: 3 additions & 1 deletion src/options.registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { patternFlySchemasIndexResource } from './resource.patternFlySchemasInde
import { patternFlySchemasTemplateResource } from './resource.patternFlySchemasTemplate';
import { patternFlyDocsCollection } from './collection.patternFlyDocs';
import { patternFlySchemasCollection } from './collection.patternFlySchemas';
import { patternFlyApiCollection } from './collection.patternFlyApi';

/**
* Built-in tools.
Expand Down Expand Up @@ -44,7 +45,8 @@ const builtinResources: McpResourceCreator[] = [
*/
const builtinCollections: McpCollectionCreator[] = [
patternFlyDocsCollection,
patternFlySchemasCollection
patternFlySchemasCollection,
patternFlyApiCollection
];

export { builtinCollections, builtinResources, builtinTools };
4 changes: 3 additions & 1 deletion src/patternFly.getResources.ts
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,12 @@ const getPatternFlyMcpResources = async (contextPathOverride?: string): Promise<
const { componentNamesIndex, byVersion: componentNamesByVersion, byDocs: componentNamesByDocs } = componentNames;

const originalDocs = patternFlyRecordsRegistry.get('patternfly-docs');
const apiCollection = patternFlyRecordsRegistry.get('patternfly-api');

const catalog = [
...originalDocs?.records?.flatMap(({ data }) => Object.entries(data as Record<string, unknown[]>)) || [],
...Array.from(componentNamesByDocs)
...Array.from(componentNamesByDocs),
...apiCollection?.records?.flatMap(({ data }) => Object.entries(data as Record<string, unknown[]>)) || []
];

const resources = new Map<string, PatternFlyMcpResourceMetadata>();
Expand Down
23 changes: 20 additions & 3 deletions src/patternFly.search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ const calculateRelevance = (
const normalizedName = normalizeString.memo(result.name);
const normalizedQuery = normalizeString.memo(query);

// Exact match
if (normalizedName === normalizedQuery) {
return 0;
}
Expand All @@ -200,16 +201,32 @@ const calculateRelevance = (
.map(entry => (entry.displayName ? normalizeString.memo(entry.displayName) : ''))
.filter(Boolean);

// Exact match
if (displayNames.some(name => name === normalizedQuery)) {
return 0;
}

if (normalizedName.includes(normalizedQuery) ||
displayNames.some(name => name.includes(normalizedQuery))) {
// Substring match
if (
normalizedName.includes(normalizedQuery) ||
normalizedQuery.includes(normalizedName) ||
displayNames.some(name => name.includes(normalizedQuery) || normalizedQuery.includes(name))
) {
return 1;
}

return 2;
// Multi-word name match
const queryTokens = normalizedQuery.split(' ').filter(token => token.length > 2);
const hasTokenMatch = queryTokens.some(token =>
normalizedName === token ||
displayNames.some(name => name === token));

if (hasTokenMatch) {
return 2;
}

// Everything else
return 3;
};

/**
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/__snapshots__/stdioTransport.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ exports[`Logging should allow setting logging options, stderr 1`] = `
"[INFO]: Registered collection: patternfly-docs
",
"[INFO]: Registered collection: patternfly-component-schemas
",
"[INFO]: Registered collection: patternfly-api
",
"[INFO]: Update collection: patternfly-component-schemas
",
Expand Down
Loading