emdash 1.3.0 → 1.4.0

package/dist/{api-D-7BNHoz.mjs → api--PYoyeTo.mjs}

@@ -1,40 +1,41 @@
-import { n as isMissingTableError, t as isMissingColumnError } from "./db-errors-CBD5yMro.mjs";
+import { n as isMissingColumnError, r as isMissingTableError } from "./db-errors-unnO6yiZ.mjs";
 import { i as validateStorageCollectionName, n as validateJsonFieldName, r as validatePluginIdentifier, t as validateIdentifier } from "./validate-DANX1-Qi.mjs";
-import { d as isSqlite, f as jsonExtractExpr, u as isPostgres } from "./dialect-helpers-7_IqPdh9.mjs";
-import { i as isI18nEnabled, o as resolveConfiguredLocale, r as getI18nConfig } from "./config-CvmjJcVw.mjs";
-import { t as after } from "./after-PcEvMY_6.mjs";
+import { d as isSqlite, f as jsonExtractExpr, u as isPostgres } from "./dialect-helpers-B1XN2HGB.mjs";
+import { l as resolveConfiguredLocale, r as getI18nConfig, s as isI18nEnabled } from "./config-Cs_AwWXI.mjs";
+import { t as after } from "./after-32yNRvd2.mjs";
 import { t as OptionsRepository } from "./options-DhrI7eMv.mjs";
-import { t as EmDashSecretsError } from "./secrets-Cc_O3Kp-.mjs";
+import { t as EmDashSecretsError } from "./secrets-Dswzrz3k.mjs";
 import { i as encodeBase64, t as decodeBase64 } from "./base64-BQBZwXCx.mjs";
