@ampless/runtime 0.2.0-alpha.1 → 0.2.0-alpha.11

package/README.ja.md

@@ -0,0 +1,86 @@
+> English: [README.md](./README.md)
+> 
+
+# @ampless/runtime
+
+[ampless](https://github.com/heavymoons/ampless) 向けパブリックサイドランタイム。投稿取得クライアント、サイト設定、テーマ解決、SEO メタデータ集約、ミドルウェア、パブリックルートハンドラーを `createAmpless()` ひとつのファクトリーにまとめます。
+
+> **プレリリース / アルファ版。** v1.0 まではマイナーバージョンでも破壊的変更が入る可能性があります。
+
+テンプレートから切り出すことで、スキャフォールドされたファイルに触れずに `npm update @ampless/runtime` でアップデートできます — パブリックサイトの動作改善はスキャフォールダーの再実行ではなく、パッケージを通じて届きます。
+
+## インストール
+
+```bash
+npm install @ampless/runtime@alpha ampless@alpha
+```
+
+`@ampless/runtime` は `next`（15+）、`react`（18/19）、`aws-amplify`（6+）、`@aws-amplify/adapter-nextjs`（1+）をピア依存として宣言します。CLI スキャフォールダーがテンプレートの `package.json` に互換バージョンをピン留めします。
+
+## 使い方
+
+テンプレートは `lib/ampless.ts` に共有インスタンスを 1 つ作成します：
+
+```ts
+import outputs from '../amplify_outputs.json'
+import cmsConfig from '../cms.config'
+import { themes, DEFAULT_THEME } from '../themes-registry'
+import { createAmpless } from '@ampless/runtime'
+
+export const ampless = createAmpless({
+  outputs,
+  cmsConfig,
+  themes: { themes, defaultTheme: DEFAULT_THEME },
+})
+```
+
+`app/site/[siteId]/` 以下のルートとディスパッチャーはワンライナーのファクトリー呼び出しになります：
+
+```ts
+// app/site/[siteId]/page.tsx
+import { ampless } from '@/lib/ampless'
+import {
+  createThemeHomeDispatcher,
+  createThemeHomeMetadata,
+} from '@ampless/runtime/dispatchers'
+
+export const dynamic = 'force-dynamic'
+export const generateMetadata = createThemeHomeMetadata(ampless)
+export default createThemeHomeDispatcher(ampless)
+```
+
+```ts
+// app/site/[siteId]/og/[slug]/route.ts
+import { ampless } from '@/lib/ampless'
+import { createOgRouteHandler } from '@ampless/runtime/routes'
+
+export const runtime = 'nodejs'
+export const dynamic = 'force-dynamic'
+export const GET = createOgRouteHandler(ampless)
+```
+
+ミドルウェア：
+
+```ts
+// middleware.ts
+import cmsConfig from './cms.config'
+import { createAmplessMiddleware, defaultMatcherConfig } from '@ampless/runtime/middleware'
+
+export const middleware = createAmplessMiddleware({ cmsConfig })
+export const config = defaultMatcherConfig
+```
+
+## サブパス
+
+- `@ampless/runtime` — `createAmpless`、ランタイム型、`renderBody`・`renderThemeCss`・フォーマットコンバーターの再エクスポート
+- `@ampless/runtime/middleware` — `createAmplessMiddleware`、`defaultMatcherConfig`
+- `@ampless/runtime/routes` — `createOgRouteHandler`、`createSitemapRouteHandler`、`createFeedRouteHandler`、`createRawRouteHandler`
+- `@ampless/runtime/dispatchers` — `createThemeHomeDispatcher`、`createThemePostDispatcher`、`createThemeTagDispatcher`（それぞれ対応する `*Metadata` ファクトリーあり）
+
+## テンプレートに残るもの
+
+管理側モジュール（投稿プロバイダー、テーマアクション、認証、KV 書き込み）とテーマコンポーネントはスキャフォールドに残ります。これらは後のリリースで `@ampless/admin` に移行する予定です。それまでは、これらのファイルへの変更はユーザーのプロジェクト内で行ってください。
+
+## ライセンス
+
+MIT

package/README.md

@@ -1,3 +1,6 @@
+> 日本語版: [README.ja.md](./README.ja.md)
+> 
+
 # @ampless/runtime
 
 Public-side runtime for [ampless](https://github.com/heavymoons/ampless). Bundles the post-fetching client, site settings, theme resolution, SEO metadata aggregation, middleware, and public route handlers behind a single `createAmpless()` factory.

package/dist/dispatchers/index.d.ts

@@ -1,3 +1,4 @@
+import { ReactNode } from 'react';
 import { Metadata } from 'next';
 import { Ampless } from '../index.js';
 import 'ampless';
@@ -7,16 +8,12 @@ interface Props$2 {
         siteId: string;
     }>;
 }
-type ThemeHomeDispatcher = (props: Props$2) => Promise<unknown>;
+type ThemeHomeDispatcher = (props: Props$2) => Promise<ReactNode>;
 type ThemeHomeMetadata = (props: Props$2) => Promise<Metadata>;
 /**
  * Home page dispatcher. Resolves the active theme for the request's
  * siteId and renders the theme's `components.Home` server component
  * with the same `params` Promise it was passed.
- *
- * The return type is `unknown` (cast at the route boundary) because
- * Next.js page-component prop types vary by route shape and the
- * underlying theme components are arbitrary server components.
  */
 declare function createThemeHomeDispatcher(ampless: Ampless): ThemeHomeDispatcher;
 /** generateMetadata factory for the home dispatcher. */
@@ -28,12 +25,28 @@ interface Props$1 {
         slug: string;
     }>;
 }
