emdash 1.3.0 → 1.4.0

package/dist/{content-DQSRZTVw.mjs → content-BKHUVsE5.mjs}

@@ -1,15 +1,17 @@
-import { d as __exportAll } from "./runner-C5NeAkBQ.mjs";
-import { n as isMissingTableError } from "./db-errors-CBD5yMro.mjs";
+import { f as __exportAll } from "./runner-Bkkfk4O8.mjs";
+import { r as isMissingTableError } from "./db-errors-unnO6yiZ.mjs";
 import { t as validateIdentifier } from "./validate-DANX1-Qi.mjs";
-import { c as executeAtomicBatchIfSupported, u as isPostgres } from "./dialect-helpers-7_IqPdh9.mjs";
+import { c as executeAtomicBatchIfSupported, u as isPostgres } from "./dialect-helpers-B1XN2HGB.mjs";
+import { i as getLocaleCandidates } from "./config-Cs_AwWXI.mjs";
 import { i as normalizeExplicitDatetime } from "./datetime-normalization-PeiEdcRY.mjs";
-import { l as invalidateCollectionCache } from "./object-cache-Bo6DGaC9.mjs";
-import { f as isIndexableFieldType, m as isStoragelessFieldRow } from "./types-BGmQ0uXs.mjs";
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-xC4UD5-S.mjs";
-import { n as slugify } from "./slugify-bu2-jKia.mjs";
-import { c as decodeCursor, i as InvalidCursorError, l as encodeCursor, n as ContentMutationConflictError, r as EmDashValidationError, s as ScheduledNotDueError, t as ContentCollectionNotFoundError } from "./types-D2NEXtgB.mjs";
-import { i as ContentDatetimeNormalizer, n as createRevisionId, t as RevisionRepository } from "./revision-BVp8S0e_.mjs";
-import { t as withTransaction } from "./transaction-BVYIo_yu.mjs";
+import { n as localeMatches, r as localeOrder, t as canonicalLocaleColumn } from "./query-BFHjCzSh.mjs";
+import { u as invalidateCollectionCache } from "./object-cache-DmKr09La.mjs";
+import { f as isIndexableFieldType, m as isStoragelessFieldRow } from "./types-C_asjp1J.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-DiW8VMwz.mjs";
+import { n as slugify } from "./slugify-BDEG9pLk.mjs";
+import { a as InvalidCursorError, c as ScheduledNotDueError, i as EmDashValidationError, l as decodeCursor, n as ContentMutationConflictError, r as ContentSlugConflictError, t as ContentCollectionNotFoundError, u as encodeCursor } from "./types-DwhEvIVb.mjs";
+import { i as ContentDatetimeNormalizer, n as createRevisionId, t as RevisionRepository } from "./revision-Dx7Uth1X.mjs";
+import { t as withTransaction } from "./transaction-CkoQ5wqQ.mjs";
 import { sql } from "kysely";
 import { ulid } from "ulidx";
 
@@ -306,6 +308,18 @@ var ContentRepository = class {
 		this.datetimeContexts = datetimeContexts;
 		this.datetimes = new ContentDatetimeNormalizer(db, datetimeContexts);
 	}
+	async assertAliasAwareSlugAvailable(type, slug, locale, excludeId) {
+		if (!slug || !locale || getLocaleCandidates(locale).length <= 1) return;
+		const tableName = getTableName(type);
+		if ((await sql`
+			SELECT id FROM ${sql.ref(tableName)}
+			WHERE slug = ${slug}
+			AND ${localeMatches("locale", locale)}
+			${excludeId === void 0 ? sql`` : sql`AND id <> ${excludeId}
+				AND coalesce((SELECT existing_row.slug FROM ${sql.ref(tableName)} AS existing_row WHERE existing_row.id = ${excludeId}), '') <> ${slug}`}
+			LIMIT 1
+		`.execute(this.db)).rows.length > 0) throw new ContentSlugConflictError();
+	}
 	/**
 	* Create a new content item
 	*/
