npm - blume - Versions diffs - 1.0.1 → 1.0.3 - Mend

blume 1.0.1 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/CHANGELOG.md +18 -0
package/dist/cli/index.js +87 -57
package/dist/cli/index.js.map +16 -15
package/dist/types/core/config-input.d.ts +17 -14
package/dist/types/core/config.d.ts +3 -3
package/dist/types/core/schema.d.ts +82 -34
package/dist/types/core/trim.d.ts +16 -0
package/docs/advanced/custom-pages.mdx +2 -0
package/docs/configuration/ai.mdx +6 -4
package/docs/configuration/index.mdx +6 -8
package/docs/content/components.mdx +25 -3
package/package.json +1 -1
package/src/ai/agent-readability.ts +3 -3
package/src/ai/mcp/data.ts +2 -2
package/src/ai/mcp/discovery.ts +2 -1
package/src/astro/generate.ts +15 -7
package/src/astro/templates.ts +52 -25
package/src/blume-modules.d.ts +6 -0
package/src/components/layout/Header.astro +15 -2
package/src/components/layout/PageLayout.astro +15 -10
package/src/components/layout/ReferenceLayout.astro +9 -10
package/src/components/layout/RootLayout.astro +14 -10
package/src/components/layout/head-scripts.ts +20 -10
package/src/core/base-path.ts +4 -4
package/src/core/config-input.ts +18 -19
package/src/core/config.ts +3 -3
package/src/core/schema.ts +15 -14
package/src/core/server-features.ts +1 -1
package/src/core/trim.ts +32 -0
package/src/deploy/adapter-output.ts +11 -1
package/src/openapi/references.ts +4 -6
package/src/registry/eject.ts +11 -5

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,23 @@
 # blume
+## 1.0.3
+### Patch Changes
+- e2f902c: Render the Ask AI trigger from the shared header instead of wiring it up per page. Custom pages built on `PageLayout` (a landing page, most of all) never passed the header's `ask` slot, so the Ask AI button — and the search modal's hand-off to it — silently went missing on them while the generated docs, changelog, and reference pages had it. The header now owns the trigger and reads whether Ask AI is on from the config, so every page gets it; pass `askEnabled={false}` to opt a page out.
+- 66b721b: Move the MCP server config under `ai` in `blume.config.ts`, alongside the other agent-facing features. Rename `mcp: { … }` to `ai: { mcp: { … } }` — the shape of the block is unchanged.
+- c8ae77e: Fix `ERR_MODULE_NOT_FOUND` in a deployed server function. Surfacing an adapter's deploy bundle out of `.blume` resolved every traced dependency's symlink against the source dir, so the links pointed into a directory the same step then deleted — the function died on its first external import (`Cannot find package '@orama/orama'` with Ask AI or the MCP server enabled). The bundle is now copied verbatim, leaving those links relative and internal to it.
+## 1.0.2
+### Patch Changes
+- d62dbd0: Harden the pre-paint inline scripts and the route-normalizing regexes against the issues CodeQL flagged.
+  The theme and banner scripts in `<head>` used to be built by interpolating config values into JavaScript source with `JSON.stringify`. JSON escaping isn't a code-context escape — `</script>` and U+2028/U+2029 pass straight through it — so a crafted `banner.id` or theme value could break out of the script. Both scripts are now constants and take their values from `data-*` attributes on their own `<script>` tag, which Astro HTML-escapes. `ReferenceLayout` had drifted to its own inline copies of both scripts; it now shares the same module as `RootLayout` and `PageLayout`.
+  Route and slug normalization used `/^\/+|\/+$/`-style patterns to trim leading and trailing separators. Those take quadratic time on a long run of the trimmed character, and they run on values that come from outside Blume (configured routes, OpenAPI spec URLs, the site origin), so a pathological config could hang the build. They're replaced by linear trimming helpers in `core/trim.ts`; behavior is unchanged.
 ## 1.0.1
 ### Patch Changes

package/dist/cli/index.js CHANGED Viewed