-import { r as isSystemOrderField, t as ContentRepository } from "./content-DQSRZTVw.mjs";
-import { m as isStoragelessFieldRow, p as isStoragelessField, s as MAX_COLLECTION_LIST_COLUMNS } from "./types-BGmQ0uXs.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-xC4UD5-S.mjs";
-import { r as requestCached } from "./request-cache-C4CIo5ad.mjs";
-import { i as InvalidCursorError, n as ContentMutationConflictError, r as EmDashValidationError, s as ScheduledNotDueError, t as ContentCollectionNotFoundError } from "./types-D2NEXtgB.mjs";
-import { t as RevisionRepository } from "./revision-BVp8S0e_.mjs";
-import { t as withTransaction } from "./transaction-BVYIo_yu.mjs";
-import { t as UserRepository } from "./user-BlCTKVAm.mjs";
-import { t as TaxonomyRepository } from "./taxonomy-C_C_LBAU.mjs";
-import { t as CommentRepository } from "./comment-UvIWDKcW.mjs";
-import { t as RedirectRepository } from "./redirect-DiS_3mA4.mjs";
-import { t as BylineRepository } from "./byline-BR1qhyiw.mjs";
-import { c as readStagedReferenceBaselines, d as RelationRepository, i as STAGED_REFERENCES_KEY, l as readStagedReferences, r as STAGED_REFERENCES_BASELINE_KEY, s as pageStagedGroups } from "./staged-CD_imitH.mjs";
-import { r as parseAllowedMimeTypes, t as matchesMimeAllowlist } from "./mime-B5M9R53H.mjs";
-import { t as EntryLockRepository } from "./entry-locks-DJAqVweV.mjs";
-import { t as SeoRepository } from "./seo-VZYOEy8f.mjs";
-import { i as scheduledPolicyRejectionKey } from "./content-policy-Dm32n9C6.mjs";
-import { n as invalidateRedirectCache } from "./cache-CEU9wo_h.mjs";
-import { r as publishRedirectChanges } from "./artifacts-htGyfCSt.mjs";
-import { t as FTSManager } from "./fts-manager-Beg3e4bI.mjs";
-import { d as invalidateTermCache } from "./taxonomies-ChnU7Mc8.mjs";
-import { L as BlockTypeRegistry, n as SchemaRegistry } from "./registry-TUVaid9Z.mjs";
+import { r as isSystemOrderField, t as ContentRepository } from "./content-BKHUVsE5.mjs";
+import { m as isStoragelessFieldRow, p as isStoragelessField, s as MAX_COLLECTION_LIST_COLUMNS } from "./types-C_asjp1J.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-DiW8VMwz.mjs";
+import { r as requestCached } from "./request-cache-5z2WzWmh.mjs";
+import { a as InvalidCursorError, c as ScheduledNotDueError, i as EmDashValidationError, n as ContentMutationConflictError, r as ContentSlugConflictError, t as ContentCollectionNotFoundError } from "./types-DwhEvIVb.mjs";
+import { t as RevisionRepository } from "./revision-Dx7Uth1X.mjs";
+import { t as withTransaction } from "./transaction-CkoQ5wqQ.mjs";
+import { t as UserRepository } from "./user-By8SzQxS.mjs";
+import { t as TaxonomyRepository } from "./taxonomy-CMI5fczd.mjs";
+import { t as CommentRepository } from "./comment-DB74Zpa4.mjs";
+import { t as interpolateUrlPattern } from "./resolve-DdNXBJSr.mjs";
+import { t as RedirectRepository } from "./redirect-DjLdw427.mjs";
+import { t as BylineRepository } from "./byline-DHJS-GGb.mjs";
+import { c as readStagedReferenceBaselines, d as RelationRepository, i as STAGED_REFERENCES_KEY, l as readStagedReferences, r as STAGED_REFERENCES_BASELINE_KEY, s as pageStagedGroups } from "./staged-ByBmPFtX.mjs";
+import { r as parseAllowedMimeTypes, t as matchesMimeAllowlist } from "./mime-D1We9jUx.mjs";
+import { t as EntryLockRepository } from "./entry-locks-CJ9uhqg1.mjs";
+import { t as SeoRepository } from "./seo-B_H_pqOd.mjs";
+import { i as scheduledPolicyRejectionKey } from "./content-policy-BmE0MPZY.mjs";
+import { n as invalidateRedirectCache } from "./cache-5DHbpEWu.mjs";
+import { r as publishRedirectChanges } from "./artifacts-Dvdp2KK-.mjs";
+import { t as FTSManager } from "./fts-manager-6861qcwk.mjs";
+import { d as invalidateTermCache } from "./taxonomies-B__VmCKQ.mjs";
+import { R as BlockTypeRegistry, n as SchemaRegistry } from "./registry-B0-O575m.mjs";
 import { r as hashString } from "./hash-BJaeek87.mjs";
-import { n as expandCollectionBlockFields } from "./block-values-gCX4HBSl.mjs";
-import { _ as referenceFieldConstraints, d as resolveEntryGroups, f as resolveReferenceSelection, g as writeReferenceSelection, h as validateOppositeSideLimit, n as getReferenceTitleField, p as resolveReferenceSelectionTargets, u as resolveEntries, v as validateReferenceSelection, y as validateRequiredReferencesPresent } from "./relations-CA_QuMTU.mjs";
+import { n as expandCollectionBlockFields } from "./block-values-Dg0-8PPS.mjs";
+import { _ as referenceFieldConstraints, d as resolveEntryGroups, f as resolveReferenceSelection, g as writeReferenceSelection, h as validateOppositeSideLimit, n as getReferenceTitleField, p as resolveReferenceSelectionTargets, u as resolveEntries, v as validateReferenceSelection, y as validateRequiredReferencesPresent } from "./relations-WIOojTL4.mjs";
 import { a as parseDurationSeconds, l as validateAggregatorUrl, n as coerceRegistryConfig, o as releaseExemptFromMinimumAge, t as canonicalCapabilitiesForDriftCheck } from "./config-DBU6iUQB.mjs";
-import { t as ErrorCode } from "./errors-BOYNdIo3.mjs";
+import { t as ErrorCode } from "./errors-8gJqv-XV.mjs";
 import { t as PluginStateRepository } from "./state-CFbGZziM.mjs";
