@webtypen/webframez-react 0.0.49 → 0.0.51

package/dist/webframez-core.js

@@ -1,3 +1,9 @@
+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 __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -5,11 +11,88 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
+var __commonJS = (cb, mod) => function __require2() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
+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
+));
+
+// node_modules/@webtypen/webframez-core/dist/routing.js
+var require_routing = __commonJS({
+  "node_modules/@webtypen/webframez-core/dist/routing.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.appRelativePath = exports.appPath = exports.getBasename = exports.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;
+    }
+    exports.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 : "";
+    }
+    exports.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;
+    }
+    exports.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;
+    }
+    exports.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"(exports, module) {
+    module.exports = require_routing();
+  }
+});
+
+// src/paths.ts
+var import_routing = __toESM(require_routing2(), 1);
 
 // src/webframez-core.ts
 import path4 from "node:path";
 
 // src/http.ts
+import { AsyncLocalStorage } from "node:async_hooks";
 import fs2 from "node:fs";
 import path3 from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
@@ -324,8 +407,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) {
@@ -976,6 +1058,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",
@@ -990,7 +1073,6 @@ const forcedPackageRequests = [
   "react-server-dom-webpack/server",
   "react-server-dom-webpack/client",
   "react-server-dom-webpack/client.node",
-  "scheduler"
 ];
 
 function shouldForcePackageResolution(request) {
@@ -1182,13 +1264,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) => {
@@ -1424,24 +1510,10 @@ ${stderrBuffer.trim()}` : "";
     }
   };
 }
+var routingRuntime = globalThis;
+var basenameContext = routingRuntime.__WEBFRAMEZ_ROUTING_CONTEXT__ ??= new 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 ?? "";
@@ -1476,12 +1548,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 (!path3.isAbsolute(moduleKey) && !moduleKey.includes(":") && !moduleKey.startsWith("file://")) {
+      const runtimePath = path3.resolve(options.cwd, moduleKey);
+      const allowedRoots = [options.distRootDir, ...candidateNodeModulesDirs];
+      const insideArtifact = allowedRoots.some((root) => {
+        const relative = path3.relative(path3.resolve(root), runtimePath);
+        return relative !== "" && relative !== ".." && !relative.startsWith(`..${path3.sep}`) && !path3.isAbsolute(relative);
+      });
+      if (insideArtifact) {
+        addAlias(`${runtimePath}${exportSuffix}`, value);
+        addAlias(`${pathToFileURL(runtimePath).href}${exportSuffix}`, value);
+      }
+    }
     if (!key.startsWith("file://")) {
       continue;
     }
     let absolutePath = "";
     try {
-      absolutePath = fileURLToPath(key);
+      absolutePath = fileURLToPath(moduleKey);
     } catch {
       continue;
     }
@@ -1492,13 +1579,13 @@ function normalizeClientManifest(manifest, options) {
     }
     const relativeModulePath = absolutePath.slice(markerIndex + marker.length);
     const relativeModulePathPosix = relativeModulePath.split(path3.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 = path3.join(nodeModulesDir, relativeModulePath);
-      addAlias(aliasPath, value);
-      addAlias(pathToFileURL(aliasPath).href, value);
+      addAlias(`${aliasPath}${exportSuffix}`, value);
+      addAlias(`${pathToFileURL(aliasPath).href}${exportSuffix}`, value);
     }
   }
   return normalized;
@@ -1643,10 +1730,10 @@ function createNodeRequestHandler(options) {
   const manifestPath = path3.resolve(
     options.manifestPath ?? path3.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);
@@ -1665,7 +1752,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");
@@ -1729,6 +1816,7 @@ function createNodeRequestHandler(options) {
           request: requestContext
         })
       );
+      resolved2.head = { ...resolved2.head, basename: resolved2.head.basename ?? basePath };
       attachResolvedContextToCoreRequest(req, resolved2.context);
       const payload = {
         model: resolved2.model,
@@ -1804,6 +1892,7 @@ function createNodeRequestHandler(options) {
         )
       })
     );
+    resolved.head = { ...resolved.head, basename: resolved.head.basename ?? basePath };
     attachResolvedContextToCoreRequest(req, resolved.context);
     const initialPayload = {
       model: resolved.model,
@@ -1889,6 +1978,7 @@ function createNodeRequestHandler(options) {
       }
     );
   };
+  return (req, res) => withRequestBasename(basePath, () => handleRequest(req, res));
 }
 
 // src/webframez-core.ts
@@ -1977,6 +2067,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;
@@ -2070,10 +2171,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) {
@@ -2115,13 +2213,10 @@ 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
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webtypen/webframez-react",
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "TypeScript React RSC addition for @webtypen/webframez-core",
   "homepage": "https://webtypen.de/",
   "author": {
@@ -74,7 +74,12 @@
     "./defaults/webpack.server": "./defaults/webpack.server.cjs",
     "./defaults/tsconfig.server": "./defaults/tsconfig.server.json",
     "./defaults/tsconfig.server.example": "./defaults/tsconfig.server.example.json",
-    "./cli": "./bin/webframez-react.mjs"
+    "./cli": "./bin/webframez-react.mjs",
+    "./paths": {
+      "types": "./dist/paths.d.ts",
+      "import": "./dist/paths.js",
+      "require": "./dist/paths.cjs"
+    }
   },
   "files": [
     "dist",
@@ -88,10 +93,11 @@
   "scripts": {
     "clean": "rm -rf dist",
     "build": "npm run clean && node scripts/build.mjs",
-    "build:watch": "node scripts/build.mjs --watch"
+    "build:watch": "node scripts/build.mjs --watch",
+    "test": "node --test tests/*.test.cjs"
   },
   "peerDependencies": {
-    "@webtypen/webframez-core": "^0.3.30",
+    "@webtypen/webframez-core": ">=0.3.69",
     "react": "^19.0.0 || >=0.0.0-0 <0.0.1",
     "react-dom": "^19.0.0 || >=0.0.0-0 <0.0.1",
     "react-server-dom-webpack": "^19.0.0 || >=0.0.0-0 <0.0.1"
@@ -102,9 +108,17 @@
     }
   },
   "devDependencies": {
+    "@webtypen/webframez-core": "0.3.69",
     "esbuild": "^0.20.2",
     "react": "19.1.1",
     "react-dom": "19.1.1",
     "react-server-dom-webpack": "19.1.1"
+  },
+  "typesVersions": {
+    "*": {
+      "paths": [
+        "dist/paths.d.ts"
+      ]
+    }
   }
 }