@@ -318,6 +332,17 @@ var ContentRepository = class {
 		const normalizedPublishedAt = publishedAt ? await this.datetimes.normalizeValue(type, publishedAt) : null;
 		if (!type) throw new EmDashValidationError("Content type is required");
 		const tableName = getTableName(type);
+		if (translationOf && getLocaleCandidates(locale ?? "en").length > 1) {
+			if ((await sql`
+				SELECT sibling.id FROM ${sql.ref(tableName)} AS sibling
+				INNER JOIN ${sql.ref(tableName)} AS source
+					ON coalesce(source.translation_group, source.id) = sibling.translation_group
+				WHERE source.id = ${translationOf} AND source.deleted_at IS NULL
+					AND sibling.deleted_at IS NULL AND ${localeMatches("sibling.locale", locale ?? "en")}
+				LIMIT 1
+			`.execute(this.db)).rows.length > 0) throw new ContentMutationConflictError(`Translation already exists in locale "${locale ?? "en"}" for this content item`);
+		}
+		await this.assertAliasAwareSlugAvailable(type, slug, locale);
 		const columns = [
 			"id",
 			"slug",
@@ -401,7 +426,7 @@ var ContentRepository = class {
 		if ((locale ? await sql`
 					SELECT slug FROM ${sql.ref(tableName)}
 					WHERE slug = ${baseSlug}
-					AND locale = ${locale}
+					AND ${localeMatches("locale", locale)}
 					LIMIT 1
 				`.execute(this.db) : await sql`
 					SELECT slug FROM ${sql.ref(tableName)}
@@ -412,7 +437,7 @@ var ContentRepository = class {
 		const candidates = locale ? await sql`
 					SELECT slug FROM ${sql.ref(tableName)}
 					WHERE (slug = ${baseSlug} OR slug LIKE ${pattern})
-					AND locale = ${locale}
+					AND ${localeMatches("locale", locale)}
 				`.execute(this.db) : await sql`
 					SELECT slug FROM ${sql.ref(tableName)}
 					WHERE slug = ${baseSlug} OR slug LIKE ${pattern}
@@ -485,14 +510,16 @@ var ContentRepository = class {
 		if (slugs.length === 0) return items;
 		const tableName = getTableName(type);
 		const deletedFilter = options.includeTrashed ? sql`` : sql`AND deleted_at IS NULL`;
+		const statusFilter = options.publishedOnly ? sql`AND status = ${"published"}` : sql``;
 		for (const batch of chunks([...new Set(slugs)], SQL_BATCH_SIZE)) {
 			const result = await sql`
 				SELECT * FROM ${sql.ref(tableName)}
-				WHERE slug IN (${sql.join(batch)}) AND locale = ${locale} ${deletedFilter}
+				WHERE slug IN (${sql.join(batch)}) AND ${localeMatches("locale", locale)} ${deletedFilter} ${statusFilter}
+				ORDER BY ${localeOrder("locale", locale)}, id ASC
 			`.execute(this.db);
 			for (const row of result.rows) {
 				const item = this.mapRow(type, row);
-				if (item.slug !== null) items.set(item.slug, item);
+				if (item.slug !== null && !items.has(item.slug)) items.set(item.slug, item);
 			}
 		}
 		return items;
@@ -561,8 +588,9 @@ var ContentRepository = class {
 		const row = (locale ? await sql`
 					SELECT * FROM ${sql.ref(tableName)}
 					WHERE slug = ${slug}
-					AND locale = ${locale}
+					AND ${localeMatches("locale", locale)}
 					AND deleted_at IS NULL
+					ORDER BY ${localeOrder("locale", locale)}, id ASC
 				`.execute(this.db) : await sql`
 					SELECT * FROM ${sql.ref(tableName)}
 					WHERE slug = ${slug}
@@ -582,7 +610,8 @@ var ContentRepository = class {
 		const row = (locale ? await sql`
 					SELECT * FROM ${sql.ref(tableName)}
 					WHERE slug = ${slug}
-					AND locale = ${locale}
+					AND ${localeMatches("locale", locale)}
+					ORDER BY ${localeOrder("locale", locale)}, id ASC
 				`.execute(this.db) : await sql`
 					SELECT * FROM ${sql.ref(tableName)}
 					WHERE slug = ${slug}
@@ -609,7 +638,7 @@ var ContentRepository = class {
 		let query = this.db.selectFrom(tableName).selectAll().where("deleted_at", "is", null);
 		if (options.where?.status) query = query.where("status", "=", options.where.status);
 		if (options.where?.authorId) query = query.where("author_id", "=", options.where.authorId);
-		if (options.where?.locale) query = query.where("locale", "=", options.where.locale);
+		if (options.where?.locale) query = query.where(localeMatches("locale", options.where.locale));
 		query = this.applySearchFilter(query, options.where, type);
 		query = this.applyDateFilter(query, options.where);
 		query = this.applyBylineFilter(query, options.where, type);
@@ -671,9 +700,10 @@ var ContentRepository = class {
 	/**
 	* Update content
 	*/
-	async update(type, id, input) {
+	async update(type, id, input, expectedRevision) {
 		const tableName = getTableName(type);
 		const now = (/* @__PURE__ */ new Date()).toISOString();
+		await this.assertAliasAwareSlugAvailable(type, input.slug, input.locale, id);
 		const updates = {};
 		if (input.status !== void 0) updates.status = input.status;
 		if (input.slug !== void 0) updates.slug = input.slug;
@@ -687,8 +717,12 @@ var ContentRepository = class {
 		}
 		const hasColumnWrites = Object.keys(updates).length > 0;
 		if (hasColumnWrites) updates.updated_at = now;
+		if (input.draftRevisionId === null) updates.draft_revision_id = null;
 		updates.version = sql`version + 1`;
-		await this.db.updateTable(tableName).set(updates).where("id", "=", id).where("deleted_at", "is", null).execute();
+		let query = this.db.updateTable(tableName).set(updates).where("id", "=", id).where("deleted_at", "is", null);
+		if (expectedRevision) query = query.where(sql`version = ${expectedRevision.version}`).where(sql`updated_at = ${expectedRevision.updatedAt}`);
+		const result = await query.executeTakeFirst();
+		if (expectedRevision && result.numUpdatedRows === 0n) throw new ContentMutationConflictError();
 		if (hasColumnWrites) invalidateCollectionCache(type);
 		const updated = await this.findById(type, id);
 		if (!updated) throw new Error("Content not found");
@@ -841,7 +875,8 @@ var ContentRepository = class {
 		const supports = supportsRaw ? JSON.parse(supportsRaw) : [];
 		if (!Array.isArray(supports) || !supports.includes("revisions")) return this.update(type, id, {
 			...input,
-			data
+			data,
+			draftRevisionId: null
 		});
 		const fieldSlugs = new Set(collectionRows.map((row) => row.fieldSlug).filter((slug) => Boolean(slug)));
 		const revisionRepo = new RevisionRepository(this.db, this.datetimeContexts);
@@ -1152,7 +1187,7 @@ var ContentRepository = class {
 		const dbField = this.mapOrderField(orderField);
 		const safeOrderDirection = orderDirection.toLowerCase() === "asc" ? "ASC" : "DESC";
 		let query = this.db.selectFrom(tableName).selectAll().where("deleted_at", "is not", null);
-		if (options.where?.locale) query = query.where("locale", "=", options.where.locale);
+		if (options.where?.locale) query = query.where(localeMatches("locale", options.where.locale));
 		if (options.cursor) {
 			const { orderValue, id: cursorId } = decodeCursor(options.cursor);
 			if (safeOrderDirection === "DESC") query = query.where((eb) => eb.or([eb(dbField, "<", orderValue), eb.and([eb(dbField, "=", orderValue), eb("id", "<", cursorId)])]));
@@ -1183,7 +1218,7 @@ var ContentRepository = class {
 	async countTrashed(type, options = {}) {
 		const tableName = getTableName(type);
 		let query = this.db.selectFrom(tableName).select((eb) => eb.fn.count("id").as("count")).where("deleted_at", "is not", null);
-		if (options.locale) query = query.where("locale", "=", options.locale);
+		if (options.locale) query = query.where(localeMatches("locale", options.locale));
 		const result = await query.executeTakeFirst();
 		return Number(result?.count || 0);
 	}
@@ -1262,14 +1297,14 @@ var ContentRepository = class {
 		const localeColumn = `${tableName}.locale`;
 		const creditRenders = (eb, bylineIds) => {
 			let sub = eb.selectFrom("_emdash_content_bylines as cb").innerJoin("_emdash_bylines as b", "b.translation_group", "cb.byline_id").select("cb.id").where("cb.collection_slug", "=", type).whereRef("cb.content_id", "=", idColumn);
-			sub = filter.locale ? sub.where("b.locale", "=", filter.locale) : sub.whereRef("b.locale", "=", localeColumn);
+			sub = filter.locale ? sub.where(localeMatches("b.locale", filter.locale)) : sub.where(sql`${canonicalLocaleColumn("b.locale")} = ${canonicalLocaleColumn(localeColumn)}`);
 			if (bylineIds) sub = sub.where("cb.byline_id", "in", bylineIds);
 			return eb.exists(sub);
 		};
 		const hasExplicitCredit = (eb) => eb.exists(eb.selectFrom("_emdash_content_bylines as cb").select("cb.id").where("cb.collection_slug", "=", type).whereRef("cb.content_id", "=", idColumn));
 		const authorHasByline = (eb, bylineIds) => {
 			let sub = eb.selectFrom("_emdash_bylines as b").select("b.id").whereRef("b.user_id", "=", authorColumn);
-			sub = filter.locale ? sub.where("b.locale", "=", filter.locale) : sub.whereRef("b.locale", "=", localeColumn);
+			sub = filter.locale ? sub.where(localeMatches("b.locale", filter.locale)) : sub.where(sql`${canonicalLocaleColumn("b.locale")} = ${canonicalLocaleColumn(localeColumn)}`);
 			if (bylineIds) sub = sub.where("b.translation_group", "in", bylineIds);
 			return eb.exists(sub);
 		};
@@ -1296,7 +1331,7 @@ var ContentRepository = class {
 		let query = this.db.selectFrom(tableName).select((eb) => eb.fn.count("id").as("count")).where("deleted_at", "is", null);
 		if (where?.status) query = query.where("status", "=", where.status);
 		if (where?.authorId) query = query.where("author_id", "=", where.authorId);
-		if (where?.locale) query = query.where("locale", "=", where.locale);
+		if (where?.locale) query = query.where(localeMatches("locale", where.locale));
 		query = this.applySearchFilter(query, where, type);
 		query = this.applyDateFilter(query, where);
 		query = this.applyBylineFilter(query, where, type);
@@ -1750,10 +1785,12 @@ var ContentRepository = class {
 	* Unpublish content
 	*
 	* Removes live pointer and cancels any pending schedule, but preserves the
-	* draft and publication date. If no draft exists, creates one from the live
-	* version so the content isn't lost.
+	* draft and publication date. If no draft exists and `draftFromLive` is set,
+	* creates one from the live version so the content isn't lost. Collections
+	* without revisions save to the columns, and a draft revision would hide
+	* those saves.
 	*/
-	async unpublish(type, id, expectedRevision) {
+	async unpublish(type, id, expectedRevision, draftFromLive = true) {
 		const tableName = getTableName(type);
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const existing = await this.findById(type, id);
@@ -1764,7 +1801,7 @@ var ContentRepository = class {
 		let provisionalRevisionId = null;
 		try {
 			let draftRevisionId = existing.draftRevisionId;
-			if (!draftRevisionId && existing.liveRevisionId) {
+			if (draftFromLive && !draftRevisionId && existing.liveRevisionId) {
 				const liveRevision = await revisionRepo.findById(existing.liveRevisionId);
 				if (liveRevision) {
 					const draft = await revisionRepo.create({
@@ -2072,4 +2109,4 @@ var ContentRepository = class {
 
 //#endregion
 export { staleStoredKeys as a, keepKnownFields as i, content_exports as n, isSystemOrderField as r, ContentRepository as t };
-//# sourceMappingURL=content-DQSRZTVw.mjs.map
+//# sourceMappingURL=content-BKHUVsE5.mjs.map