emdash 0.36.0 → 0.38.0

package/src/schema/registry.ts

@@ -9,6 +9,7 @@ import type {
 import { sql } from "kysely";
 import { ulid } from "ulidx";
 
+import { refreshDevTypes } from "../astro/dev-typegen.js";
 import { currentTimestamp, listTablesLike, tableExists } from "../database/dialect-helpers.js";
 import { withTransaction } from "../database/transaction.js";
 import type { CollectionTable, Database, FieldTable } from "../database/types.js";
@@ -31,6 +32,7 @@ import {
 } from "../media/usage/content-refresh.js";
 import { FTSManager } from "../search/fts-manager.js";
 import { chunks, SQL_BATCH_SIZE } from "../utils/chunks.js";
+import { resetRegisteredCollectionsCache } from "./collection-slugs-cache.js";
 import {
 	type Collection,
 	type CollectionAdminConfig,
@@ -195,7 +197,9 @@ export async function buildSeedCollectionCaptureFingerprint(
 				hasSeo,
 				hidden: input.hidden ?? false,
 				sortOrder: input.sortOrder ?? null,
+				...(input.group ? { group: input.group } : {}),
 				commentsEnabled: input.commentsEnabled ?? false,
+				...(input.editLocking === false ? { editLocking: false } : {}),
 				urlPattern: input.urlPattern ?? null,
 				routable: input.routable ?? true,
 			},
@@ -244,6 +248,13 @@ export class SchemaError extends Error {
 export class SchemaRegistry {
 	constructor(private db: Kysely<Database>) {}
 
+	/**
+	 * Notify the dev typegen hook that the schema has changed.
+	 */
+	private notifyTypegen(): void {
+		refreshDevTypes(this.db);
+	}
+
 	// ============================================
 	// Collection Operations
 	// ============================================
@@ -461,7 +472,9 @@ export class SchemaRegistry {
 				routable: input.routable === false ? 0 : 1,
 				hidden: input.hidden ? 1 : 0,
 				sort_order: input.sortOrder ?? null,
+				nav_group: input.group?.trim() || null,
 				comments_enabled: input.commentsEnabled ? 1 : 0,
+				edit_locking: input.editLocking === false ? 0 : 1,
 				url_pattern: input.urlPattern ?? null,
 			};
 
@@ -496,6 +509,8 @@ export class SchemaRegistry {
 			throw new SchemaError("Failed to create collection", "CREATE_FAILED");
 		}
 
+		resetRegisteredCollectionsCache();
+		this.notifyTypegen();
 		return collection;
 	}
 
@@ -604,7 +619,9 @@ export class SchemaRegistry {
 					routable: input.routable === false ? 0 : 1,
 					hidden: input.hidden ? 1 : 0,
 					sort_order: input.sortOrder ?? null,
+					nav_group: input.group?.trim() || null,
 					comments_enabled: input.commentsEnabled ? 1 : 0,
+					edit_locking: input.editLocking === false ? 0 : 1,
 					url_pattern: input.urlPattern ?? null,
 				};
 				const rows = fieldRows.map((row) => ({
@@ -670,7 +687,10 @@ export class SchemaRegistry {
 				);
 			}
 			throw error;
+		} finally {
+			if (schemaMutated) resetRegisteredCollectionsCache();
 		}
+		this.notifyTypegen();
 	}
 
 	private async assertSeedFieldDefinitions(
@@ -719,7 +739,7 @@ export class SchemaRegistry {
 	 * Update a collection
 	 */
 	async updateCollection(slug: string, input: UpdateCollectionInput): Promise<Collection> {
-		return withTransaction(this.db, async (trx) => {
+		const updated = await withTransaction(this.db, async (trx) => {
 			const existingRow = await trx
 				.selectFrom("_emdash_collections")
 				.where("slug", "=", slug)
@@ -755,6 +775,7 @@ export class SchemaRegistry {
 			}
 			if (input.hidden !== undefined) updates.hidden = input.hidden ? 1 : 0;
 			if (input.sortOrder !== undefined) updates.sort_order = input.sortOrder;
+			if (input.group !== undefined) updates.nav_group = input.group?.trim() || null;
 			if (input.titleField !== undefined) updates.title_field = input.titleField || null;
 			if (input.dateField !== undefined) updates.date_field = input.dateField || null;
 			if (input.commentsEnabled !== undefined) {
@@ -769,6 +790,7 @@ export class SchemaRegistry {
 			if (input.commentsAutoApproveUsers !== undefined) {
 				updates.comments_auto_approve_users = input.commentsAutoApproveUsers ? 1 : 0;
 			}
+			if (input.editLocking !== undefined) updates.edit_locking = input.editLocking ? 1 : 0;
 
 			updates.updated_at = new Date().toISOString();
 			await trx
@@ -798,6 +820,8 @@ export class SchemaRegistry {
 
 			return this.mapCollectionRow(row);
 		});
+		this.notifyTypegen();
+		return updated;
 	}
 
 	/**
@@ -851,7 +875,13 @@ export class SchemaRegistry {
 				await deleteContentMediaUsageCollection(this.db, slug);
 			}
 			throw error;
+		} finally {
+			// Even a failed delete may have dropped the ec_* table (D1 has no
+			// real transactions) — over-invalidation is harmless, a stale set
+			// is not.
+			if (contentTableDropped) resetRegisteredCollectionsCache();
 		}
+		this.notifyTypegen();
 	}
 
 	// ============================================
@@ -1005,6 +1035,7 @@ export class SchemaRegistry {
 					"CONTENT_USAGE_STALE",
 				);
 			}
+			this.notifyTypegen();
 			return created;
 		} catch (error) {
 			if (schemaMutated) {
@@ -1185,6 +1216,7 @@ export class SchemaRegistry {
 					);
 				}
 			}
+			this.notifyTypegen();
 			return updatedField;
 		} catch (error) {
 			if (schemaMutated) {
@@ -1326,6 +1358,7 @@ export class SchemaRegistry {
 			}
 			throw error;
 		}
+		this.notifyTypegen();
 	}
 
 	/**
@@ -1380,6 +1413,7 @@ export class SchemaRegistry {
 					.execute();
 			}
 		});
+		this.notifyTypegen();
 	}
 
 	/**
@@ -1400,6 +1434,7 @@ export class SchemaRegistry {
 				.where("slug", "=", fieldSlugs[i])
 				.execute();
 		}
+		this.notifyTypegen();
 	}
 
 	// ============================================
@@ -1463,9 +1498,13 @@ export class SchemaRegistry {
 			ON ${sql.ref(tableName)} (slug)
 		`.execute(conn);
 
+		// Name must stay identical to migration 074. `deleted_at` leads so the
+		// scheduled-publishing sweep can seek it and walk `scheduled_at` for both
+		// its range and its ORDER BY; a `scheduled_at`-only index leaves a
+		// stats-blind planner reading every live row.
 		await sql`
-			${createIndex} ${sql.ref(`idx_${tableName}_scheduled`)}
-			ON ${sql.ref(tableName)} (scheduled_at)
+			${createIndex} ${sql.ref(`idx_${tableName}_del_sched`)}
+			ON ${sql.ref(tableName)} (deleted_at, scheduled_at)
 			WHERE scheduled_at IS NOT NULL
 		`.execute(conn);
 
@@ -1806,6 +1845,7 @@ export class SchemaRegistry {
 			routable: row.routable !== 0,
 			hidden: row.hidden === 1,
 			sortOrder: row.sort_order ?? undefined,
+			group: row.nav_group ?? undefined,
 			commentsEnabled: row.comments_enabled === 1,
 			commentsModeration:
 				moderation === "all" || moderation === "first_time" || moderation === "none"
@@ -1813,6 +1853,7 @@ export class SchemaRegistry {
 					: "first_time",
 			commentsClosedAfterDays: row.comments_closed_after_days ?? 90,
 			commentsAutoApproveUsers: row.comments_auto_approve_users === 1,
+			editLocking: row.edit_locking !== 0,
 			createdAt: row.created_at,
 			updatedAt: row.updated_at,
 		};
@@ -1992,6 +2033,7 @@ export class SchemaRegistry {
 				throw new SchemaError("Failed to register orphaned table", "REGISTER_FAILED");
 			}
 			await markContentMediaUsageCollectionStaleSafely(this.db, slug, "CONTENT_USAGE_STALE");
+			this.notifyTypegen();
 
 			return collection;
 		} catch (error) {

package/src/schema/types.ts

@@ -175,6 +175,9 @@ export interface FieldWidgetOptions {
 
 export const MAX_COLLECTION_LIST_COLUMNS = 4;
 
+/** Longest admin sidebar folder label a collection may declare. */
+export const MAX_COLLECTION_GROUP_LENGTH = 100;
+
 /** Collection-level admin presentation options. */
 export interface CollectionAdminConfig {
 	/** Custom field slugs to show in the content list. */
@@ -205,10 +208,10 @@ export interface Collection {
 	/** Whether published entries require a public slug. Defaults to true. */
 	routable?: boolean;
 	/**
-	 * Omit this collection's auto-generated entry from the admin sidebar.
-	 * The collection stays fully functional everywhere else (API, MCP, hooks,
-	 * direct `/content/:collection` URLs) — this only hides the nav link, so a
-	 * plugin that owns the collection can point editors at its own admin UI.
+	 * Omit this collection's auto-generated sidebar entry and dashboard quick
+	 * action. The collection stays fully functional everywhere else (API, MCP,
+	 * hooks, direct `/content/:collection` URLs), so a plugin that owns the
+	 * collection can point editors at its own admin UI.
 	 */
 	hidden: boolean;
 	/**
@@ -217,6 +220,12 @@ export interface Collection {
 	 * order and follow. `undefined` means "no explicit position".
 	 */
 	sortOrder?: number;
+	/**
+	 * Admin sidebar folder. Collections sharing a group render under one
+	 * collapsible entry labelled with the group; `undefined` keeps the
+	 * collection inline.
+	 */
+	group?: string;
 	/** Whether comments are enabled for this collection */
 	commentsEnabled: boolean;
 	/** Moderation strategy: "all" | "first_time" | "none" */
@@ -225,6 +234,8 @@ export interface Collection {
 	commentsClosedAfterDays: number;
 	/** Auto-approve comments from authenticated CMS users */
 	commentsAutoApproveUsers: boolean;
+	/** Whether opening an entry takes an edit lock. Defaults to true. */
+	editLocking: boolean;
 	createdAt: string;
 	updatedAt: string;
 }
@@ -269,11 +280,15 @@ export interface CreateCollectionInput {
 	urlPattern?: string;
 	routable?: boolean;
 	hasSeo?: boolean;
-	/** Omit the auto-generated admin sidebar entry (defaults to false) */
+	/** Omit the auto-generated sidebar entry and dashboard quick action (defaults to false) */
 	hidden?: boolean;
 	/** Explicit admin sidebar position (omit for the alphabetical fallback) */
 	sortOrder?: number | null;
+	/** Admin sidebar folder shared with other collections of the same group */
+	group?: string | null;
 	commentsEnabled?: boolean;
+	/** Take an edit lock when an entry is opened (defaults to true) */
+	editLocking?: boolean;
 }
 
 /**
@@ -289,14 +304,18 @@ export interface UpdateCollectionInput {
 	urlPattern?: string | null;
 	routable?: boolean;
 	hasSeo?: boolean;
-	/** Omit the auto-generated admin sidebar entry */
+	/** Omit the auto-generated sidebar entry and dashboard quick action */
 	hidden?: boolean;
 	/** Explicit admin sidebar position; `null` clears it back to alphabetical */
 	sortOrder?: number | null;
+	/** Admin sidebar folder; `null` moves the collection back inline */
+	group?: string | null;
 	commentsEnabled?: boolean;
 	commentsModeration?: "all" | "first_time" | "none";
 	commentsClosedAfterDays?: number;
 	commentsAutoApproveUsers?: boolean;
+	/** Take an edit lock when an entry is opened */
+	editLocking?: boolean;
 	/** Field slug for the Title column; `null`/`""` clears back to the default. */
 	titleField?: string | null;
 	/** Datetime field slug for the Date column; `null`/`""` clears back to the default. */

package/src/schema/zod-generator.ts

@@ -1,4 +1,4 @@
-import { z, type ZodTypeAny } from "zod";
+import { z, type ZodType } from "zod";
 
 import { hashString } from "../utils/hash.js";
 import type { CollectionWithFields, Field, FieldType, RepeaterSubField } from "./types.js";
@@ -14,8 +14,8 @@ const PASCAL_CASE_SPLIT_PATTERN = /[_\-\s]+/;
  */
 export function generateZodSchema(
 	collection: CollectionWithFields,
-): z.ZodObject<Record<string, ZodTypeAny>> {
-	const shape: Record<string, ZodTypeAny> = {};
+): z.ZodObject<Record<string, ZodType>> {
+	const shape: Record<string, ZodType> = {};
 
 	for (const field of collection.fields) {
 		shape[field.slug] = generateFieldSchema(field);
@@ -27,7 +27,7 @@ export function generateZodSchema(
 /**
  * Generate Zod schema for a single field
  */
-export function generateFieldSchema(field: Field): ZodTypeAny {
+export function generateFieldSchema(field: Field): ZodType {
 	let schema = getBaseSchema(field.type, field);
 
 	// Apply validation rules
@@ -58,10 +58,10 @@ export function generateFieldSchema(field: Field): ZodTypeAny {
 /**
  * Get base Zod schema for a field type
  */
-function getBaseSchema(type: FieldType, field: Pick<Field, "validation">): ZodTypeAny {
+function getBaseSchema(type: FieldType, field: Pick<Field, "validation">): ZodType {
 	switch (type) {
 		case "url":
-			return z.string().url();
+			return z.string().check(z.url());
 
 		case "string":
 		case "text":
@@ -94,7 +94,10 @@ function getBaseSchema(type: FieldType, field: Pick<Field, "validation">): ZodTy
 			// validate or the entry becomes unsavable through its own editor
 			// (#1368; same class as #867). `z.iso.*` retains semantic validation,
 			// so impossible dates are still rejected.
-			return z.iso.datetime({ offset: true, local: true }).or(z.iso.date());
+			return z.iso
+				.datetime({ offset: true, local: true })
+				.or(z.iso.datetime({ offset: true, local: true, precision: -1 }))
+				.or(z.iso.date());
 
 		case "select": {
 			const options = field.validation?.options;
@@ -122,7 +125,7 @@ function getBaseSchema(type: FieldType, field: Pick<Field, "validation">): ZodTy
 			// renderers dispatch on it, but `_key` is intentionally optional:
 			// it's a UI-layer concern that the editor regenerates on every
 			// change (see `PortableTextEditor`), and the rest of this schema
-			// uses `.passthrough()` for everything below the top level. Making
+			// uses `.loose()` for everything below the top level. Making
 			// `_key` strictly required here was an accidentally tight invariant
 			// that rejected any seed/import data not authored against the
 			// editor (#867 — autosave failures on seeded template content).
@@ -132,7 +135,7 @@ function getBaseSchema(type: FieldType, field: Pick<Field, "validation">): ZodTy
 						_type: z.string(),
 						_key: z.string().optional(),
 					})
-					.passthrough(),
+					.loose(),
 			);
 
 		case "image": {
@@ -186,8 +189,8 @@ function getBaseSchema(type: FieldType, field: Pick<Field, "validation">): ZodTy
 
 function generateRepeaterRowSchema(
 	subFields: readonly RepeaterSubField[],
-): z.ZodObject<Record<string, ZodTypeAny>> {
-	const shape: Record<string, ZodTypeAny> = {};
+): z.ZodObject<Record<string, ZodType>> {
+	const shape: Record<string, ZodType> = {};
 
 	for (const subField of subFields) {
 		let schema = getBaseSchema(subField.type, {
@@ -204,13 +207,13 @@ function generateRepeaterRowSchema(
 		shape[subField.slug] = schema;
 	}
 
-	return z.object(shape).passthrough();
+	return z.object(shape).loose();
 }
 
 /**
  * Apply validation rules to a schema
  */
-function applyValidation(schema: ZodTypeAny, field: Field): ZodTypeAny {
+function applyValidation(schema: ZodType, field: Field): ZodType {
 	const validation = field.validation;
 	if (!validation) return schema;