@jxsuite/compiler 6.1.0 → 7.0.0

package/src/targets/compile-server.ts

@@ -1,65 +1,30 @@
 /**
- * Compile-server.js — Hono server handler compilation
+ * Compile-server.js — the site worker
  *
- * Compiles `timing: "server"` entries from a Jx document into a deployable Hono server handler
- * file.
+ * Emits the one Hono worker a site deploys beside its static output: every `timing: "server"` entry
+ * the build collected as a `POST /_jx/server/<export>` route, the extension server mounts, and the
+ * adapter's fallthrough to static assets (compiler.md §6.3).
  */
 
 import { withBase } from "@jxsuite/schema/asset-paths";
-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 { JxDocumentValue, JxElement } from "@jxsuite/schema/types";
+import type { JxDocumentValue } from "@jxsuite/schema/types";
 
 /**
- * Compile a Jx document to a Hono server handler file. The handler exposes each `timing: "server"`
- * entry as a POST endpoint under `/_jx/server/$export`. Returns null if no server entries are
- * found.
+ * The route prefix the site worker registers its server functions under, and a compiled page or
+ * component posts to: the deployment base (site-architecture.md §14.7) in front of `baseUrl`.
  *
- * @example
- *   const server = await compileServer("./dashboard.json");
- *   if (server) fs.writeFileSync("dist/server.js", server);
+ * One function builds it for both sides. The worker IS the origin, so a route left at the bare path
+ * never matches on a site served from a subfolder, and no pass rewrites a module after it is
+ * compiled, so the caller has to be given the same prefix when the module is.
  *
- * @param {string | JxElement} sourcePath - Path to .json file, URL, or raw document
- * @param {object} [opts]
- * @param {string} [opts.baseUrl] - Base path for server endpoints. Default is `'/_jx/server'`
- * @returns {Promise<string | null>} Hono server handler source string, or null
+ * @param {string} base - The deployment base, `""` for a site at an origin root
+ * @param {string} [baseUrl] - Route prefix before the base is applied, `"/_jx/server"` by default
+ * @returns {string}
  */
-export async function compileServer(
-  sourcePath: string | JxElement,
-  opts: {
-    baseUrl?: string;
-  } = {},
-) {
-  const { baseUrl = "/_jx/server" } = opts;
-  /* SAFETY: the parameter is a Jx element document or the path of one, and `dereference` only
-     replaces each `$ref` node with the value it points to, so the result is that same document
-     with its references inlined. A file read from disk is not re-validated here. */
-  const doc = (await dereference(sourcePath)) as JxElement;
-  const entries = collectServerEntries(doc);
-  if (entries.length === 0) {
-    return null;
-  }
-
-  const imports = entries
-    .map(({ exportName, src }) => `import { ${exportName} } from '${src}'`)
-    .join("\n");
-
-  const routes = entries.map(({ exportName }) => buildRoute(exportName, baseUrl)).join("\n");
-
-  return `// Generated by @jxsuite/compiler — do not edit manually
-// Deploy as a Cloudflare Worker, Node server, or Bun process.
-// Requires: npm install hono
-
-import { Hono } from 'hono'
-${imports}
-
-const app = new Hono()
-${routes}
-
-export default app
-`;
+export function serverRoutePrefix(base: string, baseUrl = "/_jx/server"): string {
+  return withBase(base, baseUrl);
 }
 
 /**
@@ -131,7 +96,7 @@ export function compileSiteServer(
    * everything behind it routes on the bare path. Each is internally consistent: production serves
    * exactly one URL space, while `jx dev` deliberately answers both.
    */
-  const baseUrl = withBase(base, opts.baseUrl ?? "/_jx/server");
+  const baseUrl = serverRoutePrefix(base, opts.baseUrl);
   if (entries.length === 0 && mounts.length === 0 && !adapter) {
     return null;
   }
@@ -217,7 +182,7 @@ function buildRoute(exportName: string, baseUrl: string) {
 app.post('${baseUrl}/${exportName}', async (c) => {
   const args = await c.req.json().catch(() => ({}))
   try {
-    return c.json(await ${exportName}(args, c.env))
+    return c.json((await ${exportName}(args, c.env)) ?? null)
   } catch (e) {
     return c.json({ ok: false, error: e?.message ?? 'Server error' }, 500)
   }