@stack-mode/site-manager-kit 1.44.0 → 1.44.1

package/src/preview-route.ts

@@ -1,48 +1,48 @@
-import { cookies, draftMode } from "next/headers";
-import { siteId } from "./client";
-import { safePath, signVisualCookie, verifyPreviewToken, VISUAL_COOKIE } from "./preview";
-
-/**
- * Opens a preview of unpublished changes from Site Manager. Put in app/api/blueprint/preview/route.ts:
- *
- *   export { GET } from "site-manager-kit/preview-route";
- *
- * `?token=` is a signed link from Site Manager (it lasts an hour). It turns on Next.js draft mode for this browser
- * and opens the page; while it's on, every Site Manager read skips the cache and includes drafts and scheduled
- * changes. `?exit=1&path=/` turns it off again. Anything else gets a 401 and changes nothing.
- *
- * A Visual Editor link also names the Site Manager address it was made on. It sets the visual cookie, which lets
- * that address (and only that one) show this site in a frame while the preview lasts.
- */
-export async function GET(req: Request): Promise<Response> {
-  const url = new URL(req.url);
-  const draft = await draftMode();
-  if (url.searchParams.get("exit") === "1") {
-    draft.disable();
-    (await cookies()).set({ name: VISUAL_COOKIE, value: "", ...frameCookie(url), maxAge: 0 });
-    return redirect(url, safePath(url.searchParams.get("path")) ?? "/");
-  }
-  const secret = process.env.BLUEPRINT_REVALIDATE_SECRET;
-  const ok = verifyPreviewToken(secret, url.searchParams.get("token"), siteId());
-  if (!ok) return Response.json({ error: "invalid_preview_link" }, { status: 401, headers: { "cache-control": "no-store" } });
-  draft.enable();
-  if (!ok.adminOrigin || !secret) return redirect(url, ok.path);
-  // Inside a frame on another site, cookies only stick when they are SameSite=None, Secure and, on browsers that
-  // split third-party cookies by top site, Partitioned. Next sets the draft cookie without Partitioned, so set it again.
-  const jar = await cookies();
-  const bypass = jar.get("__prerender_bypass")?.value;
-  if (bypass) jar.set({ name: "__prerender_bypass", value: bypass, httpOnly: true, ...frameCookie(url) });
-  jar.set({ name: VISUAL_COOKIE, value: signVisualCookie(secret, siteId(), ok.adminOrigin), httpOnly: true, maxAge: 3600, ...frameCookie(url) });
-  return redirect(url, ok.path, { "content-security-policy": `frame-ancestors 'self' ${ok.adminOrigin}` });
-}
-
-// Browsers accept Secure cookies from http://localhost, so local work behaves like the live site.
-function frameCookie(url: URL) {
-  const secure = url.protocol === "https:" || url.hostname === "localhost" || url.hostname.endsWith(".localhost");
-  return { path: "/", secure, sameSite: secure ? ("none" as const) : ("lax" as const), partitioned: secure };
-}
-
-// Relative to this site, so a preview can never send anyone somewhere else.
-function redirect(from: URL, path: string, headers: Record<string, string> = {}) {
-  return new Response(null, { status: 307, headers: { location: new URL(path, from.origin).toString(), "cache-control": "no-store", ...headers } });
-}
+import { cookies, draftMode } from "next/headers";
+import { siteId } from "./client";
+import { safePath, signVisualCookie, verifyPreviewToken, VISUAL_COOKIE } from "./preview";
+
+/**
+ * Opens a preview of unpublished changes from Site Manager. Put in app/api/blueprint/preview/route.ts:
+ *
+ *   export { GET } from "site-manager-kit/preview-route";
+ *
+ * `?token=` is a signed link from Site Manager (it lasts an hour). It turns on Next.js draft mode for this browser
+ * and opens the page; while it's on, every Site Manager read skips the cache and includes drafts and scheduled
+ * changes. `?exit=1&path=/` turns it off again. Anything else gets a 401 and changes nothing.
+ *
+ * A Visual Editor link also names the Site Manager address it was made on. It sets the visual cookie, which lets
+ * that address (and only that one) show this site in a frame while the preview lasts.
+ */
+export async function GET(req: Request): Promise<Response> {
+  const url = new URL(req.url);
+  const draft = await draftMode();
+  if (url.searchParams.get("exit") === "1") {
+    draft.disable();
+    (await cookies()).set({ name: VISUAL_COOKIE, value: "", ...frameCookie(url), maxAge: 0 });
+    return redirect(url, safePath(url.searchParams.get("path")) ?? "/");
+  }
+  const secret = process.env.BLUEPRINT_REVALIDATE_SECRET;
+  const ok = verifyPreviewToken(secret, url.searchParams.get("token"), siteId());
+  if (!ok) return Response.json({ error: "invalid_preview_link" }, { status: 401, headers: { "cache-control": "no-store" } });
+  draft.enable();
+  if (!ok.adminOrigin || !secret) return redirect(url, ok.path);
+  // Inside a frame on another site, cookies only stick when they are SameSite=None, Secure and, on browsers that
+  // split third-party cookies by top site, Partitioned. Next sets the draft cookie without Partitioned, so set it again.
+  const jar = await cookies();
+  const bypass = jar.get("__prerender_bypass")?.value;
+  if (bypass) jar.set({ name: "__prerender_bypass", value: bypass, httpOnly: true, ...frameCookie(url) });
+  jar.set({ name: VISUAL_COOKIE, value: signVisualCookie(secret, siteId(), ok.adminOrigin), httpOnly: true, maxAge: 3600, ...frameCookie(url) });
+  return redirect(url, ok.path, { "content-security-policy": `frame-ancestors 'self' ${ok.adminOrigin}` });
+}
+
+// Browsers accept Secure cookies from http://localhost, so local work behaves like the live site.
+function frameCookie(url: URL) {
+  const secure = url.protocol === "https:" || url.hostname === "localhost" || url.hostname.endsWith(".localhost");
+  return { path: "/", secure, sameSite: secure ? ("none" as const) : ("lax" as const), partitioned: secure };
+}
+
+// Relative to this site, so a preview can never send anyone somewhere else.
+function redirect(from: URL, path: string, headers: Record<string, string> = {}) {
+  return new Response(null, { status: 307, headers: { location: new URL(path, from.origin).toString(), "cache-control": "no-store", ...headers } });
+}

