@rshono/core 1.0.0-rc.11 → 1.0.0-rc.13

package/dist/server/prerendered.js

@@ -1,22 +1,21 @@
 /**
- * Everything about a prerendered page that doesn't need a filesystem: where the build puts it, and
- * what it looks like once read back.
+ * Everything about a prerendered page that doesn't need a filesystem: where the build puts it, and what it
+ * looks like once read back.
  *
- * Split out of `ssg.ts` — which owns the writing and the reading, both through `node:fs` — because a
- * deploy target without a filesystem reads the very same layout out of an asset store, and importing
- * it from the fs module would drag `node:fs` and `node:crypto` into a bundle that has neither.
+ * Apart from `ssg.ts`, which does the reading and writing through `node:fs`, because a deploy target without a
+ * filesystem reads the same layout out of an asset store — and importing it from there would drag `node:fs`
+ * into a bundle that has neither.
  */
 export const VARIANTS = {
     html: { file: 'index.html', accept: 'text/html', contentType: 'text/html' },
     flight: { file: 'index.rsc', accept: 'text/x-component', contentType: 'text/x-component' },
 };
 /**
- * Where a route's prerendered output lives, relative to the output root — or `null` for a path that
- * cannot be prerendered at all (one with a param or a wildcard left in it).
+ * Where a route's prerendered output lives, relative to the output root — or `null` for a path that cannot be
+ * prerendered at all, one with a param or a wildcard left in it.
  *
- * Always `/`-separated, never the host's separator: the same string addresses a file on a filesystem
- * (`resolve()` and `join()` both accept forward slashes on Windows) and a key in an asset store,
- * where a backslash would simply be the wrong character.
+ * Always `/`-separated: the same string addresses a file on a filesystem, which accepts forward slashes on
+ * Windows too, and a key in an asset store, where a backslash would be the wrong character.
  */
 export function ssgFilePath(routePath, variant = 'html') {
     if (/[:*]/.test(routePath))
@@ -26,10 +25,8 @@ export function ssgFilePath(routePath, variant = 'html') {
     return trimmed === '' ? file : `${trimmed}/${file}`;
 }
 /**
- * {@link ssgFilePath} for a path that came off a request, so traversal is a miss rather than a lookup.
- *
- * The first line of defence for every deploy target: a store addressed by key has no `resolve()` to
- * fall back on, so `..` has to be refused here or not at all.
+ * {@link ssgFilePath} for a path that came off a request, so traversal is a miss rather than a lookup. A store
+ * addressed by key has no `resolve()` to fall back on, so `..` is refused here or not at all.
  */
 export function prerenderedRelPath(requestPath, variant) {
     if (/(^|\/)\.\.?(\/|$)/.test(requestPath))
@@ -37,12 +34,9 @@ export function prerenderedRelPath(requestPath, variant) {
     return ssgFilePath(requestPath, variant);
 }
 /**
- * A bounded, insertion-ordered cache of prerendered pages.
- *
- * Bounded so a site with thousands of prerendered pages keeps a working set rather than the whole
- * build in memory. Only *hits* are ever stored: caching misses would let anyone mint entries by
- * requesting paths that don't exist. The files are written at build time and never change while the
- * server is up, so an entry never needs invalidating.
+ * A bounded, insertion-ordered cache of prerendered pages, so a site with thousands of them keeps a working set
+ * rather than the whole build in memory. Only *hits* are stored — caching misses would let anyone mint entries
+ * by requesting paths that don't exist — and the files never change while the server is up.
  */
 export function createPageCache(max = 128) {
     const pages = new Map();
@@ -50,17 +44,15 @@ export function createPageCache(max = 128) {
         get: (key) => pages.get(key),
         set(key, page) {
             pages.set(key, page);
-            // Insertion-ordered, so the first key is the oldest. One entry in means at most one out.
+            // Insertion-ordered, so the first key is the oldest.
             if (pages.size > max)
                 pages.delete(pages.keys().next().value);
         },
     };
 }
 /**
- * A weak `ETag` for a page body — see {@link PrerenderedPage.etag} for why weak.
- *
- * Web Crypto rather than `node:crypto`, so the one implementation serves both a Node server and
- * `workerd`.
+ * A weak `ETag` for a page body — see {@link PrerenderedPage.etag} for why weak. Web Crypto rather than
+ * `node:crypto`, so one implementation serves both a Node server and `workerd`.
  */
 export async function weakEtag(body) {
     const digest = await crypto.subtle.digest('SHA-256', body);
@@ -71,10 +63,9 @@ export async function weakEtag(body) {
     return `W/"${base64url.slice(0, 22)}"`;
 }
 /**
- * Assembles a {@link PrerenderedPage} from a body just read out of the build.
- *
- * `storeEtag` is the validator the store supplied, where it has one — it already describes these
- * exact bytes, so it is preferred over hashing them again, and only weakened.
+ * Assembles a {@link PrerenderedPage} from a body just read out of the build. `storeEtag` is the validator the
+ * store supplied, where it has one: it already describes these exact bytes, so it is weakened rather than
+ * replaced by a fresh hash.
  */
 export async function toPrerenderedPage(body, storeEtag) {
     return {

package/dist/server/prerendered.js.map

@@ -1 +1 @@
-{"version":3,"file":"prerendered.js","sourceRoot":"","sources":["../../src/server/prerendered.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE;IAC3E,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,kBAAkB,EAAE;CACQ,CAAC;AAErG;;;;;;;GAOG;AACH,MAAM,UAAU,WAAW,CAAC,SAAiB,EAAE,OAAO,GAAqB,MAAM;IAC/E,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;IACpC,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,IAAI,EAAE,CAAC;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,WAAmB,EAAE,OAAyB;IAC/E,IAAI,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,OAAO,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,GAAG,GAAG,GAAG;IACvC,MAAM,KAAK,GAAG,IAAI,GAAG,EAA2B,CAAC;IACjD,OAAO;QACL,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;QAC5B,GAAG,CAAC,GAAG,EAAE,IAAI;YACX,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACrB,yFAAyF;YACzF,IAAI,KAAK,CAAC,IAAI,GAAG,GAAG;gBAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAA6B;IAC1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;SACnE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtB,OAAO,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;AACzC,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAA6B,EAAE,SAAyB;IAC9F,OAAO;QACL,IAAI;QACJ,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC;KAC7E,CAAC;AACJ,CAAC","sourcesContent":["/**\n * Everything about a prerendered page that doesn't need a filesystem: where the build puts it, and\n * what it looks like once read back.\n *\n * Split out of `ssg.ts` — which owns the writing and the reading, both through `node:fs` — because a\n * deploy target without a filesystem reads the very same layout out of an asset store, and importing\n * it from the fs module would drag `node:fs` and `node:crypto` into a bundle that has neither.\n */\n\n/**\n * The two representations of a page, prerendered side by side: a hard load wants the HTML document, a\n * soft navigation asks the same URL for a flight payload. Without both, every in-app click would\n * re-render a page that was already built.\n */\nexport type PrerenderVariant = 'html' | 'flight';\n\nexport const VARIANTS = {\n  html: { file: 'index.html', accept: 'text/html', contentType: 'text/html' },\n  flight: { file: 'index.rsc', accept: 'text/x-component', contentType: 'text/x-component' },\n} as const satisfies Record<PrerenderVariant, { file: string; accept: string; contentType: string }>;\n\n/**\n * Where a route's prerendered output lives, relative to the output root — or `null` for a path that\n * cannot be prerendered at all (one with a param or a wildcard left in it).\n *\n * Always `/`-separated, never the host's separator: the same string addresses a file on a filesystem\n * (`resolve()` and `join()` both accept forward slashes on Windows) and a key in an asset store,\n * where a backslash would simply be the wrong character.\n */\nexport function ssgFilePath(routePath: string, variant: PrerenderVariant = 'html'): string | null {\n  if (/[:*]/.test(routePath)) return null;\n  const trimmed = routePath.replace(/^\\/+|\\/+$/g, '');\n  const file = VARIANTS[variant].file;\n  return trimmed === '' ? file : `${trimmed}/${file}`;\n}\n\n/**\n * {@link ssgFilePath} for a path that came off a request, so traversal is a miss rather than a lookup.\n *\n * The first line of defence for every deploy target: a store addressed by key has no `resolve()` to\n * fall back on, so `..` has to be refused here or not at all.\n */\nexport function prerenderedRelPath(requestPath: string, variant: PrerenderVariant): string | null {\n  if (/(^|\\/)\\.\\.?(\\/|$)/.test(requestPath)) return null;\n  return ssgFilePath(requestPath, variant);\n}\n\n/**\n * A bounded, insertion-ordered cache of prerendered pages.\n *\n * Bounded so a site with thousands of prerendered pages keeps a working set rather than the whole\n * build in memory. Only *hits* are ever stored: caching misses would let anyone mint entries by\n * requesting paths that don't exist. The files are written at build time and never change while the\n * server is up, so an entry never needs invalidating.\n */\nexport function createPageCache(max = 128): { get(key: string): PrerenderedPage | undefined; set(key: string, page: PrerenderedPage): void } {\n  const pages = new Map<string, PrerenderedPage>();\n  return {\n    get: (key) => pages.get(key),\n    set(key, page) {\n      pages.set(key, page);\n      // Insertion-ordered, so the first key is the oldest. One entry in means at most one out.\n      if (pages.size > max) pages.delete(pages.keys().next().value!);\n    },\n  };\n}\n\n/**\n * A weak `ETag` for a page body — see {@link PrerenderedPage.etag} for why weak.\n *\n * Web Crypto rather than `node:crypto`, so the one implementation serves both a Node server and\n * `workerd`.\n */\nexport async function weakEtag(body: Uint8Array<ArrayBuffer>): Promise<string> {\n  const digest = await crypto.subtle.digest('SHA-256', body);\n  const base64url = btoa(String.fromCharCode(...new Uint8Array(digest)))\n    .replace(/\\+/g, '-')\n    .replace(/\\//g, '_')\n    .replace(/=+$/, '');\n  return `W/\"${base64url.slice(0, 22)}\"`;\n}\n\n/**\n * Assembles a {@link PrerenderedPage} from a body just read out of the build.\n *\n * `storeEtag` is the validator the store supplied, where it has one — it already describes these\n * exact bytes, so it is preferred over hashing them again, and only weakened.\n */\nexport async function toPrerenderedPage(body: Uint8Array<ArrayBuffer>, storeEtag?: string | null): Promise<PrerenderedPage> {\n  return {\n    body,\n    contentLength: String(body.byteLength),\n    etag: storeEtag ? storeEtag.replace(/^(?!W\\/)/, 'W/') : await weakEtag(body),\n  };\n}\n\n/** A prerendered page, ready to serve: its body and a validator derived from those exact bytes. */\nexport interface PrerenderedPage {\n  /**\n   * The document or the flight payload, depending on which {@link PrerenderVariant} was read.\n   *\n   * Bytes rather than a string, because this is a *cache* entry served verbatim to every request that\n   * hits it — held as a string, each of those would pay a fresh UTF-8 encode of the whole page on the\n   * way out. Read once, encoded never.\n   */\n  body: Uint8Array<ArrayBuffer>;\n  /**\n   * `Content-Length` for {@link body}, in bytes rather than characters. Served explicitly because\n   * Hono sets no length for an in-memory body, and a proxy or CDN in front is entitled to make\n   * decisions with it — whether gzipping this response is worth the framing, most obviously.\n   */\n  contentLength: string;\n  /**\n   * `ETag` for the page, so a revalidating client can be answered with a 304 instead of the body.\n   *\n   * Deliberately **weak**. The bytes on the wire depend on whether something in front re-encoded\n   * them, and a strong validator would have to differ per coding — so the 200 and the 304 that\n   * revalidates it could disagree, and a cache would treat them as different pages. A weak tag says\n   * \"the same representation\", which is what stays true across content codings.\n   */\n  etag: string;\n}\n"]}
+{"version":3,"file":"prerendered.js","sourceRoot":"","sources":["../../src/server/prerendered.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE;IAC3E,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,kBAAkB,EAAE;CACQ,CAAC;AAErG;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,SAAiB,EAAE,OAAO,GAAqB,MAAM;IAC/E,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC;IACpC,OAAO,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,IAAI,EAAE,CAAC;AACtD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,WAAmB,EAAE,OAAyB;IAC/E,IAAI,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,OAAO,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,GAAG,GAAG,GAAG;IACvC,MAAM,KAAK,GAAG,IAAI,GAAG,EAA2B,CAAC;IACjD,OAAO;QACL,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC;QAC5B,GAAG,CAAC,GAAG,EAAE,IAAI;YACX,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACrB,qDAAqD;YACrD,IAAI,KAAK,CAAC,IAAI,GAAG,GAAG;gBAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAM,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAA6B;IAC1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;SACnE,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACtB,OAAO,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC;AACzC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAA6B,EAAE,SAAyB;IAC9F,OAAO;QACL,IAAI;QACJ,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QACtC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC;KAC7E,CAAC;AACJ,CAAC","sourcesContent":["/**\n * Everything about a prerendered page that doesn't need a filesystem: where the build puts it, and what it\n * looks like once read back.\n *\n * Apart from `ssg.ts`, which does the reading and writing through `node:fs`, because a deploy target without a\n * filesystem reads the same layout out of an asset store — and importing it from there would drag `node:fs`\n * into a bundle that has neither.\n */\n\n/**\n * The two representations of a page, prerendered side by side: a hard load wants the HTML document, a soft\n * navigation asks the same URL for a flight payload. Without both, every in-app click would re-render a page\n * that was already built.\n */\nexport type PrerenderVariant = 'html' | 'flight';\n\nexport const VARIANTS = {\n  html: { file: 'index.html', accept: 'text/html', contentType: 'text/html' },\n  flight: { file: 'index.rsc', accept: 'text/x-component', contentType: 'text/x-component' },\n} as const satisfies Record<PrerenderVariant, { file: string; accept: string; contentType: string }>;\n\n/**\n * Where a route's prerendered output lives, relative to the output root — or `null` for a path that cannot be\n * prerendered at all, one with a param or a wildcard left in it.\n *\n * Always `/`-separated: the same string addresses a file on a filesystem, which accepts forward slashes on\n * Windows too, and a key in an asset store, where a backslash would be the wrong character.\n */\nexport function ssgFilePath(routePath: string, variant: PrerenderVariant = 'html'): string | null {\n  if (/[:*]/.test(routePath)) return null;\n  const trimmed = routePath.replace(/^\\/+|\\/+$/g, '');\n  const file = VARIANTS[variant].file;\n  return trimmed === '' ? file : `${trimmed}/${file}`;\n}\n\n/**\n * {@link ssgFilePath} for a path that came off a request, so traversal is a miss rather than a lookup. A store\n * addressed by key has no `resolve()` to fall back on, so `..` is refused here or not at all.\n */\nexport function prerenderedRelPath(requestPath: string, variant: PrerenderVariant): string | null {\n  if (/(^|\\/)\\.\\.?(\\/|$)/.test(requestPath)) return null;\n  return ssgFilePath(requestPath, variant);\n}\n\n/**\n * A bounded, insertion-ordered cache of prerendered pages, so a site with thousands of them keeps a working set\n * rather than the whole build in memory. Only *hits* are stored — caching misses would let anyone mint entries\n * by requesting paths that don't exist — and the files never change while the server is up.\n */\nexport function createPageCache(max = 128): { get(key: string): PrerenderedPage | undefined; set(key: string, page: PrerenderedPage): void } {\n  const pages = new Map<string, PrerenderedPage>();\n  return {\n    get: (key) => pages.get(key),\n    set(key, page) {\n      pages.set(key, page);\n      // Insertion-ordered, so the first key is the oldest.\n      if (pages.size > max) pages.delete(pages.keys().next().value!);\n    },\n  };\n}\n\n/**\n * A weak `ETag` for a page body — see {@link PrerenderedPage.etag} for why weak. Web Crypto rather than\n * `node:crypto`, so one implementation serves both a Node server and `workerd`.\n */\nexport async function weakEtag(body: Uint8Array<ArrayBuffer>): Promise<string> {\n  const digest = await crypto.subtle.digest('SHA-256', body);\n  const base64url = btoa(String.fromCharCode(...new Uint8Array(digest)))\n    .replace(/\\+/g, '-')\n    .replace(/\\//g, '_')\n    .replace(/=+$/, '');\n  return `W/\"${base64url.slice(0, 22)}\"`;\n}\n\n/**\n * Assembles a {@link PrerenderedPage} from a body just read out of the build. `storeEtag` is the validator the\n * store supplied, where it has one: it already describes these exact bytes, so it is weakened rather than\n * replaced by a fresh hash.\n */\nexport async function toPrerenderedPage(body: Uint8Array<ArrayBuffer>, storeEtag?: string | null): Promise<PrerenderedPage> {\n  return {\n    body,\n    contentLength: String(body.byteLength),\n    etag: storeEtag ? storeEtag.replace(/^(?!W\\/)/, 'W/') : await weakEtag(body),\n  };\n}\n\n/** A prerendered page, ready to serve: its body and a validator derived from those exact bytes. */\nexport interface PrerenderedPage {\n  /**\n   * The document or the flight payload, depending on which {@link PrerenderVariant} was read. Bytes rather\n   * than a string, because this cache entry is served verbatim to every request that hits it — as a string,\n   * each would pay a fresh UTF-8 encode of the whole page.\n   */\n  body: Uint8Array<ArrayBuffer>;\n  /**\n   * `Content-Length` for {@link body}, in bytes. Served explicitly because Hono sets no length for an\n   * in-memory body, and a proxy in front is entitled to make decisions with it.\n   */\n  contentLength: string;\n  /**\n   * `ETag` for the page, so a revalidating client can be answered with a 304 instead of the body.\n   *\n   * Deliberately **weak**: the bytes on the wire depend on whether something in front re-encoded them, so a\n   * strong validator would differ per coding and a cache would treat the 200 and the 304 that revalidates it\n   * as different pages. A weak tag says \"the same representation\", which stays true across codings.\n   */\n  etag: string;\n}\n"]}

package/dist/server/server-config.d.ts

@@ -1,46 +1,39 @@
 import type { RshonoConfig } from '../config.js';
 /**
- * The framework settings the server bundle needs at request time, fully resolved.
- *
- * The value is produced once by {@link resolveServerConfig} from `rshono.config.ts`
- * and compiled into the server bundle as the `__RSHONO_CONFIG__` literal (see
- * `builder/rspack-config.ts`) — there is no runtime env-var interface for these.
- *
- * Only two fields, because only two things here are decided by the *build*. The per-request
- * security controls that used to live alongside them — the CSRF check, the CSP, the body cap — are
- * Hono middleware an app registers in `src/server.ts`, where they can be configured per route and
- * per environment instead of once per bundle.
+ * The framework settings the server bundle needs at request time, fully resolved — produced once by
+ * {@link resolveServerConfig} and compiled in as the `__RSHONO_CONFIG__` literal. There is no runtime env-var
+ * interface for these, and nothing here is a per-request concern: those are Hono middleware in `src/server.ts`.
  */
 export interface ServerConfig {
     /**
-     * `true` when the bundle came from `rshono dev`.
-     *
-     * Baked in rather than read from `process.env.NODE_ENV` at runtime: it is decided by which command
-     * produced the bundle, and a deploy target need not have a `process` to read it from.
+     * `true` when the bundle came from `rshono dev`. Baked in rather than read from `process.env.NODE_ENV`,
+     * because a deploy target need not have a `process`.
      */
     isDev: boolean;
     /** Honour `X-Forwarded-Host` / `-Proto` when resolving the browser-facing URL. Forced on in dev. */
     trustProxy: boolean;
+    /**
+     * The output directory this bundle was written to, relative to the project root. Carried into the bundle
+     * because `deploy/filesystem.ts` locates the assets and prerendered pages beside it at runtime, and only the
+     * compiler knows which directory it used.
+     */
+    outDir: string;
 }
 /**
- * The framework's built-in defaults.
- *
- * `port` and `host` are not config fields at all — they come from `PORT` / `HOST` (or `--port`)
- * wherever the address is resolved, `deploy/node/runtime.ts` for a server bundle and `cli/dev.ts`
- * for the dev server, and this is what both fall back to.
+ * The framework's built-in defaults. `port` and `host` are not config fields — they come from `PORT` / `HOST`
+ * or `--port` wherever the address is resolved, and this is what those fall back to.
  */
 export declare const SERVER_DEFAULTS: {
     readonly port: 3000;
     readonly host: '0.0.0.0';
 };
 /**
- * Resolve the user's {@link RshonoConfig} into the {@link ServerConfig} baked into the bundle.
- *
- * `isDev` is a build-time input rather than a config field because it decides one thing the user
- * shouldn't have to: `trustProxy` is forced on under `rshono dev`, where the framework's own proxy
- * is the only way in (it sets the forwarded headers itself and binds to localhost).
+ * Resolves the user's config into the {@link ServerConfig} baked into the bundle. `isDev` is a build-time input
+ * rather than a config field because it decides one thing the user should not have to: `trustProxy` is forced on
+ * under `rshono dev`, where the framework's own localhost proxy is the only way in.
  */
-export declare function resolveServerConfig(config: RshonoConfig, { isDev }: {
+export declare function resolveServerConfig(config: RshonoConfig, { isDev, outDir }: {
     isDev: boolean;
+    outDir: string;
 }): ServerConfig;
 //# sourceMappingURL=server-config.d.ts.map

package/dist/server/server-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-config.d.ts","sourceRoot":"","sources":["../../src/server/server-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,KAAK,EAAE,OAAO,CAAC;IACf,oGAAoG;IACpG,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,eAAe;aAC1B,IAAI,EAAE,IAAI;aACV,IAAI,EAAE,SAAS;CACP,CAAC;AAEX;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG,YAAY,CAKrG"}
+{"version":3,"file":"server-config.d.ts","sourceRoot":"","sources":["../../src/server/server-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B;;;OAGG;IACH,KAAK,EAAE,OAAO,CAAC;IACf,oGAAoG;IACpG,UAAU,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe;aAC1B,IAAI,EAAE,IAAI;aACV,IAAI,EAAE,SAAS;CACP,CAAC;AAEX;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,YAAY,CAM7H"}

package/dist/server/server-config.js

@@ -1,25 +1,21 @@
 /**
- * The framework's built-in defaults.
- *
- * `port` and `host` are not config fields at all — they come from `PORT` / `HOST` (or `--port`)
- * wherever the address is resolved, `deploy/node/runtime.ts` for a server bundle and `cli/dev.ts`
- * for the dev server, and this is what both fall back to.
+ * The framework's built-in defaults. `port` and `host` are not config fields — they come from `PORT` / `HOST`
+ * or `--port` wherever the address is resolved, and this is what those fall back to.
  */
 export const SERVER_DEFAULTS = {
     port: 3000,
     host: '0.0.0.0',
 };
 /**
- * Resolve the user's {@link RshonoConfig} into the {@link ServerConfig} baked into the bundle.
- *
- * `isDev` is a build-time input rather than a config field because it decides one thing the user
- * shouldn't have to: `trustProxy` is forced on under `rshono dev`, where the framework's own proxy
- * is the only way in (it sets the forwarded headers itself and binds to localhost).
+ * Resolves the user's config into the {@link ServerConfig} baked into the bundle. `isDev` is a build-time input
+ * rather than a config field because it decides one thing the user should not have to: `trustProxy` is forced on
+ * under `rshono dev`, where the framework's own localhost proxy is the only way in.
  */
-export function resolveServerConfig(config, { isDev }) {
+export function resolveServerConfig(config, { isDev, outDir }) {
     return {
         isDev,
         trustProxy: isDev || (config.trustProxy ?? false),
+        outDir,
     };
 }
 //# sourceMappingURL=server-config.js.map

package/dist/server/server-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"server-config.js","sourceRoot":"","sources":["../../src/server/server-config.ts"],"names":[],"mappings":"AA0BA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,SAAS;CACP,CAAC;AAEX;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAoB,EAAE,EAAE,KAAK,EAAsB;IACrF,OAAO;QACL,KAAK;QACL,UAAU,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC;KAClD,CAAC;AACJ,CAAC","sourcesContent":["import type { RshonoConfig } from '../config.js';\n\n/**\n * The framework settings the server bundle needs at request time, fully resolved.\n *\n * The value is produced once by {@link resolveServerConfig} from `rshono.config.ts`\n * and compiled into the server bundle as the `__RSHONO_CONFIG__` literal (see\n * `builder/rspack-config.ts`) — there is no runtime env-var interface for these.\n *\n * Only two fields, because only two things here are decided by the *build*. The per-request\n * security controls that used to live alongside them — the CSRF check, the CSP, the body cap — are\n * Hono middleware an app registers in `src/server.ts`, where they can be configured per route and\n * per environment instead of once per bundle.\n */\nexport interface ServerConfig {\n  /**\n   * `true` when the bundle came from `rshono dev`.\n   *\n   * Baked in rather than read from `process.env.NODE_ENV` at runtime: it is decided by which command\n   * produced the bundle, and a deploy target need not have a `process` to read it from.\n   */\n  isDev: boolean;\n  /** Honour `X-Forwarded-Host` / `-Proto` when resolving the browser-facing URL. Forced on in dev. */\n  trustProxy: boolean;\n}\n\n/**\n * The framework's built-in defaults.\n *\n * `port` and `host` are not config fields at all — they come from `PORT` / `HOST` (or `--port`)\n * wherever the address is resolved, `deploy/node/runtime.ts` for a server bundle and `cli/dev.ts`\n * for the dev server, and this is what both fall back to.\n */\nexport const SERVER_DEFAULTS = {\n  port: 3000,\n  host: '0.0.0.0',\n} as const;\n\n/**\n * Resolve the user's {@link RshonoConfig} into the {@link ServerConfig} baked into the bundle.\n *\n * `isDev` is a build-time input rather than a config field because it decides one thing the user\n * shouldn't have to: `trustProxy` is forced on under `rshono dev`, where the framework's own proxy\n * is the only way in (it sets the forwarded headers itself and binds to localhost).\n */\nexport function resolveServerConfig(config: RshonoConfig, { isDev }: { isDev: boolean }): ServerConfig {\n  return {\n    isDev,\n    trustProxy: isDev || (config.trustProxy ?? false),\n  };\n}\n"]}
+{"version":3,"file":"server-config.js","sourceRoot":"","sources":["../../src/server/server-config.ts"],"names":[],"mappings":"AAuBA;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,IAAI,EAAE,IAAI;IACV,IAAI,EAAE,SAAS;CACP,CAAC;AAEX;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAoB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAsC;IAC7G,OAAO;QACL,KAAK;QACL,UAAU,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC;QACjD,MAAM;KACP,CAAC;AACJ,CAAC","sourcesContent":["import type { RshonoConfig } from '../config.js';\n\n/**\n * The framework settings the server bundle needs at request time, fully resolved — produced once by\n * {@link resolveServerConfig} and compiled in as the `__RSHONO_CONFIG__` literal. There is no runtime env-var\n * interface for these, and nothing here is a per-request concern: those are Hono middleware in `src/server.ts`.\n */\nexport interface ServerConfig {\n  /**\n   * `true` when the bundle came from `rshono dev`. Baked in rather than read from `process.env.NODE_ENV`,\n   * because a deploy target need not have a `process`.\n   */\n  isDev: boolean;\n  /** Honour `X-Forwarded-Host` / `-Proto` when resolving the browser-facing URL. Forced on in dev. */\n  trustProxy: boolean;\n  /**\n   * The output directory this bundle was written to, relative to the project root. Carried into the bundle\n   * because `deploy/filesystem.ts` locates the assets and prerendered pages beside it at runtime, and only the\n   * compiler knows which directory it used.\n   */\n  outDir: string;\n}\n\n/**\n * The framework's built-in defaults. `port` and `host` are not config fields — they come from `PORT` / `HOST`\n * or `--port` wherever the address is resolved, and this is what those fall back to.\n */\nexport const SERVER_DEFAULTS = {\n  port: 3000,\n  host: '0.0.0.0',\n} as const;\n\n/**\n * Resolves the user's config into the {@link ServerConfig} baked into the bundle. `isDev` is a build-time input\n * rather than a config field because it decides one thing the user should not have to: `trustProxy` is forced on\n * under `rshono dev`, where the framework's own localhost proxy is the only way in.\n */\nexport function resolveServerConfig(config: RshonoConfig, { isDev, outDir }: { isDev: boolean; outDir: string }): ServerConfig {\n  return {\n    isDev,\n    trustProxy: isDev || (config.trustProxy ?? false),\n    outDir,\n  };\n}\n"]}

package/dist/server/shutdown.d.ts

@@ -1,7 +1,6 @@
 /**
- * Registers `handler` for both `SIGINT` and `SIGTERM` — the two signals a process
- * manager or `Ctrl-C` uses to ask for a graceful stop. Consolidates the shutdown
- * wiring shared by the server bundle and the `start` launcher.
+ * Registers `handler` for both `SIGINT` and `SIGTERM` — the two signals a process manager or `Ctrl-C` uses to
+ * ask for a graceful stop. Shared by the server bundle and the `start` launcher.
  */
 export declare function onShutdown(handler: (signal: NodeJS.Signals) => void): void;
 //# sourceMappingURL=shutdown.d.ts.map

package/dist/server/shutdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown.d.ts","sourceRoot":"","sources":["../../src/server/shutdown.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,GAAG,IAAI,CAI1E"}
+{"version":3,"file":"shutdown.d.ts","sourceRoot":"","sources":["../../src/server/shutdown.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,GAAG,IAAI,CAI1E"}

package/dist/server/shutdown.js

@@ -1,7 +1,6 @@
 /**
- * Registers `handler` for both `SIGINT` and `SIGTERM` — the two signals a process
- * manager or `Ctrl-C` uses to ask for a graceful stop. Consolidates the shutdown
- * wiring shared by the server bundle and the `start` launcher.
+ * Registers `handler` for both `SIGINT` and `SIGTERM` — the two signals a process manager or `Ctrl-C` uses to
+ * ask for a graceful stop. Shared by the server bundle and the `start` launcher.
  */
 export function onShutdown(handler) {
     for (const signal of ['SIGINT', 'SIGTERM']) {

package/dist/server/shutdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown.js","sourceRoot":"","sources":["../../src/server/shutdown.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,OAAyC;IAClE,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;QACpD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC","sourcesContent":["/**\n * Registers `handler` for both `SIGINT` and `SIGTERM` — the two signals a process\n * manager or `Ctrl-C` uses to ask for a graceful stop. Consolidates the shutdown\n * wiring shared by the server bundle and the `start` launcher.\n */\nexport function onShutdown(handler: (signal: NodeJS.Signals) => void): void {\n  for (const signal of ['SIGINT', 'SIGTERM'] as const) {\n    process.on(signal, () => handler(signal));\n  }\n}\n"]}
+{"version":3,"file":"shutdown.js","sourceRoot":"","sources":["../../src/server/shutdown.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,OAAyC;IAClE,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;QACpD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC","sourcesContent":["/**\n * Registers `handler` for both `SIGINT` and `SIGTERM` — the two signals a process manager or `Ctrl-C` uses to\n * ask for a graceful stop. Shared by the server bundle and the `start` launcher.\n */\nexport function onShutdown(handler: (signal: NodeJS.Signals) => void): void {\n  for (const signal of ['SIGINT', 'SIGTERM'] as const) {\n    process.on(signal, () => handler(signal));\n  }\n}\n"]}

package/dist/server/ssg.d.ts

@@ -1,11 +1,8 @@
 import { type Route } from '../router.js';
 import { type PrerenderedPage, type PrerenderVariant } from './prerendered.js';
 /**
- * Resolve {@link RshonoConfig.siteUrl} to the origin prerendering should render against.
- *
- * A path is rejected rather than dropped: `'https://example.com/docs'` almost certainly means the
- * author expects a base path, and silently serving from the root would be a confusing way to find
- * out that isn't supported.
+ * Resolves `siteUrl` to the origin prerendering renders against. A path is rejected rather than dropped:
+ * `'https://example.com/docs'` means the author expects a base path, which is not supported.
  */
 export declare function resolveSiteOrigin(siteUrl: string | undefined): string;
 export declare function readPrerendered(ssgDir: string, requestPath: string, variant?: PrerenderVariant): Promise<PrerenderedPage | null>;
@@ -13,7 +10,7 @@ interface PrerenderOptions {
     routes: readonly Route[];
     fetch: (request: Request) => Response | Promise<Response>;
     ssgDir: string;
-    /** {@link RshonoConfig.siteUrl} — the origin absolute URLs in the output are built against. */
+    /** The origin absolute URLs in the output are built against — `siteUrl` from `rshono.config.ts`. */
     siteUrl?: string;
 }
 export interface PrerenderResult {

package/dist/server/ssg.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssg.d.ts","sourceRoot":"","sources":["../../src/server/ssg.ts"],"names":[],"mappings":"AAGA,OAAO,EAA+B,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAML,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAS1B;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAUrE;AA4BD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAyB,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CA8B9I;AAED,UAAU,gBAAgB;IACxB,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;IACzB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,+FAA+F;IAC/F,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAoBD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CA0D/F"}
+{"version":3,"file":"ssg.d.ts","sourceRoot":"","sources":["../../src/server/ssg.ts"],"names":[],"mappings":"AAGA,OAAO,EAA+B,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAML,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAQ1B;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAUrE;AA4BD,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAyB,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CA0B9I;AAED,UAAU,gBAAgB;IACxB,MAAM,EAAE,SAAS,KAAK,EAAE,CAAC;IACzB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC1D,MAAM,EAAE,MAAM,CAAC;IACf,oGAAoG;IACpG,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAiBD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC,CAyD/F"}

package/dist/server/ssg.js

@@ -4,17 +4,13 @@ import { dirname, join, resolve, sep } from 'node:path';
 import { isPageRoute } from '../router.js';
 import { createPageCache, prerenderedRelPath, ssgFilePath, toPrerenderedPage, VARIANTS, } from './prerendered.js';
 /**
- * Stand-in origin for a build that didn't declare {@link RshonoConfig.siteUrl}. Deliberately
- * obviously-wrong rather than a guess: a page that bakes this into a canonical tag should be easy
- * to spot, and the build warns when static routes are prerendered without a real origin.
+ * Stand-in origin for a build that declared no `siteUrl`. Obviously wrong rather than a guess, so a page that
+ * bakes it into a canonical tag is easy to spot; the build warns as well.
  */
 const DEFAULT_SSG_ORIGIN = 'http://localhost';
 /**
- * Resolve {@link RshonoConfig.siteUrl} to the origin prerendering should render against.
- *
- * A path is rejected rather than dropped: `'https://example.com/docs'` almost certainly means the
- * author expects a base path, and silently serving from the root would be a confusing way to find
- * out that isn't supported.
+ * Resolves `siteUrl` to the origin prerendering renders against. A path is rejected rather than dropped:
+ * `'https://example.com/docs'` means the author expects a base path, which is not supported.
  */
 export function resolveSiteOrigin(siteUrl) {
     if (!siteUrl)
@@ -53,9 +49,8 @@ function interpolatePath(pattern, params) {
 /** Prerendered pages, keyed by the request that produced them (see {@link readPrerendered}). */
 const pageCache = createPageCache();
 export async function readPrerendered(ssgDir, requestPath, variant = 'html') {
-    // Keyed by what the request carried, not by the resolved filename, so a hit costs one Map lookup
-    // instead of re-deriving the path every time. Safe because only *hits* are cached: an entry
-    // exists only if this exact key already passed the checks below.
+    // Keyed by what the request carried rather than by the resolved filename, so a hit costs one Map lookup. Safe
+    // because only *hits* are cached: an entry exists only if this exact key already passed the checks below.
     const key = `${ssgDir}\0${variant}\0${requestPath}`;
     const cached = pageCache.get(key);
     if (cached)
@@ -63,16 +58,13 @@ export async function readPrerendered(ssgDir, requestPath, variant = 'html') {
     const relPath = prerenderedRelPath(requestPath, variant);
     if (relPath === null)
         return null;
-    // Belt and braces: the shared guard already refused a traversal, and this proves the resolved file
-    // is under the root whatever else the path contained.
+    // Belt and braces over the shared traversal guard: this proves the resolved file is under the root.
     const root = resolve(ssgDir);
     const file = resolve(root, relPath);
     if (!file.startsWith(root + sep))
         return null;
-    // No encoding argument: the bytes are what gets served, and decoding them to a string here would
-    // only mean re-encoding them on every request that hits the cache. Copied out of the Buffer rather
-    // than kept as one, because `readFile` can hand back a view into Node's shared allocation pool and
-    // this is retained for the life of the process.
+    // No encoding argument: the bytes are what gets served. Copied out of the Buffer rather than kept as one,
+    // because `readFile` can hand back a view into Node's shared pool and this is retained for the process.
     let body;
     try {
         body = new Uint8Array(await readFile(file));
@@ -129,9 +121,8 @@ export async function prerenderStaticRoutes(options) {
                 writeFileSync(file, body);
             };
             write('html', document.body);
-            // The soft-navigation representation of the same page. Best-effort: if it doesn't come back
-            // cleanly the document is still valid on its own, and serving falls back to rendering the
-            // flight payload per request.
+            // The soft-navigation representation of the same page. Best-effort: the document is valid on its own, and
+            // serving falls back to rendering the flight payload per request.
             const flight = await renderVariant(fetch, origin + path, 'flight');
             if (flight.ok) {
                 write('flight', flight.body);

package/dist/server/ssg.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssg.js","sourceRoot":"","sources":["../../src/server/ssg.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,EAAE,WAAW,EAA8B,MAAM,cAAc,CAAC;AACvE,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,WAAW,EACX,iBAAiB,EACjB,QAAQ,GAGT,MAAM,kBAAkB,CAAC;AAE1B;;;;GAIG;AACH,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAA2B;IAC3D,IAAI,CAAC,OAAO;QAAE,OAAO,kBAAkB,CAAC;IACxC,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,EAAE,CAAC;QAC7E,MAAM,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAC;IAC1H,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,wDAAwD,CAAC,CAAC;IACvH,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,MAA8B;IACtE,OAAO,OAAO;SACX,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,wDAAwD,CAAC,CAAC;YACxG,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,4DAA4D,CAAC,CAAC;QAC5G,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,OAAO,mCAAmC,IAAI,IAAI,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED,gGAAgG;AAChG,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,WAAmB,EAAE,OAAO,GAAqB,MAAM;IAC3G,iGAAiG;IACjG,4FAA4F;IAC5F,iEAAiE;IACjE,MAAM,GAAG,GAAG,GAAG,MAAM,KAAK,OAAO,KAAK,WAAW,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,MAAM,OAAO,GAAG,kBAAkB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACzD,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAClC,mGAAmG;IACnG,sDAAsD;IACtD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAE9C,iGAAiG;IACjG,mGAAmG;IACnG,mGAAmG;IACnG,gDAAgD;IAChD,IAAI,IAA6B,CAAC;IAClC,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,UAAU,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC;AACd,CAAC;AAwBD,KAAK,UAAU,aAAa,CAAC,KAAgC,EAAE,GAAW,EAAE,OAAyB;IACnG,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;IAClG,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;IAChF,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;QAC1F,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,QAAQ,CAAC,OAAO,CAAC,CAAC,WAAW,WAAW,EAAE,CAAC;IAClF,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAyB;IACnE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAkB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;IACnG,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAElD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAChD,OAAO,CAAC,IAAI,CACV,yEAAyE,kBAAkB,yBAAyB;YAClH,uGAAuG,CAC1G,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;QACjC,IAAI,KAAe,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,KAAK,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,qBAAqB,KAAK,CAAC,IAAI,yDAAyD,CAAC,CAAC;gBACvG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACzB,SAAS;YACX,CAAC;YACD,KAAK,GAAG,CAAC,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3F,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;YACnE,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,cAAc,QAAQ,CAAC,MAAM,kDAAkD,CAAC,CAAC;gBAC1G,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GAAG,CAAC,OAAyB,EAAE,IAAY,EAAE,EAAE;gBACxD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,OAAO,CAAE,CAAC,CAAC;gBACvD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9C,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;YACF,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YAE7B,4FAA4F;YAC5F,0FAA0F;YAC1F,8BAA8B;YAC9B,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,QAAQ,CAAC,CAAC;YACnE,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,gFAAgF,CAAC,CAAC;YAC7G,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAC9B,CAAC","sourcesContent":["import { mkdirSync, writeFileSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { dirname, join, resolve, sep } from 'node:path';\nimport { isPageRoute, type PageRoute, type Route } from '../router.js';\nimport {\n  createPageCache,\n  prerenderedRelPath,\n  ssgFilePath,\n  toPrerenderedPage,\n  VARIANTS,\n  type PrerenderedPage,\n  type PrerenderVariant,\n} from './prerendered.js';\n\n/**\n * Stand-in origin for a build that didn't declare {@link RshonoConfig.siteUrl}. Deliberately\n * obviously-wrong rather than a guess: a page that bakes this into a canonical tag should be easy\n * to spot, and the build warns when static routes are prerendered without a real origin.\n */\nconst DEFAULT_SSG_ORIGIN = 'http://localhost';\n\n/**\n * Resolve {@link RshonoConfig.siteUrl} to the origin prerendering should render against.\n *\n * A path is rejected rather than dropped: `'https://example.com/docs'` almost certainly means the\n * author expects a base path, and silently serving from the root would be a confusing way to find\n * out that isn't supported.\n */\nexport function resolveSiteOrigin(siteUrl: string | undefined): string {\n  if (!siteUrl) return DEFAULT_SSG_ORIGIN;\n  const parsed = URL.parse(siteUrl);\n  if (!parsed || (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')) {\n    throw new Error(`[rshono] invalid siteUrl ${JSON.stringify(siteUrl)} — use a full origin, e.g. 'https://example.com'.`);\n  }\n  if (parsed.pathname !== '/' || parsed.search || parsed.hash) {\n    throw new Error(`[rshono] siteUrl ${JSON.stringify(siteUrl)} must be a bare origin — a base path is not supported.`);\n  }\n  return parsed.origin;\n}\n\nfunction interpolatePath(pattern: string, params: Record<string, string>): string {\n  return pattern\n    .split('/')\n    .map((segment) => {\n      if (!segment.startsWith(':')) {\n        if (segment.includes('*')) {\n          throw new Error(`Cannot prerender \"${pattern}\": wildcard segments are not supported by staticPaths.`);\n        }\n        return segment;\n      }\n      const name = segment.slice(1);\n      if (!/^\\w+$/.test(name)) {\n        throw new Error(`Cannot prerender \"${pattern}\": optional/regex params are not supported by staticPaths.`);\n      }\n      const value = params[name];\n      if (value === undefined) {\n        throw new Error(`staticPaths for \"${pattern}\" returned a param set without \"${name}\".`);\n      }\n      return encodeURIComponent(value);\n    })\n    .join('/');\n}\n\n/** Prerendered pages, keyed by the request that produced them (see {@link readPrerendered}). */\nconst pageCache = createPageCache();\n\nexport async function readPrerendered(ssgDir: string, requestPath: string, variant: PrerenderVariant = 'html'): Promise<PrerenderedPage | null> {\n  // Keyed by what the request carried, not by the resolved filename, so a hit costs one Map lookup\n  // instead of re-deriving the path every time. Safe because only *hits* are cached: an entry\n  // exists only if this exact key already passed the checks below.\n  const key = `${ssgDir}\\0${variant}\\0${requestPath}`;\n  const cached = pageCache.get(key);\n  if (cached) return cached;\n\n  const relPath = prerenderedRelPath(requestPath, variant);\n  if (relPath === null) return null;\n  // Belt and braces: the shared guard already refused a traversal, and this proves the resolved file\n  // is under the root whatever else the path contained.\n  const root = resolve(ssgDir);\n  const file = resolve(root, relPath);\n  if (!file.startsWith(root + sep)) return null;\n\n  // No encoding argument: the bytes are what gets served, and decoding them to a string here would\n  // only mean re-encoding them on every request that hits the cache. Copied out of the Buffer rather\n  // than kept as one, because `readFile` can hand back a view into Node's shared allocation pool and\n  // this is retained for the life of the process.\n  let body: Uint8Array<ArrayBuffer>;\n  try {\n    body = new Uint8Array(await readFile(file));\n  } catch {\n    return null;\n  }\n\n  const page = await toPrerenderedPage(body);\n  pageCache.set(key, page);\n  return page;\n}\n\ninterface PrerenderOptions {\n  routes: readonly Route[];\n  fetch: (request: Request) => Response | Promise<Response>;\n  ssgDir: string;\n  /** {@link RshonoConfig.siteUrl} — the origin absolute URLs in the output are built against. */\n  siteUrl?: string;\n}\n\nexport interface PrerenderResult {\n  written: string[];\n  skipped: string[];\n}\n\n/**\n * One representation of a path, as the app answered for it at build time.\n *\n * Discriminated on `ok` rather than returned as a body-or-status-or-null union: both callers have to\n * tell \"the app rendered this\" from \"it did not\", and only one of them cares *why* — which as three\n * shapes made every read a `'body' in result` check against a value that could also be null.\n */\ntype RenderedVariant = { ok: true; body: string } | { ok: false; reason: string };\n\nasync function renderVariant(fetch: PrerenderOptions['fetch'], url: string, variant: PrerenderVariant): Promise<RenderedVariant> {\n  const response = await fetch(new Request(url, { headers: { Accept: VARIANTS[variant].accept } }));\n  if (response.status !== 200) return { ok: false, reason: `${response.status}` };\n  if (!(response.headers.get('Content-Type') ?? '').includes(VARIANTS[variant].contentType)) {\n    return { ok: false, reason: `a non-${VARIANTS[variant].contentType} response` };\n  }\n  return { ok: true, body: await response.text() };\n}\n\nexport async function prerenderStaticRoutes(options: PrerenderOptions): Promise<PrerenderResult> {\n  const { routes, fetch, ssgDir } = options;\n  const staticRoutes = routes.filter((r): r is PageRoute => isPageRoute(r) && r.render === 'static');\n  const origin = resolveSiteOrigin(options.siteUrl);\n\n  if (staticRoutes.length > 0 && !options.siteUrl) {\n    console.warn(\n      `  ⚠ No siteUrl in rshono.config — prerendered pages are built against ${DEFAULT_SSG_ORIGIN}, so any absolute URL\\n` +\n        `    they derive from a page's \\`url\\` prop (canonical tags, og:url, absolute links) will point there.`,\n    );\n  }\n\n  const written: string[] = [];\n  const skipped: string[] = [];\n\n  for (const route of staticRoutes) {\n    let paths: string[];\n    if (!/[:*]/.test(route.path)) {\n      paths = [route.path];\n    } else {\n      if (!route.staticPaths) {\n        console.warn(`  ⚠ Static route \"${route.path}\" has params but no staticPaths — will SSR per request.`);\n        skipped.push(route.path);\n        continue;\n      }\n      paths = (await route.staticPaths()).map((params) => interpolatePath(route.path, params));\n    }\n\n    for (const path of paths) {\n      const document = await renderVariant(fetch, origin + path, 'html');\n      if (!document.ok) {\n        console.warn(`  ⚠ \"${path}\" rendered ${document.reason} at build time — skipping, will SSR per request.`);\n        skipped.push(path);\n        continue;\n      }\n\n      const write = (variant: PrerenderVariant, body: string) => {\n        const file = join(ssgDir, ssgFilePath(path, variant)!);\n        mkdirSync(dirname(file), { recursive: true });\n        writeFileSync(file, body);\n      };\n      write('html', document.body);\n\n      // The soft-navigation representation of the same page. Best-effort: if it doesn't come back\n      // cleanly the document is still valid on its own, and serving falls back to rendering the\n      // flight payload per request.\n      const flight = await renderVariant(fetch, origin + path, 'flight');\n      if (flight.ok) {\n        write('flight', flight.body);\n      } else {\n        console.warn(`  ⚠ \"${path}\" produced no flight payload — soft navigations to it will render per request.`);\n      }\n\n      written.push(path);\n    }\n  }\n\n  return { written, skipped };\n}\n"]}
+{"version":3,"file":"ssg.js","sourceRoot":"","sources":["../../src/server/ssg.ts"],"names":[],"mappings":"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","sourcesContent":["import { mkdirSync, writeFileSync } from 'node:fs';\nimport { readFile } from 'node:fs/promises';\nimport { dirname, join, resolve, sep } from 'node:path';\nimport { isPageRoute, type PageRoute, type Route } from '../router.js';\nimport {\n  createPageCache,\n  prerenderedRelPath,\n  ssgFilePath,\n  toPrerenderedPage,\n  VARIANTS,\n  type PrerenderedPage,\n  type PrerenderVariant,\n} from './prerendered.js';\n\n/**\n * Stand-in origin for a build that declared no `siteUrl`. Obviously wrong rather than a guess, so a page that\n * bakes it into a canonical tag is easy to spot; the build warns as well.\n */\nconst DEFAULT_SSG_ORIGIN = 'http://localhost';\n\n/**\n * Resolves `siteUrl` to the origin prerendering renders against. A path is rejected rather than dropped:\n * `'https://example.com/docs'` means the author expects a base path, which is not supported.\n */\nexport function resolveSiteOrigin(siteUrl: string | undefined): string {\n  if (!siteUrl) return DEFAULT_SSG_ORIGIN;\n  const parsed = URL.parse(siteUrl);\n  if (!parsed || (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')) {\n    throw new Error(`[rshono] invalid siteUrl ${JSON.stringify(siteUrl)} — use a full origin, e.g. 'https://example.com'.`);\n  }\n  if (parsed.pathname !== '/' || parsed.search || parsed.hash) {\n    throw new Error(`[rshono] siteUrl ${JSON.stringify(siteUrl)} must be a bare origin — a base path is not supported.`);\n  }\n  return parsed.origin;\n}\n\nfunction interpolatePath(pattern: string, params: Record<string, string>): string {\n  return pattern\n    .split('/')\n    .map((segment) => {\n      if (!segment.startsWith(':')) {\n        if (segment.includes('*')) {\n          throw new Error(`Cannot prerender \"${pattern}\": wildcard segments are not supported by staticPaths.`);\n        }\n        return segment;\n      }\n      const name = segment.slice(1);\n      if (!/^\\w+$/.test(name)) {\n        throw new Error(`Cannot prerender \"${pattern}\": optional/regex params are not supported by staticPaths.`);\n      }\n      const value = params[name];\n      if (value === undefined) {\n        throw new Error(`staticPaths for \"${pattern}\" returned a param set without \"${name}\".`);\n      }\n      return encodeURIComponent(value);\n    })\n    .join('/');\n}\n\n/** Prerendered pages, keyed by the request that produced them (see {@link readPrerendered}). */\nconst pageCache = createPageCache();\n\nexport async function readPrerendered(ssgDir: string, requestPath: string, variant: PrerenderVariant = 'html'): Promise<PrerenderedPage | null> {\n  // Keyed by what the request carried rather than by the resolved filename, so a hit costs one Map lookup. Safe\n  // because only *hits* are cached: an entry exists only if this exact key already passed the checks below.\n  const key = `${ssgDir}\\0${variant}\\0${requestPath}`;\n  const cached = pageCache.get(key);\n  if (cached) return cached;\n\n  const relPath = prerenderedRelPath(requestPath, variant);\n  if (relPath === null) return null;\n  // Belt and braces over the shared traversal guard: this proves the resolved file is under the root.\n  const root = resolve(ssgDir);\n  const file = resolve(root, relPath);\n  if (!file.startsWith(root + sep)) return null;\n\n  // No encoding argument: the bytes are what gets served. Copied out of the Buffer rather than kept as one,\n  // because `readFile` can hand back a view into Node's shared pool and this is retained for the process.\n  let body: Uint8Array<ArrayBuffer>;\n  try {\n    body = new Uint8Array(await readFile(file));\n  } catch {\n    return null;\n  }\n\n  const page = await toPrerenderedPage(body);\n  pageCache.set(key, page);\n  return page;\n}\n\ninterface PrerenderOptions {\n  routes: readonly Route[];\n  fetch: (request: Request) => Response | Promise<Response>;\n  ssgDir: string;\n  /** The origin absolute URLs in the output are built against — `siteUrl` from `rshono.config.ts`. */\n  siteUrl?: string;\n}\n\nexport interface PrerenderResult {\n  written: string[];\n  skipped: string[];\n}\n\n/**\n * One representation of a path, as the app answered for it at build time. Discriminated on `ok` because both\n * callers have to tell \"the app rendered this\" from \"it did not\", and only one cares why.\n */\ntype RenderedVariant = { ok: true; body: string } | { ok: false; reason: string };\n\nasync function renderVariant(fetch: PrerenderOptions['fetch'], url: string, variant: PrerenderVariant): Promise<RenderedVariant> {\n  const response = await fetch(new Request(url, { headers: { Accept: VARIANTS[variant].accept } }));\n  if (response.status !== 200) return { ok: false, reason: `${response.status}` };\n  if (!(response.headers.get('Content-Type') ?? '').includes(VARIANTS[variant].contentType)) {\n    return { ok: false, reason: `a non-${VARIANTS[variant].contentType} response` };\n  }\n  return { ok: true, body: await response.text() };\n}\n\nexport async function prerenderStaticRoutes(options: PrerenderOptions): Promise<PrerenderResult> {\n  const { routes, fetch, ssgDir } = options;\n  const staticRoutes = routes.filter((r): r is PageRoute => isPageRoute(r) && r.render === 'static');\n  const origin = resolveSiteOrigin(options.siteUrl);\n\n  if (staticRoutes.length > 0 && !options.siteUrl) {\n    console.warn(\n      `  ⚠ No siteUrl in rshono.config — prerendered pages are built against ${DEFAULT_SSG_ORIGIN}, so any absolute URL\\n` +\n        `    they derive from a page's \\`url\\` prop (canonical tags, og:url, absolute links) will point there.`,\n    );\n  }\n\n  const written: string[] = [];\n  const skipped: string[] = [];\n\n  for (const route of staticRoutes) {\n    let paths: string[];\n    if (!/[:*]/.test(route.path)) {\n      paths = [route.path];\n    } else {\n      if (!route.staticPaths) {\n        console.warn(`  ⚠ Static route \"${route.path}\" has params but no staticPaths — will SSR per request.`);\n        skipped.push(route.path);\n        continue;\n      }\n      paths = (await route.staticPaths()).map((params) => interpolatePath(route.path, params));\n    }\n\n    for (const path of paths) {\n      const document = await renderVariant(fetch, origin + path, 'html');\n      if (!document.ok) {\n        console.warn(`  ⚠ \"${path}\" rendered ${document.reason} at build time — skipping, will SSR per request.`);\n        skipped.push(path);\n        continue;\n      }\n\n      const write = (variant: PrerenderVariant, body: string) => {\n        const file = join(ssgDir, ssgFilePath(path, variant)!);\n        mkdirSync(dirname(file), { recursive: true });\n        writeFileSync(file, body);\n      };\n      write('html', document.body);\n\n      // The soft-navigation representation of the same page. Best-effort: the document is valid on its own, and\n      // serving falls back to rendering the flight payload per request.\n      const flight = await renderVariant(fetch, origin + path, 'flight');\n      if (flight.ok) {\n        write('flight', flight.body);\n      } else {\n        console.warn(`  ⚠ \"${path}\" produced no flight payload — soft navigations to it will render per request.`);\n      }\n\n      written.push(path);\n    }\n  }\n\n  return { written, skipped };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rshono/core",
-  "version": "1.0.0-rc.11",
+  "version": "1.0.0-rc.13",
   "description": "Minimalist web framework — Hono + Rspack + React Server Components",
   "author": "Lasse <lasse@lassetange.com> (https://www.lassetange.com)",
   "license": "ISC",