emdash 0.20.0 → 0.22.0

package/src/database/repositories/comment-reaction.ts

@@ -0,0 +1,132 @@
+import type { Kysely } from "kysely";
+import { ulid } from "ulidx";
+
+import { SQL_BATCH_SIZE, chunks } from "../../utils/chunks.js";
+import type { Database } from "../types.js";
+
+/** Per-comment reaction counts: `{ like: 12, love: 3 }`. */
+export type ReactionCounts = Record<string, number>;
+
+export interface ToggleReactionInput {
+	commentId: string;
+	reaction: string;
+	voterHash: string;
+}
+
+/**
+ * Repository for comment reactions (likes / emoji).
+ *
+ * Reactions are deduped per (comment, voter, reaction) by a unique index, so
+ * a second toggle of the same reaction by the same voter removes it.
+ */
+export class CommentReactionRepository {
+	constructor(private db: Kysely<Database>) {}
+
+	/**
+	 * Toggle a reaction for a voter on a comment.
+	 *
+	 * @returns `{ reacted: true }` if the reaction was added, `{ reacted: false }`
+	 *   if an existing reaction was removed.
+	 */
+	async toggle(input: ToggleReactionInput): Promise<{ reacted: boolean }> {
+		// Idempotent add: insert, or no-op if this voter already has this
+		// reaction. Using ON CONFLICT (rather than read-then-write) avoids a
+		// TOCTOU race where two concurrent toggles both see "no row" and the
+		// second INSERT violates the unique index — the old path surfaced that
+		// as a 500. The unique index doubles as the conflict target.
+		const inserted = await this.db
+			.insertInto("_emdash_comment_reactions")
+			.values({
+				id: ulid(),
+				comment_id: input.commentId,
+				reaction: input.reaction,
+				voter_hash: input.voterHash,
+				created_at: new Date().toISOString(),
+			})
+			.onConflict((oc) => oc.columns(["comment_id", "voter_hash", "reaction"]).doNothing())
+			.executeTakeFirst();
+
+		if ((inserted.numInsertedOrUpdatedRows ?? 0n) > 0n) {
+			return { reacted: true };
+		}
+
+		// The reaction already existed → toggle it off.
+		await this.db
+			.deleteFrom("_emdash_comment_reactions")
+			.where("comment_id", "=", input.commentId)
+			.where("voter_hash", "=", input.voterHash)
+			.where("reaction", "=", input.reaction)
+			.execute();
+		return { reacted: false };
+	}
+
+	/**
+	 * Aggregate reaction counts for a set of comments.
+	 *
+	 * @returns a Map keyed by comment id; comments with no reactions are absent.
+	 */
+	async countsForComments(commentIds: string[]): Promise<Map<string, ReactionCounts>> {
+		const result = new Map<string, ReactionCounts>();
+		if (commentIds.length === 0) return result;
+
+		for (const batch of chunks(commentIds, SQL_BATCH_SIZE)) {
+			const rows = await this.db
+				.selectFrom("_emdash_comment_reactions")
+				.select(["comment_id", "reaction"])
+				.select((eb) => eb.fn.count<number>("id").as("count"))
+				.where("comment_id", "in", batch)
+				.groupBy(["comment_id", "reaction"])
+				.execute();
+
+			for (const row of rows) {
+				const counts = result.get(row.comment_id) ?? {};
+				counts[row.reaction] = Number(row.count);
+				result.set(row.comment_id, counts);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Which reactions a given voter has set, per comment.
+	 *
+	 * @returns a Map keyed by comment id whose values are the reaction names the
+	 *   voter has active on that comment.
+	 */
+	async viewerReactions(commentIds: string[], voterHash: string): Promise<Map<string, string[]>> {
+		const result = new Map<string, string[]>();
+		if (commentIds.length === 0) return result;
+
+		for (const batch of chunks(commentIds, SQL_BATCH_SIZE)) {
+			const rows = await this.db
+				.selectFrom("_emdash_comment_reactions")
+				.select(["comment_id", "reaction"])
+				.where("comment_id", "in", batch)
+				.where("voter_hash", "=", voterHash)
+				.execute();
+
+			for (const row of rows) {
+				const list = result.get(row.comment_id) ?? [];
+				list.push(row.reaction);
+				result.set(row.comment_id, list);
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Count a voter's reactions within a recent time window (for rate limiting).
+	 */
+	async countRecentByVoter(voterHash: string, windowMinutes = 10): Promise<number> {
+		const cutoff = new Date(Date.now() - windowMinutes * 60 * 1000).toISOString();
+		const result = await this.db
+			.selectFrom("_emdash_comment_reactions")
+			.select((eb) => eb.fn.count<number>("id").as("count"))
+			.where("voter_hash", "=", voterHash)
+			.where("created_at", ">", cutoff)
+			.executeTakeFirst();
+		return Number(result?.count ?? 0);
+	}
+}

package/src/database/repositories/comment.ts

@@ -1,6 +1,7 @@
 import { sql, type ExpressionBuilder, type Kysely } from "kysely";
 import { ulid } from "ulidx";
 
+import { invalidateCommentObjectCache } from "../../object-cache/index.js";
 import type { Database } from "../types.js";
 import { encodeCursor, decodeCursor, type FindManyResult } from "./types.js";
 
@@ -39,6 +40,8 @@ export interface PublicComment {
 	body: string;
 	createdAt: string;
 	replies?: PublicComment[];
+	/** Aggregate reaction counts (`{ like: 12 }`), attached when requested. */
+	reactions?: Record<string, number>;
 }
 
 export interface CreateCommentInput {
@@ -99,6 +102,8 @@ export class CommentRepository {
 			})
 			.execute();
 
+		invalidateCommentObjectCache();
+
 		const comment = await this.findById(id);
 		if (!comment) {
 			throw new Error("Failed to create comment");
@@ -237,6 +242,7 @@ export class CommentRepository {
 			.where("id", "=", id)
 			.execute();
 
+		invalidateCommentObjectCache();
 		return this.findById(id);
 	}
 
@@ -254,6 +260,7 @@ export class CommentRepository {
 			.where("id", "in", ids)
 			.executeTakeFirst();
 
+		invalidateCommentObjectCache();
 		return Number(result.numUpdatedRows ?? 0);
 	}
 
@@ -266,6 +273,7 @@ export class CommentRepository {
 			.where("id", "=", id)
 			.executeTakeFirst();
 
+		invalidateCommentObjectCache();
 		return (result.numDeletedRows ?? 0) > 0;
 	}
 
@@ -280,6 +288,7 @@ export class CommentRepository {
 			.where("id", "in", ids)
 			.executeTakeFirst();
 
+		invalidateCommentObjectCache();
 		return Number(result.numDeletedRows ?? 0);
 	}
 
@@ -293,6 +302,7 @@ export class CommentRepository {
 			.where("content_id", "=", contentId)
 			.executeTakeFirst();
 
+		invalidateCommentObjectCache();
 		return Number(result.numDeletedRows ?? 0);
 	}
 

package/src/database/repositories/content.ts

@@ -1,6 +1,7 @@
 import { sql, type Kysely } from "kysely";
 import { ulid } from "ulidx";
 
+import { invalidateCollectionCache } from "../../object-cache/index.js";
 import { slugify } from "../../utils/slugify.js";
 import type { Database } from "../types.js";
 import { validateIdentifier } from "../validate.js";
@@ -207,6 +208,8 @@ export class ContentRepository {
 			VALUES (${sql.join(valuePlaceholders, sql`, `)})
 		`.execute(this.db);
 
+		invalidateCollectionCache(type);
+
 		// Fetch and return the created item
 		const item = await this.findById(type, id);
 		if (!item) {
@@ -621,6 +624,8 @@ export class ContentRepository {
 			.where("deleted_at" as never, "is", null)
 			.execute();
 
+		invalidateCollectionCache(type);
+
 		const updated = await this.findById(type, id);
 		if (!updated) {
 			throw new Error("Content not found");
@@ -643,7 +648,9 @@ export class ContentRepository {
 			AND deleted_at IS NULL
 		`.execute(this.db);
 
-		return (result.numAffectedRows ?? 0n) > 0n;
+		const changed = (result.numAffectedRows ?? 0n) > 0n;
+		if (changed) invalidateCollectionCache(type);
+		return changed;
 	}
 
 	/**
@@ -659,7 +666,9 @@ export class ContentRepository {
 			AND deleted_at IS NOT NULL
 		`.execute(this.db);
 
-		return (result.numAffectedRows ?? 0n) > 0n;
+		const changed = (result.numAffectedRows ?? 0n) > 0n;
+		if (changed) invalidateCollectionCache(type);
+		return changed;
 	}
 
 	/**
@@ -684,7 +693,9 @@ export class ContentRepository {
 			AND deleted_at IS NOT NULL
 		`.execute(this.db);
 
-		return (result.numAffectedRows ?? 0n) > 0n;
+		const changed = (result.numAffectedRows ?? 0n) > 0n;
+		if (changed) invalidateCollectionCache(type);
+		return changed;
 	}
 
 	/**
@@ -940,6 +951,8 @@ export class ContentRepository {
 			AND deleted_at IS NULL
 		`.execute(this.db);
 
+		invalidateCollectionCache(type);
+
 		const updated = await this.findById(type, id);
 		if (!updated) {
 			throw new Error("Content not found");
@@ -977,6 +990,8 @@ export class ContentRepository {
 			AND deleted_at IS NULL
 		`.execute(this.db);
 
+		invalidateCollectionCache(type);
+
 		const updated = await this.findById(type, id);
 		if (!updated) {
 			throw new Error("Content not found");
@@ -1175,6 +1190,7 @@ export class ContentRepository {
 				throw new Error("Content not found");
 			}
 
+			invalidateCollectionCache(type);
 			return updated;
 		} catch (error) {
 			// Best-effort schedule restore for the no-transaction (D1) case so a
@@ -1257,6 +1273,8 @@ export class ContentRepository {
 			AND deleted_at IS NULL
 		`.execute(this.db);
 
+		invalidateCollectionCache(type);
+
 		const updated = await this.findById(type, id);
 		if (!updated) {
 			throw new Error("Content not found");
@@ -1302,6 +1320,8 @@ export class ContentRepository {
 			WHERE id = ${id}
 			AND deleted_at IS NULL
 		`.execute(this.db);
+
+		invalidateCollectionCache(type);
 	}
 
 	/**
@@ -1332,6 +1352,8 @@ export class ContentRepository {
 			AND deleted_at IS NULL
 		`.execute(this.db);
 
+		invalidateCollectionCache(type);
+
 		const updated = await this.findById(type, id);
 		if (!updated) {
 			throw new Error("Content not found");

package/src/database/repositories/menu.ts

@@ -16,6 +16,7 @@
 import type { Kysely, Selectable } from "kysely";
 import { ulid } from "ulidx";
 
+import { invalidateMenuObjectCache } from "../../object-cache/index.js";
 import { withTransaction } from "../transaction.js";
 import type { Database, MenuItemTable, MenuTable } from "../types.js";
 
@@ -369,6 +370,8 @@ export class MenuRepository {
 			}
 		});
 
+		invalidateMenuObjectCache();
+
 		const created = await this.findById(id);
 		if (!created) throw new Error("Failed to create menu");
 		return created;
@@ -383,6 +386,7 @@ export class MenuRepository {
 
 		if (Object.keys(values).length > 0) {
 			await this.db.updateTable("_emdash_menus").set(values).where("id", "=", id).execute();
+			invalidateMenuObjectCache();
 		}
 
 		return (await this.findById(id))!;
@@ -404,6 +408,7 @@ export class MenuRepository {
 			await trx.deleteFrom("_emdash_menu_items").where("menu_id", "=", id).execute();
 			await trx.deleteFrom("_emdash_menus").where("id", "=", id).execute();
 		});
+		invalidateMenuObjectCache();
 		return true;
 	}
 
@@ -488,6 +493,8 @@ export class MenuRepository {
 			})
 			.execute();
 
+		invalidateMenuObjectCache();
+
 		const row = await this.db
 			.selectFrom("_emdash_menu_items")
 			.selectAll()
@@ -529,6 +536,7 @@ export class MenuRepository {
 				.set(values)
 				.where("id", "=", itemId)
 				.execute();
+			invalidateMenuObjectCache();
 		}
 
 		const row = await this.db
@@ -546,7 +554,9 @@ export class MenuRepository {
 			.where("id", "=", itemId)
 			.where("menu_id", "=", menuId)
 			.execute();
-		return result[0]?.numDeletedRows !== 0n;
+		const deleted = result[0]?.numDeletedRows !== 0n;
+		if (deleted) invalidateMenuObjectCache();
+		return deleted;
 	}
 
 	/**
@@ -614,6 +624,7 @@ export class MenuRepository {
 				.execute();
 		});
 
+		invalidateMenuObjectCache();
 		return { itemCount: items.length };
 	}
 
@@ -622,6 +633,7 @@ export class MenuRepository {
 	 * malicious payload cannot move foreign items into this menu's siblings.
 	 */
 	async reorderItems(menuId: string, items: ReorderItem[]): Promise<MenuItem[]> {
+		invalidateMenuObjectCache();
 		return withTransaction(this.db, async (trx) => {
 			for (const item of items) {
 				await trx

package/src/database/repositories/seo.ts

@@ -1,5 +1,6 @@
 import { sql, type Kysely } from "kysely";
 
+import { invalidateCollectionCache } from "../../object-cache/index.js";
 import { chunks, SQL_BATCH_SIZE } from "../../utils/chunks.js";
 import type { Database } from "../types.js";
 import type { ContentSeo, ContentSeoInput } from "./types.js";
@@ -153,6 +154,7 @@ export class SeoRepository {
 				updated_at = ${now}
 		`.execute(this.db);
 
+		invalidateCollectionCache(collection);
 		return this.get(collection, contentId);
 	}
 
@@ -165,6 +167,7 @@ export class SeoRepository {
 			.where("collection", "=", collection)
 			.where("content_id", "=", contentId)
 			.execute();
+		invalidateCollectionCache(collection);
 	}
 
 	/**

package/src/database/repositories/taxonomy.ts

@@ -1,6 +1,7 @@
 import type { Kysely, Selectable } from "kysely";
 import { ulid } from "ulidx";
 
+import { invalidateTaxonomyObjectCache } from "../../object-cache/index.js";
 import type { Database, TaxonomyTable, ContentTaxonomyTable } from "../types.js";
 
 export interface Taxonomy {
@@ -88,6 +89,8 @@ export class TaxonomyRepository {
 			})
 			.execute();
 
+		invalidateTaxonomyObjectCache();
+
 		const taxonomy = await this.findById(id);
 		if (!taxonomy) throw new Error("Failed to create taxonomy");
 		return taxonomy;
@@ -187,6 +190,7 @@ export class TaxonomyRepository {
 
 		if (Object.keys(updates).length > 0) {
 			await this.db.updateTable("taxonomies").set(updates).where("id", "=", id).execute();
+			invalidateTaxonomyObjectCache();
 		}
 
 		return this.findById(id);
@@ -214,6 +218,7 @@ export class TaxonomyRepository {
 		}
 
 		const result = await this.db.deleteFrom("taxonomies").where("id", "=", id).executeTakeFirst();
+		invalidateTaxonomyObjectCache();
 		return (result.numDeletedRows ?? 0n) > 0n;
 	}
 
@@ -233,6 +238,7 @@ export class TaxonomyRepository {
 			.values(row)
 			.onConflict((oc) => oc.doNothing())
 			.execute();
+		invalidateTaxonomyObjectCache();
 	}
 
 	async detachFromEntry(collection: string, entryId: string, taxonomyId: string): Promise<void> {
@@ -245,6 +251,7 @@ export class TaxonomyRepository {
 			.where("entry_id", "=", entryId)
 			.where("taxonomy_id", "=", group)
 			.execute();
+		invalidateTaxonomyObjectCache();
 	}
 
 	/**
@@ -324,6 +331,8 @@ export class TaxonomyRepository {
 				.onConflict((oc) => oc.doNothing())
 				.execute();
 		}
+
+		if (toRemove.length > 0 || toAdd.length > 0) invalidateTaxonomyObjectCache();
 	}
 
 	async clearEntryTerms(collection: string, entryId: string): Promise<number> {
@@ -332,7 +341,9 @@ export class TaxonomyRepository {
 			.where("collection", "=", collection)
 			.where("entry_id", "=", entryId)
 			.executeTakeFirst();
-		return Number(result.numDeletedRows ?? 0);
+		const removed = Number(result.numDeletedRows ?? 0);
+		if (removed > 0) invalidateTaxonomyObjectCache();
+		return removed;
 	}
 
 	/**
@@ -364,6 +375,7 @@ export class TaxonomyRepository {
 			)
 			.onConflict((oc) => oc.doNothing())
 			.execute();
+		invalidateTaxonomyObjectCache();
 	}
 
 	/**

package/src/database/types.ts

@@ -382,6 +382,14 @@ export interface CommentTable {
 	updated_at: Generated<string>;
 }
 
+export interface CommentReactionTable {
+	id: string;
+	comment_id: string;
+	reaction: string;
+	voter_hash: string;
+	created_at: Generated<string>;
+}
+
 // Sections
 
 export interface SectionTable {
@@ -433,6 +441,7 @@ export interface Database {
 	_emdash_seo: SeoTable;
 	_emdash_cron_tasks: CronTaskTable;
 	_emdash_comments: CommentTable;
+	_emdash_comment_reactions: CommentReactionTable;
 	_emdash_redirects: RedirectTable;
 	_emdash_404_log: NotFoundLogTable;
 	_emdash_bylines: BylineTable;

package/src/emdash-runtime.ts

@@ -41,11 +41,13 @@ import type {
 	PublicPageContext,
 	PageMetadataContribution,
 	PageFragmentContribution,
+	PortableTextBlockConfig,
+	FieldWidgetConfig,
 } from "./plugins/types.js";
 import type { FieldType } from "./schema/types.js";
 import { hashString } from "./utils/hash.js";
 import { createInitLock, type InitLock, initWithLock } from "./utils/init-lock.js";
-import { createIsolateCache, isolateCachedAsync } from "./utils/isolate-cache.js";
+import { createSingleFlightCache, singleFlightCached } from "./utils/single-flight-cache.js";
 import { COMMIT, VERSION } from "./version.js";
 
 const LEADING_SLASH_PATTERN = /^\//;
@@ -212,6 +214,10 @@ export interface SandboxedPluginEntry {
 	adminPages?: Array<{ path: string; label?: string; icon?: string }>;
 	/** Dashboard widgets */
 	adminWidgets?: Array<{ id: string; title?: string; size?: string }>;
+	/** Portable Text block types contributed to the editor (declarative Block Kit) */
+	portableTextBlocks?: PortableTextBlockConfig[];
+	/** Field widget types contributed for schema-field editing UIs */
+	fieldWidgets?: FieldWidgetConfig[];
 	/** Admin entry module */
 	adminEntry?: string;
 	/**
@@ -384,7 +390,10 @@ const marketplaceManifestCache = new Map<
 	{
 		id: string;
 		version: string;
-		admin?: { pages?: PluginAdminPage[]; widgets?: PluginDashboardWidget[] };
+		admin?: {
+			pages?: PluginAdminPage[];
+			widgets?: PluginDashboardWidget[];
+		};
 	}
 >();
 /** Route metadata for sandboxed plugins: pluginId -> routeName -> RouteMeta */
@@ -420,10 +429,10 @@ export class EmDashRuntime {
 	/**
 	 * Isolate-lifetime guard so FTS indexes are verified at most once per
 	 * worker rather than on every admin request. See ensureSearchHealthy().
-	 * Uses the poison-immune isolate cache (never a shared awaitable promise)
-	 * so a cancelled first caller can't wedge later ones.
+	 * Uses the poison-immune single-flight cache (never a shared awaitable
+	 * promise) so a cancelled first caller can't wedge later ones.
 	 */
-	private readonly _searchHealthCache = createIsolateCache<void>();
+	private readonly _searchHealthCache = createSingleFlightCache<void>();
 
 	/** Current hook pipeline. Use the `hooks` getter for external access. */
 	get hooks(): HookPipeline {
@@ -1570,6 +1579,8 @@ export class EmDashRuntime {
 					storage: entry.storage as never,
 					adminPages,
 					adminWidgets,
+					portableTextBlocks: entry.portableTextBlocks,
+					fieldWidgets: entry.fieldWidgets,
 				});
 				plugins.push(resolved);
 				console.log(
@@ -2096,9 +2107,6 @@ export class EmDashRuntime {
 		}
 
 		// Add sandboxed plugins (use entries for admin config)
-		// TODO: sandboxed plugins need fieldWidgets extracted from their manifest
-		// to support Block Kit field widgets. Currently only trusted plugins carry
-		// fieldWidgets through the admin.fieldWidgets path.
 		for (const entry of this.sandboxedPluginEntries) {
 			const status = this.pluginStates.get(entry.id);
 			const enabled = status === undefined || status === "active";
@@ -2110,9 +2118,15 @@ export class EmDashRuntime {
 				version: entry.version,
 				enabled,
 				sandboxed: true,
+				// `adminMode` reflects only admin pages/widgets. A plugin can
+				// contribute portableTextBlocks/fieldWidgets with adminMode "none" —
+				// the admin reads those from the manifest regardless, so don't gate
+				// admin contributions on `adminMode`.
 				adminMode: hasAdminPages || hasWidgets ? "blocks" : "none",
 				adminPages: entry.adminPages ?? [],
 				dashboardWidgets: entry.adminWidgets ?? [],
+				portableTextBlocks: entry.portableTextBlocks,
+				fieldWidgets: entry.fieldWidgets,
 			};
 		}
 
@@ -2233,7 +2247,7 @@ export class EmDashRuntime {
 		// branch, no need to cache it.
 		if (!isSqlite(this._db)) return;
 		try {
-			await isolateCachedAsync(
+			await singleFlightCached(
 				this._searchHealthCache,
 				async () => {
 					try {

package/src/index.ts

@@ -192,6 +192,28 @@ export type {
 } from "./storage/types.js";
 export { EmDashStorageError } from "./storage/types.js";
 
+// Object cache (distributed read-through query cache)
+export {
+	cachedQuery,
+	invalidateObjectCache,
+	invalidateCollectionCache,
+	invalidateTaxonomyObjectCache,
+	invalidateBylineObjectCache,
+	invalidateMenuObjectCache,
+	invalidateSchemaObjectCache,
+	invalidateCommentObjectCache,
+	contentNamespace,
+	contentNamespaces,
+	CacheNamespace,
+} from "./object-cache/index.js";
+export type { CachedQueryOptions } from "./object-cache/index.js";
+export type {
+	ObjectCacheBackend,
+	ObjectCacheDescriptor,
+	ObjectCacheRuntimeConfig,
+	CreateObjectCacheBackendFn,
+} from "./object-cache/types.js";
+
 // Plugin system
 export {
 	definePlugin,