feat(marketplace): add categories, FTS5 search, and category filter UI by BenjaminPrice · Pull Request #303 · emdash-cms/emdash

BenjaminPrice · 2026-04-06T09:53:39Z

What does this PR do?

Adds structured categories and FTS5 full-text search to the marketplace, wired end-to-end from the D1 schema through the API to the admin UI. Also resolves existing contract drift where the core MarketplaceClient sent a category param the Worker ignored.

Type of change

Checklist

I have read CONTRIBUTING.md
pnpm typecheck passes
pnpm --silent lint:json | jq '.diagnostics | length' returns 0 (1 pre-existing warning in router.tsx)
pnpm test passes (3 pre-existing failures in auth tests, 0 new failures)
pnpm format has been run
I have added/updated tests for my changes (if applicable)
I have added a changeset (if this PR changes a published package)
New features link to an approved Discussion: Marketplace Discussion #296

AI-generated code disclosure

This PR includes AI-generated code

Changes

Schema (`packages/marketplace/src/db/schema.sql`)

categories table (id, slug, name, description, icon, sort_order)
plugin_categories join table with index on category_id
FTS5 virtual table plugins_fts with INSERT/UPDATE/DELETE sync triggers
12 seed categories: seo, forms, analytics, email, media, social, security, devtools, content, performance, migration, ecommerce

Marketplace Worker (`packages/marketplace`)

