@ryusenkei/maezae 0.7.1 → 0.8.0

package/dist/analytics.js

@@ -11,7 +11,7 @@ const BOT = /bot|crawl|spider|slurp|preview|monitor|headless/i;
 /** ボットの UA か */
 const isBot = (userAgent) => BOT.test(userAgent ?? "");
 /** 閲覧を1件記録（対象: GET で応答が200の HTML・ボット以外、記録の失敗は無視） */
-function recordView(dataset, request, response, { classify, timeZone, tenant }) {
+function recordView(dataset, request, response, { classify, timeZone, project }) {
 	if (!dataset || request.method !== "GET" || response.status !== 200) return;
 	if (!response.headers.get("content-type")?.includes("text/html") || isBot(request.headers.get("user-agent"))) return;
 	const path = new URL(request.url).pathname;
@@ -24,9 +24,9 @@ function recordView(dataset, request, response, { classify, timeZone, tenant })
 				path,
 				dayIn(timeZone),
 				"view",
-				tenant ?? ""
+				project ?? ""
 			],
-			indexes: [tenant ?? kind]
+			indexes: [project ?? kind]
 		});
 	} catch {}
 }

package/dist/delivery.js

@@ -1,5 +1,5 @@
 import { c as croppedHotspot, d as createClock, i as typeOf, r as optionsOf, s as cropRect, t as pagePathOf } from "./page-TFUlKv3R.js";
