@webtypen/webframez-react 0.0.25 → 0.0.28

package/dist/index.cjs

@@ -183,6 +183,62 @@ 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);
 
+// src/head.ts
+var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
+function normalizeHeadBasename(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, basename) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedBasename = normalizeHeadBasename(basename);
+  if (!normalizedAssetUrl || !normalizedBasename) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedBasename}${normalizedAssetUrl}`;
+  }
+  return `${normalizedBasename}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedBasename) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedHead = {
+    ...head,
+    ...effectiveBasename ? { basename: effectiveBasename } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveBasename
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveBasename)
+    }));
+  }
+  return normalizedHead;
+}
+
 // src/router-runtime.tsx
 var import_react = __toESM(require("react"), 1);
 var ROUTE_CHILDREN_TAG = "webframez-route-children";
@@ -398,7 +454,8 @@ function mergeHead(...configs) {
     meta: [],
     links: []
   };
-  for (const config of configs) {
+  for (const candidate of configs) {
+    const config = normalizeHeadConfig(candidate, merged.basename);
     if (!config) {
       continue;
     }
@@ -408,6 +465,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.basename) {
+      merged.basename = config.basename;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -421,22 +481,23 @@ function mergeHead(...configs) {
   return merged;
 }
 function renderHeadToString(head) {
+  const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
-  if (head.description) {
+  if (normalizedHead.description) {
     tags.push(
-      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(normalizedHead.description)}" />`
     );
   }
-  if (head.favicon) {
+  if (normalizedHead.favicon) {
     tags.push(
-      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(normalizedHead.favicon)}" />`
     );
   }
-  for (const meta of head.meta ?? []) {
+  for (const meta of normalizedHead.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
-  for (const link of head.links ?? []) {
+  for (const link of normalizedHead.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
@@ -652,6 +713,12 @@ function createFileRouter(options) {
       params: {},
       searchParams: input.searchParams,
       cookies: input.cookies ?? {},
+      request: input.request ?? {
+        host: null,
+        pathname,
+        originalPathname: pathname,
+        headers: {}
+      },
       abort: (options2) => {
         throw createAbort(options2);
       }
@@ -883,6 +950,60 @@ function normalizeBasePath(basePath) {
   const withLeadingSlash = basePath.startsWith("/") ? basePath : `/${basePath}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash.slice(0, -1) : withLeadingSlash;
 }
+function normalizeRequestHostValue(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const firstValue = trimmed.split(",")[0]?.trim() || "";
+  if (!firstValue) {
+    return null;
+  }
+  if (firstValue.startsWith("[")) {
+    const closingIndex = firstValue.indexOf("]");
+    if (closingIndex > 0) {
+      return firstValue.slice(1, closingIndex).toLowerCase();
+    }
+  }
+  return firstValue.replace(/:\d+$/, "").toLowerCase();
+}
+function getRequestHost(req) {
+  const candidates = [
+    req.headers["x-forwarded-host"],
+    req.headers["x-original-host"],
+    req.headers.host
+  ];
+  for (const candidate of candidates) {
+    if (Array.isArray(candidate)) {
+      for (const singleValue of candidate) {
+        if (typeof singleValue !== "string") {
+          continue;
+        }
+        const normalized2 = normalizeRequestHostValue(singleValue);
+        if (normalized2) {
+          return normalized2;
+        }
+      }
+      continue;
+    }
+    if (typeof candidate !== "string") {
+      continue;
+    }
+    const normalized = normalizeRequestHostValue(candidate);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return null;
+}
+function createRouteRequestContext(req, pathname, originalPathname) {
+  return {
+    host: getRequestHost(req),
+    pathname,
+    originalPathname,
+    headers: req.headers
+  };
+}
 function stripBasePath(pathname, basePath) {
   if (!basePath) {
     return pathname;
@@ -1228,13 +1349,19 @@ function createNodeRequestHandler(options) {
     }
     if (url.pathname === rscPath) {
       const pathname = stripBasePath(url.searchParams.get("path") || "/", basePath);
+      const requestContext = createRouteRequestContext(
+        req,
+        pathname,
+        url.searchParams.get("path") || "/"
+      );
       const search = new URLSearchParams(url.searchParams.get("search") || "");
       const resolved2 = await withRequestBasename(
         basePath,
         () => router.resolve({
           pathname,
           searchParams: parseSearchParams(search),
-          cookies: requestCookies
+          cookies: requestCookies,
+          request: requestContext
         })
       );
       const payload = {
@@ -1274,7 +1401,12 @@ function createNodeRequestHandler(options) {
       () => router.resolve({
         pathname: stripBasePath(url.pathname, basePath),
         searchParams: parseSearchParams(url.searchParams),
-        cookies: requestCookies
+        cookies: requestCookies,
+        request: createRouteRequestContext(
+          req,
+          stripBasePath(url.pathname, basePath),
+          url.pathname
+        )
       })
     );
     const initialPayload = {
@@ -1318,7 +1450,7 @@ function createNodeRequestHandler(options) {
               rscEndpoint: rscPath,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: basePath,
+              basename: resolved?.head?.basename ?? basePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1337,7 +1469,7 @@ function createNodeRequestHandler(options) {
         rscEndpoint: rscPath,
         rootHtml,
         initialFlightData,
-        basename: basePath,
+        basename: resolved.head.basename ?? basePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })

package/dist/index.js

@@ -147,6 +147,62 @@ import fs from "node:fs";
 import Module from "node:module";
 import path2 from "node:path";
 
+// src/head.ts
+var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
+function normalizeHeadBasename(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, basename) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedBasename = normalizeHeadBasename(basename);
+  if (!normalizedAssetUrl || !normalizedBasename) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedBasename}${normalizedAssetUrl}`;
+  }
+  return `${normalizedBasename}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedBasename) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedHead = {
+    ...head,
+    ...effectiveBasename ? { basename: effectiveBasename } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveBasename
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveBasename)
+    }));
+  }
+  return normalizedHead;
+}
+
 // src/router-runtime.tsx
 import React from "react";
 var ROUTE_CHILDREN_TAG = "webframez-route-children";
@@ -362,7 +418,8 @@ function mergeHead(...configs) {
     meta: [],
     links: []
   };
-  for (const config of configs) {
+  for (const candidate of configs) {
+    const config = normalizeHeadConfig(candidate, merged.basename);
     if (!config) {
       continue;
     }
@@ -372,6 +429,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.basename) {
+      merged.basename = config.basename;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -385,22 +445,23 @@ function mergeHead(...configs) {
   return merged;
 }
 function renderHeadToString(head) {
+  const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
-  if (head.description) {
+  if (normalizedHead.description) {
     tags.push(
-      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(normalizedHead.description)}" />`
     );
   }
-  if (head.favicon) {
+  if (normalizedHead.favicon) {
     tags.push(
-      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(normalizedHead.favicon)}" />`
     );
   }
-  for (const meta of head.meta ?? []) {
+  for (const meta of normalizedHead.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
-  for (const link of head.links ?? []) {
+  for (const link of normalizedHead.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
@@ -616,6 +677,12 @@ function createFileRouter(options) {
       params: {},
       searchParams: input.searchParams,
       cookies: input.cookies ?? {},
+      request: input.request ?? {
+        host: null,
+        pathname,
+        originalPathname: pathname,
+        headers: {}
+      },
       abort: (options2) => {
         throw createAbort(options2);
       }
@@ -847,6 +914,60 @@ function normalizeBasePath(basePath) {
   const withLeadingSlash = basePath.startsWith("/") ? basePath : `/${basePath}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash.slice(0, -1) : withLeadingSlash;
 }
+function normalizeRequestHostValue(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const firstValue = trimmed.split(",")[0]?.trim() || "";
+  if (!firstValue) {
+    return null;
+  }
+  if (firstValue.startsWith("[")) {
+    const closingIndex = firstValue.indexOf("]");
+    if (closingIndex > 0) {
+      return firstValue.slice(1, closingIndex).toLowerCase();
+    }
+  }
+  return firstValue.replace(/:\d+$/, "").toLowerCase();
+}
+function getRequestHost(req) {
+  const candidates = [
+    req.headers["x-forwarded-host"],
+    req.headers["x-original-host"],
+    req.headers.host
+  ];
+  for (const candidate of candidates) {
+    if (Array.isArray(candidate)) {
+      for (const singleValue of candidate) {
+        if (typeof singleValue !== "string") {
+          continue;
+        }
+        const normalized2 = normalizeRequestHostValue(singleValue);
+        if (normalized2) {
+          return normalized2;
+        }
+      }
+      continue;
+    }
+    if (typeof candidate !== "string") {
+      continue;
+    }
+    const normalized = normalizeRequestHostValue(candidate);
+    if (normalized) {
+      return normalized;
+    }
+  }
+  return null;
+}
+function createRouteRequestContext(req, pathname, originalPathname) {
+  return {
+    host: getRequestHost(req),
+    pathname,
+    originalPathname,
+    headers: req.headers
+  };
+}
 function stripBasePath(pathname, basePath) {
   if (!basePath) {
     return pathname;
@@ -1192,13 +1313,19 @@ function createNodeRequestHandler(options) {
     }
     if (url.pathname === rscPath) {
       const pathname = stripBasePath(url.searchParams.get("path") || "/", basePath);
+      const requestContext = createRouteRequestContext(
+        req,
+        pathname,
+        url.searchParams.get("path") || "/"
+      );
       const search = new URLSearchParams(url.searchParams.get("search") || "");
       const resolved2 = await withRequestBasename(
         basePath,
         () => router.resolve({
           pathname,
           searchParams: parseSearchParams(search),
-          cookies: requestCookies
+          cookies: requestCookies,
+          request: requestContext
         })
       );
       const payload = {
@@ -1238,7 +1365,12 @@ function createNodeRequestHandler(options) {
       () => router.resolve({
         pathname: stripBasePath(url.pathname, basePath),
         searchParams: parseSearchParams(url.searchParams),
-        cookies: requestCookies
+        cookies: requestCookies,
+        request: createRouteRequestContext(
+          req,
+          stripBasePath(url.pathname, basePath),
+          url.pathname
+        )
       })
     );
     const initialPayload = {
@@ -1282,7 +1414,7 @@ function createNodeRequestHandler(options) {
               rscEndpoint: rscPath,
               rootHtml: createInitialHtmlErrorMarkup("Initial HTML render failed."),
               initialFlightData,
-              basename: basePath,
+              basename: resolved?.head?.basename ?? basePath,
               liveReloadPath: liveReloadPath || void 0,
               liveReloadServerId: liveReloadPath ? devServerId : void 0
             })
@@ -1301,7 +1433,7 @@ function createNodeRequestHandler(options) {
         rscEndpoint: rscPath,
         rootHtml,
         initialFlightData,
-        basename: basePath,
+        basename: resolved.head.basename ?? basePath,
         liveReloadPath: liveReloadPath || void 0,
         liveReloadServerId: liveReloadPath ? devServerId : void 0
       })

package/dist/router.cjs

@@ -41,6 +41,62 @@ 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);
 
+// src/head.ts
+var ABSOLUTE_ASSET_URL_PATTERN = /^(?:[a-zA-Z][a-zA-Z\d+\-.]*:|\/\/|#)/;
+function normalizeHeadBasename(value) {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed === "/") {
+    return "/";
+  }
+  return trimmed.replace(/\/+$/, "");
+}
+function resolveHeadAssetUrl(assetUrl, basename) {
+  const normalizedAssetUrl = assetUrl.trim();
+  const normalizedBasename = normalizeHeadBasename(basename);
+  if (!normalizedAssetUrl || !normalizedBasename) {
+    return normalizedAssetUrl;
+  }
+  if (ABSOLUTE_ASSET_URL_PATTERN.test(normalizedAssetUrl)) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename !== "/" && (normalizedAssetUrl === normalizedBasename || normalizedAssetUrl.startsWith(`${normalizedBasename}/`))) {
+    return normalizedAssetUrl;
+  }
+  if (normalizedBasename === "/") {
+    return normalizedAssetUrl.startsWith("/") ? normalizedAssetUrl : `/${normalizedAssetUrl}`;
+  }
+  if (normalizedAssetUrl.startsWith("/")) {
+    return `${normalizedBasename}${normalizedAssetUrl}`;
+  }
+  return `${normalizedBasename}/${normalizedAssetUrl}`;
+}
+function normalizeHeadConfig(head, inheritedBasename) {
+  if (!head) {
+    return void 0;
+  }
+  const effectiveBasename = normalizeHeadBasename(head.basename) ?? normalizeHeadBasename(inheritedBasename);
+  const normalizedHead = {
+    ...head,
+    ...effectiveBasename ? { basename: effectiveBasename } : {}
+  };
+  if (normalizedHead.favicon) {
+    normalizedHead.favicon = resolveHeadAssetUrl(
+      normalizedHead.favicon,
+      effectiveBasename
+    );
+  }
+  if (normalizedHead.links) {
+    normalizedHead.links = normalizedHead.links.map((link) => ({
+      ...link,
+      href: resolveHeadAssetUrl(link.href, effectiveBasename)
+    }));
+  }
+  return normalizedHead;
+}
+
 // src/router-runtime.tsx
 var import_react = __toESM(require("react"), 1);
 var ROUTE_CHILDREN_TAG = "webframez-route-children";
@@ -256,7 +312,8 @@ function mergeHead(...configs) {
     meta: [],
     links: []
   };
-  for (const config of configs) {
+  for (const candidate of configs) {
+    const config = normalizeHeadConfig(candidate, merged.basename);
     if (!config) {
       continue;
     }
@@ -266,6 +323,9 @@ function mergeHead(...configs) {
     if (config.description) {
       merged.description = config.description;
     }
+    if (config.basename) {
+      merged.basename = config.basename;
+    }
     if (config.favicon) {
       merged.favicon = config.favicon;
     }
@@ -279,22 +339,23 @@ function mergeHead(...configs) {
   return merged;
 }
 function renderHeadToString(head) {
+  const normalizedHead = normalizeHeadConfig(head) ?? head;
   const tags = [];
-  if (head.description) {
+  if (normalizedHead.description) {
     tags.push(
-      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(head.description)}" />`
+      `<meta ${createManagedAttributes()} name="description" content="${escapeHtml(normalizedHead.description)}" />`
     );
   }
-  if (head.favicon) {
+  if (normalizedHead.favicon) {
     tags.push(
-      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(head.favicon)}" />`
+      `<link ${createManagedAttributes()} rel="icon" href="${escapeHtml(normalizedHead.favicon)}" />`
     );
   }
-  for (const meta of head.meta ?? []) {
+  for (const meta of normalizedHead.meta ?? []) {
     const attrs = Object.entries(meta).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<meta ${createManagedAttributes()} ${attrs} />`);
   }
-  for (const link of head.links ?? []) {
+  for (const link of normalizedHead.links ?? []) {
     const attrs = Object.entries(link).filter(([, value]) => Boolean(value)).map(([key, value]) => `${key}="${escapeHtml(String(value))}"`).join(" ");
     tags.push(`<link ${createManagedAttributes()} ${attrs} />`);
   }
@@ -510,6 +571,12 @@ function createFileRouter(options) {
       params: {},
       searchParams: input.searchParams,
       cookies: input.cookies ?? {},
+      request: input.request ?? {
+        host: null,
+        pathname,
+        originalPathname: pathname,
+        headers: {}
+      },
       abort: (options2) => {
         throw createAbort(options2);
       }