emdash 0.4.0 → 0.6.0

package/dist/request-context.d.mts

@@ -1,20 +1,6 @@
+import { QueryRecorder } from "./database/instrumentation.mjs";
+
 //#region src/request-context.d.ts
-/**
- * EmDash Request Context
- *
- * Uses AsyncLocalStorage to provide request-scoped state to query functions
- * without requiring explicit parameter passing. The middleware wraps next()
- * in als.run(), making the context available to all code during rendering.
- *
- * For logged-out users with no CMS signals (no edit cookie, no preview param),
- * the middleware skips ALS entirely — zero overhead for normal traffic.
- *
- * The AsyncLocalStorage instance is stored on globalThis with a Symbol key
- * to guarantee a singleton even when bundlers duplicate this module across
- * code-split chunks. Without this, Rollup/Vite may inline the module into
- * multiple chunks (e.g. middleware and page components), each with its own
- * ALS instance — breaking request-scoped state propagation.
- */
 interface EmDashRequestContext {
   /** Whether the current request is in visual editing mode */
   editMode: boolean;
@@ -33,6 +19,23 @@ interface EmDashRequestContext {
    * the singleton instance. Also used by the DO preview pattern.
    */
   db?: unknown;
+  /**
+   * Indicates the per-request `db` points at an isolated database
+   * instance whose schema may diverge from the configured one
+   * (playground, DO preview sessions). When true, schema-derived caches
+   * (manifest, taxonomy defs, etc.) must not be reused across requests.
+   *
+   * Plain D1 Sessions API routing does NOT set this — sessions are just
+   * a routing hint over the same schema, so the module-scoped manifest
+   * cache remains valid.
+   */
+  dbIsIsolated?: boolean;
+  /**
+   * Query recorder attached by middleware when EMDASH_QUERY_LOG_FILE is set.
+   * The Kysely `log` hook appends an event per query; middleware flushes
+   * to NDJSON after the response.
+   */
+  queryRecorder?: QueryRecorder;
 }
 /**
  * Run a function within an EmDash request context.

package/dist/request-context.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.d.mts","names":[],"sources":["../src/request-context.ts"],"mappings":";;AAmBA;;;;;;;;;;;;AAqCA;;;UArCiB,oBAAA;EAqCsD;EAnCtE,QAAA;EAmC2E;EAjC3E,OAAA;IACC,UAAA;IACA,EAAA;EAAA;EA+BqE;EA5BtE,MAAA;EA4B0E;;;AAQ3E;;;;EA5BC,EAAA;AAAA;;;;;iBAoBe,cAAA,GAAA,CAAkB,GAAA,EAAK,oBAAA,EAAsB,EAAA,QAAU,CAAA,GAAI,CAAA;;;;;iBAQ3D,iBAAA,CAAA,GAAqB,oBAAA"}
+{"version":3,"file":"request-context.d.mts","names":[],"sources":["../src/request-context.ts"],"mappings":";;;UAqBiB,oBAAA;EAsDD;EApDf,QAAA;EAoD6B;EAlD7B,OAAA;IACC,UAAA;IACA,EAAA;EAAA;EAgD0E;EA7C3E,MAAA;EA6CsC;;;;;;;EArCtC,EAAA;EA6CgC;;;;;;;;;;EAlChC,YAAA;;;;;;EAMA,aAAA,GAAgB,aAAA;AAAA;;;;;iBAoBD,cAAA,GAAA,CAAkB,GAAA,EAAK,oBAAA,EAAsB,EAAA,QAAU,CAAA,GAAI,CAAA;;;;;iBAQ3D,iBAAA,CAAA,GAAqB,oBAAA"}

package/dist/request-context.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.mjs","names":[],"sources":["../src/request-context.ts"],"sourcesContent":["/**\n * EmDash Request Context\n *\n * Uses AsyncLocalStorage to provide request-scoped state to query functions\n * without requiring explicit parameter passing. The middleware wraps next()\n * in als.run(), making the context available to all code during rendering.\n *\n * For logged-out users with no CMS signals (no edit cookie, no preview param),\n * the middleware skips ALS entirely — zero overhead for normal traffic.\n *\n * The AsyncLocalStorage instance is stored on globalThis with a Symbol key\n * to guarantee a singleton even when bundlers duplicate this module across\n * code-split chunks. Without this, Rollup/Vite may inline the module into\n * multiple chunks (e.g. middleware and page components), each with its own\n * ALS instance — breaking request-scoped state propagation.\n */\n\nimport { AsyncLocalStorage } from \"node:async_hooks\";\n\nexport interface EmDashRequestContext {\n\t/** Whether the current request is in visual editing mode */\n\teditMode: boolean;\n\t/** Preview token info, if this is a preview request */\n\tpreview?: {\n\t\tcollection: string;\n\t\tid: string;\n\t};\n\t/** Current locale from Astro's i18n routing (when configured) */\n\tlocale?: string;\n\t/**\n\t * Per-request database override.\n\t *\n\t * Set by middleware when D1 read replica sessions are enabled.\n\t * The runtime's `db` getter checks this first, falling back to\n\t * the singleton instance. Also used by the DO preview pattern.\n\t */\n\tdb?: unknown;\n}\n\nconst ALS_KEY = Symbol.for(\"emdash:request-context\");\n\nconst storage: AsyncLocalStorage<EmDashRequestContext> =\n\t// eslint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- globalThis singleton pattern\n\t((globalThis as Record<symbol, unknown>)[ALS_KEY] as\n\t\t| AsyncLocalStorage<EmDashRequestContext>\n\t\t| undefined) ??\n\t(() => {\n\t\tconst als = new AsyncLocalStorage<EmDashRequestContext>();\n\t\t(globalThis as Record<symbol, unknown>)[ALS_KEY] = als;\n\t\treturn als;\n\t})();\n\n/**\n * Run a function within an EmDash request context.\n * Called by middleware to wrap next().\n */\nexport function runWithContext<T>(ctx: EmDashRequestContext, fn: () => T): T {\n\treturn storage.run(ctx, fn);\n}\n\n/**\n * Get the current request context.\n * Returns undefined if no context is set (logged-out fast path).\n */\nexport function getRequestContext(): EmDashRequestContext | undefined {\n\treturn storage.getStore();\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAuCA,MAAM,UAAU,OAAO,IAAI,yBAAyB;AAEpD,MAAM,UAEH,WAAuC,mBAGlC;CACN,MAAM,MAAM,IAAI,mBAAyC;AACzD,CAAC,WAAuC,WAAW;AACnD,QAAO;IACJ;;;;;AAML,SAAgB,eAAkB,KAA2B,IAAgB;AAC5E,QAAO,QAAQ,IAAI,KAAK,GAAG;;;;;;AAO5B,SAAgB,oBAAsD;AACrE,QAAO,QAAQ,UAAU"}
+{"version":3,"file":"request-context.mjs","names":[],"sources":["../src/request-context.ts"],"sourcesContent":["/**\n * EmDash Request Context\n *\n * Uses AsyncLocalStorage to provide request-scoped state to query functions\n * without requiring explicit parameter passing. The middleware wraps next()\n * in als.run(), making the context available to all code during rendering.\n *\n * For logged-out users with no CMS signals (no edit cookie, no preview param),\n * the middleware skips ALS entirely — zero overhead for normal traffic.\n *\n * The AsyncLocalStorage instance is stored on globalThis with a Symbol key\n * to guarantee a singleton even when bundlers duplicate this module across\n * code-split chunks. Without this, Rollup/Vite may inline the module into\n * multiple chunks (e.g. middleware and page components), each with its own\n * ALS instance — breaking request-scoped state propagation.\n */\n\nimport { AsyncLocalStorage } from \"node:async_hooks\";\n\nimport type { QueryRecorder } from \"./database/instrumentation.js\";\n\nexport interface EmDashRequestContext {\n\t/** Whether the current request is in visual editing mode */\n\teditMode: boolean;\n\t/** Preview token info, if this is a preview request */\n\tpreview?: {\n\t\tcollection: string;\n\t\tid: string;\n\t};\n\t/** Current locale from Astro's i18n routing (when configured) */\n\tlocale?: string;\n\t/**\n\t * Per-request database override.\n\t *\n\t * Set by middleware when D1 read replica sessions are enabled.\n\t * The runtime's `db` getter checks this first, falling back to\n\t * the singleton instance. Also used by the DO preview pattern.\n\t */\n\tdb?: unknown;\n\t/**\n\t * Indicates the per-request `db` points at an isolated database\n\t * instance whose schema may diverge from the configured one\n\t * (playground, DO preview sessions). When true, schema-derived caches\n\t * (manifest, taxonomy defs, etc.) must not be reused across requests.\n\t *\n\t * Plain D1 Sessions API routing does NOT set this — sessions are just\n\t * a routing hint over the same schema, so the module-scoped manifest\n\t * cache remains valid.\n\t */\n\tdbIsIsolated?: boolean;\n\t/**\n\t * Query recorder attached by middleware when EMDASH_QUERY_LOG_FILE is set.\n\t * The Kysely `log` hook appends an event per query; middleware flushes\n\t * to NDJSON after the response.\n\t */\n\tqueryRecorder?: QueryRecorder;\n}\n\nconst ALS_KEY = Symbol.for(\"emdash:request-context\");\n\nconst storage: AsyncLocalStorage<EmDashRequestContext> =\n\t// eslint-disable-next-line typescript-eslint(no-unsafe-type-assertion) -- globalThis singleton pattern\n\t((globalThis as Record<symbol, unknown>)[ALS_KEY] as\n\t\t| AsyncLocalStorage<EmDashRequestContext>\n\t\t| undefined) ??\n\t(() => {\n\t\tconst als = new AsyncLocalStorage<EmDashRequestContext>();\n\t\t(globalThis as Record<symbol, unknown>)[ALS_KEY] = als;\n\t\treturn als;\n\t})();\n\n/**\n * Run a function within an EmDash request context.\n * Called by middleware to wrap next().\n */\nexport function runWithContext<T>(ctx: EmDashRequestContext, fn: () => T): T {\n\treturn storage.run(ctx, fn);\n}\n\n/**\n * Get the current request context.\n * Returns undefined if no context is set (logged-out fast path).\n */\nexport function getRequestContext(): EmDashRequestContext | undefined {\n\treturn storage.getStore();\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AA0DA,MAAM,UAAU,OAAO,IAAI,yBAAyB;AAEpD,MAAM,UAEH,WAAuC,mBAGlC;CACN,MAAM,MAAM,IAAI,mBAAyC;AACzD,CAAC,WAAuC,WAAW;AACnD,QAAO;IACJ;;;;;AAML,SAAgB,eAAkB,KAA2B,IAAgB;AAC5E,QAAO,QAAQ,IAAI,KAAK,GAAG;;;;;;AAO5B,SAAgB,oBAAsD;AACrE,QAAO,QAAQ,UAAU"}

package/dist/{runner-DYv3rX8P.d.mts → runner-Fl2NcUUz.d.mts}

@@ -1,4 +1,4 @@
-import { t as Database } from "./types-B6BzlZxx.mjs";
+import { t as Database } from "./types-8xrvl_68.mjs";
 import { Kysely } from "kysely";
 
 //#region src/database/migrations/runner.d.ts
@@ -31,4 +31,4 @@ declare function rollbackMigration(db: Kysely<Database>): Promise<{
 }>;
 //#endregion
 export { runMigrations as i, getMigrationStatus as n, rollbackMigration as r, MigrationStatus as t };
-//# sourceMappingURL=runner-DYv3rX8P.d.mts.map
+//# sourceMappingURL=runner-Fl2NcUUz.d.mts.map

package/dist/{runner-DYv3rX8P.d.mts.map → runner-Fl2NcUUz.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"runner-DYv3rX8P.d.mts","names":[],"sources":["../src/database/migrations/runner.ts"],"mappings":";;;;UAuFiB,eAAA;EAChB,OAAA;EACA,OAAA;AAAA;;AAUD;;iBAAsB,kBAAA,CAAmB,EAAA,EAAI,MAAA,CAAO,QAAA,IAAY,OAAA,CAAQ,eAAA;;;;;;;;;;;iBAkClD,aAAA,CAAc,EAAA,EAAI,MAAA,CAAO,QAAA,IAAY,OAAA;EAAU,OAAA;AAAA;AAArE;;;AAAA,iBA8CsB,iBAAA,CACrB,EAAA,EAAI,MAAA,CAAO,QAAA,IACT,OAAA;EAAU,UAAA;AAAA"}
+{"version":3,"file":"runner-Fl2NcUUz.d.mts","names":[],"sources":["../src/database/migrations/runner.ts"],"mappings":";;;;UAuFiB,eAAA;EAChB,OAAA;EACA,OAAA;AAAA;;AAUD;;iBAAsB,kBAAA,CAAmB,EAAA,EAAI,MAAA,CAAO,QAAA,IAAY,OAAA,CAAQ,eAAA;;;;;;;;;;;iBAkClD,aAAA,CAAc,EAAA,EAAI,MAAA,CAAO,QAAA,IAAY,OAAA;EAAU,OAAA;AAAA;AAArE;;;AAAA,iBA8CsB,iBAAA,CACrB,EAAA,EAAI,MAAA,CAAO,QAAA,IACT,OAAA;EAAU,UAAA;AAAA"}

package/dist/runtime.d.mts

@@ -1,9 +1,9 @@
-import { f as MediaProvider } from "./placeholder-BBCtpTES.mjs";
-import "./types-B6BzlZxx.mjs";
-import { Fn as getDb, Mn as EntryData, Nn as EntryFilter, Pn as emdashLoader, jn as CollectionFilter } from "./index-CRg3PWfZ.mjs";
-import "./runner-DYv3rX8P.mjs";
-import "./types-BYWYxLcp.mjs";
-import "./validate-CcNRWH6I.mjs";
+import { f as MediaProvider } from "./placeholder-tzpqGWII.mjs";
+import "./types-8xrvl_68.mjs";
+import { Fn as EntryFilter, In as emdashLoader, Ln as getDb, Nn as CollectionFilter, Pn as EntryData } from "./index-BYv0mB9g.mjs";
+import "./runner-Fl2NcUUz.mjs";
+import "./types-DgrIP0tF.mjs";
+import "./validate-CaLH1Ia2.mjs";
 
 //#region src/media/provider-loader.d.ts
 /**

package/dist/runtime.mjs

@@ -1,7 +1,7 @@
 import "./dialect-helpers-DhTzaUxP.mjs";
 import "./base64-MBPo9ozB.mjs";
 import "./types-CMMN0pNg.mjs";
-import { n as getDb, t as emdashLoader } from "./loader-BYzwzORf.mjs";
+import { n as getDb, t as emdashLoader } from "./loader-DeiBJEMe.mjs";
 
 //#region src/media/provider-loader.ts
 let virtualMediaProviders;

package/dist/{search-B5p9D36n.mjs → search-DI4bM2w9.mjs}

@@ -4,20 +4,22 @@ import { a as slugify, r as RevisionRepository, t as ContentRepository } from ".
 import { r as encodeBase64, t as decodeBase64 } from "./base64-MBPo9ozB.mjs";
 import { n as decodeCursor, r as encodeCursor, t as EmDashValidationError } from "./types-CMMN0pNg.mjs";
 import { t as MediaRepository } from "./media-DqHVh136.mjs";
-import { a as stripCredentialHeaders, f as OptionsRepository, i as ssrfSafeFetch, o as validateExternalUrl, r as SsrfError } from "./apply-Cma_PiF6.mjs";
+import { a as stripCredentialHeaders, f as OptionsRepository, i as ssrfSafeFetch, o as validateExternalUrl, r as SsrfError } from "./apply-B4MsLM-w.mjs";
 import { t as withTransaction } from "./transaction-Cn2rjY78.mjs";
 import { t as RedirectRepository } from "./redirect-7lGhLBNZ.mjs";
-import { n as SQL_BATCH_SIZE, r as chunks, t as BylineRepository } from "./byline-WuOq9MFJ.mjs";
-import { r as isI18nEnabled } from "./config-DkxPrM9l.mjs";
-import { r as invalidateRedirectCache } from "./cache-E3Dts-yT.mjs";
-import { i as FTSManager, n as SchemaRegistry } from "./registry-BgnP3ysR.mjs";
-import { n as getDb } from "./loader-BYzwzORf.mjs";
-import { i as pluginManifestSchema } from "./manifest-schema-BsXINkQD.mjs";
-import { t as generatePreviewToken } from "./tokens-DKHiCYCB.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-HGz06Soa.mjs";
+import { t as BylineRepository } from "./byline-C4OVd8b3.mjs";
+import { r as isI18nEnabled } from "./config-BXwuX8Bx.mjs";
+import { r as invalidateRedirectCache } from "./cache-BkKBuIvS.mjs";
+import { i as FTSManager, n as SchemaRegistry } from "./registry-Ci3WxVAr.mjs";
+import { n as getDb } from "./loader-DeiBJEMe.mjs";
+import { n as requestCached } from "./request-cache-DiR961CV.mjs";
+import { i as pluginManifestSchema } from "./manifest-schema-V30qsMft.mjs";
+import { t as generatePreviewToken } from "./tokens-BFPFx3CA.mjs";
 import { sql } from "kysely";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { ulid } from "ulidx";
 import { z } from "astro/zod";
-import { AsyncLocalStorage } from "node:async_hooks";
 import { z as z$1 } from "zod";
 import { createGzipDecoder, unpackTar } from "modern-tar";
 import sax from "sax";
@@ -2229,7 +2231,9 @@ async function handleMediaDelete(db, id) {
 * ```
 */
 async function getCollectionInfo(slug) {
-	return getCollectionInfoWithDb(await getDb(), slug);
+	return requestCached(`collection-info:${slug}`, async () => {
+		return getCollectionInfoWithDb(await getDb(), slug);
+	});
 }
 /**
 * Get collection metadata with an explicit db handle.
@@ -2751,14 +2755,8 @@ const mediaUpdateBody = z$1.object({
 	width: z$1.number().int().positive().optional(),
 	height: z$1.number().int().positive().optional()
 }).meta({ id: "MediaUpdateBody" });
-/** Maximum allowed file upload size (50 MB). */
-const MAX_UPLOAD_SIZE = 50 * 1024 * 1024;
-const mediaUploadUrlBody = z$1.object({
-	filename: z$1.string().min(1, "filename is required"),
-	contentType: z$1.string().min(1, "contentType is required"),
-	size: z$1.number().int().positive().max(MAX_UPLOAD_SIZE, `File size must not exceed ${MAX_UPLOAD_SIZE / 1024 / 1024}MB`),
-	contentHash: z$1.string().optional()
-}).meta({ id: "MediaUploadUrlBody" });
+/** Default maximum allowed file upload size (50 MB). */
+const DEFAULT_MAX_UPLOAD_SIZE = 50 * 1024 * 1024;
 const mediaConfirmBody = z$1.object({
 	size: z$1.number().int().positive().optional(),
 	width: z$1.number().int().positive().optional(),
@@ -2824,6 +2822,7 @@ const collectionSourcePattern = /^(template:.+|import:.+|manual|discovered|seed)
 const fieldTypeValues = z$1.enum([
 	"string",
 	"text",
+	"url",
 	"number",
 	"integer",
 	"boolean",
@@ -3105,6 +3104,10 @@ const inviteCreateBody = z$1.object({
 	email: z$1.string().email(),
 	role: roleLevel.optional()
 }).meta({ id: "InviteCreateBody" });
+const inviteRegisterOptionsBody = z$1.object({
+	token: z$1.string().min(1),
+	name: z$1.string().optional()
+}).meta({ id: "InviteRegisterOptionsBody" });
 const inviteCompleteBody = z$1.object({
 	token: z$1.string().min(1),
 	credential: registrationCredential$1,
@@ -4217,6 +4220,33 @@ function convertCodeBlock(block) {
 	};
 }
 
+//#endregion
+//#region src/after.ts
+const waitUntilReady = (async () => {
+	try {
+		return (await import("virtual:emdash/wait-until")).waitUntil ?? null;
+	} catch {
+		return null;
+	}
+})();
+waitUntilReady.catch(() => {});
+/**
+* Schedule `fn` to run without blocking the response.
+*
+* Errors are caught and logged — a deferred task should never surface
+* as an unhandled rejection because the response is long gone. Callers
+* that care about errors should handle them inside `fn`.
+*/
+function after(fn) {
+	const promise = Promise.resolve().then(fn).catch((error) => {
+		console.error("[emdash] deferred task failed:", error);
+	});
+	waitUntilReady.then((waitUntil) => {
+		if (waitUntil) waitUntil(promise);
+		return null;
+	});
+}
+
 //#endregion
 //#region src/cli/wxr/parser.ts
 const PHP_SERIALIZED_STRING_PATTERN = /s:\d+:"([^"]+)"/g;
@@ -5439,7 +5469,8 @@ function createContentAccess(db) {
 			const result = await contentRepo.findMany(collection, {
 				limit: options?.limit ?? 50,
 				cursor: options?.cursor,
-				orderBy
+				orderBy,
+				where: options?.where
 			});
 			const items = result.items.map((item) => ({
 				id: item.id,
@@ -6930,8 +6961,14 @@ var EmailPipeline = class {
 const DEV_CONSOLE_EMAIL_PLUGIN_ID = "emdash-console-email";
 /** Maximum number of emails to keep in memory */
 const MAX_STORED_EMAILS = 100;
-/** In-memory store for dev emails */
-const storedEmails = [];
+/**
+* In-memory store for dev emails.
+* Uses globalThis so the same array is shared across Vite SSR module
+* instances (the runtime and the route handler may load separate copies
+* of this module, but globalThis is always the same object).
+*/
+const GLOBAL_KEY = "__emdash_dev_emails__";
+const storedEmails = globalThis[GLOBAL_KEY] ??= [];
 /**
 * The email:deliver handler for the dev console provider.
 * Logs to console and stores in memory.
@@ -8671,8 +8708,10 @@ async function getCommentCountWithDb(db, collection, contentId) {
 * }
 * ```
 */
-async function getMenu(name) {
-	return getMenuWithDb(name, await getDb());
+function getMenu(name) {
+	return requestCached(`menu:${name}`, async () => {
+		return getMenuWithDb(name, await getDb());
+	});
 }
 /**
 * Get menu by name with resolved URLs (with explicit db)
@@ -8839,179 +8878,6 @@ async function resolveTaxonomyUrl(taxonomyId, db) {
 	return `/${taxonomy.name}/${taxonomy.slug}`;
 }
 
-//#endregion
-//#region src/taxonomies/index.ts
-/**
-* Runtime API for taxonomies
-*
-* Provides functions to query taxonomy definitions and terms.
-*/
-/**
-* Get all taxonomy definitions
-*/
-async function getTaxonomyDefs() {
-	return (await (await getDb()).selectFrom("_emdash_taxonomy_defs").selectAll().execute()).map((row) => ({
-		id: row.id,
-		name: row.name,
-		label: row.label,
-		labelSingular: row.label_singular ?? void 0,
-		hierarchical: row.hierarchical === 1,
-		collections: row.collections ? JSON.parse(row.collections) : []
-	}));
-}
-/**
-* Get a single taxonomy definition by name
-*/
-async function getTaxonomyDef(name) {
-	const row = await (await getDb()).selectFrom("_emdash_taxonomy_defs").selectAll().where("name", "=", name).executeTakeFirst();
-	if (!row) return null;
-	return {
-		id: row.id,
-		name: row.name,
-		label: row.label,
-		labelSingular: row.label_singular ?? void 0,
-		hierarchical: row.hierarchical === 1,
-		collections: row.collections ? JSON.parse(row.collections) : []
-	};
-}
-/**
-* Get all terms for a taxonomy (as tree for hierarchical, flat for tags)
-*/
-async function getTaxonomyTerms(taxonomyName) {
-	const db = await getDb();
-	const def = await getTaxonomyDef(taxonomyName);
-	if (!def) return [];
-	const rows = await db.selectFrom("taxonomies").selectAll().where("name", "=", taxonomyName).orderBy("label", "asc").execute();
-	const countsResult = await db.selectFrom("content_taxonomies").select(["taxonomy_id"]).select((eb) => eb.fn.count("entry_id").as("count")).groupBy("taxonomy_id").execute();
-	const counts = /* @__PURE__ */ new Map();
-	for (const row of countsResult) counts.set(row.taxonomy_id, row.count);
-	const flatTerms = rows.map((row) => ({
-		id: row.id,
-		name: row.name,
-		slug: row.slug,
-		label: row.label,
-		parent_id: row.parent_id,
-		data: row.data
-	}));
-	if (def.hierarchical) return buildTree(flatTerms, counts);
-	return flatTerms.map((term) => ({
-		id: term.id,
-		name: term.name,
-		slug: term.slug,
-		label: term.label,
-		children: [],
-		count: counts.get(term.id) ?? 0
-	}));
-}
-/**
-* Get a single term by taxonomy and slug
-*/
-async function getTerm(taxonomyName, slug) {
-	const db = await getDb();
-	const row = await db.selectFrom("taxonomies").selectAll().where("name", "=", taxonomyName).where("slug", "=", slug).executeTakeFirst();
-	if (!row) return null;
-	const count = (await db.selectFrom("content_taxonomies").select((eb) => eb.fn.count("entry_id").as("count")).where("taxonomy_id", "=", row.id).executeTakeFirst())?.count ?? 0;
-	const children = (await db.selectFrom("taxonomies").selectAll().where("parent_id", "=", row.id).orderBy("label", "asc").execute()).map((child) => ({
-		id: child.id,
-		name: child.name,
-		slug: child.slug,
-		label: child.label,
-		parentId: child.parent_id ?? void 0,
-		children: []
-	}));
-	return {
-		id: row.id,
-		name: row.name,
-		slug: row.slug,
-		label: row.label,
-		parentId: row.parent_id ?? void 0,
-		description: row.data ? JSON.parse(row.data).description : void 0,
-		children,
-		count
-	};
-}
-/**
-* Get terms assigned to an entry
-*/
-async function getEntryTerms(collection, entryId, taxonomyName) {
-	let query = (await getDb()).selectFrom("content_taxonomies").innerJoin("taxonomies", "taxonomies.id", "content_taxonomies.taxonomy_id").selectAll("taxonomies").where("content_taxonomies.collection", "=", collection).where("content_taxonomies.entry_id", "=", entryId);
-	if (taxonomyName) query = query.where("taxonomies.name", "=", taxonomyName);
-	return (await query.execute()).map((row) => ({
-		id: row.id,
-		name: row.name,
-		slug: row.slug,
-		label: row.label,
-		parentId: row.parent_id ?? void 0,
-		children: []
-	}));
-}
-/**
-* Get terms for multiple entries in a single query (batched API)
-*
-* This is more efficient than calling getEntryTerms for each entry
-* when you need terms for a list of entries.
-*
-* @param collection - The collection type (e.g., "posts")
-* @param entryIds - Array of entry IDs
-* @param taxonomyName - The taxonomy name (e.g., "categories")
-* @returns Map from entry ID to array of terms
-*/
-async function getTermsForEntries(collection, entryIds, taxonomyName) {
-	const result = /* @__PURE__ */ new Map();
-	for (const id of entryIds) result.set(id, []);
-	if (entryIds.length === 0) return result;
-	const rows = await (await getDb()).selectFrom("content_taxonomies").innerJoin("taxonomies", "taxonomies.id", "content_taxonomies.taxonomy_id").select([
-		"content_taxonomies.entry_id",
-		"taxonomies.id",
-		"taxonomies.name",
-		"taxonomies.slug",
-		"taxonomies.label",
-		"taxonomies.parent_id"
-	]).where("content_taxonomies.collection", "=", collection).where("content_taxonomies.entry_id", "in", entryIds).where("taxonomies.name", "=", taxonomyName).execute();
-	for (const row of rows) {
-		const entryId = row.entry_id;
-		const term = {
-			id: row.id,
-			name: row.name,
-			slug: row.slug,
-			label: row.label,
-			parentId: row.parent_id ?? void 0,
-			children: []
-		};
-		const terms = result.get(entryId);
-		if (terms) terms.push(term);
-	}
-	return result;
-}
-/**
-* Get entries by term (wraps getEmDashCollection)
-*/
-async function getEntriesByTerm(collection, taxonomyName, termSlug) {
-	const { getEmDashCollection } = await import("./query-B6Vu0d2i.mjs").then((n) => n.o);
-	const { entries } = await getEmDashCollection(collection, { where: { [taxonomyName]: termSlug } });
-	return entries;
-}
-/**
-* Build tree structure from flat terms
-*/
-function buildTree(flatTerms, counts) {
-	const map = /* @__PURE__ */ new Map();
-	const roots = [];
-	for (const term of flatTerms) map.set(term.id, {
-		id: term.id,
-		name: term.name,
-		slug: term.slug,
-		label: term.label,
-		parentId: term.parent_id ?? void 0,
-		description: term.data ? JSON.parse(term.data).description : void 0,
-		children: [],
-		count: counts.get(term.id) ?? 0
-	});
-	for (const term of map.values()) if (term.parentId && map.has(term.parentId)) map.get(term.parentId).children.push(term);
-	else roots.push(term);
-	return roots;
-}
-
 //#endregion
 //#region src/widgets/components.ts
 /**
@@ -9121,18 +8987,53 @@ function getWidgetComponents$1() {
 //#endregion
 //#region src/widgets/index.ts
 /**
-* Get a widget area by name, with all its widgets
+* Get a widget area by name, with all its widgets.
+*
+* Single query with a left join rather than area-then-widgets so the
+* common case costs one round-trip. An area with no widgets yields one
+* row with null widget columns, which we skip when mapping.
 */
 async function getWidgetArea(name) {
-	const db = await getDb();
-	const areaRow = await db.selectFrom("_emdash_widget_areas").selectAll().where("name", "=", name).executeTakeFirst();
-	if (!areaRow) return null;
-	const widgets = (await db.selectFrom("_emdash_widgets").selectAll().$castTo().where("area_id", "=", areaRow.id).orderBy("sort_order", "asc").execute()).map((row) => rowToWidget(row));
+	const rows = await (await getDb()).selectFrom("_emdash_widget_areas as a").leftJoin("_emdash_widgets as w", "w.area_id", "a.id").select([
+		"a.id as a_id",
+		"a.name as a_name",
+		"a.label as a_label",
+		"a.description as a_description",
+		"w.id as w_id",
+		"w.type as w_type",
+		"w.title as w_title",
+		"w.content as w_content",
+		"w.menu_name as w_menu_name",
+		"w.component_id as w_component_id",
+		"w.component_props as w_component_props",
+		"w.area_id as w_area_id",
+		"w.sort_order as w_sort_order",
+		"w.created_at as w_created_at"
+	]).where("a.name", "=", name).orderBy("w.sort_order", "asc").execute();
+	const first = rows[0];
+	if (!first) return null;
+	const widgets = [];
+	for (const row of rows) {
+		if (row.w_id === null) continue;
+		const widgetRow = {
+			id: row.w_id,
+			type: row.w_type,
+			title: row.w_title,
+			content: row.w_content,
+			menu_name: row.w_menu_name,
+			component_id: row.w_component_id,
+			component_props: row.w_component_props,
+			area_id: row.w_area_id,
+			sort_order: row.w_sort_order,
+			created_at: row.w_created_at
+		};
+		widgets.push(rowToWidget(widgetRow));
+	}
 	return {
-		id: areaRow.id,
-		name: areaRow.name,
-		label: areaRow.label,
-		description: areaRow.description ?? void 0,
+		id: first.a_id,
+		name: first.a_name,
+		label: first.a_label,
+		description: first.a_description ?? void 0,
 		widgets
 	};
 }
@@ -9334,8 +9235,8 @@ async function getSuggestions(db, query, options = {}) {
 		validateIdentifier(collection, "collection slug");
 		const ftsTable = ftsManager.getFtsTableName(collection);
 		const contentTable = ftsManager.getContentTableName(collection);
-		const prefixQuery = `${escapeQuery(query)}*`;
-		if (!prefixQuery || prefixQuery === "*") continue;
+		const prefixQuery = escapeQuery(query);
+		if (!prefixQuery) continue;
 		const results = await sql`
 			SELECT 
 				c.id,
@@ -9495,5 +9396,5 @@ function extractSearchableFields(entry, fields) {
 }
 
 //#endregion
-export { sanitizeHeadersForSandbox as $, getAllSources as A, handleContentGet as At, createNoopSandboxRunner as B, handleContentUnschedule as Bt, isPreviewRequest as C, handleContentCompare as Ct, parseWxrDate as D, handleContentDelete as Dt, wordpressRestSource as E, handleContentCreate as Et, registerSource as F, handleContentPublish as Ft, DEV_CONSOLE_EMAIL_PLUGIN_ID as G, image as Gt, createPluginManager as H, validateRev as Ht, importReusableBlocksAsSections as I, handleContentRestore as It, HookPipeline as J, devConsoleEmailDeliver as K, isStandardPluginDefinition as L, handleContentSchedule as Lt, getSource as M, handleContentList as Mt, getUrlSources as N, handleContentListTrashed as Nt, wxrSource as O, handleContentDiscardDraft as Ot, probeUrl as P, handleContentPermanentDelete as Pt, extractRequestMeta as Q, NoopSandboxRunner as R, handleContentTranslations as Rt, getPreviewToken as S, hashString as St, getPreviewUrl as T, handleContentCountTrashed as Tt, PluginRouteError as U, portableText as Ut, PluginManager as V, handleContentUpdate as Vt, PluginRouteRegistry as W, reference as Wt, resolveExclusiveHooks as X, createHookPipeline as Y, CronExecutor as Z, getTermsForEntries as _, handleRevisionGet as _t, search as a, isSafeHref as at, getCommentCount as b, generateManifest as bt, getWidgetArea as c, getSection as ct, getEntriesByTerm as d, getCollectionInfo as dt, definePlugin as et, getEntryTerms as f, handleMediaCreate as ft, getTerm as g, handleMediaUpdate as gt, getTaxonomyTerms as h, handleMediaList as ht, getSuggestions as i, prosemirrorToPortableText as it, getFileSources as j, handleContentGetIncludingTrashed as jt, clearSources as k, handleContentDuplicate as kt, getWidgetAreas as l, getSections as lt, getTaxonomyDefs as m, handleMediaGet as mt, extractSearchableFields as n, parseWxrString as nt, searchCollection as o, sanitizeHref as ot, getTaxonomyDef as p, handleMediaDelete as pt, EmailPipeline as q, getSearchStats as r, portableTextToProsemirror as rt, searchWithDb as s, loadBundleFromR2 as st, extractPlainText as t, parseWxr as tt, getWidgetComponents as u, PluginStateRepository as ut, getMenu as v, handleRevisionList as vt, buildPreviewUrl as w, handleContentCountScheduled as wt, getComments as x, computeContentHash as xt, getMenus as y, handleRevisionRestore as yt, SandboxNotAvailableError as z, handleContentUnpublish as zt };
-//# sourceMappingURL=search-B5p9D36n.mjs.map
+export { isSafeHref as $, isStandardPluginDefinition as A, handleContentRestore as At, EmailPipeline as B, getAllSources as C, handleContentDuplicate as Ct, probeUrl as D, handleContentListTrashed as Dt, getUrlSources as E, handleContentList as Et, createPluginManager as F, handleContentUpdate as Ft, extractRequestMeta as G, createHookPipeline as H, PluginRouteError as I, validateRev as It, parseWxr as J, sanitizeHeadersForSandbox as K, PluginRouteRegistry as L, portableText as Lt, SandboxNotAvailableError as M, handleContentTranslations as Mt, createNoopSandboxRunner as N, handleContentUnpublish as Nt, registerSource as O, handleContentPermanentDelete as Ot, PluginManager as P, handleContentUnschedule as Pt, prosemirrorToPortableText as Q, DEV_CONSOLE_EMAIL_PLUGIN_ID as R, reference as Rt, clearSources as S, handleContentDiscardDraft as St, getSource as T, handleContentGetIncludingTrashed as Tt, resolveExclusiveHooks as U, HookPipeline as V, CronExecutor as W, after as X, parseWxrString as Y, portableTextToProsemirror as Z, buildPreviewUrl as _, handleContentCompare as _t, search as a, getCollectionInfo as at, parseWxrDate as b, handleContentCreate as bt, getWidgetArea as c, handleMediaGet as ct, getMenu as d, handleRevisionGet as dt, sanitizeHref as et, getMenus as f, handleRevisionList as ft, isPreviewRequest as g, hashString as gt, getPreviewToken as h, computeContentHash as ht, getSuggestions as i, PluginStateRepository as it, NoopSandboxRunner as j, handleContentSchedule as jt, importReusableBlocksAsSections as k, handleContentPublish as kt, getWidgetAreas as l, handleMediaList as lt, getComments as m, generateManifest as mt, extractSearchableFields as n, getSection as nt, searchCollection as o, handleMediaCreate as ot, getCommentCount as p, handleRevisionRestore as pt, definePlugin as q, getSearchStats as r, getSections as rt, searchWithDb as s, handleMediaDelete as st, extractPlainText as t, loadBundleFromR2 as tt, getWidgetComponents as u, handleMediaUpdate as ut, getPreviewUrl as v, handleContentCountScheduled as vt, getFileSources as w, handleContentGet as wt, wxrSource as x, handleContentDelete as xt, wordpressRestSource as y, handleContentCountTrashed as yt, devConsoleEmailDeliver as z, image as zt };
+//# sourceMappingURL=search-DI4bM2w9.mjs.map