bearminion 1.4.0 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # bearminion
 
+## 1.6.0
+
+### Minor Changes
+
+- eec6f3d: New starter sections and editor features.
+  
+  - **Gallery** section: grid, masonry and featured layouts, a keyboard-friendly lightbox, an optional box around each picture, and required alt text.
+  - **Text** section: long-form rich text for an About or policy page, with a narrow, readable column on by default. Rich-text fields can opt into **H2** and **H3** (`data-rich-headings`); `renderRichText`, `sanitizeRichHtml` and `stripPlainRich` take a `{ headings }` option.
+  - **Media** now covers video: the separate Video section is gone, and Media gains `playback` (`controls` or `loop`). Content `schemaVersion` 2 migrates existing Video sections to Media automatically.
+  - **Video uploads**: upload an mp4, webm, mov or ogv to `public/videos` from the editor (`videosDir`, `maxVideoBytes`, default 50 MB), pick an uploaded one, and see what a pasted link is or why it will not play. New API routes `GET`/`POST /videos` and `DELETE /videos/:filename`.
+  - `parseMediaSource` and `VIDEO_FILE` are exported from `bearminion`.
+
+### Patch Changes
+
+- eec6f3d: Clearer package descriptions and READMEs: what BearMinion is, who it is for, and what `create-bearminion` refuses (a folder that is not new or empty).
+
+## 1.5.0
+
+### Minor Changes
+
+- 8a428e7: Sitewide JSON-LD. `site.seo.jsonLd` is optional (up to 10 blocks, 50 KB, so no migration) and the default template emits its blocks on every page. A page's own `seo.jsonLd` still replaces only the generated `WebPage` block, and a block with the same `@id` is emitted once, the page's first. With the conventional ids `<url>/#organization` and `<url>/#website` in the site's blocks, the generated `WebPage` gets `isPartOf` and `publisher` as `@id` references. The Site tab has a Structured data group with an Edit JSON-LD dialog and a Generate button that fills an `Organization` and a `WebSite` from the site name, address and language, replacing blocks with the same `@id`. The logo is added only for a full https address. A warning shows while the site address is still `example.com`. `siteJsonLdIds`, `mergeJsonLd`, `hasJsonLdId`, `generateSiteJsonLd`, `upsertJsonLd` and `isPlaceholderSiteUrl` are exported; themes that emit JSON-LD should use `mergeJsonLd` (see the theme docs).
+
 ## 1.4.0
 
 ### Minor Changes

package/README.md

@@ -3,7 +3,7 @@
 </p>
 
 <p align="center">
-  A website you edit by clicking on it. No database, no admin panel, no server.<br />
+  The BearMinion for the bare minimum. A website you edit by clicking on it: no database to patch at 3 AM, no admin panel, no server.<br />
   Built on <a href="https://astro.build">Astro</a>.
 </p>
 
@@ -34,7 +34,7 @@ It asks for the site's name and web address. Open the address `npm run dev` prin
 ## What you can change
 
 - **Text** right on the page, with bold, italic, code, links and lists
-- **Sections**: thirteen ready-made types, each with three layouts, added from a visual picker
+- **Sections**: fourteen ready-made types, each with two or three layouts, added from a visual picker
 - **Pages, menus and footer**, with titles and descriptions for search and sharing
 - **Images**: upload, choose how they fill their frame and which part stays in view
 - **Colors**: pick three, and the editor builds a full light and dark palette that stays readable

package/dist/astro.d.ts

