@marko/run 0.6.5 → 0.7.0

package/dist/cli/index.mjs

@@ -15,7 +15,7 @@ import sade from "sade";
 
 // src/cli/commands.ts
 import fs5 from "fs";
-import path5 from "path";
+import path7 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import {
   build as viteBuild,
@@ -29,9 +29,12 @@ import createDebug from "debug";
 import { resolveToEsbuildTarget } from "esbuild-plugin-browserslist";
 import fs3 from "fs";
 import { glob } from "glob";
-import path4 from "path";
+import path6 from "path";
 import { fileURLToPath } from "url";
-import { buildErrorMessage, mergeConfig } from "vite";
+import {
+  buildErrorMessage,
+  mergeConfig
+} from "vite";
 
 // src/adapter/utils.ts
 import kleur from "kleur";
@@ -59,7 +62,7 @@ function prepareError(err) {
 }
 
 // src/vite/codegen/index.ts
-import path from "path";
+import path2 from "path";
 
 // src/vite/constants.ts
 var markoRunFilePrefix = "__marko-run__";
@@ -84,6 +87,12 @@ var RoutableFileTypes = {
   Error: "500"
 };
 
+// src/vite/utils/fs.ts
+import path from "path";
+var POSIX_SEP = "/";
+var WINDOWS_SEP = "\\";
+var normalizePath = path.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
+
 // src/vite/utils/route.ts
 var httpVerbOrder = httpVerbs.reduce(
   (order, verb, index) => {
@@ -107,6 +116,9 @@ function hasVerb(route, verb) {
   var _a, _b;
   return verb === "get" && !!route.page || ((_b = (_a = route.handler) == null ? void 0 : _a.verbs) == null ? void 0 : _b.includes(verb)) || verb === "head" && hasVerb(route, "get");
 }
+function getRouteVirtualFileName(route) {
+  return `${markoRunFilePrefix}${route.key.replace(/\//g, ".")}.js`;
+}
 
 // src/vite/codegen/writer.ts
 function createWriter(sink, options) {
@@ -249,27 +261,34 @@ function createStringWriter(opts) {
 }
 
 // src/vite/codegen/index.ts
-function renderRouteTemplate(route, getRelativePath) {
+function normalizedRelativePath(from, to) {
+  const relativePath = normalizePath(path2.relative(from, to));
+  return relativePath.startsWith(".") ? relativePath : "./" + relativePath;
+}
+function renderRouteTemplate(route, rootDir) {
   if (!route.page) {
     throw new Error(`Route ${route.key} has no page to render`);
   }
+  if (!route.templateFilePath) {
+    throw new Error(`Route ${route.key} has no template file path`);
+  }
   return renderEntryTemplate(
-    route.entryName,
+    normalizedRelativePath(rootDir, route.templateFilePath),
     [...route.layouts, route.page].map(
-      (file) => getRelativePath(file.importPath)
+      (file) => normalizedRelativePath(
+        path2.dirname(route.templateFilePath),
+        file.filePath
+      )
     ),
     route.key === RoutableFileTypes.Error ? ["error"] : []
   );
 }
 function renderEntryTemplate(name, files, pageInputs = []) {
-  if (!name) {
-    throw new Error(`Invalid argument - 'name' cannot be empty`);
-  }
   if (!files.length) {
     throw new Error(`Invalid argument - 'files' cannot be empty`);
   }
   const writer = createStringWriter();
-  writer.writeLines(`// ${name}.marko`);
+  writer.writeLines(`// ${name}`);
   writer.branch("imports");
   writer.writeLines("");
   writeEntryTemplateTag(writer, files, pageInputs);
@@ -279,7 +298,7 @@ function writeEntryTemplateTag(writer, [file, ...rest], pageInputs, index = 1) {
   if (file) {
     const isLast = !rest.length;
     const tag = isLast ? "Page" : `Layout${index}`;
-    writer.branch("imports").writeLines(`import ${tag} from '${file}';`);
+    writer.branch("imports").writeLines(`import ${tag} from "${file}";`);
     if (isLast) {
       const attributes = pageInputs.length ? " " + pageInputs.map((name) => `${name}=input.${name}`).join(" ") : "";
       writer.writeLines(`<${tag}${attributes}/>`);
@@ -290,9 +309,9 @@ function writeEntryTemplateTag(writer, [file, ...rest], pageInputs, index = 1) {
     }
   }
 }
-function renderRouteEntry(route, entriesDir) {
+function renderRouteEntry(route, rootDir) {
   var _a;
-  const { key, index, handler, page, middleware, meta, entryName } = route;
+  const { key, index, handler, page, middleware, meta } = route;
   const verbs = getVerbs(route);
   if (!verbs) {
     throw new Error(
@@ -300,7 +319,7 @@ function renderRouteEntry(route, entriesDir) {
     );
   }
   const writer = createStringWriter();
-  writer.writeLines(`// ${virtualFilePrefix}/${entryName}.js`);
+  writer.writeLines(`// ${virtualFilePrefix}${getRouteVirtualFileName(route)}`);
   const imports = writer.branch("imports");
   const runtimeImports = [];
   if (handler) {
@@ -312,9 +331,6 @@ function renderRouteEntry(route, entriesDir) {
   if (!page || verbs.some((verb) => verb !== "get" && verb !== "head")) {
     runtimeImports.push("noContent");
   }
-  if (page) {
-    runtimeImports.push("pageResponse");
-  }
   if (verbs.includes("head")) {
     runtimeImports.push("stripResponseBody");
   }
@@ -322,7 +338,7 @@ function renderRouteEntry(route, entriesDir) {
     imports.writeLines(
       `import { ${runtimeImports.join(
         ", "
-      )} } from '${virtualFilePrefix}/runtime/internal';`
+      )} } from "${virtualFilePrefix}/runtime/internal";`
     );
   }
   if (middleware.length) {
@@ -330,7 +346,7 @@ function renderRouteEntry(route, entriesDir) {
     imports.writeLines(
       `import { ${names.join(
         ", "
-      )} } from '${virtualFilePrefix}/${markoRunFilePrefix}middleware.js';`
+      )} } from "${virtualFilePrefix}/${markoRunFilePrefix}middleware.js";`
     );
   }
   if ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.length) {
@@ -342,18 +358,17 @@ function renderRouteEntry(route, entriesDir) {
       writer.writeLines(`const ${verb}Handler = normalize(${importName});`);
     }
     imports.writeLines(
-      `import { ${names.join(", ")} } from './${handler.importPath}';`
+      `import { ${names.join(", ")} } from "${normalizedRelativePath(rootDir, handler.filePath)}";`
     );
   }
   if (page) {
-    const pageNameIndex = page.name.indexOf("+page");
-    const pageNamePrefix = pageNameIndex > 0 ? `${page.name.slice(0, pageNameIndex)}.` : "";
-    const importPath = route.layouts.length ? `./${path.posix.join(entriesDir, page.relativePath, "..", pageNamePrefix + "route.marko")}` : `./${page.importPath}`;
-    imports.writeLines(`import page from '${importPath}${serverEntryQuery}';`);
+    imports.writeLines(
+      `import page from "${normalizedRelativePath(rootDir, route.templateFilePath || page.filePath)}${serverEntryQuery}";`
+    );
   }
   if (meta) {
     imports.writeLines(
-      `export { default as meta${index} } from './${meta.importPath}';`
+      `export { default as meta${index} } from "${normalizedRelativePath(rootDir, meta.filePath)}";`
     );
   }
   for (const verb of verbs) {
@@ -370,9 +385,7 @@ function writeRouteEntryHandler(writer, route, verb) {
   let hasBody = false;
   writer.writeLines("");
   if (page && (verb === "get" || verb === "head")) {
-    writer.writeBlockStart(
-      `export function ${verb}${index}(context, buildInput) {`
-    );
+    writer.writeBlockStart(`export function ${verb}${index}(context) {`);
   } else {
     writer.writeBlockStart(`export function ${verb}${index}(context) {`);
   }
@@ -382,7 +395,7 @@ function writeRouteEntryHandler(writer, route, verb) {
     if ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes(verb)) {
       const name = `${verb}Handler`;
       continuations.writeLines(
-        `const ${currentName} = () => pageResponse(page, buildInput());`
+        `const ${currentName} = () => context.render(page, {});`
       );
       if (len) {
         nextName = currentName;
@@ -401,17 +414,15 @@ function writeRouteEntryHandler(writer, route, verb) {
         hasBody = true;
       }
     } else if (verb === "head") {
-      writer.writeLines(
-        `return stripResponseBody(get${index}(context, buildInput));`
-      );
+      writer.writeLines(`return stripResponseBody(get${index}(context));`);
       hasBody = true;
     } else if (len) {
       continuations.writeLines(
-        `const ${currentName} = () => pageResponse(page, buildInput());`
+        `const ${currentName} = () => context.render(page, {});`
       );
       nextName = currentName;
     } else {
-      writer.writeLines(`return pageResponse(page, buildInput());`);
+      writer.writeLines(`return context.render(page, {});`);
       hasBody = true;
     }
   } else if ((_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes(verb)) {
@@ -461,7 +472,7 @@ function writeRouteEntryHandler(writer, route, verb) {
   continuations.join();
   writer.writeBlockEnd("}");
 }
-function renderRouter(routes, entriesDir, options = {
+function renderRouter(routes, rootDir, options = {
   trailingSlashes: "RedirectWithout"
 }) {
   const writer = createStringWriter();
@@ -470,20 +481,19 @@ function renderRouter(routes, entriesDir, options = {
   writer.writeLines(`// @marko/run/router`);
   const imports = writer.branch("imports");
   imports.writeLines(
-    `import { NotHandled, NotMatched, createContext${hasErrorPage || hasNotFoundPage ? ", pageResponse" : ""} } from '${virtualFilePrefix}/runtime/internal';`
+    `import { NotHandled, NotMatched, createContext } from "${virtualFilePrefix}/runtime/internal";`
   );
   for (const route of routes.list) {
     const verbs = getVerbs(route);
     const names = verbs.map((verb) => `${verb}${route.index}`);
     route.meta && names.push(`meta${route.index}`);
     imports.writeLines(
-      `import { ${names.join(", ")} } from '${virtualFilePrefix}/${route.entryName}.js';`
+      `import { ${names.join(", ")} } from "${virtualFilePrefix}/${getRouteVirtualFileName(route)}";`
     );
   }
   for (const route of Object.values(routes.special)) {
-    const importPath = route.layouts.length ? `./${path.posix.join(entriesDir, route.page.relativePath, "..", `route.${route.key}.marko`)}` : `./${route.page.importPath}`;
     imports.writeLines(
-      `import page${route.key} from '${importPath}${serverEntryQuery}';`
+      `import page${route.key} from "${normalizedRelativePath(rootDir, route.templateFilePath || route.page.filePath)}${serverEntryQuery}";`
     );
   }
   writer.writeLines(
@@ -491,11 +501,12 @@ function renderRouter(routes, entriesDir, options = {
 globalThis.__marko_run__ = { match, fetch, invoke };
     `
   ).writeBlockStart(`export function match(method, pathname) {`).writeLines(
-    `if (!pathname) {
-    pathname = '/';
-  } else if (pathname.charAt(0) !== '/') {
-    pathname = '/' + pathname;
-  }`
+    `const last = pathname.length - 1;
+  return match_internal(method, last && pathname.charAt(last) === '/' ? pathname.slice(0, last) : pathname)
+};
+  
+function match_internal(method, pathname) {
+  const len = pathname.length;`
   ).writeBlockStart(`switch (method) {`);
   for (const verb of httpVerbs) {
     const filteredRoutes = routes.list.filter((route) => hasVerb(route, verb));
@@ -511,13 +522,13 @@ globalThis.__marko_run__ = { match, fetch, invoke };
   writer.writeLines("").writeBlockStart(
     "export async function invoke(route, request, platform, url) {"
   ).writeLines(
-    "const [context, buildInput] = createContext(route, request, platform, url);"
+    "const context = createContext(route, request, platform, url);"
   );
   if (hasErrorPage) {
     writer.writeBlockStart("try {");
   }
   writer.writeBlockStart("if (route) {").writeBlockStart("try {").writeLines(
-    "const response = await route.handler(context, buildInput);",
+    "const response = await route.handler(context);",
     "if (response) return response;"
   ).indent--;
   writer.writeBlockStart("} catch (error) {").writeLines(
@@ -534,7 +545,7 @@ const page404ResponseInit = {
     );
     writer.write(`    
     if (context.request.headers.get('Accept')?.includes('text/html')) {
-      return pageResponse(page404, buildInput(), page404ResponseInit);
+      return context.render(page404, {}, page404ResponseInit);
     }`);
   }
   writer.indent--;
@@ -551,7 +562,7 @@ const page500ResponseInit = {
     writer.writeBlockStart(`} catch (error) {`).writeBlockStart(
       `if (context.request.headers.get('Accept')?.includes('text/html')) {`
     ).writeLines(
-      `return pageResponse(page500, buildInput({ error }), page500ResponseInit);`
+      `return context.render(page500, { error }, page500ResponseInit);`
     ).writeBlockEnd("}").writeLines("throw error;").writeBlockEnd("}");
   }
   writer.writeBlockEnd("}");
@@ -563,38 +574,40 @@ function renderFetch(writer, options) {
 export async function fetch(request, platform) {
   try {
     const url = new URL(request.url);
-    let { pathname } = url;`);
+    const { pathname } = url;
+    const last = pathname.length - 1;
+    const hasTrailingSlash = last && pathname.charAt(last) === '/';
+    const normalizedPathname = hasTrailingSlash ? pathname.slice(0, last) : pathname;
+    const route = match_internal(request.method, normalizedPathname);`);
   switch (options.trailingSlashes) {
     case "RedirectWithout":
       writer.write(`
-    if (pathname !== '/' && pathname.endsWith('/')) {
-      url.pathname = pathname.slice(0, -1);
+    if (route && hasTrailingSlash) {
+      url.pathname = normalizedPathname
       return Response.redirect(url);
     }`);
       break;
     case "RedirectWith":
       writer.write(`
-    if (pathname !== '/' && !pathname.endsWith('/')) {
-      url.pathname = pathname + '/';
+    if (route && pathname !== '/' && !hasTrailingSlash) {
+      url.pathname += '/';
       return Response.redirect(url);
     }`);
       break;
     case "RewriteWithout":
       writer.write(`
-    if (pathname !== '/' && pathname.endsWith('/')) {
-      url.pathname = pathname = pathname.slice(0, -1);
+    if (route && hasTrailingSlash) {
+      url.pathname = normalizedPathname;
     }`);
       break;
     case "RewriteWith":
       writer.write(`
-    if (pathname !== '/' && !pathname.endsWith('/')) {
-      url.pathname = pathname = pathname + '/';
+    if (route && pathname !== '/' && !hasTrailingSlash) {
+      url.pathname += '/';
     }`);
       break;
   }
   writer.write(`   
-
-    const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
     if (import.meta.env.DEV) {
@@ -610,10 +623,9 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
   const { route, dynamic, catchAll } = trie;
   let closeCount = 0;
   if (level === 0) {
-    writer.writeLines(`const len = pathname.length;`);
     if (route) {
       writer.writeLines(
-        `if (len === 1) return ${renderMatch(verb, route, trie.path)}; // ${trie.path.path}`
+        `if (len === 1) return ${renderMatch(verb, route, trie.path)};`
       );
     } else if (trie.static || dynamic) {
       writer.writeBlockStart(`if (len > 1) {`);
@@ -654,17 +666,15 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         if (useSwitch) {
           writer.writeBlockStart(`switch (${value}) {`);
         }
-        for (const { key, path: path6, route: route2 } of terminal) {
+        for (const { key, path: path8, route: route2 } of terminal) {
           const decodedKey = decodeURIComponent(key);
           if (useSwitch) {
             writer.write(`case '${decodedKey}': `, true);
           } else {
             writer.write(`if (${value} === '${decodedKey}') `, true);
           }
-          writer.write(
-            `return ${renderMatch(verb, route2, path6)}; // ${path6.path}
-`
-          );
+          writer.write(`return ${renderMatch(verb, route2, path8)};
+`);
         }
         if (useSwitch) {
           writer.writeBlockEnd("}");
@@ -676,7 +686,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
             verb,
             dynamic.route,
             dynamic.path
-          )}; // ${dynamic.path.path}`
+          )};`
         );
       }
     }
@@ -736,7 +746,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         catchAll.route,
         catchAll.path,
         String(offset)
-      )}; // ${catchAll.path.path}`
+      )};`
     );
   } else if (level === 0) {
     writer.writeLines("return null;");
@@ -765,43 +775,47 @@ function renderParams(params, pathIndex) {
   }
   return result ? result + " }" : "{}";
 }
-function renderMatch(verb, route, path6, pathIndex) {
+function renderMatch(verb, route, path8, pathIndex) {
   const handler = `${verb}${route.index}`;
-  const params = path6.params ? renderParams(path6.params, pathIndex) : "{}";
+  const params = path8.params ? renderParams(path8.params, pathIndex) : "{}";
   const meta = route.meta ? `meta${route.index}` : "{}";
-  const pathPattern = pathToURLPatternString(path6.path);
-  return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${pathPattern}' }`;
+  return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${path8.path}' }`;
 }
-function renderMiddleware(middleware) {
+function renderMiddleware(middleware, rootDir) {
   const writer = createStringWriter();
   writer.writeLines(
     `// ${virtualFilePrefix}/${markoRunFilePrefix}middleware.js`
   );
   const imports = writer.branch("imports");
   imports.writeLines(
-    `import { normalize } from '${virtualFilePrefix}/runtime/internal';`
+    `import { normalize } from "${virtualFilePrefix}/runtime/internal";`
   );
   writer.writeLines("");
-  for (const { id, importPath } of middleware) {
+  for (const { id, filePath } of middleware) {
     const importName = `middleware${id}`;
-    imports.writeLines(`import ${importName} from './${importPath}';`);
+    imports.writeLines(
+      `import ${importName} from "${normalizedRelativePath(rootDir, filePath)}";`
+    );
     writer.writeLines(`export const mware${id} = normalize(${importName});`);
   }
   imports.join();
   return writer.end();
 }
-function stripTsExtension(path6) {
-  const index = path6.lastIndexOf(".");
+function stripTsExtension(path8) {
+  const index = path8.lastIndexOf(".");
   if (index !== -1) {
-    const ext = path6.slice(index + 1);
+    const ext = path8.slice(index + 1);
     if (ext.toLowerCase() === "ts") {
-      return path6.slice(0, index);
+      return path8.slice(0, index);
     }
   }
-  return path6;
+  return path8;
 }
-async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
-  var _a, _b;
+function decodePath(path8) {
+  return path8;
+}
+async function renderRouteTypeInfo(routes, outDir, adapter) {
+  var _a, _b, _c, _d;
   const writer = createStringWriter();
   writer.writeLines(
     `/*
@@ -830,11 +844,31 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   const routeTypes = /* @__PURE__ */ new Map();
   for (const route of routes.list) {
     let routeType = "";
-    for (const path6 of route.paths) {
-      const pathType = `"${pathToURLPatternString(path6.path)}"`;
-      routeType += routeType ? " | " + pathType : pathType;
-      routesWriter.writeLines(`${pathType}: Routes["${route.key}"];`);
+    let routeDefinition = "";
+    if (route.page || route.handler) {
+      const verbs = [];
+      if (route.page || ((_b = (_a = route.handler) == null ? void 0 : _a.verbs) == null ? void 0 : _b.includes("get"))) {
+        verbs.push(`"get"`);
+      }
+      if ((_d = (_c = route.handler) == null ? void 0 : _c.verbs) == null ? void 0 : _d.includes("post")) {
+        verbs.push(`"post"`);
+      }
+      routeDefinition = `{ verb: ${verbs.join(" | ")};`;
+      if (route.meta) {
+        const metaPath = stripTsExtension(
+          normalizedRelativePath(outDir, route.meta.filePath)
+        );
+        let metaType = `typeof import("${metaPath}")`;
+        if (/\.(ts|js|mjs)$/.test(route.meta.name)) {
+          metaType += `["default"]`;
+        }
+        routeDefinition += ` meta: ${metaType};`;
+      }
+      routeDefinition += " }";
     }
+    const pathType = `"${decodePath(route.path.path)}"`;
+    routeType += routeType ? " | " + pathType : pathType;
+    routesWriter.writeLines(`${pathType}: ${routeDefinition};`);
     for (const file of [route.handler, route.page]) {
       if (file) {
         const existing = routeTypes.get(file);
@@ -867,33 +901,33 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   const pageWriter = writer.branch("page");
   const layoutWriter = writer.branch("layout");
   for (const [file, types] of routeTypes) {
-    const path6 = `${pathPrefix}/${file.relativePath}`;
+    const modulePath = stripTsExtension(
+      normalizedRelativePath(outDir, file.filePath)
+    );
     const routeType = `Run.Routes[${types.join(" | ")}]`;
     switch (file.type) {
       case RoutableFileTypes.Handler:
-        writeModuleDeclaration(handlerWriter, path6, routeType);
+        writeModuleDeclaration(handlerWriter, modulePath, routeType);
         break;
       case RoutableFileTypes.Middleware:
-        writeModuleDeclaration(middlewareWriter, path6, routeType);
+        writeModuleDeclaration(middlewareWriter, modulePath, routeType);
         break;
       case RoutableFileTypes.Page:
-        writeModuleDeclaration(pageWriter, path6, routeType);
+        writeModuleDeclaration(pageWriter, modulePath, routeType);
         break;
       case RoutableFileTypes.Layout:
         writeModuleDeclaration(
           layoutWriter,
-          path6,
+          modulePath,
           routeType,
           `
-  export interface Input {
-    [Run.ContentKeyFor<typeof import('${path6}')>]: Marko.Body;
-  }`
+  export interface Input extends Run.LayoutInput<typeof import("${modulePath}")> {}`
         );
         break;
       case RoutableFileTypes.Error:
         writeModuleDeclaration(
           writer,
-          path6,
+          modulePath,
           "globalThis.MarkoRun.Route",
           `
   export interface Input {
@@ -902,7 +936,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
         );
         break;
       case RoutableFileTypes.NotFound:
-        writeModuleDeclaration(writer, path6, "Run.Route");
+        writeModuleDeclaration(writer, modulePath, "Run.Route");
         break;
     }
   }
@@ -910,40 +944,15 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   middlewareWriter.join();
   pageWriter.join();
   layoutWriter.join();
-  writer.writeBlockStart(`
-type Routes = {`);
-  for (const route of routes.list) {
-    const { meta, handler, page } = route;
-    if (page || handler) {
-      const verbs = [];
-      if (page || ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes("get"))) {
-        verbs.push(`"get"`);
-      }
-      if ((_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes("post")) {
-        verbs.push(`"post"`);
-      }
-      let routeType = `{ verb: ${verbs.join(" | ")};`;
-      if (meta) {
-        const metaPath = stripTsExtension(`${pathPrefix}/${meta.relativePath}`);
-        let metaType = `typeof import("${metaPath}")`;
-        if (/\.(ts|js|mjs)$/.test(meta.name)) {
-          metaType += `["default"]`;
-        }
-        routeType += ` meta: ${metaType};`;
-      }
-      writer.writeLines(`"${route.key}": ${routeType} };`);
-    }
-  }
-  writer.writeBlockEnd("}");
   return writer.end();
 }
-function writeModuleDeclaration(writer, path6, routeType, moduleTypes) {
-  writer.writeLines("").write(`declare module "${stripTsExtension(path6)}" {`);
+function writeModuleDeclaration(writer, name, routeType, moduleTypes) {
+  writer.writeLines("").write(`declare module "${name}" {`);
   if (moduleTypes) {
     writer.write(moduleTypes);
   }
   if (routeType) {
-    const isMarko = path6.endsWith(".marko");
+    const isMarko = name.endsWith(".marko");
     writer.write(`
   namespace MarkoRun {
     export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
@@ -957,21 +966,15 @@ function writeModuleDeclaration(writer, path6, routeType, moduleTypes) {
   writer.writeLines(`
 }`);
 }
-function pathToURLPatternString(path6) {
-  return path6.replace(/\/\$(\$?)([^/]*)/g, (_, catchAll, name) => {
-    name = decodeURIComponent(name);
-    return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
-  });
-}
 function createRouteTrie(routes) {
   const root = {
     key: ""
   };
-  function insert(path6, route) {
+  function insert(path8, route) {
     let node = root;
-    for (const segment of path6.segments) {
+    for (const segment of path8.segments) {
       if (segment === "$$") {
-        node.catchAll ?? (node.catchAll = { route, path: path6 });
+        node.catchAll ?? (node.catchAll = { route, path: path8 });
         return;
       } else if (segment === "$") {
         node = node.dynamic ?? (node.dynamic = {
@@ -989,17 +992,18 @@ function createRouteTrie(routes) {
         node = next;
       }
     }
-    node.path ?? (node.path = path6);
+    node.path ?? (node.path = path8);
     node.route ?? (node.route = route);
   }
   for (const route of routes) {
-    for (const path6 of route.paths) {
-      insert(path6, route);
-    }
+    insert(route.path, route);
   }
   return root;
 }
 
+// src/vite/routes/builder.ts
+import path3 from "path";
+
 // src/vite/routes/parse.ts
 function parseFlatRoute(pattern) {
   if (!pattern) throw new Error("Empty pattern");
@@ -1014,53 +1018,72 @@ function parseFlatRoute(pattern) {
   ]);
   function parse2(basePaths, group) {
     const pathMap = /* @__PURE__ */ new Map();
-    const delimiters = group ? ").," : ".,";
+    const delimiters = group ? "`).," : "`.,";
     let charCode;
     let segmentStart = i;
     let type;
     let current;
+    let escaped = "";
+    let escapeStart = 0;
     do {
       charCode = pattern.charCodeAt(i);
-      if (charCode === 41 && group) {
+      if (charCode === 96 /* Escape */) {
+        if (escapeStart) {
+          escaped += pattern.slice(segmentStart, escapeStart - 1) + pattern.slice(escapeStart, i);
+          escapeStart = 0;
+          segmentStart = ++i;
+        } else {
+          escapeStart = i + 1;
+          i = pattern.indexOf("`", escapeStart);
+          if (i < 0) break;
+        }
+      } else if (charCode === 41 /* GroupEnd */ && group) {
         break;
-      } else if (charCode === 44) {
+      } else if (charCode === 44 /* Alternate */) {
         if (!current) {
           segmentEnd(
-            basePaths.map((path6) => ({
-              ...path6,
-              segments: path6.segments.slice()
+            basePaths.map((path8) => ({
+              ...path8,
+              segments: path8.segments.slice()
             })),
-            "",
+            escaped,
             "_",
             pathMap
           );
         } else {
-          segmentEnd(current, pattern.slice(segmentStart, i), type, pathMap);
+          segmentEnd(
+            current,
+            escaped + pattern.slice(segmentStart, i),
+            type,
+            pathMap
+          );
         }
         current = void 0;
         type = void 0;
+        escaped = "";
         segmentStart = ++i;
-      } else if (charCode === 46) {
+      } else if (charCode === 46 /* Directory */) {
         if (current) {
-          segmentEnd(current, pattern.slice(segmentStart, i), type);
+          segmentEnd(current, escaped + pattern.slice(segmentStart, i), type);
         }
         type = void 0;
+        escaped = "";
         segmentStart = ++i;
-      } else if (charCode === 40) {
+      } else if (charCode === 40 /* GroupStart */) {
         const groupPaths = parse2(current || basePaths, ++i);
         if (groupPaths.length) {
           current = groupPaths;
         }
         segmentStart = ++i;
       } else {
-        if (charCode === 95) {
+        if (charCode === 95 /* Pathless */) {
           type = "_";
-        } else if (charCode === 36) {
+        } else if (charCode === 36 /* Dynamic */) {
           type = pattern.charCodeAt(i + 1) === 36 ? "$$" : "$";
         }
-        current ?? (current = basePaths.map((path6) => ({
-          ...path6,
-          segments: path6.segments.slice()
+        current ?? (current = basePaths.map((path8) => ({
+          ...path8,
+          segments: path8.segments.slice()
         })));
         i = len;
         for (const char of delimiters) {
@@ -1071,7 +1094,12 @@ function parseFlatRoute(pattern) {
         }
       }
     } while (i < len);
-    if (group && charCode !== 41) {
+    if (escapeStart) {
+      throw new Error(
+        `Invalid route pattern: unclosed escape '${pattern.slice(escapeStart)}' in '${pattern}'`
+      );
+    }
+    if (group && charCode !== 41 /* GroupEnd */) {
       throw new Error(
         `Invalid route pattern: group was not closed '${pattern.slice(
           group
@@ -1080,16 +1108,21 @@ function parseFlatRoute(pattern) {
     }
     if (!current) {
       segmentEnd(
-        basePaths.map((path6) => ({
-          ...path6,
-          segments: path6.segments.slice()
+        basePaths.map((path8) => ({
+          ...path8,
+          segments: path8.segments.slice()
         })),
-        "",
-        "_",
+        escaped,
+        void 0,
         pathMap
       );
     } else {
-      segmentEnd(current, pattern.slice(segmentStart, i), type, pathMap);
+      segmentEnd(
+        current,
+        escaped + pattern.slice(segmentStart, i),
+        type,
+        pathMap
+      );
     }
     return [...pathMap.values()];
   }
@@ -1098,17 +1131,17 @@ function parseFlatRoute(pattern) {
     if (raw) {
       segment = {
         raw,
-        name: raw,
+        name: normalizeSegment(raw),
         type
       };
       if (type === "$" || type === "$$") {
         segment.name = type;
-        segment.param = raw.slice(type.length);
+        segment.param = normalizeParam(raw.slice(type.length));
       }
     }
-    for (const path6 of paths) {
+    for (const path8 of paths) {
       if (segment) {
-        if (path6.isCatchall) {
+        if (path8.isCatchall) {
           throw new Error(
             `Invalid route pattern: nested segments are not allowed after a catch-all parameter. Found '.' following '${pattern.slice(
               0,
@@ -1116,26 +1149,36 @@ function parseFlatRoute(pattern) {
             )}' in '${pattern}'.`
           );
         }
-        path6.segments.push(segment);
-        path6.id += path6.id === "/" ? segment.name : `/${segment.name}`;
+        path8.segments.push(segment);
+        path8.id += path8.id === "/" ? segment.name : `/${segment.name}`;
         if (type === "$$") {
-          path6.isCatchall = true;
+          path8.isCatchall = true;
         }
       }
       if (map) {
-        if (map.has(path6.id)) {
-          const existing = map.get(path6.id);
+        if (map.has(path8.id)) {
+          const existing = map.get(path8.id);
           const existingExpansion = existing.segments.map((s) => s.raw).join(".");
-          const currentExpansion = path6.segments.map((s) => s.raw).join(".");
+          const currentExpansion = path8.segments.map((s) => s.raw).join(".");
           throw new Error(
-            `Invalid route pattern: route '${path6.id}' is ambiguous. Expansion '${currentExpansion}' collides with '${existingExpansion}' in '${pattern}'.`
+            `Invalid route pattern: route '${path8.id}' is ambiguous. Expansion '${currentExpansion}' collides with '${existingExpansion}' in '${pattern}'.`
           );
         }
-        map.set(path6.id, path6);
+        map.set(path8.id, path8);
       }
     }
   }
 }
+function normalizeParam(segment) {
+  const normalized = normalizeSegment(segment);
+  return /^\$/.test(normalized) ? `\`${normalized}\`` : normalized;
+}
+function normalizeSegment(segment) {
+  return decodeURIComponent(segment).replace(
+    /[/?#]/g,
+    (char) => "%" + char.charCodeAt(0).toString(16)
+  );
+}
 
 // src/vite/routes/vdir.ts
 var _dirs, _pathlessDirs;
@@ -1146,14 +1189,12 @@ var _VDir = class _VDir {
     __publicField(this, "parent");
     __publicField(this, "source");
     __publicField(this, "path");
-    __publicField(this, "fullPath");
     __publicField(this, "segment");
     __publicField(this, "files");
     if (!parent || !segment) {
       this.parent = null;
       this.source = null;
       this.path = "/";
-      this.fullPath = "/";
       this.segment = {
         raw: "",
         name: ""
@@ -1161,12 +1202,8 @@ var _VDir = class _VDir {
     } else {
       this.parent = parent;
       this.source = source;
-      this.path = parent.path + (parent.path === "/" ? segment.name : `/${segment.name}`);
-      this.fullPath = parent.fullPath + (parent.fullPath === "/" ? segment.name : `/${segment.name}`);
-      if (segment.param) {
-        this.fullPath += segment.param;
-      }
       this.segment = segment;
+      this.path = parent.path + (parent.path === "/" ? "" : "/") + segment.name;
     }
   }
   get pathInfo() {
@@ -1179,17 +1216,18 @@ var _VDir = class _VDir {
     for (const { segment } of this) {
       const { type, name, param } = segment;
       if (name && type !== "_") {
-        value.id += sep + (type || name);
+        value.id += sep + name;
         value.path += sep + name;
         value.isEnd = type === "$$";
         if (param) {
-          value.path += param;
+          const unescapedParam = param.charAt(0) === "`" ? param.slice(1, -1) : param;
           const index = type === "$$" ? null : value.segments.length;
           if (!value.params) {
-            value.params = { [param]: index };
+            value.params = { [unescapedParam]: index };
           } else if (!(param in value.params)) {
-            value.params[param] = index;
+            value.params[unescapedParam] = index;
           }
+          value.path += param;
         }
         value.segments.push(name);
         sep = "/";
@@ -1201,11 +1239,11 @@ var _VDir = class _VDir {
     });
     return value;
   }
-  addDir(path6, segment) {
+  addDir(path8, segment) {
     const map = segment.type === "_" ? __privateGet(this, _pathlessDirs) ?? __privateSet(this, _pathlessDirs, /* @__PURE__ */ new Map()) : __privateGet(this, _dirs) ?? __privateSet(this, _dirs, /* @__PURE__ */ new Map());
     const key = segment.type === "$" ? segment.raw : segment.name;
     if (!map.has(key)) {
-      const dir = new _VDir(this, segment, path6);
+      const dir = new _VDir(this, segment, path8);
       map.set(key, dir);
       return dir;
     }
@@ -1221,15 +1259,15 @@ var _VDir = class _VDir {
       const existing = this.files.get(file.type);
       if (existing !== file) {
         throw new Error(
-          `Duplicate file type '${file.type}' added at path '${this.path}'. File '${file.importPath}' collides with '${existing.importPath}'.`
+          `Duplicate file type ${file.type} added at path ${this.path}. File ${file.filePath} collides with ${existing.filePath}.`
         );
       } else if (file.type === RoutableFileTypes.Page || file.type === RoutableFileTypes.Handler) {
         throw new Error(
-          `Ambiguous path definition: route '${this.path}' is defined multiple times by ${file.importPath}`
+          `Ambiguous path definition: route ${this.path} is defined multiple times by ${file.filePath}`
         );
       }
       throw new Error(
-        `Ambiguous path definition: file '${this.path}' is included multiple times by ${file.importPath}`
+        `Ambiguous path definition: file ${this.path} is included multiple times by ${file.filePath}`
       );
     }
   }
@@ -1251,10 +1289,10 @@ var _VDir = class _VDir {
     const dirs = [];
     const unique = /* @__PURE__ */ new Map();
     for (const root of roots) {
-      for (const path6 of paths) {
+      for (const path8 of paths) {
         let dir = root;
-        for (const segment of path6.segments) {
-          dir = dir.addDir(path6, segment);
+        for (const segment of path8.segments) {
+          dir = dir.addDir(path8, segment);
         }
         const existing = unique.get(dir.path);
         if (existing) {
@@ -1267,7 +1305,7 @@ var _VDir = class _VDir {
             }
           }
           throw new Error(
-            `Ambiguous directory structure: '${sourcePath}${path6.source}' defines '${dir.path}' multiple times.`
+            `Ambiguous directory structure: ${sourcePath}${path8.source} defines ${dir.path} multiple times.`
           );
         } else {
           unique.set(dir.path, dir);
@@ -1293,13 +1331,11 @@ function matchRoutableFile(filename) {
   const match = filename.match(routeableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
 }
-function isSpecialType(type) {
-  return type === RoutableFileTypes.NotFound || type === RoutableFileTypes.Error;
-}
-async function buildRoutes(sources) {
+async function buildRoutes(sources, outDir) {
   const uniqueRoutes = /* @__PURE__ */ new Map();
   const routes = [];
   const special = {};
+  const seenKeys = /* @__PURE__ */ new Map();
   const middlewares = /* @__PURE__ */ new Set();
   const unusedFiles = /* @__PURE__ */ new Set();
   const currentLayouts = /* @__PURE__ */ new Set();
@@ -1307,13 +1343,13 @@ async function buildRoutes(sources) {
   const root = new VDir();
   const dirStack = [];
   let basePath;
-  let importPrefix;
   let activeDirs;
   let isBaseDir;
   let nextFileId = 1;
   let nextRouteIndex = 1;
   const walkOptions = {
-    onEnter({ name }) {
+    onEnter(dir) {
+      let { name } = dir;
       const prevDirStackLength = dirStack.length;
       if (isBaseDir) {
         isBaseDir = false;
@@ -1332,15 +1368,16 @@ async function buildRoutes(sources) {
         dirStack.length = prevDirStackLength;
       };
     },
-    onFile({ name, path: path6 }) {
+    onFile(file) {
+      const { name } = file;
       const match = name.match(routeableFileRegex);
       if (!match) {
         return;
       }
       const type = (match[1] || match[3]).toLowerCase();
-      if (dirStack.length && isSpecialType(type)) {
+      if (dirStack.length && (type === RoutableFileTypes.NotFound || type === RoutableFileTypes.Error)) {
         console.warn(
-          `Special pages '${RoutableFileTypes.NotFound}' and '${RoutableFileTypes.Error}' are only considered in the root directory - ignoring ${path6}`
+          `Special pages '${RoutableFileTypes.NotFound}' and '${RoutableFileTypes.Error}' are only considered in the root directory - ignoring ${file.path}`
         );
         return;
       }
@@ -1349,19 +1386,15 @@ async function buildRoutes(sources) {
         const paths = parseFlatRoute(name.slice(0, match.index));
         dirs = VDir.addPaths(activeDirs, paths);
       }
-      const dirPath = dirStack.join("/");
-      const relativePath = dirPath ? `${dirPath}/${name}` : name;
-      const file = {
+      const routableFile = {
         id: String(nextFileId++),
         name,
         type,
-        filePath: path6,
-        relativePath,
-        importPath: `${importPrefix}/${relativePath}`,
+        filePath: file.path,
         verbs: type === RoutableFileTypes.Page ? ["get", "head"] : void 0
       };
       for (const dir of dirs) {
-        dir.addFile(file);
+        dir.addFile(routableFile);
       }
     }
   };
@@ -1369,7 +1402,6 @@ async function buildRoutes(sources) {
     sources = [sources];
   }
   for (const source of sources) {
-    importPrefix = source.importPrefix ? source.importPrefix.replace(/^\/+|\/+$/g, "") : "";
     basePath = source.basePath || "";
     activeDirs = [root];
     isBaseDir = true;
@@ -1389,7 +1421,8 @@ async function buildRoutes(sources) {
       layout = dir.files.get(RoutableFileTypes.Layout);
       const handler = dir.files.get(RoutableFileTypes.Handler);
       const page = dir.files.get(RoutableFileTypes.Page);
-      let hasSpecial = false;
+      const pathInfo = dir.pathInfo;
+      let layoutsUsed = false;
       if (middleware) {
         if (currentMiddleware.has(middleware)) {
           middleware = void 0;
@@ -1406,64 +1439,64 @@ async function buildRoutes(sources) {
           unusedFiles.add(layout);
         }
       }
+      if (dir === root) {
+        for (const [type, file] of dir.files) {
+          if (type === RoutableFileTypes.NotFound || type === RoutableFileTypes.Error) {
+            special[type] = {
+              index: nextRouteIndex++,
+              key: type,
+              path: dir.pathInfo,
+              middleware: [],
+              layouts: [...currentLayouts],
+              page: file,
+              templateFilePath: currentLayouts.size ? path3.join(outDir, `${type}.marko`) : void 0
+            };
+            layoutsUsed = true;
+          }
+        }
+      }
       if (page || handler) {
-        const path6 = dir.pathInfo;
-        if (uniqueRoutes.has(path6.id)) {
-          const existing = uniqueRoutes.get(path6.id);
+        if (uniqueRoutes.has(pathInfo.id)) {
+          const existing = uniqueRoutes.get(pathInfo.id);
           const route = routes[existing.index];
           const existingFiles = [route.handler, route.page].filter(Boolean).map((f) => f.filePath);
           const currentFiles = [handler, page].filter(Boolean).map((f) => f.filePath);
-          throw new Error(`Duplicate routes for path '${path6.id}' were defined. A route established by:
-      ${existingFiles.join(" and ")} via '${existing.dir.fullPath}'
-        collides with
-      ${currentFiles.join(" and ")} via '${dir.fullPath}'
-      `);
+          throw new Error(
+            `Duplicate routes for path ${pathInfo.id} were defined. A route established by: "${existingFiles.join(" and ")}" collides with "${currentFiles.join(" and ")}"`
+          );
+        }
+        uniqueRoutes.set(pathInfo.id, { dir, index: routes.length });
+        let key = pathInfo.segments.map(replaceInvalidFilenameChars).concat("route").join("/");
+        const keyCount = (seenKeys.get(key) || 0) + 1;
+        seenKeys.set(key, keyCount);
+        if (keyCount > 1) {
+          key += keyCount;
         }
-        uniqueRoutes.set(path6.id, { dir, index: routes.length });
         routes.push({
           index: nextRouteIndex++,
-          key: dir.fullPath,
-          paths: [path6],
+          key,
+          path: pathInfo,
           middleware: [...currentMiddleware],
           layouts: page ? [...currentLayouts] : [],
           meta: dir.files.get(RoutableFileTypes.Meta),
           page,
           handler,
-          entryName: `${markoRunFilePrefix}route` + (dir.path !== "/" ? dir.fullPath.replace(/\//g, ".").replace(/(%[A-Fa-f0-9]{2})+/g, "_") : "")
+          templateFilePath: page && currentLayouts.size ? path3.join(outDir, key + ".marko") : void 0
         });
-      }
-      if (dir === root) {
-        for (const [type, file] of dir.files) {
-          if (isSpecialType(type)) {
-            hasSpecial = true;
-            special[type] = {
-              index: 0,
-              key: type,
-              paths: [],
-              middleware: [],
-              layouts: [...currentLayouts],
-              page: file,
-              entryName: `${markoRunFilePrefix}special.${type}`
-            };
-          }
-        }
-      }
-      if (handler || page) {
+        layoutsUsed = !!page;
         for (const middleware2 of currentMiddleware) {
           middlewares.add(middleware2);
           unusedFiles.delete(middleware2);
         }
       }
-      if (page || hasSpecial) {
+      if (layoutsUsed) {
         for (const layout2 of currentLayouts) {
           unusedFiles.delete(layout2);
         }
       }
     }
-    if (dir.dirs) {
-      for (const child of dir.dirs()) {
-        traverse(child);
-      }
+    for (const childDir of dir.dirs()) {
+      traverse(childDir);
     }
     if (middleware) {
       currentMiddleware.delete(middleware);
@@ -1473,10 +1506,13 @@ async function buildRoutes(sources) {
     }
   }
 }
+function replaceInvalidFilenameChars(str) {
+  return str.replace(/[<>:"/\\|?*]+/g, "_");
+}
 
 // src/vite/routes/walk.ts
 import fs from "fs";
-import path2 from "path";
+import path4 from "path";
 function createFSWalker(dir) {
   return async function walkFS({
     onEnter,
@@ -1491,7 +1527,7 @@ function createFSWalker(dir) {
         const entries = await fs.promises.readdir(dir2.path, {
           withFileTypes: true
         });
-        const prefix = dir2.path + path2.sep;
+        const prefix = dir2.path + path4.sep;
         for (const entry of entries) {
           const walkEntry = {
             name: entry.name,
@@ -1514,7 +1550,7 @@ function createFSWalker(dir) {
     await walk(
       {
         path: dir,
-        name: path2.basename(dir)
+        name: path4.basename(dir)
       },
       maxDepth
     );
@@ -1632,36 +1668,34 @@ function logRoutesTable(routes, bundle) {
     style: { compact: true }
   });
   for (const route of routes.list) {
-    for (const path6 of route.paths) {
-      const verbs = getVerbs(route, true);
-      let firstRow = true;
-      for (const verb of verbs) {
-        const entryType = [];
-        let size = "";
-        let verbCell = verbColor(verb)(verb.toUpperCase());
-        if (verb === "get" && !verbs.includes("head")) {
-          verbCell += kleur2.dim(`,${verbColor(verb)("HEAD")}`);
-        }
-        if (route.handler) {
-          entryType.push(kleur2.blue("handler"));
-        }
-        if (route.page && (verb === "get" || verb === "head")) {
-          entryType.push(kleur2.yellow("page"));
-          if (verb === "get") {
-            size = prettySize(computeRouteSize(route, bundle));
-          }
-        }
-        const row = [verbCell];
-        if (verbs.length === 1 || firstRow) {
-          row.push({ rowSpan: verbs.length, content: prettyPath(path6.path) });
-          firstRow = false;
+    const verbs = getVerbs(route, true);
+    let firstRow = true;
+    for (const verb of verbs) {
+      const entryType = [];
+      let size = "";
+      const verbCell = verbColor(verb)(verb.toUpperCase());
+      if (route.handler) {
+        entryType.push(kleur2.blue("handler"));
+      }
+      if (route.page && (verb === "get" || verb === "head")) {
+        entryType.push(kleur2.yellow("page"));
+        if (verb === "get") {
+          size = prettySize(computeRouteSize(route, bundle));
         }
-        row.push(entryType.join(" -> "));
-        hasMiddleware && row.push(route.middleware.length || "");
-        hasMeta && row.push(route.meta ? "\u2713" : "");
-        row.push(size || "");
-        table.push(row);
       }
+      const row = [verbCell];
+      if (verbs.length === 1 || firstRow) {
+        row.push({
+          rowSpan: verbs.length,
+          content: prettyPath(route.path.path)
+        });
+        firstRow = false;
+      }
+      row.push(entryType.join(" -> "));
+      hasMiddleware && row.push(route.middleware.length || "");
+      hasMeta && row.push(route.meta ? "\u2713" : "");
+      row.push(size || "");
+      table.push(row);
     }
   }
   for (const [key, route] of Object.entries(routes.special).sort()) {
@@ -1717,17 +1751,20 @@ function prettySize([bytes, compBytes]) {
   else str += kleur2.bold(kleur2.red(compSize));
   return str;
 }
-function prettyPath(path6) {
-  return path6.replace(/\/\$\$(.*)$/, (_, p) => "/" + kleur2.bold(kleur2.dim(`*${p}`))).replace(/\/\$([^/]+)/g, (_, p) => "/" + kleur2.bold(kleur2.dim(`:${p}`)));
+function prettyPath(path8) {
+  return path8.replace(
+    /\/(\$\$?)(`?)([^/`]+)\2/g,
+    (_, type, tick, key) => "/" + type + tick + kleur2.bold(kleur2.dim(key)) + tick
+  );
 }
 
 // src/vite/utils/read-once-persisted-store.ts
 import { promises as fs2 } from "fs";
 import os from "os";
-import path3 from "path";
+import path5 from "path";
 var noop = () => {
 };
-var tmpFile = path3.join(os.tmpdir(), "marko-run-storage.json");
+var tmpFile = path5.join(os.tmpdir(), "marko-run-storage.json");
 var values = /* @__PURE__ */ new Map();
 var loadedFromDisk;
 var ReadOncePersistedStore = class {
@@ -1769,17 +1806,17 @@ process.once("beforeExit", (code) => {
 
 // src/vite/plugin.ts
 var debug = createDebug("@marko/run");
-var __dirname = path4.dirname(fileURLToPath(import.meta.url));
+var __dirname = path6.dirname(fileURLToPath(import.meta.url));
 var PLUGIN_NAME_PREFIX = "marko-run-vite";
-var POSIX_SEP = "/";
-var WINDOWS_SEP = "\\";
 var CLIENT_OUT_DIR = "public";
 var MIDDLEWARE_FILENAME = `${markoRunFilePrefix}middleware.js`;
 var ROUTER_FILENAME = `${markoRunFilePrefix}router.js`;
 var defaultPort = Number(process.env.PORT || 3e3);
-var normalizePath = path4.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 function markoRun(opts = {}) {
-  let { routesDir, adapter, ...markoVitePluginOptions } = opts;
+  let routesDir;
+  let adapter;
+  let trailingSlashes;
+  const { ...markoVitePluginOptions } = opts;
   let store;
   let root;
   let shouldEmptyOutDir = false;
@@ -1812,12 +1849,8 @@ function markoRun(opts = {}) {
       root,
       "{.tsconfig*,tsconfig*.json}"
     )))) {
-      const filepath = path4.join(typesDir, "routes.d.ts");
-      const data = await renderRouteTypeInfo(
-        routes2,
-        normalizePath(path4.relative(typesDir, resolvedRoutesDir)),
-        adapter
-      );
+      const filepath = path6.join(typesDir, "routes.d.ts");
+      const data = await renderRouteTypeInfo(routes2, typesDir, adapter);
       if (data !== typesFile || !fs3.existsSync(filepath)) {
         await ensureDir(typesDir);
         await fs3.promises.writeFile(filepath, typesFile = data);
@@ -1828,20 +1861,25 @@ function markoRun(opts = {}) {
   function buildVirtualFiles() {
     return buildVirtualFilesResult ?? (buildVirtualFilesResult = (async () => {
       virtualFiles.clear();
-      routes = await buildRoutes({
-        walker: createFSWalker(resolvedRoutesDir),
-        importPrefix: routesDir
-      });
+      routes = await buildRoutes(
+        {
+          walker: createFSWalker(resolvedRoutesDir)
+        },
+        entryFilesDir
+      );
       if (!routes.list.length) {
         throw new Error("No routes generated");
       }
       for (const route of routes.list) {
-        virtualFiles.set(path4.posix.join(root, `${route.entryName}.js`), "");
+        virtualFiles.set(
+          path6.posix.join(root, getRouteVirtualFileName(route)),
+          ""
+        );
       }
       if (routes.middleware.length) {
-        virtualFiles.set(path4.posix.join(root, MIDDLEWARE_FILENAME), "");
+        virtualFiles.set(path6.posix.join(root, MIDDLEWARE_FILENAME), "");
       }
-      virtualFiles.set(path4.posix.join(root, ROUTER_FILENAME), "");
+      virtualFiles.set(path6.posix.join(root, ROUTER_FILENAME), "");
       return routes;
     })());
   }
@@ -1855,111 +1893,78 @@ function markoRun(opts = {}) {
           fs3.rmSync(entryFilesDir, { recursive: true });
         }
         for (const route of routes2.list) {
-          const { handler, page, layouts } = route;
-          if (handler) {
-            const exports = await getExportsFromFile(context, handler.filePath);
-            handler.verbs = [];
+          if (route.handler) {
+            const exports = await getExportsFromFile(
+              context,
+              route.handler.filePath
+            );
+            route.handler.verbs = [];
             for (const name of exports) {
               const verb = name.toLowerCase();
               if (name === verb.toUpperCase() && httpVerbs.includes(verb)) {
-                handler.verbs.push(verb);
+                route.handler.verbs.push(verb);
               }
             }
-            if (!handler.verbs.length) {
+            if (!route.handler.verbs.length) {
               context.warn(
-                `Did not find any http verb exports in handler '${path4.relative(root, handler.filePath)}' - expected ${httpVerbs.map((v) => v.toUpperCase()).join(", ")}`
+                `Did not find any http verb exports in ${path6.relative(root, route.handler.filePath)} - expected ${httpVerbs.map((v) => v.toUpperCase()).join(", ")}`
               );
             }
           }
-          if (page) {
-            if (layouts.length) {
-              const relativePath = path4.relative(
-                resolvedRoutesDir,
-                page.filePath
-              );
-              const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
-              const routeFileRelativePathPosix = normalizePath(
-                path4.relative(routeFileDir, root)
-              );
-              fs3.mkdirSync(routeFileDir, { recursive: true });
-              const pageNameIndex = page.name.indexOf("+page");
-              const pageNamePrefix = pageNameIndex > 0 ? `${page.name.slice(0, pageNameIndex)}.` : "";
-              fs3.writeFileSync(
-                route.templateFilePath = path4.join(
-                  routeFileDir,
-                  pageNamePrefix + "route.marko"
-                ),
-                renderRouteTemplate(
-                  route,
-                  (to) => path4.posix.join(routeFileRelativePathPosix, to)
-                )
-              );
-            } else {
-              route.templateFilePath = page.filePath;
-            }
+          if (route.templateFilePath) {
+            fs3.mkdirSync(path6.dirname(route.templateFilePath), {
+              recursive: true
+            });
+            fs3.writeFileSync(
+              route.templateFilePath,
+              renderRouteTemplate(route, root)
+            );
           }
           virtualFiles.set(
-            path4.posix.join(root, `${route.entryName}.js`),
-            renderRouteEntry(route, relativeEntryFilesDirPosix)
+            path6.posix.join(root, getRouteVirtualFileName(route)),
+            renderRouteEntry(route, root)
           );
         }
         for (const route of Object.values(routes2.special)) {
-          const { page, layouts, key } = route;
-          if (page) {
-            if (layouts.length) {
-              const relativePath = path4.relative(
-                resolvedRoutesDir,
-                page.filePath
-              );
-              const routeFileDir = path4.join(entryFilesDir, relativePath, "..");
-              const routeFileRelativePathPosix = normalizePath(
-                path4.relative(routeFileDir, root)
-              );
-              fs3.mkdirSync(routeFileDir, { recursive: true });
-              fs3.writeFileSync(
-                route.templateFilePath = path4.join(
-                  routeFileDir,
-                  `route.${key}.marko`
-                ),
-                renderRouteTemplate(
-                  route,
-                  (to) => path4.posix.join(routeFileRelativePathPosix, to)
-                )
-              );
-            } else {
-              route.templateFilePath = page.filePath;
-            }
+          if (route.templateFilePath) {
+            fs3.mkdirSync(path6.dirname(route.templateFilePath), {
+              recursive: true
+            });
+            fs3.writeFileSync(
+              route.templateFilePath,
+              renderRouteTemplate(route, root)
+            );
           }
         }
         if (routes2.middleware.length) {
           for (const middleware of routes2.middleware) {
             if (!(await getExportsFromFile(context, middleware.filePath)).includes("default")) {
               context.warn(
-                `Did not find a default export in middleware '${path4.relative(root, middleware.filePath)}'`
+                `Did not find a default export in middleware '${path6.relative(root, middleware.filePath)}'`
               );
             }
           }
           virtualFiles.set(
-            path4.posix.join(root, MIDDLEWARE_FILENAME),
-            renderMiddleware(routes2.middleware)
+            path6.posix.join(root, MIDDLEWARE_FILENAME),
+            renderMiddleware(routes2.middleware, root)
           );
         }
         virtualFiles.set(
-          path4.posix.join(root, ROUTER_FILENAME),
-          renderRouter(routes2, relativeEntryFilesDirPosix, {
-            trailingSlashes: opts.trailingSlashes || "RedirectWithout"
+          path6.posix.join(root, ROUTER_FILENAME),
+          renderRouter(routes2, root, {
+            trailingSlashes
           })
         );
         await writeTypesFile(routes2);
         if (adapter == null ? void 0 : adapter.routesGenerated) {
-          await adapter.routesGenerated(
-            routes2,
-            new Map(virtualFiles.entries()),
-            {
+          await adapter.routesGenerated({
+            routes: routes2,
+            virtualFiles: new Map(virtualFiles.entries()),
+            meta: {
               buildTime: times.routesBuild,
               renderTime: times.routesRender
             }
-          );
+          });
           if (!isBuild) {
             await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes2.list));
           }
@@ -1969,7 +1974,7 @@ function markoRun(opts = {}) {
           throw err;
         }
         virtualFiles.set(
-          path4.posix.join(root, ROUTER_FILENAME),
+          path6.posix.join(root, ROUTER_FILENAME),
           `throw ${JSON.stringify(prepareError(err))}`
         );
       }
@@ -2006,27 +2011,28 @@ function markoRun(opts = {}) {
           }
         }
         routesDir = opts.routesDir || "src/routes";
+        trailingSlashes = opts.trailingSlashes || "RedirectWithout";
         store = new ReadOncePersistedStore(
           `vite-marko-run${opts.runtimeId ? `-${opts.runtimeId}` : ""}`
         );
         markoVitePluginOptions.runtimeId = opts.runtimeId;
         markoVitePluginOptions.basePathVar = opts.basePathVar;
-        resolvedRoutesDir = path4.resolve(root, routesDir);
-        outputDir = path4.join(root, ((_d = config2.build) == null ? void 0 : _d.outDir) || "dist");
-        entryFilesDir = path4.join(outputDir, ".marko-run");
+        resolvedRoutesDir = path6.resolve(root, routesDir);
+        outputDir = path6.join(root, ((_d = config2.build) == null ? void 0 : _d.outDir) || "dist");
+        entryFilesDir = path6.join(outputDir, ".marko-run");
         entryFilesDirPosix = normalizePath(entryFilesDir);
         relativeEntryFilesDirPosix = normalizePath(
-          path4.relative(root, entryFilesDir)
+          path6.relative(root, entryFilesDir)
         );
-        typesDir = path4.join(root, ".marko-run");
-        devEntryFile = path4.join(root, "index.html");
+        typesDir = path6.join(root, ".marko-run");
+        devEntryFile = path6.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
         let outDir = ((_e = config2.build) == null ? void 0 : _e.outDir) || "dist";
         const assetsDir = ((_f = config2.build) == null ? void 0 : _f.assetsDir) || "assets";
         let rollupOutputOptions = (_h = (_g = config2.build) == null ? void 0 : _g.rollupOptions) == null ? void 0 : _h.output;
         if (isBuild) {
           if (!isSSRBuild) {
-            outDir = path4.join(outDir, CLIENT_OUT_DIR);
+            outDir = path6.join(outDir, CLIENT_OUT_DIR);
           }
           const defaultRollupOutputOptions = {
             assetFileNames({ name }) {
@@ -2151,7 +2157,7 @@ function markoRun(opts = {}) {
         devServer.watcher.on("all", async (type, filename) => {
           seenErrors.clear();
           const routableFileType = matchRoutableFile(
-            path4.parse(filename).base
+            path6.parse(filename).base
           );
           if (filename.startsWith(resolvedRoutesDir) && routableFileType) {
             if (type === "add" || type === "unlink" || type === "change" && (routableFileType === RoutableFileTypes.Handler || routableFileType === RoutableFileTypes.Middleware)) {
@@ -2201,19 +2207,19 @@ function markoRun(opts = {}) {
       },
       async resolveId(importee, importer) {
         if (importee === "@marko/run/router") {
-          return normalizePath(path4.resolve(root, ROUTER_FILENAME));
+          return normalizePath(path6.resolve(root, ROUTER_FILENAME));
         } else if (importee.endsWith(".marko") && importee.includes(relativeEntryFilesDirPosix)) {
           if (!importee.startsWith(root)) {
-            importee = path4.resolve(root, "." + importee);
+            importee = path6.resolve(root, "." + importee);
           }
           return normalizePath(importee);
         }
         let virtualFilePath;
         if (importee.startsWith(virtualFilePrefix)) {
           virtualFilePath = importee.slice(virtualFilePrefix.length + 1);
-          importee = path4.resolve(root, virtualFilePath);
+          importee = path6.resolve(root, virtualFilePath);
         } else if (!isBuild && importer && (importer === devEntryFile || normalizePath(importer) === devEntryFilePosix) && importee.startsWith(`/${markoRunFilePrefix}`)) {
-          importee = path4.resolve(root, "." + importee);
+          importee = path6.resolve(root, "." + importee);
         }
         importee = normalizePath(importee);
         if (!buildVirtualFilesResult) {
@@ -2222,7 +2228,7 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           return importee;
         } else if (virtualFilePath) {
-          const filePath = path4.resolve(__dirname, "..", virtualFilePath);
+          const filePath = path6.resolve(__dirname, "..", virtualFilePath);
           return await this.resolve(filePath, importer, {
             skipSelf: true
           });
@@ -2261,7 +2267,7 @@ function markoRun(opts = {}) {
           const builtEntries = Object.values(bundle).reduce(
             (acc, item) => {
               if (item.type === "chunk" && item.isEntry) {
-                acc.push(path4.join(options.dir, item.fileName));
+                acc.push(path6.join(options.dir, item.fileName));
               }
               return acc;
             },
@@ -2289,12 +2295,12 @@ function markoRun(opts = {}) {
             fs3.rmSync(entryFilesDir, { recursive: true });
           }
           if ((adapter == null ? void 0 : adapter.buildEnd) && routes) {
-            await adapter.buildEnd(
-              resolvedConfig,
-              routes.list,
-              routeData.builtEntries,
-              routeData.sourceEntries
-            );
+            await adapter.buildEnd({
+              routes,
+              config: resolvedConfig,
+              builtEntries: routeData.builtEntries,
+              sourceEntries: routeData.sourceEntries
+            });
           }
         }
       }
@@ -2326,11 +2332,11 @@ async function ensureDir(dir) {
 }
 async function getPackageData(dir) {
   do {
-    const pkgPath = path4.join(dir, "package.json");
+    const pkgPath = path6.join(dir, "package.json");
     if (fs3.existsSync(pkgPath)) {
       return JSON.parse(await fs3.promises.readFile(pkgPath, "utf-8"));
     }
-  } while (dir !== (dir = path4.dirname(dir)));
+  } while (dir !== (dir = path6.dirname(dir)));
   return null;
 }
 async function resolveAdapter(root, options, log) {
@@ -2435,7 +2441,7 @@ async function getAvailablePort(port) {
 }
 
 // src/cli/commands.ts
-var __dirname2 = path5.dirname(fileURLToPath2(import.meta.url));
+var __dirname2 = path7.dirname(fileURLToPath2(import.meta.url));
 var defaultConfigFileBases = ["vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
 async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile, args = []) {
@@ -2464,10 +2470,10 @@ async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile,
   if (!entry) {
     entry = await ((_a = adapter.getEntryFile) == null ? void 0 : _a.call(adapter));
   }
-  const dir = path5.resolve(cwd, resolvedConfig.build.outDir);
-  const entryFile = distEntry ? path5.join(dir, distEntry) : await findFileWithExt(dir, "index", [".mjs", ".js"]);
+  const dir = path7.resolve(cwd, resolvedConfig.build.outDir);
+  const entryFile = distEntry ? path7.join(dir, distEntry) : findFileWithExt(dir, "index", [".mjs", ".js"]);
   if (envFile) {
-    envFile = path5.resolve(cwd, envFile);
+    envFile = path7.resolve(cwd, envFile);
   }
   const options = {
     cwd,
@@ -2477,7 +2483,10 @@ async function preview(entry, distEntry, cwd, configFile, port, outDir, envFile,
     envFile,
     entry
   };
-  return await adapter.startPreview(entryFile, options);
+  return await adapter.startPreview({
+    entry: entryFile,
+    options
+  });
 }
 async function dev(entry, cwd, configFile, port, envFile, args = []) {
   var _a;
@@ -2491,7 +2500,7 @@ async function dev(entry, cwd, configFile, port, envFile, args = []) {
     "serve"
   );
   if (envFile) {
-    envFile = path5.resolve(cwd, envFile);
+    envFile = path7.resolve(cwd, envFile);
   }
   const [availablePort, adapter] = await Promise.all([
     getAvailablePort(
@@ -2521,7 +2530,7 @@ async function dev(entry, cwd, configFile, port, envFile, args = []) {
     port: availablePort,
     envFile
   };
-  return await adapter.startDev(entry, config2, options);
+  return await adapter.startDev({ entry, config: config2, options });
 }
 async function build(entry, cwd, configFile, outDir, envFile) {
   var _a;
@@ -2545,7 +2554,7 @@ async function build(entry, cwd, configFile, outDir, envFile) {
     }
   }
   if (envFile) {
-    envFile = path5.resolve(cwd, envFile);
+    envFile = path7.resolve(cwd, envFile);
   }
   const buildConfig = setExternalAdapterOptions(
     {
@@ -2583,7 +2592,7 @@ async function build(entry, cwd, configFile, outDir, envFile) {
 }
 function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
   for (const ext of extensions) {
-    const filePath = path5.join(dir, base + ext);
+    const filePath = path7.join(dir, base + ext);
     if (fs5.existsSync(filePath)) {
       return filePath;
     }
@@ -2592,7 +2601,7 @@ function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
 }
 async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
   if (configFile) {
-    const configFilePath = path5.join(dir, configFile);
+    const configFilePath = path7.join(dir, configFile);
     if (!fs5.existsSync(configFilePath)) {
       throw new Error(`No config file found at '${configFilePath}'`);
     }
@@ -2604,7 +2613,7 @@ async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
       return configFile;
     }
   }
-  return path5.join(__dirname2, "default.config.mjs");
+  return path7.join(__dirname2, "default.config.mjs");
 }
 async function resolveAdapter2(config2) {
   const options = getExternalPluginOptions(config2);