-type ThemePostDispatcher = (props: Props$1) => Promise<unknown>;
+type ThemePostDispatcher = (props: Props$1) => Promise<ReactNode>;
 type ThemePostMetadata = (props: Props$1) => Promise<Metadata>;
 /**
  * Post page dispatcher. Resolves the active theme and renders the
- * theme's `components.Post` server component. If the theme doesn't
- * declare a Post component, returns Next.js's notFound() (404).
+ * theme's `components.Post` server component.
+ *
+ * Before delegating, the dispatcher peeks at the post's metadata: if
+ * `metadata.no_layout === true`, the post is meant to be served as
+ * bare HTML (own DOCTYPE, no theme chrome, no Next.js root layout).
+ * Next.js page.tsx can't bypass the root layout, so we 308-redirect
+ * to the raw route handler at `/raw/<slug>` which returns the body
+ * unchanged. The redirect is permanent because no_layout is a
+ * persistent property of the post — bookmarks naturally settle on
+ * the `/raw/` URL.
+ *
+ * The metadata peek is an extra AppSync call before theme resolve,
+ * but it's the same query the theme's Post component would make
+ * anyway; AppSync's query-level dedupe within a single request keeps
+ * the wire cost flat in practice.
+ *
+ * If the theme doesn't declare a Post component at all, returns
+ * Next.js's notFound() (404).
  */
 declare function createThemePostDispatcher(ampless: Ampless): ThemePostDispatcher;
 /** generateMetadata factory for the post dispatcher. */
@@ -45,7 +58,7 @@ interface Props {
         tag: string;
     }>;
 }
