@jxsuite/compiler 1.5.0 → 2.0.2

package/src/targets/compile-server.ts

@@ -7,6 +7,8 @@
 
 import { dereference } from "@apidevtools/json-schema-ref-parser";
 import { collectServerEntries } from "../shared.ts";
+import { localeNegotiationMiddleware } from "../site/locale-negotiation.ts";
+import type { ResolvedI18n } from "../site/i18n.ts";
 import type { JxElement } from "@jxsuite/schema/types";
 
 /**
@@ -97,6 +99,7 @@ export interface SiteConnectorSpec {
  *   `"cloudflare-pages"`, `"node"`, `"bun"`
  * @param {SiteMountSpec[]} [opts.mounts] - Extension server mounts, already sorted by order
  * @param {SiteConnectorSpec[]} [opts.connectors] - Connector classes used by the mounts
+ * @param {ResolvedI18n | null} [opts.i18n] - Locale routing; drives the `/` negotiation middleware
  * @returns {string | null} Complete worker/server source string, or null
  */
 export function compileSiteServer(
@@ -106,9 +109,16 @@ export function compileSiteServer(
     adapter?: string | null;
     mounts?: SiteMountSpec[];
     connectors?: SiteConnectorSpec[];
+    i18n?: ResolvedI18n | null;
   } = {},
 ) {
-  const { baseUrl = "/_jx/server", adapter = null, mounts = [], connectors = [] } = opts;
+  const {
+    baseUrl = "/_jx/server",
+    adapter = null,
+    mounts = [],
+    connectors = [],
+    i18n = null,
+  } = opts;
   if (entries.length === 0 && mounts.length === 0 && !adapter) {
     return null;
   }
@@ -128,12 +138,19 @@ export function compileSiteServer(
       ? "\napp.all('*', (c) => c.env.ASSETS.fetch(c.req.raw))\n"
       : "\n";
 
+  /*
+   * Negotiation is middleware and it is registered FIRST, before any route and before the ASSETS
+   * fallthrough. It has to be: on `/` it either redirects or hands the request straight back to
+   * whatever would have served it, and it cannot do the second from behind a terminal handler.
+   */
+  const localeBlock = localeNegotiationMiddleware(i18n);
+
   return `// Generated by @jxsuite/compiler — do not edit manually
 import { Hono } from 'hono'
 ${imports}${mountBlock.imports}
 
 const app = new Hono()
-${mountBlock.routes}${routes}
+${localeBlock}${mountBlock.routes}${routes}
 ${adapterBlock}
 export default app
 `;

package/src/targets/compile-static.ts

@@ -15,6 +15,7 @@ import {
   isNodeDynamic,
   PREFORMATTED_TAGS,
   pureSchemeOf,
+  resolveStaticTagName,
   resolveStaticValue,
   SELF_CLOSING,
 } from "../shared.ts";
@@ -160,7 +161,9 @@ function compileNode(
     return `<${tagName}></${tagName}>`;
   }
 
-  const tag = def.tagName ?? "div";
+  // Resolved against the same scope the attributes are, so the prerendered element and its
+  // Attributes come from one decision rather than two.
+  const tag = resolveStaticTagName(def.tagName, nextContext.scope);
   const attrs = buildAttrs(def, nextContext.scope);
 
   // Void elements (br, hr, img, …) have no closing tag.

package/src/types.ts

@@ -6,6 +6,8 @@ export interface HeadMergeContext {
   url?: string;
   siteUrl?: string;
   pageUrl?: string;
+  /** `rel="alternate"` links for this page's translations (site-architecture.md §13.5). */
+  alternates?: readonly { hreflang: string; href: string }[];
 }
 
 export interface SiteRoute {