@qwik.dev/router 2.0.0-beta.27 → 2.0.0-beta.29

package/lib/chunks/fs.mjs

@@ -1,108 +1,5 @@
 import { normalize, basename, dirname, relative } from 'node:path';
-
-function toTitleCase(str) {
-  return str.replace(/\w\S*/g, (txt) => {
-    return txt.charAt(0).toUpperCase() + txt.slice(1).toLowerCase();
-  });
-}
-function addError(ctx, e) {
-  ctx.diagnostics.push({
-    type: "error",
-    message: e ? String(e.stack || e) : "Error"
-  });
-}
-function addWarning(ctx, message) {
-  ctx.diagnostics.push({
-    type: "warn",
-    message: String(message)
-  });
-}
-function msToString(ms) {
-  if (ms < 1) {
-    return ms.toFixed(2) + " ms";
-  }
-  if (ms < 1e3) {
-    return ms.toFixed(1) + " ms";
-  }
-  if (ms < 6e4) {
-    return (ms / 1e3).toFixed(1) + " s";
-  }
-  return (ms / 6e4).toFixed(1) + " m";
-}
-
-function normalizePathname(pathname, basePathname) {
-  if (typeof pathname === "string") {
-    pathname = pathname.trim();
-    if (pathname !== "") {
-      try {
-        pathname = pathname.replace(/\/+/g, "/");
-        if (pathname.startsWith("/")) {
-          pathname = pathname.slice(1);
-        }
-        pathname = new URL(basePathname + pathname, `https://qwik.dev`).pathname;
-        if (pathname !== basePathname) {
-          if (!globalThis.__NO_TRAILING_SLASH__) {
-            if (!pathname.endsWith("/")) {
-              const segments = pathname.split("/");
-              const lastSegment = segments[segments.length - 1];
-              if (!lastSegment.includes(".")) {
-                pathname += "/";
-              }
-            }
-          } else {
-            if (pathname.endsWith("/")) {
-              pathname = pathname.slice(0, pathname.length - 1);
-            }
-          }
-        }
-        return pathname;
-      } catch (e) {
-        console.error(e);
-      }
-    }
-  }
-  return null;
-}
-function getPathnameForDynamicRoute(originalPathname, paramNames, params) {
-  let pathname = originalPathname;
-  if (paramNames && params) {
-    for (const paramName of paramNames) {
-      const paramKey = `[${paramName}]`;
-      const restParamKey = `[...${paramName}]`;
-      const paramValue = params[paramName];
-      pathname = pathname.replace(restParamKey, paramValue);
-      pathname = pathname.replace(paramKey, paramValue);
-    }
-  }
-  return pathname;
-}
-function isSameOriginUrl(url) {
-  if (typeof url === "string") {
-    url = url.trim();
-    if (url !== "") {
-      const firstChar = url.charAt(0);
-      if (firstChar !== "/" && firstChar !== ".") {
-        if (firstChar === "#") {
-          return false;
-        }
-        const i = url.indexOf(":");
-        if (i > -1) {
-          const protocol = url.slice(0, i).toLowerCase();
-          return !PROTOCOLS[protocol];
-        }
-      }
-      return true;
-    }
-  }
-  return false;
-}
-const PROTOCOLS = {
-  https: true,
-  http: true,
-  about: true,
-  javascript: true,
-  file: true
-};
+import { t as toTitleCase, n as normalizePathname } from './pathname.mjs';
 
 function parseRouteIndexName(extlessName) {
   let layoutName = "";
@@ -115,25 +12,10 @@ function parseRouteIndexName(extlessName) {
     namedLayoutParts.shift();
     layoutName = namedLayoutParts.join("@");
   }
-  return { layoutName, layoutStop };
-}
-function getPathnameFromDirPath(opts, dirPath) {
-  const relFilePath = relative(opts.routesDir, dirPath);
-  let pathname = normalizePath(relFilePath);
-  pathname = normalizePathname(pathname, opts.basePathname).split("/").filter((segment) => !isGroupedLayoutName(segment)).join("/");
-  if (pathname === "") {
-    return "/";
-  }
-  return pathname;
-}
-function getMenuPathname(opts, filePath) {
-  let pathname = normalizePath(relative(opts.routesDir, filePath));
-  pathname = `/` + normalizePath(dirname(pathname));
-  let result = normalizePathname(pathname, opts.basePathname);
-  if (!result.endsWith("/")) {
-    result += "/";
-  }
-  return result;
+  return {
+    layoutName,
+    layoutStop
+  };
 }
 function getExtension(fileName) {
   if (typeof fileName === "string") {
@@ -156,9 +38,6 @@ function removeExtension(fileName) {
   }
   return "";
 }
-function normalizePath(path) {
-  return normalizePathSlash(normalize(path));
-}
 function normalizePathSlash(path) {
   const isExtendedLengthPath = path.startsWith("\\\\?\\");
   const hasNonAscii = /[^\u0000-\u0080]+/.test(path);
@@ -171,6 +50,18 @@ function normalizePathSlash(path) {
   }
   return path;
 }
+function normalizePath(path) {
+  return normalizePathSlash(normalize(path));
+}
+function getMenuPathname(opts, filePath) {
+  let pathname = normalizePath(relative(opts.routesDir, filePath));
+  pathname = `/` + normalizePath(dirname(pathname));
+  let result = normalizePathname(pathname, opts.basePathname);
+  if (!result.endsWith("/")) {
+    result += "/";
+  }
+  return result;
+}
 function createFileId(routesDir, fsPath, explicitFileType) {
   const ids = [];
   for (let i = 0; i < 25; i++) {
@@ -235,20 +126,19 @@ function isEntryName(extlessName) {
   return extlessName === "entry";
 }
 function isErrorName(extlessName) {
-  return /^[45][0-9]{2}$/.test(extlessName);
+  return extlessName === "error" || extlessName === "404";
 }
 function isGroupedLayoutName(dirName, warn = true) {
-  if (dirName.startsWith("__")) {
-    if (warn) {
-      console.warn(
-        `Grouped (pathless) layout "${dirName}" should use the "(${dirName.slice(
-          2
-        )})" directory name instead. Prefixing a directory with "__" has been deprecated and will be removed in future versions.`
-      );
-    }
-    return true;
-  }
   return dirName.startsWith("(") && dirName.endsWith(")");
 }
+function getPathnameFromDirPath(opts, dirPath) {
+  const relFilePath = relative(opts.routesDir, dirPath);
+  let pathname = normalizePath(relFilePath);
+  pathname = normalizePathname(pathname, opts.basePathname).split("/").filter((segment) => !isGroupedLayoutName(segment)).join("/");
+  if (pathname === "") {
+    return "/";
+  }
+  return pathname;
+}
 
-export { isErrorName as a, isLayoutModule as b, isEntryName as c, isMenuFileName as d, isServiceWorkerName as e, isPageModuleExt as f, getExtension as g, isModuleExt as h, isIndexModule as i, isMarkdownExt as j, isSameOriginUrl as k, normalizePath as l, getPathnameFromDirPath as m, normalizePathSlash as n, getMenuPathname as o, createFileId as p, parseRouteIndexName as q, removeExtension as r, isPluginModule as s, addError as t, addWarning as u, isPageExt as v, msToString as w, getPathnameForDynamicRoute as x };
+export { isErrorName as a, isLayoutModule as b, isEntryName as c, isMenuFileName as d, isServiceWorkerName as e, isPageModuleExt as f, getExtension as g, isModuleExt as h, isIndexModule as i, isMarkdownExt as j, normalizePath as k, getPathnameFromDirPath as l, getMenuPathname as m, normalizePathSlash as n, createFileId as o, parseRouteIndexName as p, isPluginModule as q, removeExtension as r, isPageExt as s };

package/lib/chunks/http-error.qwik.mjs

@@ -0,0 +1,27 @@
+import { componentQrl, inlinedQrl, _jsxSorted } from '@qwik.dev/core';
+import { k as useHttpStatus } from './use-functions.qwik.mjs';
+
+const cacheKey = (status) => String(status);
+const COLOR_400 = "#006ce9";
+const COLOR_500 = "#713fc2";
+const DisplayHttpStatus = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(() => {
+  const { status, message } = useHttpStatus();
+  const width = message ? "600px" : "300px";
+  const color = status < 500 ? COLOR_400 : COLOR_500;
+  const style = `
+			body { color: ${color}; background-color: #fafafa; padding: 30px; font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, Roboto, sans-serif; }
+			p { max-width: ${width}; margin: 60px auto 30px auto; background: white; border-radius: 4px; box-shadow: 0px 0px 50px -20px ${color}; overflow: hidden; }
+			strong { display: inline-block; padding: 15px; background: ${color}; color: white; }
+			span { display: inline-block; padding: 15px; }
+	`;
+  return /* @__PURE__ */ _jsxSorted("p", null, null, [
+    /* @__PURE__ */ _jsxSorted("style", {
+      dangerouslySetInnerHTML: style
+    }, null, null, 3, null),
+    /* @__PURE__ */ _jsxSorted("strong", null, null, status || 500, 3, null),
+    " ",
+    /* @__PURE__ */ _jsxSorted("span", null, null, message || "", 3, null)
+  ], 1, "vY_0");
+}, "DisplayHttpStatus_component_PJf4K4PL7Oc"));
+
+export { cacheKey, DisplayHttpStatus as default };

package/lib/chunks/not-found-wrapper.qwik.mjs

@@ -0,0 +1,25 @@
+import { k as useHttpStatus } from './use-functions.qwik.mjs';
+
+function createNotFoundWrapper(notFoundMod, errorMod) {
+  const NotFound = notFoundMod.default;
+  const ErrorPage = errorMod.default;
+  const Component = () => {
+    const { status } = useHttpStatus();
+    if (status === 404 && NotFound) {
+      return NotFound({});
+    }
+    if (ErrorPage) {
+      return ErrorPage({});
+    }
+    return null;
+  };
+  const notFoundHead = notFoundMod.routeConfig && typeof notFoundMod.routeConfig !== "function" ? notFoundMod.routeConfig.head : notFoundMod.head;
+  const errorHead = errorMod.routeConfig && typeof errorMod.routeConfig !== "function" ? errorMod.routeConfig.head : errorMod.head;
+  return {
+    default: Component,
+    head: notFoundHead ?? errorHead,
+    cacheKey: (status) => String(status)
+  };
+}
+
+export { createNotFoundWrapper };

package/lib/chunks/pathname.mjs

@@ -0,0 +1,105 @@
+function toTitleCase(str) {
+  return str.replace(/\w\S*/g, (txt) => {
+    return txt.charAt(0).toUpperCase() + txt.slice(1).toLowerCase();
+  });
+}
+function addError(ctx, e) {
+  ctx.diagnostics.push({
+    type: "error",
+    message: e ? String(e.stack || e) : "Error"
+  });
+}
+function addWarning(ctx, message) {
+  ctx.diagnostics.push({
+    type: "warn",
+    message: String(message)
+  });
+}
+function msToString(ms) {
+  if (ms < 1) {
+    return ms.toFixed(2) + " ms";
+  }
+  if (ms < 1e3) {
+    return ms.toFixed(1) + " ms";
+  }
+  if (ms < 6e4) {
+    return (ms / 1e3).toFixed(1) + " s";
+  }
+  return (ms / 6e4).toFixed(1) + " m";
+}
+
+function normalizePathname(pathname, basePathname) {
+  if (typeof pathname === "string") {
+    pathname = pathname.trim();
+    if (pathname !== "") {
+      try {
+        pathname = pathname.replace(/\/+/g, "/");
+        if (pathname.startsWith("/")) {
+          pathname = pathname.slice(1);
+        }
+        pathname = new URL(basePathname + pathname, `https://qwik.dev`).pathname;
+        if (pathname !== basePathname) {
+          if (!globalThis.__NO_TRAILING_SLASH__) {
+            if (!pathname.endsWith("/")) {
+              const segments = pathname.split("/");
+              const lastSegment = segments[segments.length - 1];
+              if (!lastSegment.includes(".")) {
+                pathname += "/";
+              }
+            }
+          } else {
+            if (pathname.endsWith("/")) {
+              pathname = pathname.slice(0, pathname.length - 1);
+            }
+          }
+        }
+        return pathname;
+      } catch (e) {
+        console.error(e);
+      }
+    }
+  }
+  return null;
+}
+function getPathnameForDynamicRoute(originalPathname, paramNames, params) {
+  let pathname = originalPathname;
+  if (paramNames && params) {
+    for (const paramName of paramNames) {
+      const paramKey = `[${paramName}]`;
+      const restParamKey = `[...${paramName}]`;
+      const paramValue = params[paramName];
+      pathname = pathname.replace(restParamKey, paramValue);
+      pathname = pathname.replace(paramKey, paramValue);
+    }
+  }
+  return pathname;
+}
+const PROTOCOLS = {
+  https: true,
+  http: true,
+  about: true,
+  javascript: true,
+  file: true
+};
+function isSameOriginUrl(url) {
+  if (typeof url === "string") {
+    url = url.trim();
+    if (url !== "") {
+      const firstChar = url.charAt(0);
+      if (firstChar !== "/" && firstChar !== ".") {
+        if (firstChar === "#") {
+          return false;
+        }
+        const i = url.indexOf(":");
+        if (i > -1) {
+          const protocol = url.slice(0, i).toLowerCase();
+          return !PROTOCOLS[protocol];
+        }
+      }
+      return true;
+    }
+  }
+  return false;
+}
+
+export { addError as a, addWarning as b, getPathnameForDynamicRoute as g, isSameOriginUrl as i, msToString as m, normalizePathname as n, toTitleCase as t };