-type ThemeTagDispatcher = (props: Props) => Promise<unknown>;
+type ThemeTagDispatcher = (props: Props) => Promise<ReactNode>;
 type ThemeTagMetadata = (props: Props) => Promise<Metadata>;
 /**
  * Tag page dispatcher. Resolves the active theme and renders the

package/dist/dispatchers/index.js

@@ -17,10 +17,19 @@ function createThemeHomeMetadata(ampless) {
 }
 
 // src/dispatchers/post.ts
-import { notFound } from "next/navigation";
+import { notFound, redirect } from "next/navigation";
 function createThemePostDispatcher(ampless) {
   return async function SitePostDispatcher({ params }) {
-    const { siteId } = await params;
+    const { siteId, slug } = await params;
+    const post = await ampless.getPublishedPost(slug, { siteId });
+    if (post?.metadata?.no_layout === true) {
+      redirect(`/raw/${slug}`);
+    }
+    if (post?.format === "static") {
+      const body = post.body ?? null;
+      const entrypoint = typeof body?.entrypoint === "string" && body.entrypoint ? body.entrypoint : "index.html";
+      redirect(`/${slug}/${entrypoint}`);
+    }
     const { module } = await ampless.resolveActiveTheme(siteId);
     const Post = module.components.Post;
     if (!Post) notFound();

package/dist/index.d.ts

@@ -34,6 +34,7 @@ interface PublicPostShape {
     status?: string | null;
     publishedAt?: string | null;
     tags?: Array<string | null> | null;
+    metadata?: unknown;
 }
 interface PublicPostConnectionShape {
     items?: Array<PublicPostShape | null> | null;
@@ -108,6 +109,22 @@ interface ThemeActiveApi {
     resolveActiveTheme(siteId?: string): Promise<ResolvedTheme>;
 }
 
+type ColorScheme = 'auto' | 'light' | 'dark';
+declare const DEFAULT_COLOR_SCHEME: ColorScheme;
+/**
+ * Storage key for the per-site color-scheme override. Lives under the
+ * same `theme.*` namespace as manifest fields so it flows through the
+ * existing KvStore → S3 cache pipeline, but is read separately from
+ * the manifest field set (it's a site-wide concern, not theme-specific).
+ */
+declare const COLOR_SCHEME_SETTING_KEY = "theme.colorScheme";
+/**
+ * Narrow an arbitrary stored value to a known `ColorScheme`. Anything
+ * unrecognised (including `undefined`, malformed strings, accidental
+ * objects) falls back to `'auto'` so a typo never strands a site
+ * forced into a mode it can't undo.
+ */
+declare function validateColorScheme(raw: unknown): ColorScheme;
 interface EffectiveThemeConfig {
     /** Resolved active theme name (e.g. 'blog'). */
     activeTheme: string;
@@ -116,6 +133,16 @@ interface EffectiveThemeConfig {
     values: Record<string, string>;
     /** Subset of `values` for fields that have a `cssVar`. */
     cssVars: Record<string, string>;
+    /**
+     * Per-site color-scheme override. `'auto'` (default) lets the
+     * visitor's system `prefers-color-scheme` decide; `'light'` /
+     * `'dark'` pin one mode regardless of system preference.
+     *
+     * Consumed by the root layout to set `<html data-color-scheme>`,
+     * which the theme tokens.css files key off in combination with the
+     * `light-dark()` CSS function.
+     */
+    colorScheme: ColorScheme;
 }
 interface ThemeConfigApi {
     loadThemeConfig(siteId?: string): Promise<EffectiveThemeConfig>;
@@ -132,32 +159,42 @@ declare function renderBody(post: Post): string;
  * Convert a tiptap doc to its HTML form. Same renderer the public
  * site uses. Defensive: tiptap accepts an HTML string as initial
  * content and parses it on mount, but won't fire onUpdate until the
- * user edits — so a format-switch chain (e.g. markdown → tiptap →
+ * user edits, so a format-switch chain (e.g. markdown -> tiptap ->
  * markdown without editing) can still hand us a raw HTML string
  * here. In that case, return it as-is rather than walking it as a
  * malformed tiptap node and producing empty output.
  */
 declare function tiptapToHtml(doc: unknown): string;
-/** Convert markdown to HTML using the built-in minimal renderer. */
+/** Convert markdown to HTML using marked + GFM. */
 declare function markdownToHtml(md: string): string;
 /**
  * Walk a tiptap doc and emit Markdown. Mirrors `renderTiptap` in
  * shape but produces markdown syntax. Loses anything markdown can't
  * express (data attributes, image display modes, custom marks).
  *
+ * Notes on info loss:
+ * - underline / highlight are not in GFM, so they fall back to the
+ *   literal `<u>` / `<mark>` HTML tags (preserved as-is across round trips).
+ * - paragraph / heading textAlign cannot be expressed in markdown and
+ *   is therefore lost on conversion.
+ *
  * Same defensive path as tiptapToHtml: a string input means tiptap
  * hasn't emitted JSON yet (the body is still the HTML we handed it).
  * Route through htmlToMarkdown so the content survives.
  */
 declare function tiptapToMarkdown(doc: unknown): string;
 /**
- * Regex-based HTML → Markdown converter. Handles the tag set the
+ * Regex-based HTML -> Markdown converter. Handles the tag set the
  * editor produces (`<p>` `<h1>`-`<h6>` `<strong>` `<em>` `<a>`
  * `<img>` `<ul>` `<ol>` `<li>` `<code>` `<pre>` `<blockquote>` `<hr>`
- * `<br>`). Anything else (tables, sections, divs) keeps its content
- * but loses structural meaning.
+ * `<br>` `<u>` `<mark>` `<table>` task-list `<ul data-type="taskList">`).
+ * Decorative containers like `<div style="text-align:...">` are dropped.
+ *
+ * Tables are reduced to GFM pipe syntax via convertHtmlTable. Complex
+ * nested content inside cells (lists, other tables) is flattened to
+ * plain text.
  *
- * Not a full library — there are known limits like nested formatting
+ * Not a full library, there are known limits like nested formatting
  * inside list items potentially merging. Acceptable for a v0.x
  * format-switch convenience; complex HTML round-trips shouldn't be
  * relied on.
@@ -203,4 +240,4 @@ interface Ampless {
  */
 declare function createAmpless(opts: CreateAmplessOpts): Ampless;
 
-export { type Ampless, type AmplessOutputs, type CreateAmplessOpts, type DataOutput, type EffectiveSiteSettings, type EffectiveThemeConfig, type ListPostsByTagOptions, type ListPostsOptions, type ListPostsResult, type PostsApi, type PublicPostConnectionShape, type PublicPostShape, type ResolvedTheme, type SeoApi, type SiteSettingsApi, type StorageOutput, type ThemeActiveApi, type ThemeConfigApi, type ThemesRegistry, createAmpless, htmlToMarkdown, markdownToHtml, renderBody, renderThemeCss, tiptapToHtml, tiptapToMarkdown };
+export { type Ampless, type AmplessOutputs, COLOR_SCHEME_SETTING_KEY, type ColorScheme, type CreateAmplessOpts, DEFAULT_COLOR_SCHEME, type DataOutput, type EffectiveSiteSettings, type EffectiveThemeConfig, type ListPostsByTagOptions, type ListPostsOptions, type ListPostsResult, type PostsApi, type PublicPostConnectionShape, type PublicPostShape, type ResolvedTheme, type SeoApi, type SiteSettingsApi, type StorageOutput, type ThemeActiveApi, type ThemeConfigApi, type ThemesRegistry, createAmpless, htmlToMarkdown, markdownToHtml, renderBody, renderThemeCss, tiptapToHtml, tiptapToMarkdown, validateColorScheme };

package/dist/index.js

@@ -20,13 +20,11 @@ function createStorage(outputs) {
 // src/posts.ts
 import { cookies } from "next/headers";
 import { generateServerClientUsingCookies } from "@aws-amplify/adapter-nextjs/api";
-function decodeBody(value) {
-  if (typeof value !== "string") return value;
-  try {
-    return JSON.parse(value);
-  } catch {
-    return value;
-  }
+import { decodeAwsJson } from "ampless";
+function decodeMetadata(value) {
+  if (value === null || value === void 0) return void 0;
+  const parsed = decodeAwsJson(value);
+  return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : void 0;
 }
 function toCorePost(p) {
   return {
@@ -36,10 +34,11 @@ function toCorePost(p) {
     title: p.title,
     excerpt: p.excerpt ?? void 0,
     format: p.format ?? "markdown",
-    body: decodeBody(p.body),
+    body: decodeAwsJson(p.body),
     status: p.status ?? "draft",
     publishedAt: p.publishedAt ?? void 0,
-    tags: (p.tags ?? []).filter((t) => typeof t === "string")
+    tags: (p.tags ?? []).filter((t) => typeof t === "string"),
+    metadata: decodeMetadata(p.metadata)
   };
 }
 function createPostsApi(outputs) {
@@ -227,6 +226,12 @@ import {
   resolveThemeValues,
   themeSettingKey
 } from "ampless";
+var DEFAULT_COLOR_SCHEME = "auto";
+var COLOR_SCHEME_SETTING_KEY = "theme.colorScheme";
+function validateColorScheme(raw) {
+  if (raw === "light" || raw === "dark" || raw === "auto") return raw;
+  return DEFAULT_COLOR_SCHEME;
+}
 function createThemeConfig(themeActive, storage) {
   async function fetchRemote(siteId) {
     if (!storage.isStorageConfigured()) return null;
@@ -256,7 +261,8 @@ function createThemeConfig(themeActive, storage) {
       }
       const values = resolveThemeValues(manifest, stored);
       const cssVars = collectCssVars(manifest.fields, values);
-      return { activeTheme: active.name, manifest, values, cssVars };
+      const colorScheme = validateColorScheme(flat?.[COLOR_SCHEME_SETTING_KEY]);
+      return { activeTheme: active.name, manifest, values, cssVars, colorScheme };
     }
   };
 }
@@ -279,9 +285,17 @@ ${lines.join("\n")}
 }
 
 // src/rendering.ts
+import { marked } from "marked";
 function escape(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function textAlignStyle(attrs) {
+  const v = attrs?.textAlign;
+  if (v === "left" || v === "center" || v === "right" || v === "justify") {
+    return ` style="text-align: ${v}"`;
+  }
+  return "";
+}
 function renderTiptap(node) {
   if (node.type === "text") {
     let html = escape(node.text ?? "");
@@ -290,6 +304,8 @@ function renderTiptap(node) {
       else if (mark.type === "italic") html = `<em>${html}</em>`;
       else if (mark.type === "code") html = `<code>${html}</code>`;
       else if (mark.type === "strike") html = `<s>${html}</s>`;
+      else if (mark.type === "underline") html = `<u>${html}</u>`;
+      else if (mark.type === "highlight") html = `<mark>${html}</mark>`;
       else if (mark.type === "link") {
         const href = escape(String(mark.attrs?.href ?? "#"));
         html = `<a href="${href}" target="_blank" rel="noopener">${html}</a>`;
@@ -302,10 +318,10 @@ function renderTiptap(node) {
     case "doc":
       return children;
     case "paragraph":
-      return `<p>${children}</p>`;
+      return `<p${textAlignStyle(node.attrs)}>${children}</p>`;
     case "heading": {
       const level = Number(node.attrs?.level ?? 1);
-      return `<h${level}>${children}</h${level}>`;
+      return `<h${level}${textAlignStyle(node.attrs)}>${children}</h${level}>`;
     }
     case "bulletList":
       return `<ul>${children}</ul>`;
@@ -330,52 +346,39 @@ function renderTiptap(node) {
       const display = node.attrs?.display ? ` data-display="${escape(String(node.attrs.display))}"` : "";
       return `<img src="${src}" alt="${alt}"${title}${display} loading="lazy" />`;
     }
+    case "table":
+      return `<table class="tiptap-table"><tbody>${children}</tbody></table>`;
+    case "tableRow":
+      return `<tr>${children}</tr>`;
+    case "tableHeader":
+      return `<th${tableCellAttrs(node.attrs)}>${children}</th>`;
+    case "tableCell":
+      return `<td${tableCellAttrs(node.attrs)}>${children}</td>`;
+    case "taskList":
+      return `<ul data-type="taskList">${children}</ul>`;
+    case "taskItem": {
+      const checked = node.attrs?.checked === true ? "true" : "false";
+      return `<li data-type="taskItem" data-checked="${checked}">${children}</li>`;
+    }
     default:
       return children;
   }
 }
-function renderMarkdown(md) {
-  const lines = md.split("\n");
-  const out = [];
-  let i = 0;
-  while (i < lines.length) {
-    const line = lines[i] ?? "";
-    if (line.startsWith("# ")) {
-      out.push(`<h1>${escape(line.slice(2))}</h1>`);
-      i++;
-    } else if (line.startsWith("## ")) {
-      out.push(`<h2>${escape(line.slice(3))}</h2>`);
-      i++;
-    } else if (line.startsWith("```")) {
-      const lang = line.slice(3).trim();
-      const code = [];
-      i++;
-      while (i < lines.length && !(lines[i] ?? "").startsWith("```")) {
-        code.push(lines[i] ?? "");
-        i++;
-      }
-      i++;
-      out.push(
-        `<pre><code${lang ? ` class="language-${escape(lang)}"` : ""}>${escape(code.join("\n"))}</code></pre>`
-      );
-    } else if (line.startsWith("- ")) {
-      const items = [];
-      while (i < lines.length && (lines[i] ?? "").startsWith("- ")) {
-        items.push(`<li>${renderInlineMarkdown((lines[i] ?? "").slice(2))}</li>`);
-        i++;
-      }
-      out.push(`<ul>${items.join("")}</ul>`);
-    } else if (line.trim() === "") {
-      i++;
-    } else {
-      out.push(`<p>${renderInlineMarkdown(line)}</p>`);
-      i++;
-    }
+function tableCellAttrs(attrs) {
+  let out = "";
+  const colspan = Number(attrs?.colspan ?? 1);
+  if (colspan > 1) out += ` colspan="${colspan}"`;
+  const rowspan = Number(attrs?.rowspan ?? 1);
+  if (rowspan > 1) out += ` rowspan="${rowspan}"`;
+  const colwidth = attrs?.colwidth;
+  if (Array.isArray(colwidth) && colwidth.length > 0) {
+    const w = Number(colwidth[0]);
+    if (Number.isFinite(w) && w > 0) out += ` style="width: ${w}px"`;
   }
-  return out.join("\n");
+  return out;
 }
-function renderInlineMarkdown(text) {
-  return text.replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>");
+function renderMarkdown(md) {
+  return marked.parse(md, { gfm: true, breaks: false, async: false });
 }
 function renderBody(post) {
   if (post.format === "html") return String(post.body);
@@ -406,6 +409,8 @@ function tiptapNodeToMarkdown(node) {
       else if (mark.type === "italic") txt = `*${txt}*`;
       else if (mark.type === "code") txt = `\`${txt}\``;
       else if (mark.type === "strike") txt = `~~${txt}~~`;
+      else if (mark.type === "underline") txt = `<u>${txt}</u>`;
+      else if (mark.type === "highlight") txt = `<mark>${txt}</mark>`;
       else if (mark.type === "link") txt = `[${txt}](${String(mark.attrs?.href ?? "#")})`;
     }
     return txt;
@@ -443,12 +448,54 @@ function tiptapNodeToMarkdown(node) {
       const alt = String(node.attrs?.alt ?? "");
       return `![${alt}](${src})`;
     }
+    case "table":
+      return tiptapTableToMarkdown(node);
+    case "taskList":
+      return children + "\n";
+    case "taskItem": {
+      const checked = node.attrs?.checked === true ? "x" : " ";
+      const inner = children.replace(/\n+$/, "");
+      const [first, ...rest] = inner.split("\n");
+      const cont = rest.map((l) => l ? "  " + l : l).join("\n");
+      return `- [${checked}] ${first ?? ""}${cont ? "\n" + cont : ""}
+`;
+    }
     default:
       return children;
   }
 }
+function tiptapTableToMarkdown(node) {
+  const rows = node.content ?? [];
+  if (rows.length === 0) return "";
+  const renderedRows = [];
+  let headerIdx = -1;
+  for (let i = 0; i < rows.length; i++) {
+    const row = rows[i];
+    const cells = row.content ?? [];
+    const cellTexts = cells.map((c) => {
+      const inner = (c.content ?? []).map(tiptapNodeToMarkdown).join("");
+      return inner.replace(/\n+$/, "").replace(/\n/g, "<br>").replace(/\|/g, "\\|");
+    });
+    renderedRows.push(cellTexts);
+    if (headerIdx === -1 && cells.some((c) => c.type === "tableHeader")) headerIdx = i;
+  }
+  if (headerIdx === -1) headerIdx = 0;
+  const header = renderedRows[headerIdx] ?? [];
+  const body = renderedRows.filter((_, i) => i !== headerIdx);
+  const cols = header.length;
+  const headerLine = "| " + header.join(" | ") + " |";
+  const sepLine = "| " + Array.from({ length: cols }, () => "---").join(" | ") + " |";
+  const bodyLines = body.map((r) => {
+    const cells = Array.from({ length: cols }, (_, i) => r[i] ?? "");
+    return "| " + cells.join(" | ") + " |";
+  });
+  return "\n" + [headerLine, sepLine, ...bodyLines].join("\n") + "\n\n";
+}
 function htmlToMarkdown(html) {
   let md = html;
+  md = md.replace(/<table[^>]*>([\s\S]*?)<\/table>/gi, (_, inner) => {
+    return "\n" + convertHtmlTable(String(inner)) + "\n";
+  });
   md = md.replace(/<h([1-6])[^>]*>([\s\S]*?)<\/h\1>/gi, (_, level, text) => {
     return "\n" + "#".repeat(Number(level)) + " " + String(text).trim() + "\n\n";
   });
@@ -461,6 +508,9 @@ function htmlToMarkdown(html) {
   md = md.replace(/<blockquote[^>]*>([\s\S]*?)<\/blockquote>/gi, (_, content) => {
     return "\n" + String(content).trim().split("\n").map((l) => "> " + l).join("\n") + "\n\n";
   });
+  md = md.replace(/<ul[^>]*data-type="taskList"[^>]*>([\s\S]*?)<\/ul>/gi, (_, items) => {
+    return "\n" + convertHtmlTaskList(String(items)) + "\n";
+  });
   md = md.replace(/<ul[^>]*>([\s\S]*?)<\/ul>/gi, (_, items) => {
     return "\n" + String(items).replace(/<li[^>]*>([\s\S]*?)<\/li>/gi, "- $1\n") + "\n";
   });
@@ -480,11 +530,63 @@ function htmlToMarkdown(html) {
   md = md.replace(/<(em|i)>([\s\S]*?)<\/\1>/gi, "*$2*");
   md = md.replace(/<s>([\s\S]*?)<\/s>/gi, "~~$1~~");
   md = md.replace(/<code>([\s\S]*?)<\/code>/gi, "`$1`");
+  const PH_U_OPEN = "AMP_U_OPEN";
+  const PH_U_CLOSE = "AMP_U_CLOSE";
+  const PH_MARK_OPEN = "AMP_MARK_OPEN";
+  const PH_MARK_CLOSE = "AMP_MARK_CLOSE";
+  md = md.replace(/<u>([\s\S]*?)<\/u>/gi, `${PH_U_OPEN}$1${PH_U_CLOSE}`);
+  md = md.replace(/<mark>([\s\S]*?)<\/mark>/gi, `${PH_MARK_OPEN}$1${PH_MARK_CLOSE}`);
   md = md.replace(/<\/?[^>]+>/g, "");
+  md = md.split(PH_U_OPEN).join("<u>").split(PH_U_CLOSE).join("</u>").split(PH_MARK_OPEN).join("<mark>").split(PH_MARK_CLOSE).join("</mark>");
   md = md.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ");
   md = md.replace(/\n{3,}/g, "\n\n");
   return md.trim() + "\n";
 }
+function convertHtmlTable(inner) {
+  const stripped = inner.replace(/<\/?(thead|tbody)[^>]*>/gi, "");
+  const rowRe = /<tr[^>]*>([\s\S]*?)<\/tr>/gi;
+  const rows = [];
+  let m;
+  while ((m = rowRe.exec(stripped)) !== null) {
+    const rowHtml = m[1] ?? "";
+    const cellRe = /<(th|td)[^>]*>([\s\S]*?)<\/\1>/gi;
+    const cells = [];
+    let isHeader = false;
+    let cm;
+    while ((cm = cellRe.exec(rowHtml)) !== null) {
+      if ((cm[1] ?? "").toLowerCase() === "th") isHeader = true;
+      cells.push(normalizeTableCell(cm[2] ?? ""));
+    }
+    if (cells.length > 0) rows.push({ isHeader, cells });
+  }
+  if (rows.length === 0) return "";
+  let headerIdx = rows.findIndex((r) => r.isHeader);
+  if (headerIdx === -1) headerIdx = 0;
+  const header = rows[headerIdx].cells;
+  const body = rows.filter((_, i) => i !== headerIdx).map((r) => r.cells);
+  const cols = header.length;
+  const headerLine = "| " + header.join(" | ") + " |";
+  const sepLine = "| " + Array.from({ length: cols }, () => "---").join(" | ") + " |";
+  const bodyLines = body.map((cells) => {
+    const padded = Array.from({ length: cols }, (_, i) => cells[i] ?? "");
+    return "| " + padded.join(" | ") + " |";
+  });
+  return [headerLine, sepLine, ...bodyLines].join("\n") + "\n";
+}
+function normalizeTableCell(html) {
+  return html.replace(/<br\s*\/?>/gi, " ").replace(/<\/?[^>]+>/g, "").replace(/\|/g, "\\|").replace(/\s+/g, " ").trim();
+}
+function convertHtmlTaskList(items) {
+  const liRe = /<li[^>]*data-checked="(true|false)"[^>]*>([\s\S]*?)<\/li>/gi;
+  const out = [];
+  let m;
+  while ((m = liRe.exec(items)) !== null) {
+    const checked = m[1] === "true" ? "x" : " ";
+    const inner = String(m[2] ?? "").replace(/<\/?p[^>]*>/gi, "").trim();
+    out.push(`- [${checked}] ${inner}`);
+  }
+  return out.join("\n");
+}
 
 // src/index.ts
 function createAmpless(opts) {
@@ -520,11 +622,14 @@ function createAmpless(opts) {
   };
 }
 export {
+  COLOR_SCHEME_SETTING_KEY,
+  DEFAULT_COLOR_SCHEME,
   createAmpless,
   htmlToMarkdown,
   markdownToHtml,
   renderBody,
   renderThemeCss,
   tiptapToHtml,
-  tiptapToMarkdown
+  tiptapToMarkdown,
+  validateColorScheme
 };

package/dist/middleware.d.ts

@@ -10,25 +10,37 @@ type MiddlewareFn = (request: NextRequest) => NextResponse;
  *
  *  - hostname → siteId resolution (multi-site rewrites)
  *  - `/path` → `/site/<siteId>/path` internal rewrite
- *  - `<slug>.html` → `/site/<siteId>/raw/<slug>.html` (bare HTML route)
  *  - `?previewTheme=<name>` → `x-preview-theme` header forwarding
  *  - `Cache-Control: private, no-store` in multi-site mode (Amplify
  *    Hosting's CloudFront cache key doesn't include Host, so SSR
  *    responses would cross-contaminate at the same path)
  *
+ * No-layout / bare-HTML routing is data-driven: the theme post
+ * dispatcher reads `post.metadata.no_layout` and redirects to
+ * `/raw/<slug>` when set. The plain prefix-prepend below picks up
+ * that path because the raw route lives at
+ * `app/site/<siteId>/raw/<slug>/route.ts` — no special middleware
+ * branch is needed.
+ *
  * The factory captures the multi-site flag at construction time so the
  * hot path stays a pair of cheap header lookups.
  */
 declare function createAmplessMiddleware({ cmsConfig }: CreateMiddlewareOpts): MiddlewareFn;
 /**
- * Default Next.js middleware matcher config. Exposed as a constant so
- * templates can re-export it directly:
+ * Reference matcher config — admin / api / login / static assets /
+ * amplify_outputs.json are excluded so middleware doesn't rewrite
+ * legitimate non-blog routes into the public site tree.
  *
- *     export const config = defaultMatcherConfig
+ * **You can't re-export this directly.** Next.js 16's Turbopack
+ * requires `export const config` in `proxy.ts` (or `middleware.ts`)
+ * to be a statically analysable object literal — referencing an
+ * imported variable fails the build with:
+ *   "Next.js can't recognize the exported `config` field in route.
+ *    It needs to be a static object."
  *
- * Excludes admin / api / login / static assets / amplify_outputs.json
- * — without these exclusions middleware would rewrite legitimate
- * non-blog routes into the public site tree.
+ * So the scaffold inlines the matcher into the user's `proxy.ts`.
+ * This export is kept as a reference for documentation and for
+ * non-Next.js callers that want to inspect the canonical matcher.
  */
 declare const defaultMatcherConfig: {
     matcher: string[];

package/dist/middleware.js

@@ -1,7 +1,6 @@
 // src/middleware.ts
 import { NextResponse } from "next/server";
 import { resolveSiteId, isMultiSite } from "ampless";
-var RAW_HTML_PATH_RE = /^\/([^/]+\.html)$/;
 function createAmplessMiddleware({ cmsConfig }) {
   const MULTI_SITE = isMultiSite(cmsConfig);
   return function middleware(request) {
@@ -12,18 +11,15 @@ function createAmplessMiddleware({ cmsConfig }) {
     }
     const url = request.nextUrl.clone();
     if (!url.pathname.startsWith("/site/")) {
-      const rawMatch = RAW_HTML_PATH_RE.exec(url.pathname);
-      if (rawMatch) {
-        url.pathname = `/site/${siteId}/raw/${rawMatch[1]}`;
-      } else {
-        const tail = url.pathname === "/" ? "" : url.pathname;
-        url.pathname = `/site/${siteId}${tail}`;
-      }
+      const tail = url.pathname === "/" ? "" : url.pathname;
+      url.pathname = `/site/${siteId}${tail}`;
     }
     const previewTheme = url.searchParams.get("previewTheme");
+    const previewColorScheme = url.searchParams.get("previewColorScheme");
     const requestHeaders = new Headers(request.headers);
     requestHeaders.set("x-site-id", siteId);
     if (previewTheme) requestHeaders.set("x-preview-theme", previewTheme);
+    if (previewColorScheme) requestHeaders.set("x-preview-color-scheme", previewColorScheme);
     const response = NextResponse.rewrite(url, { request: { headers: requestHeaders } });
     response.headers.set("x-site-id", siteId);
     if (MULTI_SITE) {

package/dist/routes/index.d.ts

@@ -2,21 +2,21 @@ import { Ampless } from '../index.js';
 import 'ampless';
 import 'next';
 
-interface Ctx$3 {
+interface Ctx$4 {
     params: Promise<{
         siteId: string;
         slug: string;
     }>;
 }
-type OgRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
+type OgRouteHandler = (req: Request, ctx: Ctx$4) => Promise<Response>;
 declare function createOgRouteHandler(ampless: Ampless): OgRouteHandler;
 
-interface Ctx$2 {
+interface Ctx$3 {
     params: Promise<{
         siteId: string;
     }>;
 }
-type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
+type SitemapRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
 /**
  * Sitemap route delegate. Looks up the active theme for the request's
  * siteId and forwards to whichever `routes.sitemap` handler the theme
@@ -24,12 +24,12 @@ type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
  */
 declare function createSitemapRouteHandler(ampless: Ampless): SitemapRouteHandler;
 
-interface Ctx$1 {
+interface Ctx$2 {
     params: Promise<{
         siteId: string;
     }>;
 }
-type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
+type FeedRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
 /**
  * Feed route delegate. Looks up the active theme for the request's
  * siteId and forwards to whichever `routes.feed` handler the theme
@@ -37,21 +37,24 @@ type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
  */
 declare function createFeedRouteHandler(ampless: Ampless): FeedRouteHandler;
 
-interface Ctx {
+interface Ctx$1 {
     params: Promise<{
         siteId: string;
         slug: string;
     }>;
 }
-type RawRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
+type RawRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
 /**
  * Bare HTML route. Returns the published post's rendered body as the
  * entire HTTP response — no Next.js root layout, no theme chrome.
  *
- * Reached via the slug-suffix convention: middleware rewrites
- * `/<slug>.html` → `/site/<siteId>/raw/<slug>.html`. The post is
- * looked up by the full slug (including the `.html` part), so what
- * the admin types in the slug field IS the URL.
+ * Reached via the data-driven dispatcher path: the theme post page
+ * checks `post.metadata.no_layout` and redirects to `/raw/<slug>` when
+ * set. Posts without that flag never hit this route in practice; the
+ * handler additionally enforces the same check here so a direct
+ * `/raw/<slug>` request can't bypass the theme for a post that wasn't
+ * marked no-layout (would otherwise surface the body without any
+ * chrome the editor didn't intend).
  *
  * Why this is a route handler (not a page): Next.js's root layout
  * always emits `<html>` / `<head>` / `<body>`, which means a normal
@@ -74,4 +77,37 @@ type RawRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
  */
 declare function createRawRouteHandler(ampless: Ampless): RawRouteHandler;
 
-export { type FeedRouteHandler, type OgRouteHandler, type RawRouteHandler, type SitemapRouteHandler, createFeedRouteHandler, createOgRouteHandler, createRawRouteHandler, createSitemapRouteHandler };
+interface Ctx {
+    params: Promise<{
+        siteId: string;
+        path: string[];
+    }>;
+}
+type StaticRouteHandler = (req: Request, ctx: Ctx) => Promise<Response>;
+/**
+ * Catch-all route for static bundles. Lives at
+ * `app/site/[siteId]/[...path]/route.ts` and serves every file
+ * inside a `format: 'static'` post's bundle. The first segment of
+ * `path` is the post slug; the rest is the relative path inside the
+ * bundle (or empty, in which case the manifest's entrypoint is used).
+ *
+ * Routing precedence: Next.js prefers the more specific
+ * `[siteId]/[slug]/page.tsx` for single-segment URLs, so this catch-all
+ * only fires when path.length >= 2. The post dispatcher detects
+ * `format === 'static'` and 308-redirects to `/<slug>/<entrypoint>`
+ * so the catch-all picks up from there.
+ *
+ * Single-segment requests (`/<siteId>/<slug>`) that somehow do reach
+ * here are 308-redirected to add a trailing slash, which is what makes
+ * relative paths in the bundle resolve correctly in the browser.
+ *
+ * Implementation: generate a short-lived presigned URL for the S3
+ * object and 302-redirect to it. Same model as `/api/media/[...path]`
+ * — keeps the bucket private while letting CloudFront cache the 302
+ * for the Cache-Control window. The presigned URL itself expires in
+ * an hour; the 302 cache is 5 minutes so re-issued presigns stay
+ * fresh.
+ */
+declare function createStaticRouteHandler(ampless: Ampless): StaticRouteHandler;
+
+export { type FeedRouteHandler, type OgRouteHandler, type RawRouteHandler, type SitemapRouteHandler, type StaticRouteHandler, createFeedRouteHandler, createOgRouteHandler, createRawRouteHandler, createSitemapRouteHandler, createStaticRouteHandler };

package/dist/routes/index.js

@@ -75,6 +75,9 @@ function createRawRouteHandler(ampless) {
     if (!post) {
       return new Response("Not Found", { status: 404 });
     }
+    if (post.metadata?.no_layout !== true) {
+      return new Response("Not Found", { status: 404 });
+    }
     return new Response(ampless.renderBody(post), {
       status: 200,
       headers: {
@@ -84,9 +87,78 @@ function createRawRouteHandler(ampless) {
     });
   };
 }
+
+// src/routes/static.ts
+import { createServerRunner } from "@aws-amplify/adapter-nextjs";
+import { cookies } from "next/headers";
+import { getUrl } from "aws-amplify/storage/server";
+var FALLBACK_MIME = {
+  ".html": "text/html; charset=utf-8",
+  ".htm": "text/html; charset=utf-8"
+};
+function createStaticRouteHandler(ampless) {
+  const { runWithAmplifyServerContext } = createServerRunner({
+    config: ampless.outputs
+  });
+  return async function GET(request, { params }) {
+    const { siteId, path } = await params;
+    if (!path || path.length === 0) {
+      return new Response("Not Found", { status: 404 });
+    }
+    const slug = path[0];
+    const restSegments = path.slice(1);
+    if (restSegments.some(
+      (s) => !s || s === "." || s === ".." || s.includes("/") || s.includes("\\") || s.includes("\0")
+    )) {
+      return new Response("Invalid path", { status: 400 });
+    }
+    const post = await ampless.getPublishedPost(slug, { siteId });
+    if (!post || post.format !== "static") {
+      return new Response("Not Found", { status: 404 });
+    }
+    const body = post.body ?? null;
+    const entrypoint = typeof body?.entrypoint === "string" && body.entrypoint ? body.entrypoint : "index.html";
+    const fileList = Array.isArray(body?.files) ? body.files : [];
+    let rest = restSegments.join("/");
+    if (rest === "") {
+      const url = new URL(request.url);
+      if (!url.pathname.endsWith("/")) {
+        const next = new URL(url);
+        next.pathname = `${url.pathname}/`;
+        return Response.redirect(next.toString(), 308);
+      }
+      rest = entrypoint;
+    }
+    if (fileList.length > 0 && !fileList.includes(rest)) {
+      return new Response("Not Found", { status: 404 });
+    }
+    const objectPath = `public/static/${siteId}/${slug}/${rest}`;
+    try {
+      const presignedUrl = await runWithAmplifyServerContext({
+        nextServerContext: { cookies },
+        operation: async (amplifyContext) => {
+          const result = await getUrl(amplifyContext, {
+            path: objectPath,
+            options: { expiresIn: 60 * 60 }
+          });
+          return result.url.toString();
+        }
+      });
+      return Response.redirect(presignedUrl, 302);
+    } catch {
+      const ext = rest.slice(rest.lastIndexOf("."));
+      const fallback = FALLBACK_MIME[ext] ?? "text/plain; charset=utf-8";
+      return new Response("Not Found", {
+        status: 404,
+        headers: { "Content-Type": fallback }
+      });
+    }
+  };
+}
 export {
   createFeedRouteHandler,
   createOgRouteHandler,
   createRawRouteHandler,
-  createSitemapRouteHandler
+  createSitemapRouteHandler,
+  createStaticRouteHandler
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "0.2.0-alpha.1",
+  "version": "0.2.0-alpha.11",
   "description": "Public-side runtime for ampless: post fetching, theme dispatch, middleware, public route handlers",
   "license": "MIT",
   "type": "module",
@@ -47,9 +47,10 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^1.16.0",
+    "marked": "^14.1.4",
     "tailwind-merge": "^3.6.0",
-    "ampless": "0.2.0-alpha.1",
-    "@ampless/plugin-og-image": "0.2.0-alpha.1"
+    "ampless": "0.2.0-alpha.7",
+    "@ampless/plugin-og-image": "0.2.0-alpha.7"
   },
   "peerDependencies": {
     "next": "^15 || ^16",