-import { p as encodePluginSettingValue, u as PluginSettingEncryptionError } from "./settings-CWb84sDm.mjs";
+import { f as PluginSettingEncryptionError, h as encodePluginSettingValue } from "./settings-D932YP2-.mjs";
 import { a as pluginManifestSchema$1, i as normalizeManifestRoute$1, o as reconcileManifestAccess$1 } from "./manifest-schema-DNb4XmTS.mjs";
 import { n as MarketplaceUnavailableError, r as createMarketplaceClient, t as MarketplaceError } from "./marketplace-CqbgeIa7.mjs";
 import { o as withUnavailableReason } from "./types-qHVygneX.mjs";
@@ -453,10 +454,13 @@ function decodeRevisionPrecondition(rev) {
 	return decoded;
 }
 /**
-* Extract a slug source (title or name) from content data.
+* Extract a slug source from content data: the collection's `titleField` when
+* it sets one and the entry has a value for it, otherwise `title`, then `name`.
 * Returns null if no suitable string field is found.
 */
-function getSlugSource(data) {
+function getSlugSource(data, titleField) {
+	const configured = titleField ? data[titleField] : void 0;
+	if (typeof configured === "string" && configured.length > 0) return configured;
 	if (typeof data.title === "string" && data.title.length > 0) return data.title;
 	if (typeof data.name === "string" && data.name.length > 0) return data.name;
 	return null;
@@ -493,6 +497,11 @@ async function getCollectionPublishConfig(db, collection) {
 		};
 	});
 }
+async function getCollectionTitleField(db, collection) {
+	return requestCached(`collectionTitleField:${collection}`, async () => {
+		return (await db.selectFrom("_emdash_collections").select("title_field").where("slug", "=", collection).executeTakeFirst())?.title_field ?? null;
+	});
+}
 function requireRoutablePublishSlug(routable, slug) {
 	if (routable && !slug?.trim()) throw new EmDashValidationError("Cannot publish routable content without a slug");
 }
@@ -714,12 +723,18 @@ async function resolveIdIncludingTrashed(repo, collection, identifier, locale) {
 * the `title`/`name` display fields when the collection actually defines them,
 * mirroring the admin's item-title resolution (titleField -> title -> name ->
 * slug), and includes every field explicitly marked searchable. Returning only
