emdash 0.27.0 → 0.28.1

package/src/import/settings.ts

@@ -1,12 +1,20 @@
 /**
  * Site settings import functions
  *
- * Import site settings from WordPress (title, tagline, logo, favicon, etc.)
+ * Import site settings from WordPress (title, tagline, logo, favicon)
+ * into EmDash's site settings (the `site:*` options read by
+ * `getSiteSettings()` and the templates).
  */
 
 import type { Kysely } from "kysely";
 
+import { OptionsRepository } from "../database/repositories/options.js";
 import type { Database } from "../database/types.js";
+import { invalidateSiteSettingsCache } from "../settings/index.js";
+import type { SiteSettings } from "../settings/types.js";
+
+/** Options key prefix used by the site settings module (`settings/index.ts`). */
+const SETTINGS_PREFIX = "site:";
 
 /**
  * Site settings analysis from import source
@@ -16,30 +24,10 @@ export interface SiteSettingsAnalysis {
 	title?: string;
 	/** Site tagline/description */
 	tagline?: string;
-	/** Custom logo */
+	/** Custom logo (source URL + WP attachment ID) */
 	logo?: { url: string; id?: number };
-	/** Favicon/site icon */
+	/** Favicon/site icon (source URL + WP attachment ID) */
 	favicon?: { url: string; id?: number };