package/src/preview.ts

@@ -1,94 +1,94 @@
-import { createHmac, timingSafeEqual } from "node:crypto";
-
-/*
- * Previews of unpublished changes, signed with BLUEPRINT_REVALIDATE_SECRET (the same formats Site Manager uses in
- * src/lib/changes/preview.ts):
- *   link token  <base64url JSON { s: siteId, p: path, e: unix expiry }>.<hex HMAC-SHA256 of "link.<payload>">
- *   read header x-blueprint-preview: t=<unix>,v1=<hex HMAC-SHA256 of "<t>.preview">
- * A link for the Visual Editor adds v: 1 and o: <admin origin> to the link payload. Opening it sets the visual cookie
- *   bp_visual   <base64url JSON { s: siteId, o: admin origin, e: unix expiry }>.<hex HMAC-SHA256 of "visual.<payload>">
- * which lets that one admin origin show the site in a frame and talk to it.
- */
-
-export const PREVIEW_HEADER = "x-blueprint-preview";
-export const VISUAL_COOKIE = "bp_visual";
-
-const hmac = (secret: string, data: string) => createHmac("sha256", secret).update(data).digest("hex");
-
-function equal(a: string, b: string) {
-  const x = Buffer.from(a);
-  const y = Buffer.from(b);
-  return x.length === y.length && timingSafeEqual(x, y);
-}
-
-/** A safe path on this site, or null. Never another address: no scheme, no `//host`, no backslashes. */
-export function safePath(p: unknown): string | null {
-  if (typeof p !== "string" || !p.startsWith("/") || p.startsWith("//") || p.includes("\\") || p.length > 2000) return null;
-  return p;
-}
-
-function readSigned(secret: string, value: string, purpose: string): Record<string, unknown> | null {
-  const [payload, sig, extra] = value.split(".");
-  if (!payload || !sig || extra !== undefined || !/^[0-9a-f]{64}$/.test(sig)) return null;
-  if (!equal(hmac(secret, `${purpose}.${payload}`), sig)) return null;
-  try {
-    const data: unknown = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
-    return data && typeof data === "object" && !Array.isArray(data) ? (data as Record<string, unknown>) : null;
-  } catch {
-    return null;
-  }
-}
-
-const isLocalHost = (host: string) => host === "localhost" || host.endsWith(".localhost");
-
-/** An admin origin a visual link may name: https (http only for localhost and *.localhost), with nothing but scheme, host and port. */
-export function isAllowedAdminOrigin(o: unknown): o is string {
-  if (typeof o !== "string" || o.length > 300) return false;
-  let url: URL;
-  try {
-    url = new URL(o);
-  } catch {
-    return false;
-  }
-  if (url.origin !== o) return false;
-  return url.protocol === "https:" || (url.protocol === "http:" && isLocalHost(url.hostname));
-}
-
-/**
- * A link from Site Manager for this site, or null. `adminOrigin` is set only for a Visual Editor link with an allowed
- * origin; a link naming a bad origin still opens as a plain preview.
- */
-export function verifyPreviewToken(
-  secret: string | undefined,
-  token: string | null,
-  siteId: string,
-  now = Math.floor(Date.now() / 1000),
-): { path: string; adminOrigin: string | null } | null {
-  if (!secret || !token) return null;
-  const data = readSigned(secret, token, "link");
-  if (!data || data.s !== siteId || typeof data.e !== "number" || data.e < now) return null;
-  const path = safePath(data.p);
-  if (!path) return null;
-  return { path, adminOrigin: data.v === 1 && isAllowedAdminOrigin(data.o) ? data.o : null };
-}
-
-export function signVisualCookie(secret: string, siteId: string, adminOrigin: string, now = Math.floor(Date.now() / 1000)): string {
-  const payload = Buffer.from(JSON.stringify({ s: siteId, o: adminOrigin, e: now + 3600 })).toString("base64url");
-  return `${payload}.${hmac(secret, `visual.${payload}`)}`;
-}
-
-export function verifyVisualCookie(
-  secret: string | undefined,
-  value: string | undefined,
-  siteId: string,
-  now = Math.floor(Date.now() / 1000),
-): { adminOrigin: string } | null {
-  if (!secret || !value) return null;
-  const data = readSigned(secret, value, "visual");
-  if (!data || data.s !== siteId || typeof data.e !== "number" || data.e < now || !isAllowedAdminOrigin(data.o)) return null;
-  return { adminOrigin: data.o };
-}
-
-export function signPreviewHeader(secret: string, now = Math.floor(Date.now() / 1000)): string {
-  return `t=${now},v1=${hmac(secret, `${now}.preview`)}`;
-}
+import { createHmac, timingSafeEqual } from "node:crypto";
+
+/*
+ * Previews of unpublished changes, signed with BLUEPRINT_REVALIDATE_SECRET (the same formats Site Manager uses in
+ * src/lib/changes/preview.ts):
+ *   link token  <base64url JSON { s: siteId, p: path, e: unix expiry }>.<hex HMAC-SHA256 of "link.<payload>">
+ *   read header x-blueprint-preview: t=<unix>,v1=<hex HMAC-SHA256 of "<t>.preview">
+ * A link for the Visual Editor adds v: 1 and o: <admin origin> to the link payload. Opening it sets the visual cookie
+ *   bp_visual   <base64url JSON { s: siteId, o: admin origin, e: unix expiry }>.<hex HMAC-SHA256 of "visual.<payload>">
+ * which lets that one admin origin show the site in a frame and talk to it.
+ */
+
+export const PREVIEW_HEADER = "x-blueprint-preview";
+export const VISUAL_COOKIE = "bp_visual";
+
+const hmac = (secret: string, data: string) => createHmac("sha256", secret).update(data).digest("hex");
+
+function equal(a: string, b: string) {
+  const x = Buffer.from(a);
+  const y = Buffer.from(b);
+  return x.length === y.length && timingSafeEqual(x, y);
+}
+
+/** A safe path on this site, or null. Never another address: no scheme, no `//host`, no backslashes. */
+export function safePath(p: unknown): string | null {
+  if (typeof p !== "string" || !p.startsWith("/") || p.startsWith("//") || p.includes("\\") || p.length > 2000) return null;
+  return p;
+}
+
+function readSigned(secret: string, value: string, purpose: string): Record<string, unknown> | null {
+  const [payload, sig, extra] = value.split(".");
+  if (!payload || !sig || extra !== undefined || !/^[0-9a-f]{64}$/.test(sig)) return null;
+  if (!equal(hmac(secret, `${purpose}.${payload}`), sig)) return null;
+  try {
+    const data: unknown = JSON.parse(Buffer.from(payload, "base64url").toString("utf8"));
+    return data && typeof data === "object" && !Array.isArray(data) ? (data as Record<string, unknown>) : null;
+  } catch {
+    return null;
+  }
+}
+
+const isLocalHost = (host: string) => host === "localhost" || host.endsWith(".localhost");
+
+/** An admin origin a visual link may name: https (http only for localhost and *.localhost), with nothing but scheme, host and port. */
+export function isAllowedAdminOrigin(o: unknown): o is string {
+  if (typeof o !== "string" || o.length > 300) return false;
+  let url: URL;
+  try {
+    url = new URL(o);
+  } catch {
+    return false;
+  }
+  if (url.origin !== o) return false;
+  return url.protocol === "https:" || (url.protocol === "http:" && isLocalHost(url.hostname));
+}
+
+/**
+ * A link from Site Manager for this site, or null. `adminOrigin` is set only for a Visual Editor link with an allowed
+ * origin; a link naming a bad origin still opens as a plain preview.
+ */
+export function verifyPreviewToken(
+  secret: string | undefined,
+  token: string | null,
+  siteId: string,
+  now = Math.floor(Date.now() / 1000),
+): { path: string; adminOrigin: string | null } | null {
+  if (!secret || !token) return null;
+  const data = readSigned(secret, token, "link");
+  if (!data || data.s !== siteId || typeof data.e !== "number" || data.e < now) return null;
+  const path = safePath(data.p);
+  if (!path) return null;
+  return { path, adminOrigin: data.v === 1 && isAllowedAdminOrigin(data.o) ? data.o : null };
+}
+
+export function signVisualCookie(secret: string, siteId: string, adminOrigin: string, now = Math.floor(Date.now() / 1000)): string {
+  const payload = Buffer.from(JSON.stringify({ s: siteId, o: adminOrigin, e: now + 3600 })).toString("base64url");
+  return `${payload}.${hmac(secret, `visual.${payload}`)}`;
+}
+
+export function verifyVisualCookie(
+  secret: string | undefined,
+  value: string | undefined,
+  siteId: string,
+  now = Math.floor(Date.now() / 1000),
+): { adminOrigin: string } | null {
+  if (!secret || !value) return null;
+  const data = readSigned(secret, value, "visual");
+  if (!data || data.s !== siteId || typeof data.e !== "number" || data.e < now || !isAllowedAdminOrigin(data.o)) return null;
+  return { adminOrigin: data.o };
+}
+
+export function signPreviewHeader(secret: string, now = Math.floor(Date.now() / 1000)): string {
+  return `t=${now},v1=${hmac(secret, `${now}.preview`)}`;
+}