-* schema-backed columns avoids "no such column" errors.
+* fields that have a column (a reference field bound to a relation has none)
+* avoids "no such column" errors.
 */
 async function resolveSearchColumns(db, collection) {
 	const row = await db.selectFrom("_emdash_collections").select(["id", "title_field"]).where("slug", "=", collection).executeTakeFirst();
 	if (!row) return ["slug"];
-	const fields = await db.selectFrom("_emdash_fields").select(["slug", "searchable"]).where("collection_id", "=", row.id).orderBy("sort_order", "asc").execute();
+	const fields = (await db.selectFrom("_emdash_fields").select([
+		"slug",
+		"searchable",
+		"type",
+		"validation"
+	]).where("collection_id", "=", row.id).orderBy("sort_order", "asc").execute()).filter((f) => !isStoragelessFieldRow(f));
 	const columns = new Set(["slug"]);
 	const fieldSlugs = new Set(fields.map((f) => f.slug));
 	if (row.title_field && fieldSlugs.has(row.title_field)) columns.add(row.title_field);
@@ -813,6 +828,26 @@ async function createSlugChangeRedirect(db, collection, oldSlug, newSlug, conten
 	invalidateRedirectCache();
 	return redirect !== null;
 }
+/**
+* Remove any auto-redirect whose source is the URL a newly published entry
+* now occupies. This prevents an earlier slug-change redirect from shadowing
+* the new live page, because the redirect middleware runs before routing.
+*/
+async function removeShadowingAutoRedirect(db, collection, slug, contentId, publishedAt) {
+	if (!slug) return false;
+	validateIdentifier(collection, "collection slug");
+	const url = interpolateUrlPattern({
+		pattern: (await db.selectFrom("_emdash_collections").select("url_pattern").where("slug", "=", collection).executeTakeFirst())?.url_pattern ?? null,
+		collection,
+		slug,
+		id: contentId,
+		date: publishedAt
+	});
+	const result = await db.deleteFrom("_emdash_redirects").where("source", "=", url).where("auto", "=", 1).executeTakeFirst();
+	const removed = BigInt(result.numDeletedRows ?? 0n) > 0n;
+	if (removed) invalidateRedirectCache();
+	return removed;
+}
 /** Whether a row other than `contentId` still holds `slug` in this collection. */
 async function slugStillTaken(db, collection, slug, contentId) {
 	validateIdentifier(collection, "collection slug");
@@ -1109,6 +1144,7 @@ async function handleContentCreate(db, collection, body) {
 		if (!mimeCheck.success) return mimeCheck;
 		const requiredReferences = await validateRequiredReferencesPresent(db, collection, body.references, body.translationOf);
 		if (!requiredReferences.success) return requiredReferences;
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
@@ -1125,7 +1161,7 @@ async function handleContentCreate(db, collection, body) {
 			const effectiveLocale = body.locale ? resolveConfiguredLocale(body.locale) : getI18nConfig()?.defaultLocale;
 			let slug = body.slug;
 			if (!slug) {
-				const slugSource = getSlugSource(body.data);
+				const slugSource = getSlugSource(body.data, await getCollectionTitleField(trx, collection));
 				if (slugSource) slug = await repo.generateUniqueSlug(collection, slugSource, effectiveLocale);
 			}
 			if (body.status === "published") requireRoutablePublishSlug((await getCollectionPublishConfig(trx, collection)).routable, slug);
@@ -1157,8 +1193,10 @@ async function handleContentCreate(db, collection, body) {
 				...write,
 				entryGroup: created.translationGroup
 			});
+			if (created.status === "published") redirectChanged = await removeShadowingAutoRedirect(trx, collection, created.slug, created.id, created.publishedAt);
 			return created;
 		});
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 		return {
 			success: true,
 			data: {
@@ -1181,6 +1219,20 @@ async function handleContentCreate(db, collection, body) {
 				message: `Collection '${collection}' not found`
 			}
 		};
+		if (error instanceof ContentMutationConflictError) return {
+			success: false,
+			error: {
+				code: "CONFLICT",
+				message: error.message
+			}
+		};
+		if (error instanceof ContentSlugConflictError) return {
+			success: false,
+			error: {
+				code: "SLUG_CONFLICT",
+				message: `Slug '${body.slug ?? "(auto-generated)"}' already exists in collection '${collection}'`
+			}
+		};
 		if (error instanceof EmDashValidationError) {
 			if (error.message === "Translation source content not found") return {
 				success: false,
@@ -1262,7 +1314,7 @@ async function handleContentUpdate(db, collection, id, body) {
 				if (changed.length > 0) return storagelessDataKeyError(changed);
 			}
 		}
-		let redirectCreated = false;
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const trxRepo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
@@ -1286,24 +1338,28 @@ async function handleContentUpdate(db, collection, id, body) {
 				if (!resolved.success) throw Object.assign(new Error(resolved.error.message), { apiError: { code: resolved.error.code } });
 				referenceWrites.push(resolved.data);
 			}
+			const { supportsRevisions } = await getCollectionPublishConfig(trx, collection);
 			const updated = await trxRepo.update(collection, resolvedId, {
 				data: body.data,
 				slug: body.slug,
+				locale: existing?.locale ?? body.locale,
 				status: body.status,
 				authorId: body.authorId,
-				publishedAt: body.publishedAt
-			});
+				publishedAt: body.publishedAt,
+				...supportsRevisions ? {} : { draftRevisionId: null }
+			}, body._rev ? decodeRevisionPrecondition(body._rev) : void 0);
 			if (body.bylines !== void 0) updated.primaryBylineId = (await bylineRepo.setContentBylines(collection, resolvedId, body.bylines))[0]?.byline.translationGroup ?? null;
-			if (oldSlug && body.slug) redirectCreated = await createSlugChangeRedirect(trx, collection, oldSlug, body.slug, resolvedId, existing?.publishedAt ?? null, updated.publishedAt ?? null);
+			if (oldSlug && body.slug) redirectChanged = await createSlugChangeRedirect(trx, collection, oldSlug, body.slug, resolvedId, existing?.publishedAt ?? null, updated.publishedAt ?? null);
 			if (isI18nEnabled() && body.data && updated.translationGroup) await trxRepo.syncNonTranslatableFields(collection, updated.id, updated.translationGroup, body.data);
 			if (body.seo && hasSeo) updated.seo = await new SeoRepository(trx).upsert(collection, resolvedId, body.seo);
 			else if (hasSeo) updated.seo = await new SeoRepository(trx).get(collection, resolvedId);
 			await hydrateBylines(trx, collection, updated);
 			if (body.taxonomies) await assignTaxonomies(trx, collection, resolvedId, updated.locale ?? body.locale, body.taxonomies);
 			for (const write of referenceWrites) await writeReferenceSelection(trx, write);
+			if (updated.status === "published") redirectChanged = await removeShadowingAutoRedirect(trx, collection, updated.slug, updated.id, updated.publishedAt) || redirectChanged;
 			return updated;
 		});
-		if (redirectCreated) after(() => publishRedirectChanges(db));
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 		return {
 			success: true,
 			data: {
@@ -1319,6 +1375,13 @@ async function handleContentUpdate(db, collection, id, body) {
 				message: error.message
 			}
 		};
+		if (error instanceof ContentMutationConflictError) return {
+			success: false,
+			error: {
+				code: "CONFLICT",
+				message: error.message
+			}
+		};
 		if (isMissingTableError(error)) return {
 			success: false,
 			error: {
@@ -1333,6 +1396,13 @@ async function handleContentUpdate(db, collection, id, body) {
 				message: error.message
 			}
 		};
+		if (error instanceof ContentSlugConflictError) return {
+			success: false,
+			error: {
+				code: "SLUG_CONFLICT",
+				message: `Slug '${body.slug ?? id}' already exists in collection '${collection}'`
+			}
+		};
 		const message = error instanceof Error ? error.message.toLowerCase() : "";
 		if (message.includes("unique constraint failed") || message.includes("duplicate key")) {
 			if (message.includes("slug")) return {
@@ -1815,7 +1885,7 @@ async function handleScheduledPolicyRejection(db, collection, id, options) {
 async function handleContentPublish(db, collection, id, options = {}) {
 	try {
 		const expectedRevision = decodeRevisionPrecondition(options._rev);
-		let redirectCreated = false;
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const resolvedId = await resolveId(repo, collection, id) ?? id;
@@ -1841,10 +1911,11 @@ async function handleContentPublish(db, collection, id, options = {}) {
 			const published = await repo.publish(collection, resolvedId, options.publishedAt, options.requireScheduledDue, options.expectedScheduledAt, publishConfig.supportsRevisions, publishConfig.routable, expectedRevision, options.currentTime);
 			if (publishConfig.supportsRevisions && published.liveRevisionId && published.translationGroup) await recordPublishedReferences(trx, collection, published.liveRevisionId, published.translationGroup);
 			if (existing && isI18nEnabled() && publishConfig.supportsRevisions && published.translationGroup) await repo.syncNonTranslatableFields(collection, published.id, published.translationGroup, published.data, { previous: existing.data });
-			if (existing?.status === "published" && existing.slug && published.slug && existing.slug !== published.slug) redirectCreated = await createSlugChangeRedirect(trx, collection, existing.slug, published.slug, resolvedId, existing.publishedAt ?? null, published.publishedAt ?? null);
+			if (existing?.status === "published" && existing.slug && published.slug && existing.slug !== published.slug) redirectChanged = await createSlugChangeRedirect(trx, collection, existing.slug, published.slug, resolvedId, existing.publishedAt ?? null, published.publishedAt ?? null);
+			redirectChanged = await removeShadowingAutoRedirect(trx, collection, published.slug, published.id, published.publishedAt) || redirectChanged;
 			return published;
 		});
-		if (redirectCreated) after(() => publishRedirectChanges(db));
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 		await hydrateSeo(db, collection, item, await collectionHasSeo(db, collection));
 		return {
 			success: true,
@@ -1915,7 +1986,8 @@ async function handleContentUnpublish(db, collection, id, options = {}) {
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const resolvedId = await resolveId(repo, collection, id) ?? id;
-			return repo.unpublish(collection, resolvedId, expectedRevision);
+			const { supportsRevisions } = await getCollectionPublishConfig(trx, collection);
+			return repo.unpublish(collection, resolvedId, expectedRevision, supportsRevisions);
 		});
 		await hydrateSeo(db, collection, item, await collectionHasSeo(db, collection));
 		return {
@@ -2747,16 +2819,17 @@ async function createStorageIndexes(db, pluginId, collection, indexes, options)
 		const indexName = generateIndexName(pluginId, collection, fields, { unique: entry.unique });
 		try {
 			await generateCreateIndexSql(db, pluginId, collection, fields, { unique: entry.unique }).execute(db);
+			const fieldsJson = JSON.stringify(fields);
 			await db.insertInto("_plugin_indexes").values({
 				plugin_id: pluginId,
 				collection,
 				index_name: indexName,
-				fields: JSON.stringify(fields)
+				fields: fieldsJson
 			}).onConflict((oc) => oc.columns([
 				"plugin_id",
 				"collection",
 				"index_name"
-			]).doUpdateSet({ fields: JSON.stringify(fields) })).execute();
+			]).doUpdateSet({ fields: fieldsJson }).whereRef("_plugin_indexes.fields", "!=", "excluded.fields")).execute();
 			created.push(indexName);
 		} catch (error) {
 			errors.push({
@@ -5022,4 +5095,4 @@ async function handleRegistryUpdateCheck(db, registryConfigInput) {
 
 //#endregion
 export { handleContentDelete as A, handleContentSchedule as B, generateManifest as C, handleContentCountScheduled as D, handleContentCompare as E, handleContentList as F, handleScheduledPolicyRejection as G, handleContentUnpublish as H, handleContentListTrashed as I, validateRev as J, storagelessDataKeyError as K, handleContentPermanentDelete as L, handleContentDuplicate as M, handleContentGet as N, handleContentCountTrashed as O, handleContentGetIncludingTrashed as P, handleContentPublish as R, buildManifestCollections as S, handleContentAuthors as T, handleContentUnschedule as U, handleContentTranslations as V, handleContentUpdate as W, handlePluginSettingsGet as _, handleMarketplaceGetPlugin as a, handleRevisionList as b, handleMarketplaceUninstall as c, handleThemeGetDetail as d, handleThemeSearch as f, getPluginSettingsSchema as g, syncDeclaredStorageIndexes as h, handleRegistryUpdateCheck as i, handleContentDiscardDraft as j, handleContentCreate as k, handleMarketplaceUpdate as l, rollbackPluginUpdate as m, handleRegistryUninstall as n, handleMarketplaceInstall as o, loadBundleFromR2 as p, liveReferenceSelection as q, handleRegistryUpdate as r, handleMarketplaceSearch as s, handleRegistryInstall as t, handleMarketplaceUpdateCheck as u, handlePluginSettingsUpdate as v, changedStoragelessDataKeys as w, handleRevisionRestore as x, handleRevisionGet as y, handleContentRestore as z };
-//# sourceMappingURL=api-D-7BNHoz.mjs.map
+//# sourceMappingURL=api--PYoyeTo.mjs.map