emdash 0.32.0 → 0.33.0

package/dist/{api-DgPbMlng.mjs → api-D2hunekQ.mjs}

@@ -1,34 +1,35 @@
-import { r as validatePluginIdentifier, t as validateIdentifier } from "./validate-VPnKoIzW.mjs";
-import { c as isSqlite } from "./dialect-helpers-DFwyWjTM.mjs";
+import { i as validateStorageCollectionName, n as validateJsonFieldName, r as validatePluginIdentifier, t as validateIdentifier } from "./validate-BpwoDOgt.mjs";
+import { c as isSqlite, l as jsonExtractExpr, s as isPostgres } from "./dialect-helpers-BSbfaO3F.mjs";
 import { i as resolveConfiguredLocale, n as getI18nConfig, r as isI18nEnabled } from "./config-DyF3OKg_.mjs";
-import { o as invalidateCollectionCache } from "./object-cache-Bok5j2ae.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "./content-CpfKV9QE.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-D5dlPeRb.mjs";
+import { t as after } from "./after-CBU2vkoO.mjs";
+import { c as invalidateCollectionCache } from "./object-cache-71tPfV4A.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "./content-CJ94NEx5.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-DbYzib_k.mjs";
 import { n as isMissingTableError, t as isMissingColumnError } from "./db-errors-CcWLaRiR.mjs";
 import { i as encodeBase64, t as decodeBase64 } from "./base64-B-PsqheR.mjs";
-import { n as InvalidCursorError, r as ScheduledNotDueError, t as EmDashValidationError } from "./types-XrQQ-Aex.mjs";
-import { t as MediaRepository } from "./media-tQDZEdu7.mjs";
-import { t as UserRepository } from "./user-BAumEmpA.mjs";
-import { t as TaxonomyRepository } from "./taxonomy-DvwWAPvA.mjs";
-import { t as CommentRepository } from "./comment-DnTxxVHv.mjs";
-import { t as OptionsRepository } from "./options-BlmBHTvX.mjs";
-import { t as withTransaction } from "./transaction-D0FOsb3X.mjs";
-import { t as RedirectRepository } from "./redirect-BJ6d1yHh.mjs";
+import { i as ScheduledNotDueError, n as EmDashValidationError, r as InvalidCursorError, t as ContentMutationConflictError } from "./types-Cd8iuS1J.mjs";
+import { t as MediaRepository } from "./media-BP7S-nHT.mjs";
+import { t as UserRepository } from "./user-DBrq4UVq.mjs";
+import { t as withTransaction } from "./transaction-NQj4VJ7Z.mjs";
+import { t as TaxonomyRepository } from "./taxonomy-pOrB2kZe.mjs";
+import { t as CommentRepository } from "./comment-BIkJ6Fil.mjs";
+import { t as OptionsRepository } from "./options-CBXIHUoT.mjs";
+import { t as RedirectRepository } from "./redirect-DIJxXKOG.mjs";
 import { r as requestCached } from "./request-cache-BSUptuJR.mjs";
-import { t as BylineRepository } from "./byline-C5TAqs8N.mjs";
+import { t as BylineRepository } from "./byline-Cp6csL84.mjs";
 import { r as parseAllowedMimeTypes, t as matchesMimeAllowlist } from "./mime-DfIVjNkr.mjs";