package/src/residents.ts

@@ -1,23 +1,23 @@
-import type { Pickup, Weekday } from "./types";
-
-// Plain-language text for resident and policy facts. Formatting only: the site's own code decides where it shows.
-
-const DAY_NAMES: Record<Weekday, string> = { mon: "Monday", tue: "Tuesday", wed: "Wednesday", thu: "Thursday", fri: "Friday", sat: "Saturday", sun: "Sunday" };
-
-const list = (parts: string[], joiner: string) => (parts.length <= 1 ? (parts[0] ?? "") : `${parts.slice(0, -1).join(", ")} ${joiner} ${parts[parts.length - 1]}`);
-
-/** "Monday and Thursday by 7 am". Empty when no days are set. */
-export function pickupText(p: Pick<Pickup, "days" | "time">): string {
-  if (!p.days.length) return "";
-  const days = p.days.length === 7 ? "Every day" : list(p.days.map((d) => DAY_NAMES[d]), "and");
-  if (!p.time) return days;
-  const [h, m] = p.time.split(":").map(Number);
-  const hour = h % 12 === 0 ? 12 : h % 12;
-  return `${days} by ${hour}${m ? `:${String(m).padStart(2, "0")}` : ""} ${h < 12 ? "am" : "pm"}`;
-}
-
-/** "6, 12 or 15 months". Empty when no lengths are set. */
-export function leaseTermsText(months: number[]): string {
-  if (!months.length) return "";
-  return `${list(months.map(String), "or")} month${months.length === 1 && months[0] === 1 ? "" : "s"}`;
-}
+import type { Pickup, Weekday } from "./types";
+
+// Plain-language text for resident and policy facts. Formatting only: the site's own code decides where it shows.
+
+const DAY_NAMES: Record<Weekday, string> = { mon: "Monday", tue: "Tuesday", wed: "Wednesday", thu: "Thursday", fri: "Friday", sat: "Saturday", sun: "Sunday" };
+
+const list = (parts: string[], joiner: string) => (parts.length <= 1 ? (parts[0] ?? "") : `${parts.slice(0, -1).join(", ")} ${joiner} ${parts[parts.length - 1]}`);
+
+/** "Monday and Thursday by 7 am". Empty when no days are set. */
+export function pickupText(p: Pick<Pickup, "days" | "time">): string {
+  if (!p.days.length) return "";
+  const days = p.days.length === 7 ? "Every day" : list(p.days.map((d) => DAY_NAMES[d]), "and");
+  if (!p.time) return days;
+  const [h, m] = p.time.split(":").map(Number);
+  const hour = h % 12 === 0 ? 12 : h % 12;
+  return `${days} by ${hour}${m ? `:${String(m).padStart(2, "0")}` : ""} ${h < 12 ? "am" : "pm"}`;
+}
+
+/** "6, 12 or 15 months". Empty when no lengths are set. */
+export function leaseTermsText(months: number[]): string {
+  if (!months.length) return "";
+  return `${list(months.map(String), "or")} month${months.length === 1 && months[0] === 1 ? "" : "s"}`;
+}

