perf(core): cache taxonomy defs per-isolate; move runtime/db singletons to globalThis by scottbuscemi · Pull Request #1399 · emdash-cms/emdash

scottbuscemi · 2026-06-10T07:40:21Z

What does this PR do?

Cuts per-render D1 round trips on public pages by caching taxonomy definitions across the worker isolate, and hardens the runtime/DB singletons against bundler module duplication.

Every public render that hydrates entry terms read SELECT * FROM _emdash_taxonomy_defs (via getTaxonomyDefs → getCollectionTaxonomyNames), which only had per-request caching. On Cloudflare D1, where the worker colo is often far from the database primary, each query is a ~40ms cross-region round trip, so this fired on every warm request for no benefit — taxonomy definitions change extremely rarely (created via the admin API or a seed; there is no edit/delete-def path).

They're now cached per-isolate behind a globalThis Symbol holder (the same two-tier pattern as settings/index.ts and the byline field-defs cache), keyed by resolved locale and invalidated in-memory by every def write (handleTaxonomyCreate, seed application). Invalidation is in-memory rather than a persisted version probe on purpose: a per-request version read would merely replace the query being removed, yielding no net saving on warm isolates. Isolated databases (playground / DO preview) bypass the cache.

Separately, the cached runtime instance, the DB-instance cache, and the in-flight DB-init promise (astro/middleware.ts, emdash-runtime.ts) were plain module-scoped variables. Under Vite SSR chunk duplication those can become multiple independent copies, letting cold-start migrations and bootstrap reads re-run on requests that should have hit the warm cache. They now live on globalThis behind Symbol keys, matching the existing SETUP_VERIFIED_KEY / request-context / request-cache singletons.

No schema changes, no public API changes, fully backwards compatible.

Type of change

Checklist

I have read CONTRIBUTING.md
pnpm typecheck passes
pnpm lint passes
pnpm test passes (or targeted tests for my change)
pnpm format has been run
I have added/updated tests for my changes (if applicable)
User-visible strings in the admin UI are wrapped for translation (if applicable). Do not include messages.po changes except in translation PRs — a workflow extracts catalogs on merge to main.
I have added a changeset (if this PR changes a published package)
New features link to an approved Discussion: https://github.com/emdash-cms/emdash/discussions/...

AI-generated code disclosure

This PR includes AI-generated code — model/tool: Claude Opus 4.8

Screenshots / test output

Targeted unit tests (tests/unit/taxonomies/defs-cache.test.ts):

 Test Files  1 passed (1)
      Tests  4 passed (4)

pnpm lint:json → 0 diagnostics. pnpm typecheck passes across all packages.

Try this PR

Open a fresh playground →

A full working EmDash site, deployed from this branch. Each visit gets its own session-scoped sandbox: no login needed and no shared state. Try the admin, edit content, hit the public site.

_{Tracks perf/taxonomy-defs-isolate-cache. Updated automatically when the playground redeploys.}