-import { t as SeoRepository } from "./seo-BAPKiED8.mjs";
-import { r as invalidateRedirectCache } from "./cache-B26cufFd.mjs";
-import { t as FTSManager } from "./fts-manager-vncsZIJm.mjs";
-import { u as invalidateTermCache } from "./taxonomies-B61CRSha.mjs";
-import { r as hashString } from "./hash-Cb7U1b5M.mjs";
-import { t as ErrorCode } from "./errors-DtEXIQQV.mjs";
-import { n as SchemaRegistry, t as SchemaError } from "./registry-BP1JK2xh.mjs";
-import { t as PluginStateRepository } from "./state-xxv6ZTMv.mjs";
-import { a as reconcileManifestAccess, i as pluginManifestSchema, r as normalizeManifestRoute } from "./manifest-schema-bCq54i7F.mjs";
-import { a as normalizeCapabilities, r as declaredAccessToCapabilities } from "./types-CK0LxPUQ.mjs";
-import { t as EmDashStorageError } from "./types-BD40g7zz.mjs";
-import { n as resolveAndValidateExternalUrl, t as SsrfError } from "./ssrf-CviKqWmq.mjs";
+import { t as SeoRepository } from "./seo-DTHRntNC.mjs";
+import { n as invalidateRedirectCache } from "./cache-C9FptTFR.mjs";
+import { t as FTSManager } from "./fts-manager-BITakW_R.mjs";
+import { u as invalidateTermCache } from "./taxonomies-CLN1N92E.mjs";
+import { r as hashString } from "./hash-Cg0TXJPV.mjs";
+import { t as ErrorCode } from "./errors-BucQ8VYz.mjs";
+import { n as SchemaRegistry, t as SchemaError } from "./registry-Dbodb4Uo.mjs";
+import { t as PluginStateRepository } from "./state-CQvoefYP.mjs";
+import { a as reconcileManifestAccess, i as pluginManifestSchema, r as normalizeManifestRoute } from "./manifest-schema-Da7kj23y.mjs";
+import { a as normalizeCapabilities, r as declaredAccessToCapabilities } from "./types-DKuWPYV5.mjs";
+import { t as EmDashStorageError } from "./types-BjxTKxrZ.mjs";
+import { n as resolveAndValidateExternalUrl, t as SsrfError } from "./ssrf-CTa6v21i.mjs";
 import { sql } from "kysely";
 import { createGzipDecoder, unpackTar } from "modern-tar";
 import { ClientResponseError, ClientValidationError } from "@atcute/client";
@@ -370,10 +371,22 @@ async function canUseFtsForListFilter(db, collection, searchColumns) {
 * staged as `_slug` in a draft revision, which only land on publish).
 */
 async function createSlugChangeRedirect(db, collection, oldSlug, newSlug, contentId) {
+	if (await slugStillTaken(db, collection, oldSlug, contentId)) return;
 	const collectionRow = await db.selectFrom("_emdash_collections").select("url_pattern").where("slug", "=", collection).executeTakeFirst();
 	await new RedirectRepository(db).createAutoRedirect(collection, oldSlug, newSlug, contentId, collectionRow?.url_pattern ?? null);
 	invalidateRedirectCache();
 }
