@ryusenkei/maezae 0.18.0 → 0.19.0

package/dist/model.js

@@ -1,5 +1,6 @@
 import { c as coverStart, d as objectPosition, f as stillOf, i as acceptsRole, l as cropRect, m as isDateOnly, n as publicPathOf, o as typeOf, p as createClock, r as FIELD_ROLES, s as coverPosition, t as pagePathOf, u as croppedHotspot } from "./page-BnwHL-LC.js";
 import { i as CORE_COMPONENTS, t as declaredComponentsSchema } from "./declared-Qo-mWnDd.js";
+import { t as typesSourceOf } from "./typesSource-BKPzvl--.js";
 import "./src-BrLwIWaT.js";
 import { z } from "zod";
 // ../model/src/asset.ts
@@ -511,6 +512,9 @@ const modelSchema = z.object({
 /** コンテンツスキーマの JSON を検査して返却（形が合わなければ例外、理由は zod の issues） */
 const parseModel = (json) => modelSchema.parse(normalizeLegacyModel(json));
 // ../model/src/screens.ts
+const TYPE_PREFIX = "type:";
+/** メニュー項目の id（コンテンツタイプ） */
+const typeItem = (type) => `${TYPE_PREFIX}${type}`;
 /** メニューにある全項目の id（グループの中も、上から順） */
 const menuItemsOf = (menu) => menu.flatMap((e) => typeof e === "string" ? [e] : e.items);
 /** 編集画面に配置した項目の id（セクションの順） */
@@ -544,296 +548,203 @@ const parseScreens = (json) => screensSchema.parse(json);
 // ../cms-contract/src/transfer.ts
 /** スキーマと設定の形式の名前 */
 const CONFIG_FORMAT = "cms-config";
-// src/defaults.ts
 /** 中立の既定のスキーマ（新しい媒体の作成で適用する型: post・author・tag・image・video、設定の移入の土台） */
-const DEFAULT_SCHEMA = { "types": [
+const DEFAULT_SCHEMA = { types: [
 	{
-		"id": "post",
-		"label": "投稿",
-		"publishing": "review",
-		"roles": {
-			"title": "title",
-			"image": "image",
-			"body": "body"
+		id: "post",
+		label: "投稿",
+		publishing: "review",
+		roles: {
+			title: "title",
+			image: "image",
+			body: "body"
 		},
-		"fields": [
+		fields: [
 			{
-				"key": "title",
-				"label": "タイトル",
-				"type": "text",
-				"required": "save"
+				key: "title",
+				label: "タイトル",
+				type: "text",
+				required: "save"
 			},
 			{
-				"key": "writers",
-				"label": "著者",
-				"type": "reference",
-				"to": "author",
-				"multiple": true
+				key: "writers",
+				label: "著者",
+				type: "reference",
+				to: "author",
+				multiple: true
 			},
 			{
-				"key": "image",
-				"label": "メインの画像",
-				"type": "media",
-				"accept": ["image"]
+				key: "image",
+				label: "メインの画像",
+				type: "media",
+				accept: ["image"]
 			},
 			{
-				"key": "body",
-				"label": "本文",
-				"type": "body",
-				"profile": {
-					"headings": [
+				key: "body",
+				label: "本文",
+				type: "body",
+				profile: {
+					headings: [
 						2,
 						3,
 						4
 					],
-					"marks": [
+					marks: [
 						"strong",
 						"em",
 						"code",
 						"strike"
 					],
-					"list": {
-						"ordered": true,
-						"nested": true
+					list: {
+						ordered: true,
+						nested: true
 					},
-					"quote": {
-						"multiple": true,
-						"cite": true
+					quote: {
+						multiple: true,
+						cite: true
 					},
-					"code": { "caption": false },
-					"table": {
-						"head": "optional",
-						"caption": "optional"
+					code: { caption: false },
+					table: {
+						head: "optional",
+						caption: "optional"
 					},
-					"divider": true,
-					"components": ["gallery", "link-card"]
+					divider: true,
+					components: ["gallery", "link-card"]
 				}
 			},
 			{
-				"key": "revised_at",
-				"label": "更新日時",
-				"type": "datetime"
+				key: "revised_at",
+				label: "更新日時",
+				type: "datetime"
 			},
 			{
-				"key": "tags",
-				"label": "タグ",
-				"type": "reference",
-				"to": "tag",
-				"multiple": true
+				key: "tags",
+				label: "タグ",
+				type: "reference",
+				to: "tag",
+				multiple: true
 			},
 			{
-				"key": "excerpt",
-				"label": "抜粋",
-				"type": "textarea",
-				"computed": {
-					"kind": "excerpt",
-					"from": "body"
+				key: "excerpt",
+				label: "抜粋",
+				type: "textarea",
+				computed: {
+					kind: "excerpt",
+					from: "body"
 				}
 			},
 			{
-				"key": "read_min",
-				"label": "読了の分",
-				"type": "number",
-				"computed": {
-					"kind": "read_min",
-					"from": "body"
+				key: "read_min",
+				label: "読了の分",
+				type: "number",
+				computed: {
+					kind: "read_min",
+					from: "body"
 				}
 			},
 			{
-				"key": "links",
-				"label": "リンク先",
-				"type": "text",
-				"multiple": true,
-				"computed": {
-					"kind": "links",
-					"from": "body"
+				key: "links",
+				label: "リンク先",
+				type: "text",
+				multiple: true,
+				computed: {
+					kind: "links",
+					from: "body"
 				}
 			}
 		],
-		"pages": [{
-			"path": "/posts/{id}",
-			"public": [{
-				"key": "status",
-				"in": ["published"]
+		pages: [{
+			path: "/posts/{id}",
+			public: [{
+				key: "status",
+				in: ["published"]
 			}, {
-				"key": "published_at",
-				"notFuture": true
+				key: "published_at",
+				notFuture: true
 			}]
 		}]
 	},
 	{
-		"id": "author",
-		"label": "著者",
-		"roles": {
-			"title": "name",
-			"image": "portrait"
+		id: "author",
+		label: "著者",
+		roles: {
+			title: "name",
+			image: "portrait"
 		},
-		"fields": [
+		fields: [
 			{
-				"key": "name",
-				"label": "名前",
-				"type": "text",
-				"required": "save"
+				key: "name",
+				label: "名前",
+				type: "text",
+				required: "save"
 			},
 			{
-				"key": "bio",
-				"label": "紹介",
-				"type": "textarea"
+				key: "bio",
+				label: "紹介",
+				type: "textarea"
 			},
 			{
-				"key": "portrait",
-				"label": "顔の画像",
-				"type": "media",
-				"accept": ["image"]
+				key: "portrait",
+				label: "顔の画像",
+				type: "media",
+				accept: ["image"]
 			}
 		],
-		"pages": [{ "path": "/authors/{id}" }]
+		pages: [{ path: "/authors/{id}" }]
 	},
 	{
-		"id": "tag",
-		"label": "タグ",
-		"roles": { "title": "label" },
-		"fields": [{
-			"key": "label",
-			"label": "名前",
-			"type": "text",
-			"required": "save"
+		id: "tag",
+		label: "タグ",
+		roles: { title: "label" },
+		fields: [{
+			key: "label",
+			label: "名前",
+			type: "text",
+			required: "save"
 		}]
 	},
-	{
-		"id": "image",
-		"label": "画像",
-		"description": "見せたい点（hotspot）と切り抜き（crop）を画像ごとに1つ保持、切り抜く場所すべてで共通",
-		"fields": [
-			{
-				"key": "mime_type",
-				"label": "形式",
-				"type": "text",
-				"required": "save",
-				"description": "MIME タイプ"
-			},
-			{
-				"key": "size",
-				"label": "サイズ",
-				"type": "number",
-				"required": "save",
-				"description": "バイト数"
-			},
-			{
-				"key": "width",
-				"label": "幅",
-				"type": "number",
-				"required": "save",
-				"description": "px"
-			},
-			{
-				"key": "height",
-				"label": "高さ",
-				"type": "number",
-				"required": "save",
-				"description": "px"
-			},
-			{
-				"key": "alt",
-				"label": "代替テキスト",
-				"type": "text",
-				"description": "使用する側の既定の値、使用する場所ごとに上書き可"
-			}
-		]
-	},
-	{
-		"id": "video",
-		"label": "動画",
-		"fields": [
-			{
-				"key": "mime_type",
-				"label": "形式",
-				"type": "text",
-				"required": "save",
-				"description": "MIME タイプ"
-			},
-			{
-				"key": "size",
-				"label": "サイズ",
-				"type": "number",
-				"required": "save",
-				"description": "バイト数"
-			},
-			{
-				"key": "width",
-				"label": "幅",
-				"type": "number",
-				"required": "save",
-				"description": "px"
-			},
-			{
-				"key": "height",
-				"label": "高さ",
-				"type": "number",
-				"required": "save",
-				"description": "px"
-			},
-			{
-				"key": "alt",
-				"label": "代替テキスト",
-				"type": "text",
-				"description": "使用する側の既定の値、使用する場所ごとに上書き可"
-			},
-			{
-				"key": "duration",
-				"label": "長さ",
-				"type": "number",
-				"description": "秒"
-			},
-			{
-				"key": "poster",
-				"label": "ポスター画像",
-				"type": "media",
-				"accept": ["image"],
-				"description": "読み込み前・動きを抑える設定・OG で代わりに表示"
-			}
-		]
-	}
+	IMAGE_TYPE,
+	VIDEO_TYPE
 ] };
 /** 既定の画面設定（新しい媒体の作成で適用する中立の値、移入する screens の土台） */
 const DEFAULT_SCREENS = {
-	"menu": [
+	menu: [
 		"dashboard",
 		"calendar",
 		{
-			"id": "content",
-			"label": "コンテンツ",
-			"items": ["type:post", "media"]
+			id: "content",
+			label: "コンテンツ",
+			items: [typeItem("post"), "media"]
 		},
 		{
-			"id": "masters",
-			"label": "マスタ",
-			"items": ["type:tag", "type:author"]
+			id: "masters",
+			label: "マスタ",
+			items: [typeItem("tag"), typeItem("author")]
 		}
 	],
-	"editors": { "post": { "sections": [
+	editors: { post: { sections: [
 		{
-			"id": "classify",
-			"label": "分類",
-			"items": ["writers", "tags"]
+			id: "classify",
+			label: "分類",
+			items: ["writers", "tags"]
 		},
 		{
-			"id": "publish",
-			"label": "公開",
-			"items": ["published_at", "revised_at"]
+			id: "publish",
+			label: "公開",
+			items: ["published_at", "revised_at"]
 		},
 		{
-			"id": "excerpt",
-			"label": "説明",
-			"items": ["excerpt"]
+			id: "excerpt",
+			label: "説明",
+			items: ["excerpt"]
 		},
 		{
-			"id": "image",
-			"label": "メインの画像",
-			"items": ["image"]
+			id: "image",
+			label: "メインの画像",
+			items: ["image"]
 		}
 	] } },
-	"columns": { "post": [
+	columns: { post: [
 		"status",
 		"writers",
 		"assignee",
@@ -841,4 +752,4 @@ const DEFAULT_SCREENS = {
 		"updated_at"
 	] }
 };
-export { CONFIG_FORMAT, DEFAULT_SCHEMA, DEFAULT_SCREENS, IMAGE_TYPE, VIDEO_TYPE, coverPosition, coverStart, createClock, cropRect, croppedHotspot, isDateOnly, mediaSchema, objectPosition, pagePathOf, parseModel, parseScreens, publicPathOf, stillOf, typeOf };
+export { CONFIG_FORMAT, DEFAULT_SCHEMA, DEFAULT_SCREENS, IMAGE_TYPE, VIDEO_TYPE, coverPosition, coverStart, createClock, cropRect, croppedHotspot, isDateOnly, mediaSchema, objectPosition, pagePathOf, parseModel, parseScreens, publicPathOf, stillOf, typeOf, typesSourceOf };

package/dist/preview.js

@@ -1 +1 @@
-export { i as SIGNED_HEADERS, o as signParts, s as signedHeaders, c as verifyParts, l as verifyRequest } from "./src-C6YqllXw.js";
+export { i as SIGNED_HEADERS, o as signParts, s as signedHeaders, c as verifyParts, l as verifyRequest } from "./src-BMOqN7Xs.js";

package/dist/schema.d.ts

@@ -0,0 +1 @@
+export * from './types/sdk/src/schema.js';

package/dist/schema.js

@@ -0,0 +1,56 @@
+import { t as typesSourceOf } from "./typesSource-BKPzvl--.js";
+import { t as DELIVERY_PATH } from "./client-ClY3gSSd.js";
+import { readFileSync, writeFileSync } from "node:fs";
+// src/schema.ts
+/** 標準出力と標準エラーの文 */
+const MESSAGES = {
+	usage: "usage: maezae-types --out <file> [--check] [--url <delivery API URL>]（API key: MAEZAE_API_KEY）",
+	missingUrl: "missing_url: --url か MAEZAE_DELIVERY_URL に配信 API の URL（例: https://example.com/<媒体>）",
+	missingKey: "missing_api_key: 環境変数 MAEZAE_API_KEY",
+	fetchFailed: (status, body) => `fetch_failed: ${status} ${body.slice(0, 200)}`,
+	drift: (file) => `schema_drift: ${file} が CMS のスキーマと違う（maezae-types --out ${file} で生成し直す）`,
+	upToDate: (file) => `up_to_date: ${file}`,
+	written: (file) => `written: ${file}`
+};
+/** 引数（--name value と --flag） */
+function argsOf(argv) {
+	const value = (name) => {
+		const i = argv.indexOf(name);
+		return i >= 0 ? argv[i + 1] : void 0;
+	};
+	return {
+		out: value("--out"),
+		url: value("--url"),
+		check: argv.includes("--check")
+	};
+}
+/** 配信 API の型の一覧（/types、表示名・選択肢・上限・ページの URL の形を含む。実行時に読む値もここから） */
+async function fetchDeliveredTypes(url, apiKey, fetcher = fetch) {
+	const res = await fetcher(`${url.replace(/\/+$/, "")}${DELIVERY_PATH}/types`, { headers: { authorization: `Bearer ${apiKey}` } });
+	if (!res.ok) throw new Error(MESSAGES.fetchFailed(res.status, await res.text().catch(() => "")));
+	return (await res.json()).types;
+}
+/** CLI の本体（戻り値は終了の状態） */
+async function runTypesCli(argv, env, fetcher = fetch) {
+	const { out, url = env.MAEZAE_DELIVERY_URL, check } = argsOf(argv);
+	if (!out) return console.error(MESSAGES.usage), 1;
+	if (!url) return console.error(MESSAGES.missingUrl), 1;
+	const apiKey = env.MAEZAE_API_KEY;
+	if (!apiKey) return console.error(MESSAGES.missingKey), 1;
+	const source = typesSourceOf({ types: await fetchDeliveredTypes(url, apiKey, fetcher) });
+	if (check) {
+		let current = null;
+		try {
+			current = readFileSync(out, "utf8").replace(/\r\n/g, "\n");
+		} catch {
+			current = null;
+		}
+		if (current !== source) return console.error(MESSAGES.drift(out)), 1;
+		console.log(MESSAGES.upToDate(out));
+		return 0;
+	}
+	writeFileSync(out, source);
+	console.log(MESSAGES.written(out));
+	return 0;
+}
+export { fetchDeliveredTypes, runTypesCli };

package/dist/{src-C6YqllXw.js → src-BMOqN7Xs.js}

@@ -1,32 +1,9 @@
-// ../access/src/jwt.ts
-const CERTS_TTL_MS = 3e5;
-const REFRESH_INTERVAL_MS = 3e4;
-/** 公開鍵の一覧を保持する取得（取得の失敗は保持しない） */
-function cachedCerts(fetcher, clock = Date.now) {
-	const cache = /* @__PURE__ */ new Map();
-	return async (url, refresh = false) => {
-		const hit = cache.get(url);
-		const age = hit ? clock() - hit.at : Infinity;
-		if (hit && age < (refresh ? REFRESH_INTERVAL_MS : CERTS_TTL_MS)) return hit;
-		const fresh = await fetcher(url);
-		cache.set(url, {
-			keys: fresh.keys,
-			at: clock()
-		});
-		return fresh;
-	};
-}
-cachedCerts(async (url) => {
-	const res = await fetch(url);
-	if (!res.ok) throw new Error(`JWKS の取得に失敗（${res.status}）`);
-	return res.json();
-});
-/** base64url の復号 */
-const decodeBase64Url = (s) => Uint8Array.from(atob(s.replace(/-/g, "+").replace(/_/g, "/").padEnd(Math.ceil(s.length / 4) * 4, "=")), (c) => c.charCodeAt(0));
 // ../access/src/signed.ts
 const enc = new TextEncoder();
 /** 既定で許す時刻のずれ（秒） */
 const MAX_SKEW_SEC = 300;
+/** base64url の復号 */
+const decodeBase64Url = (s) => Uint8Array.from(atob(s.replace(/-/g, "+").replace(/_/g, "/").padEnd(Math.ceil(s.length / 4) * 4, "=")), (c) => c.charCodeAt(0));
 /** 経路ごとのヘッダーの名前（署名と主体） */
 const SIGNED_HEADERS = {
 	/** MCP → CMS の署名（鍵は MCP_TOKEN） */
@@ -195,7 +172,7 @@ function startEdgeSpan({ name, request, sampleRate = 1, write = (line) => consol
 			};
 			write(JSON.stringify({
 				level: "info",
-				msg: "span",
+				event: "span",
 				...span
 			}));
 		}

package/dist/trace.js

@@ -1 +1 @@
-export { r as TRACEPARENT_HEADER, t as sampleRateOf, n as withEdgeSpan } from "./src-C6YqllXw.js";
+export { r as TRACEPARENT_HEADER, t as sampleRateOf, n as withEdgeSpan } from "./src-BMOqN7Xs.js";

package/dist/types/access/src/jwt.d.ts

@@ -1,12 +1,9 @@
-type Jwk = JsonWebKey & {
-    kid?: string;
-};
-/** 公開鍵の一覧の取得（引数は JWKS の URL、refresh は保持した値を使用せずに再取得、テストで差し替え） */
-export type FetchCerts = (jwksUrl: string, refresh?: boolean) => Promise<{
-    keys: Jwk[];
-}>;
 /** JWT のクレーム（検証を通った値） */
 export type JwtClaims = Readonly<Record<string, unknown>>;
+/** 公開鍵の一覧の取得の差し替え（テスト用、引数は JWKS の URL） */
+export type FetchCerts = (jwksUrl: string) => Promise<{
+    keys: JsonWebKey[];
+}>;
 /** JWT の検証の設定 */
 export type JwtOptions = Readonly<{
     /** 発行元（iss と完全に一致） */
@@ -15,15 +12,12 @@ export type JwtOptions = Readonly<{
     audience: string | readonly string[];
     /** 公開鍵の一覧の URL */
     jwksUrl: string;
+    /** 現在時刻（ミリ秒、テスト用） */
     now?: number;
     certs?: FetchCerts;
 }>;
-/** 公開鍵の一覧を保持する取得（取得の失敗は保持しない） */
-export declare function cachedCerts(fetcher: FetchCerts, clock?: () => number): FetchCerts;
-/** base64url の復号 */
-export declare const decodeBase64Url: (s: string) => Uint8Array<ArrayBuffer>;
 /** 検証を通った JWT のクレーム（署名・発行元・宛先・期限のどれかが違えば null） */
-export declare function verifyJwt(token: string, { issuer, audience, jwksUrl, now, certs }: JwtOptions): Promise<JwtClaims | null>;
+export declare function verifyJwt(token: string, options: JwtOptions): Promise<JwtClaims | null>;
 /**
  * Cloudflare Access の JWT を検証する設定（teamDomain は <チーム>.cloudflareaccess.com、aud はアプリの AUD）
  * - aud: カンマ区切りで複数のアプリ（ホスト名ごとにアプリが分かれる管理画面、どのアプリを通すかは Access がホスト名で判定）
@@ -39,4 +33,3 @@ export declare function verifyAccessJwt(token: string, { teamDomain, aud, now, c
     now?: number;
     certs?: FetchCerts;
 }): Promise<string | null>;
-export {};

package/dist/types/analytics/src/index.d.ts

@@ -1,5 +1,5 @@
-export { recordView, type Classify, type Dataset } from './record.js';
+export { type Classify, VIEW_COLUMNS, type ViewEvent, viewOf, type ViewOptions } from './view.js';
 export { syncCron } from './schedule.js';
 export { isViewsCron, sharedViews, viewsFor, viewsSince, viewsSyncOf } from './shared.js';
-export { analyticsEngine, type DailyRow, fixedSource, type Source, projectDaily, type ProjectSource, renamedSource } from './source.js';
+export { type DailyRow, fixedSource, type ProjectSource, renamedSource, type Source } from './source.js';
 export { readDaily, syncDaily } from './store.js';

package/dist/types/analytics/src/source.d.ts

@@ -9,27 +9,11 @@ export type DailyRow = {
 export type Source = {
     daily(since: string): Promise<DailyRow[]>;
 };
-/** Analytics Engine の接続の設定（token は Account Analytics の読み取りの API トークン、project は絞り込む媒体の識別子） */
-type AnalyticsEngineOptions = {
-    accountId: string;
-    token: string;
-    dataset: string;
-    project?: string;
-};
-/** 1回の問い合わせの行数 */
-export declare const PAGE_ROWS = 10000;
-/** 問い合わせの回数の上限（PAGE_ROWS との積が1回で集計できる行数） */
-export declare const MAX_PAGES = 20;
-/** Analytics Engine の SQL API の読み込み元 */
-export declare function analyticsEngine({ accountId, token, dataset, project }: AnalyticsEngineOptions): Source;
 /** 全媒体の読み込み元の型（since 以降の日付の閲覧数を媒体の識別子ごとに） */
 export type ProjectSource = {
     dailyByProject(since: string): Promise<ReadonlyMap<string, DailyRow[]>>;
 };
-/** 全媒体を1回の問い合わせで集計する Analytics Engine の読み込み元（媒体の列が空の記録は除外） */
-export declare function projectDaily(options: Omit<AnalyticsEngineOptions, 'project'>): ProjectSource;
 /** 集計済みの行の読み込み元（定期の集計で全媒体の問い合わせ結果を媒体ごとに受け渡し、daily は since 以降の行） */
 export declare const fixedSource: (rows: readonly DailyRow[]) => Source;
 /** 種類を付け替えた読み込み元（renames は旧の種類 → 今の種類、付け替えで重なった行は閲覧数を合計） */
 export declare function renamedSource(source: Source, renames: Readonly<Record<string, string>>): Source;
-export {};

package/dist/types/analytics/src/view.d.ts

@@ -0,0 +1,24 @@
+/** パスから種類と ID への対応（利用側が定義、例: /articles/<id> は記事） */
+export type Classify = (path: string) => {
+    kind: string;
+    id: string;
+};
+/** 閲覧の出来事（project は媒体の識別子） */
+export type ViewEvent = Readonly<{
+    kind: string;
+    id: string;
+    path: string;
+    date: string;
+    event: 'view';
+    project?: string;
+}>;
+/** 位置で持つ記録先の列の順 */
+export declare const VIEW_COLUMNS: readonly ["kind", "id", "path", "date", "event", "project"];
+/** 出来事にする設定（project は媒体の識別子） */
+export type ViewOptions = Readonly<{
+    classify: Classify;
+    timeZone: string;
+    project?: string;
+}>;
+/** 閲覧の出来事（対象: GET で応答が200の HTML・ボット以外、ほかは null） */
+export declare function viewOf(request: Request, response: Response, { classify, timeZone, project }: ViewOptions): ViewEvent | null;