-	/** Front page settings */
-	frontPage?: { type: "posts" | "page"; pageId?: number };
-	/** SEO settings (Yoast, RankMath, etc.) */
-	seo?: Record<string, unknown>;
-}
-
-/**
- * Widget area analysis
- */
-export interface WidgetAreaAnalysis {
-	/** Widget area ID */
-	id: string;
-	/** Widget area name */
-	name: string;
-	/** Widget area label */
-	label: string;
-	/** Number of widgets */
-	widgetCount: number;
-	/** Widget summaries */
-	widgets: Array<{ type: string; title?: string }>;
 }
 
 /**
@@ -55,17 +43,33 @@ export interface SettingsImportResult {
 }
 
 /**
- * Import site settings from analysis
+ * Resolved EmDash media IDs for the logo/favicon source URLs.
+ * The caller side-loads the files (they need storage access) and
+ * passes the resulting media IDs here.
+ */
+export interface SettingsMediaIds {
+	logoMediaId?: string;
+	faviconMediaId?: string;
+}
+
+/**
+ * Import site settings from analysis into EmDash site settings.
+ *
+ * Writes the `site:*` options consumed by `getSiteSettings()` and
+ * invalidates the settings cache. Logo/favicon are only applied when
+ * the caller resolved them to EmDash media IDs.
  *
  * @param settings - Site settings analysis
  * @param db - Database connection
- * @param overwrite - Whether to overwrite existing settings
- * @returns Import result
+ * @param overwrite - Whether to overwrite existing settings (a fresh
+ *   site's seed already sets title/tagline, so migrations pass true)
+ * @param media - Resolved media IDs for logo/favicon
  */
 export async function importSiteSettings(
 	settings: SiteSettingsAnalysis,
 	db: Kysely<Database>,
 	overwrite = false,
+	media: SettingsMediaIds = {},
 ): Promise<SettingsImportResult> {
 	const result: SettingsImportResult = {
 		applied: [],
@@ -73,155 +77,54 @@ export async function importSiteSettings(
 		errors: [],
 	};
 
-	// Import title
+	const updates: Array<{ setting: keyof SiteSettings; value: unknown }> = [];
 	if (settings.title) {
-		try {
-			const applied = await setOption(db, "site_title", settings.title, overwrite);
-			if (applied) {
-				result.applied.push("site_title");
-			} else {
-				result.skipped.push("site_title");
-			}
-		} catch (error) {
-			result.errors.push({
-				setting: "site_title",
-				error: error instanceof Error ? error.message : String(error),
-			});
-		}
+		updates.push({ setting: "title", value: settings.title });
 	}
-
-	// Import tagline
 	if (settings.tagline) {
-		try {
-			const applied = await setOption(db, "site_tagline", settings.tagline, overwrite);
-			if (applied) {
-				result.applied.push("site_tagline");
-			} else {
-				result.skipped.push("site_tagline");
-			}
-		} catch (error) {
-			result.errors.push({
-				setting: "site_tagline",
-				error: error instanceof Error ? error.message : String(error),
-			});
-		}
+		updates.push({ setting: "tagline", value: settings.tagline });
 	}
-
-	// Import logo URL (actual media import handled separately)
-	if (settings.logo?.url) {
-		try {
-			const applied = await setOption(db, "site_logo_url", settings.logo.url, overwrite);
-			if (applied) {
-				result.applied.push("site_logo_url");
-			} else {
-				result.skipped.push("site_logo_url");
-			}
-		} catch (error) {
-			result.errors.push({
-				setting: "site_logo_url",
-				error: error instanceof Error ? error.message : String(error),
-			});
-		}
+	if (media.logoMediaId) {
+		updates.push({ setting: "logo", value: { mediaId: media.logoMediaId } });
 	}
-
-	// Import favicon URL
-	if (settings.favicon?.url) {
-		try {
-			const applied = await setOption(db, "site_favicon_url", settings.favicon.url, overwrite);
-			if (applied) {
-				result.applied.push("site_favicon_url");
-			} else {
-				result.skipped.push("site_favicon_url");
-			}
-		} catch (error) {
-			result.errors.push({
-				setting: "site_favicon_url",
-				error: error instanceof Error ? error.message : String(error),
-			});
-		}
+	if (media.faviconMediaId) {
+		updates.push({ setting: "favicon", value: { mediaId: media.faviconMediaId } });
 	}
 
-	// Import front page settings
-	if (settings.frontPage) {
-		try {
-			const applied = await setOption(db, "front_page_type", settings.frontPage.type, overwrite);
-			if (applied) {
-				result.applied.push("front_page_type");
-			} else {
-				result.skipped.push("front_page_type");
-			}
+	if (updates.length === 0) {
+		return result;
+	}
 
-			if (settings.frontPage.pageId) {
-				const pageApplied = await setOption(
-					db,
-					"front_page_id",
-					String(settings.frontPage.pageId),
-					overwrite,
-				);
-				if (pageApplied) {
-					result.applied.push("front_page_id");
-				} else {
-					result.skipped.push("front_page_id");
+	const options = new OptionsRepository(db);
+	try {
+		for (const { setting, value } of updates) {
+			try {
+				const key = `${SETTINGS_PREFIX}${setting}`;
+				if (!overwrite) {
+					const existing = await options.get(key);
+					if (existing !== null) {
+						result.skipped.push(setting);
+						continue;
+					}
 				}
+				await options.set(key, value);
+				result.applied.push(setting);
+			} catch (error) {
+				result.errors.push({
+					setting,
+					error: error instanceof Error ? error.message : String(error),
+				});
 			}
-		} catch (error) {
-			result.errors.push({
-				setting: "front_page",
-				error: error instanceof Error ? error.message : String(error),
-			});
 		}
-	}
-
-	// Import SEO settings as JSON blob
-	if (settings.seo && Object.keys(settings.seo).length > 0) {
-		try {
-			const applied = await setOption(db, "seo_settings", JSON.stringify(settings.seo), overwrite);
-			if (applied) {
-				result.applied.push("seo_settings");
-			} else {
-				result.skipped.push("seo_settings");
-			}
-		} catch (error) {
-			result.errors.push({
-				setting: "seo_settings",
-				error: error instanceof Error ? error.message : String(error),
-			});
+	} finally {
+		if (result.applied.length > 0) {
+			invalidateSiteSettingsCache();
 		}
 	}
 
 	return result;
 }
 
-/**
- * Set an option in the database
- *
- * @returns true if the option was set, false if skipped (already exists and !overwrite)
- */
-async function setOption(
-	db: Kysely<Database>,
-	key: string,
-	value: string,
-	overwrite: boolean,
-): Promise<boolean> {
-	const existing = await db
-		.selectFrom("options")
-		.select("value")
-		.where("name", "=", key)
-		.executeTakeFirst();
-
-	if (existing && !overwrite) {
-		return false;
-	}
-
-	if (existing) {
-		await db.updateTable("options").set({ value }).where("name", "=", key).execute();
-	} else {
-		await db.insertInto("options").values({ name: key, value }).execute();
-	}
-
-	return true;
-}
-
 /**
  * Parse site settings from WordPress plugin options response
  */
@@ -230,52 +133,25 @@ export function parseSiteSettingsFromPlugin(
 ): SiteSettingsAnalysis {
 	const settings: SiteSettingsAnalysis = {};
 
-	// Basic settings
-	if (typeof options.blogname === "string") {
+	if (typeof options.blogname === "string" && options.blogname.trim() !== "") {
 		settings.title = options.blogname;
 	}
-	if (typeof options.blogdescription === "string") {
+	if (typeof options.blogdescription === "string" && options.blogdescription.trim() !== "") {
 		settings.tagline = options.blogdescription;
 	}
 
-	// Logo and favicon
-	if (typeof options.custom_logo_url === "string") {
+	if (typeof options.custom_logo_url === "string" && options.custom_logo_url !== "") {
 		settings.logo = {
 			url: options.custom_logo_url,
 			id: typeof options.custom_logo === "number" ? options.custom_logo : undefined,
 		};
 	}
-	if (typeof options.site_icon_url === "string") {
+	if (typeof options.site_icon_url === "string" && options.site_icon_url !== "") {
 		settings.favicon = {
 			url: options.site_icon_url,
 			id: typeof options.site_icon === "number" ? options.site_icon : undefined,
 		};
 	}
 
-	// Front page settings
-	if (options.show_on_front === "page") {
-		settings.frontPage = {
-			type: "page",
-			pageId: typeof options.page_on_front === "number" ? options.page_on_front : undefined,
-		};
-	} else {
-		settings.frontPage = { type: "posts" };
-	}
-
-	// SEO settings (Yoast)
-	const seo: Record<string, unknown> = {};
-	if (typeof options.wpseo === "object" && options.wpseo !== null) {
-		seo.yoast = options.wpseo;
-	}
-	if (typeof options.wpseo_titles === "object" && options.wpseo_titles !== null) {
-		seo.yoast_titles = options.wpseo_titles;
-	}
-	if (typeof options.wpseo_social === "object" && options.wpseo_social !== null) {
-		seo.yoast_social = options.wpseo_social;
-	}
-	if (Object.keys(seo).length > 0) {
-		settings.seo = seo;
-	}
-
 	return settings;
 }