@@ -536,7 +536,7 @@ var normalizeBasePath = (input) => {
   if (!input) {
     return "";
   }
-  const trimmed = input.trim().replaceAll(/^\/+|\/+$/gu, "").replaceAll(/\/{2,}/gu, "/");
+  const trimmed = input.trim().split("/").filter(Boolean).join("/");
   return trimmed === "" ? "" : `/${trimmed}`;
 };
 var isInternalPath = (target) => target.startsWith("/") && !target.startsWith("//");
@@ -676,10 +676,10 @@ var buildAgentReadability = (project) => {
     artifacts.llmsFullTxt = abs("/llms-full.txt");
     artifacts.llmsTxt = abs("/llms.txt");
   }
-  if (config.mcp.enabled) {
+  if (config.ai.mcp.enabled) {
     artifacts.mcp = {
       discovery: abs("/.well-known/mcp.json"),
-      url: abs(config.mcp.route)
+      url: abs(config.ai.mcp.route)
     };
   }
   if (config.ai.ask?.enabled) {
@@ -697,7 +697,7 @@ var buildAgentReadability = (project) => {
     artifacts,
     description: config.description,
     generator: version ? `blume@${version}` : undefined,
-    name: config.mcp.name ?? config.title,
+    name: config.ai.mcp.name ?? config.title,
     site
   };
   const usage = usagePolicy(config.seo.contentSignals);
@@ -1225,7 +1225,7 @@ var serverFeatures = (config) => {
   if (config.ai.ask?.enabled) {
     features.push("Ask AI");
   }
-  if (config.mcp.enabled) {
+  if (config.ai.mcp.enabled) {
     features.push("MCP server");
   }
   if (searchProviderMeta(config.search.provider).requiresServer) {
@@ -1269,7 +1269,7 @@ var surfaceAdapterOutput = async (config, context) => {
   }
   await mkdir2(dirname4(to), { recursive: true });
   await rm(to, { force: true, recursive: true });
-  await cp(from, to, { recursive: true });
+  await cp(from, to, { recursive: true, verbatimSymlinks: true });
   await rm(from, { force: true, recursive: true });
   return { from, ignore: `${rel.split("/")[0]}/`, moved: true, to };
 };
@@ -4117,8 +4117,8 @@ var buildMcpData = async (project) => {
       route: doc.route,
       title: doc.title
     })),
-    instructions: config.mcp.instructions,
-    name: config.mcp.name ?? config.title,
+    instructions: config.ai.mcp.instructions,
+    name: config.ai.mcp.name ?? config.title,
     navigation: graph.navigation,
     pages,
     routes,
@@ -4127,6 +4127,23 @@ var buildMcpData = async (project) => {
   };
 };
+// src/core/trim.ts
+var trimStart = (text, char) => {
+  let start = 0;
+  while (start < text.length && text[start] === char) {
+    start += 1;
+  }
+  return text.slice(start);
+};
+var trimEnd = (text, char) => {
+  let end = text.length;
+  while (end > 0 && text[end - 1] === char) {
+    end -= 1;
+  }
+  return text.slice(0, end);
+};
+var trimChar = (text, char) => trimEnd(trimStart(text, char), char);
 // src/ai/mcp/tools.ts
 var READ_ONLY = { openWorldHint: false, readOnlyHint: true };
 var MCP_TOOLS = [
@@ -4159,7 +4176,7 @@ var MCP_TOOLS = [
 // src/ai/mcp/discovery.ts
 var serverUrl = (input) => {
   const path = withBasePath(input.base, input.route);
-  return input.site ? `${input.site.replace(/\/+$/u, "")}${path}` : path;
+  return input.site ? `${trimEnd(input.site, "/")}${path}` : path;
 };
 var buildMcpDiscovery = (input) => ({
   servers: [
@@ -4829,17 +4846,14 @@ import { isAbsolute as isAbsolute5, join as join16, resolve as resolve5 } from "
 // src/openapi/references.ts
 var NON_SLUG = /[^a-z0-9]+/gu;
-var SLUG_EDGES = /^-+|-+$/gu;
-var ROUTE_EDGES = /^\/+|\/+$/gu;
-var TRAILING_SLASH = /\/+$/u;
-var slugify = (text) => text.toLowerCase().replace(NON_SLUG, "-").replace(SLUG_EDGES, "");
+var slugify = (text) => trimChar(text.toLowerCase().replace(NON_SLUG, "-"), "-");
 var normalizeRoute = (route) => {
   const trimmed = route.trim();
   const withSlash = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
-  const noTrailing = withSlash.replace(TRAILING_SLASH, "");
+  const noTrailing = trimEnd(withSlash, "/");
   return noTrailing === "" ? "/" : noTrailing;
 };
-var routeSlug = (route) => slugify(route.replace(ROUTE_EDGES, "")) || "reference";
+var routeSlug = (route) => slugify(trimChar(route, "/")) || "reference";
 var sourcesOf = (block) => {
   const sources = [...block.sources];
   if (block.spec) {
@@ -5010,8 +5024,8 @@ var loadWithCache = async (name, cache, fetchEntries, refresh = true) => {
 // src/openapi/model.ts
 var NON_SLUG2 = /[^a-z0-9]+/gu;
-var SLUG_EDGES2 = /^-+|-+$/gu;
-var slugify2 = (text) => text.toLowerCase().replace(NON_SLUG2, "-").replace(SLUG_EDGES2, "");
+var SLUG_EDGES = /^-+|-+$/gu;
+var slugify2 = (text) => text.toLowerCase().replace(NON_SLUG2, "-").replace(SLUG_EDGES, "");
 var HTTP_METHODS = [
   "get",
   "put",
@@ -6363,6 +6377,12 @@ var askAiProviders = [
   "inkeep",
   "openai-compatible"
 ];
+var mcpConfigSchema = z2.strictObject({
+  enabled: z2.boolean().default(false),
+  instructions: z2.string().optional(),
+  name: z2.string().optional(),
+  route: z2.string().default("/mcp").transform(normalizeRoute)
+});
 var aiConfigSchema = z2.strictObject({
   ask: z2.strictObject({
     apiKeyEnv: z2.string().optional(),
@@ -6392,7 +6412,8 @@ var aiConfigSchema = z2.strictObject({
   ]).default(true).transform((value) => typeof value === "boolean" ? { enabled: value, openapi: true } : value),
   markdownComponents: z2.record(z2.string(), z2.custom((value) => typeof value === "function", {
     message: "Expected a serializer function."
-  })).default({})
+  })).default({}),
+  mcp: mcpConfigSchema.default({})
 });
 var featuredLinkSchema = z2.strictObject({
   href: z2.string(),
@@ -6419,12 +6440,6 @@ var exportConfigSchema = z2.union([
     pdf: z2.boolean().default(false)
   })
 ]).transform((value) => typeof value === "boolean" ? { epub: value, pdf: value } : value);
-var mcpConfigSchema = z2.strictObject({
-  enabled: z2.boolean().default(false),
-  instructions: z2.string().optional(),
-  name: z2.string().optional(),
-  route: z2.string().default("/mcp").transform(normalizeRoute)
-});
 var localeSchema = z2.strictObject({
   code: z2.string().min(1),
   dir: z2.enum(["ltr", "rtl"]).default("ltr"),
@@ -6611,7 +6626,6 @@ var blumeConfigSchema = z2.strictObject({
   lastModified: lastModifiedConfigSchema.default(false),
   logo: logoConfigSchema.optional(),
   markdown: markdownConfigSchema.default({}),
-  mcp: mcpConfigSchema.default({}),
   navigation: navigationConfigSchema.default({}),
   openapi: openapiConfigSchema.default({}),
   react: reactConfigSchema.default({}),
@@ -7734,6 +7748,7 @@ var reactIntegration = (compilerPath) => compilerPath ? `react({ babel: { plugin
 var astroConfigTemplate = (options) => {
   const { context, config, needsReact, pages, dataPath, themePath } = options;
   const {
+    askPath,
     contentRoutes,
     examplesPath,
     examplesThemePath,
@@ -7853,6 +7868,7 @@ export default defineConfig({
     },
     resolve: {
       alias: {
+        "blume:ask": ${JSON.stringify(askPath)},
         "blume:data": ${JSON.stringify(dataPath)},
         "blume:examples": ${JSON.stringify(examplesPath)},
         "blume:examples-theme": ${JSON.stringify(examplesThemePath)},
@@ -8024,6 +8040,22 @@ ${setup}
 ${handler}
 `;
 };
+var askComponentTemplate = (askEnabled) => askEnabled ? `---
+// Generated by Blume. Do not edit.
+import AskAI from "blume/components/islands/AskAI.astro";
+import data from "blume:data";
+const { strings } = Astro.props;
+---
+<AskAI strings={strings ?? data.ui.ask} suggestions={data.config.ask?.suggestions ?? []} />
+` : `---
+// Generated by Blume. Do not edit.
+// Ask AI is off (\`ai.ask.enabled\`), so the header's Ask trigger renders nothing.
+// Deliberately imports no React island, keeping the JSX renderer out of projects
+// that don't need it.
+---
+`;
 var searchEndpointTemplate = () => `// Generated by Blume. Do not edit.
 import documents from "../generated/search.json";
@@ -8153,12 +8185,9 @@ export function GET({ props }) {
   });
 }
 `;
-var mcpPageFile = (route) => {
-  const clean = route.replace(/^\/+/u, "").replace(/\/+$/u, "");
-  return `${clean}.ts`;
-};
+var mcpPageFile = (route) => `${trimChar(route, "/")}.ts`;
 var mcpEndpointTemplate = (route) => {
-  const clean = route.replace(/^\/+/u, "").replace(/\/+$/u, "");
+  const clean = trimChar(route, "/");
   const up = "../".repeat(clean.split("/").length);
   return `// Generated by Blume. Do not edit.
 import type { APIRoute } from "astro";
@@ -8306,10 +8335,6 @@ const htmlLang = i18n ? i18n.defaultLocale : "en";
 </ReferenceLayout>
 `;
 var catchAllPageTemplate = (options) => {
-  const askImport = options.askEnabled ? `import AskAI from "blume/components/islands/AskAI.astro";
-` : "";
-  const askSlot = options.askEnabled ? `
-  <AskAI slot="ask" strings={ui.ask} suggestions={data.config.ask?.suggestions ?? []} />` : "";
   const mathImport = options.mathEnabled ? `import Math from "blume/components/content/Math.astro";
 ` : "";
   const mathEntry = options.mathEnabled ? `Math,
@@ -8322,7 +8347,6 @@ import { getEntry, render } 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";
-${askImport}
 import Accordion from "blume/components/content/Accordion.astro";
 import AccordionItem from "blume/components/content/AccordionItem.astro";
 import AutoTypeTable from "blume/components/content/AutoTypeTable.astro";
@@ -8559,7 +8583,6 @@ const LayoutComponent = resolveSlot(layoutOverrides.Layout, RootLayout);
   canonical={canonical}
   editUrl={editUrl}
   feedback={data.config.feedback}
-  askEnabled={${options.askEnabled}}
   exportPdf={${options.exportPdf}}
   exportEpub={${options.exportEpub}}
   feeds={data.feeds}
@@ -8569,7 +8592,7 @@ const LayoutComponent = resolveSlot(layoutOverrides.Layout, RootLayout);
   lastModified={lastModified}
   noindex={seo.noindex}
   structuredDataEnabled={data.config.structuredData}
->${askSlot}
+>
   <h1>{title}</h1>
   {frontmatter.description && <p class="text-lg text-muted-foreground">{frontmatter.description}</p>}
   <Content components={components} />
@@ -8577,10 +8600,6 @@ const LayoutComponent = resolveSlot(layoutOverrides.Layout, RootLayout);
 `;
 };
 var changelogIndexTemplate = (options) => {
-  const askImport = options.askEnabled ? `import AskAI from "blume/components/islands/AskAI.astro";
-` : "";
-  const askSlot = options.askEnabled ? `
-  <AskAI slot="ask" strings={data.ui.ask} suggestions={data.config.ask?.suggestions ?? []} />` : "";
   const clientData = options.needsReact ? `
   clientData={{ config: data.config, navigation: data.navigation, page: { route: "/changelog", title: pageTitle } }}` : "";
   const stagedSpread = options.staged ? `
@@ -8593,7 +8612,7 @@ 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";
-${askImport}import data from "../generated/data.json";
+import data from "../generated/data.json";
 export const prerender = true;
@@ -8762,14 +8781,13 @@ const LayoutComponent = resolveSlot(layoutOverrides.Layout, RootLayout);
   ogImage={null}
   x={data.config.x}
   canonical={canonical}
-  askEnabled={${options.askEnabled}}
   exportPdf={${options.exportPdf}}
   exportEpub={${options.exportEpub}}
   feeds={data.feeds}
   siteUrl={data.config.site}
   noindex={false}
   structuredDataEnabled={data.config.structuredData}
->${askSlot}
+>
   <h1>{changelogTitle}</h1>
   {
     items.length === 0 ? (
@@ -8989,6 +9007,11 @@ const Example = entry.Component;
 var envTemplate = () => `/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
+declare module "blume:ask" {
+  const Ask: typeof import("blume/components/islands/AskAI.astro").default;
+  export default Ask;
+}
 declare module "blume:data" {
   const data: import("blume").BlumeData;
   export default data;
@@ -9095,9 +9118,9 @@ ${dark}`;
 // src/openapi/scalar.ts
 var URL_SPEC2 = /^https?:\/\//u;
-var ROUTE_EDGES2 = /^\/+|\/+$/gu;
+var ROUTE_EDGES = /^\/+|\/+$/gu;
 var referencePagePath = (route) => {
-  const segments = route.replace(ROUTE_EDGES2, "");
+  const segments = route.replace(ROUTE_EDGES, "");
   return `${segments === "" ? "index" : segments}.astro`;
 };
 var darkModeConfig = (mode) => {
@@ -10536,7 +10559,10 @@ var buildRuntimeData = (project) => {
       } : null,
       imageZoom: config.markdown.imageZoom,
       logo: resolveLogo(project),
-      mcp: config.mcp.enabled ? { name: config.mcp.name ?? config.title, route: config.mcp.route } : null,
+      mcp: config.ai.mcp.enabled ? {
+        name: config.ai.mcp.name ?? config.title,
+        route: config.ai.mcp.route
+      } : null,
       og: { enabled: config.seo.og.enabled ?? false },
       repoUrl,
       search: {
@@ -10580,7 +10606,7 @@ var buildRuntimeData = (project) => {
 };
 var planMcp = (project, srcDir, userPages) => {
   const { config } = project;
-  const { route } = config.mcp;
+  const { route } = config.ai.mcp;
   const dir = join22(srcDir, "blume-mcp");
   const base = {
     dir,
@@ -10590,14 +10616,14 @@ var planMcp = (project, srcDir, userPages) => {
     srcDir,
     warnings: []
   };
-  if (!config.mcp.enabled) {
+  if (!config.ai.mcp.enabled) {
     return base;
   }
   if (routeIsTaken(userPages, project.graph.pages, route)) {
     return {
       ...base,
       warnings: [
-        `MCP server route "${route}" is already used by a content or custom page; the MCP server was not generated. Set a different "mcp.route" in blume.config.ts.`
+        `MCP server route "${route}" is already used by a content or custom page; the MCP server was not generated. Set a different "ai.mcp.route" in blume.config.ts.`
       ]
     };
   }
@@ -10666,6 +10692,7 @@ var generateRuntime = async (project) => {
   const { context, config } = project;
   const out = context.outDir;
   const srcDir = join22(out, "src");
+  const askPath = join22(srcDir, "generated", "Ask.astro");
   const dataPath = join22(srcDir, "generated", "data.json");
   const themePath = join22(srcDir, "generated", "app.css");
   const searchClientPath = join22(srcDir, "generated", "search-client.ts");
@@ -10724,6 +10751,7 @@ var generateRuntime = async (project) => {
     Promise.all([
       write(join22(out, "astro.config.mjs"), astroConfigTemplate({
         aliases: resolveTsconfigAliases(context.root),
+        askPath,
         config,
         contentRoutes: project.manifest.routes.map((route) => route.path),
         context,
@@ -10750,12 +10778,12 @@ var generateRuntime = async (project) => {
         staged: hasStaged
       })),
       write(join22(srcDir, "pages", "[...slug].astro"), catchAllPageTemplate({
-        askEnabled,
         exportEpub,
         exportPdf,
         mathEnabled: usesMath,
         needsReact
       })),
+      write(askPath, askComponentTemplate(askEnabled)),
       write(join22(srcDir, "generated", "components.ts"), slotPlan.module),
       write(join22(srcDir, "generated", "islands.ts"), islandMapTemplate(islandDiscovery.islands)),
       write(join22(srcDir, "generated", "examples.ts"), exampleMapTemplate(exampleDiscovery.examples, config.basePath)),
@@ -10785,7 +10813,6 @@ var generateRuntime = async (project) => {
   }
   if (hasGeneratedChangelog(project, pages)) {
     await write(join22(srcDir, "pages", "changelog.astro"), changelogIndexTemplate({
-      askEnabled,
       exportEpub,
       exportPdf,
       needsReact,
@@ -12520,7 +12547,7 @@ var askFiles = async (project, srcDir, genDir) => {
   }
   return files;
 };
-var hostsMcp = (project, userPages) => project.config.mcp.enabled && !routeIsTaken(userPages, project.graph.pages, project.config.mcp.route);
+var hostsMcp = (project, userPages) => project.config.ai.mcp.enabled && !routeIsTaken(userPages, project.graph.pages, project.config.ai.mcp.route);
 var mcpDiscoveryPages = (project, userPages) => hostsMcp(project, userPages) ? [
   {
     entrypoint: "src/blume-mcp/discovery.ts",
@@ -12535,7 +12562,7 @@ var mcpFiles = async (project, userPages, srcDir, genDir) => {
   if (!hostsMcp(project, userPages)) {
     return [];
   }
-  const { route } = project.config.mcp;
+  const { route } = project.config.ai.mcp;
   const data = await buildMcpData(project);
   const discoveryInput = {
     base: data.base,
@@ -12638,6 +12665,7 @@ var eject = async (root) => {
   const files = [
     {
       content: astroConfigTemplate({
+        askPath: "./src/generated/Ask.astro",
         config,
         contentRoutes: project.manifest.routes.map((route) => route.path),
         context: relContext,
@@ -12671,7 +12699,6 @@ var eject = async (root) => {
     },
     {
       content: catchAllPageTemplate({
-        askEnabled,
         exportEpub,
         exportPdf,
         mathEnabled: usesMath,
@@ -12712,6 +12739,10 @@ var eject = async (root) => {
       path: join27(genDir, "app.css")
     },
     { content: buildRuntimeData(project), path: join27(genDir, "data.json") },
+    {
+      content: askComponentTemplate(askEnabled),
+      path: join27(genDir, "Ask.astro")
+    },
     {
       content: `${JSON.stringify(ejectOpenApiData(project))}
 `,
@@ -12741,7 +12772,6 @@ var eject = async (root) => {
     });
   }
   files.push(...await mcpFiles(project, pages, srcDir, genDir), ...changelogFiles(project, pages, srcDir, {
-    askEnabled,
     exportEpub,
     exportPdf,
     needsReact,
@@ -13836,5 +13866,5 @@ process.on("unhandledRejection", (error) => {
 });
 runMain(main);
-//# debugId=066FB7264FFC708364756E2164756E21
+//# debugId=C36C25DD63079AEA64756E2164756E21
 //# sourceMappingURL=index.js.map