GET /api/v1/categories lists all categories sorted by sort_order
GET /api/v1/plugins?category=slug filters by category via join
FTS5 MATCH search with automatic LIKE fallback for unsanitizable queries
sanitizeFtsQuery() strips FTS5 operators (*"():^{}[]|!~) and boolean keywords (AND OR NOT NEAR), wraps remaining words in quotes
Plugin create/update accepts optional categories: string[] (max 3 slugs)
Plugin detail response includes categories: [{slug, name}]

Core (`packages/core`)

MarketplaceClient.getCategories() added to interface + implementation
handleMarketplaceGetCategories() handler
Admin proxy route: GET /_emdash/api/admin/plugins/marketplace/categories
Resolves contract drift: category param was already sent by the client but ignored by the Worker

Admin UI (`packages/admin`)

fetchCategories() API function + MarketplaceCategory type
Category filter dropdown in MarketplaceBrowse (React Query, 5min stale time)

Tests (13 new)

12 marketplace Worker tests: category CRUD, category filtering, FTS5 search by name/description, empty results, FTS5 sanitization (special chars, boolean operators, empty after sanitization)
1 core MarketplaceClient test: getCategories() API call

Migration note for production D1

-- Run via: wrangler d1 execute marketplace-db --remote --file=migration.sql
-- See schema.sql for full table definitions, triggers, and seed data

…egory integration Adds structured categories with browse-by-category UX across the full stack: Schema: - categories table with 12 seed categories (seo, forms, analytics, etc.) - plugin_categories join table (max 3 per plugin) - FTS5 virtual table with sync triggers for full-text search - FTS5 input sanitization to prevent syntax injection Marketplace Worker: - GET /api/v1/categories endpoint - Category filter on GET /api/v1/plugins?category=slug - FTS5 MATCH search with LIKE fallback for unsanitizable input - Category assignment on plugin create/update (max 3 slugs) - Categories included in plugin detail response Core MarketplaceClient: - getCategories() method on MarketplaceClient interface - Resolves existing contract drift: category param was sent by client but ignored by the Worker Admin UI: - Category filter dropdown in MarketplaceBrowse - Categories fetched via new proxy route - Proxy route: GET /_emdash/api/admin/plugins/marketplace/categories Migration note for production D1: See schema.sql for new tables and FTS5 setup.

Marketplace Worker tests (12 new): - GET /categories returns seeded categories in sort order - Category filtering returns only matching plugins - Empty category returns empty results - Unfiltered search returns all plugins - Plugin detail includes categories - FTS5 searches by name and description - FTS5 returns empty for no matches - FTS5 sanitizes special characters without errors - FTS5 handles empty query after sanitization - Boolean operators are stripped from FTS5 queries - Special characters are stripped from queries Core MarketplaceClient tests (1 new): - getCategories() returns categories from marketplace API

changeset-bot · 2026-04-06T09:53:43Z

🦋 Changeset detected

Latest commit: 7e77b95

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 9 packages

Name	Type
emdash	Minor
@emdash-cms/cloudflare	Patch
@emdash-cms/plugin-ai-moderation	Major
@emdash-cms/plugin-atproto	Patch
@emdash-cms/plugin-audit-log	Patch
@emdash-cms/plugin-color	Major
@emdash-cms/plugin-embeds	Major
@emdash-cms/plugin-forms	Major
@emdash-cms/plugin-webhook-notifier	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

github-actions · 2026-04-06T09:53:49Z

Scope check

This PR changes 656 lines across 14 files. Large PRs are harder to review and more likely to be closed without review.

If this scope is intentional, no action needed. A maintainer will review it. If not, please consider splitting this into smaller PRs.

See CONTRIBUTING.md for contribution guidelines.

pkg-pr-new · 2026-04-06T09:55:00Z

Open in StackBlitz

@emdash-cms/admin

npm i https://pkg.pr.new/@emdash-cms/admin@303

@emdash-cms/auth

npm i https://pkg.pr.new/@emdash-cms/auth@303

@emdash-cms/blocks

npm i https://pkg.pr.new/@emdash-cms/blocks@303

@emdash-cms/cloudflare

npm i https://pkg.pr.new/@emdash-cms/cloudflare@303

emdash

npm i https://pkg.pr.new/emdash@303

create-emdash

npm i https://pkg.pr.new/create-emdash@303

@emdash-cms/gutenberg-to-portable-text

npm i https://pkg.pr.new/@emdash-cms/gutenberg-to-portable-text@303

@emdash-cms/x402

npm i https://pkg.pr.new/@emdash-cms/x402@303

@emdash-cms/plugin-ai-moderation

npm i https://pkg.pr.new/@emdash-cms/plugin-ai-moderation@303

@emdash-cms/plugin-atproto

npm i https://pkg.pr.new/@emdash-cms/plugin-atproto@303

@emdash-cms/plugin-audit-log

npm i https://pkg.pr.new/@emdash-cms/plugin-audit-log@303

@emdash-cms/plugin-color

npm i https://pkg.pr.new/@emdash-cms/plugin-color@303

@emdash-cms/plugin-embeds

npm i https://pkg.pr.new/@emdash-cms/plugin-embeds@303

@emdash-cms/plugin-forms

npm i https://pkg.pr.new/@emdash-cms/plugin-forms@303

@emdash-cms/plugin-webhook-notifier

npm i https://pkg.pr.new/@emdash-cms/plugin-webhook-notifier@303

commit: 7e77b95

Copilot

Pull request overview

Adds structured plugin categories and FTS5-backed search to the marketplace, wiring schema changes through the Marketplace Worker, core proxy/client APIs, and the admin browse UI.

Changes:

Add categories + plugin_categories tables, plus plugins_fts FTS5 index and triggers in the marketplace schema.
Extend marketplace public/author APIs to list categories, filter plugins by category, include plugin categories in detail, and accept category assignments (max 3).
Add core + admin client/proxy support for fetching categories, and a category filter dropdown in the admin marketplace browse view.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
packages/marketplace/tests/categories-fts.test.ts	Adds worker-level tests covering categories, category filtering, and FTS5 search/sanitization.
packages/marketplace/src/routes/public.ts	Adds `GET /categories`, adds `category` param to plugin search, includes categories in plugin detail.
packages/marketplace/src/routes/author.ts	Accepts optional `categories` on create/update and persists them via DB query helper.
packages/marketplace/src/db/types.ts	Adds `CategoryRow` and adds `category` to search options typing.
packages/marketplace/src/db/schema.sql	Adds categories tables, join table, and FTS5 virtual table + triggers; seeds 12 categories.
packages/marketplace/src/db/queries.ts	Adds FTS sanitization + FTS-based search condition, category filtering condition, and category CRUD/query helpers.
packages/core/tests/unit/plugins/marketplace-client.test.ts	Adds a unit test ensuring the core client calls `/api/v1/categories` and returns items.
packages/core/src/plugins/marketplace.ts	Introduces `MarketplaceCategory` type and `MarketplaceClient.getCategories()`.
packages/core/src/astro/routes/api/admin/plugins/marketplace/categories.ts	Adds an admin proxy route for categories with permission gating.
packages/core/src/api/handlers/marketplace.ts	Adds `handleMarketplaceGetCategories()` handler that calls the marketplace client.
packages/core/src/api/handlers/index.ts	Re-exports the new marketplace categories handler.
packages/admin/src/lib/api/marketplace.ts	Adds `MarketplaceCategory` type, `fetchCategories()`, and sends `category` in search params.
packages/admin/src/components/MarketplaceBrowse.tsx	Adds React Query call to load categories and a category filter dropdown wired into search.
.changeset/clean-walls-rule.md	Adds a changeset documenting the feature addition.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

packages/marketplace/src/db/queries.ts

packages/marketplace/src/db/schema.sql

packages/marketplace/src/db/queries.ts

- FTS5 search now gracefully falls back to LIKE if the FTS table is missing or the query fails (e.g. migration not yet applied). Extracted query building into executeSearch() to cleanly support both modes. - Added FTS backfill: INSERT INTO plugins_fts(plugins_fts) VALUES ('rebuild') ensures existing plugins are indexed after migration. - setPluginCategories() now validates slugs before deleting existing assignments. Unknown slugs throw an error instead of silently clearing categories. Delete + insert run in a single db.batch() for atomicity. Also deduplicates input slugs.

…iflare)

github-actions · 2026-04-06T13:25:31Z

Overlapping PRs

This PR modifies files that are also changed by other open PRs:

fix: use stable site hash for install telemetry deduplication #298 (7 shared files)

This may cause merge conflicts or duplicated work. A maintainer will coordinate.

…alization)

ascorbic

Thanks. This is a good improvement. My concern is that this would be the first change to the marketplace schema since release and we have no migration system in place. This is an existing issue, but has become relevant as we need to change the schea.

Could you add a migrations dir and add it to wrangler.jsonc, copy the current sql into an initial 000_initial migration, add another migration with your changes, then change the instructions to use wrangler d1 migrations apply rather than execute

Addresses maintainer feedback: set up a proper migration system before making schema changes, so production D1 databases are updated via wrangler d1 migrations apply instead of manual SQL execution. - migrations/0000_initial.sql: baseline schema as deployed at launch - migrations/0001_categories_fts.sql: categories, FTS5, seed data - wrangler.jsonc: added migrations_dir to D1 database config Tests continue to bootstrap from schema.sql (full schema for fresh in-memory DBs). Migrations are for production D1 incremental updates. Usage: wrangler d1 migrations apply emdash-marketplace --remote

BenjaminPrice · 2026-04-08T07:01:53Z

Done. Added a migrations/ directory with the D1 migration system:

0000_initial.sql -- baseline schema as deployed at marketplace launch (includes install_count from fix: use stable site hash for install telemetry deduplication #298)
0001_categories_fts.sql -- categories tables, FTS5 virtual table + triggers, seed categories
wrangler.jsonc updated with migrations_dir: "migrations" on the D1 database binding

Production deployment:

wrangler d1 migrations apply emdash-marketplace --remote

Tests still bootstrap from schema.sql (full schema for fresh in-memory DBs), which is the standard pattern for test isolation. Migrations are for production D1 incremental updates.

Pushed in 7e77b95.

BenjaminPrice added 3 commits April 6, 2026 18:36

chore: add changeset for categories and FTS5 search

e7e12aa

Copilot AI review requested due to automatic review settings April 6, 2026 09:53

github-actions bot added area/admin area/core size/XL labels Apr 6, 2026

github-actions bot added the cla: signed label Apr 6, 2026

Copilot started reviewing on behalf of BenjaminPrice April 6, 2026 09:54 View session

Copilot AI reviewed Apr 6, 2026

View reviewed changes

packages/marketplace/src/db/queries.ts Show resolved Hide resolved

packages/marketplace/src/db/schema.sql Show resolved Hide resolved

packages/marketplace/src/db/queries.ts Outdated Show resolved Hide resolved

BenjaminPrice added 2 commits April 6, 2026 19:07

ci: retrigger smoke tests (flaky cross-request promise failure in min…

72a1c4b

…iflare)

github-actions bot added the overlap label Apr 6, 2026

github-actions bot mentioned this pull request Apr 6, 2026

fix: use stable site hash for install telemetry deduplication #298

Merged

16 tasks

merge: resolve conflicts with upstream/main (PR0 install_count denorm…

af0d804

…alization)

github-actions bot mentioned this pull request Apr 8, 2026

feat(marketplace): add reviews and ratings system #366

Open

16 tasks

Merge branch 'main' into feat/marketplace-categories-fts

cae4eae

ascorbic reviewed Apr 8, 2026

View reviewed changes

BenjaminPrice requested a review from ascorbic April 8, 2026 07:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(marketplace): add categories, FTS5 search, and category filter UI#303

feat(marketplace): add categories, FTS5 search, and category filter UI#303
BenjaminPrice wants to merge 8 commits intoemdash-cms:mainfrom
BenjaminPrice:feat/marketplace-categories-fts

BenjaminPrice commented Apr 6, 2026 •

edited

Loading

Uh oh!

changeset-bot bot commented Apr 6, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Apr 6, 2026

Uh oh!

pkg-pr-new bot commented Apr 6, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 6, 2026

Uh oh!

ascorbic left a comment

Uh oh!

BenjaminPrice commented Apr 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

BenjaminPrice commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Type of change

Checklist

AI-generated code disclosure

Changes

Schema (packages/marketplace/src/db/schema.sql)

Marketplace Worker (packages/marketplace)

Core (packages/core)

Admin UI (packages/admin)

Tests (13 new)

Migration note for production D1

Uh oh!

changeset-bot bot commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

github-actions bot commented Apr 6, 2026

Scope check

Uh oh!

pkg-pr-new bot commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 6, 2026

Overlapping PRs

Uh oh!

ascorbic left a comment

Choose a reason for hiding this comment

Uh oh!

BenjaminPrice commented Apr 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

BenjaminPrice commented Apr 6, 2026 •

edited

Loading

Schema (`packages/marketplace/src/db/schema.sql`)

Marketplace Worker (`packages/marketplace`)

Core (`packages/core`)

Admin UI (`packages/admin`)

changeset-bot bot commented Apr 6, 2026 •

edited

Loading

pkg-pr-new bot commented Apr 6, 2026 •

edited

Loading