emdash 0.17.0 → 0.17.1

package/dist/cli/index.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import { i as __exportAll, r as runMigrations, t as getMigrationStatus } from "../runner-eAgyIkeg.mjs";
 import { t as EmDashDatabaseError } from "../errors-9P_FDrJ_.mjs";
+import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { c as listTablesLike } from "../dialect-helpers-BKCvISIQ.mjs";
 import { r as isI18nEnabled } from "../config-CVssduLe.mjs";
 import { n as slugify } from "../slugify-Cjh1ssOZ.mjs";
@@ -13,7 +14,8 @@ import { t as OptionsRepository } from "../options-BL4X94qY.mjs";
 import "../redirect-BZUJltlj.mjs";
 import "../request-cache-BYMs-BGX.mjs";
 import "../byline-registry-CxK5g559.mjs";
-import "../byline-BrIVWLm-.mjs";
+import { t as BylineRepository } from "../byline-BrIVWLm-.mjs";
+import { n as isMissingTableError } from "../db-errors-CtzxKBxe.mjs";
 import "../fts-manager-DmUAk-kQ.mjs";
 import { n as SchemaRegistry } from "../registry-Dn6gsx3L.mjs";
 import { kyselyLogOption } from "../database/instrumentation.mjs";
@@ -24,7 +26,7 @@ import { n as isDeprecatedCapability, t as CAPABILITY_RENAMES } from "../types-C
 import "../ssrf-BsVGIE0Z.mjs";
 import "../ssrf-BvgVcfNQ.mjs";
 import { t as validateSeed } from "../validate-DactmcJG.mjs";
-import { t as applySeed } from "../apply-CgamLmed.mjs";
+import { t as applySeed } from "../apply-CuuZG6op.mjs";
 import { n as fingerprintKey, r as generateEncryptionKey, t as EmDashSecretsError } from "../secrets-YYbTgB1w.mjs";
 import { LocalStorage } from "../storage/local.mjs";
 import { o as convertDataForRead } from "../transport--Ck3RBin.mjs";
@@ -1248,16 +1250,97 @@ async function exportSeed(db, withContent) {
 	};
 	seed.settings = await exportSettings(db);
 	seed.collections = await exportCollections(db);
-	seed.taxonomies = await exportTaxonomies(db);
-	seed.menus = await exportMenus(db);
+	const i18nEnabled = await detectI18nEnabled(db, seed.collections);
+	seed.taxonomies = await exportTaxonomies(db, i18nEnabled);
+	seed.menus = await exportMenus(db, i18nEnabled);
 	seed.widgetAreas = await exportWidgetAreas(db);
