@marko/run 0.1.3 → 0.1.5

package/dist/adapter/default-entry.mjs

@@ -5,6 +5,7 @@ import { createMiddleware } from "@marko/run/adapter/middleware";
 import { fetch } from "@marko/run/router";
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
+import zlib from 'zlib';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -12,6 +13,7 @@ const { PORT = 3456 } = process.env;
 
 const middleware = createMiddleware(fetch);
 const compress = compression({
+  flush: zlib.constants.Z_PARTIAL_FLUSH,
   threshold: 500,
 });
 const staticServe = createStaticServe(__dirname, {

package/dist/adapter/dev-server.d.ts

@@ -1,4 +1,4 @@
-import { ViteDevServer } from "vite";
+import { InlineConfig, ViteDevServer } from "vite";
 import type { NodeMiddleware } from "./middleware";
 export declare function createViteDevMiddleware<T>(devServer: ViteDevServer, load: (prev: T | undefined) => Promise<T>, factory: (value: T) => NodeMiddleware): NodeMiddleware;
-export declare function createDevServer(configFile?: string): Promise<import("vite").Connect.Server>;
+export declare function createDevServer(config?: InlineConfig): Promise<ViteDevServer>;

package/dist/adapter/index.cjs

@@ -59,9 +59,9 @@ function createViteDevMiddleware(devServer, load, factory) {
     }
   };
 }
-async function createDevServer(configFile) {
+async function createDevServer(config2) {
   const devServer = await (0, import_vite.createServer)({
-    configFile,
+    ...config2,
     appType: "custom",
     server: { middlewareMode: true }
   });
@@ -73,7 +73,8 @@ async function createDevServer(configFile) {
     async () => await devServer.ssrLoadModule("@marko/run/router"),
     (module2) => createMiddleware(module2.fetch, { devServer })
   );
-  return devServer.middlewares.use(middleware);
+  devServer.middlewares.use(middleware);
+  return devServer;
 }
 
 // src/vite/utils/server.ts
@@ -90,14 +91,14 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   (0, import_dotenv.config)({ path: envFile });
 }