package/src/revalidate-route.ts

@@ -1,34 +1,34 @@
-import { revalidateTag } from "next/cache";
-import { siteId } from "./client";
-import { clearRedirectCache } from "./redirects";
-import { SIGNATURE_HEADER, verify } from "./signature";
-
-/**
- * Receives Site Manager's "content changed" requests. Put in app/api/blueprint/revalidate/route.ts:
- *
- *   export { POST } from "site-manager-kit/revalidate-route";
- *
- * Only signed requests from the last 5 minutes are accepted, and only this site's tags are refreshed. No visitor waits
- * for a refresh: the first visit after a change still gets the cached page and starts its rebuild.
- */
-export async function POST(req: Request): Promise<Response> {
-  const body = await req.text();
-  const check = verify(process.env.BLUEPRINT_REVALIDATE_SECRET, req.headers.get(SIGNATURE_HEADER), body);
-  if (!check.ok) return Response.json({ error: check.reason }, { status: 401 });
-
-  let tags: unknown;
-  try {
-    tags = (JSON.parse(body) as { tags?: unknown }).tags;
-  } catch {
-    return Response.json({ error: "bad_request" }, { status: 400 });
-  }
-  if (!Array.isArray(tags)) return Response.json({ error: "bad_request" }, { status: 400 });
-  const prefix = `bp:${siteId()}`;
-  const mine = tags.filter((t): t is string => typeof t === "string" && (t === prefix || t.startsWith(`${prefix}:`)) && t.length <= 256);
-  // Marked stale rather than expired: the next visitor gets the page as it was, instantly, while the page rebuilds in
-  // the background. A page rebuild waits for fresh reads before it is saved, so the visit after it shows the change.
-  // Expiring instead made the next visit to every affected page wait for the whole rebuild.
-  for (const t of mine) revalidateTag(t, "max");
-  if (mine.some((t) => t === prefix || t.endsWith(":redirects"))) clearRedirectCache();
-  return Response.json({ revalidated: mine.length });
-}
+import { revalidateTag } from "next/cache";
+import { siteId } from "./client";
+import { clearRedirectCache } from "./redirects";
+import { SIGNATURE_HEADER, verify } from "./signature";
+
+/**
+ * Receives Site Manager's "content changed" requests. Put in app/api/blueprint/revalidate/route.ts:
+ *
+ *   export { POST } from "site-manager-kit/revalidate-route";
+ *
+ * Only signed requests from the last 5 minutes are accepted, and only this site's tags are refreshed. No visitor waits
+ * for a refresh: the first visit after a change still gets the cached page and starts its rebuild.
+ */
+export async function POST(req: Request): Promise<Response> {
+  const body = await req.text();
+  const check = verify(process.env.BLUEPRINT_REVALIDATE_SECRET, req.headers.get(SIGNATURE_HEADER), body);
+  if (!check.ok) return Response.json({ error: check.reason }, { status: 401 });
+
+  let tags: unknown;
+  try {
+    tags = (JSON.parse(body) as { tags?: unknown }).tags;
+  } catch {
+    return Response.json({ error: "bad_request" }, { status: 400 });
+  }
+  if (!Array.isArray(tags)) return Response.json({ error: "bad_request" }, { status: 400 });
+  const prefix = `bp:${siteId()}`;
+  const mine = tags.filter((t): t is string => typeof t === "string" && (t === prefix || t.startsWith(`${prefix}:`)) && t.length <= 256);
+  // Marked stale rather than expired: the next visitor gets the page as it was, instantly, while the page rebuilds in
+  // the background. A page rebuild waits for fresh reads before it is saved, so the visit after it shows the change.
+  // Expiring instead made the next visit to every affected page wait for the whole rebuild.
+  for (const t of mine) revalidateTag(t, "max");
+  if (mine.some((t) => t === prefix || t.endsWith(":redirects"))) clearRedirectCache();
+  return Response.json({ revalidated: mine.length });
+}

