@publish.os/nextjs 0.0.1-alpha.90 → 0.0.1-alpha.91

package/compiler-assets/nextjs/shims/proxy.ts

@@ -1,3 +1,7 @@
+import {
+  createNotFoundTextResponse,
+  resolveNotFoundScope,
+} from "@publish.os/nextjs/kernel/routes/not-found";
 import { agentRouteConfig } from "@source/.publishos/agent-route-config.generated";
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
@@ -6,9 +10,11 @@ const AGENT_USER_AGENT_PATTERN =
   /\b(?:axios|got|node-fetch|undici|curl|wget|python-requests|httpx|aiohttp|claude-code|claudebot|claude|cursor|chatgpt|openai|perplexity|anthropic-ai)\b/i;
 const INTERNAL_MARKDOWN_PREFIX = "/__publishos/md";
 const FRAMEWORK_PREFIX = "__PUBLISHOS_FRAMEWORK_PREFIX__";
-const PUBLIC_FILE_PATTERN = /\.[a-z0-9]{1,12}$/i;
 const TEXT_METHODS = new Set(["GET", "HEAD"]);
 const PUBLIC_PATHS = new Set<string>(agentRouteConfig.publicPaths);
+const MARKDOWN_PATHS = new Set<string>(agentRouteConfig.markdownPaths);
+const OUTPUT_PATHS = new Set<string>(agentRouteConfig.outputPaths);
+const NOT_FOUND_SCOPE_HEADER = "x-publishos-not-found-scope";
 
 function debugAgentRoute(
   event: string,
@@ -48,29 +54,6 @@ function markdownAlternatePath(pathname: string): string {
   return normalized.endsWith(".md") ? normalized : `${normalized}.md`;
 }
 
-function markdownNotFoundBody(): string {
-  const links = [
-    agentRouteConfig.discoveryLinks.home
-      ? `> Home: ${agentRouteConfig.discoveryLinks.home}`
-      : undefined,
-    agentRouteConfig.discoveryLinks.sitemap
-      ? `> Sitemap: ${agentRouteConfig.discoveryLinks.sitemap}`
-      : undefined,
-    agentRouteConfig.discoveryLinks.llms
-      ? `> LLMS index: ${agentRouteConfig.discoveryLinks.llms}`
-      : undefined,
-  ].filter((line): line is string => Boolean(line));
-
-  return [
-    "# Not found",
-    "",
-    ...links,
-    "",
-    "The requested Markdown page was not found.",
-    "",
-  ].join("\n");
-}
-
 function explicitAcceptQuality(accept: string, mimeType: string): number {
   if (!accept) return 0;
 
@@ -102,8 +85,10 @@ function explicitAcceptQuality(accept: string, mimeType: string): number {
   return bestQuality;
 }
 
-function wantsMarkdown(request: NextRequest): boolean {
-  if (!TEXT_METHODS.has(request.method)) return false;
+function negotiatedTextType(
+  request: NextRequest,
+): "text/markdown; charset=utf-8" | "text/plain; charset=utf-8" | undefined {
+  if (!TEXT_METHODS.has(request.method)) return undefined;
 
   const accept = request.headers.get("accept") ?? "";
   const markdownQuality = agentRouteConfig.markdownAccept
@@ -114,12 +99,13 @@ function wantsMarkdown(request: NextRequest): boolean {
     : 0;
   const htmlQuality = explicitAcceptQuality(accept, "text/html");
 
-  if (markdownQuality > 0 && markdownQuality >= htmlQuality) return true;
+  if (markdownQuality > 0 && markdownQuality >= htmlQuality) {
+    return "text/markdown; charset=utf-8";
+  }
   if (plainQuality > 0 && htmlQuality === 0 && markdownQuality === 0) {
-    return true;
+    return "text/plain; charset=utf-8";
   }
-
-  return false;
+  return undefined;
 }
 
 function looksLikeAgent(request: NextRequest): boolean {
@@ -141,7 +127,7 @@ function markdownRequestReason(
   ) {
     return "extension";
   }
-  if (wantsMarkdown(request)) return "accept";
+  if (negotiatedTextType(request)) return "accept";
   if (looksLikeAgent(request)) return "agent";
   return undefined;
 }
@@ -154,6 +140,7 @@ function isInternalMarkdownRoute(pathname: string): boolean {
 }
 
 function isStaticOrMetadataRoute(pathname: string): boolean {
+  if (OUTPUT_PATHS.has(normalizePagePath(pathname))) return true;
   if (
     pathname === FRAMEWORK_PREFIX ||
     pathname.startsWith(`${FRAMEWORK_PREFIX}/`) ||
@@ -175,21 +162,29 @@ function isStaticOrMetadataRoute(pathname: string): boolean {
     return true;
   }
 
-  return PUBLIC_FILE_PATTERN.test(pathname) && !pathname.endsWith(".md");
+  return false;
 }
 
-function rewriteToMarkdown(
-  request: NextRequest,
-  reason: "accept" | "agent" | "extension",
-): NextResponse {
-  const url = request.nextUrl.clone();
+function rewriteToMarkdown({
+  request,
+  reason,
+  requestHeaders,
+}: {
+  request: NextRequest;
+  reason: "accept" | "agent" | "extension";
+  requestHeaders: Headers;
+}): NextResponse {
+  const url = new URL(request.url);
   url.pathname =
     normalizePagePath(url.pathname) === "/"
       ? "/sitemap.md"
       : markdownRoutePath(url.pathname);
+  const revision = request.nextUrl.searchParams.get("publishos_revision");
+  url.search = "";
+  url.hash = "";
+  if (revision) url.searchParams.set("publishos_revision", revision);
 
-  const requestHeaders = new Headers(request.headers);
-  requestHeaders.set("x-publishos-agent-route", "markdown");
+  requestHeaders.set("accept", "text/markdown");
 
   debugAgentRoute("md", {
     accept: request.headers.get("accept") ?? undefined,
@@ -241,20 +236,28 @@ function withDiscoveryHeaders(
 
 export function proxy(request: NextRequest) {
   const { pathname } = request.nextUrl;
+  const requestHeaders = new Headers(request.headers);
+  requestHeaders.delete(NOT_FOUND_SCOPE_HEADER);
+  requestHeaders.delete("x-publishos-agent-route");
 
-  if (pathname === "/_not-found") return NextResponse.next();
+  if (pathname === "/_not-found") {
+    requestHeaders.set(NOT_FOUND_SCOPE_HEADER, "none");
+    const response = NextResponse.next({
+      request: { headers: requestHeaders },
+    });
+    response.headers.set("x-robots-tag", "noindex");
+    response.headers.set("vary", "Accept, User-Agent");
+    return response;
+  }
 
   if (isInternalMarkdownRoute(pathname)) {
-    if (request.headers.get("x-publishos-agent-route") === "markdown") {
-      return NextResponse.next();
-    }
     if (!agentRouteConfig.blockInternalMarkdownRoute) {
       debugAgentRoute("pass", {
         method: request.method,
         path: pathname,
         reason: "allowed-internal",
       });
-      return NextResponse.next();
+      return NextResponse.next({ request: { headers: requestHeaders } });
     }
 
     debugAgentRoute("md", {
@@ -264,15 +267,7 @@ export function proxy(request: NextRequest) {
       status: 404,
     });
 
-    return new Response(markdownNotFoundBody(), {
-      status: 404,
-      headers: {
-        "cache-control": "public, max-age=60, s-maxage=300",
-        "content-type": "text/markdown; charset=utf-8",
-        "x-content-type-options": "nosniff",
-        "x-robots-tag": "noindex",
-      },
-    });
+    return createNotFoundTextResponse({ method: request.method });
   }
 
   if (isStaticOrMetadataRoute(pathname)) {
@@ -281,12 +276,53 @@ export function proxy(request: NextRequest) {
       path: pathname,
       reason: "static-or-metadata",
     });
-    return NextResponse.next();
+    return NextResponse.next({ request: { headers: requestHeaders } });
   }
 
   const markdownReason = markdownRequestReason(request);
   if (markdownReason) {
-    return rewriteToMarkdown(request, markdownReason);
+    let htmlPath: string | undefined;
+    try {
+      const decoded = normalizePagePath(decodeURIComponent(pathname));
+      htmlPath = decoded.endsWith(".md")
+        ? decoded.slice(0, -3) || "/"
+        : decoded;
+    } catch {
+      htmlPath = undefined;
+    }
+    const scope = resolveNotFoundScope({
+      scopes: agentRouteConfig.notFoundScopes,
+      pathname,
+    });
+    const hasArtifact =
+      htmlPath === "/"
+        ? OUTPUT_PATHS.has("/sitemap.md")
+        : htmlPath !== undefined && MARKDOWN_PATHS.has(htmlPath);
+    if (!scope || !hasArtifact) {
+      const response = createNotFoundTextResponse({
+        scope,
+        pathname,
+        method: request.method,
+        contentType:
+          markdownReason === "accept" ? negotiatedTextType(request) : undefined,
+        vary: markdownReason !== "extension",
+      });
+      if (!agentRouteConfig.enabled || !agentRouteConfig.discoveryHeaders) {
+        for (const name of [
+          "link",
+          "x-publishos-llms",
+          "x-publishos-sitemap",
+        ]) {
+          response.headers.delete(name);
+        }
+      }
+      return response;
+    }
+    return rewriteToMarkdown({
+      request,
+      reason: markdownReason,
+      requestHeaders,
+    });
   }
 
   let pagePath: string;
@@ -296,10 +332,37 @@ export function proxy(request: NextRequest) {
     pagePath = pathname;
   }
   if (!PUBLIC_PATHS.has(pagePath)) {
-    // Use Next's static 404 before an unknown catch-all reaches error recovery.
-    const url = request.nextUrl.clone();
+    // Select Next's error route before an unknown catch-all can stream.
+    const scope = resolveNotFoundScope({
+      scopes: agentRouteConfig.notFoundScopes,
+      pathname,
+    });
+    requestHeaders.set(NOT_FOUND_SCOPE_HEADER, scope?.id ?? "none");
+    const url = new URL(request.url);
     url.pathname = "/_not-found";
-    return NextResponse.rewrite(url, { status: 404 });
+    url.search = "";
+    url.hash = "";
+    const response = NextResponse.rewrite(url, {
+      status: 404,
+      request: { headers: requestHeaders },
+    });
+    const recoveryHeaders = createNotFoundTextResponse({
+      scope,
+      pathname,
+      method: request.method,
+      vary: true,
+    }).headers;
+    for (const name of [
+      "x-robots-tag",
+      "vary",
+      ...(agentRouteConfig.enabled && agentRouteConfig.discoveryHeaders
+        ? ["link", "x-publishos-llms", "x-publishos-sitemap"]
+        : []),
+    ]) {
+      const value = recoveryHeaders.get(name);
+      if (value) response.headers.set(name, value);
+    }
+    return response;
   }
 
   if (!agentRouteConfig.enabled || !agentRouteConfig.discoveryHeaders) {
@@ -310,7 +373,7 @@ export function proxy(request: NextRequest) {
         ? "discovery-disabled"
         : "agent-routes-disabled",
     });
-    return NextResponse.next();
+    return NextResponse.next({ request: { headers: requestHeaders } });
   }
 
   debugAgentRoute("html", {
@@ -321,7 +384,10 @@ export function proxy(request: NextRequest) {
     userAgent: request.headers.get("user-agent") ?? undefined,
   });
 
-  return withDiscoveryHeaders(NextResponse.next(), pathname);
+  return withDiscoveryHeaders(
+    NextResponse.next({ request: { headers: requestHeaders } }),
+    pathname,
+  );
 }
 
 export const config = {

package/compiler-assets/nextjs/shims/site-fenced-code-block.tsx

@@ -1,9 +1,5 @@
 import { CodeBlock } from "@components/mdx/code-block";
-import {
-  type ComponentPropsWithoutRef,
-  isValidElement,
-  type ReactNode,
-} from "react";
+import { type HTMLAttributes, isValidElement, type ReactNode } from "react";
 
 type CodeChildProps = {
   children?: ReactNode;
@@ -15,7 +11,7 @@ export function FencedCodeBlock({
   children,
   title,
   ...props
-}: ComponentPropsWithoutRef<"pre">) {
+}: HTMLAttributes<HTMLElement>) {
   const codeElement = isValidElement<CodeChildProps>(children)
     ? children
     : null;

package/compiler-assets/nextjs/shims/site-mdx-components.tsx

@@ -37,51 +37,63 @@ const VideoComponent = (sourceMedia.video ??
 const FigureComponent = (sourceMedia.figure ??
   PublishOsFigure) as typeof PublishOsFigure;
 
-function resolveMediaAsset(src: unknown): ResolvedMediaAsset | undefined {
-  if (typeof src !== "string" || !src.startsWith("/assets/")) return undefined;
-  return mediaManifest.assets[src as keyof typeof mediaManifest.assets] as
-    | ResolvedMediaAsset
-    | undefined;
+function getMediaMetadata(src: unknown): ResolvedMediaAsset | undefined {
+  if (typeof src !== "string") return undefined;
+  const pathname = src.split(/[?#]/u, 1)[0];
+  if (!pathname?.startsWith("/publishos/assets/")) return undefined;
+  return Object.values(
+    mediaManifest.assets as Record<string, ResolvedMediaAsset>,
+  ).find((asset) => asset.outputPath === pathname);
+}
+
+function authoredDimension(value: unknown): number | undefined {
+  if (typeof value === "number") return value;
+  if (typeof value !== "string" || !/^\d+$/u.test(value)) return undefined;
+  const dimension = Number(value);
+  return Number.isSafeInteger(dimension) && dimension > 0
+    ? dimension
+    : undefined;
 }
 
 function Link(props: LinkProps) {
-  const asset = resolveMediaAsset(props.href);
+  const asset = getMediaMetadata(props.href);
   const shouldDownload =
     asset?.mediaType === "document" || asset?.mediaType === "file";
   return (
     <LinkComponent
       {...props}
       download={props.download ?? (shouldDownload ? "" : undefined)}
-      href={asset?.outputPath ?? props.href}
+      href={props.href}
     />
   );
 }
 
 function Image(props: ImageProps) {
-  const asset = resolveMediaAsset(props.src);
+  const asset = getMediaMetadata(props.src);
+  const width = authoredDimension(props.width);
+  const height = authoredDimension(props.height);
   return (
     <ImageComponent
       {...props}
       aspect={props.aspect ?? asset?.aspect}
-      height={props.height ?? asset?.height}
+      height={height ?? asset?.height}
       intrinsicHeight={asset?.intrinsicHeight ?? asset?.height}
       intrinsicWidth={asset?.intrinsicWidth ?? asset?.width}
-      optimized={asset?.optimized}
-      src={asset?.outputPath ?? props.src}
-      width={props.width ?? asset?.width}
+      optimized={props.optimized ?? asset?.optimized}
+      src={props.src}
+      width={width ?? asset?.width}
     />
   );
 }
 
 function Video(props: VideoProps) {
-  const asset = resolveMediaAsset(props.src);
-  const poster = resolveMediaAsset(props.poster);
+  const asset = getMediaMetadata(props.src);
   return (
     <VideoComponent
       {...props}
       height={props.height ?? asset?.height}
-      poster={poster?.outputPath ?? props.poster}
-      src={asset?.outputPath ?? props.src}
+      poster={props.poster}
+      src={props.src}
       width={props.width ?? asset?.width}
     />
   );

package/compiler-assets/nextjs/shims/site-mdx.tsx

@@ -1,12 +1,17 @@
 import type { MDXProps } from "@publish.os/nextjs/mdx/mdx";
 import { renderMdx } from "@publish.os/nextjs/mdx/mdx";
 import { mdxComponents } from "@source/_internal/mdx-components.generated";
+import { importedMdxComponents } from "@source/_internal/mdx-icon-components.generated";
 
 export type { MDXComponents, MDXProps } from "@publish.os/nextjs/mdx/mdx";
 export { Figure, Image, Link, Video } from "@publish.os/nextjs/mdx/mdx";
 
 export async function MDX(props: MDXProps) {
-  return renderMdx({ ...props, siteComponents: mdxComponents });
+  return renderMdx({
+    ...props,
+    siteComponents: mdxComponents,
+    importedComponents: importedMdxComponents[props.page.path],
+  });
 }
 
 Object.defineProperty(MDX, "__publishOsMdx", { value: true });

package/dist/{build-operation-2JAYBSKF.js → build-operation-5QMLXF7N.js}

@@ -1,30 +1,30 @@
+import {
+  approveLocalComposition,
+  installLocalApp
+} from "./chunk-4BC2L2KA.js";
+import {
+  withLocalOperation
+} from "./chunk-IL4RJOKI.js";
 import {
   prepareIdeSupport
-} from "./chunk-UF6ATARM.js";
+} from "./chunk-GBPLER5H.js";
+import "./chunk-6D2E6UMD.js";
 import {
   composeFrameworkSource
-} from "./chunk-H6XILMZX.js";
+} from "./chunk-OXOFRXEI.js";
 import {
   validateLocalSource
-} from "./chunk-VO2I7MTM.js";
-import "./chunk-726GV2NF.js";
-import "./chunk-NECL5IBJ.js";
-import "./chunk-535TM4A5.js";
-import {
-  approveLocalComposition
-} from "./chunk-SVYGXXYR.js";
-import {
-  withLocalOperation
-} from "./chunk-B2V22WRT.js";
-import {
-  installLocalApp
-} from "./chunk-WKTEO6RS.js";
-import "./chunk-GGKFQ3MA.js";
-import "./chunk-DLDFHU7Y.js";
-import "./chunk-7OGTPSKI.js";
-import "./chunk-YLTOLYWM.js";
+} from "./chunk-ORIUWJBQ.js";
+import "./chunk-NNBJZPFM.js";
+import "./chunk-F3AGNDF4.js";
+import "./chunk-7NY22B5U.js";
+import "./chunk-UYGCOWRF.js";
+import "./chunk-EFO6AWXN.js";
+import "./chunk-5KAD7W53.js";
+import "./chunk-WL75GQ5M.js";
 import "./chunk-AI2UULNX.js";
-import "./chunk-WDY4IK6Z.js";
+import "./chunk-5J3YUNRY.js";
+import "./chunk-22RSSUNV.js";
 
 // src/lib/compiler/lifecycle/build-operation.ts
 async function runLocalBuild(options) {
@@ -40,10 +40,10 @@ async function runLocalBuild(options) {
         sourceRoot: lifetime.sourceRoot
       });
       return await approveLocalComposition({ options }), options.request.context?.ide && await prepareIdeSupport({
+        frameworkOptions: { ...options, signal: lifetime.signal },
         publishOsDir: lifetime.sourceRoot,
         source,
-        framework,
-        frameworkOptions: { ...options, signal: lifetime.signal }
+        framework
       }), await lifetime.replaceOutput(async (outputDir) => {
         await composeFrameworkSource({
           request: {
@@ -62,7 +62,13 @@ async function runLocalBuild(options) {
           },
           source,
           signal: lifetime.signal,
-          onProgress: (message) => options.onEvent?.({ type: "progress", message })
+          onProgress: (message) => options.onEvent?.({ type: "progress", message }),
+          onWarning: (warning) => options.onEvent?.({
+            type: "diagnostics",
+            diagnostics: {
+              diagnostics: [{ ...warning, severity: "warning" }]
+            }
+          })
         });
         let app = await installLocalApp({
           outputDir,

package/dist/{button-c3WGnxIj.d.ts → button-BdCScEKi.d.ts}

@@ -3,9 +3,9 @@ import { VariantProps } from 'class-variance-authority';
 import { ReactNode, ComponentPropsWithRef } from 'react';
 
 declare const buttonVariants: (props?: ({
-    variant?: "solid" | "soft" | "outline" | "ghost" | null | undefined;
-    size?: "xs" | "sm" | "md" | "lg" | "xl" | null | undefined;
-    iconOnly?: boolean | null | undefined;
+    readonly variant?: "solid" | "soft" | "outline" | "ghost" | null | undefined;
+    readonly size?: "xs" | "sm" | "md" | "lg" | "xl" | null | undefined;
+    readonly iconOnly?: boolean | null | undefined;
 } & class_variance_authority_types.ClassProp) | undefined) => string;
 type ButtonVariantProps = VariantProps<typeof buttonVariants>;
 type ButtonProps = {