@webtypen/webframez-react 0.0.31 → 0.0.33

package/dist/webframez-core.cjs

@@ -145,6 +145,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = (0, import_server.renderToPipeableStream)(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -154,6 +155,7 @@ function sendRSC(res, model, options = {}) {
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module2 = __toESM(require("node:module"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
+var import_route_slot = require("@webtypen/webframez-react/route-slot");
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -243,6 +245,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -258,13 +270,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!import_react.default.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = import_react.default.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -272,10 +288,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return import_react.default.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return import_react.default.cloneElement(node, void 0, ...nextChildren);
+    }
+    return import_react.default.cloneElement(node, void 0, nextChildren);
   }
-  return import_react.default.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return import_react.default.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -440,15 +465,22 @@ function mergeHead(...configs) {
     if (!config) {
       continue;
     }
+    const hasOwn = (key) => Object.prototype.hasOwnProperty.call(config, key);
     if (config.title) {
       merged.title = config.title;
     }
     if (config.description) {
       merged.description = config.description;
     }
-    if (config.basename) {
+    if (hasOwn("basename")) {
       merged.basename = config.basename;
     }
+    if (hasOwn("routeBasePath")) {
+      merged.routeBasePath = config.routeBasePath;
+    }
+    if (hasOwn("transportBasePath")) {
+      merged.transportBasePath = config.transportBasePath;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -609,9 +641,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -731,9 +766,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_route_slot.RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -888,7 +926,7 @@ async function decodeFlightPayloadFromString(flightData, moduleMap) {
 
   if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
     return await reactServerDomClientNode.createFromNodeStream(
-      Readable.from([flightData]),
+      Readable.from([Buffer.from(flightData)]),
       serverConsumerManifest
     );
   }
@@ -913,7 +951,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1380,6 +1432,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1402,6 +1456,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = import_node_fs2.default.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1425,6 +1480,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/dist/webframez-core.js

@@ -117,6 +117,7 @@ function sendRSC(res, model, options = {}) {
   } = options;
   res.statusCode = statusCode;
   res.setHeader("Content-Type", contentType);
+  res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
   const stream = renderToPipeableStream(model, moduleMap, { onError });
   stream.pipe(res);
   return stream;
@@ -126,6 +127,7 @@ function sendRSC(res, model, options = {}) {
 import fs from "node:fs";
 import Module from "node:module";
 import path2 from "node:path";
+import { RouteChildrenSlot } from "@webtypen/webframez-react/route-slot";
 
 // src/head.ts
 var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
@@ -215,6 +217,16 @@ function isRouteChildrenType(type) {
     return false;
   }
 }
+function isReactElementLike(node) {
+  if (!node || typeof node !== "object") {
+    return false;
+  }
+  try {
+    return "type" in node && "props" in node;
+  } catch {
+    return false;
+  }
+}
 function injectRouteChildren(node, routeChildren) {
   if (node === null || node === void 0 || typeof node === "boolean") {
     return node;
@@ -230,13 +242,17 @@ function injectRouteChildren(node, routeChildren) {
     });
     return changed ? next : node;
   }
-  if (!React.isValidElement(node)) {
+  if (isReactElementLike(node) && isRouteChildrenType(node.type)) {
+    return routeChildren;
+  }
+  const isValidElement = React.isValidElement(node);
+  if (!isValidElement && !isReactElementLike(node)) {
     return node;
   }
-  if (isRouteChildrenType(node.type)) {
+  if (isValidElement && isRouteChildrenType(node.type)) {
     return routeChildren;
   }
-  const props = node.props;
+  const props = node.props ?? {};
   if (!("children" in props)) {
     return node;
   }
@@ -244,10 +260,19 @@ function injectRouteChildren(node, routeChildren) {
   if (nextChildren === props.children) {
     return node;
   }
-  if (Array.isArray(nextChildren)) {
-    return React.cloneElement(node, void 0, ...nextChildren);
+  if (isValidElement) {
+    if (Array.isArray(nextChildren)) {
+      return React.cloneElement(node, void 0, ...nextChildren);
+    }
+    return React.cloneElement(node, void 0, nextChildren);
   }
-  return React.cloneElement(node, void 0, nextChildren);
+  const elementLike = node;
+  const nextProps = {
+    ...elementLike.props ?? {},
+    children: nextChildren,
+    ...elementLike.key !== void 0 && elementLike.key !== null ? { key: elementLike.key } : {}
+  };
+  return React.createElement(elementLike.type, nextProps);
 }
 
 // src/file-router.tsx
@@ -412,15 +437,22 @@ function mergeHead(...configs) {
     if (!config) {
       continue;
     }
+    const hasOwn = (key) => Object.prototype.hasOwnProperty.call(config, key);
     if (config.title) {
       merged.title = config.title;
     }
     if (config.description) {
       merged.description = config.description;
     }
-    if (config.basename) {
+    if (hasOwn("basename")) {
       merged.basename = config.basename;
     }
+    if (hasOwn("routeBasePath")) {
+      merged.routeBasePath = config.routeBasePath;
+    }
+    if (hasOwn("transportBasePath")) {
+      merged.transportBasePath = config.transportBasePath;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -581,9 +613,12 @@ function createFileRouter(options) {
     const errorHead = await resolveHead(errorModule, errorProps);
     const layoutNode = layoutModule ? await layoutModule.default(context) : null;
     const model = layoutNode ? injectRouteChildren(layoutNode, errorNode) : errorNode;
+    const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
     return {
       statusCode,
       model,
+      contextModel,
+      pageModel: errorNode,
       head: mergeHead(layoutHead, errorHead)
     };
   }
@@ -703,9 +738,12 @@ function createFileRouter(options) {
       const pageHead = await resolveHead(pageModule, pageContext);
       const layoutNode = layoutModule ? await layoutModule.default(pageContext) : null;
       const model = layoutNode ? injectRouteChildren(layoutNode, pageNode) : pageNode;
+      const contextModel = layoutNode ? injectRouteChildren(layoutNode, /* @__PURE__ */ jsx(RouteChildrenSlot, {})) : void 0;
       return {
         statusCode: 200,
         model,
+        contextModel,
+        pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead)
       };
     } catch (error) {
@@ -860,7 +898,7 @@ async function decodeFlightPayloadFromString(flightData, moduleMap) {
 
   if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
     return await reactServerDomClientNode.createFromNodeStream(
-      Readable.from([flightData]),
+      Readable.from([Buffer.from(flightData)]),
       serverConsumerManifest
     );
   }
@@ -885,7 +923,21 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.model
       : payload;
 
-  return renderHtml(model);
+  const basename =
+    payload &&
+    typeof payload === "object" &&
+    payload.head &&
+    typeof payload.head.basename === "string"
+      ? payload.head.basename
+      : "";
+
+  const previousBasename = globalThis.__RSC_BASENAME;
+  globalThis.__RSC_BASENAME = basename;
+  try {
+    return await renderHtml(model);
+  } finally {
+    globalThis.__RSC_BASENAME = previousBasename;
+  }
 }
 
 process.on("message", async (message) => {
@@ -1352,6 +1404,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1374,6 +1428,7 @@ function createNodeRequestHandler(options) {
       } else if (ext === ".json") {
         res.setHeader("Content-Type", "application/json; charset=utf-8");
       }
+      res.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate");
       const stream = fs2.createReadStream(filePath);
       stream.on("error", () => {
         res.statusCode = 404;
@@ -1397,6 +1452,8 @@ function createNodeRequestHandler(options) {
     );
     const initialPayload = {
       model: resolved.model,
+      contextModel: resolved.contextModel,
+      pageModel: resolved.pageModel,
       head: resolved.head
     };
     const initialFlightData = await renderRSCToString(initialPayload, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {
@@ -43,6 +43,11 @@
       "import": "./dist/navigation.js",
       "require": "./dist/navigation.cjs"
     },
+    "./route-slot": {
+      "types": "./dist/route-slot.d.ts",
+      "import": "./dist/route-slot.js",
+      "require": "./dist/route-slot.cjs"
+    },
     "./types": {
       "types": "./dist/types.d.ts",
       "import": "./dist/types.js",