@finesoft/front 0.1.18 → 0.1.20

package/dist/index.cjs

@@ -395,10 +395,10 @@ var init_router = __esm({
     Router = class {
       routes = [];
       /** 添加路由规则 */
-      add(pattern, intentId) {
+      add(pattern, intentId, renderMode) {
         const paramNames = [];
         const regexStr = pattern.replace(
-          /\/:(\w+)(\?)?/g,
+          /\/:([\w]+)(\?)?/g,
           (_, name, optional) => {
             paramNames.push(name);
             return optional ? "(?:/([^/]+))?" : "/([^/]+)";
@@ -408,7 +408,8 @@ var init_router = __esm({
           pattern,
           intentId,
           regex: new RegExp(`^${regexStr}/?$`),
-          paramNames
+          paramNames,
+          renderMode
         });
         return this;
       }
@@ -429,7 +430,8 @@ var init_router = __esm({
             }
             return {
               intent: { id: route.intentId, params },
-              action: makeFlowAction(urlOrPath)
+              action: makeFlowAction(urlOrPath),
+              renderMode: route.renderMode
             };
           }
         }
@@ -817,7 +819,7 @@ function defineRoutes(framework, definitions) {
       framework.registerIntent(def.controller);
       registeredIntents.add(def.intentId);
     }
-    framework.router.add(def.path, def.intentId);
+    framework.router.add(def.path, def.intentId, def.renderMode);
   }
 }
 var init_define_routes = __esm({
@@ -973,6 +975,16 @@ async function ssrRender(options) {
   const parsed = new URL(url, "http://localhost");
   const fullPath = parsed.pathname + parsed.search;
   const match = framework.routeUrl(fullPath);
+  if (match?.renderMode === "csr") {
+    framework.dispose();
+    return {
+      html: "",
+      head: "",
+      css: "",
+      serverData: [],
+      renderMode: "csr"
+    };
+  }
   let page;
   let serverData = [];
   if (match) {
@@ -991,7 +1003,8 @@ async function ssrRender(options) {
     html: result.html,
     head: result.head,
     css: result.css,
-    serverData
+    serverData,
+    renderMode: match?.renderMode
   };
 }
 var init_render = __esm({
@@ -1029,6 +1042,9 @@ ${cssTag}`).replace(SSR_PLACEHOLDERS.BODY, html).replace(
     `<script id="serialized-server-data" type="application/json">${serializedData}</script>`
   );
 }
+function injectCSRShell(template, locale) {
+  return template.replace(SSR_PLACEHOLDERS.LANG, locale).replace(SSR_PLACEHOLDERS.HEAD, "").replace(SSR_PLACEHOLDERS.BODY, "").replace(SSR_PLACEHOLDERS.DATA, "");
+}
 var SSR_PLACEHOLDERS;
 var init_inject = __esm({
   "../ssr/src/inject.ts"() {
@@ -1071,6 +1087,7 @@ __export(src_exports, {
   Framework: () => Framework,
   SSR_PLACEHOLDERS: () => SSR_PLACEHOLDERS,
   createSSRRender: () => createSSRRender,
+  injectCSRShell: () => injectCSRShell,
   injectSSRContent: () => injectSSRContent,
   serializeServerData: () => serializeServerData,
   ssrRender: () => ssrRender
@@ -1132,6 +1149,7 @@ function createSSRApp(options) {
     defaultLocale
   } = options;
   const app = new import_hono.Hono();
+  const isrCache = /* @__PURE__ */ new Map();
   async function readTemplate(url) {
     if (!isProduction && vite) {
       const { readFileSync: readFileSync2 } = await import(
@@ -1182,6 +1200,9 @@ function createSSRApp(options) {
   app.get("*", async (c) => {
     const url = c.req.path + (c.req.url.includes("?") ? "?" + c.req.url.split("?")[1] : "");
     try {
+      const cacheKey = url;
+      const cached = isrCache.get(cacheKey);
+      if (cached) return c.html(cached);
       const template = await readTemplate(url);
       const { render, serializeServerData: serializeServerData2 } = await loadSSRModule();
       const locale = parseAcceptLanguage(
@@ -1193,8 +1214,12 @@ function createSSRApp(options) {
         html: appHtml,
         head,
         css,
-        serverData
+        serverData,
+        renderMode
       } = await render(url, locale);
+      if (renderMode === "csr") {
+        return c.html(injectCSRShell(template, locale));
+      }
       const serializedData = serializeServerData2(serverData);
       const finalHtml = injectSSRContent({
         template,
@@ -1204,6 +1229,9 @@ function createSSRApp(options) {
         html: appHtml,
         serializedData
       });
+      if (renderMode === "prerender") {
+        isrCache.set(cacheKey, finalHtml);
+      }
       return c.html(finalHtml);
     } catch (e) {
       if (!isProduction && vite) {
@@ -1261,6 +1289,7 @@ __export(index_exports, {
   finesoftFrontViteConfig: () => finesoftFrontViteConfig,
   generateUuid: () => generateUuid,
   getBaseUrl: () => getBaseUrl,
+  injectCSRShell: () => injectCSRShell,
   injectSSRContent: () => injectSSRContent,
   isCompoundAction: () => isCompoundAction,
   isExternalUrlAction: () => isExternalUrlAction,
@@ -1645,6 +1674,7 @@ function generateSSREntry(ctx, opts) {
   const setupCall = ctx.setupPath ? `if (typeof _setupDefault === "function") await _setupDefault(app);` : ``;
   const locales = JSON.stringify(ctx.locales);
   const defaultLocale = JSON.stringify(ctx.defaultLocale);
+  const renderModes = JSON.stringify(ctx.renderModes ?? {});
   return `
 import { Hono } from "hono";
 ${opts.platformImport}
@@ -1654,6 +1684,7 @@ ${setupImport}
 const TEMPLATE = ${JSON.stringify(ctx.templateHtml)};
 const LOCALES = ${locales};
 const DEFAULT_LOCALE = ${defaultLocale};
+const RENDER_MODES = ${renderModes};
 
 function parseAcceptLanguage(header) {
   if (!header) return DEFAULT_LOCALE;
@@ -1676,6 +1707,28 @@ function injectSSR(t, locale, head, css, html, data) {
     .replace("<!--ssr-data-->", '<script id="serialized-server-data" type="application/json">' + data + "</script>");
 }
 
+function injectCSRShell(t, locale) {
+  return t
+    .replace("<!--ssr-lang-->", locale)
+    .replace("<!--ssr-head-->", "")
+    .replace("<!--ssr-body-->", "")
+    .replace("<!--ssr-data-->", "");
+}
+
+function matchRenderMode(url) {
+  const path = url.split("?")[0];
+  if (RENDER_MODES[path]) return RENDER_MODES[path];
+  for (const [pattern, mode] of Object.entries(RENDER_MODES)) {
+    if (pattern.includes("*")) {
+      const re = new RegExp("^" + pattern.replace(/\\*/g, ".*") + "$");
+      if (re.test(path)) return mode;
+    }
+  }
+  return null;
+}
+
+const isrCache = new Map();
+
 const app = new Hono();
 ${setupCall}
 
@@ -1683,9 +1736,33 @@ app.get("*", async (c) => {
   const url = c.req.path + (c.req.url.includes("?") ? "?" + c.req.url.split("?")[1] : "");
   try {
     const locale = parseAcceptLanguage(c.req.header("accept-language"));
-    const { html: appHtml, head, css, serverData } = await render(url, locale);
+
+    // Vite \u914D\u7F6E\u7EA7\u522B\u8986\u76D6: CSR \u76F4\u63A5\u8FD4\u56DE\u7A7A\u58F3
+    const overrideMode = matchRenderMode(url);
+    if (overrideMode === "csr") {
+      return c.html(injectCSRShell(TEMPLATE, locale));
+    }
+
+    // ISR \u7F13\u5B58\u547D\u4E2D
+    const cached = isrCache.get(url);
+    if (cached) return c.html(cached);
+
+    const { html: appHtml, head, css, serverData, renderMode } = await render(url, locale);
+
+    // \u8DEF\u7531\u7EA7 CSR
+    if (renderMode === "csr") {
+      return c.html(injectCSRShell(TEMPLATE, locale));
+    }
+
     const serializedData = serializeServerData(serverData);
-    return c.html(injectSSR(TEMPLATE, locale, head, css, appHtml, serializedData));
+    const finalHtml = injectSSR(TEMPLATE, locale, head, css, appHtml, serializedData);
+
+    // Prerender ISR \u7F13\u5B58\uFF08\u5305\u62EC Vite \u914D\u7F6E\u8986\u76D6\u548C\u8DEF\u7531\u7EA7\uFF09
+    if (renderMode === "prerender" || overrideMode === "prerender") {
+      isrCache.set(url, finalHtml);
+    }
+
+    return c.html(finalHtml);
   } catch (e) {
     console.error("[SSR Error]", e);
     return c.text("Internal Server Error", 500);
@@ -1724,6 +1801,89 @@ function copyStaticAssets(ctx, destDir, opts) {
     fs.rmSync(path.join(destDir, "index.html"), { force: true });
   }
 }
+async function prerenderRoutes(ctx, routesExport = "src/lib/bootstrap.ts") {
+  const { fs, path, root, vite } = ctx;
+  const { pathToFileURL } = await import(
+    /* @vite-ignore */
+    "url"
+  );
+  await vite.build({
+    root,
+    build: {
+      ssr: routesExport,
+      outDir: path.resolve(root, "dist/server"),
+      emptyOutDir: false,
+      rollupOptions: {
+        output: { entryFileNames: "_routes_prerender.mjs" }
+      }
+    },
+    resolve: ctx.resolvedResolve
+  });
+  const routesPath = pathToFileURL(
+    path.resolve(root, "dist/server/_routes_prerender.mjs")
+  ).href;
+  const routesMod = await import(
+    /* @vite-ignore */
+    routesPath
+  );
+  const routes = routesMod.routes ?? routesMod.default ?? [];
+  fs.rmSync(path.resolve(root, "dist/server/_routes_prerender.mjs"), {
+    force: true
+  });
+  const prerenderPaths = /* @__PURE__ */ new Set();
+  for (const r of routes) {
+    if (r.renderMode === "prerender" && r.path && !r.path.includes(":")) {
+      prerenderPaths.add(r.path);
+    }
+  }
+  if (ctx.renderModes) {
+    for (const [pattern, mode] of Object.entries(ctx.renderModes)) {
+      if (mode === "prerender" && !pattern.includes("*") && !pattern.includes(":")) {
+        prerenderPaths.add(pattern);
+      }
+    }
+  }
+  if (prerenderPaths.size === 0) return [];
+  const ssrPath = pathToFileURL(
+    path.resolve(root, "dist/server/ssr.js")
+  ).href;
+  const ssrModule = await import(
+    /* @vite-ignore */
+    ssrPath
+  );
+  const results = [];
+  for (const routePath of prerenderPaths) {
+    for (const locale of ctx.locales) {
+      const url = locale === ctx.defaultLocale ? routePath : `/${locale}${routePath === "/" ? "" : routePath}`;
+      try {
+        const {
+          html: appHtml,
+          head,
+          css,
+          serverData
+        } = await ssrModule.render(url, locale);
+        const serializedData = ssrModule.serializeServerData(serverData);
+        const finalHtml = ctx.templateHtml.replace("<!--ssr-lang-->", locale).replace(
+          "<!--ssr-head-->",
+          head + "\n<style>" + css + "</style>"
+        ).replace("<!--ssr-body-->", appHtml).replace(
+          "<!--ssr-data-->",
+          '<script id="serialized-server-data" type="application/json">' + serializedData + "</script>"
+        );
+        results.push({ url, html: finalHtml });
+      } catch (e) {
+        console.warn(`  [prerender] Failed to render ${url}:`, e);
+      }
+    }
+  }
+  if (results.length > 0) {
+    console.log(
+      `  Pre-rendered ${results.length} pages (${prerenderPaths.size} routes \xD7 ${ctx.locales.length} locales)
+`
+    );
+  }
+  return results;
+}
 
 // ../server/src/adapters/cloudflare.ts
 function cloudflareAdapter() {
@@ -1749,6 +1909,14 @@ function cloudflareAdapter() {
           // 这些构建工具运行时不需要，且 fsevents 是 macOS .node 原生二进制无法打包
         });
         copyStaticAssets(ctx, path.resolve(outputDir, "assets"));
+        const prerendered = await prerenderRoutes(ctx);
+        for (const { url, html } of prerendered) {
+          const filePath = url === "/" ? path.join(outputDir, "assets", "index.html") : path.join(outputDir, "assets", url, "index.html");
+          fs.mkdirSync(path.resolve(filePath, ".."), {
+            recursive: true
+          });
+          fs.writeFileSync(filePath, html);
+        }
       } finally {
         fs.rmSync(tempEntry, { force: true });
       }
@@ -1792,6 +1960,13 @@ function netlifyAdapter() {
         path.resolve(root, "dist/client/_redirects"),
         redirects
       );
+      const prerendered = await prerenderRoutes(ctx);
+      const clientDir = path.resolve(root, "dist/client");
+      for (const { url, html } of prerendered) {
+        const filePath = url === "/" ? path.join(clientDir, "index.html") : path.join(clientDir, url, "index.html");
+        fs.mkdirSync(path.resolve(filePath, ".."), { recursive: true });
+        fs.writeFileSync(filePath, html);
+      }
       console.log(
         "  Netlify output \u2192 .netlify/functions-internal/ssr/\n  Publish dir: dist/client/\n"
       );
@@ -1825,6 +2000,18 @@ serve({ fetch: app.fetch, port }, (info) => {
       } finally {
         fs.rmSync(tempEntry, { force: true });
       }
+      const prerendered = await prerenderRoutes(ctx);
+      if (prerendered.length > 0) {
+        const prerenderDir = path.resolve(root, "dist/prerender");
+        fs.mkdirSync(prerenderDir, { recursive: true });
+        for (const { url, html } of prerendered) {
+          const filePath = url === "/" ? path.join(prerenderDir, "index.html") : path.join(prerenderDir, url, "index.html");
+          fs.mkdirSync(path.resolve(filePath, ".."), {
+            recursive: true
+          });
+          fs.writeFileSync(filePath, html);
+        }
+      }
       console.log(
         "  Node output \u2192 dist/server/index.mjs\n  Run: node dist/server/index.mjs\n"
       );
@@ -1853,7 +2040,7 @@ function staticAdapter(opts = {}) {
         ssrPath
       );
       ctx.copyStaticAssets(outputDir, { excludeHtml: true });
-      const routePaths = await extractRoutes(ctx, opts);
+      const { paths: routePaths, defs: routeDefs } = await extractRoutesWithModes(ctx, opts);
       const allUrls = [];
       for (const routePath of routePaths) {
         for (const locale of ctx.locales) {
@@ -1872,21 +2059,37 @@ function staticAdapter(opts = {}) {
             ctx.locales,
             ctx.defaultLocale
           );
-          const {
-            html: appHtml,
-            head,
-            css,
-            serverData
-          } = await ssrModule.render(url, locale);
-          const serializedData = ssrModule.serializeServerData(serverData);
-          const finalHtml = injectSSRForStatic(
-            ctx.templateHtml,
-            locale,
-            head,
-            css,
-            appHtml,
-            serializedData
+          const routeDef = routeDefs.find(
+            (r) => r.path === stripLocalePrefix(url, ctx.locales)
+          );
+          const mode = resolveRenderMode(
+            stripLocalePrefix(url, ctx.locales),
+            routeDef?.renderMode,
+            ctx.renderModes
           );
+          let finalHtml;
+          if (mode === "csr") {
+            finalHtml = injectCSRShellForStatic(
+              ctx.templateHtml,
+              locale
+            );
+          } else {
+            const {
+              html: appHtml,
+              head,
+              css,
+              serverData
+            } = await ssrModule.render(url, locale);
+            const serializedData = ssrModule.serializeServerData(serverData);
+            finalHtml = injectSSRForStatic(
+              ctx.templateHtml,
+              locale,
+              head,
+              css,
+              appHtml,
+              serializedData
+            );
+          }
           const filePath = url === "/" ? path.join(outputDir, "index.html") : path.join(outputDir, url, "index.html");
           fs.mkdirSync(path.resolve(filePath, ".."), {
             recursive: true
@@ -1901,9 +2104,10 @@ function staticAdapter(opts = {}) {
     }
   };
 }
-async function extractRoutes(ctx, opts) {
+async function extractRoutesWithModes(ctx, opts) {
   const routesFile = opts.routesExport ?? "src/lib/bootstrap.ts";
   const paths = [];
+  const defs = [];
   try {
     const { pathToFileURL } = await import(
       /* @vite-ignore */
@@ -1933,6 +2137,7 @@ async function extractRoutes(ctx, opts) {
       for (const r of routes) {
         if (r.path && !r.path.includes(":")) {
           paths.push(r.path);
+          defs.push({ path: r.path, renderMode: r.renderMode });
         }
       }
     }
@@ -1952,7 +2157,7 @@ async function extractRoutes(ctx, opts) {
     }
   }
   if (paths.length === 0) paths.push("/");
-  return paths;
+  return { paths, defs };
 }
 function inferLocale(url, locales, defaultLocale) {
   const segments = url.split("/").filter(Boolean);
@@ -1967,6 +2172,29 @@ function injectSSRForStatic(template, locale, head, css, html, serializedData) {
     '<script id="serialized-server-data" type="application/json">' + serializedData + "</script>"
   );
 }
+function injectCSRShellForStatic(template, locale) {
+  return template.replace("<!--ssr-lang-->", locale).replace("<!--ssr-head-->", "").replace("<!--ssr-body-->", "").replace("<!--ssr-data-->", "");
+}
+function stripLocalePrefix(url, locales) {
+  const segments = url.split("/").filter(Boolean);
+  if (segments.length > 0 && locales.includes(segments[0])) {
+    const rest = segments.slice(1).join("/");
+    return rest ? `/${rest}` : "/";
+  }
+  return url;
+}
+function resolveRenderMode(routePath, routeRenderMode, renderModes) {
+  if (renderModes) {
+    if (renderModes[routePath]) return renderModes[routePath];
+    for (const [pattern, mode] of Object.entries(renderModes)) {
+      if (pattern.includes("*")) {
+        const re = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$");
+        if (re.test(routePath)) return mode;
+      }
+    }
+  }
+  return routeRenderMode ?? "ssr";
+}
 
 // ../server/src/adapters/vercel.ts
 function vercelAdapter() {
@@ -1977,8 +2205,8 @@ function vercelAdapter() {
       const outputDir = path.resolve(root, ".vercel/output");
       fs.rmSync(outputDir, { recursive: true, force: true });
       const entrySource = generateSSREntry(ctx, {
-        platformImport: `import { handle } from "hono/vercel";`,
-        platformExport: `export default handle(app);`
+        platformImport: `import { getRequestListener } from "@hono/node-server";`,
+        platformExport: `export default getRequestListener(app.fetch);`
       });
       const tempEntry = path.resolve(root, ".vercel-entry.tmp.mjs");
       fs.writeFileSync(tempEntry, entrySource);
@@ -2025,6 +2253,13 @@ function vercelAdapter() {
       } finally {
         fs.rmSync(tempEntry, { force: true });
       }
+      const prerendered = await prerenderRoutes(ctx);
+      const staticDir = path.resolve(root, ".vercel/output/static");
+      for (const { url, html } of prerendered) {
+        const filePath = url === "/" ? path.join(staticDir, "index.html") : path.join(staticDir, url, "index.html");
+        fs.mkdirSync(path.resolve(filePath, ".."), { recursive: true });
+        fs.writeFileSync(filePath, html);
+      }
       console.log("  Vercel output \u2192 .vercel/output/\n");
     }
   };
@@ -2297,6 +2532,18 @@ function resolveSetupFn(mod) {
   const first = Object.values(mod).find((v) => typeof v === "function");
   return first ?? null;
 }
+function matchRenderModeConfig(url, renderModes) {
+  if (!renderModes) return null;
+  const path = url.split("?")[0];
+  if (renderModes[path]) return renderModes[path];
+  for (const [pattern, mode] of Object.entries(renderModes)) {
+    if (pattern.includes("*")) {
+      const re = new RegExp("^" + pattern.replace(/\*/g, ".*") + "$");
+      if (re.test(path)) return mode;
+    }
+  }
+  return null;
+}
 function finesoftFrontViteConfig(options = {}) {
   const ssrEntry = options.ssr?.entry ?? "src/ssr.ts";
   let root = process.cwd();
@@ -2376,13 +2623,14 @@ function finesoftFrontViteConfig(options = {}) {
           /* @vite-ignore */
           "hono"
         );
-        const { injectSSRContent: injectSSRContent2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
+        const { injectSSRContent: injectSSRContent2, injectCSRShell: injectCSRShell2 } = await Promise.resolve().then(() => (init_src2(), src_exports));
         const { parseAcceptLanguage: parseAcceptLanguage2 } = await Promise.resolve().then(() => (init_locale(), locale_exports));
         const { getRequestListener } = await import(
           /* @vite-ignore */
           "@hono/node-server"
         );
         const app = new HonoClass();
+        const isrCache = /* @__PURE__ */ new Map();
         if (typeof options.setup === "function") {
           await options.setup(app);
         } else if (typeof options.setup === "string") {
@@ -2421,12 +2669,25 @@ function finesoftFrontViteConfig(options = {}) {
               options.locales,
               options.defaultLocale
             );
+            const overrideMode = matchRenderModeConfig(
+              url,
+              options.renderModes
+            );
+            if (overrideMode === "csr") {
+              return c.html(injectCSRShell2(template, locale));
+            }
+            const cached = isrCache.get(url);
+            if (cached) return c.html(cached);
             const {
               html: appHtml,
               head,
               css,
-              serverData
+              serverData,
+              renderMode
             } = await ssrModule.render(url, locale);
+            if (renderMode === "csr") {
+              return c.html(injectCSRShell2(template, locale));
+            }
             const serializedData = ssrModule.serializeServerData(serverData);
             const finalHtml = injectSSRContent2({
               template,
@@ -2436,6 +2697,9 @@ function finesoftFrontViteConfig(options = {}) {
               html: appHtml,
               serializedData
             });
+            if (renderMode === "prerender" || overrideMode === "prerender") {
+              isrCache.set(url, finalHtml);
+            }
             return c.html(finalHtml);
           } catch (e) {
             console.error("[SSR Preview Error]", e);
@@ -2506,6 +2770,7 @@ function finesoftFrontViteConfig(options = {}) {
             locales,
             defaultLocale,
             templateHtml,
+            renderModes: options.renderModes,
             resolvedResolve,
             resolvedCss,
             vite,
@@ -2565,6 +2830,7 @@ function finesoftFrontViteConfig(options = {}) {
   finesoftFrontViteConfig,
   generateUuid,
   getBaseUrl,
+  injectCSRShell,
   injectSSRContent,
   isCompoundAction,
   isExternalUrlAction,