+/** Whether a row other than `contentId` still holds `slug` in this collection. */
+async function slugStillTaken(db, collection, slug, contentId) {
+	validateIdentifier(collection, "collection slug");
+	return (await sql`
+		SELECT id FROM ${sql.ref(`ec_${collection}`)}
+		WHERE slug = ${slug}
+		AND id != ${contentId}
+		AND deleted_at IS NULL
+		LIMIT 1
+	`.execute(db)).rows.length > 0;
+}
 /** Matches a date-only `YYYY-MM-DD` bound (no time component). */
 const DATE_ONLY_RE = /^\d{4}-\d{2}-\d{2}$/;
 /**
@@ -1082,9 +1095,8 @@ async function handleContentUnschedule(db, collection, id) {
 /**
 * Publish content immediately.
 *
-* Wrapped in a transaction because publish performs multiple writes
-* (syncDataColumns, slug sync, status/revision update) that must
-* be atomic to prevent FTS shadow table corruption on crash.
+* Publication is one atomic content-row statement. On databases that support
+* transactions, the existing slug-redirect side write remains grouped with it.
 */
 async function handleContentPublish(db, collection, id, options = {}) {
 	try {
@@ -1092,7 +1104,7 @@ async function handleContentPublish(db, collection, id, options = {}) {
 			const repo = new ContentRepository(trx);
 			const resolvedId = await resolveId(repo, collection, id) ?? id;
 			const existing = await repo.findById(collection, resolvedId);
-			const published = await repo.publish(collection, resolvedId, options.publishedAt, options.requireScheduledDue);
+			const published = await repo.publish(collection, resolvedId, options.publishedAt, options.requireScheduledDue, options.expectedScheduledAt);
 			if (existing?.status === "published" && existing.slug && published.slug && existing.slug !== published.slug) await createSlugChangeRedirect(trx, collection, existing.slug, published.slug, resolvedId);
 			return published;
 		});
@@ -1102,6 +1114,13 @@ async function handleContentPublish(db, collection, id, options = {}) {
 			data: { item }
 		};
 	} catch (error) {
+		if (error instanceof ContentMutationConflictError) return {
+			success: false,
+			error: {
+				code: "CONFLICT",
+				message: error.message
+			}
+		};
 		if (error instanceof ScheduledNotDueError) return {
 			success: false,
 			error: {
@@ -1563,22 +1582,30 @@ async function handleRevisionRestore(db, revisionId, callerUserId) {
 			}
 		};
 		const { _slug, ...fieldData } = revision.data;
-		const item = await withTransaction(db, async (trx) => {
+		const { item, queuedRevisionId } = await withTransaction(db, async (trx) => {
 			const trxContentRepo = new ContentRepository(trx);
 			const trxRevisionRepo = new RevisionRepository(trx);
-			const updated = await trxContentRepo.update(revision.collection, revision.entryId, {
-				data: fieldData,
-				slug: typeof _slug === "string" ? _slug : void 0
-			});
-			await trxRevisionRepo.create({
-				collection: revision.collection,
-				entryId: revision.entryId,
-				data: revision.data,
-				authorId: callerUserId
-			});
-			return updated;
+			return {
+				item: await trxContentRepo.update(revision.collection, revision.entryId, {
+					data: fieldData,
+					slug: typeof _slug === "string" ? _slug : void 0
+				}),
+				queuedRevisionId: (await trxRevisionRepo.create({
+					collection: revision.collection,
+					entryId: revision.entryId,
+					data: revision.data,
+					authorId: callerUserId
+				})).id
+			};
+		});
+		const pruneRepo = new RevisionRepository(db);
+		after(async () => {
+			try {
+				await pruneRepo.pruneQueuedEntry(revision.collection, revision.entryId, queuedRevisionId, 50);
+			} catch (error) {
+				console.error(`[revisions] Failed to prune revisions for ${revision.collection}/${revision.entryId}:`, error);
+			}
 		});
-		new RevisionRepository(db).pruneOldRevisions(revision.collection, revision.entryId, 50).catch(() => {});
 		return {
 			success: true,
 			data: { item }
@@ -2750,6 +2777,171 @@ function createMarketplaceClient(baseUrl, siteOrigin) {
 	return new MarketplaceClientImpl(baseUrl, siteOrigin);
 }
 
+//#endregion
+//#region src/plugins/storage-indexes.ts
+/**
+* Generate a deterministic index name.
+* Unique indexes use a `uidx_` prefix to avoid collisions with regular indexes on the same fields.
+*/
+function generateIndexName(pluginId, collection, fields, options) {
+	return `${options?.unique ? "uidx" : "idx"}_plugin_${pluginId}_${collection}_${fields.join("_")}`.substring(0, 128);
+}
+/**
+* Generate a Kysely sql expression for creating an expression index.
+*
+* Validates all inputs before interpolation. The collection uses the
+* permissive manifest-key rules rather than SQL-identifier rules — it is
+* stored as opaque text and only reaches SQL inside the generated index
+* name — so kebab-case collections index like any other.
+*/
+function generateCreateIndexSql(db, pluginId, collection, fields, options) {
+	validatePluginIdentifier(pluginId, "plugin ID");
+	validateStorageCollectionName(collection, "collection name");
+	for (const field of fields) validateJsonFieldName(field, "index field name");
+	const indexName = generateIndexName(pluginId, collection, fields, options);
+	const expressions = fields.map((field) => {
+		if (isPostgres(db)) return `(${jsonExtractExpr(db, "data", field)})`;
+		return jsonExtractExpr(db, "data", field);
+	}).join(", ");
+	const createKeyword = options?.unique ? "CREATE UNIQUE INDEX" : "CREATE INDEX";
+	return sql`${sql.raw(createKeyword)} IF NOT EXISTS ${sql.ref(indexName)}
+		ON _plugin_storage(plugin_id, collection, ${sql.raw(expressions)})
+	`;
+}
+/**
+* Generate a Kysely sql expression for dropping an index.
+*
+* Uses sql.ref() for safe identifier quoting.
+*/
+function generateDropIndexSql(indexName) {
+	return sql`DROP INDEX IF EXISTS ${sql.ref(indexName)}`;
+}
+/**
+* Normalize index declarations to arrays of field arrays
+*/
+function normalizeIndexes(indexes) {
+	return indexes.map((index) => Array.isArray(index) ? index : [index]);
+}
+/**
+* Create all declared indexes for a plugin collection
+*/
+async function createStorageIndexes(db, pluginId, collection, indexes, options) {
+	const normalized = normalizeIndexes(indexes);
+	const uniqueNormalized = options?.uniqueIndexes ? normalizeIndexes(options.uniqueIndexes) : [];
+	const uniqueSet = new Set(uniqueNormalized.map((f) => f.join(",")));
+	const allEntries = [...normalized.filter((f) => !uniqueSet.has(f.join(","))).map((fields) => ({
+		fields,
+		unique: false
+	})), ...uniqueNormalized.map((fields) => ({
+		fields,
+		unique: true
+	}))];
+	const created = [];
+	const errors = [];
+	for (const entry of allEntries) {
+		const { fields } = entry;
+		const indexName = generateIndexName(pluginId, collection, fields, { unique: entry.unique });
+		try {
+			await generateCreateIndexSql(db, pluginId, collection, fields, { unique: entry.unique }).execute(db);
+			await db.insertInto("_plugin_indexes").values({
+				plugin_id: pluginId,
+				collection,
+				index_name: indexName,
+				fields: JSON.stringify(fields)
+			}).onConflict((oc) => oc.columns([
+				"plugin_id",
+				"collection",
+				"index_name"
+			]).doUpdateSet({ fields: JSON.stringify(fields) })).execute();
+			created.push(indexName);
+		} catch (error) {
+			errors.push({
+				index: indexName,
+				error: error instanceof Error ? error.message : String(error)
+			});
+		}
+	}
+	return {
+		created,
+		errors
+	};
+}
+/**
+* Remove indexes that are no longer declared
+*/
+async function removeOrphanedIndexes(db, pluginId, collection, currentIndexes, options) {
+	const normalized = normalizeIndexes(currentIndexes);
+	const uniqueNormalized = options?.uniqueIndexes ? normalizeIndexes(options.uniqueIndexes) : [];
+	const uniqueSet = new Set(uniqueNormalized.map((f) => f.join(",")));
+	const currentIndexNames = /* @__PURE__ */ new Set();
+	for (const fields of normalized) if (!uniqueSet.has(fields.join(","))) currentIndexNames.add(generateIndexName(pluginId, collection, fields));
+	for (const fields of uniqueNormalized) currentIndexNames.add(generateIndexName(pluginId, collection, fields, { unique: true }));
+	const existingIndexes = await db.selectFrom("_plugin_indexes").select(["index_name"]).where("plugin_id", "=", pluginId).where("collection", "=", collection).execute();
+	const removed = [];
+	const errors = [];
+	for (const { index_name } of existingIndexes) if (!currentIndexNames.has(index_name)) try {
+		await generateDropIndexSql(index_name).execute(db);
+		await db.deleteFrom("_plugin_indexes").where("plugin_id", "=", pluginId).where("collection", "=", collection).where("index_name", "=", index_name).execute();
+		removed.push(index_name);
+	} catch (error) {
+		errors.push({
+			index: index_name,
+			error: error instanceof Error ? error.message : String(error)
+		});
+	}
+	return {
+		removed,
+		errors
+	};
+}
+/**
+* Sync indexes for a plugin collection (create new, remove old)
+*/
+async function syncStorageIndexes(db, pluginId, collection, indexes, options) {
+	const [createResult, removeResult] = await Promise.all([createStorageIndexes(db, pluginId, collection, indexes, options), removeOrphanedIndexes(db, pluginId, collection, indexes, options)]);
+	return {
+		created: createResult.created,
+		removed: removeResult.removed,
+		errors: [...createResult.errors, ...removeResult.errors]
+	};
+}
+/**
+* Materialize the storage indexes a set of plugins declare in their
+* manifests. Failures are logged per collection and never thrown — a missing
+* index affects query performance, not correctness, so it must not fail an
+* install or a scheduler tick.
+*/
+async function syncDeclaredStorageIndexes(db, plugins) {
+	for (const plugin of plugins) for (const [collection, config] of Object.entries(plugin.storage ?? {})) try {
+		const result = await syncStorageIndexes(db, plugin.id, collection, config.indexes, { uniqueIndexes: config.uniqueIndexes });
+		for (const failure of result.errors) console.error(`[plugins] Failed to sync storage index ${failure.index} for ${plugin.id}/${collection}: ${failure.error}`);
+	} catch (error) {
+		console.error(`[plugins] Failed to sync storage indexes for ${plugin.id}/${collection}:`, error);
+	}
+}
+/**
+* Remove all indexes for a plugin
+*/
+async function removeAllPluginIndexes(db, pluginId) {
+	const existingIndexes = await db.selectFrom("_plugin_indexes").select(["index_name", "collection"]).where("plugin_id", "=", pluginId).execute();
+	const removed = [];
+	const errors = [];
+	for (const { index_name } of existingIndexes) try {
+		await generateDropIndexSql(index_name).execute(db);
+		removed.push(index_name);
+	} catch (error) {
+		errors.push({
+			index: index_name,
+			error: error instanceof Error ? error.message : String(error)
+		});
+	}
+	await db.deleteFrom("_plugin_indexes").where("plugin_id", "=", pluginId).execute();
+	return {
+		removed,
+		errors
+	};
+}
+
 //#endregion
 //#region src/api/handlers/marketplace.ts
 /** Semver-like pattern: digits, dots, hyphens, plus signs (e.g. 1.0.0, 1.0.0-beta.1) */
@@ -2984,6 +3176,7 @@ async function handleMarketplaceInstall(db, storage, sandboxRunner, marketplaceU
 			displayName: pluginDetail.name,
 			description: pluginDetail.description ?? void 0
 		});
+		await syncDeclaredStorageIndexes(db, [bundle.manifest]);
 		client.reportInstall(pluginId, version).catch(() => {});
 		return {
 			success: true,
@@ -3145,6 +3338,7 @@ async function handleMarketplaceUpdate(db, storage, sandboxRunner, marketplaceUr
 			mcpToolsEnabled: false,
 			mcpToolsConsent: null
 		});
+		await syncDeclaredStorageIndexes(db, [bundle.manifest]);
 		deleteBundleFromR2(storage, pluginId, oldVersion).catch(() => {});
 		return {
 			success: true,
@@ -3199,6 +3393,9 @@ async function handleMarketplaceUninstall(db, storage, pluginId, opts) {
 			await db.deleteFrom("_plugin_storage").where("plugin_id", "=", pluginId).execute();
 			dataDeleted = true;
 		} catch {}
+		try {
+			await removeAllPluginIndexes(db, pluginId);
+		} catch {}
 		await stateRepo.delete(pluginId);
 		return {
 			success: true,
@@ -4360,6 +4557,7 @@ async function handleRegistryInstall(db, storage, sandboxRunner, registryConfigI
 			}
 			throw stateErr;
 		}
+		await syncDeclaredStorageIndexes(db, [bundle.manifest]);
 		return {
 			success: true,
 			data: {
@@ -4431,6 +4629,9 @@ async function handleRegistryUninstall(db, storage, pluginId, opts) {
 			dataDeleted = true;
 		}
 		if (storage) await deleteBundleFromR2(storage, pluginId, version, "registry");
+		try {
+			await removeAllPluginIndexes(db, pluginId);
+		} catch {}
 		await stateRepo.delete(pluginId);
 		return {
 			success: true,
@@ -4673,6 +4874,7 @@ async function handleRegistryUpdate(db, storage, sandboxRunner, registryConfigIn
 			mcpToolsEnabled: false,
 			mcpToolsConsent: null
 		});
+		await syncDeclaredStorageIndexes(db, [bundle.manifest]);
 		deleteBundleFromR2(storage, pluginId, oldVersion, "registry").catch(() => {});
 		return {
 			success: true,
@@ -4798,5 +5000,5 @@ async function handleRegistryUpdateCheck(db, registryConfigInput) {
 }
 
 //#endregion
-export { handleContentDiscardDraft as $, handleSchemaCollectionList as A, handleMediaGet as B, handlePluginGet as C, handleSchemaCollectionCreate as D, handleOrphanedTableRegister as E, handleSchemaFieldList as F, handleRevisionRestore as G, handleMediaUpdate as H, handleSchemaFieldReorder as I, handleContentCompare as J, generateManifest as K, handleSchemaFieldUpdate as L, handleSchemaFieldCreate as M, handleSchemaFieldDelete as N, handleSchemaCollectionDelete as O, handleSchemaFieldGet as P, handleContentDelete as Q, handleMediaCreate as R, handlePluginEnable as S, handleOrphanedTableList as T, handleRevisionGet as U, handleMediaList as V, handleRevisionList as W, handleContentCountTrashed as X, handleContentCountScheduled as Y, handleContentCreate as Z, loadBundleFromR2 as _, handleRegistryUpdateCheck as a, handleContentPermanentDelete as at, handlePluginSettingsUpdate as b, validateAggregatorUrl as c, handleContentSchedule as ct, handleMarketplaceSearch as d, handleContentUnschedule as dt, handleContentDuplicate as et, handleMarketplaceUninstall as f, handleContentUpdate as ft, handleThemeSearch as g, handleThemeGetDetail as h, handleRegistryUpdate as i, handleContentListTrashed as it, handleSchemaCollectionUpdate as j, handleSchemaCollectionGet as k, handleMarketplaceGetPlugin as l, handleContentTranslations as lt, handleMarketplaceUpdateCheck as m, handleRegistryInstall as n, handleContentGetIncludingTrashed as nt, coerceRegistryConfig as o, handleContentPublish as ot, handleMarketplaceUpdate as p, validateRev as pt, handleContentAuthors as q, handleRegistryUninstall as r, handleContentList as rt, normalizeRegistryConfig as s, handleContentRestore as st, assertSafeArtifactUrl as t, handleContentGet as tt, handleMarketplaceInstall as u, handleContentUnpublish as ut, getPluginSettingsSchema as v, handlePluginList as w, handlePluginDisable as x, handlePluginSettingsGet as y, handleMediaDelete as z };
-//# sourceMappingURL=api-DgPbMlng.mjs.map
+export { handleContentDelete as $, handleSchemaCollectionGet as A, handleMediaDelete as B, handlePluginEnable as C, handleOrphanedTableRegister as D, handleOrphanedTableList as E, handleSchemaFieldGet as F, handleRevisionList as G, handleMediaList as H, handleSchemaFieldList as I, handleContentAuthors as J, handleRevisionRestore as K, handleSchemaFieldReorder as L, handleSchemaCollectionUpdate as M, handleSchemaFieldCreate as N, handleSchemaCollectionCreate as O, handleSchemaFieldDelete as P, handleContentCreate as Q, handleSchemaFieldUpdate as R, handlePluginDisable as S, handlePluginList as T, handleMediaUpdate as U, handleMediaGet as V, handleRevisionGet as W, handleContentCountScheduled as X, handleContentCompare as Y, handleContentCountTrashed as Z, loadBundleFromR2 as _, handleRegistryUpdateCheck as a, handleContentListTrashed as at, handlePluginSettingsGet as b, validateAggregatorUrl as c, handleContentRestore as ct, handleMarketplaceSearch as d, handleContentUnpublish as dt, handleContentDiscardDraft as et, handleMarketplaceUninstall as f, handleContentUnschedule as ft, handleThemeSearch as g, handleThemeGetDetail as h, handleRegistryUpdate as i, handleContentList as it, handleSchemaCollectionList as j, handleSchemaCollectionDelete as k, handleMarketplaceGetPlugin as l, handleContentSchedule as lt, handleMarketplaceUpdateCheck as m, validateRev as mt, handleRegistryInstall as n, handleContentGet as nt, coerceRegistryConfig as o, handleContentPermanentDelete as ot, handleMarketplaceUpdate as p, handleContentUpdate as pt, generateManifest as q, handleRegistryUninstall as r, handleContentGetIncludingTrashed as rt, normalizeRegistryConfig as s, handleContentPublish as st, assertSafeArtifactUrl as t, handleContentDuplicate as tt, handleMarketplaceInstall as u, handleContentTranslations as ut, syncDeclaredStorageIndexes as v, handlePluginGet as w, handlePluginSettingsUpdate as x, getPluginSettingsSchema as y, handleMediaCreate as z };
+//# sourceMappingURL=api-D2hunekQ.mjs.map