@marko/run 0.0.1-beta3 → 0.0.1-beta5

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;
@@ -1219,14 +1332,18 @@ function prettyPath(path3) {
 }
 
 // src/vite/utils/config.ts
-var KEY = "__MARKO_SERVE_OPTIONS__";
-function getMarkoRunOptions(viteConfig) {
-  return viteConfig[KEY];
+var PluginConfigKey = "__MARKO_RUN_PLUGIN_CONFIG__";
+var AdapterConfigKey = "__MARKO_RUN_ADAPTER_CONFIG__";
+function getConfig(obj, key) {
+  return obj[key];
 }
-function setMarkoRunOptions(viteConfig, options) {
-  viteConfig[KEY] = options;
-  return viteConfig;
+function setConfig(obj, key, value) {
+  obj[key] = value;
+  return obj;
 }
+var getExternalPluginOptions = (viteConfig) => getConfig(viteConfig, PluginConfigKey);
+var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, PluginConfigKey, value);
+var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterConfigKey);
 
 // src/vite/plugin.ts
 var import_url = require("url");
@@ -1267,10 +1384,8 @@ function markoServe(opts = {}) {
       "{.tsconfig*,tsconfig*.json}"
     ))) {
       const filepath = import_path2.default.join(typesDir, "routes.d.ts");
-      const data = renderRouteTypeInfo(
-        routes,
-        import_path2.default.relative(typesDir, routesDir)
-      );
+      const adapterTypeInfo = (adapter == null ? void 0 : adapter.writeTypeInfo) && await (adapter == null ? void 0 : adapter.writeTypeInfo());
+      const data = renderRouteTypeInfo(routes, import_path2.default.relative(typesDir, routesDir)) + adapterTypeInfo;
       if (data !== typesFile || !import_fs2.default.existsSync(filepath)) {
         await ensureDir(typesDir);
         await import_fs2.default.promises.writeFile(filepath, typesFile = data);
@@ -1319,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;
   });
