dineway 0.1.49 → 0.2.0

package/dist/astro/routes/api/import/wordpress-plugin/execute.mjs

@@ -1,39 +1,49 @@
 import "../../../../../dialect-helpers-fk43GbDb.mjs";
 import "../../../../../base64-F8-DUraK.mjs";
-import "../../../../../types-CSgR9nQB.mjs";
-import "../../../../../loader--GOYux8M.mjs";
-import { n as slugify } from "../../../../../slugify-BqebcqBg.mjs";
-import { t as ContentRepository } from "../../../../../content-CBxYGWfL.mjs";
-import "../../../../../media-CbKyYukG.mjs";
-import "../../../../../options-LsPjZlqD.mjs";
-import "../../../../../site-activity-DONFrMBJ.mjs";
-import "../../../../../review-requests-BW2NxY-l.mjs";
-import "../../../../../entity-aliases-4y93Yjuc.mjs";
-import "../../../../../request-cache-ho99schz.mjs";
-import "../../../../../byline-registry-4v6tXMNX.mjs";
-import { t as BylineRepository } from "../../../../../byline-BVC1lV6G.mjs";
-import "../../../../../briefing-CkTee1ex.mjs";
-import "../../../../../context-types-r8oFvyOq.mjs";
-import "../../../../../fts-manager-B5l_qwrA.mjs";
-import { n as SchemaRegistry } from "../../../../../registry-D7HACema.mjs";
-import "../../../../../settings-CUXOxzsT.mjs";
-import "../../../../../query-CZ3TH_Uu.mjs";
-import "../../../../../zod-generator-K91-g665.mjs";
-import "../../../../../schema-Bsi-VpYv.mjs";
-import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-DCSuUAZW.mjs";
-import { n as parseBody, t as isParseError } from "../../../../../parse-CneSgl7-.mjs";
-import "../../../../../redirects-ocRJmQHP.mjs";
-import { u as wpPluginExecuteBody } from "../../../../../byline-fields-cNrLJVRs.mjs";
+import "../../../../../types-Dq1qT19x.mjs";
+import "../../../../../loader-CjWqjweO.mjs";
+import "../../../../../object-cache-D51qOseS.mjs";
+import { n as slugify } from "../../../../../slugify-KSsVD_D3.mjs";
+import { t as ContentRepository } from "../../../../../content-Bh4BDjv8.mjs";
+import "../../../../../media-DMj0grzC.mjs";
+import "../../../../../taxonomy-Dvsw6BOs.mjs";
+import "../../../../../options-DQPTH5n0.mjs";
+import "../../../../../site-activity-Dy3FROs0.mjs";
+import "../../../../../review-requests-DUyEmtmG.mjs";
+import "../../../../../hitl-Hw1RmWOq.mjs";
+import "../../../../../request-cache-D9GQBxMP.mjs";
+import "../../../../../byline-registry-87nNnYl4.mjs";
+import "../../../../../field-defs-cache-DRNdhBJv.mjs";
+import { t as BylineRepository } from "../../../../../byline-e51-fWRs.mjs";
+import "../../../../../enrich-DIFIFA8O.mjs";
+import "../../../../../briefing-CawZ59CY.mjs";
+import "../../../../../context-types-DqTo6C79.mjs";
+import "../../../../../content-refresh-CgutSUfO.mjs";
+import "../../../../../fts-manager-Crzypjqu.mjs";
+import { n as SchemaRegistry } from "../../../../../registry-CtyVedcN.mjs";
+import "../../../../../settings-BbqgHWpU.mjs";
+import "../../../../../query-jaAmw8E1.mjs";
+import "../../../../../zod-generator-B7TMjyFJ.mjs";
+import "../../../../../schema-DXdYj4R3.mjs";
+import "../../../../../resolve-Cb6Dbz-C.mjs";
+import "../../../../../taxonomies-DRiixp_E.mjs";
+import { t as handleTaxonomyCreate } from "../../../../../taxonomies-9s-v03H-.mjs";
+import { n as apiSuccess, r as handleError, t as apiError } from "../../../../../error-CytFlgcd.mjs";
+import { n as parseBody, t as isParseError } from "../../../../../parse-CbymENaR.mjs";
+import "../../../../../redirects-CA-xylPG.mjs";
+import { u as wpPluginExecuteBody } from "../../../../../byline-fields-DOJO16Gm.mjs";
+import "../../../../../status-DANd8ERo.mjs";
 import "../../../../../api/schemas/index.mjs";
