@webtypen/webframez-react 0.0.47 → 0.0.49

package/dist/webframez-core.js

@@ -38,6 +38,8 @@ function createHTMLShell(options = {}) {
     buildId = "",
     headTags = "",
     bodyClassName = "",
+    bodyStartHtml = "",
+    bodyEndHtml = "",
     rootHtml = "",
     initialFlightData = "",
     basename = "",
@@ -87,7 +89,9 @@ function createHTMLShell(options = {}) {
     ${headTags}
   </head>
   <body${bodyClassName ? ` class="${bodyClassName.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;")}"` : ""}>
+    ${bodyStartHtml}
     <div id="root">${rootHtml}</div>
+    ${bodyEndHtml}
     <script>window.__RSC_ENDPOINT = "${rscEndpoint}";</script>
     <script>window.__RSC_BASENAME = "${basename}";</script>
     <script>window.__RSC_ROUTE_BASE_PATH = "${routeBasePath}";</script>
@@ -202,6 +206,12 @@ function normalizeHeadConfig(head, inheritedBasename) {
       href: resolveHeadAssetUrl(link.href, effectiveBasename)
     }));
   }
+  if (normalizedHead.scripts) {
+    normalizedHead.scripts = normalizedHead.scripts.map((script) => ({
+      ...script,
+      ...script.src ? { src: resolveHeadAssetUrl(script.src, effectiveBasename) } : {}
+    }));
+  }
   return normalizedHead;
 }
 
@@ -454,7 +464,9 @@ function matchRoute(entry, pathname) {
 function mergeHead(...configs) {
   const merged = {
     meta: [],
-    links: []
+    links: [],
+    scripts: [],
+    html: []
   };
   for (const candidate of configs) {
     const config = normalizeHeadConfig(candidate, merged.basename);
@@ -489,9 +501,28 @@ function mergeHead(...configs) {
     if (config.links) {
       merged.links?.push(...config.links);
     }
+    if (config.scripts) {
+      merged.scripts?.push(...config.scripts);
+    }
+    if (config.html) {
+      merged.html?.push(...Array.isArray(config.html) ? config.html : [config.html]);
+    }
+    if (config.bodyStartHtml) {
+      merged.bodyStartHtml = [merged.bodyStartHtml, config.bodyStartHtml].filter(Boolean).join("\n");
+    }
+    if (config.bodyEndHtml) {
+      merged.bodyEndHtml = [merged.bodyEndHtml, config.bodyEndHtml].filter(Boolean).join("\n");
+    }
   }
   return merged;
 }
+function renderGenericAttributes(entry, excluded = []) {
+  return Object.entries(entry).filter(
+    ([key, value]) => !excluded.includes(key) && value !== void 0 && value !== null && value !== false
+  ).map(
+    ([key, value]) => value === true ? key : `${key}="${escapeHtml(String(value))}"`
+  ).join(" ");
+}
 function renderHeadToString(head) {
   const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
@@ -513,6 +544,23 @@ function renderHeadToString(head) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
+  for (const script of normalizedHead.scripts ?? []) {
+    if (script.html) {
+      tags.push(script.html);
+      continue;
+    }
+    const attrs = renderGenericAttributes(script, [
+      "content",
+      "html"
+    ]);
+    const content = script.content ? String(script.content) : "";
+    tags.push(`<script ${createManagedAttributes()} ${attrs}>${content}</script>`);
+  }
+  for (const html of normalizedHead.html ?? []) {
+    if (typeof html === "string" && html.trim() !== "") {
+      tags.push(html);
+    }
+  }
   return tags.join("\n");
 }
 function clearModuleCache(modulePath, rootDir, visited = /* @__PURE__ */ new Set()) {
@@ -598,6 +646,7 @@ function isRouteAbort(value) {
 function createFileRouter(options) {
   installForcedPackageResolution();
   const pagesDir = options.pagesDir;
+  const onData = options.onData;
   const layoutPath = path2.join(pagesDir, "layout.js");
   const errorPath = path2.join(pagesDir, "errors.js");
   const middlewaresPath = path2.join(pagesDir, "middlewares.js");
@@ -762,10 +811,16 @@ function createFileRouter(options) {
         data: mergeRouteData(middlewareContext.data, pageData)
       };
       activeContext = pageContext;
-      const pageNode = await pageModule.default(pageContext);
-      const layoutHead = layoutModule ? await resolveHead(layoutModule, pageContext) : void 0;
-      const pageHead = await resolveHead(pageModule, pageContext);
-      const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
+      const onDataResult = typeof onData === "function" ? await onData(pageContext) : void 0;
+      const eventContext = {
+        ...pageContext,
+        data: mergeRouteData(pageContext.data, onDataResult)
+      };
+      activeContext = eventContext;
+      const pageNode = await pageModule.default(eventContext);
+      const layoutHead = layoutModule ? await resolveHead(layoutModule, eventContext) : void 0;
+      const pageHead = await resolveHead(pageModule, eventContext);
+      const layoutNode = layoutModule ? await layoutModule.default(eventContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
       const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildren, {})) : void 0;
       return {
@@ -774,7 +829,7 @@ function createFileRouter(options) {
         contextModel,
         pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead),
-        context: pageContext
+        context: eventContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -1597,7 +1652,7 @@ function createNodeRequestHandler(options) {
   const liveReloadEnabled = options.liveReloadPath !== false && (nodeEnv === "development" || runningInWatchMode);
   const liveReloadPath = !liveReloadEnabled ? "" : options.liveReloadPath ?? `${basePath || ""}/__webframez_live_reload`;
   const liveReloadClients = /* @__PURE__ */ new Set();
-  const router = createFileRouter({ pagesDir });
+  const router = createFileRouter({ pagesDir, onData: options.onData });
   const getManifestState = createManifestLoader({
     distRootDir,
     manifestPath,
@@ -1821,6 +1876,8 @@ function createNodeRequestHandler(options) {
         initialFlightData,
         basename: shellBasename,
         routeBasePath: shellRouteBasePath,
+        bodyStartHtml: resolved.head.bodyStartHtml || "",
+        bodyEndHtml: resolved.head.bodyEndHtml || "",
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       }),
@@ -2064,7 +2121,8 @@ function resolveWebframezReactRouteOptions(routePathValue, options = {}) {
     clientEntryPath: options.clientEntryPath ? resolveFromProjectRoot(options.clientEntryPath) : void 0,
     styleSrcPath: options.styleSrcPath ? resolveFromProjectRoot(options.styleSrcPath) : defaults.styleSrcPath,
     basePath: options.basePath ?? defaults.basePath,
-    liveReloadPath: options.liveReloadPath
+    liveReloadPath: options.liveReloadPath,
+    onData: options.onData
   };
 }
 function getRegisteredReactBuildTargets() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {