@notion-headless-cms/core 0.3.11 → 0.3.13

package/dist/index.mjs

@@ -59,44 +59,37 @@ const noopDocOps = noopDoc;
 const noopImgOps = noopImg;
 //#endregion
 //#region src/image.ts
-/** レスポンスヘッダまたはURLの拡張子からContent-Typeを推測する。 */
-function inferContentType(url, responseContentType) {
-	if (responseContentType?.startsWith("image/")) return responseContentType.split(";")[0].trim();
-	if (url.includes(".png")) return "image/png";
-	if (url.includes(".gif")) return "image/gif";
-	if (url.includes(".webp")) return "image/webp";
-	return "image/jpeg";
-}
 /**
-* URL → SHA-256 hash のメモ化マップ。
-* Notion の画像 URL は同じ画像でも署名が時刻ごとに変わるが、
-* 1 リクエスト内では同一 URL が複数回現れることが多い (重複ハッシュ計算を回避)。
-*
-* メモリリーク防止に最大エントリ数を設けており、超過時は最古から削除する LRU。
+* レスポンスの Content-Type ヘッダから画像の MIME タイプを取り出す。
+* ヘッダがない、または image/* でない場合は CMSError を投げる。
+* URL 拡張子からの推測や jpeg デフォルトは行わない。
 */
-const HASH_MEMO_LIMIT = 1024;
-const hashMemo = /* @__PURE__ */ new Map();
-async function memoSha256(url) {
-	const cached = hashMemo.get(url);
-	if (cached !== void 0) {
-		hashMemo.delete(url);
-		hashMemo.set(url, cached);
-		return cached;
-	}
-	const hash = await sha256Hex(url);
-	hashMemo.set(url, hash);
-	if (hashMemo.size > HASH_MEMO_LIMIT) {
-		const firstKey = hashMemo.keys().next().value;
-		if (firstKey !== void 0) hashMemo.delete(firstKey);
-	}
-	return hash;
+function pickImageContentType(headerValue, notionUrl) {
+	if (!headerValue) throw new CMSError({
+		code: "cache/image_invalid_content_type",
+		message: "Image response missing Content-Type header.",
+		context: {
+			operation: "fetchAndCacheImage:contentType",
+			notionUrl
+		}
+	});
+	const value = (headerValue.split(";")[0] ?? headerValue).trim().toLowerCase();
+	if (!value.startsWith("image/")) throw new CMSError({
+		code: "cache/image_invalid_content_type",
+		message: `Image response has non-image Content-Type: ${value}`,
+		context: {
+			operation: "fetchAndCacheImage:contentType",
+			notionUrl,
+			contentType: value
+		}
+	});
+	return value;
 }
 /**
 * Notion画像URLをfetchして ImageCacheOps にキャッシュし、プロキシURL を返す。
 * 既存キャッシュがあれば再fetchしない。
 */
-async function fetchAndCacheImage(cache, cacheName, notionUrl, imageProxyBase, logger) {
-	const hash = await memoSha256(notionUrl);
+async function fetchAndCacheImage(cache, cacheName, notionUrl, hash, imageProxyBase, logger) {
 	const proxyUrl = `${imageProxyBase}/${hash}`;
 	if (await cache.get(hash)) {
 		logger?.debug?.("画像キャッシュヒット", {
@@ -123,7 +116,7 @@ async function fetchAndCacheImage(cache, cacheName, notionUrl, imageProxyBase, l
 			}
 		});
 		const data = await response.arrayBuffer();
-		const contentType = inferContentType(notionUrl, response.headers.get("content-type"));
+		const contentType = pickImageContentType(response.headers.get("content-type"), notionUrl);
 		await cache.set(hash, data, contentType);
 		logger?.debug?.("画像をキャッシュに保存", {
 			operation: "fetchAndCacheImage",
@@ -148,9 +141,20 @@ async function fetchAndCacheImage(cache, cacheName, notionUrl, imageProxyBase, l
 * `ImageCacheOps` と `imageProxyBase` から `cacheImage` 関数を構築する。
 * 返り値は Notion 画像 URL を受け取り、SHA-256 ハッシュをキャッシュキーとして
 * {@link ImageCacheOps} に保存後、プロキシ URL を返す。
+*
+* ハッシュのメモ化はファクトリ呼び出し単位でスコープ化されており、
+* インスタンス間でキャッシュを共有しない。
 */
 function buildCacheImageFn(cache, cacheName, imageProxyBase, logger) {
-	return (notionUrl) => fetchAndCacheImage(cache, cacheName, notionUrl, imageProxyBase, logger);
+	const hashMemo = /* @__PURE__ */ new Map();
+	return async (notionUrl) => {
+		let hash = hashMemo.get(notionUrl);
+		if (hash === void 0) {
+			hash = await sha256Hex(notionUrl);
+			hashMemo.set(notionUrl, hash);
+		}
+		return fetchAndCacheImage(cache, cacheName, notionUrl, hash, imageProxyBase, logger);
+	};
 }
 //#endregion
 //#region src/rendering.ts
@@ -191,21 +195,26 @@ async function buildCachedItemContent(item, ctx) {
 			}
 		});
 	}
-	let blocks = [];
+	let blocks;
 	try {
 		blocks = await ctx.source.loadBlocks(item);
 	} catch (err) {
-		ctx.logger?.warn?.("loadBlocks に失敗したため raw フォールバック", {
-			slug: item.slug,
-			error: err instanceof Error ? err.message : String(err)
+		if (isCMSError(err)) throw err;
+		throw new CMSError({
+			code: "source/load_blocks_failed",
+			message: "Failed to load blocks from source.",
+			cause: err,
+			context: {
+				operation: "buildCachedItemContent:loadBlocks",
+				pageId: item.id,
+				slug: item.slug
+			}
 		});
-		blocks = [];
 	}
 	const cacheImage = ctx.hasImageCache ? buildCacheImageFn(ctx.imgCache, ctx.imgCacheName, ctx.imageProxyBase, ctx.logger) : void 0;
 	let html;
-	const rendererFn = ctx.rendererFn ?? await loadDefaultRenderer();
 	try {
-		html = await rendererFn(markdown, {
+		html = await ctx.rendererFn(markdown, {
 			imageProxyBase: ctx.imageProxyBase,
 			cacheImage,
 			remarkPlugins: ctx.contentConfig?.remarkPlugins,
@@ -241,23 +250,6 @@ async function buildCachedItemContent(item, ctx) {
 	ctx.hooks.onRenderEnd?.(item.slug, durationMs);
 	return result;
 }
-/**
-* renderer オプション未指定時のフォールバック。
-* @notion-headless-cms/renderer を動的 import する。
-* createCMS({ renderer }) で明示注入された場合はこのパスを通らない。
-*/
-async function loadDefaultRenderer() {
-	try {
-		return (await import("@notion-headless-cms/renderer")).renderMarkdown;
-	} catch (err) {
-		throw new CMSError({
-			code: "renderer/failed",
-			message: "renderer オプションが未指定で @notion-headless-cms/renderer が見つかりません。 createCMS({ renderer }) でレンダラーを注入するか、@notion-headless-cms/renderer をインストールしてください。",
-			cause: err,
-			context: { operation: "loadDefaultRenderer" }
-		});
-	}
-}
 //#endregion
 //#region src/retry.ts
 const DEFAULT_RETRY_CONFIG = {
@@ -376,7 +368,7 @@ var CollectionClientImpl = class {
 	async check(slug, currentVersion) {
 		const raw = await this.findRaw(slug);
 		if (!raw) return null;
-		if (raw.updatedAt === currentVersion) return { stale: false };
+		if (raw.lastEditedTime === currentVersion) return { stale: false };
 		const meta = await this.persistMeta(slug, raw);
 		await this.invalidateContent(slug);
 		return {
@@ -478,16 +470,31 @@ var CollectionClientImpl = class {
 		this.ctx.hooks.onContentRevalidated?.(slug, fresh);
 		return fresh;
 	}
-	/** メタ既知の状態で本文だけバックグラウンド再生成する。エラーは握りつぶす。 */
+	/** メタ既知の状態で本文だけバックグラウンド再生成する。エラーは onSwrError フックに通知する。 */
 	async rebuildContentBg(slug, item) {
 		try {
 			const fresh = await buildCachedItemContent(item, this.ctx.render);
 			await this.ctx.docCache.setContent(this.ctx.collection, slug, fresh);
 			this.ctx.hooks.onContentRevalidated?.(slug, fresh);
 		} catch (err) {
+			const cmsErr = isCMSError(err) ? err : new CMSError({
+				code: "swr/content_rebuild_failed",
+				message: "SWR background content rebuild failed.",
+				cause: err,
+				context: {
+					operation: "swr.rebuildContentBg",
+					collection: this.ctx.collection,
+					slug
+				}
+			});
+			this.ctx.hooks.onSwrError?.(cmsErr, {
+				phase: "item-content",
+				slug
+			});
 			this.ctx.logger?.warn?.("本文のバックグラウンド再生成に失敗", {
 				slug,
 				collection: this.ctx.collection,
+				code: cmsErr.code,
 				error: err instanceof Error ? err.message : String(err)
 			});
 		}
@@ -576,9 +583,24 @@ var CollectionClientImpl = class {
 				});
 			}
 		} catch (err) {
+			const cmsErr = isCMSError(err) ? err : new CMSError({
+				code: "swr/item_check_failed",
+				message: "SWR background item check failed.",
+				cause: err,
+				context: {
+					operation: "swr.checkAndUpdateItemBg",
+					collection: this.ctx.collection,
+					slug
+				}
+			});
+			this.ctx.hooks.onSwrError?.(cmsErr, {
+				phase: "item-meta",
+				slug
+			});
 			this.ctx.logger?.warn?.("SWR: アイテムのバックグラウンド差分チェックに失敗", {
 				slug,
 				collection: this.ctx.collection,
+				code: cmsErr.code,
 				error: err instanceof Error ? err.message : String(err)
 			});
 		}
@@ -608,14 +630,25 @@ var CollectionClientImpl = class {
 				});
 			}
 		} catch (err) {
+			const cmsErr = isCMSError(err) ? err : new CMSError({
+				code: "swr/list_check_failed",
+				message: "SWR background list check failed.",
+				cause: err,
+				context: {
+					operation: "swr.checkAndUpdateListBg",
+					collection: this.ctx.collection
+				}
+			});
+			this.ctx.hooks.onSwrError?.(cmsErr, { phase: "list" });
 			this.ctx.logger?.warn?.("SWR: リストのバックグラウンド差分チェックに失敗", {
 				collection: this.ctx.collection,
+				code: cmsErr.code,
 				error: err instanceof Error ? err.message : String(err)
 			});
 		}
 	}
-	fetchListRaw() {
-		return withRetry(() => this.ctx.source.list({ publishedStatuses: this.ctx.publishedStatuses.length > 0 ? this.ctx.publishedStatuses : void 0 }), {
+	async fetchListRaw() {
+		return (await withRetry(() => this.ctx.source.list({ publishedStatuses: this.ctx.publishedStatuses.length > 0 ? this.ctx.publishedStatuses : void 0 }), {
 			...this.ctx.retryConfig,
 			onRetry: (attempt, status) => {
 				this.ctx.logger?.warn?.("list() リトライ中", {
@@ -623,6 +656,10 @@ var CollectionClientImpl = class {
 					status
 				});
 			}
+		})).filter((item) => {
+			if (item.isArchived || item.isInTrash) return false;
+			if (this.ctx.accessibleStatuses.length > 0 && (!item.status || !this.ctx.accessibleStatuses.includes(item.status))) return false;
+			return true;
 		});
 	}
 	async findRaw(slug) {
@@ -642,12 +679,23 @@ var CollectionClientImpl = class {
 		if (notionPropName && findByProp) item = await withRetry(() => findByProp(notionPropName, slug), retryOpts);
 		else item = (await withRetry(() => this.ctx.source.list(), retryOpts)).find((i) => i.slug === slug) ?? null;
 		if (!item) return null;
+		if (item.isArchived || item.isInTrash) return null;
 		if (this.ctx.accessibleStatuses.length > 0 && (!item.status || !this.ctx.accessibleStatuses.includes(item.status))) return null;
 		return item;
 	}
 };
+function matchesWhere(item, where) {
+	for (const key of Object.keys(where)) {
+		const expected = where[key];
+		const actual = item[key];
+		if (Array.isArray(expected)) {
+			if (!expected.includes(actual)) return false;
+		} else if (actual !== expected) return false;
+	}
+	return true;
+}
 function applyListOptions(items, opts) {
-	if (!opts) return items;
+	if (!opts) return sortByPublishedAtDesc(items);
 	let result = items;
 	if (opts.status) {
 		const allow = new Set(Array.isArray(opts.status) ? opts.status : [opts.status]);
@@ -662,24 +710,46 @@ function applyListOptions(items, opts) {
 	}
 	if (opts.where) {
 		const where = opts.where;
-		result = result.filter((it) => Object.entries(where).every(([key, value]) => it[key] === value));
+		result = result.filter((it) => matchesWhere(it, where));
 	}
+	if (opts.filter) result = result.filter(opts.filter);
 	if (opts.sort) result = [...result].sort(makeComparator(opts.sort));
+	else result = sortByPublishedAtDesc(result);
 	const skip = opts.skip ?? 0;
 	const limit = opts.limit;
 	if (skip > 0 || limit !== void 0) result = result.slice(skip, limit !== void 0 ? skip + limit : void 0);
 	return result;
 }
+/** publishedAt 降順、未設定の場合は lastEditedTime 降順でソートする。 */
+function sortByPublishedAtDesc(items) {
+	return [...items].sort((a, b) => {
+		const av = a.publishedAt ?? a.lastEditedTime;
+		const bv = b.publishedAt ?? b.lastEditedTime;
+		if (av === bv) return 0;
+		return av > bv ? -1 : 1;
+	});
+}
 function makeComparator(sort) {
+	if (sort.compare) return sort.compare;
 	const by = sort.by;
 	const dir = sort.dir === "asc" ? 1 : -1;
 	return (a, b) => {
 		const av = a[by];
 		const bv = b[by];
 		if (av === bv) return 0;
-		if (av === void 0) return 1;
-		if (bv === void 0) return -1;
-		return av > bv ? dir : -dir;
+		if (av === void 0 || av === null) return 1;
+		if (bv === void 0 || bv === null) return -1;
+		if (typeof av === "string" && typeof bv === "string") return av > bv ? dir : -dir;
+		if (typeof av === "number" && typeof bv === "number") return av > bv ? dir : -dir;
+		throw new CMSError({
+			code: "core/sort_unsupported_type",
+			message: `"${String(by)}" フィールドの型 "${typeof av}" はソート非対応です。compare 関数を指定してください。`,
+			context: {
+				operation: "makeComparator",
+				field: String(by),
+				type: typeof av
+			}
+		});
 	};
 }
 //#endregion
@@ -690,12 +760,23 @@ const DEFAULT_OPTS = {
 	revalidatePath: "/revalidate"
 };
 /**
+* CMSError のコードから HTTP ステータスコードを返す。
+* 既知の webhook エラーコードのみ対応し、それ以外は null を返す。
+*/
+function webhookErrorStatus(code) {
+	if (code === "webhook/signature_invalid") return 401;
+	if (code === "webhook/not_implemented") return 501;
+	if (code === "webhook/unknown_collection") return 404;
+	if (code === "webhook/payload_invalid") return 400;
+	return null;
+}
+/**
 * Web Standard な Request → Response ルーター。
 * Next.js / React Router / Hono / Cloudflare Workers いずれでも使える。
 *
 * ルート:
-* - GET  `{basePath}/images/:hash` — 画像プロキシ
-* - POST `{basePath}/revalidate`   — Webhook 受信 + $revalidate()
+* - GET  `{basePath}/images/:hash`              — 画像プロキシ
+* - POST `{basePath}/revalidate/:collection`    — Webhook 受信 + $revalidate()
 */
 function createHandler(adapter, opts = {}) {
 	const basePath = trimTrailingSlash(opts.basePath ?? DEFAULT_OPTS.basePath);
@@ -715,23 +796,38 @@ function createHandler(adapter, opts = {}) {
 			headers.set("cache-control", "public, max-age=31536000, immutable");
 			return new Response(object.data, { headers });
 		}
-		if (req.method === "POST" && rel === revalidatePath) {
-			const scope = await adapter.parseWebhook(req, opts.webhookSecret);
-			if (!scope) return new Response(JSON.stringify({
+		if (req.method === "POST" && rel.startsWith(`${revalidatePath}/`)) {
+			const collection = rel.slice(revalidatePath.length + 1);
+			if (!collection || collection.includes("/")) return new Response(JSON.stringify({
 				ok: false,
-				reason: "invalid"
+				reason: "collection required"
 			}), {
 				status: 400,
 				headers: { "content-type": "application/json" }
 			});
-			await adapter.revalidate(scope);
-			return new Response(JSON.stringify({
-				ok: true,
-				scope
-			}), {
-				status: 200,
-				headers: { "content-type": "application/json" }
-			});
+			try {
+				const scope = await adapter.parseWebhookFor(collection, req, opts.webhookSecret);
+				await adapter.revalidate(scope);
+				return new Response(JSON.stringify({
+					ok: true,
+					scope
+				}), {
+					status: 200,
+					headers: { "content-type": "application/json" }
+				});
+			} catch (err) {
+				if (isCMSError(err)) {
+					const status = webhookErrorStatus(err.code);
+					if (status !== null) return new Response(JSON.stringify({
+						ok: false,
+						code: err.code
+					}), {
+						status,
+						headers: { "content-type": "application/json" }
+					});
+				}
+				throw err;
+			}
 		}
 		return new Response("Not Found", { status: 404 });
 	};
@@ -853,10 +949,10 @@ function createCMS(opts) {
 		...DEFAULT_RETRY_CONFIG,
 		...opts.rateLimiter ?? {}
 	};
-	const collectionNames = Object.keys(opts.collections);
+	const collectionNames = [];
 	const collections = {};
-	for (const name of collectionNames) {
-		const def = opts.collections[name];
+	for (const [name, def] of Object.entries(opts.collections)) {
+		collectionNames.push(name);
 		const source = def.source;
 		const colHooks = def.hooks;
 		const collectionHooks = colHooks ? mergeHooks([{
@@ -903,27 +999,26 @@ function createCMS(opts) {
 		$handler(handlerOpts) {
 			return createHandler({
 				imageCache: cacheRes.img,
-				parseWebhook: async (req, webhookSecret) => {
-					for (const name of collectionNames) {
-						const ds = opts.collections[name].source;
-						if (ds.parseWebhook) try {
-							return await ds.parseWebhook(req.clone(), { secret: webhookSecret });
-						} catch (err) {
-							logger?.warn?.("parseWebhook 失敗", {
-								collection: name,
-								error: err instanceof Error ? err.message : String(err)
-							});
+				async parseWebhookFor(collection, req, webhookSecret) {
+					const def = opts.collections[collection];
+					if (!def) throw new CMSError({
+						code: "webhook/unknown_collection",
+						message: `Unknown collection: ${collection}`,
+						context: {
+							operation: "parseWebhookFor",
+							collection
+						}
+					});
+					const ds = def.source;
+					if (!ds.parseWebhook) throw new CMSError({
+						code: "webhook/not_implemented",
+						message: `Collection "${collection}" does not support webhooks.`,
+						context: {
+							operation: "parseWebhookFor",
+							collection
 						}
-					}
-					try {
-						const body = await req.json();
-						if (body.slug && body.collection) return {
-							collection: body.collection,
-							slug: body.slug
-						};
-						if (body.collection) return { collection: body.collection };
-					} catch {}
-					return null;
+					});
+					return ds.parseWebhook(req, { secret: webhookSecret });
 				},
 				revalidate: (scope) => globalOps.$invalidate(scope)
 			}, handlerOpts);