package/src/rss-route.ts

@@ -1,26 +1,26 @@
-import { buildRss, getBlogFeed } from "./blog";
-import { BlueprintError } from "./client";
-
-/**
- * The blog's RSS feed. Put in app/blog/rss.xml/route.ts (or wherever the feed should live):
- *
- *   import { rssRoute } from "site-manager-kit/rss-route";
- *   export const GET = rssRoute();
- *
- * The feed's own address comes from the request. With the Blog section off in Site Manager the feed answers 404.
- */
-export function rssRoute(opts: { limit?: number; title?: string; description?: string } = {}) {
-  return async function GET(req: Request): Promise<Response> {
-    let feed;
-    try {
-      feed = await getBlogFeed({ limit: opts.limit });
-    } catch (e) {
-      if (e instanceof BlueprintError && e.code === "module_off") return new Response("Not found", { status: 404 });
-      throw e;
-    }
-    if (!feed) return new Response("Not found", { status: 404 });
-    const url = new URL(req.url);
-    const body = buildRss(feed, { feedUrl: `${url.origin}${url.pathname}`, link: feed.link ?? url.origin, title: opts.title, description: opts.description });
-    return new Response(body, { headers: { "content-type": "application/rss+xml; charset=utf-8", "cache-control": "public, max-age=0, s-maxage=3600, stale-while-revalidate=86400" } });
-  };
-}
+import { buildRss, getBlogFeed } from "./blog";
+import { BlueprintError } from "./client";
+
+/**
+ * The blog's RSS feed. Put in app/blog/rss.xml/route.ts (or wherever the feed should live):
+ *
+ *   import { rssRoute } from "site-manager-kit/rss-route";
+ *   export const GET = rssRoute();
+ *
+ * The feed's own address comes from the request. With the Blog section off in Site Manager the feed answers 404.
+ */
+export function rssRoute(opts: { limit?: number; title?: string; description?: string } = {}) {
+  return async function GET(req: Request): Promise<Response> {
+    let feed;
+    try {
+      feed = await getBlogFeed({ limit: opts.limit });
+    } catch (e) {
+      if (e instanceof BlueprintError && e.code === "module_off") return new Response("Not found", { status: 404 });
+      throw e;
+    }
+    if (!feed) return new Response("Not found", { status: 404 });
+    const url = new URL(req.url);
+    const body = buildRss(feed, { feedUrl: `${url.origin}${url.pathname}`, link: feed.link ?? url.origin, title: opts.title, description: opts.description });
+    return new Response(body, { headers: { "content-type": "application/rss+xml; charset=utf-8", "cache-control": "public, max-age=0, s-maxage=3600, stale-while-revalidate=86400" } });
+  };
+}

