Skip to content

fix(github-plugin): keep same-named components from different sub-plugins instead of dropping the later one #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deanrie wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(github-plugin): keep same-named components from different sub-plugins instead of dropping the later one #476

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 23 additions & 6 deletions apps/cursor/src/lib/github-plugin/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,14 @@ export async function parseGitHubPlugin(
}

const components: ParsedComponent[] = [];
// Which sub-plugin dir each component came from ("" for the repo root), so
// a slug that collides across sub-plugins can be told apart below.
const prefixOf = new Map<ParsedComponent, string>();

const prefixes = ["", ...subPluginDirs];

for (const prefix of prefixes) {
const firstIndex = components.length;
const ruleFiles = tree.filter(
(f) =>
f.type === "blob" &&
Expand Down Expand Up @@ -552,15 +556,28 @@ export async function parseGitHubPlugin(
// ignore
}
}

for (const c of components.slice(firstIndex)) prefixOf.set(c, prefix);
}

// Slugs come from file or directory names, so two sub-plugins that both
// ship, say, `skills/setup/SKILL.md` produce the same `skill:setup` key. The
// first occurrence keeps its slug; a later one from a sub-plugin dir gets
// the dir as a prefix (the hooks component already does this). Only a key
// that still collides after that is dropped.
const seen = new Set<string>();
const deduped = components.filter((c) => {
const key = `${c.type}:${c.slug}`;
if (seen.has(key)) return false;
seen.add(key);
return true;
});
const deduped: ParsedComponent[] = [];
for (const c of components) {
let slug = c.slug;
if (seen.has(`${c.type}:${slug}`)) {
const prefix = prefixOf.get(c) ?? "";
if (!prefix) continue;
slug = slugify(`${prefix} ${c.slug}`);
if (seen.has(`${c.type}:${slug}`)) continue;
}
seen.add(`${c.type}:${slug}`);
deduped.push(slug === c.slug ? c : { ...c, slug });
}

if (deduped.length === 0) {
const scannedPrefixes = prefixes
Expand Down