-import "../../../../../parser-DxfsARXL.mjs";
-import { n as resolveAndValidateExternalUrl, t as SsrfError } from "../../../../../ssrf-DiKqWd3N.mjs";
-import { s as getSource } from "../../../../../import-4YBXbDkI.mjs";
-import { m as resolveImportByline } from "../../../../../utils-B8hBJ9Oz.mjs";
-import "../../../../../search-Gdrqj582.mjs";
-import { n as requirePerm } from "../../../../../authorize-BLO0m7fW.mjs";
-import { _ as RiskPolicyEvaluator, p as WordPressImportHitlPayloadBuilder } from "../../../../../site-context-C8Az_P_I.mjs";
-import "../../../../../activity-events-CwM7yxPW.mjs";
-import { i as resolveHitlRouteActor, n as hitlRequiredRouteError, t as ensureWorkflowHitlRouteRequest } from "../../../../../hitl-route-helpers-k---_H3-.mjs";
+import "../../../../../parser-C1nYd-81.mjs";
+import { n as resolveAndValidateExternalUrl, t as SsrfError } from "../../../../../ssrf-DWe8jwAp.mjs";
+import "../../../../../activity-events-y6eT8UW6.mjs";
+import { C as importMenusFromPlugin, S as importCommentsFromPlugin, b as parseSiteSettingsFromPlugin, h as getSource, n as fetchPluginMenus, r as fetchPluginOptions, t as fetchPluginComments, y as importSiteSettings } from "../../../../../import-Bh9biJfx.mjs";
+import { _ as sanitizeFieldSlug, g as resolveImportByline } from "../../../../../utils-CMDhr5Xd.mjs";
+import "../../../../../search-DSaLgEFI.mjs";
+import { n as requirePerm } from "../../../../../authorize-CcBxcHtz.mjs";
+import { f as WordPressImportHitlPayloadBuilder, g as RiskPolicyEvaluator } from "../../../../../site-context-DQiL8Fl5.mjs";
+import { i as resolveHitlRouteActor, n as hitlRequiredRouteError, t as ensureWorkflowHitlRouteRequest } from "../../../../../hitl-route-helpers-hEVzvP8l.mjs";
+import { importMediaWithProgress } from "../wordpress/media.mjs";
 import { z } from "zod";
 
 //#region src/astro/routes/api/import/wordpress-plugin/execute.ts
@@ -92,7 +102,15 @@ const POST = async ({ request, locals }) => {
 			includeDrafts: true
 		});
 		const manifest = await dineway.getManifest();