…ns to globalThis Cut per-render D1 round trips on public pages by caching taxonomy definitions across the worker isolate, and harden the runtime/DB singletons against bundler module duplication. - getTaxonomyDefs (query #12, hit on every render that hydrates entry terms) now has a two-tier cache: per-request + per-isolate via a globalThis Symbol holder keyed by locale, invalidated in-memory by every def write (handleTaxonomyCreate, seed). Isolated DBs bypass it. - runtimeInstance/dbCache/dbInitPromise moved onto globalThis behind Symbol keys so Vite SSR chunk duplication can't spawn duplicate caches that re-run cold-start migrations/bootstrap reads. No schema or public-API changes. Cold-start db.batch() batching deferred to a follow-up.

changeset-bot · 2026-06-10T07:40:25Z

🦋 Changeset detected

Latest commit: 9b1ba42

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

This PR includes changesets to release 16 packages

Name	Type
emdash	Patch
@emdash-cms/cloudflare	Patch
@emdash-cms/sandbox-workerd	Patch
@emdash-cms/fixture-perf-site	Patch
@emdash-cms/perf-demo-site	Patch
@emdash-cms/cache-demo-site	Patch
@emdash-cms/do-demo-site	Patch
@emdash-cms/do-solo-demo-site	Patch
@emdash-cms/admin	Patch
@emdash-cms/auth	Patch
@emdash-cms/blocks	Patch
@emdash-cms/gutenberg-to-portable-text	Patch
@emdash-cms/x402	Patch
create-emdash	Patch
@emdash-cms/auth-atproto	Patch
@emdash-cms/plugin-embeds	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

cloudflare-workers-and-pages · 2026-06-10T07:42:24Z

Deploying with Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status	Name	Latest Commit	Updated (UTC)
✅ Deployment successful! View logs	docs	`c830d74`	Jul 01 2026, 03:01 PM

cloudflare-workers-and-pages · 2026-06-10T07:43:06Z

Deploying with Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status	Name	Latest Commit	Updated (UTC)
✅ Deployment successful! View logs	emdash-demo-cache	`9b1ba42`	Jul 01 2026, 03:12 PM

pkg-pr-new · 2026-06-10T07:43:13Z

Open in StackBlitz

@emdash-cms/admin

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

@emdash-cms/auth

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

@emdash-cms/auth-atproto

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

@emdash-cms/blocks

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

@emdash-cms/cloudflare

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

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

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

emdash

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

create-emdash

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

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

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

@emdash-cms/plugin-cli

npm i https://pkg.pr.new/@emdash-cms/plugin-cli@1399

@emdash-cms/plugin-types

npm i https://pkg.pr.new/@emdash-cms/plugin-types@1399

@emdash-cms/registry-client

npm i https://pkg.pr.new/@emdash-cms/registry-client@1399

@emdash-cms/registry-lexicons

npm i https://pkg.pr.new/@emdash-cms/registry-lexicons@1399

@emdash-cms/sandbox-workerd

npm i https://pkg.pr.new/@emdash-cms/sandbox-workerd@1399

@emdash-cms/x402

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

@emdash-cms/plugin-ai-moderation

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

@emdash-cms/plugin-atproto

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

@emdash-cms/plugin-audit-log

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

@emdash-cms/plugin-color

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

@emdash-cms/plugin-embeds

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

@emdash-cms/plugin-field-kit

npm i https://pkg.pr.new/@emdash-cms/plugin-field-kit@1399

@emdash-cms/plugin-forms

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

@emdash-cms/plugin-webhook-notifier

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

commit: 9b1ba42

cloudflare-workers-and-pages · 2026-06-10T07:43:57Z

Deploying with Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status	Name	Latest Commit	Updated (UTC)
✅ Deployment successful! View logs	emdash-playground	`9b1ba42`	Jul 01 2026, 03:13 PM

github-actions · 2026-06-10T07:47:31Z

Overlapping PRs

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

fix(core): auto-publish scheduled content and fix SQLite datetime comparison #1216 (3 shared files)

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

…olate-cache # Conflicts: # packages/core/src/astro/middleware.ts # packages/core/src/emdash-runtime.ts # scripts/query-counts.snapshot.d1.json # scripts/query-counts.snapshot.sqlite.json

…ixed harness The pre-merge snapshots were measured with the old query-counts harness that missed queries issued during streaming (fixed in #1580). Regenerated against the fixed harness so the numbers reflect reality: the per-isolate taxonomy-defs cache removes the repeated _emdash_taxonomy_defs read on every public render (-1 query per route).

cloudflare-workers-and-pages · 2026-07-01T14:57:11Z

Deploying with Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status	Name	Latest Commit	Updated (UTC)
✅ Deployment successful! View logs	emdash-demo-do	`9b1ba42`	Jul 01 2026, 03:12 PM

…ns to globalThis (emdash-cms#1399) * perf(core): cache taxonomy defs per-isolate; move runtime/db singletons to globalThis Cut per-render D1 round trips on public pages by caching taxonomy definitions across the worker isolate, and harden the runtime/DB singletons against bundler module duplication. - getTaxonomyDefs (query emdash-cms#12, hit on every render that hydrates entry terms) now has a two-tier cache: per-request + per-isolate via a globalThis Symbol holder keyed by locale, invalidated in-memory by every def write (handleTaxonomyCreate, seed). Isolated DBs bypass it. - runtimeInstance/dbCache/dbInitPromise moved onto globalThis behind Symbol keys so Vite SSR chunk duplication can't spawn duplicate caches that re-run cold-start migrations/bootstrap reads. No schema or public-API changes. Cold-start db.batch() batching deferred to a follow-up. * chore: format changeset * ci: update query-count snapshots * chore: regenerate query-count snapshots with taxonomy-defs cache on fixed harness The pre-merge snapshots were measured with the old query-counts harness that missed queries issued during streaming (fixed in emdash-cms#1580). Regenerated against the fixed harness so the numbers reflect reality: the per-isolate taxonomy-defs cache removes the repeated _emdash_taxonomy_defs read on every public render (-1 query per route). * ci: update query-count snapshots --------- Co-authored-by: emdashbot[bot] <emdashbot[bot]@users.noreply.github.com> Co-authored-by: Matt Kane <mkane@cloudflare.com>

scottbuscemi added 2 commits June 9, 2026 13:49

chore: format changeset

38e2a99

github-actions Bot added area/core size/L labels Jun 10, 2026

ci: update query-count snapshots

91b7143

github-actions Bot added query-count changed PR diff modifies query-count snapshot files cla: signed overlap labels Jun 10, 2026

github-actions Bot added the needs-rebase label Jun 12, 2026

github-actions Bot mentioned this pull request Jun 16, 2026

perf(core): cut redundant queries on content pages #1498

Merged

18 tasks

ascorbic marked this pull request as ready for review June 22, 2026 16:40

github-actions Bot added the review/needs-review No maintainer or bot review yet label Jun 22, 2026

ascorbic added 2 commits June 22, 2026 17:46

Merge remote-tracking branch 'origin/main' into perf/taxonomy-defs-is…

bea8c32

…olate-cache # Conflicts: # packages/core/src/astro/middleware.ts # packages/core/src/emdash-runtime.ts # scripts/query-counts.snapshot.d1.json # scripts/query-counts.snapshot.sqlite.json

github-actions Bot added needs-rebase and removed needs-rebase labels Jun 22, 2026

This was referenced Jun 24, 2026

fix(core): split SEO fetch from loadEntry to avoid D1 result-set column limit on wide collections #1603

Merged

Add subtree (descendant) matching to taxonomy where filters #1648

Closed

Add media usage index foundation #1670

Closed

Merge main into taxonomy defs cache PR

c830d74

github-actions Bot removed the query-count changed PR diff modifies query-count snapshot files label Jul 1, 2026

github-actions Bot removed the needs-rebase label Jul 1, 2026

ci: update query-count snapshots

9b1ba42

ascorbic merged commit 192741f into main Jul 1, 2026
46 checks passed

ascorbic deleted the perf/taxonomy-defs-isolate-cache branch July 1, 2026 15:40

emdashbot Bot mentioned this pull request Jul 1, 2026

ci: release #1677

Merged

Navigation Menu

Uh oh!

perf(core): cache taxonomy defs per-isolate; move runtime/db singletons to globalThis - #1399

perf(core): cache taxonomy defs per-isolate; move runtime/db singletons to globalThis#1399
ascorbic merged 7 commits into
mainfrom
perf/taxonomy-defs-isolate-cache

scottbuscemi commented Jun 10, 2026 •

edited by github-actions Bot

Loading

Uh oh!

changeset-bot Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

cloudflare-workers-and-pages Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

cloudflare-workers-and-pages Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

pkg-pr-new Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

cloudflare-workers-and-pages Bot commented Jun 10, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jun 10, 2026

Uh oh!

cloudflare-workers-and-pages Bot commented Jul 1, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

scottbuscemi commented Jun 10, 2026 • edited by github-actions Bot 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

Screenshots / test output

Try this PR

Uh oh!

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

Uh oh!

🦋 Changeset detected

Uh oh!

cloudflare-workers-and-pages Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying with Cloudflare Workers

Uh oh!

cloudflare-workers-and-pages Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying with Cloudflare Workers

Uh oh!

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

Uh oh!

Uh oh!

cloudflare-workers-and-pages Bot commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying with Cloudflare Workers

Uh oh!

github-actions Bot commented Jun 10, 2026

Overlapping PRs

Uh oh!

cloudflare-workers-and-pages Bot commented Jul 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Deploying with Cloudflare Workers

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

scottbuscemi commented Jun 10, 2026 •

edited by github-actions Bot

Loading

changeset-bot Bot commented Jun 10, 2026 •

edited

Loading

cloudflare-workers-and-pages Bot commented Jun 10, 2026 •

edited

Loading

cloudflare-workers-and-pages Bot commented Jun 10, 2026 •

edited

Loading

pkg-pr-new Bot commented Jun 10, 2026 •

edited

Loading

cloudflare-workers-and-pages Bot commented Jun 10, 2026 •

edited

Loading

cloudflare-workers-and-pages Bot commented Jul 1, 2026 •

edited

Loading