blume 1.0.3 → 1.1.0

package/src/astro/templates.ts

@@ -10,7 +10,7 @@ import type { ResolvedConfig } from "../core/schema.ts";
 import { BLUME_IGNORE_DIRS } from "../core/sources/watch.ts";
 import { trimChar } from "../core/trim.ts";
 import type { ProjectContext } from "../core/types.ts";
-import { applyBaseToRedirects } from "../deploy/redirects.ts";
+import { applyBaseToAstroRedirects } from "../deploy/redirects.ts";
 import { hasScalarReferences } from "../openapi/references.ts";
 import { searchProviderMeta } from "../search/providers.ts";
 import { buildFontEntries } from "../theme/fonts.ts";
@@ -80,6 +80,30 @@ const ADAPTER_OPTIONS: Record<string, string> = {
   node: '{ mode: "standalone" }',
 };
 
+const WRANGLER_CONFIG_FILES = [
+  "wrangler.jsonc",
+  "wrangler.json",
+  "wrangler.toml",
+];
+
+const resolveCloudflareAdapterArgs = (context: ProjectContext): string => {
+  const args: string[] = ['prerenderEnvironment: "node"'];
+  const wranglerPath = WRANGLER_CONFIG_FILES.map((file) =>
+    join(context.root, file)
+  ).find((file) => existsSync(file));
+  if (wranglerPath) {
+    let configPath = relative(context.outDir, wranglerPath);
+    // The wrangler config always lives at the project root, above the `.blume`
+    // runtime, so `relative` yields a `../…` path; normalize the theoretical
+    // sibling case to an explicit `./` so it reads as a relative import.
+    if (!configPath.startsWith(".") && !configPath.startsWith("/")) {
+      configPath = `./${configPath}`;
+    }
+    args.push(`configPath: ${JSON.stringify(configPath)}`);
+  }
+  return `{ ${args.join(", ")} }`;
+};
+
 /**
  * Integration packages the generated runtime imports. Declaring them in
  * `.blume/package.json` lets Astro's framework-package crawl discover and bundle
@@ -142,11 +166,16 @@ export const runtimeDependencies = (options: {
  * static-prerender Vite environments.
  *
  * Two reasons a dep lands here:
- *   - `@takumi-rs/core` (OG image rendering) is a native NAPI addon that loads a
- *     platform-specific `.node` binding via `createRequire(import.meta.url)`.
- *     Bundling it relocates `import.meta.url` and breaks the binding lookup
- *     ("Cannot find native binding") on other platforms (e.g. the Linux CI
- *     runner), so it must resolve from `node_modules` at runtime instead.
+ *   - `takumi-js` (OG image rendering) loads `@takumi-rs/core`, a native NAPI
+ *     addon that finds its platform-specific `.node` binding via
+ *     `createRequire(import.meta.url)`. Bundling it relocates `import.meta.url`
+ *     and breaks the binding lookup ("Cannot find native binding") on other
+ *     platforms (e.g. the Linux CI runner), so it must resolve from
+ *     `node_modules` at runtime instead. The prerender env matches these by
+ *     exact specifier, so every entry point Blume imports has to be listed:
+ *     the bare `takumi-js` (render) plus `takumi-js/helpers` (the `googleFonts`
+ *     OG-font loader). The `@takumi-rs/*` packages are listed too so the native
+ *     backend is never pulled into a chunk down any transitive path.
  *   - The rest are pure-JS packages kept external so an isolated linker (Bun's
  *     `isolated` mode, pnpm) doesn't bundle their symlinked store copies. When
  *     Vite bundles such a package but leaves its own `node_modules` child
@@ -166,10 +195,13 @@ const RENDER_EXTERNAL_DEPS = [
   "@shikijs/transformers",
   "@takumi-rs/core",
   "@takumi-rs/helpers",
+  "@takumi-rs/wasm",
   "github-slugger",
   "katex",
   "shiki",
   "simple-icons",
+  "takumi-js",
+  "takumi-js/helpers",
   "zod",
 ];
 
@@ -188,6 +220,21 @@ const renderUserAliases = (
 const astroOutDir = (context: ProjectContext): string =>
   context.distDir ?? `${context.root}/dist`;
 
+/**
+ * The root a deploy adapter is shown, in place of the `.blume` runtime Astro
+ * actually roots at. Adapters assume `outDir` is `<root>/dist` and resolve their
+ * own output (and Vercel's dependency trace) against `root`, so the root implied
+ * by Blume's `outDir` is the one that keeps that assumption true. See
+ * {@link withAdapterRoot}.
+ *
+ * For a normal build that is the project root (`<project>/dist` -> `<project>`).
+ * For a relocated runtime (`blume build --isolated`) it is the runtime dir
+ * itself (`<runtime>/dist` -> `<runtime>`), keeping a verify build's adapter
+ * output self-contained instead of overwriting the real `.vercel/output`.
+ */
+const adapterRoot = (context: ProjectContext): string =>
+  dirname(astroOutDir(context));
+
 /**
  * Excludes Vite's pre-bundled dep cache from @vitejs/plugin-react. Astro's
  * react() replaces the plugin's default `/node_modules/` exclude with just
@@ -263,12 +310,26 @@ export const astroConfigTemplate = (options: {
     server && deployment.adapter
       ? `import adapter from "${ADAPTER_IMPORTS[deployment.adapter]}";\n`
       : "";
-  const adapterArgs =
-    server && deployment.adapter
-      ? (ADAPTER_OPTIONS[deployment.adapter] ?? "")
-      : "";
+  const adapterArgs = (() => {
+    if (!server || !deployment.adapter) {
+      return "";
+    }
+    if (deployment.adapter === "cloudflare") {
+      return resolveCloudflareAdapterArgs(context);
+    }
+    return ADAPTER_OPTIONS[deployment.adapter] ?? "";
+  })();
+  // Vercel resolves its Build Output tree and its `@vercel/nft` dependency
+  // trace against the Astro root, which for Blume is the hidden `.blume`
+  // runtime — leaving the traced function without its chunks or node_modules.
+  // The other adapters emit into `outDir` (cloudflare, node) or are surfaced
+  // afterwards (netlify), so none of them read `root` this way.
+  const adapterExpr =
+    deployment.adapter === "vercel"
+      ? `withAdapterRoot(adapter(${adapterArgs}), ${JSON.stringify(adapterRoot(context))})`
+      : `adapter(${adapterArgs})`;
   const adapterOption =
-    server && deployment.adapter ? `\n  adapter: adapter(${adapterArgs}),` : "";
+    server && deployment.adapter ? `\n  adapter: ${adapterExpr},` : "";
 
   const siteOption = deployment.site
     ? `\n  site: ${JSON.stringify(deployment.site)},`
@@ -291,10 +352,12 @@ export const astroConfigTemplate = (options: {
     : "";
 
   // Base the redirect paths the same way routes are based, so a redirect lands
-  // under `basePath` too. Astro layers its own `base` (deployment.base) on top.
-  const basedRedirects = applyBaseToRedirects(
+  // under `basePath` too. Astro layers its own `base` (deployment.base) onto
+  // `from` when matching, but never onto `to` — see applyBaseToAstroRedirects.
+  const basedRedirects = applyBaseToAstroRedirects(
     config.redirects,
-    config.basePath
+    config.basePath,
+    deployment.base ?? ""
   );
   const redirectsOption =
     basedRedirects.length > 0
@@ -336,7 +399,13 @@ export const astroConfigTemplate = (options: {
   const svelteImport = needsSvelte
     ? `import svelte from "@astrojs/svelte";\n`
     : "";
-  const blumeImport = `import { blumeIntegration, prerenderDepsPlugin, serverAppResolvePlugin } from "blume/astro";\n`;
+  const blumeImports = [
+    "blumeIntegration",
+    "prerenderDepsPlugin",
+    "serverAppResolvePlugin",
+    ...(adapterOption.includes("withAdapterRoot") ? ["withAdapterRoot"] : []),
+  ];
+  const blumeImport = `import { ${blumeImports.join(", ")} } from "blume/astro";\n`;
 
   // Twoslash runs first, before the always-on transformers, but only on fences
   // with the `twoslash` meta (explicitTrigger) — so it's opt-in per block with
@@ -410,6 +479,18 @@ export default defineConfig({
   devToolbar: { enabled: false },
   vite: {
     plugins: [tailwindcss(), prerenderDepsPlugin(), serverAppResolvePlugin()],
+    // Mermaid (lazy-loaded client-side for diagrams) statically imports dayjs as
+    // CJS (\`dayjs/dayjs.min.js\`). In dev, an un-pre-bundled dependency is served
+    // as raw ESM, and that UMD file exposes no \`default\` export, so mermaid
+    // throws on load and diagrams render blank. Forcing mermaid through the dep
+    // optimizer bundles dayjs with correct CJS interop. In a standalone install
+    // Blume's dynamic \`import("mermaid")\` lives inside \`node_modules/blume\`,
+    // which Vite's optimizer scan doesn't crawl, so mermaid is never discovered
+    // on its own — hence the explicit include. mermaid resolves through the
+    // \`blume\` package (it isn't a direct dep of the generated project), so the
+    // nested \`blume > mermaid\` form is required. Production (Rollup) already
+    // handles the interop, so this only affects dev.
+    optimizeDeps: { include: ["blume > mermaid"] },
     // Blume's render-time deps are forced external on both build environments so
     // native bindings resolve at runtime and isolated linkers don't bundle
     // symlinked store copies (which would surface their children as unresolvable
@@ -909,10 +990,11 @@ export function getStaticPaths() {
   }));
 }
 
-export function GET({ props }) {
-  const entry = raw[props.route];
+export function GET({ props }: { props: { route: string } }) {
+  const entries = raw as Record<string, { md?: string; mdx?: string }>;
+  const entry = entries[props.route];
   return new Response(entry ? ${
-    kind === "md" ? "(entry.md ?? entry.mdx)" : "entry.mdx"
+    kind === "md" ? '(entry.md ?? entry.mdx ?? "")' : '(entry.mdx ?? "")'
   } : "", {
     headers: { "Content-Type": "text/markdown; charset=utf-8" },
   });
@@ -976,8 +1058,9 @@ export function getStaticPaths() {
   }));
 }
 
-export function GET({ props }) {
-  return new Response(feeds[props.section] ?? "", {
+export function GET({ props }: { props: { section: string } }) {
+  const bySection = feeds as Record<string, string>;
+  return new Response(bySection[props.section] ?? "", {
     headers: { "Content-Type": "application/rss+xml; charset=utf-8" },
   });
 }
@@ -989,7 +1072,7 @@ export const ogEndpointTemplate = (
 ): string =>
   `// Generated by Blume. Do not edit.
 import { renderOgImage } from "blume/og";
-import data from "../../generated/data.json";
+import data from "blume:data";
 
 export const prerender = true;
 
@@ -997,9 +1080,9 @@ export const prerender = true;
 const customRoutes = ${JSON.stringify(customRoutes)};
 
 export function getStaticPaths() {
-  const seen = new Set();
-  const paths = [];
-  const add = (slug, title) => {
+  const seen = new Set<string>();
+  const paths: { params: { slug: string }; props: { title: string } }[] = [];
+  const add = (slug: string, title: string) => {
     if (seen.has(slug)) {
       return;
     }
@@ -1032,17 +1115,19 @@ const siteHost = (() => {
   }
 })();
 
-export async function GET({ props }) {
+export async function GET({ props }: { props: { title: string } }) {
   const png = await renderOgImage({
-    accent: data.config.theme.accent.light,
+    accent: data.config.og.palette?.accent ?? data.config.theme.accent.light,
     brand: data.config.title,
     description: data.config.description,
-    logo: data.config.logo?.svg,
+    fonts: data.config.og.fonts,
+    logo: data.config.og.logo,
+    palette: data.config.og.palette,
     repo: repoSlug,
     site: siteHost,
     title: props.title,
   });
-  return new Response(png, {
+  return new Response(new Uint8Array(png), {
     headers: {
       "Cache-Control": "public, max-age=31536000, immutable",
       "Content-Type": "image/png",
@@ -1127,6 +1212,7 @@ export const catchAllPageTemplate = (options: {
   return `---
 // Generated by Blume. Do not edit.
 import { getEntry, render } from "astro:content";
+import type { CollectionKey } from "astro:content";
 import RootLayout from "blume/components/layout/RootLayout.astro";
 import { withBase } from "blume/components/islands/base-path.ts";
 import { resolveSlot } from "blume/components/layout/overrides.ts";
@@ -1170,7 +1256,7 @@ import ApiTagOperations from "blume/components/openapi/ApiTagOperations.astro";
 import Operation from "blume/components/openapi/Operation.astro";
 ${mathImport}import { mdxComponents as userMdx, layoutOverrides } from "../generated/components.ts";
 import { islandComponents } from "../generated/islands.ts";
-import data from "../generated/data.json";
+import data from "blume:data";
 
 const Color = Object.assign(ColorRoot, { Item: ColorItem, Row: ColorRow });
 const Tree = Object.assign(TreeRoot, { File: TreeFile, Folder: TreeFolder });
@@ -1239,7 +1325,7 @@ export function getStaticPaths() {
 }
 
 const { entryId, collection, route, title, indexable, editUrl, lastModified, locale, alternates, fallback } = Astro.props;
-const entry = await getEntry(collection, entryId);
+const entry = await getEntry(collection as CollectionKey, entryId);
 if (!entry) {
   return new Response(null, { status: 404 });
 }
@@ -1274,18 +1360,18 @@ const canonical =
 // Locale resolution. With i18n on, pick the active locale's nav + dictionary,
 // build hreflang alternates, and derive the language-switcher targets.
 const i18n = data.config.i18n;
-const localePrefix = (codeArg) =>
+const localePrefix = (codeArg: string) =>
   i18n && codeArg === i18n.defaultLocale && i18n.hideDefaultLocalePrefix
     ? ""
     : \`/\${codeArg}\`;
-const localizeRoute = (logical, codeArg) => {
+const localizeRoute = (logical: string, codeArg: string) => {
   const prefix = localePrefix(codeArg);
   if (!prefix) {
     return logical;
   }
   return logical === "/" ? prefix : \`\${prefix}\${logical}\`;
 };
-const stripLocale = (path, codeArg) => {
+const stripLocale = (path: string, codeArg: string) => {
   const prefix = localePrefix(codeArg);
   return prefix && path.startsWith(prefix) ? path.slice(prefix.length) || "/" : path;
 };
@@ -1302,7 +1388,7 @@ const contentLocale =
 const contentDir = i18n
   ? (i18n.locales.find((l) => l.code === contentLocale)?.dir ?? "ltr")
   : "ltr";
-const absolute = (path) => {
+const absolute = (path: string) => {
   const p = withBase(path);
   return base + (p === "/" ? "" : p);
 };
@@ -1414,14 +1500,15 @@ import Update from "blume/components/content/Update.astro";
 import { withBase } from "blume/components/islands/base-path.ts";
 import { resolveSlot } from "blume/components/layout/overrides.ts";
 import { layoutOverrides } from "../generated/components.ts";
-import data from "../generated/data.json";
+import data from "blume:data";
 
 export const prerender = true;
 
-const entryDate = (entry) =>
-  entry.data.date ?? entry.data.changelog?.date ?? null;
+const entryDate = (entry: {
+  data: { date?: string | null; changelog?: { date?: string | null } | null };
+}) => entry.data.date ?? entry.data.changelog?.date ?? null;
 
-const toTime = (value) => {
+const toTime = (value: string | null | undefined) => {
   if (!value) {
     return 0;
   }
@@ -1429,27 +1516,39 @@ const toTime = (value) => {
   return Number.isNaN(date.getTime()) ? 0 : date.getTime();
 };
 
-const formatDate = (value) => {
+// The changelog is an unlocalized route, so its chrome renders in the default
+// locale's dictionary and direction (\`data.ui\` is the default locale's resolved
+// dictionary), mirroring the catch-all's locale wiring.
+const i18n = data.config.i18n;
+const localeMeta = i18n
+  ? i18n.locales.find((l) => l.code === i18n.defaultLocale)
+  : null;
+const dir = localeMeta?.dir ?? "ltr";
+const htmlLang = i18n ? i18n.defaultLocale : "en";
+
+// Formatted in the same locale as the chrome, and in UTC, to match the
+// per-page "last updated" stamp.
+const formatDate = (value: string | null | undefined) => {
   if (!value) {
     return;
   }
   const date = new Date(value);
   return Number.isNaN(date.getTime())
     ? undefined
-    : new Intl.DateTimeFormat("en", {
+    : new Intl.DateTimeFormat(htmlLang, {
         dateStyle: "long",
         timeZone: "UTC",
       }).format(date);
 };
 
-const slugify = (text) =>
+const slugify = (text: string) =>
   text.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") ||
   "update";
 
 // The major of a version's embedded semver (\`1.2.3\` -> 1, \`pkg@2.0.0\` -> 2), or
 // null when there is no full major.minor.patch to key on. Drives the changelog's
 // group-by-major pagination, so it tolerates the scoped tags monorepos publish.
-const majorVersion = (version) => {
+const majorVersion = (version: string | null | undefined) => {
   const match = /(\\d+)\\.\\d+\\.\\d+/.exec(String(version ?? ""));
   return match ? Number(match[1]) : null;
 };
@@ -1481,7 +1580,7 @@ const items = await Promise.all(
     return {
       Content: (await render(entry)).Content,
       date: formatDate(entryDate(entry)),
-      href: routeByEntry.get(entry.id) ?? null,
+      href: routeByEntry.get(entry.id) ?? undefined,
       id: slugify(label),
       label,
       major: majorVersion(entry.data.changelog?.version),
@@ -1510,7 +1609,9 @@ for (const item of items) {
 // semver and they span more than one major line. Older majors then collapse
 // into groups the reader reveals one at a time; otherwise the timeline is flat.
 const majors = items.every((item) => item.major !== null)
-  ? [...new Set(items.map((item) => item.major))].toSorted((a, b) => b - a)
+  ? [...new Set(items.map((item) => item.major))]
+      .filter((major): major is number => major !== null)
+      .toSorted((a, b) => b - a)
   : [];
 const paginate = majors.length > 1;
 const majorGroups = majors.map((major) => ({
@@ -1531,16 +1632,6 @@ const base = data.config.site ? data.config.site.replace(/\\/$/, "") : null;
 const basedRoute = withBase("/changelog");
 const canonical = base ? base + basedRoute : null;
 
-// The changelog is an unlocalized route, so its chrome renders in the default
-// locale's dictionary and direction (\`data.ui\` is the default locale's resolved
-// dictionary), mirroring the catch-all's locale wiring.
-const i18n = data.config.i18n;
-const localeMeta = i18n
-  ? i18n.locales.find((l) => l.code === i18n.defaultLocale)
-  : null;
-const dir = localeMeta?.dir ?? "ltr";
-const htmlLang = i18n ? i18n.defaultLocale : "en";
-
 // The page chrome (h1, title, description) comes from the same translatable
 // \`changelog\` group as the reveal button; optional chaining tolerates a
 // not-yet-regenerated data snapshot from before these keys existed.
@@ -1658,7 +1749,7 @@ export const notFoundPageTemplate = (): string => `---
 // Generated by Blume. Do not edit. Override by adding \`pages/404.astro\`.
 import PageLayout from "blume/components/layout/PageLayout.astro";
 import { withBase } from "blume/components/islands/base-path.ts";
-import data from "../generated/data.json";
+import data from "blume:data";
 
 export const prerender = true;
 
@@ -1867,7 +1958,10 @@ export const getStaticPaths = () =>
   Object.keys(examples).map((path) => ({ params: { path } }));
 
 const { path } = Astro.params;
-const entry = examples[path];
+const entry = path ? examples[path] : undefined;
+if (!entry) {
+  return new Response(null, { status: 404 });
+}
 const Example = entry.Component;
 ---
 
@@ -1924,6 +2018,14 @@ declare module "blume:data" {
   export default data;
 }
 
+declare module "blume:examples" {
+  type Examples = typeof import("./generated/examples.ts").examples;
+  export const examples: Record<string, Examples[keyof Examples]>;
+  export const examplesBase: string;
+}
+
+declare module "blume:examples-theme";
+
 declare module "blume:openapi" {
   const specs: import("blume/openapi/model.ts").OpenApiData;
   export default specs;

package/src/audit/agent.ts

@@ -0,0 +1,114 @@
+import { spawn } from "node:child_process";
+import { mkdtemp, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+
+import { join } from "pathe";
+
+import { reportJson } from "./report.ts";
+import type { AuditResult } from "./run.ts";
+
+/** A coding agent CLI the audit can hand its findings to (`--claude`, `--codex`). */
+export interface AgentCli {
+  /** The executable to look up on PATH. */
+  bin: string;
+  /** How to install it, shown when the executable is missing. */
+  install: string;
+  /** Display name for messages. */
+  name: string;
+}
+
+export type AgentKind = "claude" | "codex";
+
+export const AGENTS: Record<AgentKind, AgentCli> = {
+  claude: {
+    bin: "claude",
+    install: "npm install -g @anthropic-ai/claude-code",
+    name: "Claude Code",
+  },
+  codex: {
+    bin: "codex",
+    install: "npm install -g @openai/codex",
+    name: "Codex",
+  },
+};
+
+/**
+ * Write the full JSON report where the agent can read it. A file rather than
+ * inline prompt text: a large site's report can exceed the platform's argv
+ * limit, and the JSON already carries every finding untruncated — the terminal
+ * report previews three pages per check, the file never does.
+ */
+export const writeAgentReport = async (
+  result: AuditResult,
+  root: string
+): Promise<string> => {
+  const dir = await mkdtemp(join(tmpdir(), "blume-audit-"));
+  const path = join(dir, "report.json");
+  await writeFile(path, reportJson(result, root));
+  return path;
+};
+
+/** The handoff prompt: where the report is, how to read it, and the ground rules. */
+export const fixPrompt = (reportPath: string): string =>
+  `Fix the issues found by \`blume audit\` in this project.
+
+The full audit report is at ${reportPath}. It is JSON: each entry in \`diagnostics\` is one finding, with the check \`code\`, a \`message\` explaining what is wrong, the affected page \`url\`, the source \`file\` to edit (relative to the current directory, with a \`line\` when the finding points at a specific front matter key), and a \`suggestion\` describing the fix.
+
+Work through every finding:
+1. Read the report and group the findings by \`file\`.
+2. Apply each finding's \`suggestion\` by editing the named source file — most fixes are front matter edits at the cited line.
+3. Never fix a finding by deleting a page, removing content, or hiding it from the audit; if a finding genuinely needs a human decision, leave it and say so in your summary.
+
+When you are done, run \`blume build\` and then \`blume audit\` to verify, and repeat until the audit reports no issues.`;
+
+const spawnAgent = (
+  command: string,
+  args: string[],
+  shell: boolean
+): Promise<number> =>
+  // oxlint-disable-next-line promise/avoid-new -- adapt spawn's event callbacks
+  new Promise((resolve, reject) => {
+    const child = spawn(command, args, { shell, stdio: "inherit" });
+    child.once("error", reject);
+    child.once("close", (code) => resolve(code ?? 1));
+  });
+
+/**
+ * cmd.exe reports a missing executable through this exit code instead of a
+ * spawn error, so a shell launch can't rely on the `error` event for the
+ * "not installed" diagnosis.
+ */
+export const WINDOWS_COMMAND_NOT_FOUND = 9009;
+
+/**
+ * Run the agent CLI interactively with the handoff prompt, inheriting the
+ * terminal so the user watches and steers the fixes rather than granting a
+ * headless process blanket write access. Resolves with the agent's exit code;
+ * rejects when the executable isn't on PATH.
+ *
+ * On Windows, npm installs agent CLIs as `.cmd` shims, which Node refuses to
+ * spawn without a shell — and cmd.exe cannot carry the multi-line prompt as an
+ * argument (a newline ends the command). So there the prompt is written to a
+ * file next to the report and handed over via a one-line pointer that survives
+ * cmd.exe quoting; a missing executable surfaces as
+ * {@link WINDOWS_COMMAND_NOT_FOUND} rather than a rejection.
+ */
+export const launchAgent = async (
+  bin: string,
+  prompt: string,
+  platform: NodeJS.Platform = process.platform
+): Promise<number> => {
+  if (platform !== "win32") {
+    return await spawnAgent(bin, [prompt], false);
+  }
+  const dir = await mkdtemp(join(tmpdir(), "blume-audit-"));
+  const promptPath = join(dir, "prompt.md");
+  await writeFile(promptPath, prompt);
+  // Double quotes are the one grouping cmd.exe respects; neither the temp
+  // path nor the fixed pointer text can contain one.
+  return await spawnAgent(
+    `"${bin}" "Read ${promptPath} and follow its instructions exactly."`,
+    [],
+    true
+  );
+};