@webtypen/webframez-react 0.0.32 → 0.0.34

package/dist/router.js

@@ -10,6 +10,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 import fs from "node:fs";
 import Module from "node:module";
 import path 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+\-.]*:|\/\/|#)/;
@@ -99,6 +100,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;
@@ -114,13 +125,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;
   }
@@ -128,10 +143,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
@@ -472,9 +496,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)
     };
   }
@@ -594,9 +621,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) {

package/dist/types.d.ts

@@ -71,6 +71,8 @@ export type HeadConfig = {
 export type ClientNavigationPayload = {
   model: ReactNode;
   head: HeadConfig;
+  contextModel?: ReactNode;
+  pageModel?: ReactNode;
 };
 
 export type HeadResolver<TContext = RouteContext> = (

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
@@ -616,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)
     };
   }
@@ -738,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) {
@@ -920,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) => {
@@ -1257,16 +1302,16 @@ function createServerConsumerManifest(manifest) {
     }
     return requestKey;
   };
-  const addReference = (lookupKey, reference) => {
+  const addReference = (lookupKey, exportName, reference) => {
     if (!lookupKey || lookupKey.trim() === "") {
       return;
     }
-    if (lookupKey in consumerManifest) {
+    const normalizedExportName = exportName || "*";
+    consumerManifest[lookupKey] ??= {};
+    if (normalizedExportName in consumerManifest[lookupKey]) {
       return;
     }
-    consumerManifest[lookupKey] = {
-      "*": reference
-    };
+    consumerManifest[lookupKey][normalizedExportName] = reference;
   };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
@@ -1283,9 +1328,35 @@ function createServerConsumerManifest(manifest) {
       name: entry.name ?? "*",
       ...entry.async ? { async: entry.async } : {}
     };
-    addReference(key, reference);
+    const hashIndex = key.lastIndexOf("#");
+    const keyWithoutExport = hashIndex > -1 ? key.slice(0, hashIndex) : key;
+    const keyExportName = hashIndex > -1 ? key.slice(hashIndex + 1) : "";
+    const manifestExportName = typeof entry.name === "string" && entry.name !== "*" ? entry.name : "";
+    const exportNames = new Set(
+      [keyExportName, manifestExportName].filter((name) => name.trim() !== "")
+    );
+    addReference(
+      key,
+      "*",
+      keyExportName ? { ...reference, name: keyExportName } : reference
+    );
+    addReference(keyWithoutExport, "*", reference);
+    for (const exportName of exportNames) {
+      const exportReference = {
+        ...reference,
+        name: exportName
+      };
+      addReference(keyWithoutExport, exportName, exportReference);
+      addReference(key, "*", exportReference);
+    }
     if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
-      addReference(String(entry.id), reference);
+      addReference(String(entry.id), "*", reference);
+      for (const exportName of exportNames) {
+        addReference(String(entry.id), exportName, {
+          ...reference,
+          name: exportName
+        });
+      }
     }
   }
   return consumerManifest;
@@ -1387,6 +1458,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1409,6 +1482,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;
@@ -1432,6 +1506,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
@@ -588,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)
     };
   }
@@ -710,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) {
@@ -892,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) => {
@@ -1229,16 +1274,16 @@ function createServerConsumerManifest(manifest) {
     }
     return requestKey;
   };
-  const addReference = (lookupKey, reference) => {
+  const addReference = (lookupKey, exportName, reference) => {
     if (!lookupKey || lookupKey.trim() === "") {
       return;
     }
-    if (lookupKey in consumerManifest) {
+    const normalizedExportName = exportName || "*";
+    consumerManifest[lookupKey] ??= {};
+    if (normalizedExportName in consumerManifest[lookupKey]) {
       return;
     }
-    consumerManifest[lookupKey] = {
-      "*": reference
-    };
+    consumerManifest[lookupKey][normalizedExportName] = reference;
   };
   for (const [key, value] of Object.entries(manifest)) {
     if (!value || typeof value !== "object") {
@@ -1255,9 +1300,35 @@ function createServerConsumerManifest(manifest) {
       name: entry.name ?? "*",
       ...entry.async ? { async: entry.async } : {}
     };
-    addReference(key, reference);
+    const hashIndex = key.lastIndexOf("#");
+    const keyWithoutExport = hashIndex > -1 ? key.slice(0, hashIndex) : key;
+    const keyExportName = hashIndex > -1 ? key.slice(hashIndex + 1) : "";
+    const manifestExportName = typeof entry.name === "string" && entry.name !== "*" ? entry.name : "";
+    const exportNames = new Set(
+      [keyExportName, manifestExportName].filter((name) => name.trim() !== "")
+    );
+    addReference(
+      key,
+      "*",
+      keyExportName ? { ...reference, name: keyExportName } : reference
+    );
+    addReference(keyWithoutExport, "*", reference);
+    for (const exportName of exportNames) {
+      const exportReference = {
+        ...reference,
+        name: exportName
+      };
+      addReference(keyWithoutExport, exportName, exportReference);
+      addReference(key, "*", exportReference);
+    }
     if (typeof entry.id === "number" && Number.isFinite(entry.id)) {
-      addReference(String(entry.id), reference);
+      addReference(String(entry.id), "*", reference);
+      for (const exportName of exportNames) {
+        addReference(String(entry.id), exportName, {
+          ...reference,
+          name: exportName
+        });
+      }
     }
   }
   return consumerManifest;
@@ -1359,6 +1430,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1381,6 +1454,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;
@@ -1404,6 +1478,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.32",
+  "version": "0.0.34",
   "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",