@webtypen/webframez-react 0.0.48 → 0.0.50

package/dist/webframez-core.cjs

@@ -4,6 +4,9 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -26,6 +29,60 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// node_modules/@webtypen/webframez-core/dist/routing.js
+var require_routing = __commonJS({
+  "node_modules/@webtypen/webframez-core/dist/routing.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.appRelativePath = exports2.appPath = exports2.getBasename = exports2.normalizeBasename = void 0;
+    function normalizeBasename2(value) {
+      if (value == null || value === "" || value === "/")
+        return "";
+      if (typeof value !== "string")
+        throw new Error("Router basename must be a string.");
+      const base = value.trim().replace(/\/+$/, "");
+      if (!base && value.trim().length <= 1)
+        return "";
+      if (!/^\/(?:[A-Za-z0-9_~-]+(?:\.[A-Za-z0-9_~-]+)*)(?:\/[A-Za-z0-9_~-]+(?:\.[A-Za-z0-9_~-]+)*)*$/.test(base)) {
+        throw new Error("Router basename must be empty or an absolute path such as /my-app.");
+      }
+      return base;
+    }
+    exports2.normalizeBasename = normalizeBasename2;
+    function getBasename2() {
+      var _a, _b, _c, _d;
+      const runtime = globalThis;
+      return (_d = (_c = (_b = (_a = runtime.__WEBFRAMEZ_ROUTING_CONTEXT__) === null || _a === void 0 ? void 0 : _a.getStore()) !== null && _b !== void 0 ? _b : runtime.__RSC_BASENAME) !== null && _c !== void 0 ? _c : runtime.__WEBFRAMEZ_ROUTER_BASENAME__) !== null && _d !== void 0 ? _d : "";
+    }
+    exports2.getBasename = getBasename2;
+    function appPath2(value, basename = getBasename2()) {
+      const base = normalizeBasename2(basename);
+      if (!base || !value.startsWith("/") || value.startsWith("//") || hasBasename(value, base))
+        return value;
+      return base + value;
+    }
+    exports2.appPath = appPath2;
+    function appRelativePath2(value, basename = getBasename2()) {
+      const base = normalizeBasename2(basename);
+      if (!base || !hasBasename(value, base))
+        return value;
+      const relative = value.slice(base.length);
+      return !relative || relative.startsWith("?") || relative.startsWith("#") ? "/" + relative : relative;
+    }
+    exports2.appRelativePath = appRelativePath2;
+    function hasBasename(value, base) {
+      return value === base || value.startsWith(base + "/") || value.startsWith(base + "?") || value.startsWith(base + "#");
+    }
+  }
+});
+
+// node_modules/@webtypen/webframez-core/routing.js
+var require_routing2 = __commonJS({
+  "node_modules/@webtypen/webframez-core/routing.js"(exports2, module2) {
+    module2.exports = require_routing();
+  }
+});
+
 // src/webframez-core.ts
 var webframez_core_exports = {};
 __export(webframez_core_exports, {
@@ -36,9 +93,15 @@ __export(webframez_core_exports, {
   setupWebframezCoreReactRoute: () => setupWebframezCoreReactRoute
 });
 module.exports = __toCommonJS(webframez_core_exports);
+
+// src/paths.ts
+var import_routing = __toESM(require_routing2(), 1);
+
+// src/webframez-core.ts
 var import_node_path4 = __toESM(require("node:path"), 1);
 
 // src/http.ts
+var import_node_async_hooks = require("node:async_hooks");
 var import_node_fs2 = __toESM(require("node:fs"), 1);
 var import_node_path3 = __toESM(require("node:path"), 1);
 var import_node_url = require("node:url");
@@ -62,6 +125,8 @@ function createHTMLShell(options = {}) {
     buildId = "",
     headTags = "",
     bodyClassName = "",
+    bodyStartHtml = "",
+    bodyEndHtml = "",
     rootHtml = "",
     initialFlightData = "",
     basename = "",
@@ -111,7 +176,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>
@@ -226,6 +293,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;
 }
 
@@ -338,8 +411,7 @@ var FORCED_PACKAGE_REQUESTS = [
   "react-server-dom-webpack",
   "react-server-dom-webpack/server",
   "react-server-dom-webpack/client",
-  "react-server-dom-webpack/client.node",
-  "scheduler"
+  "react-server-dom-webpack/client.node"
 ];
 var forcedPackageResolutionInstalled = false;
 function normalizePathname(pathname) {
@@ -478,7 +550,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);
@@ -513,9 +587,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 = [];
@@ -537,6 +630,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()) {
@@ -622,6 +732,7 @@ function isRouteAbort(value) {
 function createFileRouter(options) {
   installForcedPackageResolution();
   const pagesDir = options.pagesDir;
+  const onData = options.onData;
   const layoutPath = import_node_path2.default.join(pagesDir, "layout.js");
   const errorPath = import_node_path2.default.join(pagesDir, "errors.js");
   const middlewaresPath = import_node_path2.default.join(pagesDir, "middlewares.js");
@@ -786,10 +897,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__ */ (0, import_jsx_runtime.jsx)(RouteChildren, {})) : void 0;
       return {
@@ -798,7 +915,7 @@ function createFileRouter(options) {
         contextModel,
         pageModel: pageNode,
         head: mergeHead(layoutHead, pageHead),
-        context: pageContext
+        context: eventContext
       };
     } catch (error) {
       if (isRouteAbort(error)) {
@@ -945,6 +1062,7 @@ const rootParent = {
   path: process.cwd(),
   paths: Module._nodeModulePaths(process.cwd()),
 };
+// Transitive dependencies (e.g. scheduler) must resolve from their importer.
 const forcedPackageRequests = [
   "@webtypen/webframez-core",
   "@webtypen/webframez-react",
@@ -959,7 +1077,6 @@ const forcedPackageRequests = [
   "react-server-dom-webpack/server",
   "react-server-dom-webpack/client",
   "react-server-dom-webpack/client.node",
-  "scheduler"
 ];
 
 function shouldForcePackageResolution(request) {
@@ -1151,13 +1268,17 @@ async function renderHtmlFromFlightData(flightData, moduleMap) {
       ? payload.head.basename
       : "";
 
-  const previousBasename = globalThis.__RSC_BASENAME;
-  globalThis.__RSC_BASENAME = basename;
-  try {
-    return await renderHtml(model);
-  } finally {
-    globalThis.__RSC_BASENAME = previousBasename;
-  }
+  const routingContext = globalThis.__WEBFRAMEZ_ROUTING_CONTEXT__ ??=
+    new (require("node:async_hooks").AsyncLocalStorage)();
+  return routingContext.run(basename, async () => {
+    const previousBasename = globalThis.__RSC_BASENAME;
+    globalThis.__RSC_BASENAME = basename;
+    try {
+      return await renderHtml(model);
+    } finally {
+      globalThis.__RSC_BASENAME = previousBasename;
+    }
+  });
 }
 
 process.on("message", async (message) => {
@@ -1393,24 +1514,10 @@ ${stderrBuffer.trim()}` : "";
     }
   };
 }
+var routingRuntime = globalThis;
+var basenameContext = routingRuntime.__WEBFRAMEZ_ROUTING_CONTEXT__ ??= new import_node_async_hooks.AsyncLocalStorage();
 function withRequestBasename(basename, fn) {
-  const target = globalThis;
-  const previous = target.__RSC_BASENAME;
-  target.__RSC_BASENAME = basename;
-  const finish = () => {
-    target.__RSC_BASENAME = previous;
-  };
-  try {
-    const result = fn();
-    if (result && typeof result.then === "function") {
-      return result.finally(finish);
-    }
-    finish();
-    return result;
-  } catch (error) {
-    finish();
-    throw error;
-  }
+  return basenameContext.run(basename, fn);
 }
 function parseCookies(rawCookieHeader) {
   const raw = Array.isArray(rawCookieHeader) ? rawCookieHeader.join("; ") : rawCookieHeader ?? "";
@@ -1445,12 +1552,27 @@ function normalizeClientManifest(manifest, options) {
     }
   };
   for (const [key, value] of Object.entries(manifest)) {
+    const hashIndex = key.indexOf("#");
+    const moduleKey = hashIndex < 0 ? key : key.slice(0, hashIndex);
+    const exportSuffix = hashIndex < 0 ? "" : key.slice(hashIndex);
+    if (!import_node_path3.default.isAbsolute(moduleKey) && !moduleKey.includes(":") && !moduleKey.startsWith("file://")) {
+      const runtimePath = import_node_path3.default.resolve(options.cwd, moduleKey);
+      const allowedRoots = [options.distRootDir, ...candidateNodeModulesDirs];
+      const insideArtifact = allowedRoots.some((root) => {
+        const relative = import_node_path3.default.relative(import_node_path3.default.resolve(root), runtimePath);
+        return relative !== "" && relative !== ".." && !relative.startsWith(`..${import_node_path3.default.sep}`) && !import_node_path3.default.isAbsolute(relative);
+      });
+      if (insideArtifact) {
+        addAlias(`${runtimePath}${exportSuffix}`, value);
+        addAlias(`${(0, import_node_url.pathToFileURL)(runtimePath).href}${exportSuffix}`, value);
+      }
+    }
     if (!key.startsWith("file://")) {
       continue;
     }
     let absolutePath = "";
     try {
-      absolutePath = (0, import_node_url.fileURLToPath)(key);
+      absolutePath = (0, import_node_url.fileURLToPath)(moduleKey);
     } catch {
       continue;
     }
@@ -1461,13 +1583,13 @@ function normalizeClientManifest(manifest, options) {
     }
     const relativeModulePath = absolutePath.slice(markerIndex + marker.length);
     const relativeModulePathPosix = relativeModulePath.split(import_node_path3.default.sep).join("/");
-    addAlias(`./node_modules/${relativeModulePathPosix}`, value);
-    addAlias(`node_modules/${relativeModulePathPosix}`, value);
-    addAlias(absolutePath, value);
+    addAlias(`./node_modules/${relativeModulePathPosix}${exportSuffix}`, value);
+    addAlias(`node_modules/${relativeModulePathPosix}${exportSuffix}`, value);
+    addAlias(`${absolutePath}${exportSuffix}`, value);
     for (const nodeModulesDir of candidateNodeModulesDirs) {
       const aliasPath = import_node_path3.default.join(nodeModulesDir, relativeModulePath);
-      addAlias(aliasPath, value);
-      addAlias((0, import_node_url.pathToFileURL)(aliasPath).href, value);
+      addAlias(`${aliasPath}${exportSuffix}`, value);
+      addAlias(`${(0, import_node_url.pathToFileURL)(aliasPath).href}${exportSuffix}`, value);
     }
   }
   return normalized;
@@ -1612,16 +1734,16 @@ function createNodeRequestHandler(options) {
   const manifestPath = import_node_path3.default.resolve(
     options.manifestPath ?? import_node_path3.default.join(distRootDir, "react-client-manifest.json")
   );
-  const assetsPrefix = options.assetsPrefix ?? "/assets/";
-  const rscPath = options.rscPath ?? "/rsc";
-  const clientScriptUrl = options.clientScriptUrl ?? "/assets/client.js";
   const basePath = normalizeBasePath(options.basePath);
+  const assetsPrefix = options.assetsPrefix ?? `${basePath}/assets/`;
+  const rscPath = options.rscPath ?? `${basePath}/rsc`;
+  const clientScriptUrl = options.clientScriptUrl ?? `${basePath}/assets/client.js`;
   const nodeEnv = process.env.NODE_ENV || "";
   const runningInWatchMode = Array.isArray(process.execArgv) && process.execArgv.includes("--watch");
   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,
@@ -1634,7 +1756,7 @@ function createNodeRequestHandler(options) {
   process.once("exit", disposeInitialHtmlWorker);
   process.once("SIGINT", disposeInitialHtmlWorker);
   process.once("SIGTERM", disposeInitialHtmlWorker);
-  return async function handleRequest(req, res) {
+  const handleRequest = async (req, res) => {
     if (!req.url) {
       res.statusCode = 400;
       res.end("Bad request");
@@ -1698,6 +1820,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      resolved2.head = { ...resolved2.head, basename: resolved2.head.basename ?? basePath };
       attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
@@ -1773,6 +1896,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    resolved.head = { ...resolved.head, basename: resolved.head.basename ?? basePath };
     attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
@@ -1845,6 +1969,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
       }),
@@ -1856,6 +1982,7 @@ function createNodeRequestHandler(options) {
       }
     );
   };
+  return (req, res) => withRequestBasename(basePath, () => handleRequest(req, res));
 }
 
 // src/webframez-core.ts
@@ -1944,6 +2071,17 @@ function buildRenderDefaults(routePathValue) {
     clientScriptUrl: `${mountPath}/assets/client.js`
   };
 }
+function runtimeRoutePaths(routePath, options, basename = (0, import_routing.getBasename)(), groupPrefix = "") {
+  const localMount = normalizeMountPath(options.basePath ?? `${groupPrefix}${normalizeMountPath(routePath)}`);
+  const basePath = normalizeMountPath((0, import_routing.appPath)(localMount, basename)).replace(/\/$/, "");
+  return {
+    basePath,
+    assetsPrefix: options.assetsPrefix !== void 0 ? (0, import_routing.appPath)(options.assetsPrefix, basename) : `${basePath}/assets/`,
+    rscPath: options.rscPath !== void 0 ? (0, import_routing.appPath)(options.rscPath, basename) : `${basePath}/rsc`,
+    clientScriptUrl: options.clientScriptUrl !== void 0 ? (0, import_routing.appPath)(options.clientScriptUrl, basename) : `${basePath}/assets/client.js`,
+    ...typeof options.liveReloadPath === "string" ? { liveReloadPath: (0, import_routing.appPath)(options.liveReloadPath, basename) } : {}
+  };
+}
 async function waitForResponseFinish(res) {
   if (res.writableEnded || res.destroyed) {
     return;
@@ -2037,10 +2175,7 @@ function registerRouteRenderer(route, methodName) {
         distRootDir: resolvedTarget.distRootDir,
         pagesDir: resolvedTarget.pagesDir,
         manifestPath: resolvedTarget.manifestPath,
-        basePath: basePath ?? defaults.basePath,
-        assetsPrefix: assetsPrefix ?? defaults.assetsPrefix,
-        rscPath: rscPath ?? defaults.rscPath,
-        clientScriptUrl: clientScriptUrl ?? defaults.clientScriptUrl
+        ...runtimeRoutePaths(routePathValue, options, route.basename ?? (0, import_routing.getBasename)(), route.tempGroupPrefix ?? "")
       });
       const methods = normalizeMethods(method);
       for (const currentMethod of methods) {
@@ -2082,13 +2217,11 @@ function resolveWebframezReactRouteOptions(routePathValue, options = {}) {
     distRootDir,
     pagesDir,
     manifestPath,
-    assetsPrefix: options.assetsPrefix ?? defaults.assetsPrefix,
-    rscPath: options.rscPath ?? defaults.rscPath,
-    clientScriptUrl: options.clientScriptUrl ?? defaults.clientScriptUrl,
+    ...runtimeRoutePaths(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: typeof options.liveReloadPath === "string" ? (0, import_routing.appPath)(options.liveReloadPath) : options.liveReloadPath,
+    onData: options.onData
   };
 }
 function getRegisteredReactBuildTargets() {

package/dist/webframez-core.d.ts

@@ -39,14 +39,8 @@ export interface WebframezCoreRouteFacadeExtensions {
   reactRender(path: string, options?: WebframezCoreReactRenderRouteOptions): void;
 }
 
-declare module "@webtypen/webframez-core" {
-  interface RouteFacade extends WebframezCoreRouteFacadeExtensions {}
-}
-
-declare module "webframez-core" {
-  interface RouteFacade extends WebframezCoreRouteFacadeExtensions {}
-}
-
+// Augment the defining module; the package root re-exports this same class.
+// Also augmenting the root creates conflicting polymorphic `this` types.
 declare module "@webtypen/webframez-core/dist/Router/Route" {
   interface RouteFacade extends WebframezCoreRouteFacadeExtensions {}
 }