@marko/run 0.1.8 → 0.1.9

package/dist/runtime/index.d.ts

@@ -1,5 +1,5 @@
 import { NotHandled, NotMatched } from "./namespace";
-import { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, HandlerTypeFn, RuntimeModule, AnyRoute, AnyContext, AnyHandler } from "./types";
+import type { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, HandlerTypeFn, RuntimeModule, AnyRoute, AnyContext, AnyHandler } from "./types";
 declare global {
     var __marko_run__: RuntimeModule;
     namespace MarkoRun {

package/dist/runtime/types.d.ts

@@ -3,7 +3,7 @@ type OneOrMany<T> = T | T[];
 type NoParams = {};
 export interface Platform {
 }
-export interface Context<TRoute extends AnyRoute = AnyRoute> {
+export interface Context<TRoute extends Route = AnyRoute> {
     readonly url: URL;
     readonly request: Request;
     readonly route: TRoute["path"];
@@ -12,13 +12,13 @@ export interface Context<TRoute extends AnyRoute = AnyRoute> {
     readonly platform: Platform;
     readonly serializedGlobals: Record<string, boolean>;
 }
-export type MultiRouteContext<TRoute extends AnyRoute> = TRoute extends any ? Context<TRoute> : never;
+export type MultiRouteContext<TRoute extends Route> = TRoute extends any ? Context<TRoute> : never;
 export type ParamsObject = Record<string, string>;
 export type InputObject = Record<PropertyKey, any>;
 export type NextFunction = () => Awaitable<Response>;
-export type HandlerLike<TRoute extends AnyRoute = AnyRoute> = Awaitable<OneOrMany<RouteHandler<TRoute>>>;
-export type RouteHandler<TRoute extends AnyRoute = AnyRoute> = (context: MultiRouteContext<TRoute>, next: NextFunction) => Awaitable<Response | null | void>;
-export interface Route<Params extends ParamsObject, Meta, Path extends string> {
+export type HandlerLike<TRoute extends Route = AnyRoute> = Awaitable<OneOrMany<RouteHandler<TRoute>>>;
+export type RouteHandler<TRoute extends Route = AnyRoute> = (context: MultiRouteContext<TRoute>, next: NextFunction) => Awaitable<Response | null | void>;
+export interface Route<Params extends ParamsObject = ParamsObject, Meta = unknown, Path extends string = string> {
     path: Path;
     params: Params;
     meta: Meta;
@@ -79,11 +79,11 @@ type AnyParams = 0 extends HasAppData ? ParamsObject : never;
 type AnyMeta = 0 extends HasAppData ? unknown : never;
 export type Routes = AppData extends {
     routes: infer T;
-} ? T : Record<string, Route<ParamsObject, unknown, string>>;
+} ? T : Record<string, Route>;
 export type AnyRoute = Routes[keyof Routes];
 export type AnyContext = MultiRouteContext<AnyRoute>;
-export type AnyHandler<Params extends AnyParams = AnyParams, Meta extends AnyMeta = AnyMeta> = 0 extends HasAppData ? HandlerLike<Route<Params, Meta, string>> : HandlerLike<AnyRoute>;
-export type HandlerTypeFn<THandler extends HandlerLike = AnyHandler> = 0 extends HasAppData ? <Params extends ParamsObject = ParamsObject, Meta = unknown>(handler: HandlerLike<Route<Params, Meta, string>>) => HandlerLike<Route<Params, Meta, string>> : (handler: THandler) => THandler;
+export type AnyHandler<Params extends AnyParams = AnyParams, Meta extends AnyMeta = AnyMeta> = 0 extends HasAppData ? HandlerLike<Route<Params, Meta>> : HandlerLike<AnyRoute>;
+export type HandlerTypeFn<TRoute extends Route = AnyRoute> = 0 extends HasAppData ? <Params extends ParamsObject = ParamsObject, Meta = unknown>(handler: HandlerLike<Route<Params, Meta>>) => HandlerLike<Route<Params, Meta>> : (handler: HandlerLike<TRoute>) => HandlerLike<TRoute>;
 export type GetPaths = AppData extends {
     getPaths: infer T;
 } ? T : string;

package/dist/vite/index.cjs

@@ -987,7 +987,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   Do NOT manually edit this file or your changes will be lost.
 */
 `,
-    `import "@marko/run/namespace";`,
+    `import { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform } from "@marko/run/namespace";`,
     `import type Run from "@marko/run";`
   );
   const headWriter = writer.branch("head");
@@ -1130,11 +1130,11 @@ function writeModuleDeclaration(writer, path3, routeType, moduleTypes) {
     const isMarko = path3.endsWith(".marko");
     writer.write(`
   namespace MarkoRun {
-    export * from "@marko/run/namespace";
+    export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
     export type Route = ${routeType};
     export type Context = Run.MultiRouteContext<Route>${isMarko ? " & Marko.Global" : ""};
     export type Handler = Run.HandlerLike<Route>;
-    export const route: Run.HandlerTypeFn<Handler>;
+    export const route: Run.HandlerTypeFn<Route>;
   }`);
   }
   writer.writeLines(`

package/dist/vite/index.js

@@ -950,7 +950,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   Do NOT manually edit this file or your changes will be lost.
 */
 `,
-    `import "@marko/run/namespace";`,
+    `import { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform } from "@marko/run/namespace";`,
     `import type Run from "@marko/run";`
   );
   const headWriter = writer.branch("head");
@@ -1093,11 +1093,11 @@ function writeModuleDeclaration(writer, path3, routeType, moduleTypes) {
     const isMarko = path3.endsWith(".marko");
     writer.write(`
   namespace MarkoRun {
-    export * from "@marko/run/namespace";
+    export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
     export type Route = ${routeType};
     export type Context = Run.MultiRouteContext<Route>${isMarko ? " & Marko.Global" : ""};
     export type Handler = Run.HandlerLike<Route>;
-    export const route: Run.HandlerTypeFn<Handler>;
+    export const route: Run.HandlerTypeFn<Route>;
   }`);
   }
   writer.writeLines(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",