package/src/services.ts

@@ -1,52 +1,52 @@
-import type { Service, Site } from "./types";
-
-type Json = Record<string, unknown>;
-
-/**
- * schema.org `Service` structured data for a service page, with the business as its provider. A price becomes an
- * `Offer` (a range as a `PriceSpecification` with min and max); "call for pricing" and no price add no offer, so
- * search engines are never told a price the business didn't give. Amounts stay decimal strings. Prices are in USD,
- * the only currency Site Manager's sites use.
- */
-export function serviceJsonLd(service: Service, site: Pick<Site, "name" | "business" | "websiteUrl">, url: string): Json {
-  const b = site.business;
-  const a = b.address;
-  const provider: Json = {
-    "@type": "LocalBusiness",
-    name: b.displayName || site.name,
-    ...(site.websiteUrl ? { url: site.websiteUrl } : {}),
-    ...(b.phone ? { telephone: b.phone } : {}),
-    ...(a.line1 || a.city
-      ? {
-          address: {
-            "@type": "PostalAddress",
-            ...(a.line1 ? { streetAddress: [a.line1, a.line2].filter(Boolean).join(", ") } : {}),
-            ...(a.city ? { addressLocality: a.city } : {}),
-            ...(a.region ? { addressRegion: a.region } : {}),
-            ...(a.postalCode ? { postalCode: a.postalCode } : {}),
-            ...(a.country ? { addressCountry: a.country } : {}),
-          },
-        }
-      : {}),
-  };
-  const p = service.price;
-  let offers: Json | null = null;
-  if (p.kind === "fixed" && p.from) offers = { "@type": "Offer", priceCurrency: "USD", price: p.from };
-  else if (p.kind === "starting_at" && p.from) {
-    offers = { "@type": "Offer", priceCurrency: "USD", price: p.from, priceSpecification: { "@type": "PriceSpecification", priceCurrency: "USD", minPrice: p.from } };
-  } else if (p.kind === "range" && p.from && p.to) {
-    offers = { "@type": "Offer", priceCurrency: "USD", priceSpecification: { "@type": "PriceSpecification", priceCurrency: "USD", minPrice: p.from, maxPrice: p.to } };
-  }
-  return {
-    "@context": "https://schema.org",
-    "@type": "Service",
-    name: service.name,
-    url,
-    ...(service.summary ? { description: service.summary } : {}),
-    ...(service.category ? { serviceType: service.category } : {}),
-    ...(service.photos.length ? { image: service.photos.map((ph) => ph.url) } : {}),
-    provider,
-    ...(a.city ? { areaServed: a.region ? `${a.city}, ${a.region}` : a.city } : {}),
-    ...(offers ? { offers } : {}),
-  };
-}
+import type { Service, Site } from "./types";
+
+type Json = Record<string, unknown>;
+
+/**
+ * schema.org `Service` structured data for a service page, with the business as its provider. A price becomes an
+ * `Offer` (a range as a `PriceSpecification` with min and max); "call for pricing" and no price add no offer, so
+ * search engines are never told a price the business didn't give. Amounts stay decimal strings. Prices are in USD,
+ * the only currency Site Manager's sites use.
+ */
+export function serviceJsonLd(service: Service, site: Pick<Site, "name" | "business" | "websiteUrl">, url: string): Json {
+  const b = site.business;
+  const a = b.address;
+  const provider: Json = {
+    "@type": "LocalBusiness",
+    name: b.displayName || site.name,
+    ...(site.websiteUrl ? { url: site.websiteUrl } : {}),
+    ...(b.phone ? { telephone: b.phone } : {}),
+    ...(a.line1 || a.city
+      ? {
+          address: {
+            "@type": "PostalAddress",
+            ...(a.line1 ? { streetAddress: [a.line1, a.line2].filter(Boolean).join(", ") } : {}),
+            ...(a.city ? { addressLocality: a.city } : {}),
+            ...(a.region ? { addressRegion: a.region } : {}),
+            ...(a.postalCode ? { postalCode: a.postalCode } : {}),
+            ...(a.country ? { addressCountry: a.country } : {}),
+          },
+        }
+      : {}),
+  };
+  const p = service.price;
+  let offers: Json | null = null;
+  if (p.kind === "fixed" && p.from) offers = { "@type": "Offer", priceCurrency: "USD", price: p.from };
+  else if (p.kind === "starting_at" && p.from) {
+    offers = { "@type": "Offer", priceCurrency: "USD", price: p.from, priceSpecification: { "@type": "PriceSpecification", priceCurrency: "USD", minPrice: p.from } };
+  } else if (p.kind === "range" && p.from && p.to) {
+    offers = { "@type": "Offer", priceCurrency: "USD", priceSpecification: { "@type": "PriceSpecification", priceCurrency: "USD", minPrice: p.from, maxPrice: p.to } };
+  }
+  return {
+    "@context": "https://schema.org",
+    "@type": "Service",
+    name: service.name,
+    url,
+    ...(service.summary ? { description: service.summary } : {}),
+    ...(service.category ? { serviceType: service.category } : {}),
+    ...(service.photos.length ? { image: service.photos.map((ph) => ph.url) } : {}),
+    provider,
+    ...(a.city ? { areaServed: a.region ? `${a.city}, ${a.region}` : a.city } : {}),
+    ...(offers ? { offers } : {}),
+  };
+}