-async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = import_child_process.default.spawn(cmd, {
+  const proc = import_child_process.default.spawn(cmd, args, {
     cwd,
     shell: true,
     stdio: "inherit",
@@ -108,22 +109,29 @@ async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   while (!await isPortInUse(port)) {
     if (remaining >= 100) {
       remaining -= 100;
       await sleep(100);
     } else {
-      close();
       throw new Error(
         `site-write: timeout while wating for server to start on port "${port}".`
       );
     }
   }
-  return {
-    port,
-    close
-  };
 }
 async function isPortInUse(port) {
   return new Promise((resolve) => {
@@ -147,6 +155,7 @@ function sleep(ms) {
 }
 
 // src/adapter/index.ts
+var import_parse_node_args = __toESM(require("parse-node-args"), 1);
 var import_meta = {};
 var __dirname = (0, import_url.fileURLToPath)(new URL(".", import_meta.url));
 function adapter() {
@@ -156,20 +165,33 @@ function adapter() {
       const entry = import_path.default.join(__dirname, "default-entry");
       return entry;
     },
-    async startDev(configFile, port, envFile) {
+    async startDev(config2, { port = 3e3, envFile }) {
+      const { root, configFile } = config2;
       envFile && await loadEnv(envFile);
-      const server = await createDevServer(configFile);
+      const devServer = await createDevServer({
+        root,
+        configFile
+      });
       return new Promise((resolve) => {
-        const listener = server.listen(port, () => {
+        const listener = devServer.middlewares.listen(port, () => {
           const address = listener.address();
           console.log(`Dev server started: http://localhost:${address.port}`);
-          resolve();
+          resolve({
+            port,
+            async close() {
+              await devServer.close();
+            }
+          });
         });
       });
     },
-    async startPreview(_dir, entry, port, envFile) {
-      const server = await spawnServer(`node ${entry}`, port, envFile);
+    async startPreview(entry, options) {
+      const { port, envFile } = options;
+      const { nodeArgs } = (0, import_parse_node_args.default)(options.args);
+      const args = [...nodeArgs, entry];
+      const server = await spawnServer("node", args, port, envFile);
       console.log(`Preview server started: http://localhost:${server.port}`);
+      return server;
     }
   };
 }

package/dist/adapter/index.d.ts

@@ -1,5 +1,6 @@
 import type { Adapter } from "../vite";
+import { type SpawnedServer } from "../vite/utils/server";
 export { createDevServer, createViteDevMiddleware } from "./dev-server";
-export type { Adapter };
-export type { NodePlatformInfo } from './middleware';
+export type { Adapter, SpawnedServer };
+export type { NodePlatformInfo } from "./middleware";
 export default function adapter(): Adapter;

package/dist/adapter/index.js

@@ -27,9 +27,9 @@ function createViteDevMiddleware(devServer, load, factory) {
     }
   };
 }
-async function createDevServer(configFile) {
+async function createDevServer(config2) {
   const devServer = await createServer({
-    configFile,
+    ...config2,
     appType: "custom",
     server: { middlewareMode: true }
   });
@@ -41,7 +41,8 @@ async function createDevServer(configFile) {
     async () => await devServer.ssrLoadModule("@marko/run/router"),
     (module) => createMiddleware(module.fetch, { devServer })
   );
-  return devServer.middlewares.use(middleware);
+  devServer.middlewares.use(middleware);
+  return devServer;
 }
 
 // src/vite/utils/server.ts
@@ -58,14 +59,14 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   config({ path: envFile });
 }
-async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = cp.spawn(cmd, {
+  const proc = cp.spawn(cmd, args, {
     cwd,
     shell: true,
     stdio: "inherit",
@@ -76,22 +77,29 @@ async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   while (!await isPortInUse(port)) {
     if (remaining >= 100) {
       remaining -= 100;
       await sleep(100);
     } else {
-      close();
       throw new Error(
         `site-write: timeout while wating for server to start on port "${port}".`
       );
     }
   }
-  return {
-    port,
-    close
-  };
 }
 async function isPortInUse(port) {
   return new Promise((resolve) => {
@@ -115,6 +123,7 @@ function sleep(ms) {
 }
 
 // src/adapter/index.ts
+import parseNodeArgs from "parse-node-args";
 var __dirname = fileURLToPath(new URL(".", import.meta.url));
 function adapter() {
   return {
@@ -123,20 +132,33 @@ function adapter() {
       const entry = path.join(__dirname, "default-entry");
       return entry;
     },
-    async startDev(configFile, port, envFile) {
+    async startDev(config2, { port = 3e3, envFile }) {
+      const { root, configFile } = config2;
       envFile && await loadEnv(envFile);
-      const server = await createDevServer(configFile);
+      const devServer = await createDevServer({
+        root,
+        configFile
+      });
       return new Promise((resolve) => {
-        const listener = server.listen(port, () => {
+        const listener = devServer.middlewares.listen(port, () => {
           const address = listener.address();
           console.log(`Dev server started: http://localhost:${address.port}`);
-          resolve();
+          resolve({
+            port,
+            async close() {
+              await devServer.close();
+            }
+          });
         });
       });
     },
-    async startPreview(_dir, entry, port, envFile) {
-      const server = await spawnServer(`node ${entry}`, port, envFile);
+    async startPreview(entry, options) {
+      const { port, envFile } = options;
+      const { nodeArgs } = parseNodeArgs(options.args);
+      const args = [...nodeArgs, entry];
+      const server = await spawnServer("node", args, port, envFile);
       console.log(`Preview server started: http://localhost:${server.port}`);
+      return server;
     }
   };
 }

package/dist/cli/index.mjs

@@ -1,11 +1,13 @@
 #!/usr/bin/env node
 
 // src/cli/index.ts
+import sade from "sade";
+
+// src/cli/commands.ts
 import path3 from "path";
 import fs4 from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { build as viteBuild, resolveConfig } from "vite";
-import sade from "sade";
 
 // src/vite/utils/config.ts
 var PluginConfigKey = "__MARKO_RUN_PLUGIN_CONFIG__";
@@ -21,7 +23,7 @@ var getExternalPluginOptions = (viteConfig) => getConfig(viteConfig, PluginConfi
 var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, PluginConfigKey, value);
 var setExternalAdapterOptions = (viteConfig, value) => setConfig(viteConfig, AdapterConfigKey, value);
 
-// src/cli/index.ts
+// src/cli/commands.ts
 import { MemoryStore } from "@marko/vite";
 
 // src/vite/utils/server.ts
@@ -35,15 +37,15 @@ async function parseEnv(envFile) {
     return parse(content);
   }
 }
-async function spawnServer(cmd, port = 0, env, cwd2 = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = cp.spawn(cmd, {
-    cwd: cwd2,
+  const proc = cp.spawn(cmd, args, {
+    cwd,
     shell: true,
     stdio: "inherit",
     windowsHide: true,
@@ -53,22 +55,29 @@ async function spawnServer(cmd, port = 0, env, cwd2 = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   while (!await isPortInUse(port)) {
     if (remaining >= 100) {
       remaining -= 100;
       await sleep(100);
     } else {
-      close();
       throw new Error(
         `site-write: timeout while wating for server to start on port "${port}".`
       );
     }
   }
-  return {
-    port,
-    close
-  };
 }
 async function isPortInUse(port) {
   return new Promise((resolve) => {
@@ -96,7 +105,7 @@ import path2 from "path";
 import crypto from "crypto";
 import fs3 from "fs";
 import glob from "glob";
-import { mergeConfig, resolvePackageData } from "vite";
+import { mergeConfig } from "vite";
 import markoVitePlugin, { FileStore } from "@marko/vite";
 
 // src/vite/constants.ts
@@ -129,9 +138,9 @@ import path from "path";
 import * as t from "@babel/types";
 
 // src/vite/utils/log.ts
+import zlib from "node:zlib";
 import Table from "cli-table3";
 import kleur from "kleur";
-import { gzipSizeSync } from "gzip-size";
 import format from "human-format";
 var HttpVerbColors = {
   get: kleur.green,
@@ -152,6 +161,7 @@ async function resolveAdapter(root, options, log) {
   if (adapter !== void 0) {
     return adapter;
   }
+  const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
     const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
@@ -173,48 +183,12 @@ async function resolveAdapter(root, options, log) {
   return module.default();
 }
 
-// src/cli/index.ts
+// src/cli/commands.ts
 var __dirname2 = fileURLToPath2(new URL(".", import.meta.url));
-var cwd = process.cwd();
 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("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);
-});
-prog.command("dev [entry]", "", { default: true }).describe("Start development server in watch mode").option(
-  "-p, --port",
-  "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)"
-).example("dev --config vite.config.js").action(async (entry, opts) => {
-  const cmd = opts._.length ? `${entry} ${opts._.join(" ")}` : entry ? `node ${entry}` : void 0;
-  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: '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);
-});
-prog.parse(process.argv);
-async function preview(entry, configFile, port, outDir, envFile) {
+async function preview(entry, cwd, configFile, port, outDir, envFile, args = []) {
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent", build: { outDir } },
     "serve"
@@ -233,9 +207,16 @@ async function preview(entry, configFile, port, outDir, envFile) {
   if (envFile) {
     envFile = path3.resolve(cwd, envFile);
   }
-  await adapter.startPreview(dir, entryFile, port, envFile);
+  const options = {
+    cwd,
+    dir,
+    args,
+    port,
+    envFile
+  };
+  return await adapter.startPreview(entryFile, options);
 }
-async function dev(cmd, configFile, port, envFile) {
+async function dev(cmd, cwd, configFile, port, envFile, args = []) {
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent" },
     "build"
@@ -247,7 +228,7 @@ async function dev(cmd, configFile, port, envFile) {
     envFile = path3.resolve(cwd, envFile);
   }
   if (cmd) {
-    await spawnServer(cmd, port, envFile);
+    return await spawnServer(cmd, args, port, envFile, cwd);
   } else {
     const adapter = await resolveAdapter2(resolvedConfig);
     if (!adapter) {
@@ -258,12 +239,17 @@ async function dev(cmd, configFile, port, envFile) {
       throw new Error(
         `Adapter '${adapter.name}' does not support 'serve' command`
       );
-    } else {
-      await adapter.startDev(configFile, port, envFile);
     }
+    const options = {
+      cwd,
+      args,
+      port,
+      envFile
+    };
+    return await adapter.startDev({ root: cwd, configFile }, options);
   }
 }
-async function build(entry, configFile, outDir, skipClient = false, envFile) {
+async function build(entry, cwd, configFile, outDir, envFile) {
   var _a;
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent" },
@@ -311,15 +297,13 @@ async function build(entry, configFile, outDir, skipClient = false, envFile) {
       }
     }
   });
-  if (!skipClient) {
-    await viteBuild({
-      ...buildConfig,
-      build: {
-        ...buildConfig.build,
-        sourcemap: true
-      }
-    });
-  }
+  await viteBuild({
+    ...buildConfig,
+    build: {
+      ...buildConfig.build,
+      sourcemap: true
+    }
+  });
 }
 function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
   for (const ext of extensions) {
@@ -353,3 +337,51 @@ async function resolveAdapter2(config2) {
   }
   return resolveAdapter(config2.root, options);
 }
+
+// src/cli/index.ts
+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("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: 'build.outDir' in Vite config)"
+).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 cwd = process.cwd();
+  const args = process.argv.slice(entry ? 4 : 3);
+  const config2 = await getViteConfig(cwd, opts.config);
+  await build(entry, cwd, config2, opts.output, opts.env);
+  await preview(
+    opts.file,
+    cwd,
+    config2,
+    opts.port,
+    opts.output,
+    opts.env,
+    args
+  );
+});
+prog.command("dev [entry]", "", { default: true }).describe("Start development server in watch mode").option(
+  "-p, --port",
+  "Port the dev server should listen on (defaults: 'preview.port' in config, or `$PORT` env variable, or 3000)"
+).example("dev --config vite.config.js").action(async (entry, opts) => {
+  const cwd = process.cwd();
+  const args = process.argv.slice(entry ? 4 : 3);
+  const config2 = await getViteConfig(cwd, opts.config);
+  await dev(entry, cwd, config2, opts.port, opts.env, args);
+});
+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)"
+).example("build --config vite.config.js").action(async (entry, opts) => {
+  const cwd = process.cwd();
+  const config2 = await getViteConfig(cwd, opts.config);
+  await build(entry, cwd, config2, opts.ouput, opts.env);
+});
+prog.parse(process.argv);

package/dist/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang=en><head><meta charset=UTF-8><title>@marko/run Test Fixture</title><script async type="module" crossorigin src="/assets/__marko-run__route__index.marko-3cfb730f.js"></script></head><body><div id=app>Page rendered</div></body></html>

package/dist/runtime/index.d.ts

@@ -5,7 +5,7 @@ declare global {
         const NotMatched: unique symbol;
         interface Route extends AnyRoute {
         }
-        interface Context extends AnyContext<Route> {
+        interface Context extends AnyContext {
         }
         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;

package/dist/vite/index.cjs

@@ -680,17 +680,7 @@ function renderRouter(routes, options = {
       `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
     );
   }
-  writer.writeLines(
-    `
-const page404ResponseInit = {
-  status: 404,
-  headers: { "content-type": "text/html;charset=UTF-8" },
-};
-const page500ResponseInit = {
-  status: 404,
-  headers: { "content-type": "text/html;charset=UTF-8" },
-};`
-  ).writeBlockStart(`export function match(method, pathname) {`).writeLines(
+  writer.writeLines("").writeBlockStart(`export function match(method, pathname) {`).writeLines(
     `if (!pathname) {
     pathname = '/';
   } else if (pathname.charAt(0) !== '/') {
@@ -722,8 +712,16 @@ export async function invoke(route, request, platform, url) {
 					throw error;
 				}
 			}
-`).indent = 2;
+`);
   if (routes.special[RoutableFileTypes.NotFound]) {
+    writer.indent = 2;
+    imports.writeLines(
+      `
+const page404ResponseInit = {
+  status: 404,
+  headers: { "content-type": "text/html;charset=UTF-8" },
+};`
+    );
     writer.write(
       `    } else {
     }
@@ -733,11 +731,17 @@ export async function invoke(route, request, platform, url) {
 `
     );
   } else {
+    writer.indent = 3;
     writer.writeBlockEnd("}");
   }
   writer.indent--;
   writer.writeBlockStart(`} catch (error) {`);
   if (routes.special[RoutableFileTypes.Error]) {
+    imports.writeLines(`
+const page500ResponseInit = {
+  status: 404,
+  headers: { "content-type": "text/html;charset=UTF-8" },
+};`);
     writer.writeBlockStart(
       `if (context.request.headers.get('Accept')?.includes('text/html')) {`
     ).writeLines(
@@ -825,7 +829,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
     if (terminal || (dynamic == null ? void 0 : dynamic.route)) {
       closeCount++;
       writer.writeBlockStart(`if (!${index} || ${index} === len) {`);
-      let value = `pathname.slice(${offset}, ${index} ? -1 : len)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} ? -1 : len))`;
       if (dynamic == null ? void 0 : dynamic.route) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -864,7 +868,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         writer.writeBlockStart(`if (${index} && ${index} !== len) {`);
         closeCount++;
       }
-      let value = `pathname.slice(${offset}, ${index} - 1)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} - 1))`;
       if ((dynamic == null ? void 0 : dynamic.static) || (dynamic == null ? void 0 : dynamic.dynamic)) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -876,11 +880,12 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
           writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
         }
         for (const child of children) {
+          const decodedKey = decodeURIComponent(child.key);
           if (useSwitch) {
-            writer.writeBlockStart(`case '${child.key}': {`);
+            writer.writeBlockStart(`case '${decodedKey}': {`);
           } else {
             writer.writeBlockStart(
-              `if (${value}.toLowerCase() === '${child.key}') {`
+              `if (${value}.toLowerCase() === '${decodedKey}') {`
             );
           }
           const nextOffset = typeof offset === "string" ? index : offset + child.key.length + 1;
@@ -910,6 +915,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
   }
 }
 function wrapPropertyName(name) {
+  name = decodeURIComponent(name);
   return /^[^A-Za-z_$]|[^A-Za-z0-9$_]/.test(name) ? `'${name}'` : name;
 }
 function renderParamsInfo(params, pathIndex) {
@@ -922,7 +928,7 @@ function renderParamsInfo(params, pathIndex) {
   for (const { name, index } of params) {
     if (index >= 0) {
       result += `${sep} ${wrapPropertyName(name)}: s${index + 1}`;
-      sep || (sep = ",");
+      sep = ",";
     } else if (pathIndex) {
       catchAll = name;
     }
@@ -1010,7 +1016,10 @@ interface NoMeta {}
     const routeType = `Route${route.index}`;
     const pathType = `\`${route.path.replace(
       /\/\$(\$?)([^\/]*)/,
-      (_, catchAll, name) => catchAll ? `/:${name || "rest"}*` : `/:${name}`
+      (_, catchAll, name) => {
+        name = decodeURIComponent(name);
+        return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
+      }
     )}\``;
     const paramsType = (params == null ? void 0 : params.length) ? renderParamsInfoType(params) : "NoParams";
     let metaType = "NoMeta";
@@ -1018,10 +1027,10 @@ interface NoMeta {}
       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 path3 = route.path.replace(/\$(\$?)([^/]+)/g, (_, catchAll, name) => {
+          name = decodeURIComponent(name);
+          return catchAll ? `\${...${name}}` : `\${${name}}`;
+        });
         const splatIndex = path3.indexOf("/${...");
         if (splatIndex >= 0) {
           const path22 = path3.slice(0, splatIndex) || "/";
@@ -1232,9 +1241,9 @@ function getExportIdentifiers(astProgramNode) {
 }
 
 // src/vite/utils/log.ts
+var import_node_zlib = __toESM(require("node:zlib"), 1);
 var import_cli_table3 = __toESM(require("cli-table3"), 1);
 var import_kleur = __toESM(require("kleur"), 1);
-var import_gzip_size = require("gzip-size");
 var import_human_format = __toESM(require("human-format"), 1);
 var HttpVerbColors = {
   get: import_kleur.default.green,
@@ -1320,17 +1329,20 @@ function computeRouteSize(route, bundle) {
   }
   return [0, 0];
 }
-function byteSize(str) {
-  return new Blob([str]).size;
+function gzipSize(source) {
+  return import_node_zlib.default.gzipSync(source, { level: 9 }).length;
+}
+function byteSize(source) {
+  return new Blob([source]).size;
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
     return [
       byteSize(chunk.source),
-      (0, import_gzip_size.gzipSizeSync)(chunk.source)
+      gzipSize(chunk.source)
     ];
   }
-  const size = [byteSize(chunk.code), (0, import_gzip_size.gzipSizeSync)(chunk.code)];
+  const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
     if (!seen.has(id)) {
       const [bytes, compBytes] = computeChunkSize(bundle[id], bundle, seen);
@@ -1420,7 +1432,7 @@ function markoRun(opts = {}) {
       const filepath = import_path2.default.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        import_path2.default.relative(typesDir, routesDir),
+        import_path2.default.relative(typesDir, resolvedRoutesDir),
         adapter
       );
       if (data !== typesFile || !import_fs2.default.existsSync(filepath)) {
@@ -1515,7 +1527,7 @@ function markoRun(opts = {}) {
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         compiler.taglib.register("@marko/run", {
           "<*>": {
-            template: import_path2.default.resolve(
+            transform: import_path2.default.resolve(
               __dirname,
               "../components/src-attributes-transformer.cjs"
             )
@@ -1533,6 +1545,9 @@ function markoRun(opts = {}) {
           define: isBuild ? {
             "process.env.NODE_ENV": "'production'"
           } : void 0,
+          ssr: {
+            noExternal: /@marko\/run/
+          },
           build: {
             emptyOutDir: isSSRBuild
           }
@@ -1770,7 +1785,8 @@ async function resolveAdapter(root, options, log) {
   if (adapter !== void 0) {
     return adapter;
   }
-  const pkg = (0, import_vite.resolvePackageData)(".", root);
+  const { resolvePackageData } = await import("vite");
+  const pkg = resolvePackageData(".", root);
   if (pkg) {
     const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
     for (const name of Object.keys(dependecies)) {
@@ -1805,14 +1821,14 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   (0, import_dotenv.config)({ path: envFile });
 }
-async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = import_child_process.default.spawn(cmd, {
+  const proc = import_child_process.default.spawn(cmd, args, {
     cwd,
     shell: true,
     stdio: "inherit",
@@ -1823,22 +1839,29 @@ async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   while (!await isPortInUse(port)) {
     if (remaining >= 100) {
       remaining -= 100;
       await sleep(100);
     } else {
-      close();
       throw new Error(
         `site-write: timeout while wating for server to start on port "${port}".`
       );
     }
   }
-  return {
-    port,
-    close
-  };
 }
 async function isPortInUse(port) {
   return new Promise((resolve) => {

package/dist/vite/index.js

@@ -3,7 +3,7 @@ import path2 from "path";
 import crypto from "crypto";
 import fs2 from "fs";
 import glob from "glob";
-import { mergeConfig, resolvePackageData } from "vite";
+import { mergeConfig } from "vite";
 import markoVitePlugin, { FileStore } from "@marko/vite";
 
 // src/vite/constants.ts
@@ -643,17 +643,7 @@ function renderRouter(routes, options = {
       `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
     );
   }
-  writer.writeLines(
-    `
-const page404ResponseInit = {
-  status: 404,
-  headers: { "content-type": "text/html;charset=UTF-8" },
-};
-const page500ResponseInit = {
-  status: 404,
-  headers: { "content-type": "text/html;charset=UTF-8" },
-};`
-  ).writeBlockStart(`export function match(method, pathname) {`).writeLines(
+  writer.writeLines("").writeBlockStart(`export function match(method, pathname) {`).writeLines(
     `if (!pathname) {
     pathname = '/';
   } else if (pathname.charAt(0) !== '/') {
@@ -685,8 +675,16 @@ export async function invoke(route, request, platform, url) {
 					throw error;
 				}
 			}
-`).indent = 2;
+`);
   if (routes.special[RoutableFileTypes.NotFound]) {
+    writer.indent = 2;
+    imports.writeLines(
+      `
+const page404ResponseInit = {
+  status: 404,
+  headers: { "content-type": "text/html;charset=UTF-8" },
+};`
+    );
     writer.write(
       `    } else {
     }
@@ -696,11 +694,17 @@ export async function invoke(route, request, platform, url) {
 `
     );
   } else {
+    writer.indent = 3;
     writer.writeBlockEnd("}");
   }
   writer.indent--;
   writer.writeBlockStart(`} catch (error) {`);
   if (routes.special[RoutableFileTypes.Error]) {
+    imports.writeLines(`
+const page500ResponseInit = {
+  status: 404,
+  headers: { "content-type": "text/html;charset=UTF-8" },
+};`);
     writer.writeBlockStart(
       `if (context.request.headers.get('Accept')?.includes('text/html')) {`
     ).writeLines(
@@ -788,7 +792,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
     if (terminal || (dynamic == null ? void 0 : dynamic.route)) {
       closeCount++;
       writer.writeBlockStart(`if (!${index} || ${index} === len) {`);
-      let value = `pathname.slice(${offset}, ${index} ? -1 : len)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} ? -1 : len))`;
       if (dynamic == null ? void 0 : dynamic.route) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -827,7 +831,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
         writer.writeBlockStart(`if (${index} && ${index} !== len) {`);
         closeCount++;
       }
-      let value = `pathname.slice(${offset}, ${index} - 1)`;
+      let value = `decodeURIComponent(pathname.slice(${offset}, ${index} - 1))`;
       if ((dynamic == null ? void 0 : dynamic.static) || (dynamic == null ? void 0 : dynamic.dynamic)) {
         const segment = `s${next}`;
         writer.writeLines(`const ${segment} = ${value};`);
@@ -839,11 +843,12 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
           writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
         }
         for (const child of children) {
+          const decodedKey = decodeURIComponent(child.key);
           if (useSwitch) {
-            writer.writeBlockStart(`case '${child.key}': {`);
+            writer.writeBlockStart(`case '${decodedKey}': {`);
           } else {
             writer.writeBlockStart(
-              `if (${value}.toLowerCase() === '${child.key}') {`
+              `if (${value}.toLowerCase() === '${decodedKey}') {`
             );
           }
           const nextOffset = typeof offset === "string" ? index : offset + child.key.length + 1;
@@ -873,6 +878,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
   }
 }
 function wrapPropertyName(name) {
+  name = decodeURIComponent(name);
   return /^[^A-Za-z_$]|[^A-Za-z0-9$_]/.test(name) ? `'${name}'` : name;
 }
 function renderParamsInfo(params, pathIndex) {
@@ -885,7 +891,7 @@ function renderParamsInfo(params, pathIndex) {
   for (const { name, index } of params) {
     if (index >= 0) {
       result += `${sep} ${wrapPropertyName(name)}: s${index + 1}`;
-      sep || (sep = ",");
+      sep = ",";
     } else if (pathIndex) {
       catchAll = name;
     }
@@ -973,7 +979,10 @@ interface NoMeta {}
     const routeType = `Route${route.index}`;
     const pathType = `\`${route.path.replace(
       /\/\$(\$?)([^\/]*)/,
-      (_, catchAll, name) => catchAll ? `/:${name || "rest"}*` : `/:${name}`
+      (_, catchAll, name) => {
+        name = decodeURIComponent(name);
+        return catchAll ? `/:${name || "rest"}*` : `/:${name}`;
+      }
     )}\``;
     const paramsType = (params == null ? void 0 : params.length) ? renderParamsInfoType(params) : "NoParams";
     let metaType = "NoMeta";
@@ -981,10 +990,10 @@ interface NoMeta {}
       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 path3 = route.path.replace(/\$(\$?)([^/]+)/g, (_, catchAll, name) => {
+          name = decodeURIComponent(name);
+          return catchAll ? `\${...${name}}` : `\${${name}}`;
+        });
         const splatIndex = path3.indexOf("/${...");
         if (splatIndex >= 0) {
           const path22 = path3.slice(0, splatIndex) || "/";
@@ -1195,9 +1204,9 @@ function getExportIdentifiers(astProgramNode) {
 }
 
 // src/vite/utils/log.ts
+import zlib from "node:zlib";
 import Table from "cli-table3";
 import kleur from "kleur";
-import { gzipSizeSync } from "gzip-size";
 import format from "human-format";
 var HttpVerbColors = {
   get: kleur.green,
@@ -1283,17 +1292,20 @@ function computeRouteSize(route, bundle) {
   }
   return [0, 0];
 }
-function byteSize(str) {
-  return new Blob([str]).size;
+function gzipSize(source) {
+  return zlib.gzipSync(source, { level: 9 }).length;
+}
+function byteSize(source) {
+  return new Blob([source]).size;
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
     return [
       byteSize(chunk.source),
-      gzipSizeSync(chunk.source)
+      gzipSize(chunk.source)
     ];
   }
-  const size = [byteSize(chunk.code), gzipSizeSync(chunk.code)];
+  const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
     if (!seen.has(id)) {
       const [bytes, compBytes] = computeChunkSize(bundle[id], bundle, seen);
@@ -1382,7 +1394,7 @@ function markoRun(opts = {}) {
       const filepath = path2.join(typesDir, "routes.d.ts");
       const data = await renderRouteTypeInfo(
         routes,
-        path2.relative(typesDir, routesDir),
+        path2.relative(typesDir, resolvedRoutesDir),
         adapter
       );
       if (data !== typesFile || !fs2.existsSync(filepath)) {
@@ -1477,7 +1489,7 @@ function markoRun(opts = {}) {
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         compiler.taglib.register("@marko/run", {
           "<*>": {
-            template: path2.resolve(
+            transform: path2.resolve(
               __dirname,
               "../components/src-attributes-transformer.cjs"
             )
@@ -1495,6 +1507,9 @@ function markoRun(opts = {}) {
           define: isBuild ? {
             "process.env.NODE_ENV": "'production'"
           } : void 0,
+          ssr: {
+            noExternal: /@marko\/run/
+          },
           build: {
             emptyOutDir: isSSRBuild
           }
@@ -1732,6 +1747,7 @@ async function resolveAdapter(root, options, log) {
   if (adapter !== void 0) {
     return adapter;
   }
+  const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
     const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
@@ -1767,14 +1783,14 @@ async function parseEnv(envFile) {
 function loadEnv(envFile) {
   config({ path: envFile });
 }
-async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4) {
+async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), wait = 3e4) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
   if (typeof env === "string") {
     env = await parseEnv(env);
   }
-  const proc = cp.spawn(cmd, {
+  const proc = cp.spawn(cmd, args, {
     cwd,
     shell: true,
     stdio: "inherit",
@@ -1785,22 +1801,29 @@ async function spawnServer(cmd, port = 0, env, cwd = process.cwd(), wait = 3e4)
     proc.unref();
     proc.kill();
   };
+  try {
+    await waitForServer(port, wait);
+  } catch (err) {
+    close();
+    throw err;
+  }
+  return {
+    port,
+    close
+  };
+}
+async function waitForServer(port, wait = 0) {
   let remaining = wait > 0 ? wait : Infinity;
   while (!await isPortInUse(port)) {
     if (remaining >= 100) {
       remaining -= 100;
       await sleep(100);
     } else {
-      close();
       throw new Error(
         `site-write: timeout while wating for server to start on port "${port}".`
       );
     }
   }
-  return {
-    port,
-    close
-  };
 }
 async function isPortInUse(port) {
   return new Promise((resolve) => {

package/dist/vite/types.d.ts

@@ -1,19 +1,31 @@
 import type { RoutableFileType, HttpVerb, RoutableFileTypes } from "./constants";
 import type { Options as MarkoViteOptions } from "@marko/vite";
-import type { ResolvedConfig, UserConfig } from "vite";
+import type { ResolvedConfig, UserConfig, InlineConfig } from "vite";
+import type { SpawnedServer } from "./utils/server";
 export type { RoutableFileType, HttpVerb };
 export type StartServer = (port?: number) => Promise<void>;
 export interface AdapterConfig {
     [name: PropertyKey]: any;
 }
+export interface StartOptions {
+    cwd: string;
+    args: string[];
+    port?: number;
+    envFile?: string;
+}
+export interface StartDevOptions extends StartOptions {
+}
+export interface StartPreviewOptions extends StartOptions {
+    dir: string;
+}
 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;
+    startDev?(config: InlineConfig, options: StartDevOptions): Promise<SpawnedServer> | SpawnedServer;
+    startPreview?(entry: string | undefined, options: StartPreviewOptions): Promise<SpawnedServer> | SpawnedServer;
     buildEnd?(config: ResolvedConfig, routes: Route[], builtEntries: string[], sourceEntries: string[]): Promise<void> | void;
     typeInfo?(writer: (data: string) => void): Promise<string> | string;
 }

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

@@ -1,9 +1,10 @@
 export interface SpawnedServer {
     port: number;
-    close(): void;
+    close(): Promise<void> | void;
 }
 export declare function parseEnv(envFile: string): Promise<import("dotenv").DotenvParseOutput | undefined>;
 export declare function loadEnv(envFile: string): void;
-export declare function spawnServer(cmd: string, port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
+export declare function spawnServer(cmd: string, args?: string[], port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
+export declare function waitForServer(port: number, wait?: number): Promise<void>;
 export declare function isPortInUse(port: number): Promise<boolean>;
 export declare function getAvailablePort(): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -20,11 +20,10 @@
     "marko-run": "./dist/cli/index.mjs"
   },
   "scripts": {
-    "mocha": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
-    "test": "npm run mocha",
-    "test:watch": "npm run mocha -- --watch",
+    "test": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.ts\"",
+    "test:watch": "npm test -- --watch",
     "test:inspect": "npm test -- --inspect",
-    "test:update": "npm run mocha -- --update",
+    "test:update": "npm test -- --update",
     "build": "tsc -b && tsx scripts/build.ts"
   },
   "exports": {
@@ -83,17 +82,26 @@
   },
   "devDependencies": {
     "@babel/types": "^7.19.0",
+    "@marko/fixture-snapshots": "^2.1.7",
+    "@marko/testing-library": "^6.1.2",
     "@types/glob": "^8.0.1",
     "@types/human-format": "^1.0.0",
+    "@types/jsdom": "^21.1.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.11.18",
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
+    "jsdom": "^21.1.1",
     "marko": "^5.23.0",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "mocha-snap": "^4.3.0",
+    "playwright": "^1.29.1",
     "prettier": "^2.7.1",
+    "ts-mocha": "^10.0.0",
+    "ts-node": "^10.9.1",
+    "tslib": "^2.5.0",
+    "tsm": "^2.3.0",
     "tsx": "^3.9.0",
     "typescript": "^4.7.4"
   },
@@ -103,9 +111,9 @@
     "compression": "^1.7.4",
     "dotenv": "^16.0.3",
     "glob": "^8.1.0",
-    "gzip-size": "^7.0.0",
     "human-format": "^1.0.0",
     "kleur": "^4.1.5",
+    "parse-node-args": "^1.1.2",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "strip-ansi": "^7.0.1",