-		const result = await importContent(items, config, dineway, manifest);
+		const { result, contentIdMap, collectionByWpId } = await importContent(items, config, dineway, manifest);
+		await importPluginFollowups({
+			dineway,
+			url: body.url,
+			token: body.token,
+			result,
+			contentIdMap,
+			collectionByWpId
+		});
 		console.log("[WP Plugin Import] Import result:", JSON.stringify(result, null, 2));
 		return apiSuccess({
 			success: true,
@@ -127,8 +145,168 @@ const IMPORT_FIELDS = [
 		label: "Featured Image",
 		type: "image",
 		check: (item) => !!item.featuredImage
+	},
+	{
+		slug: "seo_title",
+		label: "SEO Title",
+		type: "string",
+		check: (item) => !!extractSeo(item).title
+	},
+	{
+		slug: "seo_description",
+		label: "SEO Description",
+		type: "text",
+		check: (item) => !!extractSeo(item).description
 	}
 ];
+/**
+* Coerce WordPress meta values to the destination Dineway field type.
+* Returns undefined when the value cannot be represented safely.
+*/
+function coerceToFieldType(value, fieldType) {
+	switch (fieldType) {
+		case "integer": {
+			const n = typeof value === "number" ? value : Number(value);
+			return Number.isInteger(n) ? n : void 0;
+		}
+		case "number": {
+			const n = typeof value === "number" ? value : Number(value);
+			return Number.isFinite(n) ? n : void 0;
+		}
+		case "boolean":
+			if (typeof value === "boolean") return value;
+			if (value === 1 || value === "1" || value === "true" || value === "yes") return true;
+			if (value === 0 || value === "0" || value === "false" || value === "no") return false;
+			return;
+		case "datetime": {
+			if (typeof value !== "string" && typeof value !== "number") return void 0;
+			const d = new Date(value);
+			return Number.isNaN(d.getTime()) ? void 0 : d.toISOString();
+		}
+		case "json": return value;
+		case "string":
+		case "text":
+		case "url":
+		case "select":
+		case "slug":
+		case "reference":
+			if (typeof value === "string") return value;
+			if (typeof value === "number") return String(value);
+			return;
+		default: return typeof value === "object" && value !== null ? value : void 0;
+	}
+}
+function pickSeoValue(blob, key) {
+	if (typeof blob !== "object" || blob === null) return void 0;
+	const value = blob[key];
+	return typeof value === "string" && value.trim() !== "" ? value : void 0;
+}
+function extractSeo(item) {
+	const yoast = item.meta?._yoast;
+	const rankmath = item.meta?._rankmath;
+	return {
+		title: pickSeoValue(yoast, "title") ?? pickSeoValue(rankmath, "title"),
+		description: pickSeoValue(yoast, "description") ?? pickSeoValue(rankmath, "description")
+	};
+}
+const BUILTIN_TAXONOMIES = new Set([
+	"category",
+	"post_tag",
+	"nav_menu",
+	"post_format"
+]);
+const TAXONOMY_NAME_PATTERN = /^[a-z][a-z0-9_]*$/;
+function manifestFieldType(field) {
+	if (typeof field !== "object" || field === null) return void 0;
+	if ("kind" in field && typeof field.kind === "string") return field.kind;
+	if ("type" in field && typeof field.type === "string") return field.type;
+}
+async function ensureCustomTaxonomyDefs(db, taxonomies, config) {
+	const created = [];
+	for (const taxonomy of taxonomies) {
+		if (BUILTIN_TAXONOMIES.has(taxonomy.name)) continue;
+		if (taxonomy.terms.length === 0) continue;
+		if (!TAXONOMY_NAME_PATTERN.test(taxonomy.name)) continue;
+		if (await db.selectFrom("_dineway_taxonomy_defs").select("id").where("name", "=", taxonomy.name).executeTakeFirst()) continue;
+		const collections = (taxonomy.post_types ?? []).map((postType) => config.postTypeMappings[postType]).filter((mapping) => mapping?.enabled).map((mapping) => mapping.collection);
+		const result = await handleTaxonomyCreate(db, {
+			name: taxonomy.name,
+			label: taxonomy.label,
+			labelSingular: taxonomy.label_singular,
+			hierarchical: taxonomy.hierarchical,
+			collections: [...new Set(collections)]
+		});
+		if (result.success) created.push(taxonomy.name);
+		else console.warn(`[WP Plugin Import] Could not create taxonomy '${taxonomy.name}':`, result.error.message);
+	}
+	return created;
+}
+async function importPluginFollowups({ dineway, url, token, result, contentIdMap, collectionByWpId, fetchers }) {
+	const fetchMenus = fetchers?.menus ?? fetchPluginMenus;
+	const fetchComments = fetchers?.comments ?? fetchPluginComments;
+	const fetchOptions = fetchers?.options ?? fetchPluginOptions;
+	try {
+		const menus = await fetchMenus(url, token);
+		if (menus.length > 0) {
+			const menuResult = await importMenusFromPlugin(menus, dineway.db, contentIdMap);
+			result.menus = {
+				created: menuResult.menusCreated,
+				items: menuResult.itemsCreated
+			};
+			for (const menuError of menuResult.errors) result.errors.push({
+				title: `Menu: ${menuError.menu}`,
+				error: menuError.error
+			});
+		}
+	} catch (error) {
+		console.warn("[WP Plugin Import] Menu import failed:", error);
+	}
+	try {
+		const comments = await fetchComments(url, token);
+		if (comments.length > 0) {
+			const commentsResult = await importCommentsFromPlugin(comments, dineway.db, contentIdMap, collectionByWpId);
+			result.comments = {
+				imported: commentsResult.imported,
+				skipped: commentsResult.skipped
+			};
+			for (const commentError of commentsResult.errors) result.errors.push({
+				title: `Comment: ${commentError.comment}`,
+				error: commentError.error
+			});
+		}
+	} catch (error) {
+		console.warn("[WP Plugin Import] Comment import failed:", error);
+	}
+	try {
+		result.siteSettings = await applySiteSettings(dineway, url, token, fetchOptions);
+	} catch (error) {
+		console.warn("[WP Plugin Import] Site settings import failed:", error);
+	}
+}
+async function applySiteSettings(dineway, url, token, fetchOptions) {
+	const parsed = parseSiteSettingsFromPlugin(await fetchOptions(url, token));
+	const media = {};
+	const storage = dineway.storage;
+	if (storage && (parsed.logo?.url || parsed.favicon?.url)) {
+		const attachments = [];
+		if (parsed.logo?.url) attachments.push({
+			id: parsed.logo.id,
+			url: parsed.logo.url
+		});
+		if (parsed.favicon?.url && parsed.favicon.url !== parsed.logo?.url) attachments.push({
+			id: parsed.favicon.id,
+			url: parsed.favicon.url
+		});
+		const mediaResult = await importMediaWithProgress(attachments, dineway.db, storage, () => {});
+		for (const item of mediaResult.imported) {
+			if (item.originalUrl === parsed.logo?.url) media.logoMediaId = item.mediaId;
+			if (item.originalUrl === parsed.favicon?.url) media.faviconMediaId = item.mediaId;
+		}
+	}
+	const settingsResult = await importSiteSettings(parsed, dineway.db, true, media);
+	for (const settingError of settingsResult.errors) console.warn(`[WP Plugin Import] Site setting "${settingError.setting}" failed:`, settingError.error);
+	return settingsResult.applied;
+}
 async function importContent(items, config, dineway, manifest) {
 	const result = {
 		success: true,
@@ -137,11 +315,14 @@ async function importContent(items, config, dineway, manifest) {
 		errors: [],
 		byCollection: {}
 	};
+	const contentIdMap = /* @__PURE__ */ new Map();
+	const collectionByWpId = /* @__PURE__ */ new Map();
 	const contentRepo = new ContentRepository(dineway.db);
 	const bylineRepo = new BylineRepository(dineway.db);
 	const bylineCache = /* @__PURE__ */ new Map();
 	const schemaRegistry = new SchemaRegistry(dineway.db);
-	const ensuredCollections = /* @__PURE__ */ new Set();
+	const ensuredFields = /* @__PURE__ */ new Set();
+	const fieldTypesByCollection = /* @__PURE__ */ new Map();
 	const translationGroupMap = /* @__PURE__ */ new Map();
 	for await (const item of items) {
 		console.log("[WP Plugin Import] Processing item:", {
@@ -168,29 +349,50 @@ async function importContent(items, config, dineway, manifest) {
 			continue;
 		}
 		try {
-			if (!ensuredCollections.has(collection)) {
-				for (const field of IMPORT_FIELDS) if (field.check(item)) {
-					if (!await schemaRegistry.getField(collection, field.slug)) {
-						console.log(`[WP Plugin Import] Creating missing field "${field.slug}" in collection "${collection}"`);
-						try {
-							await schemaRegistry.createField(collection, {
-								slug: field.slug,
-								label: field.label,
-								type: field.type,
-								required: false
-							});
-						} catch (e) {
-							console.log(`[WP Plugin Import] Field "${field.slug}" creation skipped:`, e instanceof Error ? e.message : e);
-						}
+			for (const field of IMPORT_FIELDS) {
+				const ensureKey = `${collection}:${field.slug}`;
+				if (ensuredFields.has(ensureKey) || !field.check(item)) continue;
+				ensuredFields.add(ensureKey);
+				if (!await schemaRegistry.getField(collection, field.slug)) {
+					console.log(`[WP Plugin Import] Creating missing field "${field.slug}" in collection "${collection}"`);
+					try {
+						await schemaRegistry.createField(collection, {
+							slug: field.slug,
+							label: field.label,
+							type: field.type,
+							required: false
+						});
+						fieldTypesByCollection.get(collection)?.set(field.slug, field.type);
+					} catch (e) {
+						console.log(`[WP Plugin Import] Field "${field.slug}" creation skipped:`, e instanceof Error ? e.message : e);
 					}
 				}
-				ensuredCollections.add(collection);
+			}
+			let fieldTypes = fieldTypesByCollection.get(collection);
+			if (!fieldTypes) {
+				fieldTypes = /* @__PURE__ */ new Map();
+				const manifestFields = manifest.collections[collection]?.fields ?? {};
+				for (const [slug, field] of Object.entries(manifestFields)) {
+					const fieldType = manifestFieldType(field);
+					if (fieldType) fieldTypes.set(slug, fieldType);
+				}
+				const registryWithLists = schemaRegistry;
+				if (typeof registryWithLists.getCollection === "function" && typeof registryWithLists.listFields === "function") {
+					const collectionDef = await registryWithLists.getCollection(collection);
+					for (const field of collectionDef ? await registryWithLists.listFields(collectionDef.id) : []) fieldTypes.set(field.slug, field.type);
+				}
+				fieldTypesByCollection.set(collection, fieldTypes);
 			}
 			const slug = item.slug || slugify(item.title || `post-${item.sourceId}`);
 			if (config.skipExisting) {
 				const existing = await contentRepo.findBySlug(collection, slug, item.locale);
 				if (existing) {
 					if (item.translationGroup) translationGroupMap.set(item.translationGroup, existing.id);
+					const wpId = Number(item.sourceId);
+					if (Number.isFinite(wpId)) {
+						contentIdMap.set(wpId, existing.id);
+						collectionByWpId.set(wpId, collection);
+					}
 					result.skipped++;
 					continue;
 				}
@@ -204,6 +406,23 @@ async function importContent(items, config, dineway, manifest) {
 				data.featured_image = item.featuredImage;
 				console.log("[WP Plugin Import] Adding featured_image:", item.featuredImage);
 			}
+			const seo = extractSeo(item);
+			if (seo.title) data.seo_title = seo.title;
+			if (seo.description) data.seo_description = seo.description;
+			const assignMetaValue = (key, value) => {
+				if (value === null || value === "") return;
+				const fieldSlug = sanitizeFieldSlug(key);
+				const fieldType = fieldTypes.get(fieldSlug);
+				if (!fieldType || fieldSlug in data) return;
+				const coerced = coerceToFieldType(value, fieldType);
+				if (coerced !== void 0) data[fieldSlug] = coerced;
+			};
+			const acf = item.meta?._acf;
+			if (typeof acf === "object" && acf !== null) for (const [key, value] of Object.entries(acf)) assignMetaValue(key, value);
+			if (item.meta) for (const [key, value] of Object.entries(item.meta)) {
+				if (key.startsWith("_")) continue;
+				assignMetaValue(key, value);
+			}
 			let authorId;
 			if (config.authorMappings && item.author) {
 				const mappedUserId = config.authorMappings[item.author];
@@ -232,10 +451,15 @@ async function importContent(items, config, dineway, manifest) {
 			if (createResult.success) {
 				result.imported++;
 				result.byCollection[collection] = (result.byCollection[collection] || 0) + 1;
-				if (item.translationGroup && !translationGroupMap.has(item.translationGroup)) {
-					const createdData = createResult.data;
-					if (createdData?.id) translationGroupMap.set(item.translationGroup, createdData.id);
+				const createdId = createResult.data?.item?.id;
+				if (createdId) {
+					const wpId = Number(item.sourceId);
+					if (Number.isFinite(wpId)) {
+						contentIdMap.set(wpId, createdId);
+						collectionByWpId.set(wpId, collection);
+					}
 				}
+				if (item.translationGroup && !translationGroupMap.has(item.translationGroup) && createdId) translationGroupMap.set(item.translationGroup, createdId);
 			} else result.errors.push({
 				title: item.title || "Untitled",
 				error: typeof createResult.error === "object" && createResult.error !== null ? createResult.error.message || "Unknown error" : String(createResult.error)
@@ -249,7 +473,11 @@ async function importContent(items, config, dineway, manifest) {
 		}
 	}
 	result.success = result.errors.length === 0;
-	return result;
+	return {
+		result,
+		contentIdMap,
+		collectionByWpId
+	};
 }
 function mapStatus(wpStatus) {
 	switch (wpStatus) {
@@ -267,4 +495,4 @@ async function collectPluginItems(items) {
 }
 
 //#endregion
-export { POST, prerender };
+export { POST, coerceToFieldType, ensureCustomTaxonomyDefs, importContent, importPluginFollowups, prerender };

package/dist/astro/routes/api/manifest.mjs

@@ -1,7 +1,8 @@
-import { n as VERSION, t as COMMIT } from "../../../version-C4gfn0PJ.mjs";
-import { r as handleError } from "../../../error-DCSuUAZW.mjs";
-import { t as getAuthMode } from "../../../mode-CZqCF9dZ.mjs";
-import { i as experimentalSiteContextWorkflowsEnabled } from "../../../experimental-workflows-CSMffP6q.mjs";
+import { t as OptionsRepository } from "../../../options-DQPTH5n0.mjs";
+import { n as VERSION, t as COMMIT } from "../../../version-BTvfRGc6.mjs";
+import { r as handleError } from "../../../error-CytFlgcd.mjs";
+import { t as getAuthMode } from "../../../mode-C4CIyjtR.mjs";
+import { i as experimentalSiteContextWorkflowsEnabled } from "../../../experimental-workflows-BMsUnIAw.mjs";
 
 //#region src/astro/routes/api/manifest.ts
 const prerender = false;
@@ -10,7 +11,15 @@ const GET = async ({ locals }) => {
 		const { dineway } = locals;
 		const manifestSource = dineway ? await dineway.getManifest() : null;
 		const authMode = getAuthMode(dineway?.config);
-		const adminBranding = manifestSource?.admin ?? dineway?.config.admin;
+		let adminBranding = manifestSource?.admin ?? dineway?.config.admin;
+		if (!adminBranding?.siteName && dineway?.db) try {
+			const titles = await new OptionsRepository(dineway.db).getMany(["site:title", "dineway:site_title"]);
+			const siteTitle = titles.get("site:title") ?? titles.get("dineway:site_title");
+			if (siteTitle) adminBranding = {
+				...adminBranding,
+				siteName: siteTitle
+			};
+		} catch {}
 		let signupEnabled = false;
 		if (dineway?.db && authMode.type === "passkey") try {
 			const { sql } = await import("kysely");