@@ -1335,13 +1451,19 @@ function markoServe(opts = {}) {
       enforce: "pre",
       async config(config2, env) {
         var _a, _b, _c;
-        const externalPluginOptions = getMarkoRunOptions(config2);
+        const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = (0, import_vite.mergeConfig)(opts, externalPluginOptions);
         }
-        const adapterOptions = await ((_a = adapter == null ? void 0 : adapter.pluginOptions) == null ? void 0 : _a.call(adapter, opts));
-        if (adapterOptions) {
-          opts = (0, import_vite.mergeConfig)(opts, adapterOptions);
+        if (adapter) {
+          const externalAdapterConfig = getExternalAdapterOptions(config2);
+          if (externalAdapterConfig && adapter.configure) {
+            adapter.configure(externalAdapterConfig);
+          }
+          const adapterOptions = await ((_a = adapter.pluginOptions) == null ? void 0 : _a.call(adapter, opts));
+          if (adapterOptions) {
+            opts = (0, import_vite.mergeConfig)(opts, adapterOptions);
+          }
         }
         root = (0, import_vite.normalizePath)(config2.root || process.cwd());
         store = opts.store || new import_vite2.FileStore(
@@ -1365,7 +1487,7 @@ function markoServe(opts = {}) {
         if (adapterConfig) {
           pluginConfig = (0, import_vite.mergeConfig)(pluginConfig, adapterConfig);
         }
-        return setMarkoRunOptions(pluginConfig, opts);
+        return setExternalPluginOptions(pluginConfig, opts);
       },
       configResolved(config2) {
         resolvedConfig = config2;

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
 export { default } from "./plugin";
 export { getAvailablePort, isPortInUse, loadEnv, parseEnv, spawnServer, } from "./utils/server";
 export type { SpawnedServer } from "./utils/server";
-export type { Adapter, Options, BuiltRoutes, HttpVerb, ParamInfo, Route, RoutableFile, RoutableFileType, } from "./types";
+export type { Adapter, AdapterConfig, Options, BuiltRoutes, HttpVerb, ParamInfo, Route, RoutableFile, RoutableFileType, } from "./types";

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;
@@ -1182,14 +1295,18 @@ function prettyPath(path3) {
 }
 
 // src/vite/utils/config.ts
-var KEY = "__MARKO_SERVE_OPTIONS__";
-function getMarkoRunOptions(viteConfig) {
-  return viteConfig[KEY];
+var PluginConfigKey = "__MARKO_RUN_PLUGIN_CONFIG__";
+var AdapterConfigKey = "__MARKO_RUN_ADAPTER_CONFIG__";
+function getConfig(obj, key) {
+  return obj[key];
 }
-function setMarkoRunOptions(viteConfig, options) {
-  viteConfig[KEY] = options;
-  return viteConfig;
+function setConfig(obj, key, value) {
+  obj[key] = value;
+  return obj;
 }
+var getExternalPluginOptions = (viteConfig) => getConfig(viteConfig, PluginConfigKey);
+var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, PluginConfigKey, value);
+var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterConfigKey);
 
 // src/vite/plugin.ts
 import { fileURLToPath } from "url";
@@ -1229,10 +1346,8 @@ function markoServe(opts = {}) {
       "{.tsconfig*,tsconfig*.json}"
     ))) {
       const filepath = path2.join(typesDir, "routes.d.ts");
-      const data = renderRouteTypeInfo(
-        routes,
-        path2.relative(typesDir, routesDir)
-      );
+      const adapterTypeInfo = (adapter == null ? void 0 : adapter.writeTypeInfo) && await (adapter == null ? void 0 : adapter.writeTypeInfo());
+      const data = renderRouteTypeInfo(routes, path2.relative(typesDir, routesDir)) + adapterTypeInfo;
       if (data !== typesFile || !fs2.existsSync(filepath)) {
         await ensureDir(typesDir);
         await fs2.promises.writeFile(filepath, typesFile = data);
@@ -1281,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;
   });
@@ -1297,13 +1413,19 @@ function markoServe(opts = {}) {
       enforce: "pre",
       async config(config2, env) {
         var _a, _b, _c;
-        const externalPluginOptions = getMarkoRunOptions(config2);
+        const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
         }
-        const adapterOptions = await ((_a = adapter == null ? void 0 : adapter.pluginOptions) == null ? void 0 : _a.call(adapter, opts));
-        if (adapterOptions) {
-          opts = mergeConfig(opts, adapterOptions);
+        if (adapter) {
+          const externalAdapterConfig = getExternalAdapterOptions(config2);
+          if (externalAdapterConfig && adapter.configure) {
+            adapter.configure(externalAdapterConfig);
+          }
+          const adapterOptions = await ((_a = adapter.pluginOptions) == null ? void 0 : _a.call(adapter, opts));
+          if (adapterOptions) {
+            opts = mergeConfig(opts, adapterOptions);
+          }
         }
         root = normalizePath(config2.root || process.cwd());
         store = opts.store || new FileStore(
@@ -1327,7 +1449,7 @@ function markoServe(opts = {}) {
         if (adapterConfig) {
           pluginConfig = mergeConfig(pluginConfig, adapterConfig);
         }
-        return setMarkoRunOptions(pluginConfig, opts);
+        return setExternalPluginOptions(pluginConfig, opts);
       },
       configResolved(config2) {
         resolvedConfig = config2;

package/dist/vite/types.d.ts

@@ -3,14 +3,19 @@ import type { Options as MarkoViteOptions } from "@marko/vite";
 import type { ResolvedConfig, UserConfig } from "vite";
 export type { RoutableFileType, HttpVerb };
 export declare type StartServer = (port?: number) => Promise<void>;
+export interface AdapterConfig {
+    [name: PropertyKey]: any;
+}
 export interface Adapter {
     readonly name: string;
+    configure?(config: AdapterConfig): void;
     pluginOptions?(options: Options): Promise<Options> | Options | undefined;
     viteConfig?(config: UserConfig): Promise<UserConfig> | UserConfig | undefined;
     getEntryFile?(): Promise<string> | string;
     startDev?(configFile: string, port: number, envFile?: string): Promise<void> | void;
     startPreview?(dir: string, entry?: string, port?: number, envFile?: string): Promise<void> | void;
     buildEnd?(config: ResolvedConfig, routes: Route[], builtEntries: string[], sourceEntries: string[]): Promise<void> | void;
+    writeTypeInfo?(): Promise<string> | string;
 }
 export interface RouterOptions {
     trailingSlashes: 'Ignore' | 'RedirectWithout' | 'RedirectWith' | 'RewriteWithout' | 'RewriteWith';

package/dist/vite/utils/config.d.ts

@@ -1,3 +1,5 @@
-import type { Options } from '../types';
-export declare function getMarkoRunOptions<T extends Record<string, any>>(viteConfig: T): Readonly<Options> | undefined;
-export declare function setMarkoRunOptions<T extends Record<string, any>>(viteConfig: T, options: Options): T;
+import type { Options, AdapterConfig } from '../types';
+export declare const getExternalPluginOptions: <T>(viteConfig: T) => Readonly<Options> | undefined;
+export declare const setExternalPluginOptions: <T>(viteConfig: T, value: Options) => T;
+export declare const getExternalAdapterOptions: <T>(viteConfig: T) => Readonly<AdapterConfig> | undefined;
+export declare const setExternalAdapterOptions: <T>(viteConfig: T, value: AdapterConfig) => T;

package/dist/vite/utils/route.d.ts

@@ -1,3 +1,3 @@
 import type { HttpVerb, Route } from "../types";
-export declare function getVerbs(route: Route): ("get" | "post" | "put" | "delete")[];
+export declare function getVerbs(route: Route): ("get" | "delete" | "post" | "put")[];
 export declare function hasVerb(route: Route, verb: HttpVerb): boolean | import("../types").RoutableFile | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.0.1-beta3",
+  "version": "0.0.1-beta5",
   "description": "File-based routing for Marko based on Vite",
   "keywords": [],
   "author": "Ryan Turnquist <rturnq@gmail.com>",
@@ -47,19 +47,19 @@
   "typesVersions": {
     "*": {
       "*": [
-        "./src/runtime/index.ts"
+        "./dist/runtime/index.d.ts"
       ],
       "router": [
-        "./src/runtime/router.ts"
+        "./dist/runtime/router.d.ts"
       ],
       "vite": [
-        "./src/vite/index.ts"
+        "./dist/vite/index.d.ts"
       ],
       "adapter/middleware": [
-        "./src/adapter/middleware.ts"
+        "./dist/adapter/middleware.d.ts"
       ],
       "adapter": [
-        "./src/adapter/index.ts"
+        "./dist/adapter/index.d.ts"
       ]
     }
   },
@@ -81,7 +81,7 @@
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
-    "marko": "^5.21.9",
+    "marko": "^5.22.4",
     "mocha": "^10.0.0",
     "mocha-snap": "^4.3.0",
     "prettier": "^2.7.1",

package/dist/runtime/utils.d.ts

@@ -1,3 +0,0 @@
-import type { RouteHandler } from "./types";
-export declare function compose(...handlers: RouteHandler[]): RouteHandler;
-export declare function createHandler(factory: () => Promise<RouteHandler>): RouteHandler;