-// ../delivery-client/src/query.ts
+// src/delivery/query.ts
 const isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
 /** in の値の検査（コンマを含む値はクエリで区切れない） */
 const joined = (values) => {
@@ -25,7 +25,7 @@ function listParams(query) {
 	if (query.cursor) params.cursor = query.cursor;
 	return params;
 }
-// ../delivery-client/src/client.ts
+// src/delivery/client.ts
 /** 配信 API のパスの前半 */
 const DELIVERY_PATH = "/content/v1";
 /** 配信 API の取得の失敗（call: 失敗した経路、status: 応答のステータス） */
@@ -134,10 +134,10 @@ const VIDEO_PATH = /^\/videos\/([A-Za-z0-9_-]+)\/([A-Za-z0-9_-]+)\.([a-z0-9]+)$/
 function parseMediaPath(pathname) {
 	const image = IMAGE_PATH.exec(pathname);
 	if (image) {
-		const [, tenant, id, width, height, ext] = image;
+		const [, project, id, width, height, ext] = image;
 		return mediaMimeOf(ext)?.startsWith("image/") ? {
 			kind: "image",
-			tenant,
+			project,
 			id,
 			ext,
 			width: Number(width),
@@ -146,10 +146,10 @@ function parseMediaPath(pathname) {
 	}
 	const video = VIDEO_PATH.exec(pathname);
 	if (video) {
-		const [, tenant, id, ext] = video;
+		const [, project, id, ext] = video;
 		return mediaMimeOf(ext)?.startsWith("video/") ? {
 			kind: "video",
-			tenant,
+			project,
 			id,
 			ext
 		} : null;
@@ -224,7 +224,7 @@ function imageParamsOf(query) {
 		...rect && { rect }
 	};
 }
-// ../delivery-client/src/media.ts
+// src/delivery/media.ts
 /** 配信 URL の画像の切り抜き（クエリ rect、範囲なしは元の URL） */
 const deliveredImageUrl = (src, rect) => rect ? withImageParams(src, { rect }) : src;
 /**
@@ -274,7 +274,7 @@ function mediaOf(base, imageUrl) {
 		};
 	};
 }
-// ../delivery-client/src/schema.ts
+// src/delivery/schema.ts
 /** 選択肢の項目から表示名の表（値 → 表示名、key はまとまりの中なら `links.kind` の形、選択肢の項目でなければ空） */
 const optionLabels = (schema, type, key) => Object.fromEntries(optionsOf(typeOf(schema, type), key).map((o) => [o.value, o.label]));
 /** 型の項目（なければ例外: 導入先の設定の誤り） */

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

@@ -1,4 +1,4 @@
 export { recordView, type Classify, type Dataset } from './record.js';
 export { syncCron } from './schedule.js';
-export { analyticsEngine, type DailyRow, fixedSource, type Source, tenantDaily, type TenantSource } from './source.js';
+export { analyticsEngine, type DailyRow, fixedSource, type Source, projectDaily, type ProjectSource } from './source.js';
 export { readDaily, syncDaily } from './store.js';

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

@@ -11,12 +11,12 @@ export type Classify = (path: string) => {
     kind: string;
     id: string;
 };
-/** 記録の設定（tenant は媒体の識別子） */
+/** 記録の設定（project は媒体の識別子） */
 type RecordOptions = {
     classify: Classify;
     timeZone: string;
-    tenant?: string;
+    project?: string;
 };
 /** 閲覧を1件記録（対象: GET で応答が200の HTML・ボット以外、記録の失敗は無視） */
-export declare function recordView(dataset: Dataset | undefined, request: Request, response: Response, { classify, timeZone, tenant }: RecordOptions): void;
+export declare function recordView(dataset: Dataset | undefined, request: Request, response: Response, { classify, timeZone, project }: RecordOptions): void;
 export {};

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

@@ -9,25 +9,25 @@ export type DailyRow = {
 export type Source = {
     daily(since: string): Promise<DailyRow[]>;
 };
-/** Analytics Engine の接続の設定（token は Account Analytics の読み取りの API トークン、tenant は絞り込む媒体の識別子） */
+/** Analytics Engine の接続の設定（token は Account Analytics の読み取りの API トークン、project は絞り込む媒体の識別子） */
 type AnalyticsEngineOptions = {
     accountId: string;
     token: string;
     dataset: string;
-    tenant?: 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, tenant }: AnalyticsEngineOptions): Source;
+export declare function analyticsEngine({ accountId, token, dataset, project }: AnalyticsEngineOptions): Source;
 /** 全媒体の読み込み元の型（since 以降の日付の閲覧数を媒体の識別子ごとに） */
-export type TenantSource = {
-    dailyByTenant(since: string): Promise<ReadonlyMap<string, DailyRow[]>>;
+export type ProjectSource = {
+    dailyByProject(since: string): Promise<ReadonlyMap<string, DailyRow[]>>;
 };
 /** 全媒体を1回の問い合わせで集計する Analytics Engine の読み込み元（媒体の列が空の記録は除外） */
-export declare function tenantDaily(options: Omit<AnalyticsEngineOptions, 'tenant'>): TenantSource;
+export declare function projectDaily(options: Omit<AnalyticsEngineOptions, 'project'>): ProjectSource;
 /** 集計済みの行の読み込み元（定期の集計で全媒体の問い合わせ結果を媒体ごとに受け渡し、daily は since 以降の行） */
 export declare const fixedSource: (rows: readonly DailyRow[]) => Source;
 export {};

package/dist/types/cms-contract/src/embeds.d.ts

@@ -21,7 +21,7 @@ export type EmbedEntry = Readonly<{
 }>;
 /** 署名つきの文脈の内容（id は行の ID で新規は null、origin は管理画面のオリジン） */
 export type EmbedContext = Readonly<{
-    tenant: string;
+    project: string;
     account: Readonly<{
         id: string;
         role: string;

package/dist/types/model/src/mediaUrl.d.ts

@@ -6,16 +6,16 @@ export declare const mediaMimeOf: (ext: string) => string | null;
 /** 配信 URL のパスの要素（寸法は画像だけ） */
 export type MediaPath = Readonly<{
     kind: 'image' | 'video';
-    tenant: string;
+    project: string;
     id: string;
     ext: string;
     width?: number;
     height?: number;
 }>;
 /** 配信 URL のパス（媒体・ID の形が不正、配信しない形式なら null） */
-export declare function mediaPathOf({ kind, tenant, id, mimeType, width, height }: Readonly<{
+export declare function mediaPathOf({ kind, project, id, mimeType, width, height }: Readonly<{
     kind: 'image' | 'video';
-    tenant: string;
+    project: string;
     id: string;
     mimeType: string;
     width: number;

package/dist/types/{delivery-client/src → sdk/src/delivery}/client.d.ts

@@ -1,4 +1,4 @@
-import type { ContentType } from '../../model/src/index.js';
+import type { ContentType } from '../../../model/src/index.js';
 import { type ListQuery, type Page } from './query.js';
 /** 配信 API のパスの前半 */
 export declare const DELIVERY_PATH = "/content/v1";
@@ -43,11 +43,11 @@ export declare function createDeliveryClient(delivery: Delivery, { drafts, at }?
         id: string;
         label: string;
         description?: string;
-        format?: import("../../model/src/index.js").ContentFormat;
-        publishing?: import("../../model/src/index.js").Publishing;
-        fields: readonly import("../../model/src/index.js").FieldDef[];
-        pages?: readonly import("../../model/src/index.js").PageDef[];
-        counts?: readonly import("../../model/src/index.js").CountDef[];
+        format?: import("../../../model/src/model.js").ContentFormat;
+        publishing?: import("../../../model/src/model.js").Publishing;
+        fields: readonly import("../model.js").FieldDef[];
+        pages?: readonly import("../model.js").PageDef[];
+        counts?: readonly import("../../../model/src/model.js").CountDef[];
         og?: string;
         idInput?: boolean;
     }>>(path: string, query: ListQuery<T> & Readonly<{

package/dist/types/{delivery-client/src → sdk/src/delivery}/index.d.ts

@@ -1,6 +1,6 @@
 export { createDeliveryClient, DELIVERY_PATH, DeliveryError, subPath, type BundleResult, type Delivery, type DeliveryClient, type Prefetched } from './client.js';
 export { deliveredImageUrl, mediaOf, type ImageUrl, type MediaOf } from './media.js';
-export { imageParamsOf, parseMediaPath, withImageParams, type ImageParams, type MediaPath } from '../../model/src/index.js';
+export { imageParamsOf, parseMediaPath, withImageParams, type ImageParams, type MediaPath } from '../../../model/src/index.js';
 export { listParams, type ListFilter, type ListQuery, type Page } from './query.js';
 export { createDeliveryClock, fieldOf, limitOf, optionLabels, pagePath, type DeliveryClock } from './schema.js';
 export type { DeliveredAsset, FieldValue, Item, ItemMeta, ItemOf } from './values.js';

package/dist/types/{delivery-client/src → sdk/src/delivery}/media.d.ts

@@ -1,4 +1,4 @@
-import { type CropRect, type Media } from '../../model/src/index.js';
+import { type CropRect, type Media } from '../../../model/src/index.js';
 /** 配信する画像の URL（元の URL と、元画像の画素での切り抜きの範囲から、配信の側で変換する URL） */
 export type ImageUrl = (src: string, rect?: CropRect) => string;
 /** 配信 URL の画像の切り抜き（クエリ rect、範囲なしは元の URL） */

package/dist/types/{delivery-client/src → sdk/src/delivery}/query.d.ts

@@ -1,4 +1,4 @@
-import type { ContentType, FieldDef } from '../../model/src/index.js';
+import type { ContentType, FieldDef } from '../../../model/src/index.js';
 import type { FieldsOf, Item, SingleValue } from './values.js';
 /** 範囲の指定（両端を含む） */
 type Range<V> = Readonly<{

package/dist/types/{delivery-client/src → sdk/src/delivery}/schema.d.ts

@@ -1,4 +1,4 @@
-import { type Clock, type ContentModel, type DateString, type FieldDef, type PageEntry } from '../../model/src/index.js';
+import { type Clock, type ContentModel, type DateString, type FieldDef, type PageEntry } from '../../../model/src/index.js';
 /** 選択肢の項目から表示名の表（値 → 表示名、key はまとまりの中なら `links.kind` の形、選択肢の項目でなければ空） */
 export declare const optionLabels: <K extends string = string>(schema: ContentModel, type: string, key: string) => Readonly<Record<K, string>>;
 /** 型の項目（なければ例外: 導入先の設定の誤り） */

package/dist/types/{delivery-client/src → sdk/src/delivery}/values.d.ts

@@ -1,5 +1,5 @@
-import type { Body } from '../../body/src/index.js';
-import type { ContentType, Crop, DateString, FieldDef, Hotspot } from '../../model/src/index.js';
+import type { Body } from '../../../body/src/index.js';
+import type { ContentType, Crop, DateString, FieldDef, Hotspot } from '../../../model/src/index.js';
 /** 配信 API の1件の値（id・項目の key・メタ情報 _meta） */
 export type Item = Readonly<Record<string, unknown>>;
 /** 配信 API が解決した実体（url は配信 URL で配信のオリジンがある CMS だけ、hotspot・crop は元の画像に対する割合） */

package/dist/types/sdk/src/delivery.d.ts

@@ -1,2 +1,2 @@
-export { createDeliveryClient, createDeliveryClock, deliveredImageUrl, DELIVERY_PATH, DeliveryError, fieldOf, imageParamsOf, limitOf, listParams, mediaOf, optionLabels, pagePath, parseMediaPath, subPath, withImageParams } from '../../delivery-client/src/index.js';
-export type { BundleResult, DeliveredAsset, Delivery, DeliveryClient, DeliveryClock, FieldValue, ImageParams, ImageUrl, Item, ItemMeta, ItemOf, ListFilter, ListQuery, MediaOf, MediaPath, Page, Prefetched } from '../../delivery-client/src/index.js';
+export { createDeliveryClient, createDeliveryClock, deliveredImageUrl, DELIVERY_PATH, DeliveryError, fieldOf, imageParamsOf, limitOf, listParams, mediaOf, optionLabels, pagePath, parseMediaPath, subPath, withImageParams } from './delivery/index.js';
+export type { BundleResult, DeliveredAsset, Delivery, DeliveryClient, DeliveryClock, FieldValue, ImageParams, ImageUrl, Item, ItemMeta, ItemOf, ListFilter, ListQuery, MediaOf, MediaPath, Page, Prefetched } from './delivery/index.js';

package/dist/types/sdk/src/dev.d.ts

@@ -1,4 +1,4 @@
-import type { Delivery } from '../../delivery-client/src/index.js';
+import type { Delivery } from './delivery/index.js';
 /** 記録の1件（記録のファイルの JSON） */
 export type FixtureResponse = Readonly<{
     method: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryusenkei/maezae",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "maezae の導入先のサイト向けの SDK（配信 API の取得・本文の型・プレビューの署名・手元の開発の配信 API）",
   "license": "UNLICENSED",
   "author": "RYUSENKEI",