@monkeyplus/flow 5.0.0-rc.9 → 5.0.0-rc.91

package/dist/core/runtime/nitro/flow.mjs

@@ -1,6 +1,6 @@
-import { defineEventHandler } from "h3";
 import "node-fetch-native/polyfill";
-import { useRuntimeConfig } from "#internal/nitro";
+import { defineEventHandler } from "h3";
+import { defineCachedFunction, useRuntimeConfig } from "#internal/nitro";
 const getServerApp = cachedImport(() => import("#server"));
 const getFlowRenderer = cachedResult(async () => {
   const createFlowApp = await getServerApp();
@@ -12,6 +12,7 @@ export default defineEventHandler(async ({ context }) => {
   const flow = await getFlowRenderer();
   context.flow = flow;
   context.render = flow.render;
+  context.defineCachedFunction = defineCachedFunction;
 });
 function _interopDefault(e) {
   return e && typeof e === "object" && "default" in e ? e.default : e;

package/dist/core/runtime/nitro/renderer.mjs

@@ -1,4 +1,10 @@
 import { eventHandler, useQuery } from "h3";
+import { joinURL } from "ufo";
+const normalizeCall = async (seo, ctx) => {
+  if (typeof seo === "function")
+    return await seo(ctx);
+  return seo || {};
+};
 export default eventHandler(async (event) => {
   const url = event.req.url?.split("?")[0];
   const flow = event.context.flow;
@@ -9,38 +15,64 @@ export default eventHandler(async (event) => {
   const scripts = { head: [], bodyStart: [], bodyEnd: [] };
   const chunks = { head: [], body: [] };
   const generate = {};
-  const { page, locale, params, view } = flow.router.byUrl.lookup(url) || {};
+  const { page, locale, params, view, name: pageName } = flow.router.byUrl.lookup(url) || {};
   if (!page)
     return;
-  await flow.callHook("page:scripts", scripts);
   if (view.bundle)
     await flow.callHook("page:chunks", view.bundle, chunks);
   const templateContext = {};
-  const dynamyc = params?._;
-  const contextPage = {};
+  const dynamic = params?._;
+  const contextPage = {
+    chunks,
+    locale
+  };
   const contextInject = {};
-  const utils = Object.assign({ getLocale: () => locale, injectContext: (key, value) => contextInject[key] = value }, flow.app.utils);
+  const utils = Object.assign({ getLocale: () => locale, injectContext: (key, value) => contextInject[key] = value, defineCachedFunction: event.context.defineCachedFunction }, flow.app.utils);
+  const contextHooks = {};
+  await flow.callHook("page:context", { localeCode: locale.code, page: pageName }, utils, contextHooks);
   templateContext.url = url;
+  templateContext.baseURL = flow.$config.app.baseURL;
+  const pageObject = {
+    name: pageName,
+    pathname: url,
+    url: joinURL(flow.site.origin, templateContext.baseURL, `${url}`),
+    origin: flow.site.origin,
+    joinOrigin: (_url, includeBase) => joinURL(flow.site.origin, includeBase ? templateContext.baseURL : "/", _url)
+  };
+  templateContext.page = pageObject;
+  contextPage.page = pageObject;
   templateContext.locale = locale;
   templateContext.view = view;
-  if (dynamyc && page.dynamic) {
+  if (dynamic && page.dynamic) {
     const pages = await page.dynamic.method({ locale, utils });
-    const dynamicPage = pages.find((_page) => _page.url === dynamyc);
+    const dynamicPage = pages.find((_page) => _page.url === dynamic);
     if (!dynamicPage)
       return;
     if (page.dynamic.assign)
       templateContext[page.dynamic.assign] = dynamicPage.context;
-    contextPage.dynamyc = dynamicPage;
+    contextPage.dynamic = dynamicPage;
   }
   templateContext.seo = {};
-  templateContext.context = {};
-  templateContext.sharedContext = {};
+  const sharedContext = await utils.getSharedContext({
+    ...contextHooks,
+    ...contextPage,
+    utils
+  });
+  templateContext.sharedContext = sharedContext || {};
   templateContext.utils = utils;
-  templateContext.seo = await page.seo?.({ ...contextPage, utils }) || {};
-  templateContext.context = await page.context?.({ ...contextPage, utils }) || {};
+  templateContext.seo = await normalizeCall(page?.seo, { ...contextHooks, ...contextPage, utils, sharedContext });
+  const contexData = await page.context?.({ ...contextHooks, ...contextPage, utils, sharedContext }) || {};
+  templateContext.context = {
+    ...contextHooks,
+    ...contexData
+  };
+  await flow.callHook("page:scripts", scripts, templateContext);
   templateContext.getHeadScripts = () => {
     return scripts.head.join("\n");
   };
+  templateContext.getBodyEndScripts = () => {
+    return scripts.bodyEnd.join("\n");
+  };
   templateContext.getHeadChunks = () => {
     return chunks.head.join("\n");
   };
@@ -53,8 +85,14 @@ export default eventHandler(async (event) => {
   const query = useQuery(event);
   if (query?.context)
     return { ...templateContext, utils: Object.keys(utils) };
-  const html = await flow.render(view, templateContext);
-  event.res.setHeader("Content-Type", "text/html;charset=UTF-8");
+  let html;
+  if (view.render)
+    html = await view.render(templateContext, event);
+  else
+    html = await flow.render(view, templateContext);
+  event.res.setHeader("Content-Type", view.contentType || "text/html;charset=UTF-8");
+  if (view.postRender)
+    html = await view.postRender(html, event);
   if (flow.generate) {
     await flow.callHook("page:generate", generate);
     globalThis.generate = generate;