@marko/run 0.0.1-beta8 → 0.1.0

package/dist/cli/default.config.mjs

@@ -1,7 +1,7 @@
 import { defineConfig } from "vite";
 import marko from "@marko/run/vite";
-import staticAdapter from "@marko/run/adapter";
+import nodeAdapter from "@marko/run/adapter";
 
 export default defineConfig({
-  plugins: [marko({ adapter: staticAdapter() })]
+  plugins: [marko({ adapter: nodeAdapter() })]
 });

package/dist/cli/index.mjs

@@ -98,7 +98,8 @@ var defaultPort = +process.env.PORT || 3e3;
 var defaultConfigFileBases = ["serve.config", "vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
 var prog = sade("marko-run").version("0.0.1").option("-c, --config", `Provide path to a Vite config file (by default looks for a file starting with ${defaultConfigFileBases.join(" or ")} with one of these extensions: ${defaultConfigFileExts.join(", ")})`).option("-e, --env", "Provide path to a dotenv file");
-prog.command("serve [entry]").describe("Start a production-like server for already-built app files").option("-o, --output", "Directory to serve files from, and write asset files to if `--build` (default: )").option("-p, --port", "Port the server should listen on (defaults: `$PORT` env variable or 3000)").option("-f, --file", "Output file to start").action(async (entry, opts) => {
+prog.command("preview [entry]").describe("Start a production-like server for already-built app files").option("-o, --output", "Directory to serve files from, and write asset files to if `--build` (default: )").option("-p, --port", "Port the server should listen on (defaults: `$PORT` env variable or 3000)").option("-f, --file", "Output file to start").action(async (entry, opts) => {
+  process.env.NODE_ENV = "production";
   const config2 = await getViteConfig(cwd, opts.config);
   await build(entry, config2, opts.output, false, opts.env);
   await preview(opts.entry, config2, opts.port, opts.output, opts.env);
@@ -109,6 +110,7 @@ prog.command("dev [entry]", "", { default: true }).describe("Start development s
   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: 'build.outDir' in Vite config)").option("--skip-client", "Skip the client-side build").example("build --config vite.config.js").action(async (entry, opts) => {
+  process.env.NODE_ENV = "production";
   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,21 +1,21 @@
-import type { HandlerLike, ParamsObject, Route, RouteContext } from "./types";
+import type { HandlerLike, ParamsObject, Route as AnyRoute, Context as AnyContext } from "./types";
 declare global {
     namespace Marko {
-        interface Global extends MarkoRun.CurrentContext {
+        interface Global extends MarkoRun.Context {
         }
         interface Out {
             global: Global;
         }
     }
     namespace MarkoRun {
-        const NotHandled: symbol;
-        const NotMatched: symbol;
-        interface CurrentRoute extends Route {
+        const NotHandled: unique symbol;
+        const NotMatched: unique symbol;
+        interface Route extends AnyRoute {
         }
-        interface CurrentContext extends RouteContext<CurrentRoute> {
+        interface Context extends AnyContext<Route> {
         }
-        type Handler<Params extends ParamsObject = {}, Meta = unknown> = HandlerLike<Route<Params, Meta, string>>;
+        type Handler<Params extends ParamsObject = {}, Meta = unknown> = HandlerLike<AnyRoute<Params, Meta, string>>;
         function route<Params extends ParamsObject = {}, Meta = unknown>(handler: Handler<Params, Meta>): typeof handler;
     }
 }
-export type { Fetch, HandlerLike, InputObject, Invoke, Match, NextFunction, PathTemplate, Route, RouteContext, RouteContextExtensions, RouteHandler, RouteWithHandler, RuntimeModule, ValidateHref, ValidatePath, } from "./types";
+export type { Fetch, HandlerLike, InputObject, Invoke, Match, NextFunction, PathTemplate, Route, Context, ContextExtensions, RouteHandler, RouteWithHandler, RuntimeModule, ValidateHref, ValidatePath, } from "./types";

package/dist/runtime/internal.cjs

@@ -28,9 +28,17 @@ __export(internal_exports, {
   noContent: () => noContent,
   normalize: () => normalize,
   notHandled: () => notHandled,
-  notMatched: () => notMatched
+  notMatched: () => notMatched,
+  pageResponse: () => pageResponse
 });
 module.exports = __toCommonJS(internal_exports);
+var pageResponseInit = {
+  status: 200,
+  headers: { "content-type": "text/html;charset=UTF-8" }
+};
+function pageResponse(template, input) {
+  return new Response(template.stream(input), pageResponseInit);
+}
 var NotHandled = Symbol();
 var NotMatched = Symbol();
 globalThis.MarkoRun ?? (globalThis.MarkoRun = {
@@ -147,5 +155,6 @@ function notMatched() {
   noContent,
   normalize,
   notHandled,
-  notMatched
+  notMatched,
+  pageResponse
 });

package/dist/runtime/internal.d.ts

@@ -1,8 +1,9 @@
-import type { InputObject, NextFunction, Route, RouteContext, RouteHandler } from "./types";
-export declare const NotHandled: unique symbol;
-export declare const NotMatched: unique symbol;
-export declare function createInput(context: RouteContext): (data: InputObject) => InputObject;
-export declare function call(handler: RouteHandler<Route>, next: NextFunction, context: RouteContext): Promise<Response>;
+import type { InputObject, NextFunction, Route, Context, RouteHandler } from "./types";
+export declare function pageResponse(template: any, input: Record<PropertyKey, unknown>): Response;
+export declare const NotHandled: typeof MarkoRun.NotHandled;
+export declare const NotMatched: typeof MarkoRun.NotMatched;
+export declare function createInput(context: Context): (data: InputObject) => InputObject;
+export declare function call(handler: RouteHandler<Route>, next: NextFunction, context: Context): Promise<Response>;
 export declare function compose(handlers: RouteHandler[]): RouteHandler;
 export declare function normalize(obj: RouteHandler | RouteHandler[] | Promise<RouteHandler | RouteHandler[]>): RouteHandler;
 export declare function noContent(): Response;

package/dist/runtime/internal.js

@@ -1,4 +1,11 @@
 // src/runtime/internal.ts
+var pageResponseInit = {
+  status: 200,
+  headers: { "content-type": "text/html;charset=UTF-8" }
+};
+function pageResponse(template, input) {
+  return new Response(template.stream(input), pageResponseInit);
+}
 var NotHandled = Symbol();
 var NotMatched = Symbol();
 globalThis.MarkoRun ?? (globalThis.MarkoRun = {
@@ -114,5 +121,6 @@ export {
   noContent,
   normalize,
   notHandled,
-  notMatched
+  notMatched,
+  pageResponse
 };

package/dist/runtime/types.d.ts

@@ -3,11 +3,11 @@ declare type OneOrMany<T> = T | T[];
 declare type Combine<T> = T extends object ? {
     [P in keyof T]: T[P];
 } : T;
-export interface RouteContextExtensions {
+export interface ContextExtensions {
 }
 export declare type ParamsObject = Record<string, string>;
 export declare type InputObject = Record<PropertyKey, any>;
-export declare type RouteContext<Platform = unknown, TRoute extends Route = Route> = TRoute extends any ? Combine<RouteContextExtensions & Readonly<{
+export declare type Context<Platform = unknown, TRoute extends Route = Route> = TRoute extends any ? Combine<ContextExtensions & Readonly<{
     url: URL;
     request: Request;
     route: TRoute["path"];
@@ -17,7 +17,7 @@ export declare type RouteContext<Platform = unknown, TRoute extends Route = Rout
 }>> : never;
 export declare type NextFunction = () => Awaitable<Response>;
 export declare type HandlerLike<TRoute extends Route = Route> = Awaitable<OneOrMany<RouteHandler<TRoute>>>;
-export declare type RouteHandler<TRoute extends Route = Route> = (context: RouteContext<unknown, TRoute>, next: NextFunction) => Awaitable<Response | null | void>;
+export declare type RouteHandler<TRoute extends Route = Route> = (context: Context<unknown, TRoute>, next: NextFunction) => Awaitable<Response | null | void>;
 export interface Route<Params extends ParamsObject = {}, Meta = unknown, Path extends string = string> {
     path: Path;
     params: Params;

package/dist/vite/index.cjs

@@ -537,6 +537,9 @@ function renderRouteEntry(route) {
   if (!page || verbs.length > 1) {
     runtimeImports.push("noContent");
   }
+  if (page) {
+    runtimeImports.push("pageResponse");
+  }
   if (runtimeImports.length) {
     imports.writeLines(
       `import { ${runtimeImports.join(", ")} } from '${virtualRuntimePrefix}';`
@@ -578,10 +581,8 @@ function renderRouteEntry(route) {
   return writer.end();
 }
 function writePageResponse(writer, wrapFn) {
-  writer.writeBlock(
-    `${wrapFn ? `const ${wrapFn} = () =>` : `return`} new Response(page.stream(buildInput()), {`,
-    ["status: 200,", 'headers: { "content-type": "text/html;charset=UTF-8" }'],
-    "});"
+  writer.writeLines(
+    `${wrapFn ? `const ${wrapFn} = () =>` : `return`} pageResponse(page, buildInput());`
   );
 }
 function writeMiddleware(writer, middleware, next, wrapFn) {
@@ -788,24 +789,12 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const message = import.meta.env.DEV
-      ? \`Internal Server Error (\${error.message})\`
-      : "Internal Server Error";
-
-    return new Response(
-      JSON.stringify({
-        error: {
-          message,
-          stack: import.meta.env.DEV
-            ? \`This will only be seen in development mode\\n\\n\${error.stack}\`
-            : ""
-        }
-      }),
-      {
-        statusText: message,
-        status: 500,
-      }
-    );
+    const body = import.meta.env.DEV
+      ? error.stack || error.message || "Internal Server Error"
+      : null;
+    return new Response(body, {
+      status: 500
+    });
   }
 }`);
   return writer.end();
@@ -1004,7 +993,7 @@ function renderRouteTypeInfo(routes, pathPrefix = ".", adapterTypes = "") {
   Do NOT manually edit this file or your changes will be lost.
 */
 `,
-    `import type { HandlerLike, Route, RouteContext, ValidatePath, ValidateHref } from "@marko/run";`,
+    `import type { HandlerLike, Route as AnyRoute, Context as AnyContext, ValidatePath, ValidateHref } from "@marko/run";`,
     adapterTypes,
     `
 
@@ -1075,8 +1064,8 @@ declare module '${pathPrefix}/${page.relativePath}' {
   export interface Input {}
 
   namespace MarkoRun {
-    type CurrentRoute = ${routeType};
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
+    type Route = ${routeType};
+    type Context = AnyContext<AnyContext['platform'], Route>;
   }
 }`);
     }
@@ -1108,7 +1097,7 @@ declare module '${pathPrefix}/${page.relativePath}' {
       }
     }
     routesWriter.writeLines(
-      `interface ${routeType} extends Route<${paramsType}, ${metaType}, ${pathType}> {}`
+      `interface ${routeType} extends AnyRoute<${paramsType}, ${metaType}, ${pathType}> {}`
     );
   }
   pathsWriter.write("    type GetPaths =");
@@ -1140,8 +1129,8 @@ declare module '${pathPrefix}/${file.relativePath}' {
   }
 
   namespace MarkoRun {
-    type CurrentRoute = ${routeTypes.join(" | ")};
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
+    type Route = ${routeTypes.join(" | ")};
+    type Context = AnyContext<AnyContext['platform'], Route>;
   }
 }`);
   }
@@ -1158,8 +1147,8 @@ declare module '${pathPrefix}/${route.page.relativePath}' {
       writer.writeLines(`}
 
   namespace MarkoRun {
-    type CurrentRoute = Route;
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
+    type Route = AnyRoute;
+    type Context = AnyContext<AnyContext['platform'], Route>;
   }
 }`);
     }
@@ -1171,11 +1160,11 @@ function writeRouteTypeModule(writer, pathPrefix, path3, routeType) {
   writer.writeLines(`
 declare module '${pathPrefix}/${stripTsExtension(path3)}' {
   namespace MarkoRun {
-    type CurrentRoute = ${routeType};
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
-    type Handler<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']> = HandlerLike<CurrentRoute>;
+    type Route = ${routeType};
+    type Context = AnyContext<AnyContext['platform'], Route>;
+    type Handler<_Params = Route['params'], _Meta = Route['meta']> = HandlerLike<Route>;
     function route(handler: Handler): typeof handler;
-    function route<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']>(handler: Handler): typeof handler;
+    function route<_Params = Route['params'], _Meta = Route['meta']>(handler: Handler): typeof handler;
   }
 }`);
 }

package/dist/vite/index.js

@@ -500,6 +500,9 @@ function renderRouteEntry(route) {
   if (!page || verbs.length > 1) {
     runtimeImports.push("noContent");
   }
+  if (page) {
+    runtimeImports.push("pageResponse");
+  }
   if (runtimeImports.length) {
     imports.writeLines(
       `import { ${runtimeImports.join(", ")} } from '${virtualRuntimePrefix}';`
@@ -541,10 +544,8 @@ function renderRouteEntry(route) {
   return writer.end();
 }
 function writePageResponse(writer, wrapFn) {
-  writer.writeBlock(
-    `${wrapFn ? `const ${wrapFn} = () =>` : `return`} new Response(page.stream(buildInput()), {`,
-    ["status: 200,", 'headers: { "content-type": "text/html;charset=UTF-8" }'],
-    "});"
+  writer.writeLines(
+    `${wrapFn ? `const ${wrapFn} = () =>` : `return`} pageResponse(page, buildInput());`
   );
 }
 function writeMiddleware(writer, middleware, next, wrapFn) {
@@ -751,24 +752,12 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const message = import.meta.env.DEV
-      ? \`Internal Server Error (\${error.message})\`
-      : "Internal Server Error";
-
-    return new Response(
-      JSON.stringify({
-        error: {
-          message,
-          stack: import.meta.env.DEV
-            ? \`This will only be seen in development mode\\n\\n\${error.stack}\`
-            : ""
-        }
-      }),
-      {
-        statusText: message,
-        status: 500,
-      }
-    );
+    const body = import.meta.env.DEV
+      ? error.stack || error.message || "Internal Server Error"
+      : null;
+    return new Response(body, {
+      status: 500
+    });
   }
 }`);
   return writer.end();
@@ -967,7 +956,7 @@ function renderRouteTypeInfo(routes, pathPrefix = ".", adapterTypes = "") {
   Do NOT manually edit this file or your changes will be lost.
 */
 `,
-    `import type { HandlerLike, Route, RouteContext, ValidatePath, ValidateHref } from "@marko/run";`,
+    `import type { HandlerLike, Route as AnyRoute, Context as AnyContext, ValidatePath, ValidateHref } from "@marko/run";`,
     adapterTypes,
     `
 
@@ -1038,8 +1027,8 @@ declare module '${pathPrefix}/${page.relativePath}' {
   export interface Input {}
 
   namespace MarkoRun {
-    type CurrentRoute = ${routeType};
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
+    type Route = ${routeType};
+    type Context = AnyContext<AnyContext['platform'], Route>;
   }
 }`);
     }
@@ -1071,7 +1060,7 @@ declare module '${pathPrefix}/${page.relativePath}' {
       }
     }
     routesWriter.writeLines(
-      `interface ${routeType} extends Route<${paramsType}, ${metaType}, ${pathType}> {}`
+      `interface ${routeType} extends AnyRoute<${paramsType}, ${metaType}, ${pathType}> {}`
     );
   }
   pathsWriter.write("    type GetPaths =");
@@ -1103,8 +1092,8 @@ declare module '${pathPrefix}/${file.relativePath}' {
   }
 
   namespace MarkoRun {
-    type CurrentRoute = ${routeTypes.join(" | ")};
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
+    type Route = ${routeTypes.join(" | ")};
+    type Context = AnyContext<AnyContext['platform'], Route>;
   }
 }`);
   }
@@ -1121,8 +1110,8 @@ declare module '${pathPrefix}/${route.page.relativePath}' {
       writer.writeLines(`}
 
   namespace MarkoRun {
-    type CurrentRoute = Route;
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
+    type Route = AnyRoute;
+    type Context = AnyContext<AnyContext['platform'], Route>;
   }
 }`);
     }
@@ -1134,11 +1123,11 @@ function writeRouteTypeModule(writer, pathPrefix, path3, routeType) {
   writer.writeLines(`
 declare module '${pathPrefix}/${stripTsExtension(path3)}' {
   namespace MarkoRun {
-    type CurrentRoute = ${routeType};
-    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
-    type Handler<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']> = HandlerLike<CurrentRoute>;
+    type Route = ${routeType};
+    type Context = AnyContext<AnyContext['platform'], Route>;
+    type Handler<_Params = Route['params'], _Meta = Route['meta']> = HandlerLike<Route>;
     function route(handler: Handler): typeof handler;
-    function route<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']>(handler: Handler): typeof handler;
+    function route<_Params = Route['params'], _Meta = Route['meta']>(handler: Handler): typeof handler;
   }
 }`);
 }

package/package.json

@@ -1,10 +1,20 @@
 {
   "name": "@marko/run",
-  "version": "0.0.1-beta8",
-  "description": "File-based routing for Marko based on Vite",
-  "keywords": [],
-  "author": "Ryan Turnquist <rturnq@gmail.com>",
+  "version": "0.1.0",
+  "description": "The Marko application framework.",
   "license": "MIT",
+  "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
+  "logo": {
+    "url": "https://github.com/marko-js/run/raw/main/assets/marko-run.png"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/marko-js/run.git"
+  },
+  "author": "Ryan Turnquist <rturnq@gmail.com>",
+  "keywords": [
+    "marko"
+  ],
   "type": "module",
   "bin": {
     "marko-run": "./dist/cli/index.mjs"
@@ -69,12 +79,12 @@
     "dist"
   ],
   "peerDependencies": {
-    "@marko/vite": "^2.3.9",
+    "@marko/vite": "^2.3.12",
     "marko": "^5"
   },
   "devDependencies": {
     "@babel/types": "^7.19.0",
-    "@marko/compiler": "^5.22.6",
+    "@marko/vite": "^2.3.12",
     "@types/glob": "^8.0.1",
     "@types/human-format": "^1.0.0",
     "@types/mocha": "^9.1.1",
@@ -82,7 +92,7 @@
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
-    "marko": "^5.22.4",
+    "marko": "^5.23.0",
     "mocha": "^10.0.0",
     "mocha-snap": "^4.3.0",
     "prettier": "^2.7.1",
@@ -90,7 +100,6 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^2.3.9",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",
@@ -101,6 +110,6 @@
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "undici": "^5.20.0",
-    "vite": "^3.0.8"
+    "vite": "^4.1.4"
   }
 }