dineway 0.1.48 → 0.2.0

package/dist/{apply-CX3no7XE.mjs → apply-bZswmZPm.mjs}

@@ -1,16 +1,17 @@
-import { a as __exportAll } from "./runner-B-tbV751.mjs";
+import { a as __exportAll } from "./runner-DB7CRfOF.mjs";
 import { n as getI18nConfig } from "./config-CVssduLe.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "./content-QaryevFO.mjs";
-import { t as MediaRepository } from "./media-DUAjMfvR.mjs";
-import { t as TaxonomyRepository } from "./taxonomy-CBmkmMuU.mjs";
-import { t as withTransaction } from "./transaction-CShMWIej.mjs";
-import { t as RedirectRepository } from "./redirect-C2zXRj3c.mjs";
-import { t as BylineRepository } from "./byline-1ntDwv8c.mjs";
-import { t as FTSManager } from "./fts-manager-CIZlScg5.mjs";
-import { n as SchemaRegistry } from "./registry-CTkbIDB9.mjs";
-import { o as setSiteSettings } from "./settings-yLjz_I4T.mjs";
-import { a as validateExternalUrl, r as ssrfSafeFetch } from "./ssrf-DiKqWd3N.mjs";
-import { t as validateSeed } from "./validate-7SYRbz2f.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "./content-Bh4BDjv8.mjs";
+import { t as MediaRepository } from "./media-DMj0grzC.mjs";
+import { t as TaxonomyRepository } from "./taxonomy-Dvsw6BOs.mjs";
+import { t as withTransaction } from "./transaction-C2EOMTJA.mjs";
+import { t as RedirectRepository } from "./redirect-BAjt4Z6b.mjs";
+import { t as BylineRepository } from "./byline-e51-fWRs.mjs";
+import { a as markContentMediaUsageCollectionStaleSafely } from "./content-refresh-CgutSUfO.mjs";
+import { t as FTSManager } from "./fts-manager-Crzypjqu.mjs";
+import { n as SchemaRegistry } from "./registry-CtyVedcN.mjs";
+import { s as setSiteSettings } from "./settings-BbqgHWpU.mjs";
+import { a as validateExternalUrl, r as ssrfSafeFetch } from "./ssrf-DWe8jwAp.mjs";
+import { t as validateSeed } from "./validate-DNs0pTSc.mjs";
 import { ulid } from "ulidx";
 import { imageSize } from "image-size";
 import mime from "mime/lite";
@@ -128,7 +129,22 @@ async function applySeed(db, seed, options = {}) {
 	};
 	const seedIdMap = /* @__PURE__ */ new Map();
 	const seedBylineIdMap = /* @__PURE__ */ new Map();
+	const staleMarkedContentCollections = /* @__PURE__ */ new Set();
+	const failedStaleContentCollections = /* @__PURE__ */ new Set();
 	const defaultLocale = getI18nConfig()?.defaultLocale ?? seed.defaultLocale ?? "en";
+	const markSeedContentCollectionStale = async (collectionSlug) => {
+		if (staleMarkedContentCollections.has(collectionSlug)) return;
+		if (await markContentMediaUsageCollectionStaleSafely(db, collectionSlug, "CONTENT_USAGE_STALE")) {
+			staleMarkedContentCollections.add(collectionSlug);
+			failedStaleContentCollections.delete(collectionSlug);
+		} else failedStaleContentCollections.add(collectionSlug);
+	};
+	const retryFailedSeedContentStaleMarks = async () => {
+		for (const collectionSlug of failedStaleContentCollections) if (await markContentMediaUsageCollectionStaleSafely(db, collectionSlug, "CONTENT_USAGE_STALE")) {
+			staleMarkedContentCollections.add(collectionSlug);
+			failedStaleContentCollections.delete(collectionSlug);
+		}
+	};
 	if (seed.settings) {
 		await setSiteSettings(seed.settings, db);
 		result.settings.applied = Object.keys(seed.settings).length;
@@ -154,6 +170,7 @@ async function applySeed(db, seed, options = {}) {
 						if (repairSchema) await registry.ensureFieldColumn(collection.slug, field.slug);
 						await registry.updateField(collection.slug, field.slug, {
 							label: field.label,
+							type: field.type,
 							required: field.required || false,
 							unique: field.unique || false,
 							searchable: field.searchable || false,
@@ -234,7 +251,7 @@ async function applySeed(db, seed, options = {}) {
 				id: defId,
 				translationGroup: defTranslationGroup
 			});
-			if (taxonomy.terms && taxonomy.terms.length > 0) {
+			if (includeContent && taxonomy.terms && taxonomy.terms.length > 0) {
 				const termRepo = new TaxonomyRepository(db);
 				if (taxonomy.hierarchical) await applyHierarchicalTerms(termRepo, taxonomy.name, defLocale, taxonomy.terms, termSeedIdMap, result, onConflict);
 				else for (const term of taxonomy.terms) {
@@ -266,8 +283,10 @@ async function applySeed(db, seed, options = {}) {
 				}
 			}
 		}
+		const { invalidateTaxonomyDefsCache } = await import("./taxonomies-DRiixp_E.mjs").then((n) => n.u);
+		invalidateTaxonomyDefsCache();
 	}
-	if (seed.bylines) {
+	if (includeContent && seed.bylines) {
 		const bylineRepo = new BylineRepository(db);
 		for (const byline of seed.bylines) {
 			const existing = await bylineRepo.findBySlug(byline.slug);
@@ -318,69 +337,90 @@ async function applySeed(db, seed, options = {}) {
 	}
 	if (includeContent && seed.content) {
 		const contentRepo = new ContentRepository(db);
-		for (const [collectionSlug, entries] of Object.entries(seed.content)) for (const entry of entries) {
-			const entryLocale = entry.locale ?? defaultLocale;
-			const existing = await contentRepo.findBySlug(collectionSlug, entry.slug, entryLocale);
-			if (existing) {
-				if (onConflict === "error") throw new Error(`Conflict: content "${entry.slug}" in "${collectionSlug}" already exists`);
-				if (onConflict === "update") {
-					const resolvedData = await resolveReferences(entry.data, seedIdMap, mediaContext, result);
-					const status = entry.status || "published";
-					await withTransaction(db, async (trx) => {
+		try {
+			for (const [collectionSlug, entries] of Object.entries(seed.content)) for (const entry of entries) {
+				const entryLocale = entry.locale ?? defaultLocale;
+				const existing = await contentRepo.findBySlug(collectionSlug, entry.slug, entryLocale);
+				if (existing) {
+					if (onConflict === "error") throw new Error(`Conflict: content "${entry.slug}" in "${collectionSlug}" already exists`);
+					if (onConflict === "update") {
+						const resolvedData = await resolveReferences(entry.data, seedIdMap, mediaContext, result);
+						const status = entry.status || "published";
+						let contentMutated = false;
+						try {
+							await withTransaction(db, async (trx) => {
+								const trxContentRepo = new ContentRepository(trx);
+								const trxBylineRepo = new BylineRepository(trx);
+								const trxRevisionRepo = new RevisionRepository(trx);
+								await trxContentRepo.update(collectionSlug, existing.id, {
+									status,
+									data: resolvedData
+								});
+								contentMutated = true;
+								await applyContentBylines(trxBylineRepo, collectionSlug, existing.id, entry, seedBylineIdMap, true);
+								await applyContentTaxonomies(trx, collectionSlug, existing.id, entry, true);
+								if (status === "published") {
+									const draft = await trxRevisionRepo.create({
+										collection: collectionSlug,
+										entryId: existing.id,
+										data: resolvedData
+									});
+									await trxContentRepo.setDraftRevision(collectionSlug, existing.id, draft.id);
+									await trxContentRepo.publish(collectionSlug, existing.id);
+								}
+							});
+						} catch (error) {
+							if (contentMutated) await markSeedContentCollectionStale(collectionSlug);
+							throw error;
+						}
+						seedIdMap.set(entry.id, existing.id);
+						result.content.updated++;
+						await markSeedContentCollectionStale(collectionSlug);
+						continue;
+					}
+					result.content.skipped++;
+					seedIdMap.set(entry.id, existing.id);
+					continue;
+				}
+				const resolvedData = await resolveReferences(entry.data, seedIdMap, mediaContext, result);
+				let translationOf;
+				if (entry.translationOf) {
+					const sourceId = seedIdMap.get(entry.translationOf);
+					if (!sourceId) console.warn(`content.${collectionSlug}: translationOf "${entry.translationOf}" not found (not yet created or missing). Skipping translation link.`);
+					else translationOf = sourceId;
+				}
+				const status = entry.status || "published";
+				let contentMutated = false;
+				let created;
+				try {
+					created = await withTransaction(db, async (trx) => {
 						const trxContentRepo = new ContentRepository(trx);
 						const trxBylineRepo = new BylineRepository(trx);
-						const trxRevisionRepo = new RevisionRepository(trx);
-						await trxContentRepo.update(collectionSlug, existing.id, {
+						const item = await trxContentRepo.create({
+							type: collectionSlug,
+							slug: entry.slug,
 							status,
-							data: resolvedData
+							data: resolvedData,
+							locale: entryLocale,
+							translationOf,
+							publishedAt: status === "published" ? (/* @__PURE__ */ new Date()).toISOString() : null
 						});
-						await applyContentBylines(trxBylineRepo, collectionSlug, existing.id, entry, seedBylineIdMap, true);
-						await applyContentTaxonomies(trx, collectionSlug, existing.id, entry, true);
-						if (status === "published") {
-							const draft = await trxRevisionRepo.create({
-								collection: collectionSlug,
-								entryId: existing.id,
-								data: resolvedData
-							});
-							await trxContentRepo.setDraftRevision(collectionSlug, existing.id, draft.id);
-							await trxContentRepo.publish(collectionSlug, existing.id);
-						}
+						contentMutated = true;
+						await applyContentBylines(trxBylineRepo, collectionSlug, item.id, entry, seedBylineIdMap);
+						await applyContentTaxonomies(trx, collectionSlug, item.id, entry, false);
+						if (status === "published") await trxContentRepo.publish(collectionSlug, item.id);
+						return item;
 					});
-					seedIdMap.set(entry.id, existing.id);
-					result.content.updated++;
-					continue;
+				} catch (error) {
+					if (contentMutated) await markSeedContentCollectionStale(collectionSlug);
+					throw error;
 				}
-				result.content.skipped++;
-				seedIdMap.set(entry.id, existing.id);
-				continue;
-			}
-			const resolvedData = await resolveReferences(entry.data, seedIdMap, mediaContext, result);
-			let translationOf;
-			if (entry.translationOf) {
-				const sourceId = seedIdMap.get(entry.translationOf);
-				if (!sourceId) console.warn(`content.${collectionSlug}: translationOf "${entry.translationOf}" not found (not yet created or missing). Skipping translation link.`);
-				else translationOf = sourceId;
+				seedIdMap.set(entry.id, created.id);
+				result.content.created++;
+				await markSeedContentCollectionStale(collectionSlug);
 			}
-			const status = entry.status || "published";
-			const created = await withTransaction(db, async (trx) => {
-				const trxContentRepo = new ContentRepository(trx);
-				const trxBylineRepo = new BylineRepository(trx);
-				const item = await trxContentRepo.create({
-					type: collectionSlug,
-					slug: entry.slug,
-					status,
-					data: resolvedData,
-					locale: entryLocale,
-					translationOf,
-					publishedAt: status === "published" ? (/* @__PURE__ */ new Date()).toISOString() : null
-				});
-				await applyContentBylines(trxBylineRepo, collectionSlug, item.id, entry, seedBylineIdMap);
-				await applyContentTaxonomies(trx, collectionSlug, item.id, entry, false);
-				if (status === "published") await trxContentRepo.publish(collectionSlug, item.id);
-				return item;
-			});
-			seedIdMap.set(entry.id, created.id);
-			result.content.created++;
+		} finally {
+			await retryFailedSeedContentStaleMarks();
 		}
 	}
 	if (seed.menus) {
@@ -430,7 +470,7 @@ async function applySeed(db, seed, options = {}) {
 				if (onConflict === "error") throw new Error(`Conflict: redirect "${redirect.source}" already exists`);
 				if (onConflict === "update") {
 					await redirectRepo.update(existing.id, {
-						destination: redirect.destination,
+						destination: redirect.type === 410 || redirect.type === 451 ? "" : redirect.destination,
 						type: redirect.type,
 						enabled: redirect.enabled,
 						groupName: redirect.groupName
@@ -443,7 +483,7 @@ async function applySeed(db, seed, options = {}) {
 			}
 			await redirectRepo.create({
 				source: redirect.source,
-				destination: redirect.destination,
+				destination: redirect.type === 410 || redirect.type === 451 ? "" : redirect.destination,
 				type: redirect.type,
 				enabled: redirect.enabled,
 				groupName: redirect.groupName
@@ -519,9 +559,9 @@ async function applySeed(db, seed, options = {}) {
 			}
 		}
 	}
-	const { invalidateBylineCache } = await import("./bylines-DtxChhN_.mjs").then((n) => n.t);
-	const { invalidateUrlPatternCache } = await import("./query-BYc3oruA.mjs").then((n) => n.o);
-	const { invalidateRedirectCache } = await import("./cache-DbKyr60Q.mjs").then((n) => n.t);
+	const { invalidateBylineCache } = await import("./bylines-y4LO-dTj.mjs").then((n) => n.t);
+	const { invalidateUrlPatternCache } = await import("./query-CfRCdaL3.mjs").then((n) => n.o);
+	const { invalidateRedirectCache } = await import("./cache-C-FNTFYK.mjs").then((n) => n.t);
 	invalidateBylineCache();
 	invalidateUrlPatternCache();
 	invalidateRedirectCache();
@@ -605,7 +645,7 @@ async function applyContentTaxonomies(db, collectionSlug, contentId, entry, isUp
 	if (isUpdate) await db.deleteFrom("content_taxonomies").where("collection", "=", collectionSlug).where("entry_id", "=", contentId).execute();
 	if (!entry.taxonomies) {
 		if (isUpdate) {
-			const { invalidateTermCache } = await import("./taxonomies-CNOGeC-3.mjs").then((n) => n.l);
+			const { invalidateTermCache } = await import("./taxonomies-DRiixp_E.mjs").then((n) => n.u);
 			invalidateTermCache();
 		}
 		return;
@@ -617,7 +657,7 @@ async function applyContentTaxonomies(db, collectionSlug, contentId, entry, isUp
 			if (term) await termRepo.attachToEntry(collectionSlug, contentId, term.id);
 		}
 	}
-	const { invalidateTermCache } = await import("./taxonomies-CNOGeC-3.mjs").then((n) => n.l);
+	const { invalidateTermCache } = await import("./taxonomies-DRiixp_E.mjs").then((n) => n.u);
 	invalidateTermCache();
 }
 /**

package/dist/astro/image-endpoint.d.mts

@@ -0,0 +1,7 @@
+import { APIRoute } from "astro";
+
+//#region src/astro/image-endpoint.d.ts
+declare const prerender = false;
+declare const GET: APIRoute;
+//#endregion
+export { GET, prerender };

package/dist/astro/image-endpoint.mjs

@@ -0,0 +1,54 @@
+import { IMMUTABLE_IMAGE_CACHE, matchInternalMediaKey, originalMediaHeaders } from "../media/image-endpoint.mjs";
+import { GET as GET$1 } from "astro/assets/endpoint/generic";
+import { getConfiguredImageService, imageConfig } from "astro:assets";
+
+//#region src/astro/image-endpoint.ts
+const prerender = false;
+const FORMAT_MIME = {
+	webp: "image/webp",
+	avif: "image/avif",
+	png: "image/png",
+	jpeg: "image/jpeg",
+	jpg: "image/jpeg",
+	gif: "image/gif"
+};
+function isNotFound(error) {
+	return error instanceof Error && (error.message.includes("not found") || error.message.includes("NOT_FOUND"));
+}
+function streamOriginal(body, contentType) {
+	return new Response(body, {
+		status: 200,
+		headers: originalMediaHeaders(contentType)
+	});
+}
+const GET = async (ctx) => {
+	const url = new URL(ctx.request.url);
+	const key = matchInternalMediaKey(url.searchParams.get("href"));
+	const storage = ctx.locals.dineway?.storage;
+	if (!key || !storage) return GET$1(ctx);
+	const service = await getConfiguredImageService();
+	if (!("transform" in service)) return GET$1(ctx);
+	try {
+		const source = await storage.download(key);
+		if (!source.contentType.startsWith("image/")) return streamOriginal(source.body, source.contentType);
+		const transform = await service.parseURL(url, imageConfig);
+		if (!transform) return streamOriginal(source.body, source.contentType);
+		const inputBuffer = new Uint8Array(await new Response(source.body).arrayBuffer());
+		const { data, format } = await service.transform(inputBuffer, transform, imageConfig);
+		return new Response(data, {
+			status: 200,
+			headers: {
+				"Content-Type": FORMAT_MIME[format] ?? source.contentType,
+				"Cache-Control": IMMUTABLE_IMAGE_CACHE,
+				"X-Content-Type-Options": "nosniff"
+			}
+		});
+	} catch (error) {
+		if (isNotFound(error)) return new Response("Not Found", { status: 404 });
+		console.error("[dineway] image transform failed:", error);
+		return new Response("Internal Server Error", { status: 500 });
+	}
+};
+
+//#endregion
+export { GET, prerender };

package/dist/astro/index.d.mts

@@ -1,14 +1,15 @@
-import { i as ContentItem } from "../types-DRIKLmJI.mjs";
-import { a as S3StorageConfig, i as LocalStorageConfig, o as StorageDescriptor, r as getStoredConfig, t as DinewayConfig, wi as MediaItem } from "../runtime-DEWQpZ-4.mjs";
-import "../types-eu5UDgHN.mjs";
-import { X as ResolvedPlugin } from "../types-DSPGWjxO.mjs";
-import "../types-Dryvv7LH.mjs";
-import "../runner-D4FL9usy.mjs";
-import "../index-CwRuZ-u8.mjs";
-import "../byline-fields-BX7rWKNU.mjs";
-import "../types-GaCtZ1k9.mjs";
-import "../validate-BMs11tan.mjs";
+import { i as ContentItem } from "../types-C_ly5eTp.mjs";
+import { Yi as MediaItem, a as S3StorageConfig, i as LocalStorageConfig, o as StorageDescriptor, r as getStoredConfig, t as DinewayConfig } from "../runtime-BOeiQsCv.mjs";
+import "../types-DU0bU2Wu.mjs";
+import { xt as ResolvedPlugin } from "../types-C8XW6L19.mjs";
+import "../types-Rc3gQqqw.mjs";
+import { i as ObjectCacheRuntimeConfig, r as ObjectCacheDescriptor } from "../types-DF7ZuGGk.mjs";
+import "../runner-1tC2tIRV.mjs";
+import "../index-D4y6NGiy.mjs";
 import { DinewayHandlers, DinewayManifest, ManifestCollection } from "./types.mjs";
+import "../byline-fields-CUvbslGc.mjs";
+import "../types-CDpH6MA4.mjs";
+import "../validate-CZvb-BKB.mjs";
 import { AstroIntegration } from "astro";
 
 //#region src/astro/storage/adapters.d.ts
@@ -54,10 +55,33 @@ declare function s3(config?: Partial<S3StorageConfig>): StorageDescriptor;
  */
 declare function local(config: LocalStorageConfig): StorageDescriptor;
 //#endregion
+//#region src/astro/object-cache/adapters.d.ts
+/** Options for {@link memoryCache}. */
+interface MemoryCacheOptions extends ObjectCacheRuntimeConfig {
+  /**
+   * Soft cap on the number of cached keys per isolate before FIFO eviction.
+   * @default 1000
+   */
+  maxEntries?: number;
+}
+/**
+ * In-isolate memory object cache.
+ *
+ * Caches query results across requests within a single process. On Node this
+ * is a genuine cross-request cache; on multi-process deployments each process
+ * keeps its own cache. Useful for local development regardless of target.
+ *
+ * @example
+ * ```ts
+ * dineway({ objectCache: memoryCache({ defaultTtl: 600 }) })
+ * ```
+ */
+declare function memoryCache(options?: MemoryCacheOptions): ObjectCacheDescriptor;
+//#endregion
 //#region src/astro/integration/index.d.ts
 /**
  * Create the Dineway Astro integration
  */
 declare function dineway(config?: DinewayConfig): AstroIntegration;
 //#endregion
-export { type ContentItem, type DinewayConfig, type DinewayHandlers, type DinewayManifest, type LocalStorageConfig, type ManifestCollection, type MediaItem, type ResolvedPlugin, type S3StorageConfig, type StorageDescriptor, dineway as default, getStoredConfig, local, s3 };
+export { type ContentItem, type DinewayConfig, type DinewayHandlers, type DinewayManifest, type LocalStorageConfig, type ManifestCollection, type MediaItem, type MemoryCacheOptions, type ResolvedPlugin, type S3StorageConfig, type StorageDescriptor, dineway as default, getStoredConfig, local, memoryCache, s3 };