@notion-headless-cms/core 0.3.7 → 0.3.9

package/dist/index.mjs

@@ -1,5 +1,4 @@
-import { memoryDocumentCache, memoryImageCache } from "./cache/memory.mjs";
-import { noopDocumentCache, noopImageCache } from "./cache/noop.mjs";
+import { memoryCache } from "./cache/memory.mjs";
 import { CMSError, isCMSError, isCMSErrorInNamespace } from "./errors.mjs";
 import { mergeHooks, mergeLoggers } from "./hooks.mjs";
 //#region src/cache.ts
@@ -18,6 +17,47 @@ function isStale(cachedAt, ttlMs) {
 	return Date.now() - cachedAt > ttlMs;
 }
 //#endregion
+//#region src/cache/noop.ts
+/** 何もキャッシュしないドキュメントオペレーション。常に null を返す。 */
+const noopDoc = {
+	getList(_collection) {
+		return Promise.resolve(null);
+	},
+	setList(_collection, _data) {
+		return Promise.resolve();
+	},
+	getMeta(_collection, _slug) {
+		return Promise.resolve(null);
+	},
+	setMeta(_collection, _slug, _data) {
+		return Promise.resolve();
+	},
+	getContent(_collection, _slug) {
+		return Promise.resolve(null);
+	},
+	setContent(_collection, _slug, _data) {
+		return Promise.resolve();
+	},
+	invalidate() {
+		return Promise.resolve();
+	}
+};
+/** 何もキャッシュしない画像オペレーション。 */
+const noopImg = {
+	get(_hash) {
+		return Promise.resolve(null);
+	},
+	set() {
+		return Promise.resolve();
+	}
+};
+/**
+* 何もキャッシュしないアダプタ。`createCMS({ cache })` 未指定時の内部デフォルト。
+* テストでも使える。
+*/
+const noopDocOps = noopDoc;
+const noopImgOps = noopImg;
+//#endregion
 //#region src/image.ts
 /** レスポンスヘッダまたはURLの拡張子からContent-Typeを推測する。 */
 function inferContentType(url, responseContentType) {
@@ -28,23 +68,47 @@ function inferContentType(url, responseContentType) {
 	return "image/jpeg";
 }
 /**
-* Notion画像URLをfetchしてImageCacheAdapterにキャッシュし、プロキシURL を返す。
+* URL → SHA-256 hash のメモ化マップ。
+* Notion の画像 URL は同じ画像でも署名が時刻ごとに変わるが、
+* 1 リクエスト内では同一 URL が複数回現れることが多い (重複ハッシュ計算を回避)。
+*
+* メモリリーク防止に最大エントリ数を設けており、超過時は最古から削除する LRU。
+*/
+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;
+}
+/**
+* Notion画像URLをfetchして ImageCacheOps にキャッシュし、プロキシURL を返す。
 * 既存キャッシュがあれば再fetchしない。
 */