@@ -1,5 +1,5 @@
-import { F as SiteDefinition, I as SiteOf, It as ContentMigrator, _ as SectionRegistry, d as SectionOf, g as ContentModel, t as Page } from "./page-C87bm-bf.js";
-import { a as StoreKeyError, c as createFileStore, i as FileStoreOptions, n as EditorContext, o as StoreOperation, r as ContentStore, s as UploadStore, t as BearminionOptions } from "./options-qFsKXOuE.js";
+import { A as SectionRegistry, J as SiteDefinition, Y as SiteOf, Yt as ContentMigrator, k as ContentModel, t as Page, u as SectionOf } from "./page-BFuPEq6Q.js";
+import { a as StoreKeyError, c as createFileStore, i as FileStoreOptions, n as EditorContext, o as StoreOperation, r as ContentStore, s as UploadStore, t as BearminionOptions } from "./options-DdCyRbPs.js";
 import { AstroIntegration } from "astro";
 //#region src/integration.d.ts
 interface BearminionIntegration extends AstroIntegration {

package/dist/astro.js

@@ -1,15 +1,15 @@
-import { a as imageFields, c as ContentReadError, l as ContentValidationError, r as loadThemePreview, t as PreviewUnavailableError } from "./preview-CTVEBdEY.js";
-import { t as defaultTheme } from "./theme-DMpt3hcT.js";
-import { c as withoutOrphanSections, d as isOrphanSection, i as isSystemPage, n as createPageSchema$1, r as createTolerantPageSchema } from "./page-ON4Jkcm-.js";
-import { a as DEFAULT_UPLOADS_DIR, i as DEFAULT_CONTENT_DIR, n as createMigrator, r as API_PREFIX, t as SCHEMA_VERSION_KEY } from "./migrate-B56wxCiC.js";
-import { a as JSON_BODY_LIMIT, c as isInside, d as resolveDir, f as resolveInside, i as IMAGE_BYTE_LIMIT, l as isLocalRequest, n as contentReloadPlugin, o as MULTIPART_BODY_LIMIT, r as dropEarlyReloadAfterSave, s as asDirectory, u as readSlug } from "./reload-Cq434rtI.js";
+import { a as imageFields, c as ContentReadError, l as ContentValidationError, r as loadThemePreview, t as PreviewUnavailableError } from "./preview--S1QUrMM.js";
+import { t as defaultTheme } from "./theme-DFjHjgFO.js";
+import { i as isSystemPage, n as createPageSchema$1, r as createTolerantPageSchema, s as withoutOrphanSections, u as isOrphanSection } from "./page-NOFVEqn1.js";
+import { a as DEFAULT_UPLOADS_DIR, i as DEFAULT_CONTENT_DIR, n as createMigrator, o as DEFAULT_VIDEOS_DIR, r as API_PREFIX, t as SCHEMA_VERSION_KEY } from "./migrate-b408EaLp.js";
+import { a as JSON_BODY_LIMIT, c as isInside, d as resolveDir, f as resolveInside, i as IMAGE_BYTE_LIMIT, l as isLocalRequest, n as contentReloadPlugin, o as MULTIPART_BODY_LIMIT, r as dropEarlyReloadAfterSave, s as asDirectory, u as readSlug } from "./reload-D0vwI0OT.js";
 import { S as isAssetPath, b as describeSiteRef, c as projectId, v as assetRefs, y as describePageRef } from "./draft-store-1Y4-sn45.js";
 import { z } from "zod";
 import fs from "node:fs";
 import { fileURLToPath } from "node:url";
 import path from "node:path";
-import { access, mkdir, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { randomBytes } from "node:crypto";
+import { access, mkdir, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 //#region src/editor-client.ts
@@ -35,6 +35,112 @@ function editorClientPlugin() {
 	};
 }
 //#endregion
+//#region src/videos.ts
+const EXTENSION$1 = {
+	mp4: ".mp4",
+	mov: ".mov",
+	webm: ".webm",
+	ogv: ".ogv"
+};
+const MIME_TO_KIND$1 = {
+	"video/mp4": "mp4",
+	"video/x-m4v": "mp4",
+	"video/quicktime": "mov",
+	"video/webm": "webm",
+	"video/ogg": "ogv"
+};
+/** Room for multipart boundaries around a max-size video. */
+function videoBodyLimit(maxVideoBytes) {
+	return maxVideoBytes + 262144;
+}
+/** The container a file really is, from its first bytes. The file's name and declared type are not trusted. */
+function sniffVideo(bytes) {
+	if (bytes.length >= 12 && ascii$1(bytes, 4, 8) === "ftyp") {
+		const brand = ascii$1(bytes, 8, 12);
+		if (brand === "avif" || brand === "avis") return null;
+		return brand === "qt  " ? "mov" : "mp4";
+	}
+	if (bytes.length >= 4 && bytes[0] === 26 && bytes[1] === 69 && bytes[2] === 223 && bytes[3] === 163) return ascii$1(bytes, 0, Math.min(bytes.length, 64)).includes("webm") ? "webm" : null;
+	if (bytes.length >= 4 && ascii$1(bytes, 0, 4) === "OggS") return "ogv";
+	return null;
+}
+function videoKindFromMime(mime) {
+	const base = mime.split(";", 1)[0]?.trim().toLowerCase() ?? "";
+	return MIME_TO_KIND$1[base] ?? null;
+}
+/** The address a file in `public/` is served at. */
+function publicUrl(root, filePath) {
+	return `/${path.relative(path.resolve(root, "public"), filePath).split(path.sep).join("/")}`;
+}
+async function saveVideo(options) {
+	await mkdir(options.videosDir, { recursive: true });
+	const extension = EXTENSION$1[options.kind];
+	const stem = safeStem$1(options.originalName);
+	for (let attempt = 0; attempt < 8; attempt += 1) {
+		const filename = `${stem}-${randomBytes(4).toString("hex")}${extension}`;
+		const filePath = resolveInside(options.videosDir, filename);
+		if (filePath === null) throw new Error("Resolved upload path escaped the videos directory.");
+		try {
+			await writeFile(filePath, options.bytes, { flag: "wx" });
+		} catch (error) {
+			if (error instanceof Error && "code" in error && error.code === "EEXIST") continue;
+			throw error;
+		}
+		if (!isInside(options.root, filePath)) throw new Error("Upload path is outside the project root.");
+		return {
+			filename,
+			path: path.relative(options.root, filePath).split(path.sep).join("/"),
+			url: publicUrl(options.root, filePath),
+			bytes: options.bytes.byteLength
+		};
+	}
+	throw new Error("Unable to allocate a unique upload filename.");
+}
+async function listVideos(root, videosDir) {
+	let entries;
+	try {
+		entries = await readdir(videosDir, { withFileTypes: true });
+	} catch {
+		return [];
+	}
+	const videos = [];
+	for (const entry of entries) {
+		if (!entry.isFile() || entry.name.startsWith(".")) continue;
+		if (!Object.values(EXTENSION$1).includes(path.extname(entry.name).toLowerCase())) continue;
+		const filePath = resolveInside(videosDir, entry.name);
+		if (filePath === null) continue;
+		const info = await stat(filePath).catch(() => null);
+		videos.push({
+			filename: entry.name,
+			path: path.relative(root, filePath).split(path.sep).join("/"),
+			url: publicUrl(root, filePath),
+			...info ? { bytes: info.size } : {}
+		});
+	}
+	videos.sort((a, b) => a.filename.localeCompare(b.filename));
+	return videos;
+}
+/** Delete one uploaded video by file name. False when there is no such file or the name is not a plain video file name. */
+async function deleteVideo(videosDir, filename) {
+	if (filename !== path.basename(filename) || filename.startsWith(".")) return false;
+	if (!Object.values(EXTENSION$1).includes(path.extname(filename).toLowerCase())) return false;
+	const filePath = resolveInside(videosDir, filename);
+	if (filePath === null) return false;
+	try {
+		if (!(await stat(filePath)).isFile()) return false;
+		await unlink(filePath);
+		return true;
+	} catch {
+		return false;
+	}
+}
+function safeStem$1(originalName) {
+	return path.win32.basename(path.basename(originalName)).replace(/\.[^.]+$/, "").normalize("NFKD").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48) || "video";
+}
+function ascii$1(bytes, from, to) {
+	return Buffer.from(bytes.subarray(from, to)).toString("latin1");
+}
+//#endregion
 //#region src/asset-refs.ts
 /**
 * Where an image path may live on disk: under `src/assets` or the uploads directory. The absolute path, or null
@@ -237,7 +343,7 @@ function pageKey(slug) {
 	return `${PAGES_DIR}/${slug}.json`;
 }
 /** The content store for a local project: content as JSON files, uploads in a folder. */
-function createFileStore({ root, contentDir, uploadsDir }) {
+function createFileStore({ root, contentDir, uploadsDir, videosDir }) {
 	function resolve(key) {
 		const parts = key.split("/");
 		if (key === "" || parts.some((part) => part === "" || part === "." || part === "..")) throw new StoreKeyError(key);
@@ -282,6 +388,17 @@ function createFileStore({ root, contentDir, uploadsDir }) {
 			if (filePath === null) return false;
 			return stat(filePath).then((info) => info.isFile(), () => false);
 		},
+		...videosDir === void 0 ? {} : { videos: {
+			list: () => listVideos(root, videosDir),
+			save: ({ originalName, bytes, kind }) => saveVideo({
+				root,
+				videosDir,
+				originalName,
+				bytes,
+				kind
+			}),
+			remove: (filename) => deleteVideo(videosDir, filename)
+		} },
 		uploads: {
 			async list() {
 				return listImages(root, uploadsDir);
@@ -312,17 +429,21 @@ function resolveEditorContext(options, rootInput) {
 	const root = asDirectory(rootInput);
 	const contentDir = resolveDir(root, options?.contentDir, DEFAULT_CONTENT_DIR);
 	const uploadsDir = resolveDir(root, options?.uploadsDir, DEFAULT_UPLOADS_DIR);
+	const videosDir = resolveDir(root, options?.videosDir, DEFAULT_VIDEOS_DIR);
 	return {
 		root,
 		contentDir,
 		uploadsDir,
+		videosDir,
+		maxVideoBytes: options?.maxVideoBytes ?? 52428800,
 		sections: options.sections,
 		site: options.site,
 		theme: options.theme ?? defaultTheme,
 		store: options.store ?? createFileStore({
 			root,
 			contentDir,
-			uploadsDir
+			uploadsDir,
+			videosDir
 		}),
 		migrator: createMigrator(options),
 		git: options?.git === true
@@ -452,7 +573,11 @@ async function git(root, args) {
 }
 /** The folders a commit may touch: the content and the uploads. Relative to the project root. */
 function trackedPaths(context) {
-	return [context.contentDir, context.uploadsDir].filter((dir) => isInside(context.root, dir)).map((dir) => path.relative(context.root, dir).split(path.sep).join("/") || ".");
+	return [
+		context.contentDir,
+		context.uploadsDir,
+		context.videosDir
+	].filter((dir) => isInside(context.root, dir)).map((dir) => path.relative(context.root, dir).split(path.sep).join("/") || ".");
 }
 function statusOf(code) {
 	if (code === "??") return "untracked";
@@ -606,6 +731,15 @@ async function handleEditorRequest(request, context, meta = {}) {
 		if (method === "DELETE") return removeImage(context, decodeSegment(parts[1] ?? ""));
 		return methodNotAllowed(["DELETE"]);
 	}
+	if (parts.length === 1 && parts[0] === "videos") {
+		if (method === "GET") return getVideos(context);
+		if (method === "POST") return postVideo(request, context);
+		return methodNotAllowed(["GET", "POST"]);
+	}
+	if (parts.length === 2 && parts[0] === "videos") {
+		if (method === "DELETE") return removeVideo(context, decodeSegment(parts[1] ?? ""));
+		return methodNotAllowed(["DELETE"]);
+	}
 	if (parts.length === 1 && parts[0] === "preview") {
 		if (method === "POST") return postPreview(request, context, meta);
 		return methodNotAllowed(["POST"]);
@@ -1149,6 +1283,87 @@ async function removeImage(context, filename) {
 		filename
 	});
 }
+const NO_VIDEOS = "This content store does not take video uploads.";
+async function getVideos(context) {
+	if (!context.store.videos) return json(200, {
+		videos: [],
+		maxBytes: context.maxVideoBytes
+	});
+	return json(200, {
+		videos: await context.store.videos.list(),
+		maxBytes: context.maxVideoBytes
+	});
+}
+/** Every string in a JSON value. */
+function* strings(value) {
+	if (typeof value === "string") yield value;
+	else if (Array.isArray(value)) for (const item of value) yield* strings(item);
+	else if (typeof value === "object" && value !== null) for (const item of Object.values(value)) yield* strings(item);
+}
+/** Where saved content links the video at `url`, named like the image usages: "Home page › Media". */
+async function videoUsages(context, url) {
+	const labels = Object.fromEntries(Object.values(context.sections).map((definition) => [definition.type, definition.label]));
+	const usages = [];
+	if ([...strings(await readStoredJson(context, "site.json", "site"))].includes(url)) usages.push("Site settings");
+	for (const name of await context.store.list("pages") ?? []) {
+		if (!name.endsWith(".json") || name.startsWith(".")) continue;
+		const page = await readStoredJson(context, `${PAGES_DIR}/${name}`, "page");
+		if (typeof page !== "object" || page === null) continue;
+		const title = "title" in page && typeof page.title === "string" ? page.title : name.replace(/\.json$/, "");
+		const sections = "sections" in page && Array.isArray(page.sections) ? page.sections : [];
+		for (const section of sections) if ([...strings(section)].includes(url)) usages.push(`${title} › ${labels[section.type ?? ""] ?? section.type ?? "section"}`);
+	}
+	return usages;
+}
+async function removeVideo(context, filename) {
+	const videos = context.store.videos;
+	if (!videos) return problem(404, "not_found", NO_VIDEOS);
+	const video = (await videos.list()).find((item) => item.filename === filename);
+	if (!video) return problem(404, "not_found", "No uploaded video has that name.");
+	const usages = await videoUsages(context, video.url);
+	if (usages.length > 0) return json(409, {
+		error: "in_use",
+		message: `${filename} is still used: ${usages.join("; ")}. Choose another video there and save, then delete it.`,
+		usages
+	});
+	if (!await videos.remove(filename)) return problem(404, "not_found", "No uploaded video has that name.");
+	return json(200, {
+		deleted: true,
+		filename
+	});
+}
+async function postVideo(request, context) {
+	const videos = context.store.videos;
+	if (!videos) return problem(404, "not_found", NO_VIDEOS);
+	const limitMb = Math.round(context.maxVideoBytes / 1048576);
+	const tooLarge = () => problem(413, "too_large", `Videos must be ${limitMb}MB or smaller. Link a hosted video instead, or compress this one.`);
+	const length = contentLength(request);
+	if (length !== null && length > videoBodyLimit(context.maxVideoBytes)) return tooLarge();
+	if (!(request.headers.get("content-type") ?? "").toLowerCase().includes("multipart/form-data")) return problem(415, "unsupported_media_type", "Upload the video as multipart/form-data.");
+	let form;
+	try {
+		form = await request.formData();
+	} catch {
+		return problem(400, "invalid_upload", "The upload body could not be read.");
+	}
+	const entry = form.get("file");
+	if (!(entry instanceof File)) return problem(400, "invalid_upload", "Expected a multipart file field named \"file\".");
+	if (entry.size > context.maxVideoBytes) return tooLarge();
+	const bytes = new Uint8Array(await entry.arrayBuffer());
+	if (bytes.byteLength > context.maxVideoBytes) return tooLarge();
+	const declared = videoKindFromMime(entry.type);
+	const sniffed = sniffVideo(bytes);
+	if (declared === null || sniffed === null || declared !== sniffed) return problem(415, "unsupported_media_type", "Upload an mp4, webm, mov or ogv video whose contents match the declared type.");
+	try {
+		return json(201, await videos.save({
+			originalName: entry.name,
+			bytes,
+			kind: sniffed
+		}));
+	} catch (error) {
+		return problem(500, "write_failed", error instanceof Error ? error.message : "Upload failed.");
+	}
+}
 async function postImage(request, context) {
 	const length = contentLength(request);
 	if (length !== null && length > 5505024) return problem(413, "too_large", "Upload exceeds the 5MB image limit.");
@@ -1450,10 +1665,12 @@ async function dispatch(req, res, context, rawUrl, hooks) {
 	const headers = headersFrom(req);
 	const method = (req.method ?? "GET").toUpperCase();
 	const multipart = (headers.get("content-type") ?? "").toLowerCase().includes("multipart/form-data");
-	const limit = multipart ? MULTIPART_BODY_LIMIT : JSON_BODY_LIMIT;
+	const videoUpload = multipart && stripTrailingSlash(rawUrl.split("?")[0] ?? "") === `/__bearminion/api/videos`;
+	const limit = videoUpload ? videoBodyLimit(context.maxVideoBytes) : multipart ? MULTIPART_BODY_LIMIT : JSON_BODY_LIMIT;
+	const tooLargeMessage = videoUpload ? "Upload exceeds the video size limit." : multipart ? "Upload exceeds the 5MB image limit." : "JSON body exceeds 1MB.";
 	const advertised = Number(headers.get("content-length") ?? "");
 	if (Number.isFinite(advertised) && advertised > limit) {
-		await send(res, jsonProblem(413, "too_large", multipart ? "Upload exceeds the 5MB image limit." : "JSON body exceeds 1MB."));
+		await send(res, jsonProblem(413, "too_large", tooLargeMessage));
 		return;
 	}
 	let body;
@@ -1461,7 +1678,7 @@ async function dispatch(req, res, context, rawUrl, hooks) {
 		body = await readBody(req, limit);
 	} catch (error) {
 		if (error instanceof PayloadTooLargeError) {
-			await send(res, jsonProblem(413, "too_large", multipart ? "Upload exceeds the 5MB image limit." : "JSON body exceeds 1MB."));
+			await send(res, jsonProblem(413, "too_large", tooLargeMessage));
 			return;
 		}
 		throw error;
@@ -1627,7 +1844,11 @@ function bearminion(options) {
 				if (command !== "dev") return;
 				const context = resolveEditorContext(options, rootInput(config.root));
 				updateConfig({ vite: {
-					server: { watch: { ignored: [`${context.uploadsDir.replaceAll("\\", "/")}/**`, `${context.root.replaceAll("\\", "/")}/.editor/**`] } },
+					server: { watch: { ignored: [
+						`${context.uploadsDir.replaceAll("\\", "/")}/**`,
+						`${context.videosDir.replaceAll("\\", "/")}/**`,
+						`${context.root.replaceAll("\\", "/")}/.editor/**`
+					] } },
 					plugins: [contentReloadPlugin([context.contentDir]), editorClientPlugin()]
 				} });
 				injectScript("page", "import \"virtual:bearminion-editor\"");

package/dist/content.d.ts

@@ -1,4 +1,4 @@
-import { d as SectionOf, g as ContentModel, t as Page } from "./page-C87bm-bf.js";
+import { k as ContentModel, t as Page, u as SectionOf } from "./page-BFuPEq6Q.js";
 import { z } from "zod";
 //#region src/content.d.ts
 export interface ContentCollectionsOptions {

package/dist/content.js

@@ -1,6 +1,6 @@
-import { n as createPageSchema, r as createTolerantPageSchema } from "./page-ON4Jkcm-.js";
-import { n as createMigrator } from "./migrate-B56wxCiC.js";
-import { t as CONTENT_COLLECTIONS_MARKER } from "./reload-Cq434rtI.js";
+import { n as createPageSchema, r as createTolerantPageSchema } from "./page-NOFVEqn1.js";
+import { n as createMigrator } from "./migrate-b408EaLp.js";
+import { t as CONTENT_COLLECTIONS_MARKER } from "./reload-D0vwI0OT.js";
 import { z } from "zod";
 import { pathToFileURL } from "node:url";
 import path from "node:path";

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { $ as Tone, A as HeaderConfig, At as variantOption, B as brandLogoSchema, Bt as createMigrator, C as BRAND_LOGO_HEIGHT, Ct as Option, D as FooterColumn, Dt as themeModes, E as Footer, Et as motionOption, F as SiteDefinition, Ft as ContentMigration, G as themeColorsSchema, H as siteAnalyticsSchema, I as SiteOf, It as ContentMigrator, J as Image, K as themeSchema, L as SiteSeo, Lt as ContentVersioning, M as SiteAnalytics, Mt as FieldIcons, N as SiteConfig, Nt as ShowCondition, O as FooterConfig, Ot as toneOption, P as SiteConsent, Pt as ShowWhen, Q as Text, R as SiteWith, Rt as DocumentKind, S as defineTheme, St as NumberOption, T as DEFAULT_MAX_HEADER_ACTIONS, Tt as buttonStyles, U as siteConsentSchema, V as defineSite, W as siteSeoSchema, X as MAX_NAV_DEPTH, Y as Link, Z as RichText, _ as SectionRegistry, _t as wireframeIssues, a as isSystemPage, at as textSchema, b as ThemeFont, bt as CountRule, c as withoutOrphanSections, ct as withEmphasis, d as SectionOf, dt as defineSection, et as htmlIdSchema, f as anchorSchema, ft as WireKind, g as ContentModel, gt as wireKinds, h as API_PREFIX, ht as defineWireframe, i as createPageSchema, it as textMarkSchema, j as Site, jt as FieldChoices, k as Header, kt as tones, l as BaseSection, lt as SectionConfig, m as sectionIdSchema, mt as Wireframe, n as SYSTEM_PAGES, nt as linkSchema, o as jsonLdSchema, ot as toneSchema, p as createSectionSchema, pt as WireRect, q as ButtonStyle, r as Seo, rt as richTextSchema, s as seoSchema, st as trackingIdSchema, t as Page, tt as imageSchema, u as PropsOf, ut as SectionDefinition, v as ThemeConfig, vt as OptionalContent, w as DEFAULT_MAX_FOOTER_COLUMNS, wt as StringOption, x as defaultTheme, xt as EnumOption, y as ThemeDefinition, yt as BooleanOption, z as Theme, zt as SCHEMA_VERSION_KEY } from "./page-C87bm-bf.js";
+import { $ as brandLogoSchema, $t as createMigrator, A as SectionRegistry, At as wireframeIssues, B as FooterColumn, Bt as themeModes, C as jsonLdWarnings, Ct as SectionDefinition, D as upsertJsonLd, Dt as Wireframe, E as siteJsonLdIds, Et as WireRect, F as defineTheme, Ft as NumberOption, G as SiteAnalytics, Gt as FieldIcons, H as Header, Ht as tones, I as BRAND_LOGO_HEIGHT, It as Option, J as SiteDefinition, Jt as ContentMigration, K as SiteConfig, Kt as ShowCondition, L as DEFAULT_MAX_FOOTER_COLUMNS, Lt as StringOption, M as ThemeDefinition, Mt as BooleanOption, N as ThemeFont, Nt as CountRule, O as API_PREFIX, Ot as defineWireframe, P as defaultTheme, Pt as EnumOption, Q as Theme, Qt as SCHEMA_VERSION_KEY, R as DEFAULT_MAX_HEADER_ACTIONS, Rt as buttonStyles, S as jsonLdSchema, St as SectionConfig, T as parseJsonLdInput, Tt as WireKind, U as HeaderConfig, Ut as variantOption, V as FooterConfig, Vt as toneOption, W as Site, Wt as FieldChoices, X as SiteSeo, Xt as ContentVersioning, Y as SiteOf, Yt as ContentMigrator, Z as SiteWith, Zt as DocumentKind, _ as SiteJsonLdSource, _t as textMarkSchema, a as isSystemPage, at as themeSchema, b as hasJsonLdId, bt as trackingIdSchema, c as BaseSection, ct as Link, d as anchorSchema, dt as Text, et as defineSite, f as createSectionSchema, ft as Tone, g as SiteJsonLdIds, gt as richTextSchema, h as JsonLdResult, ht as linkSchema, i as createPageSchema, it as themeColorsSchema, j as ThemeConfig, jt as OptionalContent, k as ContentModel, kt as wireKinds, l as PropsOf, lt as MAX_NAV_DEPTH, m as JsonLdBlock, mt as imageSchema, n as SYSTEM_PAGES, nt as siteConsentSchema, o as seoSchema, ot as ButtonStyle, p as sectionIdSchema, pt as htmlIdSchema, q as SiteConsent, qt as ShowWhen, r as Seo, rt as siteSeoSchema, s as withoutOrphanSections, st as Image, t as Page, tt as siteAnalyticsSchema, u as SectionOf, ut as RichText, v as formatJsonLd, vt as textSchema, w as mergeJsonLd, wt as defineSection, x as isPlaceholderSiteUrl, xt as withEmphasis, y as generateSiteJsonLd, yt as toneSchema, z as Footer, zt as motionOption } from "./page-BFuPEq6Q.js";
 import { _ as renderMarkedHtml, a as WeightMark, f as markClass, g as reconcileMarks, i as TextRun, l as fontMarks, m as marksFromEmphasis, o as applyTextMark, r as TextMark, t as FontMark, v as splitMarkedText, y as weightMarks } from "./marks-BzLa48Y9.js";
-import "./options-qFsKXOuE.js";
+import "./options-DdCyRbPs.js";
 //#region src/errors.d.ts
 /** One schema problem, addressed by a dot path such as `sections.0.props.heading`. */
 interface ContentIssue {
@@ -70,6 +70,29 @@ interface ThemePreview<TModel extends ContentModel = ContentModel> {
  */
 export declare function defineThemePreview<TModel extends ContentModel = ContentModel>(preview: ThemePreview<TModel>): ThemePreview<TModel>;
 //#endregion
+//#region src/media-source.d.ts
+/**
+ * What a Media section's video link points at. YouTube and Vimeo links become privacy-friendly embeds
+ * (youtube-nocookie.com, Vimeo with Do Not Track) that load only after the visitor presses play. A link to a video file
+ * plays in a `<video>` element.
+ */
+type MediaSource = {
+  kind: 'youtube';
+  id: string;
+  embed: string;
+  thumbnail: string;
+} | {
+  kind: 'vimeo';
+  id: string;
+  embed: string;
+} | {
+  kind: 'file';
+  src: string;
+};
+/** A path in `public/` (`/videos/demo.webm`) or an `https://` link to a video file. */
+export declare const VIDEO_FILE: RegExp;
+export declare function parseMediaSource(value: string): MediaSource | null;
+//#endregion
 //#region src/git.d.ts
 type ChangeStatus = 'added' | 'modified' | 'deleted' | 'renamed' | 'untracked';
 interface ChangedFile {
@@ -120,6 +143,15 @@ interface UploadedImage {
   path: string;
   bytes?: number;
 }
+/** `GET /videos` entries and the body of a successful `POST /videos`. */
+interface UploadedVideo {
+  filename: string;
+  /** Project-relative path of the file. */
+  path: string;
+  /** What a Media section's `video` field holds, such as `/videos/demo-1a2b3c4d.mp4`. */
+  url: string;
+  bytes?: number;
+}
 /** `GET /history/site` and `GET /history/pages/:slug` entries. */
 interface HistoryEntry {
   id: string;
@@ -162,26 +194,6 @@ interface SitePreview {
   footer: string;
 }
 //#endregion
-//#region src/json-ld.d.ts
-/** JSON-LD blocks as a page stores them: parsed, so diffs stay readable and output can be escaped safely. */
-type JsonLdBlock = Record<string, unknown>;
-type JsonLdResult = {
-  ok: true;
-  value: JsonLdBlock[];
-} | {
-  ok: false;
-  error: string;
-};
-/**
- * Parses what a person pastes into the JSON-LD box: an object, an array of objects, or either one inside a
- * `<script type="application/ld+json">` tag. Empty input is valid and means "no custom JSON-LD".
- */
-export declare function parseJsonLdInput(raw: string): JsonLdResult;
-/** The text shown in the editor box: one block as an object, several as an array, none as empty. */
-export declare function formatJsonLd(blocks: readonly JsonLdBlock[] | undefined): string;
-/** Advice, not errors: a block without `@type` or `@context` is usually a paste mistake, but Google decides what it accepts. */
-export declare function jsonLdWarnings(blocks: readonly JsonLdBlock[]): string[];
-//#endregion
 //#region src/consent.d.ts
 /** Longest copy the consent banner takes, in characters. The editor shows the same limits. */
 export declare const CONSENT_LIMITS: {
@@ -292,4 +304,4 @@ interface ContrastCheck {
 /** Text pairs a visitor reads: text on its background, label on the accent fill, link on its background. */
 export declare function contrastChecks(colors: ThemeColors | undefined): ContrastCheck[];
 //#endregion
-export { API_PREFIX, type ApiIssue, type ApiProblem, BRAND_LOGO_HEIGHT, type BaseSection, type BooleanOption, type ButtonStyle, type ChangedFile, type CommitRequest, type CommitResult, type ConsentCopy, type ConsentReopen, type ConsentText, type ConsentTextKey, type ContentIssue, type ContentMigration, type ContentMigrator, type ContentModel, type ContentVersioning, type ContrastCheck, type CountRule, type CreatePageRequest, DEFAULT_MAX_FOOTER_COLUMNS, DEFAULT_MAX_HEADER_ACTIONS, type DocumentKind, type EnumOption, type FieldChoices, type FieldIcons, type FontMark, type Footer, type FooterColumn, type FooterConfig, type GitInfo, type Header, type HeaderConfig, type HistoryEntry, type Image, type ImageFit, type ImagePosition, type JsonLdBlock, type JsonLdResult, type Link, MAX_NAV_DEPTH, type NumberOption, type Option, type OptionalContent, type Page, type PageListItem, type PropsOf, type RichText, SCHEMA_VERSION_KEY, SYSTEM_PAGES, type SaveRequest, type SaveResponse, type SectionConfig, type SectionDefinition, type SectionOf, type SectionRegistry, type Seo, type ShowCondition, type ShowWhen, type Site, type SiteAnalytics, type SiteConfig, type SiteConsent, type SiteDefinition, type SiteOf, type SitePreview, type SitePreviewHtml, type SiteSeo, type SiteWith, type StringOption, type Text, type TextMark, type TextRun, type Theme, type ThemeColors, type ThemeConfig, type ThemeDefinition, type ThemeFont, type ThemePreview, type Tone, type UploadedImage, type WeightMark, type WireKind, type WireRect, type Wireframe, anchorSchema, applyTextMark, brandLogoSchema, buttonStyles, createMigrator, createPageSchema, createSectionSchema, defaultTheme, defineSection, defineSite, defineTheme, defineWireframe, fontMarks, htmlIdSchema, imageSchema, isSystemPage, jsonLdSchema, linkSchema, markClass, marksFromEmphasis, motionOption, reconcileMarks, renderMarkedHtml, richTextSchema, sectionIdSchema, seoSchema, siteAnalyticsSchema, siteConsentSchema, siteSeoSchema, splitMarkedText, textMarkSchema, textSchema, themeColorsSchema, themeModes, themeSchema, toneOption, toneSchema, tones, trackingIdSchema, variantOption, weightMarks, wireKinds, wireframeIssues, withEmphasis, withoutOrphanSections };
+export { API_PREFIX, type ApiIssue, type ApiProblem, BRAND_LOGO_HEIGHT, type BaseSection, type BooleanOption, type ButtonStyle, type ChangedFile, type CommitRequest, type CommitResult, type ConsentCopy, type ConsentReopen, type ConsentText, type ConsentTextKey, type ContentIssue, type ContentMigration, type ContentMigrator, type ContentModel, type ContentVersioning, type ContrastCheck, type CountRule, type CreatePageRequest, DEFAULT_MAX_FOOTER_COLUMNS, DEFAULT_MAX_HEADER_ACTIONS, type DocumentKind, type EnumOption, type FieldChoices, type FieldIcons, type FontMark, type Footer, type FooterColumn, type FooterConfig, type GitInfo, type Header, type HeaderConfig, type HistoryEntry, type Image, type ImageFit, type ImagePosition, type JsonLdBlock, type JsonLdResult, type Link, MAX_NAV_DEPTH, type MediaSource, type NumberOption, type Option, type OptionalContent, type Page, type PageListItem, type PropsOf, type RichText, SCHEMA_VERSION_KEY, SYSTEM_PAGES, type SaveRequest, type SaveResponse, type SectionConfig, type SectionDefinition, type SectionOf, type SectionRegistry, type Seo, type ShowCondition, type ShowWhen, type Site, type SiteAnalytics, type SiteConfig, type SiteConsent, type SiteDefinition, type SiteJsonLdIds, type SiteJsonLdSource, type SiteOf, type SitePreview, type SitePreviewHtml, type SiteSeo, type SiteWith, type StringOption, type Text, type TextMark, type TextRun, type Theme, type ThemeColors, type ThemeConfig, type ThemeDefinition, type ThemeFont, type ThemePreview, type Tone, type UploadedImage, type UploadedVideo, type WeightMark, type WireKind, type WireRect, type Wireframe, anchorSchema, applyTextMark, brandLogoSchema, buttonStyles, createMigrator, createPageSchema, createSectionSchema, defaultTheme, defineSection, defineSite, defineTheme, defineWireframe, fontMarks, formatJsonLd, generateSiteJsonLd, hasJsonLdId, htmlIdSchema, imageSchema, isPlaceholderSiteUrl, isSystemPage, jsonLdSchema, jsonLdWarnings, linkSchema, markClass, marksFromEmphasis, mergeJsonLd, motionOption, parseJsonLdInput, reconcileMarks, renderMarkedHtml, richTextSchema, sectionIdSchema, seoSchema, siteAnalyticsSchema, siteConsentSchema, siteJsonLdIds, siteSeoSchema, splitMarkedText, textMarkSchema, textSchema, themeColorsSchema, themeModes, themeSchema, toneOption, toneSchema, tones, trackingIdSchema, upsertJsonLd, variantOption, weightMarks, wireKinds, wireframeIssues, withEmphasis, withoutOrphanSections };

package/dist/index.js

@@ -1,9 +1,9 @@
-import { c as ContentReadError, i as enumFields, l as ContentValidationError, n as defineThemePreview, o as schemaProps, s as ContentError, u as formatContentIssues } from "./preview-CTVEBdEY.js";
-import { n as defineTheme, t as defaultTheme } from "./theme-DMpt3hcT.js";
-import { A as isImagePosition, C as trackingIdSchema, D as IMAGE_FITS, E as DEFAULT_IMAGE_POSITION, F as toneOption, I as tones, L as variantOption, M as buttonStyles, N as motionOption, O as IMAGE_POSITIONS, P as themeModes, S as toneSchema, T as DEFAULT_IMAGE_FIT, _ as imageSchema, a as jsonLdSchema, b as textMarkSchema, c as withoutOrphanSections, f as sectionIdSchema, g as htmlIdSchema, h as addMarkIssues, i as isSystemPage, k as isImageFit, l as anchorSchema, m as MAX_NAV_DEPTH, n as createPageSchema, o as seoSchema, p as walkLinkIds, t as SYSTEM_PAGES, u as createSectionSchema, v as linkSchema, w as withEmphasis, x as textSchema, y as richTextSchema } from "./page-ON4Jkcm-.js";
+import { c as ContentReadError, i as enumFields, l as ContentValidationError, n as defineThemePreview, o as schemaProps, s as ContentError, u as formatContentIssues } from "./preview--S1QUrMM.js";
+import { n as defineTheme, t as defaultTheme } from "./theme-DFjHjgFO.js";
+import { A as textSchema, C as MAX_NAV_DEPTH, D as linkSchema, E as imageSchema, F as DEFAULT_IMAGE_POSITION, G as tones, H as motionOption, I as IMAGE_FITS, K as variantOption, L as IMAGE_POSITIONS, M as trackingIdSchema, N as withEmphasis, O as richTextSchema, P as DEFAULT_IMAGE_FIT, R as isImageFit, S as upsertJsonLd, T as htmlIdSchema, U as themeModes, V as buttonStyles, W as toneOption, _ as jsonLdSchema, a as seoSchema, b as parseJsonLdInput, c as anchorSchema, d as sectionIdSchema, f as walkLinkIds, g as isPlaceholderSiteUrl, h as hasJsonLdId, i as isSystemPage, j as toneSchema, k as textMarkSchema, l as createSectionSchema, m as generateSiteJsonLd, n as createPageSchema, p as formatJsonLd, s as withoutOrphanSections, t as SYSTEM_PAGES, v as jsonLdWarnings, w as addMarkIssues, x as siteJsonLdIds, y as mergeJsonLd, z as isImagePosition } from "./page-NOFVEqn1.js";
 import { applyTextMark, fontMarks, markClass, marksFromEmphasis, reconcileMarks, renderMarkedHtml, splitMarkedText, weightMarks } from "./marks.js";
-import { n as createMigrator, r as API_PREFIX, t as SCHEMA_VERSION_KEY } from "./migrate-B56wxCiC.js";
-import { _ as consentCopy, a as contrastRatio, b as jsonLdWarnings, c as hasThemeColors, d as tokenToHex, f as CONSENT_COPY, g as CONSENT_REOPEN, h as CONSENT_LIMITS, i as contrastChecks, l as hexToToken, m as CONSENT_HREF_MESSAGE, n as HEX_COLOR, o as derivePalette, p as CONSENT_HREF, s as hasOverrides, u as themeCss, v as consentTextIssues, x as parseJsonLdInput, y as formatJsonLd } from "./theme-colors-zICpze42.js";
+import { n as createMigrator, r as API_PREFIX, t as SCHEMA_VERSION_KEY } from "./migrate-b408EaLp.js";
+import { _ as consentCopy, a as contrastRatio, b as parseMediaSource, c as hasThemeColors, d as tokenToHex, f as CONSENT_COPY, g as CONSENT_REOPEN, h as CONSENT_LIMITS, i as contrastChecks, l as hexToToken, m as CONSENT_HREF_MESSAGE, n as HEX_COLOR, o as derivePalette, p as CONSENT_HREF, s as hasOverrides, u as themeCss, v as consentTextIssues, y as VIDEO_FILE } from "./theme-colors-CHROGZkI.js";
 import { z } from "zod";
 //#region src/wireframe.ts
 /**
@@ -239,7 +239,9 @@ const siteSeoSchema = z.object({
 	/** `%s` is replaced with the page SEO title. */
 	titleTemplate: z.string().min(1).optional(),
 	description: z.string().optional(),
-	ogImage: z.string().min(1).optional()
+	ogImage: z.string().min(1).optional(),
+	/** Structured data emitted on every page, such as `Organization` and `WebSite`. A page's own blocks add to it. */
+	jsonLd: jsonLdSchema.optional()
 }).strict();
 /**
 * Raw HTML snippets for analytics and similar tags. A theme renders `head` at the end of `<head>` and
@@ -439,4 +441,4 @@ function defineSite(config) {
 	};
 }
 //#endregion
-export { API_PREFIX, BRAND_LOGO_HEIGHT, CONSENT_COPY, CONSENT_HREF, CONSENT_LIMITS, CONSENT_REOPEN, ContentError, ContentReadError, ContentValidationError, DEFAULT_IMAGE_FIT, DEFAULT_IMAGE_POSITION, DEFAULT_MAX_FOOTER_COLUMNS, DEFAULT_MAX_HEADER_ACTIONS, HEX_COLOR, IMAGE_FITS, IMAGE_POSITIONS, MAX_NAV_DEPTH, SCHEMA_VERSION_KEY, SYSTEM_PAGES, anchorSchema, applyTextMark, brandLogoSchema, buttonStyles, consentCopy, consentTextIssues, contrastChecks, contrastRatio, createMigrator, createPageSchema, createSectionSchema, defaultTheme, defineSection, defineSite, defineTheme, defineThemePreview, defineWireframe, derivePalette, fontMarks, formatJsonLd, hasOverrides, hasThemeColors, hexToToken, htmlIdSchema, imageSchema, isImageFit, isImagePosition, isSystemPage, jsonLdSchema, jsonLdWarnings, linkSchema, markClass, marksFromEmphasis, motionOption, parseJsonLdInput, reconcileMarks, renderMarkedHtml, richTextSchema, sectionIdSchema, seoSchema, siteAnalyticsSchema, siteConsentSchema, siteSeoSchema, splitMarkedText, textMarkSchema, textSchema, themeColorsSchema, themeCss, themeModes, themeSchema, tokenToHex, toneOption, toneSchema, tones, trackingIdSchema, variantOption, weightMarks, wireKinds, wireframeIssues, withEmphasis, withoutOrphanSections };
+export { API_PREFIX, BRAND_LOGO_HEIGHT, CONSENT_COPY, CONSENT_HREF, CONSENT_LIMITS, CONSENT_REOPEN, ContentError, ContentReadError, ContentValidationError, DEFAULT_IMAGE_FIT, DEFAULT_IMAGE_POSITION, DEFAULT_MAX_FOOTER_COLUMNS, DEFAULT_MAX_HEADER_ACTIONS, HEX_COLOR, IMAGE_FITS, IMAGE_POSITIONS, MAX_NAV_DEPTH, SCHEMA_VERSION_KEY, SYSTEM_PAGES, VIDEO_FILE, anchorSchema, applyTextMark, brandLogoSchema, buttonStyles, consentCopy, consentTextIssues, contrastChecks, contrastRatio, createMigrator, createPageSchema, createSectionSchema, defaultTheme, defineSection, defineSite, defineTheme, defineThemePreview, defineWireframe, derivePalette, fontMarks, formatJsonLd, generateSiteJsonLd, hasJsonLdId, hasOverrides, hasThemeColors, hexToToken, htmlIdSchema, imageSchema, isImageFit, isImagePosition, isPlaceholderSiteUrl, isSystemPage, jsonLdSchema, jsonLdWarnings, linkSchema, markClass, marksFromEmphasis, mergeJsonLd, motionOption, parseJsonLdInput, parseMediaSource, reconcileMarks, renderMarkedHtml, richTextSchema, sectionIdSchema, seoSchema, siteAnalyticsSchema, siteConsentSchema, siteJsonLdIds, siteSeoSchema, splitMarkedText, textMarkSchema, textSchema, themeColorsSchema, themeCss, themeModes, themeSchema, tokenToHex, toneOption, toneSchema, tones, trackingIdSchema, upsertJsonLd, variantOption, weightMarks, wireKinds, wireframeIssues, withEmphasis, withoutOrphanSections };

package/dist/{migrate-B56wxCiC.js → migrate-b408EaLp.js}

@@ -3,6 +3,8 @@
 const API_PREFIX = "/__bearminion/api";
 const DEFAULT_CONTENT_DIR = "content";
 const DEFAULT_UPLOADS_DIR = "src/assets/uploads";
+/** Videos are served as they are, so they live in `public/`. */
+const DEFAULT_VIDEOS_DIR = "public/videos";
 //#endregion
 //#region src/migrate.ts
 /** The key that stores a document's version. It is stripped on read and stamped on write; schemas never see it. */
@@ -56,4 +58,4 @@ function createMigrator(versioning = {}) {
 	};
 }
 //#endregion
-export { DEFAULT_UPLOADS_DIR as a, DEFAULT_CONTENT_DIR as i, createMigrator as n, API_PREFIX as r, SCHEMA_VERSION_KEY as t };
+export { DEFAULT_UPLOADS_DIR as a, DEFAULT_CONTENT_DIR as i, createMigrator as n, DEFAULT_VIDEOS_DIR as o, API_PREFIX as r, SCHEMA_VERSION_KEY as t };