@marko/run 0.0.1-beta4 → 0.0.1-beta6

package/README.md

@@ -12,12 +12,14 @@
   </a>
 </div>
 
-`@marko/serve` is a Vite plugin for [Marko](https://markojs.com), with these features:
+`@marko/run` is an application framework for [Marko](https://markojs.com), with these features:
 
-- Encapsulates [`@marko/vite`](https://github.com/marko-js/vite)
+- Vite plugin that encapsulates [`@marko/vite`](https://github.com/marko-js/vite)
+- CLI to simplify build modes
 - File-based routing with layouts and middleware
 - Efficient routing using a compiled static trie
 - [Designed with web standards](https://developer.mozilla.org/en-US/docs/Web/API/URLPattern/URLPattern) to run anywhere
+- TypeScript support
 
 ## Installation
 
@@ -25,6 +27,39 @@
 npm install @marko/run
 ```
 
+## CLI
+
+The package provides a command line tool `marko-run` which can be run using scripts in your package.json or with npx.
+
+### Getting Started / Zero Config
+
+`marko-run` makes it easy to get started without little to no config. The package ships with a default Vite config and node-based adapter that means a minimal project start can be:
+1. Install `@marko/run`
+2. Create file `src/routes/+page.marko`
+3. Run `npx marko-run dev`
+4. Open browser to `http://localhost:3000`
+
+### Commands
+
+**`dev`** - Start development server in watch mode
+```bash
+> npx marko-run dev
+```
+
+**`build`** - Create a production build
+```bash
+> npx marko-run build
+```
+
+**`preview`** - Create a production build and serve
+```bash
+> npx marko-run preview
+```
+or (default command)
+```bash
+> npx marko-run
+```
+
 ## Vite Plugin
 
 This package’s Vite plugin discovers your route files, generates the routing code, and registers the `@marko/vite` plugin to compile your `.marko` files.
@@ -36,47 +71,66 @@ import marko from "@marko/run/vite"; // Import the Vite plugin
 
 export default defineConfig({
   plugins: [marko()], // Register the Vite plugin
-  build: {
-    sourcemap: true, // Generate sourcemaps for all builds
-    emptyOutDir: false, // Avoid server & client deleting files from each other. TODO: do we have to make the user set this themselves?
-  }
 })
 ```
 
+## Adapters
+
+*🎗 TODO: provide a quick overview*
+
 ## Runtime
 
-Generally, using one of the adapters is more convenient <!-- TODO: is an “adapter” the same thing as using the Vite plugin above? -->, but this package also provides a runtime API:
+Generally, when using an adapter, this runtime will be abstracted away.
 
 ```ts
-import { router, getMatchedRoute } from '@marko/run`;
+import { router, matchRoute, invokeRoute } from '@marko/run/router`;
 ```
 
 ### `router`
 
 ```ts
-(request: Request) => Promise<Response>;
+interface RequestContext<T> {
+  url: URL;
+  method: string;
+  request: Request;
+  platform: T;
+}
+
+async function router(context: RequestContext) => Promise<Response | void>;
 ```
 
-This asynchronous function takes a [WHATWG `Request` object](https://fetch.spec.whatwg.org/#request-class) and returns a [`Response` object](https://fetch.spec.whatwg.org/#response-class) generated by executing any matched route files.
+This asynchronous function takes a context object and returns the [WHATWG `Response` object](https://fetch.spec.whatwg.org/#response-class) from executing any matched route files or undefined if the request was explicitly not handled. If no route matches the requested path, a `404` status code response will be returned. If an error occurs a `500` status code response will be returned.
 
-If no match is found, returns a response with a `404` status code. If an unhandled error occurs, returns a response with a `500` status code.
+The context object contains the following properties
+- `url`: The URL reprensting the requested resource
+- `method`: The HTTP method used
+- `request`: [WHATWG `Request` object](https://fetch.spec.whatwg.org/#request-class)
+- `platform`: An object containing any platform-specific data (eg Node request/response) and will vary between adapters.
 
-### `getMatchedRoute`
+### `matchRoute`
 
 ```ts
-(method: string, url: URL) => {
+interface interface Route {
   params: Record<string, string>;
   meta: unknown;
-  invoke(request: Request): Promise<Response>;
-} | null;
+}
+
+function matchRoute(method: string, pathname: string) => Route | null;
 ```
 
-This synchronous function takes an HTTP method + URL, then returns an object representing the best match — or `null` if no match is found.
+This synchronous function takes an HTTP method and path name, then returns an object representing the best match — or `null` if no match is found.
 
 - `params` - a `{ key: value }` collection of any path parameters for the route
 - `meta` - metadata for the route
-- `invoke` - an asynchronous function that takes a `Request` and returns the `Response` generated from matched route files.
-  > **Note**: unlike the top-level `router` function, errors will not be caught.
+
+### `invokeRoute`
+
+```ts
+function invokeRoute(route: Route, context: RequestContext) => Promise<Response | void>;
+```
+This asynchronous function takes a route object returned by [matchRoute](#matchRoute) and a context object and returns a response in the same way the [router](#router) does.
+
+
 
 ## File-based Routing
 

package/dist/adapter/index.cjs

@@ -37,15 +37,35 @@ var import_url = require("url");
 // src/adapter/dev-server.ts
 var import_vite = require("vite");
 
-// src/adapter/middleware.ts
-var webStream = __toESM(require("stream/web"), 1);
-var import_crypto = __toESM(require("@hattip/polyfills/crypto"), 1);
-(0, import_crypto.default)();
-for (const key of Object.keys(webStream)) {
-  if (!(key in global)) {
-    global[key] = webStream[key];
+// src/adapter/polyfill.ts
+var import_web = require("stream/web");
+var import_crypto = require("crypto");
+var import_undici = require("undici");
+var globals = {
+  crypto: import_crypto.webcrypto,
+  fetch: import_undici.fetch,
+  Response: import_undici.Response,
+  Request: import_undici.Request,
+  Headers: import_undici.Headers,
+  ReadableStream: import_web.ReadableStream,
+  TransformStream: import_web.TransformStream,
+  WritableStream: import_web.WritableStream,
+  FormData: import_undici.FormData,
+  File: import_undici.File
+};
+function installPolyfills() {
+  for (const name in globals) {
+    Object.defineProperty(globalThis, name, {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: globals[name]
+    });
   }
 }
+
+// src/adapter/middleware.ts
+installPolyfills();
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {

package/dist/adapter/index.js

@@ -5,15 +5,35 @@ import { fileURLToPath } from "url";
 // src/adapter/dev-server.ts
 import { createServer } from "vite";
 
-// src/adapter/middleware.ts
-import * as webStream from "stream/web";
-import installCrypto from "@hattip/polyfills/crypto";
-installCrypto();
-for (const key of Object.keys(webStream)) {
-  if (!(key in global)) {
-    global[key] = webStream[key];
+// src/adapter/polyfill.ts
+import { ReadableStream as ReadableStream2, TransformStream, WritableStream } from "stream/web";
+import { webcrypto as crypto } from "crypto";
+import { fetch, Response, Request as Request2, Headers, FormData, File } from "undici";
+var globals = {
+  crypto,
+  fetch,
+  Response,
+  Request: Request2,
+  Headers,
+  ReadableStream: ReadableStream2,
+  TransformStream,
+  WritableStream,
+  FormData,
+  File
+};
+function installPolyfills() {
+  for (const name in globals) {
+    Object.defineProperty(globalThis, name, {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: globals[name]
+    });
   }
 }
+
+// src/adapter/middleware.ts
+installPolyfills();
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {

package/dist/adapter/middleware.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,10 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/adapter/middleware.ts
@@ -30,14 +24,36 @@ __export(middleware_exports, {
   getOrigin: () => getOrigin
 });
 module.exports = __toCommonJS(middleware_exports);
-var webStream = __toESM(require("stream/web"), 1);
-var import_crypto = __toESM(require("@hattip/polyfills/crypto"), 1);
-(0, import_crypto.default)();
-for (const key of Object.keys(webStream)) {
-  if (!(key in global)) {
-    global[key] = webStream[key];
+
+// src/adapter/polyfill.ts
+var import_web = require("stream/web");
+var import_crypto = require("crypto");
+var import_undici = require("undici");
+var globals = {
+  crypto: import_crypto.webcrypto,
+  fetch: import_undici.fetch,
+  Response: import_undici.Response,
+  Request: import_undici.Request,
+  Headers: import_undici.Headers,
+  ReadableStream: import_web.ReadableStream,
+  TransformStream: import_web.TransformStream,
+  WritableStream: import_web.WritableStream,
+  FormData: import_undici.FormData,
+  File: import_undici.File
+};
+function installPolyfills() {
+  for (const name in globals) {
+    Object.defineProperty(globalThis, name, {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: globals[name]
+    });
   }
 }
+
+// src/adapter/middleware.ts
+installPolyfills();
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {

package/dist/adapter/middleware.js

@@ -1,12 +1,32 @@
-// src/adapter/middleware.ts
-import * as webStream from "stream/web";
-import installCrypto from "@hattip/polyfills/crypto";
-installCrypto();
-for (const key of Object.keys(webStream)) {
-  if (!(key in global)) {
-    global[key] = webStream[key];
+// src/adapter/polyfill.ts
+import { ReadableStream as ReadableStream2, TransformStream, WritableStream } from "stream/web";
+import { webcrypto as crypto } from "crypto";
+import { fetch, Response, Request as Request2, Headers, FormData, File } from "undici";
+var globals = {
+  crypto,
+  fetch,
+  Response,
+  Request: Request2,
+  Headers,
+  ReadableStream: ReadableStream2,
+  TransformStream,
+  WritableStream,
+  FormData,
+  File
+};
+function installPolyfills() {
+  for (const name in globals) {
+    Object.defineProperty(globalThis, name, {
+      enumerable: true,
+      configurable: true,
+      writable: true,
+      value: globals[name]
+    });
   }
 }
+
+// src/adapter/middleware.ts
+installPolyfills();
 function getForwardedHeader(req, name) {
   const value = req.headers["x-forwarded-" + name];
   if (value) {

package/dist/adapter/polyfill.d.ts

@@ -0,0 +1 @@
+export declare function installPolyfills(): void;

package/dist/cli/index.mjs

@@ -108,7 +108,7 @@ prog.command("dev [entry]").describe("Start development server in watch mode").o
   const config2 = await getViteConfig(cwd, opts.config);
   await dev(cmd, config2, opts.port, opts.env);
 });
-prog.command("build [entry]").describe("Build the application (without serving it)").option("-o, --output", "Directory to write built files (default: )").option("--skip-client", "Skip the client-side build").example("build --config vite.config.js").action(async (entry, opts) => {
+prog.command("build [entry]").describe("Build the application (without serving it)").option("-o, --output", "Directory to write built files (default: 'build.outDir' in Vite config)").option("--skip-client", "Skip the client-side build").example("build --config vite.config.js").action(async (entry, opts) => {
   const config2 = await getViteConfig(cwd, opts.config);
   await build(entry, config2, opts.ouput, opts["skip-client"], opts.env);
 });

package/dist/runtime/index.d.ts

@@ -1,10 +1,17 @@
-import type { HandlerLike, ParamsObject, Route } from "./types";
+import type { HandlerLike, ParamsObject, Route, RouteContext } from "./types";
 declare global {
     namespace Marko {
+        interface Global {
+            context: RouteContext;
+        }
+    }
+    namespace MarkoRun {
         interface CurrentRoute extends Route {
         }
+        interface CurrentContext extends RouteContext<CurrentRoute> {
+        }
         type Handler<Params extends ParamsObject = {}, Meta = unknown> = HandlerLike<Route<Params, Meta, string>>;
         function route<Params extends ParamsObject = {}, Meta = unknown>(handler: Handler<Params, Meta>): typeof handler;
     }
 }
-export type { HandlerLike, InputObject, InvokeRoute, MatchRoute, NextFunction, RequestContext, Route, RouteContext, RouteContextExtensions, RouteHandler, RouteWithHandler, Router, } from "./types";
+export type { HandlerLike, InputObject, InvokeRoute, MatchRoute, NextFunction, PathTemplate, RequestContext, Route, RouteContext, RouteContextExtensions, RouteHandler, RouteWithHandler, Router, ValidateHref, ValidatePath, } from "./types";

package/dist/runtime/internal.cjs

@@ -31,8 +31,8 @@ __export(internal_exports, {
   notMatched: () => notMatched
 });
 module.exports = __toCommonJS(internal_exports);
-globalThis.Marko ?? (globalThis.Marko = {});
-globalThis.Marko.route = (handler) => handler;
+globalThis.MarkoRun ?? (globalThis.MarkoRun = {});
+globalThis.MarkoRun.route = (handler) => handler;
 var RequestNotHandled = Symbol();
 var RequestNotMatched = Symbol();
 function createInput(context) {

package/dist/runtime/internal.js

@@ -1,6 +1,6 @@
 // src/runtime/internal.ts
-globalThis.Marko ?? (globalThis.Marko = {});
-globalThis.Marko.route = (handler) => handler;
+globalThis.MarkoRun ?? (globalThis.MarkoRun = {});
+globalThis.MarkoRun.route = (handler) => handler;
 var RequestNotHandled = Symbol();
 var RequestNotMatched = Symbol();
 function createInput(context) {

package/dist/runtime/types.d.ts

@@ -32,4 +32,12 @@ export interface RouteWithHandler<Params extends ParamsObject = {}, Meta = unkno
 export declare type MatchRoute = (method: string, pathname: string) => RouteWithHandler | null;
 export declare type Router<T = unknown> = (context: RequestContext<T>) => Promise<Response | void>;
 export declare type InvokeRoute<T = unknown> = (route: Route | null, context: RequestContext<T>) => Promise<Response | void>;
+declare type Member<T, U> = T extends T ? (U extends T ? T : never) : never;
+declare type Segments<T extends string, Acc extends string[] = []> = T extends "" ? Acc : T extends `${infer Left}/${infer Rest}` ? Segments<Rest, [...Acc, Left]> : [...Acc, T];
+declare type GTE<A extends any[], B extends any[]> = A["length"] extends B["length"] ? 1 : A extends [infer _Ha, ...infer Ta] ? B extends [infer _Hb, ...infer Tb] ? GTE<Ta, Tb> : 1 : 0;
+declare type MatchSegments<A extends string, B extends string> = A extends `${infer P}/${string}*` ? 1 extends GTE<Segments<B>, Segments<P>> ? `${P}/${string}` : never : Segments<B>["length"] extends Segments<A>["length"] ? A : never;
+declare type PathPattern<T extends string> = T extends `${infer Left}/\${${string}}/${infer Rest}` ? PathPattern<`${Left}/${string}/${Rest}`> : T extends `${infer Left}/\${...${string}}` ? PathPattern<`${Left}/${string}*`> : T extends `${infer Left}/\${${string}}` ? PathPattern<`${Left}/${string}`> : T;
+export declare type PathTemplate<Path extends string> = Path extends `${infer Left}/\${${string}}/${infer Rest}` ? PathTemplate<`${Left}/${string}/${Rest}`> : Path extends `${infer Left}/\${${string}}` ? PathTemplate<`${Left}/${string}`> : Path;
+export declare type ValidatePath<Paths extends string, Path extends string> = Paths | (Path extends `/${string}` ? MatchSegments<Member<PathPattern<Paths>, Path>, Path> : Path);
+export declare type ValidateHref<Paths extends string, Href extends string> = Href extends `${infer P}#${infer H}?${infer Q}` ? `${ValidatePath<Paths, P>}#${H}?${Q}` : Href extends `${infer P}?${infer Q}` ? `${ValidatePath<Paths, P>}?${Q}` : Href extends `${infer P}#${infer H}` ? `${ValidatePath<Paths, P>}#${H}` : ValidatePath<Paths, Href>;
 export {};

package/dist/vite/index.cjs

@@ -980,6 +980,7 @@ function stripTsExtension(path3) {
   return path3;
 }
 function renderRouteTypeInfo(routes, pathPrefix = ".") {
+  var _a, _b;
   const writer = createStringWriter();
   writer.writeLines(
     `/*
@@ -987,13 +988,28 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
   Do NOT manually edit this file or your changes will be lost.
 */
   `,
-    `import type { HandlerLike, Route } from "@marko/run";
-    `
+    `import type { HandlerLike, Route, RouteContext, ValidatePath, ValidateHref } from "@marko/run";
+
+declare global {
+  namespace MarkoRun {`
   );
+  const pathsWriter = writer.branch("paths");
+  writer.write(`
+    type GetablePath<T extends string> = ValidatePath<GetPaths, T>;
+    type GetableHref<T extends string> = ValidateHref<GetPaths, T>; 
+    type PostablePath<T extends string> = ValidatePath<PostPaths, T>;
+    type PostableHref<T extends string> = ValidateHref<PostPaths, T>; 
+  }
+}
+`);
   const routesWriter = writer.branch("types");
+  const serverWriter = writer.branch("server");
   const middlewareRouteTypes = /* @__PURE__ */ new Map();
+  const layoutRouteTypes = /* @__PURE__ */ new Map();
+  const getPaths = /* @__PURE__ */ new Set();
+  const postPaths = /* @__PURE__ */ new Set();
   for (const route of routes.list) {
-    const { meta, handler, params, middleware } = route;
+    const { meta, handler, params, middleware, page, layouts } = route;
     const routeType = `Route${route.index}`;
     const pathType = `\`${route.path.replace(
       /\/\$(\$?)([^\/]*)/,
@@ -1001,6 +1017,24 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
     )}\``;
     const paramsType = params ? renderParamsInfoType(params) : "{}";
     let metaType = "undefined";
+    if (page || handler) {
+      const isGet = page || ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes("get"));
+      const isPost = (_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes("post");
+      if (isGet || isPost) {
+        const path3 = route.path.replace(
+          /\$(\$?)([^/]+)/g,
+          (_, s, name) => s ? `\${...${name}}` : `\${${name}}`
+        );
+        const splatIndex = path3.indexOf("/${...");
+        if (splatIndex >= 0) {
+          const path22 = path3.slice(0, splatIndex) || "/";
+          isGet && getPaths.add(path22);
+          isPost && postPaths.add(path22);
+        }
+        isGet && getPaths.add(path3);
+        isPost && postPaths.add(path3);
+      }
+    }
     if (meta) {
       metaType = `typeof import('${pathPrefix}/${stripTsExtension(
         meta.relativePath
@@ -1010,7 +1044,23 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
       }
     }
     if (handler) {
-      writeRouteTypeModule(writer, pathPrefix, handler.relativePath, routeType);
+      writeRouteTypeModule(
+        serverWriter,
+        pathPrefix,
+        handler.relativePath,
+        routeType
+      );
+    }
+    if (page) {
+      writer.writeLines(`
+declare module '${pathPrefix}/${page.relativePath}' {
+  export interface Input {}
+
+  namespace MarkoRun {
+    type CurrentRoute = ${routeType};
+    type CurrentContext = RouteContext<CurrentRoute>;
+  }
+}`);
     }
     if (middleware) {
       let i = 0;
@@ -1027,21 +1077,84 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
         i++;
       }
     }
+    if (layouts) {
+      for (const layout of layouts) {
+        const existing = layoutRouteTypes.get(layout);
+        if (!existing) {
+          layoutRouteTypes.set(layout, {
+            routeTypes: [routeType]
+          });
+        } else {
+          existing.routeTypes.push(routeType);
+        }
+      }
+    }
     routesWriter.writeLines(
       `interface ${routeType} extends Route<${paramsType}, ${metaType}, ${pathType}> {}`
     );
   }
+  pathsWriter.write("    type GetPaths =");
+  for (const path3 of getPaths) {
+    pathsWriter.write(`
+      | '${path3}'`);
+  }
+  pathsWriter.writeLines(";", "");
+  pathsWriter.write("    type PostPaths =");
+  for (const path3 of postPaths) {
+    pathsWriter.write(`
+      | '${path3}'`);
+  }
+  pathsWriter.writeLines(";");
+  pathsWriter.join();
   for (const [file, { routeTypes }] of middlewareRouteTypes) {
-    const routeType = routeTypes.length > 1 ? routeTypes.join(" | ") : routeTypes[0];
-    writeRouteTypeModule(writer, pathPrefix, file.relativePath, routeType);
+    writeRouteTypeModule(
+      serverWriter,
+      pathPrefix,
+      file.relativePath,
+      routeTypes.join(" | ")
+    );
+  }
+  for (const [file, { routeTypes }] of layoutRouteTypes) {
+    writer.writeLines(`
+declare module '${pathPrefix}/${file.relativePath}' {
+  export interface Input {
+    renderBody: Marko.Body;
+  }
+
+  namespace MarkoRun {
+    type CurrentRoute = ${routeTypes.join(" | ")};
+    type CurrentContext = RouteContext<CurrentRoute>;
+  }
+}`);
+  }
+  for (const route of [routes.special["404"], routes.special["500"]]) {
+    if (route && route.page) {
+      writer.write(`
+declare module '${pathPrefix}/${route.page.relativePath}' {
+  export interface Input {`);
+      if (route.page.type === RoutableFileTypes.Error) {
+        writer.write(`
+    error: unknown;
+  `);
+      }
+      writer.writeLines(`}
+
+  namespace MarkoRun {
+    type CurrentRoute = Route;
+    type CurrentContext = RouteContext<CurrentRoute>;
+  }
+}`);
+    }
   }
+  serverWriter.join();
   return writer.end();
 }
 function writeRouteTypeModule(writer, pathPrefix, path3, routeType) {
   writer.writeLines(`
 declare module '${pathPrefix}/${stripTsExtension(path3)}' {
-  namespace Marko {
+  namespace MarkoRun {
     type CurrentRoute = ${routeType};
+    type CurrentContext = RouteContext<CurrentRoute>;
     type Handler<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']> = HandlerLike<CurrentRoute>;
     function route(handler: Handler): typeof handler;
     function route<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']>(handler: Handler): typeof handler;
@@ -1321,13 +1434,14 @@ function markoServe(opts = {}) {
     const startTime = performance.now();
     routes = await buildRoutes(createFSWalker(resolvedRoutesDir), routesDir);
     times.routesBuild = performance.now() - startTime;
-    await Promise.all([writeTypesFile(), setVirtualFiles(false)]);
+    await setVirtualFiles(false);
     isStale = false;
     isRendered = false;
   });
   const renderVirtualFiles = single(async () => {
     const startTime = performance.now();
     await setVirtualFiles(true);
+    await writeTypesFile();
     times.routesRender = performance.now() - startTime;
     isRendered = true;
   });

package/dist/vite/index.js

@@ -943,6 +943,7 @@ function stripTsExtension(path3) {
   return path3;
 }
 function renderRouteTypeInfo(routes, pathPrefix = ".") {
+  var _a, _b;
   const writer = createStringWriter();
   writer.writeLines(
     `/*
@@ -950,13 +951,28 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
   Do NOT manually edit this file or your changes will be lost.
 */
   `,
-    `import type { HandlerLike, Route } from "@marko/run";
-    `
+    `import type { HandlerLike, Route, RouteContext, ValidatePath, ValidateHref } from "@marko/run";
+
+declare global {
+  namespace MarkoRun {`
   );
+  const pathsWriter = writer.branch("paths");
+  writer.write(`
+    type GetablePath<T extends string> = ValidatePath<GetPaths, T>;
+    type GetableHref<T extends string> = ValidateHref<GetPaths, T>; 
+    type PostablePath<T extends string> = ValidatePath<PostPaths, T>;
+    type PostableHref<T extends string> = ValidateHref<PostPaths, T>; 
+  }
+}
+`);
   const routesWriter = writer.branch("types");
+  const serverWriter = writer.branch("server");
   const middlewareRouteTypes = /* @__PURE__ */ new Map();
+  const layoutRouteTypes = /* @__PURE__ */ new Map();
+  const getPaths = /* @__PURE__ */ new Set();
+  const postPaths = /* @__PURE__ */ new Set();
   for (const route of routes.list) {
-    const { meta, handler, params, middleware } = route;
+    const { meta, handler, params, middleware, page, layouts } = route;
     const routeType = `Route${route.index}`;
     const pathType = `\`${route.path.replace(
       /\/\$(\$?)([^\/]*)/,
@@ -964,6 +980,24 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
     )}\``;
     const paramsType = params ? renderParamsInfoType(params) : "{}";
     let metaType = "undefined";
+    if (page || handler) {
+      const isGet = page || ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes("get"));
+      const isPost = (_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes("post");
+      if (isGet || isPost) {
+        const path3 = route.path.replace(
+          /\$(\$?)([^/]+)/g,
+          (_, s, name) => s ? `\${...${name}}` : `\${${name}}`
+        );
+        const splatIndex = path3.indexOf("/${...");
+        if (splatIndex >= 0) {
+          const path22 = path3.slice(0, splatIndex) || "/";
+          isGet && getPaths.add(path22);
+          isPost && postPaths.add(path22);
+        }
+        isGet && getPaths.add(path3);
+        isPost && postPaths.add(path3);
+      }
+    }
     if (meta) {
       metaType = `typeof import('${pathPrefix}/${stripTsExtension(
         meta.relativePath
@@ -973,7 +1007,23 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
       }
     }
     if (handler) {
-      writeRouteTypeModule(writer, pathPrefix, handler.relativePath, routeType);
+      writeRouteTypeModule(
+        serverWriter,
+        pathPrefix,
+        handler.relativePath,
+        routeType
+      );
+    }
+    if (page) {
+      writer.writeLines(`
+declare module '${pathPrefix}/${page.relativePath}' {
+  export interface Input {}
+
+  namespace MarkoRun {
+    type CurrentRoute = ${routeType};
+    type CurrentContext = RouteContext<CurrentRoute>;
+  }
+}`);
     }
     if (middleware) {
       let i = 0;
@@ -990,21 +1040,84 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
         i++;
       }
     }
+    if (layouts) {
+      for (const layout of layouts) {
+        const existing = layoutRouteTypes.get(layout);
+        if (!existing) {
+          layoutRouteTypes.set(layout, {
+            routeTypes: [routeType]
+          });
+        } else {
+          existing.routeTypes.push(routeType);
+        }
+      }
+    }
     routesWriter.writeLines(
       `interface ${routeType} extends Route<${paramsType}, ${metaType}, ${pathType}> {}`
     );
   }
+  pathsWriter.write("    type GetPaths =");
+  for (const path3 of getPaths) {
+    pathsWriter.write(`
+      | '${path3}'`);
+  }
+  pathsWriter.writeLines(";", "");
+  pathsWriter.write("    type PostPaths =");
+  for (const path3 of postPaths) {
+    pathsWriter.write(`
+      | '${path3}'`);
+  }
+  pathsWriter.writeLines(";");
+  pathsWriter.join();
   for (const [file, { routeTypes }] of middlewareRouteTypes) {
-    const routeType = routeTypes.length > 1 ? routeTypes.join(" | ") : routeTypes[0];
-    writeRouteTypeModule(writer, pathPrefix, file.relativePath, routeType);
+    writeRouteTypeModule(
+      serverWriter,
+      pathPrefix,
+      file.relativePath,
+      routeTypes.join(" | ")
+    );
+  }
+  for (const [file, { routeTypes }] of layoutRouteTypes) {
+    writer.writeLines(`
+declare module '${pathPrefix}/${file.relativePath}' {
+  export interface Input {
+    renderBody: Marko.Body;
+  }
+
+  namespace MarkoRun {
+    type CurrentRoute = ${routeTypes.join(" | ")};
+    type CurrentContext = RouteContext<CurrentRoute>;
+  }
+}`);
+  }
+  for (const route of [routes.special["404"], routes.special["500"]]) {
+    if (route && route.page) {
+      writer.write(`
+declare module '${pathPrefix}/${route.page.relativePath}' {
+  export interface Input {`);
+      if (route.page.type === RoutableFileTypes.Error) {
+        writer.write(`
+    error: unknown;
+  `);
+      }
+      writer.writeLines(`}
+
+  namespace MarkoRun {
+    type CurrentRoute = Route;
+    type CurrentContext = RouteContext<CurrentRoute>;
+  }
+}`);
+    }
   }
+  serverWriter.join();
   return writer.end();
 }
 function writeRouteTypeModule(writer, pathPrefix, path3, routeType) {
   writer.writeLines(`
 declare module '${pathPrefix}/${stripTsExtension(path3)}' {
-  namespace Marko {
+  namespace MarkoRun {
     type CurrentRoute = ${routeType};
+    type CurrentContext = RouteContext<CurrentRoute>;
     type Handler<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']> = HandlerLike<CurrentRoute>;
     function route(handler: Handler): typeof handler;
     function route<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']>(handler: Handler): typeof handler;
@@ -1283,13 +1396,14 @@ function markoServe(opts = {}) {
     const startTime = performance.now();
     routes = await buildRoutes(createFSWalker(resolvedRoutesDir), routesDir);
     times.routesBuild = performance.now() - startTime;
-    await Promise.all([writeTypesFile(), setVirtualFiles(false)]);
+    await setVirtualFiles(false);
     isStale = false;
     isRendered = false;
   });
   const renderVirtualFiles = single(async () => {
     const startTime = performance.now();
     await setVirtualFiles(true);
+    await writeTypesFile();
     times.routesRender = performance.now() - startTime;
     isRendered = true;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.0.1-beta4",
+  "version": "0.0.1-beta6",
   "description": "File-based routing for Marko based on Vite",
   "keywords": [],
   "author": "Ryan Turnquist <rturnq@gmail.com>",
@@ -89,7 +89,6 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@hattip/polyfills": "^0.0.27",
     "@marko/vite": "^2.3.9",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
@@ -100,6 +99,7 @@
     "kleur": "^4.1.5",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
+    "undici": "^5.20.0",
     "vite": "^3.0.8"
   }
 }