dineway 0.1.48 → 0.2.0

package/dist/{query-BYc3oruA.mjs → query-CfRCdaL3.mjs}

@@ -1,9 +1,10 @@
-import { a as __exportAll } from "./runner-B-tbV751.mjs";
+import { a as __exportAll } from "./runner-DB7CRfOF.mjs";
 import { n as getI18nConfig, r as isI18nEnabled, t as getFallbackChain } from "./config-CVssduLe.mjs";
-import { i as encodeCursor } from "./types-DfuD0Afl.mjs";
 import { getRequestContext } from "./request-context.mjs";
-import { r as requestCached } from "./request-cache-CYMbwZc6.mjs";
-import { a as isMissingTableError, o as takeLiveCollectionMeta, t as CURSOR_RAW_VALUES } from "./loader-tg63WSY2.mjs";
+import { i as encodeCursor } from "./types-Dq1qT19x.mjs";
+import { o as isMissingTableError, s as takeLiveCollectionMeta, t as CURSOR_RAW_VALUES } from "./loader-CjWqjweO.mjs";
+import { i as contentNamespaces, n as cachedQuery, u as invalidateSchemaObjectCache } from "./object-cache-D51qOseS.mjs";
+import { r as requestCached } from "./request-cache-D9GQBxMP.mjs";
 
 //#region src/visual-editing/editable.ts
 /**
@@ -84,6 +85,8 @@ var query_exports = /* @__PURE__ */ __exportAll({
 	resolveDinewayPath: () => resolveDinewayPath,
 	sliceCollectionResult: () => sliceCollectionResult
 });
+const FOLDED_TERMS = Symbol.for("dineway:foldedTerms");
+const FOLDED_BYLINES = Symbol.for("dineway:foldedBylines");
 const COLLECTION_NAME = "_dineway";
 /** Symbol key for edit metadata on PT arrays — avoids collision with user data */
 const DINEWAY_EDIT = Symbol.for("__dineway");
@@ -125,6 +128,14 @@ function dataStr(data, key, fallback = "") {
 	const val = data[key];
 	return typeof val === "string" ? val : fallback;
 }
+/** Safely read a date-like field from a Record */
+function dataDate(data, key) {
+	const val = data[key];
+	if (val instanceof Date) return Number.isNaN(val.getTime()) ? void 0 : val;
+	if (typeof val !== "string" && typeof val !== "number") return void 0;
+	const date = new Date(val);
+	return Number.isNaN(date.getTime()) ? void 0 : date;
+}
 /** Type guard for Record<string, unknown> */
 function isRecord(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -176,61 +187,105 @@ async function getDinewayCollection(type, filter) {
 	const i18nConfig = getI18nConfig();
 	const resolvedLocale = filter?.locale ?? ctx?.locale ?? (isI18nEnabled() ? i18nConfig.defaultLocale : void 0);
 	const bucketed = bucketFilter(filter);
-	const cached = await requestCached(collectionCacheKey(type, bucketed.fetchFilter, resolvedLocale), async () => {
-		const { getLiveCollection } = await import("astro:content");
-		const requestedFetchLimit = bucketed.fetchFilter?.limit;
-		const liveLimit = requestedFetchLimit !== void 0 && requestedFetchLimit > 0 ? requestedFetchLimit + 1 : requestedFetchLimit;
-		const liveFilter = {
-			type,
-			status: bucketed.fetchFilter?.status,
-			limit: liveLimit,
-			cursor: bucketed.fetchFilter?.cursor,
-			where: bucketed.fetchFilter?.where,
-			q: bucketed.fetchFilter?.q,
-			searchColumns: bucketed.fetchFilter?.searchColumns,
-			orderBy: bucketed.fetchFilter?.orderBy,
-			locale: resolvedLocale
-		};
-		const result = await getLiveCollection(COLLECTION_NAME, liveFilter);
-		const meta = takeLiveCollectionMeta(liveFilter);
-		const { entries, error, cacheHint } = result;
-		const rawCursor = Object.getOwnPropertyDescriptor(result, "nextCursor")?.value;
-		const nextCursor = typeof rawCursor === "string" ? rawCursor : meta?.nextCursor;
-		const rawTotal = Object.getOwnPropertyDescriptor(result, "total")?.value;
-		const total = typeof rawTotal === "number" ? rawTotal : meta?.total;
-		if (error) return {
-			entries: [],
-			error,
-			cacheHint: {},
-			total
-		};
-		const hasMore = requestedFetchLimit !== void 0 && requestedFetchLimit > 0 && entries.length > requestedFetchLimit;
-		const pageEntries = hasMore ? entries.slice(0, requestedFetchLimit) : entries;
-		const pageNextCursor = (hasMore ? encodeEntryCursor(pageEntries.at(-1), bucketed.fetchFilter?.orderBy) : void 0) ?? nextCursor;
-		const isEditMode = ctx?.editMode ?? false;
-		const entriesWithEdit = pageEntries.map((entry) => {
-			const dbId = entryDatabaseId(entry);
-			if (isEditMode) tagEditableFields(entryData(entry), type, dbId);
+	const cached = await requestCached(collectionCacheKey(type, bucketed.fetchFilter, resolvedLocale), () => loadCollectionCached(type, bucketed.fetchFilter, resolvedLocale));
+	return bucketed.requestedLimit === void 0 ? cached : sliceCollectionResult(cached, bucketed.requestedLimit, filter?.orderBy);
+}
+async function loadCollectionCached(type, filter, resolvedLocale) {
+	const snapshot = await cachedQuery({
+		namespace: contentNamespaces(type),
+		key: collectionCacheKey(type, filter, resolvedLocale),
+		load: async () => {
+			const result = await getDinewayCollectionUncached(type, filter, resolvedLocale);
+			if (result.error) return {
+				ok: false,
+				error: result.error,
+				cacheHint: result.cacheHint,
+				total: result.total
+			};
 			return {
-				...entry,
-				edit: isEditMode ? createEditable(type, dbId, entryEditOptions(entry)) : createNoop()
+				ok: true,
+				value: {
+					entries: result.entries.map(entrySnapshot),
+					nextCursor: result.nextCursor,
+					hasMore: result.hasMore,
+					total: result.total,
+					cacheHint: result.cacheHint
+				}
 			};
-		});
-		await Promise.all([hydrateEntryBylines(type, entriesWithEdit), hydrateEntryTerms(type, entriesWithEdit, resolvedLocale)]);
+		},
+		cacheable: (snap) => snap.ok
+	});
+	if (!snapshot.ok) return {
+		entries: [],
+		error: snapshot.error,
+		cacheHint: snapshot.cacheHint,
+		total: snapshot.total
+	};
+	return {
+		entries: snapshot.value.entries.map((entry) => reviveEntry(entry)),
+		nextCursor: snapshot.value.nextCursor,
+		hasMore: snapshot.value.hasMore,
+		total: snapshot.value.total,
+		cacheHint: snapshot.value.cacheHint
+	};
+}
+async function getDinewayCollectionUncached(type, filter, resolvedLocale) {
+	const { getLiveCollection } = await import("astro:content");
+	const ctx = getRequestContext();
+	const requestedFetchLimit = filter?.limit;
+	const liveLimit = requestedFetchLimit !== void 0 && requestedFetchLimit > 0 ? requestedFetchLimit + 1 : requestedFetchLimit;
+	const pageParam = filter?.cursor !== void 0 ? { cursor: filter.cursor } : filter?.offset !== void 0 ? { offset: filter.offset } : {};
+	const liveFilter = {
+		type,
+		status: filter?.status,
+		limit: liveLimit,
+		...pageParam,
+		where: filter?.where,
+		q: filter?.q,
+		searchColumns: filter?.searchColumns,
+		orderBy: filter?.orderBy,
+		locale: resolvedLocale
+	};
+	const result = await getLiveCollection(COLLECTION_NAME, liveFilter);
+	const meta = takeLiveCollectionMeta(liveFilter);
+	const { entries, error, cacheHint } = result;
+	const rawCursor = Object.getOwnPropertyDescriptor(result, "nextCursor")?.value;
+	const nextCursor = typeof rawCursor === "string" ? rawCursor : meta?.nextCursor;
+	const rawTotal = Object.getOwnPropertyDescriptor(result, "total")?.value;
+	const total = typeof rawTotal === "number" ? rawTotal : meta?.total;
+	if (error) return {
+		entries: [],
+		error,
+		cacheHint: {},
+		total
+	};
+	const hasMore = requestedFetchLimit !== void 0 && requestedFetchLimit > 0 && entries.length > requestedFetchLimit;
+	const pageEntries = hasMore ? entries.slice(0, requestedFetchLimit) : entries;
+	const pageNextCursor = (hasMore ? encodeEntryCursor(pageEntries.at(-1), filter?.orderBy) : void 0) ?? nextCursor;
+	const hasMoreResult = requestedFetchLimit !== void 0 && requestedFetchLimit > 0 ? hasMore : meta?.hasMore;
+	const isEditMode = ctx?.editMode ?? false;
+	const entriesWithEdit = pageEntries.map((entry) => {
+		const dbId = entryDatabaseId(entry);
+		if (isEditMode) tagEditableFields(entryData(entry), type, dbId);
 		return {
-			entries: entriesWithEdit,
-			nextCursor: pageNextCursor,
-			total,
-			cacheHint: cacheHint ?? {}
+			...entry,
+			edit: isEditMode ? createEditable(type, dbId, entryEditOptions(entry)) : createNoop()
 		};
 	});
-	return bucketed.requestedLimit === void 0 ? cached : sliceCollectionResult(cached, bucketed.requestedLimit, filter?.orderBy);
+	await Promise.all([hydrateEntryBylines(type, entriesWithEdit), hydrateEntryTerms(type, entriesWithEdit, resolvedLocale)]);
+	return {
+		entries: entriesWithEdit,
+		nextCursor: pageNextCursor,
+		hasMore: hasMoreResult,
+		total,
+		cacheHint: cacheHint ?? {}
+	};
 }
 const BUCKET_LIMIT_THRESHOLD = 10;
 /** @internal exported for unit tests; not part of the public API. */
 function bucketFilter(filter) {
 	const limit = filter?.limit;
-	if (limit === void 0 || limit >= BUCKET_LIMIT_THRESHOLD || limit <= 0 || filter?.cursor !== void 0) return {
+	if (limit === void 0 || limit >= BUCKET_LIMIT_THRESHOLD || limit <= 0 || filter?.cursor !== void 0 || filter?.offset !== void 0) return {
 		fetchFilter: filter,
 		requestedLimit: void 0
 	};
@@ -252,7 +307,8 @@ function sliceCollectionResult(cached, limit, orderBy) {
 	return {
 		...cached,
 		entries,
-		nextCursor
+		nextCursor,
+		hasMore: true
 	};
 }
 const ENTRY_DATA_KEY_MAP = {
@@ -292,6 +348,7 @@ function collectionCacheKey(type, filter, locale) {
 		filter?.status ?? "",
 		filter?.limit ?? "",
 		filter?.cursor ?? "",
+		filter?.offset ?? "",
 		filter?.where ? stableStringify(filter.where) : "",
 		filter?.q ?? "",
 		filter?.searchColumns ? JSON.stringify(filter.searchColumns) : "",
@@ -310,6 +367,36 @@ function stableOrder(value) {
 	}
 	return ordered;
 }
+const CURSOR_RAW_FIELD = "__dinewayCursorRaw";
+function entrySnapshot(entry) {
+	const data = entryData(entry);
+	const rawCursor = Reflect.get(data, CURSOR_RAW_VALUES);
+	return {
+		id: entry.id,
+		data: {
+			...data,
+			[CURSOR_RAW_FIELD]: isRecord(rawCursor) ? rawCursor : {}
+		}
+	};
+}
+function reviveEntry(raw) {
+	const entry = isRecord(raw) ? raw : {};
+	const data = { ...isRecord(entry.data) ? entry.data : {} };
+	const rawCursorValue = data[CURSOR_RAW_FIELD];
+	const rawCursor = isRecord(rawCursorValue) ? rawCursorValue : {};
+	delete data[CURSOR_RAW_FIELD];
+	Object.defineProperty(data, CURSOR_RAW_VALUES, {
+		value: rawCursor,
+		enumerable: false,
+		configurable: false,
+		writable: false
+	});
+	return {
+		id: typeof entry.id === "string" ? entry.id : "",
+		data,
+		edit: createNoop()
+	};
+}
 /**
 * Get a single entry by type and ID/slug
 *
@@ -351,8 +438,16 @@ async function getDinewayEntry(type, id, options) {
 	function isVisible(entry) {
 		const data = entryData(entry);
 		const status = dataStr(data, "status");
-		const scheduledAt = dataStr(data, "scheduledAt") || void 0;
-		return status === "published" || !!(status === "scheduled" && scheduledAt && new Date(scheduledAt) <= /* @__PURE__ */ new Date());
+		const scheduledAt = dataDate(data, "scheduledAt");
+		const isPublished = status === "published";
+		const isScheduledAndReady = status === "scheduled" && scheduledAt !== void 0 && scheduledAt.getTime() <= Date.now();
+		return isPublished || !!isScheduledAndReady;
+	}
+	function isPendingScheduled(entry) {
+		const data = entryData(entry);
+		if (dataStr(data, "status") !== "scheduled") return false;
+		const scheduledAt = dataDate(data, "scheduledAt");
+		return scheduledAt !== void 0 && scheduledAt.getTime() > Date.now();
 	}
 	const localeChain = requestedLocale && isI18nEnabled() ? getFallbackChain(requestedLocale) : [requestedLocale];
 	/** Return a successful EntryResult with runtime data hydrated */
@@ -419,30 +514,68 @@ async function getDinewayEntry(type, id, options) {
 			cacheHint: {}
 		};
 	}
-	for (let i = 0; i < localeChain.length; i++) {
-		const locale = localeChain[i];
-		const fallbackLocale = i > 0 ? locale : void 0;
-		const { entry, error, cacheHint } = await getLiveEntry(COLLECTION_NAME, {
-			type,
-			id,
-			locale
-		});
-		if (error) return {
+	let timeSensitive = false;
+	const resolveNormal = async () => {
+		for (let i = 0; i < localeChain.length; i++) {
+			const locale = localeChain[i];
+			const fallbackLocale = i > 0 ? locale : void 0;
+			const { entry, error, cacheHint } = await getLiveEntry(COLLECTION_NAME, {
+				type,
+				id,
+				locale
+			});
+			if (error) return {
+				entry: null,
+				error,
+				isPreview: false,
+				cacheHint: {}
+			};
+			if (entry && isVisible(entry)) return successResult(wrapEntry(entry), {
+				isPreview: false,
+				fallbackLocale,
+				cacheHint: cacheHint ?? {}
+			});
+			if (entry && isPendingScheduled(entry)) timeSensitive = true;
+		}
+		return {
 			entry: null,
-			error,
 			isPreview: false,
 			cacheHint: {}
 		};
-		if (entry && isVisible(entry)) return successResult(wrapEntry(entry), {
-			isPreview: false,
-			fallbackLocale,
-			cacheHint: cacheHint ?? {}
-		});
-	}
-	return {
+	};
+	const snapshot = await cachedQuery({
+		namespace: contentNamespaces(type),
+		key: `entry:${id}|loc=${requestedLocale ?? ""}`,
+		load: async () => {
+			const result = await resolveNormal();
+			if (result.error) return {
+				ok: false,
+				error: result.error,
+				cacheHint: result.cacheHint
+			};
+			return {
+				ok: true,
+				value: {
+					entry: result.entry ? entrySnapshot(result.entry) : null,
+					isPreview: result.isPreview,
+					fallbackLocale: result.fallbackLocale,
+					cacheHint: result.cacheHint
+				}
+			};
+		},
+		cacheable: (snap) => snap.ok && !timeSensitive
+	});
+	if (!snapshot.ok) return {
 		entry: null,
+		error: snapshot.error,
 		isPreview: false,
-		cacheHint: {}
+		cacheHint: snapshot.cacheHint
+	};
+	return {
+		entry: snapshot.value.entry ? reviveEntry(snapshot.value.entry) : null,
+		isPreview: snapshot.value.isPreview,
+		fallbackLocale: snapshot.value.fallbackLocale,
+		cacheHint: snapshot.value.cacheHint
 	};
 }
 /**
@@ -456,8 +589,47 @@ async function getDinewayEntry(type, id, options) {
 */
 async function hydrateEntryBylines(type, entries) {
 	if (entries.length === 0) return;
+	if (entries.every((entry) => FOLDED_BYLINES in entryData(entry))) {
+		const parsed = entries.map((entry) => {
+			const data = entryData(entry);
+			const folded = Reflect.get(data, FOLDED_BYLINES);
+			return {
+				data,
+				credits: (Array.isArray(folded) ? folded : []).map((raw) => {
+					const byline = raw?.byline ?? {};
+					return {
+						roleLabel: raw?.roleLabel ?? null,
+						sortOrder: Number(raw?.sortOrder ?? 0),
+						source: "explicit",
+						byline: {
+							...byline,
+							isGuest: Boolean(byline.isGuest),
+							customFields: {}
+						}
+					};
+				}).toSorted((a, b) => a.sortOrder - b.sortOrder)
+			};
+		});
+		let needsQueryPath = parsed.some((item) => item.credits.length === 0 && (dataStr(item.data, "authorId") !== "" || dataStr(item.data, "primaryBylineId") !== ""));
+		let hasCustomFields = false;
+		if (!needsQueryPath) try {
+			const { getDb } = await import("./loader-CjWqjweO.mjs").then((n) => n.i);
+			const db = await getDb();
+			const { getBylineFieldDefs } = await import("./field-defs-cache-DRNdhBJv.mjs").then((n) => n.t);
+			hasCustomFields = (await getBylineFieldDefs(db)).length > 0;
+		} catch (error) {
+			if (!isMissingTableError(error)) needsQueryPath = true;
+		}
+		if (!needsQueryPath && !hasCustomFields) {
+			for (const item of parsed) {
+				item.data.bylines = item.credits;
+				item.data.byline = item.credits[0]?.byline ?? null;
+			}
+			return;
+		}
+	}
 	try {
-		const { getBylinesForEntries } = await import("./bylines-DtxChhN_.mjs").then((n) => n.t);
+		const { getBylinesForEntries } = await import("./bylines-y4LO-dTj.mjs").then((n) => n.t);
 		const refs = entries.map((entry) => {
 			const data = entryData(entry);
 			const id = dataStr(data, "id");
@@ -487,8 +659,40 @@ async function hydrateEntryBylines(type, entries) {
 }
 async function hydrateEntryTerms(type, entries, locale) {
 	if (entries.length === 0) return;
+	if (entries.every((entry) => FOLDED_TERMS in entryData(entry))) {
+		const perEntry = [];
+		for (const entry of entries) {
+			const data = entryData(entry);
+			const folded = Reflect.get(data, FOLDED_TERMS);
+			const rows = Array.isArray(folded) ? folded : [];
+			const grouped = {};
+			for (const row of rows) {
+				const name = String(row?.name);
+				(grouped[name] ??= []).push({
+					id: row?.id,
+					name,
+					slug: row?.slug,
+					label: row?.label,
+					parentId: row?.parent_id ?? void 0,
+					children: [],
+					locale: row?.locale,
+					translationGroup: row?.translation_group
+				});
+			}
+			for (const [name, terms] of Object.entries(grouped)) grouped[name] = terms.toSorted((a, b) => String(a.label).localeCompare(String(b.label)));
+			data.terms = grouped;
+			const entryId = dataStr(data, "id");
+			if (entryId) perEntry.push({
+				entryId,
+				byTaxonomy: grouped
+			});
+		}
+		const { primeFoldedEntryTerms } = await import("./taxonomies-DRiixp_E.mjs").then((n) => n.u);
+		primeFoldedEntryTerms(type, perEntry, { locale });
+		return;
+	}
 	try {
-		const { getAllTermsForEntries } = await import("./taxonomies-CNOGeC-3.mjs").then((n) => n.l);
+		const { getAllTermsForEntries } = await import("./taxonomies-DRiixp_E.mjs").then((n) => n.u);
 		const ids = entries.map((entry) => dataStr(entryData(entry), "id")).filter(Boolean);
 		if (ids.length === 0) return;
 		const termsMap = await getAllTermsForEntries(type, ids, { locale });
@@ -522,9 +726,9 @@ async function hydrateEntryTerms(type, entries, locale) {
 */
 async function getTranslations(type, id) {
 	try {
-		const db = (await import("./loader-tg63WSY2.mjs").then((n) => n.i)).getDb;
+		const db = (await import("./loader-CjWqjweO.mjs").then((n) => n.i)).getDb;
 		const dbInstance = await db();
-		const { ContentRepository } = await import("./content-QaryevFO.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("./content-Bh4BDjv8.mjs").then((n) => n.n);
 		const repo = new ContentRepository(dbInstance);
 		const item = await repo.findByIdOrSlug(type, id);
 		if (!item) return {
@@ -567,6 +771,7 @@ function patternToRegex(pattern) {
 let cachedUrlPatterns = null;
 function invalidateUrlPatternCache() {
 	cachedUrlPatterns = null;
+	invalidateSchemaObjectCache();
 }
 /**
 * Resolve a URL path to a content entry by matching against collection URL patterns.
@@ -591,8 +796,8 @@ async function resolveDinewayPath(path) {
 	const hasDbOverride = !!getRequestContext()?.db;
 	let patterns = !hasDbOverride ? cachedUrlPatterns : null;
 	if (!patterns) {
-		const { getDb } = await import("./loader-tg63WSY2.mjs").then((n) => n.i);
-		const { SchemaRegistry } = await import("./registry-CTkbIDB9.mjs").then((n) => n.r);
+		const { getDb } = await import("./loader-CjWqjweO.mjs").then((n) => n.i);
+		const { SchemaRegistry } = await import("./registry-CtyVedcN.mjs").then((n) => n.r);
 		patterns = (await new SchemaRegistry(await getDb()).listCollections()).filter((collection) => collection.urlPattern).map((collection) => {
 			const { regex, paramNames } = patternToRegex(collection.urlPattern);
 			return {

package/dist/{query-DKEwzobh.mjs → query-jaAmw8E1.mjs}

@@ -1,6 +1,7 @@
-import { r as requestCached } from "./request-cache-CYMbwZc6.mjs";
-import { n as SchemaRegistry } from "./registry-CTkbIDB9.mjs";
-import { r as getDb } from "./loader-tg63WSY2.mjs";
+import { r as getDb } from "./loader-CjWqjweO.mjs";
+import { n as cachedQuery, t as CacheNamespace } from "./object-cache-D51qOseS.mjs";
+import { r as requestCached } from "./request-cache-D9GQBxMP.mjs";
+import { n as SchemaRegistry } from "./registry-CtyVedcN.mjs";
 
 //#region src/schema/query.ts
 /**
@@ -17,9 +18,13 @@ import { r as getDb } from "./loader-tg63WSY2.mjs";
 * ```
 */
 async function getCollectionInfo(slug) {
-	return requestCached(`collection-info:${slug}`, async () => {
-		return getCollectionInfoWithDb(await getDb(), slug);
-	});
+	return requestCached(`collection-info:${slug}`, () => cachedQuery({
+		namespace: CacheNamespace.SCHEMA,
+		key: `collection-info:${slug}`,
+		load: async () => {
+			return getCollectionInfoWithDb(await getDb(), slug);
+		}
+	}));
 }
 /**
 * Get collection metadata with an explicit db handle.

package/dist/{rate-limit-i0G3IAOX.mjs → rate-limit-ZLdyWoZF.mjs}

@@ -1,5 +1,5 @@
-import { t as apiError } from "./error-DCSuUAZW.mjs";
-import { n as normalizeTrustedHeaders } from "./trusted-proxy-BgIIcbsN.mjs";
+import { t as apiError } from "./error-CytFlgcd.mjs";
+import { n as normalizeTrustedHeaders } from "./trusted-proxy-DTXQ2IMv.mjs";
 import { sql } from "kysely";
 
 //#region src/auth/rate-limit.ts

package/dist/{redirect-C2zXRj3c.mjs → redirect-BAjt4Z6b.mjs}

@@ -1,6 +1,6 @@
 import { a as currentTimestampValue } from "./dialect-helpers-fk43GbDb.mjs";
-import { i as encodeCursor, r as decodeCursor } from "./types-DfuD0Afl.mjs";
-import { i as matchPattern, n as interpolateDestination, r as isPattern, t as compilePattern } from "./patterns-r-0n824Y.mjs";
+import { i as encodeCursor, r as decodeCursor } from "./types-Dq1qT19x.mjs";
+import { i as matchPattern, n as interpolateDestination, r as isPattern, t as compilePattern } from "./patterns-BhAvqO0S.mjs";
 import { sql } from "kysely";
 import { ulid } from "ulidx";
 

package/dist/{redirects-YZo_znWG.mjs → redirects-BTdwpQtE.mjs}

@@ -1,7 +1,8 @@
-import { t as OptionsRepository } from "./options-BvJoSSJR.mjs";
-import { t as RedirectRepository } from "./redirect-C2zXRj3c.mjs";
-import { a as validateDestinationParams, i as matchPattern, n as interpolateDestination, o as validatePattern, r as isPattern, t as compilePattern } from "./patterns-r-0n824Y.mjs";
-import { i as invalidateRedirectCache } from "./cache-DbKyr60Q.mjs";
+import { t as OptionsRepository } from "./options-DQPTH5n0.mjs";
+import { t as RedirectRepository } from "./redirect-BAjt4Z6b.mjs";
+import { a as validateDestinationParams, i as matchPattern, n as interpolateDestination, o as validatePattern, r as isPattern, t as compilePattern } from "./patterns-BhAvqO0S.mjs";
+import { i as invalidateRedirectCache } from "./cache-C-FNTFYK.mjs";
+import { n as isTerminalStatus } from "./status-DANd8ERo.mjs";
 
 //#region src/redirects/loops.ts
 /**
@@ -176,7 +177,17 @@ async function handleRedirectList(db, params) {
 async function handleRedirectCreate(db, input) {
 	try {
 		const repo = new RedirectRepository(db);
-		if (input.source === input.destination) return {
+		const type = input.type ?? 301;
+		const terminal = isTerminalStatus(type);
+		const destination = terminal ? "" : input.destination ?? "";
+		if (!terminal && !destination) return {
+			success: false,
+			error: {
+				code: "VALIDATION_ERROR",
+				message: "destination is required for redirect types"
+			}
+		};
+		if (!terminal && input.source === destination) return {
 			success: false,
 			error: {
 				code: "VALIDATION_ERROR",
@@ -193,14 +204,16 @@ async function handleRedirectCreate(db, input) {
 					message: `Invalid source pattern: ${patternError}`
 				}
 			};
-			const destError = validateDestinationParams(input.source, input.destination);
-			if (destError) return {
-				success: false,
-				error: {
-					code: "VALIDATION_ERROR",
-					message: destError
-				}
-			};
+			if (!terminal) {
+				const destError = validateDestinationParams(input.source, destination);
+				if (destError) return {
+					success: false,
+					error: {
+						code: "VALIDATION_ERROR",
+						message: destError
+					}
+				};
+			}
 		}
 		if (await repo.findBySource(input.source)) return {
 			success: false,
@@ -209,14 +222,14 @@ async function handleRedirectCreate(db, input) {
 				message: `A redirect from "${input.source}" already exists`
 			}
 		};
-		if (input.enabled !== false) {
-			const loopPath = wouldCreateLoop(input.source, input.destination, toEdges(await repo.findAllEnabled()));
+		if (!terminal && input.enabled !== false) {
+			const loopPath = wouldCreateLoop(input.source, destination, toEdges(await repo.findAllEnabled()));
 			if (loopPath) return loopError(loopPath);
 		}
 		const redirect = await repo.create({
 			source: input.source,
-			destination: input.destination,
-			type: input.type ?? 301,
+			destination,
+			type,
 			isPattern: sourceIsPattern,
 			enabled: input.enabled ?? true,
 			groupName: input.groupName ?? null
@@ -279,8 +292,17 @@ async function handleRedirectUpdate(db, id, input) {
 			}
 		};
 		const newSource = input.source ?? existing.source;
-		const newDest = input.destination ?? existing.destination;
-		if (newSource === newDest) return {
+		const newType = input.type ?? existing.type;
+		const terminal = isTerminalStatus(newType);
+		const newDest = terminal ? "" : input.destination ?? existing.destination;
+		if (!terminal && !newDest) return {
+			success: false,
+			error: {
+				code: "VALIDATION_ERROR",
+				message: "destination is required for redirect types"
+			}
+		};
+		if (!terminal && newSource === newDest) return {
 			success: false,
 			error: {
 				code: "VALIDATION_ERROR",
@@ -307,7 +329,7 @@ async function handleRedirectUpdate(db, id, input) {
 				}
 			};
 		}
-		if (isPattern(newSource)) {
+		if (!terminal && isPattern(newSource)) {
 			const destError = validateDestinationParams(newSource, newDest);
 			if (destError) return {
 				success: false,
@@ -317,14 +339,15 @@ async function handleRedirectUpdate(db, id, input) {
 				}
 			};
 		}
-		if ((input.enabled ?? existing.enabled) && (input.source !== void 0 || input.destination !== void 0 || input.enabled === true && !existing.enabled)) {
+		const newEnabled = input.enabled ?? existing.enabled;
+		if (!terminal && newEnabled && (input.source !== void 0 || input.destination !== void 0 || input.type !== void 0 || input.enabled === true && !existing.enabled)) {
 			const loopPath = wouldCreateLoop(newSource, newDest, toEdges(await repo.findAllEnabled()), id);
 			if (loopPath) return loopError(loopPath);
 		}
 		const updated = await repo.update(id, {
 			source: input.source,
-			destination: input.destination,
-			type: input.type,
+			destination: terminal ? "" : input.destination,
+			type: newType,
 			enabled: input.enabled,
 			groupName: input.groupName
 		});
@@ -390,7 +413,7 @@ function loopError(loopPath) {
 	};
 }
 function toEdges(redirects) {
-	return redirects.map((redirect) => ({
+	return redirects.filter((redirect) => !isTerminalStatus(redirect.type)).map((redirect) => ({
 		id: redirect.id,
 		source: redirect.source,
 		destination: redirect.destination,