+	const { bylines, groupToSeedId } = await exportBylines(db);
+	if (bylines.length > 0) seed.bylines = bylines;
 	if (withContent !== void 0) {
 		const collections = withContent === "" || withContent === "true" ? null : withContent.split(",").map((s) => s.trim()).filter(Boolean);
-		seed.content = await exportContent(db, seed.collections || [], collections);
+		seed.content = await exportContent(db, seed.collections || [], collections, groupToSeedId, i18nEnabled);
 	}
 	return seed;
 }
 /**
+* Export byline profiles as root-level `bylines[]`.
+*
+* `SeedByline` has no locale axis, so locale siblings of the same byline
+* (sharing a `translation_group`) collapse to a single profile. The returned
+* `groupToSeedId` map keys on `translation_group` — the value stored in
+* `_emdash_content_bylines.byline_id` — so content credits can resolve to the
+* emitted seed id.
+*/
+async function exportBylines(db) {
+	const bylineRepo = new BylineRepository(db);
+	const bylines = [];
+	const groupToSeedId = /* @__PURE__ */ new Map();
+	const usedSeedIds = /* @__PURE__ */ new Set();
+	let cursor;
+	do {
+		const result = await bylineRepo.findMany({
+			limit: 100,
+			cursor
+		});
+		for (const byline of result.items) {
+			const group = byline.translationGroup ?? byline.id;
+			if (groupToSeedId.has(group)) continue;
+			let seedId = `byline:${byline.slug}`;
+			if (usedSeedIds.has(seedId)) seedId = `byline:${byline.slug}:${group}`;
+			usedSeedIds.add(seedId);
+			groupToSeedId.set(group, seedId);
+			bylines.push({
+				id: seedId,
+				slug: byline.slug,
+				displayName: byline.displayName,
+				bio: byline.bio || void 0,
+				websiteUrl: byline.websiteUrl || void 0,
+				isGuest: byline.isGuest || void 0
+			});
+		}
+		cursor = result.nextCursor;
+	} while (cursor);
+	return {
+		bylines,
+		groupToSeedId
+	};
+}
+/**
+* Determine whether the export should emit locale-suffixed seed ids.
+*
+* The runtime initializes the i18n config in middleware, but the CLI never does,
+* so `isI18nEnabled()` is always false under `emdash export-seed` (#1330). When
+* the flag is unset, fall back to the data: a project is multi-locale when its
+* i18n-aware tables hold rows in more than one distinct locale. `locale` is
+* NOT NULL (defaulting to the site's default locale), so a per-row presence
+* check is not enough — only the *count* of distinct locales distinguishes a
+* genuinely single-locale project from a multi-locale one. This keeps
+* single-locale exports on bare ids and gives multi-locale exports the
+* per-locale suffix they need to avoid duplicate seed ids.
+*/
+async function detectI18nEnabled(db, collections) {
+	if (isI18nEnabled()) return true;
+	const locales = /* @__PURE__ */ new Set();
+	const collectDistinctLocales = async (tableRef) => {
+		const result = await sql`
+			SELECT DISTINCT locale FROM ${tableRef}
+		`.execute(db);
+		for (const row of result.rows) if (row.locale) locales.add(row.locale);
+		return locales.size > 1;
+	};
+	if (await collectDistinctLocales(sql.ref("_emdash_taxonomy_defs"))) return true;
+	if (await collectDistinctLocales(sql.ref("_emdash_menus"))) return true;
+	for (const collection of collections) {
+		validateIdentifier(collection.slug, "collection slug");
+		try {
+			if (await collectDistinctLocales(sql.ref(`ec_${collection.slug}`))) return true;
+		} catch (error) {
+			if (!isMissingTableError(error)) throw error;
+		}
+	}
+	return false;
+}
+/**
 * Export site settings
 */
 async function exportSettings(db) {
@@ -1306,8 +1389,7 @@ async function exportCollections(db) {
 /**
 * Export taxonomy definitions and terms
 */
-async function exportTaxonomies(db) {
-	const i18nEnabled = isI18nEnabled();
+async function exportTaxonomies(db, i18nEnabled) {
 	const defs = await db.selectFrom("_emdash_taxonomy_defs").selectAll().orderBy(["name", "locale"]).execute();
 	const result = [];
 	const termRepo = new TaxonomyRepository(db);
@@ -1364,8 +1446,7 @@ async function exportTaxonomies(db) {
 /**
 * Export menus with their items
 */
-async function exportMenus(db) {
-	const i18nEnabled = isI18nEnabled();
+async function exportMenus(db, i18nEnabled) {
 	const menus = await db.selectFrom("_emdash_menus").selectAll().orderBy(["name", "locale"]).execute();
 	const result = [];
 	const groupToSeedId = /* @__PURE__ */ new Map();
@@ -1487,7 +1568,7 @@ async function exportWidgetAreas(db) {
 /**
 * Export content from collections
 */
-async function exportContent(db, collections, includeCollections) {
+async function exportContent(db, collections, includeCollections, bylineGroupToSeedId, i18nEnabled) {
 	const content = {};
 	const contentRepo = new ContentRepository(db);
 	const taxonomyRepo = new TaxonomyRepository(db);
@@ -1510,7 +1591,6 @@ async function exportContent(db, collections, includeCollections) {
 			cursor = result.nextCursor;
 		} while (cursor);
 	} catch {}
-	const i18nEnabled = isI18nEnabled();
 	for (const collection of collections) {
 		if (includeCollections && !includeCollections.includes(collection.slug)) continue;
 		const entries = [];
@@ -1540,6 +1620,8 @@ async function exportContent(db, collections, includeCollections) {
 				}
 				const taxonomies = await getTaxonomyAssignments(taxonomyRepo, collection.slug, item.id);
 				if (Object.keys(taxonomies).length > 0) entry.taxonomies = taxonomies;
+				const bylines = await getBylineCredits(db, collection.slug, item.id, bylineGroupToSeedId);
+				if (bylines.length > 0) entry.bylines = bylines;
 				entries.push(entry);
 			}
 			cursor = result.nextCursor;
@@ -1587,6 +1669,26 @@ function processDataForExport(data, fields, mediaMap) {
 	return result;
 }
 /**
+* Get ordered byline credits for a content entry as `SeedBylineCredit[]`.
+*
+* The `_emdash_content_bylines.byline_id` column stores the credited byline's
+* `translation_group`, so it maps straight through `groupToSeedId`. Credits
+* whose group wasn't emitted in the root `bylines[]` are skipped (defensive;
+* shouldn't happen for a consistent DB).
+*/
+async function getBylineCredits(db, collection, entryId, groupToSeedId) {
+	const rows = await db.selectFrom("_emdash_content_bylines").select(["byline_id", "role_label"]).where("collection_slug", "=", collection).where("content_id", "=", entryId).orderBy("sort_order", "asc").execute();
+	const credits = [];
+	for (const row of rows) {
+		const seedId = groupToSeedId.get(row.byline_id);
+		if (!seedId) continue;
+		const credit = { byline: seedId };
+		if (row.role_label) credit.roleLabel = row.role_label;
+		credits.push(credit);
+	}
+	return credits;
+}
+/**
 * Get taxonomy term assignments for a content entry
 */
 async function getTaxonomyAssignments(taxonomyRepo, collection, entryId) {