@webtypen/webframez-react 0.0.31 → 0.0.33

package/dist/index.js

@@ -111,6 +111,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;
@@ -148,6 +149,7 @@ function createRSCHandler(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+\-.]*:|\/\/|#)/;
@@ -237,6 +239,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;
@@ -252,13 +264,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;
   }
@@ -266,10 +282,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
@@ -434,15 +459,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;
     }
@@ -603,9 +635,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)
     };
   }
@@ -725,9 +760,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) {
@@ -886,7 +924,7 @@ async function decodeFlightPayloadFromString(flightData, moduleMap) {
 
   if (typeof reactServerDomClientNode.createFromNodeStream === "function") {
     return await reactServerDomClientNode.createFromNodeStream(
-      Readable.from([flightData]),
+      Readable.from([Buffer.from(flightData)]),
       serverConsumerManifest
     );
   }
@@ -911,7 +949,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) => {
@@ -1378,6 +1430,8 @@ function createNodeRequestHandler(options) {
       );
       const payload = {
         model: resolved2.model,
+        contextModel: resolved2.contextModel,
+        pageModel: resolved2.pageModel,
         head: resolved2.head
       };
       sendRSC(res, payload, {
@@ -1400,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;
@@ -1423,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/dist/route-slot.cjs

@@ -0,0 +1,53 @@
+"use client";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/route-slot.tsx
+var route_slot_exports = {};
+__export(route_slot_exports, {
+  RouteChildrenSlot: () => RouteChildrenSlot,
+  RouteChildrenSlotProvider: () => RouteChildrenSlotProvider
+});
+module.exports = __toCommonJS(route_slot_exports);
+var import_react = __toESM(require("react"), 1);
+var import_jsx_runtime = require("react/jsx-runtime");
+var RouteChildrenSlotContext = import_react.default.createContext(null);
+function RouteChildrenSlotProvider({
+  children,
+  page
+}) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RouteChildrenSlotContext.Provider, { value: page, children });
+}
+function RouteChildrenSlot() {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: import_react.default.useContext(RouteChildrenSlotContext) });
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  RouteChildrenSlot,
+  RouteChildrenSlotProvider
+});

package/dist/route-slot.d.ts

@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+export function RouteChildrenSlotProvider(props: {
+  children: ReactNode;
+  page: ReactNode;
+}): ReactNode;
+export function RouteChildrenSlot(): ReactNode;

package/dist/route-slot.js

@@ -0,0 +1,19 @@
+"use client";
+
+// src/route-slot.tsx
+import React from "react";
+import { Fragment, jsx } from "react/jsx-runtime";
+var RouteChildrenSlotContext = React.createContext(null);
+function RouteChildrenSlotProvider({
+  children,
+  page
+}) {
+  return /* @__PURE__ */ jsx(RouteChildrenSlotContext.Provider, { value: page, children });
+}
+function RouteChildrenSlot() {
+  return /* @__PURE__ */ jsx(Fragment, { children: React.useContext(RouteChildrenSlotContext) });
+}
+export {
+  RouteChildrenSlot,
+  RouteChildrenSlotProvider
+};

package/dist/router.cjs

@@ -40,6 +40,7 @@ module.exports = __toCommonJS(router_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_module = __toESM(require("node:module"), 1);
 var import_node_path = __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+\-.]*:|\/\/|#)/;
@@ -129,6 +130,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;
@@ -144,13 +155,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;
   }
@@ -158,10 +173,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
@@ -326,15 +350,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;
     }
@@ -495,9 +526,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)
     };
   }
@@ -617,9 +651,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) {

package/dist/router.d.ts

@@ -5,6 +5,8 @@ export type ResolvedRoute = {
   statusCode: number;
   model: ReactNode;
   head: HeadConfig;
+  contextModel?: ReactNode;
+  pageModel?: ReactNode;
 };
 
 export function createFileRouter(options: { pagesDir: string }): {

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
@@ -296,15 +320,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;
     }
@@ -465,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)
     };
   }
@@ -587,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

@@ -61,6 +61,8 @@ export type HeadConfig = {
   title?: string;
   description?: string;
   basename?: string;
+  routeBasePath?: string;
+  transportBasePath?: string;
   favicon?: string;
   meta?: HeadMetaTag[];
   links?: HeadLinkTag[];
@@ -69,6 +71,8 @@ export type HeadConfig = {
 export type ClientNavigationPayload = {
   model: ReactNode;
   head: HeadConfig;
+  contextModel?: ReactNode;
+  pageModel?: ReactNode;
 };
 
 export type HeadResolver<TContext = RouteContext> = (
@@ -112,6 +116,7 @@ export type CreateHtmlShellOptions = {
   initialFlightData?: string;
   clientRenderMode?: "hydrate" | "mount";
   basename?: string;
+  routeBasePath?: string;
   liveReloadPath?: string;
   liveReloadServerId?: string;
 };