-async function fetchAndCacheImage(cache, notionUrl, imageProxyBase, logger) {
-	const hash = await sha256Hex(notionUrl);
+async function fetchAndCacheImage(cache, cacheName, notionUrl, imageProxyBase, logger) {
+	const hash = await memoSha256(notionUrl);
 	const proxyUrl = `${imageProxyBase}/${hash}`;
 	if (await cache.get(hash)) {
 		logger?.debug?.("画像キャッシュヒット", {
 			operation: "fetchAndCacheImage",
-			cacheAdapter: cache.name,
+			cacheAdapter: cacheName,
 			imageHash: hash
 		});
 		return proxyUrl;
 	}
 	logger?.debug?.("画像キャッシュミス、Notion からフェッチ", {
 		operation: "fetchAndCacheImage",
-		cacheAdapter: cache.name,
+		cacheAdapter: cacheName,
 		imageHash: hash
 	});
 	try {
@@ -63,7 +127,7 @@ async function fetchAndCacheImage(cache, notionUrl, imageProxyBase, logger) {
 		await cache.set(hash, data, contentType);
 		logger?.debug?.("画像をキャッシュに保存", {
 			operation: "fetchAndCacheImage",
-			cacheAdapter: cache.name,
+			cacheAdapter: cacheName,
 			imageHash: hash
 		});
 	} catch (err) {
@@ -81,23 +145,30 @@ async function fetchAndCacheImage(cache, notionUrl, imageProxyBase, logger) {
 	return proxyUrl;
 }
 /**
-* ImageCacheAdapter と imageProxyBase から cacheImage 関数を構築するファクトリ。
-*
-* 返り値の関数は Notion 画像 URL を受け取り、SHA-256 ハッシュをキャッシュキーとして
-* {@link ImageCacheAdapter} に保存後、フロントエンドへの配信用プロキシ URL を返す。
-* Content-Type はレスポンスヘッダまたは URL の拡張子から推測する。
-* タイムアウトは 10 秒固定。
+* `ImageCacheOps` と `imageProxyBase` から `cacheImage` 関数を構築する。
+* 返り値は Notion 画像 URL を受け取り、SHA-256 ハッシュをキャッシュキーとして
+* {@link ImageCacheOps} に保存後、プロキシ URL を返す。
 */
-function buildCacheImageFn(cache, imageProxyBase, logger) {
-	return (notionUrl) => fetchAndCacheImage(cache, notionUrl, imageProxyBase, logger);
+function buildCacheImageFn(cache, cacheName, imageProxyBase, logger) {
+	return (notionUrl) => fetchAndCacheImage(cache, cacheName, notionUrl, imageProxyBase, logger);
 }
 //#endregion
 //#region src/rendering.ts
 /**
-* コンテンツアイテムをソースから Markdown ロード → blocks 生成 → HTML レンダリング
-* → フック適用まで実行し、キャッシュ保存用の `CachedItem` を返す。
+* メタデータキャッシュエントリを生成する。Notion API も renderer も呼ばない軽量関数。
+*/
+function buildCachedItemMeta(item, source) {
+	return {
+		item,
+		notionUpdatedAt: source.getLastModified(item),
+		cachedAt: Date.now()
+	};
+}
+/**
+* アイテム本文を Markdown ロード → blocks 生成 → HTML レンダリング → フック適用まで
+* 実行し、本文キャッシュ用の `CachedItemContent` を返す。
 */
-async function buildCachedItem(item, ctx) {
+async function buildCachedItemContent(item, ctx) {
 	const start = Date.now();
 	ctx.logger?.info?.("コンテンツのレンダリング開始", {
 		slug: item.slug,
@@ -114,7 +185,7 @@ async function buildCachedItem(item, ctx) {
 			message: "Failed to load markdown from source.",
 			cause: err,
 			context: {
-				operation: "buildCachedItem:loadMarkdown",
+				operation: "buildCachedItemContent:loadMarkdown",
 				pageId: item.id,
 				slug: item.slug
 			}
@@ -130,7 +201,7 @@ async function buildCachedItem(item, ctx) {
 		});
 		blocks = [];
 	}
-	const cacheImage = ctx.hasImageCache ? buildCacheImageFn(ctx.imgCache, ctx.imageProxyBase, ctx.logger) : void 0;
+	const cacheImage = ctx.hasImageCache ? buildCacheImageFn(ctx.imgCache, ctx.imgCacheName, ctx.imageProxyBase, ctx.logger) : void 0;
 	let html;
 	const rendererFn = ctx.rendererFn ?? await loadDefaultRenderer();
 	try {
@@ -147,7 +218,7 @@ async function buildCachedItem(item, ctx) {
 			message: "Failed to render markdown.",
 			cause: err,
 			context: {
-				operation: "buildCachedItem:renderMarkdown",
+				operation: "buildCachedItemContent:renderMarkdown",
 				pageId: item.id,
 				slug: item.slug
 			}
@@ -158,11 +229,10 @@ async function buildCachedItem(item, ctx) {
 		html,
 		blocks,
 		markdown,
-		item,
 		notionUpdatedAt: ctx.source.getLastModified(item),
 		cachedAt: Date.now()
 	};
-	if (ctx.hooks.beforeCache) result = await ctx.hooks.beforeCache(result);
+	if (ctx.hooks.beforeCacheContent) result = await ctx.hooks.beforeCacheContent(result, item);
 	const durationMs = Date.now() - start;
 	ctx.logger?.info?.("コンテンツのレンダリング完了", {
 		slug: item.slug,
@@ -230,132 +300,101 @@ async function withRetry(fn, config) {
 /**
 * コレクション別キャッシュキーを生成する。
 * item: `{collection}:{slug}` / list: `{collection}`
+*
+* (Cache adapter 内部のキー戦略はアダプタごとに異なるが、
+* 表示や再計算用に core 側でも公開ヘルパーを提供する)
 */
 function collectionKey(collection, slug) {
 	return slug ? `${collection}:${slug}` : collection;
 }
 /** CollectionClient の実装。ユーザーは `createCMS` 経由でインスタンスを受け取る。 */
 var CollectionClientImpl = class {
+	cache;
 	constructor(ctx) {
 		this.ctx = ctx;
+		this.cache = {
+			invalidate: (slug) => this.invalidateImpl(slug),
+			warm: (opts) => this.warmImpl(opts),
+			adjacent: (slug, opts) => this.adjacentImpl(slug, opts)
+		};
 	}
-	async getItem(slug) {
-		const cached = await this.ctx.docCache.getItem(slug);
-		if (cached) {
-			if (this.ctx.ttlMs !== void 0 && isStale(cached.cachedAt, this.ctx.ttlMs)) {
+	async get(slug, opts = {}) {
+		if (opts.fresh) {
+			this.ctx.hooks.onCacheMiss?.(slug);
+			const item = await this.findRaw(slug);
+			if (!item) return null;
+			const meta = await this.persistMeta(slug, item);
+			await this.invalidateContent(slug);
+			return this.attachLazyContent(meta);
+		}
+		const cachedMeta = await this.ctx.docCache.getMeta(this.ctx.collection, slug);
+		if (cachedMeta) {
+			if (this.ctx.ttlMs !== void 0 && isStale(cachedMeta.cachedAt, this.ctx.ttlMs)) {
 				this.ctx.logger?.debug?.("キャッシュ期限切れ（TTL）、フェッチ", {
-					operation: "getItem",
+					operation: "get",
 					slug,
 					collection: this.ctx.collection,
-					cacheAdapter: this.ctx.docCache.name
+					cacheAdapter: this.ctx.docCacheName
 				});
 				this.ctx.hooks.onCacheMiss?.(slug);
 				const item = await this.findRaw(slug);
 				if (!item) return null;
-				const entry = await buildCachedItem(item, this.ctx.render);
-				await this.ctx.docCache.setItem(slug, entry);
-				return this.attachContent(entry.item, entry);
+				const meta = await this.persistMeta(slug, item);
+				await this.invalidateContent(slug);
+				return this.attachLazyContent(meta);
 			}
-			const bg = this.checkAndUpdateItemBg(slug, cached);
+			const bg = this.checkAndUpdateItemBg(slug, cachedMeta);
 			if (this.ctx.waitUntil) this.ctx.waitUntil(bg);
 			this.ctx.logger?.debug?.("キャッシュヒット", {
-				operation: "getItem",
+				operation: "get",
 				slug,
 				collection: this.ctx.collection,
-				cacheAdapter: this.ctx.docCache.name,
-				cachedAt: cached.cachedAt
+				cacheAdapter: this.ctx.docCacheName,
+				cachedAt: cachedMeta.cachedAt
 			});
-			this.ctx.hooks.onCacheHit?.(slug, cached);
-			return this.attachContent(cached.item, cached);
+			this.ctx.hooks.onCacheHit?.(slug, cachedMeta);
+			return this.attachLazyContent(cachedMeta);
 		}
 		this.ctx.logger?.debug?.("キャッシュミス、フェッチ", {
-			operation: "getItem",
+			operation: "get",
 			slug,
 			collection: this.ctx.collection,
-			cacheAdapter: this.ctx.docCache.name
+			cacheAdapter: this.ctx.docCacheName
 		});
 		this.ctx.hooks.onCacheMiss?.(slug);
 		const item = await this.findRaw(slug);
-		if (!item) {
-			this.ctx.logger?.debug?.("アイテムが見つかりません", {
-				operation: "getItem",
-				slug,
-				collection: this.ctx.collection
-			});
-			return null;
-		}
-		const entry = await buildCachedItem(item, this.ctx.render);
-		const save = this.ctx.docCache.setItem(slug, entry);
-		if (this.ctx.waitUntil) this.ctx.waitUntil(save);
-		else await save;
-		return this.attachContent(entry.item, entry);
+		if (!item) return null;
+		const meta = await this.persistMeta(slug, item, { background: true });
+		return this.attachLazyContent(meta);
 	}
-	async getList(opts) {
-		const items = applyGetListOptions(await this.fetchList(), opts);
-		return {
-			items,
-			version: this.ctx.source.getListVersion(items)
-		};
+	async list(opts) {
+		return applyListOptions(await this.fetchList(), opts);
 	}
-	async getStaticParams() {
+	async params() {
 		return (await this.fetchList()).map((item) => ({ slug: item.slug }));
 	}
-	async getStaticPaths() {
-		return (await this.fetchList()).map((item) => item.slug);
-	}
-	async adjacent(slug, opts) {
-		const items = applyGetListOptions(await this.fetchList(), { sort: opts?.sort });
-		const index = items.findIndex((it) => it.slug === slug);
-		if (index === -1) return {
-			prev: null,
-			next: null
-		};
-		return {
-			prev: index > 0 ? items[index - 1] ?? null : null,
-			next: index < items.length - 1 ? items[index + 1] ?? null : null
-		};
-	}
-	async revalidate(slug) {
-		this.ctx.logger?.debug?.("アイテムキャッシュを無効化", {
-			operation: "revalidate",
-			collection: this.ctx.collection,
-			cacheAdapter: this.ctx.docCache.name,
-			slug
-		});
-		if (!this.ctx.docCache.invalidate) return;
-		await this.ctx.docCache.invalidate({
-			collection: this.ctx.collection,
-			slug
-		});
-	}
-	async revalidateAll() {
+	async invalidateImpl(slug) {
+		if (slug !== void 0) {
+			this.ctx.logger?.debug?.("アイテムキャッシュを無効化", {
+				operation: "cache.invalidate",
+				collection: this.ctx.collection,
+				cacheAdapter: this.ctx.docCacheName,
+				slug
+			});
+			await this.ctx.docCache.invalidate({
+				collection: this.ctx.collection,
+				slug
+			});
+			return;
+		}
 		this.ctx.logger?.debug?.("コレクション全体のキャッシュを無効化", {
-			operation: "revalidateAll",
+			operation: "cache.invalidate",
 			collection: this.ctx.collection,
-			cacheAdapter: this.ctx.docCache.name
+			cacheAdapter: this.ctx.docCacheName
 		});
-		if (!this.ctx.docCache.invalidate) return;
 		await this.ctx.docCache.invalidate({ collection: this.ctx.collection });
 	}
-	async checkForUpdate({ slug, since }) {
-		await this.revalidate(slug);
-		const item = await this.getItem(slug);
-		if (!item) return { changed: false };
-		return item.updatedAt !== since ? {
-			changed: true,
-			item
-		} : { changed: false };
-	}
-	async checkListForUpdate({ since, filter }) {
-		await this.revalidateAll();
-		const { items, version } = await this.getList(filter);
-		return version !== since ? {
-			changed: true,
-			items,
-			version
-		} : { changed: false };
-	}
-	async prefetch(opts) {
+	async warmImpl(opts) {
 		const items = await this.fetchListRaw();
 		const concurrency = opts?.concurrency ?? this.ctx.maxConcurrent;
 		let ok = 0;
@@ -364,12 +403,13 @@ var CollectionClientImpl = class {
 			const chunk = items.slice(i, i + concurrency);
 			await Promise.all(chunk.map(async (item) => {
 				try {
-					const rendered = await buildCachedItem(item, this.ctx.render);
-					await this.ctx.docCache.setItem(item.slug, rendered);
+					await this.persistMeta(item.slug, item);
+					const content = await buildCachedItemContent(item, this.ctx.render);
+					await this.ctx.docCache.setContent(this.ctx.collection, item.slug, content);
 					ok++;
 				} catch (err) {
 					failed++;
-					this.ctx.logger?.warn?.("prefetch: アイテムの事前レンダリングに失敗", {
+					this.ctx.logger?.warn?.("warm: アイテムの事前レンダリングに失敗", {
 						slug: item.slug,
 						pageId: item.id,
 						error: err instanceof Error ? err.message : String(err)
@@ -378,7 +418,7 @@ var CollectionClientImpl = class {
 			}));
 			opts?.onProgress?.(Math.min(i + concurrency, items.length), items.length);
 		}
-		await this.ctx.docCache.setList({
+		await this.ctx.docCache.setList(this.ctx.collection, {
 			items,
 			cachedAt: Date.now()
 		});
@@ -387,45 +427,86 @@ var CollectionClientImpl = class {
 			failed
 		};
 	}
-	attachContent(item, cached) {
-		const ctx = this.ctx;
-		let blocksCache;
-		let htmlCache = cached.html;
-		let markdownCache;
-		const content = {
-			get blocks() {
-				if (!blocksCache) blocksCache = [{
-					type: "raw",
-					html: cached.html
-				}];
-				return blocksCache;
-			},
-			async html() {
-				if (htmlCache !== void 0) return htmlCache;
-				htmlCache = cached.html;
-				return htmlCache;
-			},
-			async markdown() {
-				if (markdownCache !== void 0) return markdownCache;
-				markdownCache = await ctx.source.loadMarkdown(item);
-				return markdownCache;
-			}
+	async adjacentImpl(slug, opts) {
+		const items = applyListOptions(await this.fetchList(), { sort: opts?.sort });
+		const index = items.findIndex((it) => it.slug === slug);
+		if (index === -1) return {
+			prev: null,
+			next: null
+		};
+		return {
+			prev: index > 0 ? items[index - 1] ?? null : null,
+			next: index < items.length - 1 ? items[index + 1] ?? null : null
+		};
+	}
+	async persistMeta(slug, item, opts = {}) {
+		let meta = buildCachedItemMeta(item, this.ctx.source);
+		if (this.ctx.hooks.beforeCacheMeta) meta = await this.ctx.hooks.beforeCacheMeta(meta);
+		const save = this.ctx.docCache.setMeta(this.ctx.collection, slug, meta);
+		if (opts.background && this.ctx.waitUntil) this.ctx.waitUntil(save);
+		else await save;
+		return meta;
+	}
+	async invalidateContent(slug) {
+		await this.ctx.docCache.invalidate({
+			collection: this.ctx.collection,
+			slug,
+			kind: "content"
+		});
+	}
+	/**
+	* 本文キャッシュをロードする。キャッシュが無いか、メタとの整合性が取れない場合は
+	* 再生成して書き戻す。
+	*/
+	async loadOrBuildContent(slug, item) {
+		const expected = this.ctx.source.getLastModified(item);
+		const cached = await this.ctx.docCache.getContent(this.ctx.collection, slug);
+		if (cached && cached.notionUpdatedAt === expected) return cached;
+		const fresh = await buildCachedItemContent(item, this.ctx.render);
+		await this.ctx.docCache.setContent(this.ctx.collection, slug, fresh);
+		this.ctx.hooks.onContentRevalidated?.(slug, fresh);
+		return fresh;
+	}
+	/** メタ既知の状態で本文だけバックグラウンド再生成する。エラーは握りつぶす。 */
+	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) {
+			this.ctx.logger?.warn?.("本文のバックグラウンド再生成に失敗", {
+				slug,
+				collection: this.ctx.collection,
+				error: err instanceof Error ? err.message : String(err)
+			});
+		}
+	}
+	attachLazyContent(meta) {
+		const slug = meta.item.slug;
+		const item = meta.item;
+		let payloadPromise;
+		const loadPayload = () => {
+			if (!payloadPromise) payloadPromise = this.loadOrBuildContent(slug, item);
+			return payloadPromise;
+		};
+		const render = async (opts) => {
+			const payload = await loadPayload();
+			return opts?.format === "markdown" ? payload.markdown : payload.html;
 		};
-		if (cached.blocks) blocksCache = cached.blocks;
-		return Object.assign(Object.create(null), item, { content });
+		return Object.assign(Object.create(null), item, { render });
 	}
 	async fetchList() {
-		const cached = await this.ctx.docCache.getList();
+		const cached = await this.ctx.docCache.getList(this.ctx.collection);
 		if (cached) {
 			if (this.ctx.ttlMs !== void 0 && isStale(cached.cachedAt, this.ctx.ttlMs)) {
 				this.ctx.logger?.debug?.("リストキャッシュ期限切れ（TTL）、フェッチ", {
-					operation: "getList",
+					operation: "list",
 					collection: this.ctx.collection,
-					cacheAdapter: this.ctx.docCache.name
+					cacheAdapter: this.ctx.docCacheName
 				});
 				this.ctx.hooks.onListCacheMiss?.();
 				const items = await this.fetchListRaw();
-				await this.ctx.docCache.setList({
+				await this.ctx.docCache.setList(this.ctx.collection, {
 					items,
 					cachedAt: Date.now()
 				});
@@ -434,22 +515,22 @@ var CollectionClientImpl = class {
 			const bg = this.checkAndUpdateListBg(cached);
 			if (this.ctx.waitUntil) this.ctx.waitUntil(bg);
 			this.ctx.logger?.debug?.("リストキャッシュヒット", {
-				operation: "getList",
+				operation: "list",
 				collection: this.ctx.collection,
-				cacheAdapter: this.ctx.docCache.name
+				cacheAdapter: this.ctx.docCacheName
 			});
 			this.ctx.hooks.onListCacheHit?.(cached);
 			return cached.items;
 		}
 		this.ctx.logger?.debug?.("リストキャッシュミス、フェッチ", {
-			operation: "getList",
+			operation: "list",
 			collection: this.ctx.collection,
-			cacheAdapter: this.ctx.docCache.name
+			cacheAdapter: this.ctx.docCacheName
 		});
 		this.ctx.hooks.onListCacheMiss?.();
 		const items = await this.fetchListRaw();
 		const cachedAt = Date.now();
-		const save = this.ctx.docCache.setList({
+		const save = this.ctx.docCache.setList(this.ctx.collection, {
 			items,
 			cachedAt
 		});
@@ -462,22 +543,23 @@ var CollectionClientImpl = class {
 			const item = await this.findRaw(slug);
 			if (!item) return;
 			if (this.ctx.source.getLastModified(item) !== cached.notionUpdatedAt) {
-				const entry = await buildCachedItem(item, this.ctx.render);
-				await this.ctx.docCache.setItem(slug, entry);
-				this.ctx.logger?.debug?.("SWR: 差分を検出、キャッシュを差し替え", {
-					operation: "getItem:bg",
+				const meta = await this.persistMeta(slug, item);
+				await this.invalidateContent(slug);
+				this.ctx.logger?.debug?.("SWR: 差分を検出、メタを差し替え", {
+					operation: "get:bg",
 					slug,
 					collection: this.ctx.collection,
 					notionUpdatedAt: cached.notionUpdatedAt
 				});
-				this.ctx.hooks.onCacheRevalidated?.(slug, entry);
+				this.ctx.hooks.onCacheRevalidated?.(slug, meta);
+				await this.rebuildContentBg(slug, item);
 			} else if (this.ctx.ttlMs !== void 0) {
-				await this.ctx.docCache.setItem(slug, {
+				await this.ctx.docCache.setMeta(this.ctx.collection, slug, {
 					...cached,
 					cachedAt: Date.now()
 				});
 				this.ctx.logger?.debug?.("SWR: 差分なし、TTL をリセット", {
-					operation: "getItem:bg",
+					operation: "get:bg",
 					slug,
 					collection: this.ctx.collection
 				});
@@ -498,19 +580,19 @@ var CollectionClientImpl = class {
 					items,
 					cachedAt: Date.now()
 				};
-				await this.ctx.docCache.setList(listEntry);
+				await this.ctx.docCache.setList(this.ctx.collection, listEntry);
 				this.ctx.logger?.debug?.("SWR: リスト差分を検出、キャッシュを差し替え", {
-					operation: "getList:bg",
+					operation: "list:bg",
 					collection: this.ctx.collection
 				});
 				this.ctx.hooks.onListCacheRevalidated?.(listEntry);
 			} else if (this.ctx.ttlMs !== void 0) {
-				await this.ctx.docCache.setList({
+				await this.ctx.docCache.setList(this.ctx.collection, {
 					...cached,
 					cachedAt: Date.now()
 				});
 				this.ctx.logger?.debug?.("SWR: リスト差分なし、TTL をリセット", {
-					operation: "getList:bg",
+					operation: "list:bg",
 					collection: this.ctx.collection
 				});
 			}
@@ -525,7 +607,7 @@ var CollectionClientImpl = class {
 		return 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?.("getList() リトライ中", {
+				this.ctx.logger?.warn?.("list() リトライ中", {
 					attempt,
 					status
 				});
@@ -536,15 +618,14 @@ var CollectionClientImpl = class {
 		const retryOpts = {
 			...this.ctx.retryConfig,
 			onRetry: (attempt, status) => {
-				this.ctx.logger?.warn?.("getItem() リトライ中", {
+				this.ctx.logger?.warn?.("get() リトライ中", {
 					attempt,
 					status,
 					slug
 				});
 			}
 		};
-		const slugField = this.ctx.slugField;
-		const notionPropName = slugField ? this.ctx.source.properties?.[slugField]?.notion : void 0;
+		const notionPropName = this.ctx.source.properties?.[this.ctx.slugField]?.notion;
 		let item;
 		const findByProp = this.ctx.source.findByProp?.bind(this.ctx.source);
 		if (notionPropName && findByProp) item = await withRetry(() => findByProp(notionPropName, slug), retryOpts);
@@ -554,11 +635,11 @@ var CollectionClientImpl = class {
 		return item;
 	}
 };
-function applyGetListOptions(items, opts) {
+function applyListOptions(items, opts) {
 	if (!opts) return items;
 	let result = items;
-	if (opts.statuses && opts.statuses.length > 0) {
-		const allow = new Set(opts.statuses);
+	if (opts.status) {
+		const allow = new Set(Array.isArray(opts.status) ? opts.status : [opts.status]);
 		result = result.filter((it) => it.status !== void 0 && allow.has(it.status));
 	}
 	if (opts.tag) {
@@ -580,7 +661,7 @@ function applyGetListOptions(items, opts) {
 }
 function makeComparator(sort) {
 	const by = sort.by;
-	const dir = sort.direction === "asc" ? 1 : -1;
+	const dir = sort.dir === "asc" ? 1 : -1;
 	return (a, b) => {
 		const av = a[by];
 		const bv = b[by];
@@ -648,88 +729,41 @@ function trimTrailingSlash(s) {
 	return s.endsWith("/") ? s.slice(0, -1) : s;
 }
 //#endregion
-//#region src/preset-node.ts
-/**
-* Node.js ランタイム向けの `createCMS` オプションプリセット。
-* メモリキャッシュをデフォルト有効にした `{ cache, renderer }` を返す。
-*
-* @example
-* import { createCMS, nodePreset } from "@notion-headless-cms/core";
-* import { cmsDataSources } from "./generated/cms-schema";
-*
-* const cms = createCMS({
-*   ...nodePreset({ ttlMs: 5 * 60_000 }),
-*   dataSources: cmsDataSources,
-* });
-*/
-function nodePreset(opts = {}) {
-	if (opts.cache === "disabled") return {
-		cache: void 0,
-		renderer: opts.renderer
-	};
-	return {
-		cache: opts.cache ?? {
-			document: memoryDocumentCache(),
-			image: memoryImageCache(),
-			ttlMs: opts.ttlMs
-		},
-		renderer: opts.renderer
-	};
-}
-//#endregion
 //#region src/cms.ts
 const DEFAULT_IMAGE_PROXY_BASE = "/api/images";
-function resolveDocumentCache(cache) {
-	if (!cache || cache === "disabled" || !cache.document) return noopDocumentCache();
-	return cache.document;
-}
-function resolveImageCache(cache) {
-	if (!cache || cache === "disabled" || !cache.image) return noopImageCache();
-	return cache.image;
-}
-function resolveTtl(cache) {
-	if (!cache || cache === "disabled") return void 0;
-	return cache.ttlMs;
-}
-function hasImageCacheConfigured(cache) {
-	if (!cache || cache === "disabled") return false;
-	return !!cache.image;
-}
 /**
-* `{collection}:{slug}` キー空間で動作するコレクション別キャッシュビューを生成する。
-* 単一の `DocumentCacheAdapter` に複数コレクションを同居させるためのアダプタ。
+* `cache` オプションから document / image オペレーションを解決する。
+*
+* - 配列で渡された場合は各 adapter の `handles` を見て先勝ち (最初に見つかったもの) で振り分ける
+* - 単体で渡された場合は `handles` の領域だけ反映、片側は noop
+* - 未指定なら両方 noop
 */
-function scopeDocumentCache(base, collection) {
-	const itemKey = (slug) => `${collection}:${slug}`;
-	let listSlot = null;
-	let listInitialized = false;
-	return {
-		name: `${base.name}@${collection}`,
-		getList: async () => {
-			if (!listInitialized) {
-				listInitialized = true;
-				listSlot = await base.getList();
-			}
-			return listSlot;
-		},
-		setList: (data) => {
-			listSlot = data;
-			listInitialized = true;
-			return Promise.resolve();
-		},
-		getItem: (slug) => base.getItem(itemKey(slug)),
-		setItem: (slug, data) => base.setItem(itemKey(slug), data),
-		async invalidate(scope) {
-			listSlot = null;
-			listInitialized = true;
-			if (!base.invalidate) return;
-			if (scope === "all") return base.invalidate({ collection });
-			if ("slug" in scope) return base.invalidate({
-				collection: scope.collection,
-				slug: itemKey(scope.slug)
-			});
-			return base.invalidate(scope);
+function resolveCache(cache) {
+	const adapters = cache === void 0 ? [] : Array.isArray(cache) ? cache : [cache];
+	let doc = noopDocOps;
+	let docName = "noop-document";
+	let img = noopImgOps;
+	let imgName = "noop-image";
+	let docFound = false;
+	let imgFound = false;
+	for (const adapter of adapters) {
+		if (!docFound && adapter.handles.includes("document") && adapter.doc) {
+			doc = adapter.doc;
+			docName = adapter.name;
+			docFound = true;
+		}
+		if (!imgFound && adapter.handles.includes("image") && adapter.img) {
+			img = adapter.img;
+			imgName = adapter.name;
+			imgFound = true;
 		}
+	}
+	return {
+		doc,
+		docName,
+		img,
+		imgName,
+		hasImg: imgFound
 	};
 }
 const LOG_LEVEL_ORDER = {
@@ -752,68 +786,53 @@ function applyLogLevel(logger, minLevel) {
 	return filtered;
 }
 /**
-* `preset` オプションを解決して `cache` / `renderer` のデフォルトを補完する内部関数。
-* 明示的な `cache` / `renderer` がある場合はそちらが優先される。
-* `preset` 未指定時は opts をそのまま返す。
-*/
-function resolvePreset(opts) {
-	if (opts.preset === "disabled") return {
-		...opts,
-		cache: void 0
-	};
-	if (opts.preset === "node") {
-		const presetResult = nodePreset({ ttlMs: opts.ttlMs });
-		return {
-			...opts,
-			cache: opts.cache ?? presetResult.cache,
-			renderer: opts.renderer ?? presetResult.renderer
-		};
-	}
-	return opts;
-}
-/**
-* 複数の DataSource を束ねた CMS クライアントを生成する。
-*
-* @example
-* // Node.js（preset を使った簡潔な記法）
-* const cms = createCMS({ dataSources: cmsDataSources, preset: "node", ttlMs: 5 * 60_000 });
+* 複数の `CollectionDef` を束ねた CMS クライアントを生成する。
 *
-* @example
-* // 従来の spread パターン（引き続き動作する）
-* const cms = createCMS({ ...nodePreset({ ttlMs: 5 * 60_000 }), dataSources: cmsDataSources });
+* 通常はユーザーが直接呼ぶことはなく、CLI 生成の `nhc.ts` の `createCMS`
+* (低レベルのこの関数をラップしたもの) を経由する。
 *
 * @example
-* // キャッシュを細かく指定する場合
-* const cms = createCMS({
-*   dataSources,
-*   cache: { document, image, ttlMs: 60_000 },
+* createCMS({
+*   collections: {
+*     posts: {
+*       source: createNotionCollection({ token, dataSourceId, properties }),
+*       slugField: "slug",
+*       statusField: "status",
+*       publishedStatuses: ["公開済み"],
+*     }
+*   },
+*   cache: memoryCache({ ttlMs: 5 * 60_000 }),
 * });
 */
 function createCMS(opts) {
-	if (!opts.dataSources || Object.keys(opts.dataSources).length === 0) throw new CMSError({
+	if (!opts.collections || Object.keys(opts.collections).length === 0) throw new CMSError({
 		code: "core/config_invalid",
-		message: "createCMS: dataSources に少なくとも1つのコレクションを指定してください。",
+		message: "createCMS: collections に少なくとも 1 つのコレクションを指定してください。",
 		context: { operation: "createCMS" }
 	});
-	for (const [name, col] of Object.entries(opts.collections ?? {})) {
-		const c = col;
-		if (c && !c.slug) throw new CMSError({
+	for (const [name, def] of Object.entries(opts.collections)) {
+		if (!def.source) throw new CMSError({
+			code: "core/config_invalid",
+			message: `createCMS: コレクション "${name}" の source は必須です。`,
+			context: {
+				operation: "createCMS",
+				collection: name
+			}
+		});
+		if (!def.slugField) throw new CMSError({
 			code: "core/config_invalid",
-			message: `createCMS: コレクション "${name}" の collections.slug は必須です。slug として使うフィールド名を指定してください。`,
+			message: `createCMS: コレクション "${name}" の slugField は必須です。`,
 			context: {
 				operation: "createCMS",
 				collection: name
 			}
 		});
 	}
-	const resolved = resolvePreset(opts);
-	const baseDocCache = resolveDocumentCache(resolved.cache);
-	const imgCache = resolveImageCache(resolved.cache);
-	const hasImageCache = hasImageCacheConfigured(resolved.cache);
-	const ttlMs = resolveTtl(resolved.cache);
-	const imageProxyBase = opts.content?.imageProxyBase ?? DEFAULT_IMAGE_PROXY_BASE;
+	const cacheRes = resolveCache(opts.cache);
+	const ttlMs = opts.ttlMs;
+	const imageProxyBase = opts.imageProxyBase ?? DEFAULT_IMAGE_PROXY_BASE;
 	const contentConfig = opts.content;
-	const rendererFn = resolved.renderer;
+	const rendererFn = opts.renderer;
 	const waitUntil = opts.waitUntil;
 	const baseLogger = mergeLoggers(opts.plugins ?? [], opts.logger);
 	const logger = opts.logLevel ? applyLogLevel(baseLogger, opts.logLevel) : baseLogger;
@@ -823,62 +842,59 @@ function createCMS(opts) {
 		...DEFAULT_RETRY_CONFIG,
 		...opts.rateLimiter ?? {}
 	};
-	const collectionNames = Object.keys(opts.dataSources);
+	const collectionNames = Object.keys(opts.collections);
 	const collections = {};
-	const scopedCaches = [];
 	for (const name of collectionNames) {
-		const source = opts.dataSources[name];
-		const scopedCache = scopeDocumentCache(baseDocCache, name);
-		scopedCaches.push(scopedCache);
-		const col = opts.collections?.[name];
-		const colHooks = col?.hooks;
+		const def = opts.collections[name];
+		const source = def.source;
+		const colHooks = def.hooks;
 		const collectionHooks = colHooks ? mergeHooks([{
 			name: `${name}:global`,
 			hooks
 		}], colHooks, logger) : hooks;
+		const renderCtx = {
+			source,
+			rendererFn,
+			imgCache: cacheRes.img,
+			imgCacheName: cacheRes.imgName,
+			hasImageCache: cacheRes.hasImg,
+			imageProxyBase,
+			contentConfig,
+			hooks: collectionHooks,
+			logger
+		};
 		collections[name] = new CollectionClientImpl({
 			collection: name,
 			source,
-			docCache: scopedCache,
-			render: {
-				source,
-				rendererFn,
-				imgCache,
-				hasImageCache,
-				imageProxyBase,
-				contentConfig,
-				hooks: collectionHooks,
-				logger
-			},
+			docCache: cacheRes.doc,
+			docCacheName: cacheRes.docName,
+			render: renderCtx,
 			hooks: collectionHooks,
 			logger,
 			ttlMs,
-			publishedStatuses: col?.publishedStatuses ? [...col.publishedStatuses] : [],
-			accessibleStatuses: col?.accessibleStatuses ? [...col.accessibleStatuses] : [],
+			publishedStatuses: def.publishedStatuses ? [...def.publishedStatuses] : [],
+			accessibleStatuses: def.accessibleStatuses ? [...def.accessibleStatuses] : [],
 			retryConfig,
 			maxConcurrent,
 			waitUntil,
-			slugField: col?.slug
+			slugField: def.slugField
 		});
 	}
 	const globalOps = {
 		$collections: collectionNames,
-		async $revalidate(scope) {
+		async $invalidate(scope) {
 			logger?.debug?.("グローバルキャッシュを無効化", {
-				operation: "$revalidate",
-				cacheAdapter: baseDocCache.name
+				operation: "$invalidate",
+				cacheAdapter: cacheRes.docName
 			});
-			for (const cache of scopedCaches) {
-				if (!cache.invalidate) continue;
-				await cache.invalidate(scope ?? "all");
-			}
+			await cacheRes.doc.invalidate(scope ?? "all");
 		},
 		$handler(handlerOpts) {
 			return createHandler({
-				imageCache: imgCache,
+				imageCache: cacheRes.img,
 				parseWebhook: async (req, webhookSecret) => {
 					for (const name of collectionNames) {
-						const ds = opts.dataSources[name];
+						const ds = opts.collections[name].source;
 						if (ds.parseWebhook) try {
 							return await ds.parseWebhook(req.clone(), { secret: webhookSecret });
 						} catch (err) {
@@ -898,11 +914,11 @@ function createCMS(opts) {
 					} catch {}
 					return null;
 				},
-				revalidate: (scope) => globalOps.$revalidate(scope)
+				revalidate: (scope) => globalOps.$invalidate(scope)
 			}, handlerOpts);
 		},
 		$getCachedImage(hash) {
-			return imgCache.get(hash);
+			return cacheRes.img.get(hash);
 		}
 	};
 	return Object.assign(Object.create(null), collections, globalOps);
@@ -913,6 +929,6 @@ function definePlugin(plugin) {
 	return plugin;
 }
 //#endregion
-export { CMSError, CollectionClientImpl, DEFAULT_RETRY_CONFIG, collectionKey, createCMS, createHandler, definePlugin, isCMSError, isCMSErrorInNamespace, isStale, memoryDocumentCache, memoryImageCache, mergeHooks, mergeLoggers, nodePreset, noopDocumentCache, noopImageCache, sha256Hex, withRetry };
+export { CMSError, CollectionClientImpl, DEFAULT_RETRY_CONFIG, collectionKey, createCMS, createHandler, definePlugin, isCMSError, isCMSErrorInNamespace, isStale, memoryCache, mergeHooks, mergeLoggers, noopDocOps, noopImgOps, sha256Hex, withRetry };
 
 //# sourceMappingURL=index.mjs.map