@qwik.dev/router 2.0.0-beta.3 → 2.0.0-beta.31

package/lib/adapters/vercel-edge/vite/index.mjs

@@ -1,21 +1,32 @@
-// packages/qwik-router/src/adapters/vercel-edge/vite/index.ts
-import fs from "node:fs";
-import { dirname, join } from "node:path";
-import { getParentDir, viteAdapter } from "../../shared/vite/index.mjs";
+import fs from 'node:fs';
+import { join, dirname } from 'node:path';
+import { viteAdapter, getParentDir } from '../../shared/vite/index.mjs';
+
 function vercelEdgeAdapter(opts = {}) {
-  var _a;
   return viteAdapter({
     name: "vercel-edge",
-    origin: ((_a = process == null ? void 0 : process.env) == null ? void 0 : _a.VERCEL_URL) || "https://yoursitename.vercel.app",
+    origin: process?.env?.VERCEL_URL || "https://yoursitename.vercel.app",
     ssg: opts.ssg,
     staticPaths: opts.staticPaths,
     cleanStaticGenerated: true,
     config(config) {
-      var _a2;
-      const outDir = ((_a2 = config.build) == null ? void 0 : _a2.outDir) || join(".vercel", "output", "functions", "_qwik-router.func");
+      const outDir = config.build?.outDir || join(".vercel", "output", "functions", "_qwik-router.func");
       return {
         resolve: {
-          conditions: opts.target === "node" ? ["node", "import", "module", "browser", "default"] : ["edge-light", "webworker", "worker", "browser", "module", "main"]
+          conditions: opts.target === "node" ? [
+            "node",
+            "import",
+            "module",
+            "browser",
+            "default"
+          ] : [
+            "edge-light",
+            "webworker",
+            "worker",
+            "browser",
+            "module",
+            "main"
+          ]
         },
         ssr: {
           target: opts.target === "node" ? "node" : "webworker",
@@ -39,7 +50,9 @@ function vercelEdgeAdapter(opts = {}) {
       if (opts.outputConfig !== false) {
         const vercelOutputConfig = {
           routes: [
-            { handle: "filesystem" },
+            {
+              handle: "filesystem"
+            },
             {
               src: basePathname + ".*",
               dest: "/_qwik-router"
@@ -47,10 +60,7 @@ function vercelEdgeAdapter(opts = {}) {
           ],
           version: 3
         };
-        await fs.promises.writeFile(
-          join(vercelOutputDir, "config.json"),
-          JSON.stringify(vercelOutputConfig, null, 2)
-        );
+        await fs.promises.writeFile(join(vercelOutputDir, "config.json"), JSON.stringify(vercelOutputConfig, null, 2));
       }
       let entrypoint = opts.vcConfigEntryPoint;
       if (!entrypoint) {
@@ -72,12 +82,16 @@ function vercelEdgeAdapter(opts = {}) {
       if (basePathnameParts.length > 0) {
         vercelStaticDir = join(vercelStaticDir, ...basePathnameParts);
       }
-      await fs.promises.rm(vercelStaticDir, { recursive: true, force: true });
-      await fs.promises.mkdir(dirname(vercelStaticDir), { recursive: true });
+      await fs.promises.rm(vercelStaticDir, {
+        recursive: true,
+        force: true
+      });
+      await fs.promises.mkdir(dirname(vercelStaticDir), {
+        recursive: true
+      });
       await fs.promises.rename(clientPublicOutDir, vercelStaticDir);
     }
   });
 }
-export {
-  vercelEdgeAdapter
-};
+
+export { vercelEdgeAdapter };

package/lib/chunks/deepFreeze.qwik.mjs

@@ -0,0 +1,18 @@
+const deepFreeze = (obj) => {
+  if (obj == null) {
+    return obj;
+  }
+  Object.getOwnPropertyNames(obj).forEach((prop) => {
+    const value = obj[prop];
+    if (value && typeof value === "object" && !Object.isFrozen(value)) {
+      try {
+        deepFreeze(value);
+      } catch {
+        return obj;
+      }
+    }
+  });
+  return Object.freeze(obj);
+};
+
+export { deepFreeze as d };

package/lib/chunks/error-handler.mjs

@@ -0,0 +1,57 @@
+const ESCAPE_HTML = /[&<>]/g;
+const escapeHtml = (s) => {
+  return s.replace(ESCAPE_HTML, (c) => {
+    switch (c) {
+      case "&":
+        return "&amp;";
+      case "<":
+        return "&lt;";
+      case ">":
+        return "&gt;";
+      default:
+        return "";
+    }
+  });
+};
+const COLOR_400 = "#006ce9";
+const COLOR_500 = "#713fc2";
+function minimalHtmlResponse(status, message) {
+  if (typeof status !== "number") {
+    status = 500;
+  }
+  if (typeof message === "string") {
+    message = escapeHtml(message);
+  } else {
+    message = "";
+  }
+  const width = typeof message === "string" ? "600px" : "300px";
+  const color = status >= 500 ? COLOR_500 : COLOR_400;
+  return `
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="Status" content="${status}">
+  <title>${status} ${message}</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <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; }
+  </style>
+</head>
+<body><p><strong>${status}</strong> <span>${message}</span></p></body>
+`;
+}
+function getErrorHtml(status, e) {
+  let message = "Server Error";
+  if (e != null) {
+    if (typeof e.message === "string") {
+      message = e.message;
+    } else {
+      message = String(e);
+    }
+  }
+  return `<html>` + minimalHtmlResponse(status, message) + `</html>`;
+}
+
+export { getErrorHtml as g, minimalHtmlResponse as m };

package/lib/chunks/fs.mjs

@@ -0,0 +1,144 @@
+import { normalize, basename, dirname, relative } from 'node:path';
+import { t as toTitleCase, n as normalizePathname } from './pathname.mjs';
+
+function parseRouteIndexName(extlessName) {
+  let layoutName = "";
+  const layoutStop = extlessName.endsWith("!");
+  if (layoutStop) {
+    extlessName = extlessName.slice(0, extlessName.length - 1);
+  }
+  const namedLayoutParts = extlessName.split("@");
+  if (namedLayoutParts.length > 1) {
+    namedLayoutParts.shift();
+    layoutName = namedLayoutParts.join("@");
+  }
+  return {
+    layoutName,
+    layoutStop
+  };
+}
+function getExtension(fileName) {
+  if (typeof fileName === "string") {
+    const parts = fileName.trim().toLowerCase().split(".");
+    if (parts.length > 1) {
+      const ext = parts.pop().split("?")[0].split("#")[0];
+      if (ext === "ts" && parts.pop() === "d") {
+        return ".d.ts";
+      }
+      return "." + ext;
+    }
+  }
+  return "";
+}
+function removeExtension(fileName) {
+  if (typeof fileName === "string") {
+    fileName = fileName.trim();
+    const ext = getExtension(fileName);
+    return fileName.slice(0, fileName.length - ext.length);
+  }
+  return "";
+}
+function normalizePathSlash(path) {
+  const isExtendedLengthPath = path.startsWith("\\\\?\\");
+  const hasNonAscii = /[^\u0000-\u0080]+/.test(path);
+  if (isExtendedLengthPath || hasNonAscii) {
+    return path;
+  }
+  path = path.replace(/\\/g, "/");
+  if (path.endsWith("/")) {
+    path = path.slice(0, path.length - 1);
+  }
+  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++) {
+    let baseName = removeExtension(basename(fsPath));
+    baseName = baseName.replace(/[\W_]+/g, "");
+    if (baseName === "") {
+      baseName = "Q" + i;
+    } else if (!isNaN(baseName.charAt(0))) {
+      baseName = "Q" + baseName;
+    }
+    ids.push(toTitleCase(baseName));
+    fsPath = normalizePath(dirname(fsPath));
+    if (fsPath === routesDir) {
+      break;
+    }
+  }
+  if (ids.length > 1 && ids[0] === "Index") {
+    ids.shift();
+  }
+  return ids.reverse().join("").concat(explicitFileType || "");
+}
+const PAGE_MODULE_EXTS = {
+  ".tsx": true,
+  ".jsx": true
+};
+const MODULE_EXTS = {
+  ".ts": true,
+  ".js": true
+};
+const MARKDOWN_EXTS = {
+  ".md": true,
+  ".mdx": true
+};
+function isIndexModule(extlessName) {
+  return /^index(|!|@.+)$/.test(extlessName);
+}
+function isPluginModule(extlessName) {
+  return /^plugin(|@.+)$/.test(extlessName) && !/\.(test|unit|spec)(\.[jt]s)?$/.test(extlessName);
+}
+function isLayoutModule(extlessName) {
+  return /^layout(|!|-.+)$/.test(extlessName);
+}
+function isPageModuleExt(ext) {
+  return ext in PAGE_MODULE_EXTS;
+}
+function isModuleExt(ext) {
+  return ext in MODULE_EXTS;
+}
+function isMarkdownExt(ext) {
+  return ext in MARKDOWN_EXTS;
+}
+function isPageExt(ext) {
+  return ext in PAGE_MODULE_EXTS || ext in MARKDOWN_EXTS;
+}
+function isMenuFileName(fileName) {
+  return fileName === "menu.md";
+}
+function isServiceWorkerName(extlessName) {
+  return extlessName === "service-worker";
+}
+function isEntryName(extlessName) {
+  return extlessName === "entry";
+}
+function isErrorName(extlessName) {
+  return extlessName === "error" || extlessName === "404";
+}
+function isGroupedLayoutName(dirName, warn = 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, 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,35 @@
+import { componentQrl, inlinedQrl, _jsxSorted, _fnSignal } from '@qwik.dev/core';
+import { k as useHttpStatus } from './use-functions.qwik.mjs';
+
+const _hf0 = (p0) => p0.status || 500;
+const _hf0_str = "p0.status||500";
+const _hf1 = (p0) => p0.message || "";
+const _hf1_str = 'p0.message||""';
+const cacheKey = (status) => String(status);
+const COLOR_400 = "#006ce9";
+const COLOR_500 = "#713fc2";
+const DisplayHttpStatus = /* @__PURE__ */ componentQrl(/* @__PURE__ */ inlinedQrl(() => {
+  const httpstatus = useHttpStatus();
+  const width = httpstatus.message ? "600px" : "300px";
+  const color = httpstatus.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, _fnSignal(_hf0, [
+      httpstatus
+    ], _hf0_str), 3, null),
+    " ",
+    /* @__PURE__ */ _jsxSorted("span", null, null, _fnSignal(_hf1, [
+      httpstatus
+    ], _hf1_str), 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 };

package/lib/chunks/redirect-handler.mjs

@@ -0,0 +1,6 @@
+class AbortMessage {
+}
+class RedirectMessage extends AbortMessage {
+}
+
+export { AbortMessage as A, RedirectMessage as R };