npm - @ampless/runtime - Versions diffs - 0.2.0-alpha.8 → 1.0.0-alpha.13 - Mend

@ampless/runtime 0.2.0-alpha.8 → 1.0.0-alpha.13

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 (11) hide show

package/README.ja.md +86 -0
package/README.md +4 -1
package/dist/dispatchers/index.d.ts +21 -11
package/dist/dispatchers/index.js +10 -20
package/dist/index.d.ts +29 -26
package/dist/index.js +174 -95
package/dist/middleware.d.ts +16 -14
package/dist/middleware.js +8 -17
package/dist/routes/index.d.ts +48 -74
package/dist/routes/index.js +84 -79
package/package.json +4 -3

package/dist/routes/index.d.ts CHANGED Viewed

@@ -2,112 +2,86 @@ import { Ampless } from '../index.js';
 import 'ampless';
 import 'next';
-interface Ctx$4 {
+interface Ctx$3 {
     params: Promise<{
         siteId: string;
         slug: string;
     }>;
 }
-type OgRouteHandler = (req: Request, ctx: Ctx$4) => Promise<Response>;
+type OgRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
 declare function createOgRouteHandler(ampless: Ampless): OgRouteHandler;
-interface Ctx$3 {
+interface Ctx$2 {
     params: Promise<{
         siteId: string;
     }>;
 }
-type SitemapRouteHandler = (req: Request, ctx: Ctx$3) => Promise<Response>;
+type SitemapRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
 /**
- * Sitemap route delegate. Looks up the active theme for the request's
- * siteId and forwards to whichever `routes.sitemap` handler the theme
- * provides. Themes without a sitemap handler return 404.
+ * Sitemap route delegate. Looks up the active theme and forwards to
+ * whichever `routes.sitemap` handler the theme provides. Themes
+ * without a sitemap handler return 404.
  */
 declare function createSitemapRouteHandler(ampless: Ampless): SitemapRouteHandler;
-interface Ctx$2 {
+interface Ctx$1 {
     params: Promise<{
         siteId: string;
     }>;
 }
-type FeedRouteHandler = (req: Request, ctx: Ctx$2) => Promise<Response>;
+type FeedRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
 /**
- * Feed route delegate. Looks up the active theme for the request's
- * siteId and forwards to whichever `routes.feed` handler the theme
- * provides. Themes without a feed handler return 404.
+ * Feed route delegate. Looks up the active theme and forwards to
+ * whichever `routes.feed` handler the theme provides. Themes without
+ * a feed handler return 404.
  */
 declare function createFeedRouteHandler(ampless: Ampless): FeedRouteHandler;
-interface Ctx$1 {
+interface Ctx {
     params: Promise<{
-        siteId: string;
         slug: string;
+        path?: string[];
     }>;
 }
-type RawRouteHandler = (req: Request, ctx: Ctx$1) => Promise<Response>;
+type UnderscoreRouteHandler = (req: Request, ctx: Ctx) => 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 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).
+ * Unified `/_/<slug>(/...)` route handler.
  *
- * Why this is a route handler (not a page): Next.js's root layout
- * always emits `<html>` / `<head>` / `<body>`, which means a normal
- * page can't replace the document. A `route.ts` returns a Response
- * directly and bypasses React rendering entirely.
+ * The public URL prefix `/_/` is reserved for two related cases that
+ * both need to bypass the theme's post page:
  *
- * Format pairing:
- *   - `format: 'html'` with a full `<!DOCTYPE html>...</html>` body
- *     → the body lands in the response unchanged. Best fit for
- *     custom landing pages with their own `<head>`, styles, scripts.
- *   - `format: 'tiptap'` / `'markdown'` → renderBody returns an
- *     HTML fragment. Browsers render fragments fine, but the page
- *     ships without `<!DOCTYPE>` / `<head>` / `<title>`. If you care
- *     about those, use `format: 'html'`.
- *
- * Trust model: the response body is the editor's content verbatim,
- * with no sanitization. Same trust assumption as `format: 'html'`
- * post bodies on the regular path — see
- * docs/architecture/04-access-layer-mcp.md §"editor の信頼モデル".
- */
-declare function createRawRouteHandler(ampless: Ampless): RawRouteHandler;
-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).
+ *  1. `format: 'html'` posts with `metadata.no_layout === true` — the
+ *     body is its own complete HTML document and ships as the entire
+ *     response. URL: `/_/<slug>` (no trailing slash, no extra path).
+ *  2. `format: 'static'` posts — the body is a manifest describing a
+ *     bundle of files in S3 at `public/static/<slug>/`. The bundle's
+ *     entrypoint is served at `/_/<slug>/`, every internal file at
+ *     `/_/<slug>/<relative-path>`.
  *
- * 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.
+ * Routing model:
+ *   - File location: `app/site/[siteId]/r/[slug]/[[...path]]/route.ts`.
+ *     The literal folder is `r/` (not `_/`) because Next.js's App
+ *     Router skips any path part starting with `_` during route
+ *     discovery (see `recursive-readdir` + `ignorePartFilter` in
+ *     next/dist/build/route-discovery.js). Middleware rewrites the
+ *     public `/_/` prefix to `/r/` internally; the public URL stays
+ *     `/_/<slug>(/...)`.
+ *   - `params.path` is `undefined` (or `[]`) for single-segment
+ *     requests `/_/<slug>`, an array of remaining segments otherwise.
  *
- * 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.
+ * Trailing-slash responsibility lives here, not in the dispatcher:
+ * the dispatcher redirects `format='static'` posts to `/_/<slug>`,
+ * and this handler then 308-redirects to `/_/<slug>/` to anchor
+ * relative paths inside the bundle. Same anchoring reason as the
+ * legacy static route's behaviour — `<img src="img.png">` must resolve
+ * to `/_/<slug>/img.png`, not the site root.
  *
- * 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.
+ * Trust model: no_layout HTML bodies are emitted verbatim, same trust
+ * shape as `format: 'html'` post bodies on the regular path. Static
+ * bundle assets are served via short-lived S3 presigned URLs; the
+ * bucket stays private. See docs/architecture/04-access-layer-mcp.md
+ * §"editor の信頼モデル".
  */
-declare function createStaticRouteHandler(ampless: Ampless): StaticRouteHandler;
+declare function createUnderscoreRouteHandler(ampless: Ampless): UnderscoreRouteHandler;
-export { type FeedRouteHandler, type OgRouteHandler, type RawRouteHandler, type SitemapRouteHandler, type StaticRouteHandler, createFeedRouteHandler, createOgRouteHandler, createRawRouteHandler, createSitemapRouteHandler, createStaticRouteHandler };
+export { type FeedRouteHandler, type OgRouteHandler, type SitemapRouteHandler, type UnderscoreRouteHandler, createFeedRouteHandler, createOgRouteHandler, createSitemapRouteHandler, createUnderscoreRouteHandler };

package/dist/routes/index.js CHANGED Viewed

@@ -6,13 +6,13 @@ function hasOgImage(p) {
 }
 function createOgRouteHandler(ampless) {
   return async function GET(_req, { params }) {
-    const { siteId, slug } = await params;
+    const { slug } = await params;
     const cleanSlug = slug.replace(/\.png$/, "");
-    const post = await ampless.getPublishedPost(cleanSlug, { siteId });
+    const post = await ampless.getPublishedPost(cleanSlug);
     if (!post) return new Response("not found", { status: 404 });
     const plugin = (ampless.cmsConfig.plugins ?? []).find(hasOgImage);
     if (!plugin) return new Response("og not configured", { status: 404 });
-    const settings = await ampless.loadSiteSettings(siteId);
+    const settings = await ampless.loadSiteSettings();
     const fonts = await Promise.all(
       plugin.ogImage.fonts.map(async (f) => ({
         name: f.name,
@@ -43,122 +43,127 @@ function createOgRouteHandler(ampless) {
 // src/routes/sitemap.ts
 function createSitemapRouteHandler(ampless) {
-  return async function GET(request, { params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+  return async function GET(request) {
+    const { module } = await ampless.resolveActiveTheme();
     const handler = module.routes?.sitemap;
     if (!handler) {
       return new Response("sitemap not implemented for this theme", { status: 404 });
     }
-    return handler({ siteId, request });
+    return handler({ request });
   };
 }
 // src/routes/feed.ts
 function createFeedRouteHandler(ampless) {
-  return async function GET(request, { params }) {
-    const { siteId } = await params;
-    const { module } = await ampless.resolveActiveTheme(siteId);
+  return async function GET(request) {
+    const { module } = await ampless.resolveActiveTheme();
     const handler = module.routes?.feed;
     if (!handler) {
       return new Response("feed not implemented for this theme", { status: 404 });
     }
-    return handler({ siteId, request });
+    return handler({ request });
   };
 }
-// src/routes/raw.ts
-function createRawRouteHandler(ampless) {
-  return async function GET(_request, { params }) {
-    const { siteId, slug } = await params;
-    const post = await ampless.getPublishedPost(slug, { siteId });
-    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: {
-        "Content-Type": "text/html; charset=utf-8",
-        "Cache-Control": "public, max-age=300"
-      }
-    });
-  };
-}
-// src/routes/static.ts
+// src/routes/underscore.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) {
+function createUnderscoreRouteHandler(ampless) {
   const { runWithAmplifyServerContext } = createServerRunner({
     config: ampless.outputs
   });
   return async function GET(request, { params }) {
-    const { siteId, path } = await params;
-    if (!path || path.length === 0) {
+    const { slug, path } = await params;
+    const restSegments = path ?? [];
+    const post = await ampless.getPublishedPost(slug);
+    if (!post) {
+      return new Response("Not Found", { status: 404 });
+    }
+    if (restSegments.length === 0) {
+      if (post.format === "html" && post.metadata?.no_layout === true) {
+        return new Response(ampless.renderBody(post), {
+          status: 200,
+          headers: {
+            "Content-Type": "text/html; charset=utf-8",
+            "Cache-Control": "public, max-age=300"
+          }
+        });
+      }
+      if (post.format === "static") {
+        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);
+        }
+        const body2 = post.body ?? null;
+        const entrypoint = typeof body2?.entrypoint === "string" && body2.entrypoint ? body2.entrypoint : "index.html";
+        const presignedUrl2 = await signStaticAsset({
+          runWithAmplifyServerContext,
+          slug,
+          rest: entrypoint
+        });
+        if (!presignedUrl2) {
+          return new Response("Not Found", { status: 404 });
+        }
+        return Response.redirect(presignedUrl2, 302);
+      }
+      return new Response("Not Found", { status: 404 });
+    }
+    if (post.format !== "static") {
       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;
-    }
+    const rest = restSegments.join("/");
     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 }
-      });
+    const presignedUrl = await signStaticAsset({
+      runWithAmplifyServerContext,
+      slug,
+      rest
+    });
+    if (!presignedUrl) {
+      return new Response("Not Found", { status: 404 });
     }
+    return Response.redirect(presignedUrl, 302);
   };
 }
+async function signStaticAsset({
+  runWithAmplifyServerContext,
+  slug,
+  rest
+}) {
+  const objectPath = `public/static/${slug}/${rest}`;
+  try {
+    return await runWithAmplifyServerContext({
+      nextServerContext: { cookies },
+      operation: async (amplifyContext) => {
+        const result = await getUrl(amplifyContext, {
+          path: objectPath,
+          options: { expiresIn: 60 * 60 }
+        });
+        return result.url.toString();
+      }
+    });
+  } catch (err) {
+    console.error(
+      `[underscore-route] presign failed for ${objectPath}:`,
+      err
+    );
+    return null;
+  }
+}
 export {
   createFeedRouteHandler,
   createOgRouteHandler,
-  createRawRouteHandler,
   createSitemapRouteHandler,
-  createStaticRouteHandler
+  createUnderscoreRouteHandler
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "0.2.0-alpha.8",
+  "version": "1.0.0-alpha.13",
   "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.5",
-    "@ampless/plugin-og-image": "0.2.0-alpha.5"
+    "ampless": "1.0.0-alpha.9",
+    "@ampless/plugin-og-image": "0.2.0-alpha.9"
   },
   "peerDependencies": {
     "next": "^15 || ^16",