@marko/run 0.2.7 → 0.2.9

package/dist/cli/index.mjs

@@ -403,10 +403,7 @@ function matchRoutableFile(filename) {
 function isSpecialType(type) {
   return type === RoutableFileTypes.NotFound || type === RoutableFileTypes.Error;
 }
-async function buildRoutes(walk, basePath = "") {
-  if (basePath) {
-    basePath = basePath.replace(/^\/+|\/+$/g, "");
-  }
+async function buildRoutes(sources) {
   const uniqueRoutes = /* @__PURE__ */ new Map();
   const routes = [];
   const special = {};
@@ -416,23 +413,30 @@ async function buildRoutes(walk, basePath = "") {
   const currentMiddleware = /* @__PURE__ */ new Set();
   const root = new VDir();
   const dirStack = [];
-  let activeDirs = [root];
+  let basePath;
+  let importPrefix;
+  let activeDirs;
+  let isBaseDir;
   let nextFileId = 1;
   let nextRouteIndex = 1;
-  let isBaseDir = true;
-  await walk({
+  const walkOptions = {
     onEnter({ name }) {
-      if (!name || isBaseDir) {
+      const prevDirStackLength = dirStack.length;
+      if (isBaseDir) {
         isBaseDir = false;
-        return;
+        if (!basePath) {
+          return;
+        }
+        name = basePath;
+      } else {
+        dirStack.push(name);
       }
-      dirStack.push(name);
       const previousDirs = activeDirs;
       const paths = parseFlatRoute(name);
       activeDirs = VDir.addPaths(previousDirs, paths);
       return () => {
         activeDirs = previousDirs;
-        dirStack.pop();
+        dirStack.length = prevDirStackLength;
       };
     },
     onFile({ name, path: path4 }) {
@@ -460,14 +464,24 @@ async function buildRoutes(walk, basePath = "") {
         type,
         filePath: path4,
         relativePath,
-        importPath: `${basePath}/${relativePath}`,
+        importPath: `${importPrefix}/${relativePath}`,
         verbs: type === RoutableFileTypes.Page ? ["get"] : void 0
       };
       for (const dir of dirs) {
         dir.addFile(file);
       }
     }
-  });
+  };
+  if (!Array.isArray(sources)) {
+    sources = [sources];
+  }
+  for (const source of sources) {
+    importPrefix = source.importPrefix ? source.importPrefix.replace(/^\/+|\/+$/g, "") : "";
+    basePath = source.basePath || "";
+    activeDirs = [root];
+    isBaseDir = true;
+    await source.walker(walkOptions);
+  }
   traverse(root);
   return {
     list: routes,
@@ -1115,10 +1129,18 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const body = import.meta.env.DEV
-      ? error.stack || error.message || "Internal Server Error"
-      : null;
-    return new Response(body, {
+    if (import.meta.env.DEV) {
+      let body;
+      if (error.cause) {
+        body = error.cause.stack || error.cause.message || error.cause;
+      } else {
+        body = error.stack || error.message || "Internal Server Error";
+      }
+      return new Response(body, {
+        status: 500
+      });
+    }
+    return new Response(null, {
       status: 500
     });
   }
@@ -1169,10 +1191,11 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
           writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
         }
         for (const { key, path: path4, route: route2 } of terminal) {
+          const decodedKey = decodeURIComponent(key);
           if (useSwitch) {
-            writer.write(`case '${key}': `, true);
+            writer.write(`case '${decodedKey}': `, true);
           } else {
-            writer.write(`if (${value}.toLowerCase() === '${key}') `, true);
+            writer.write(`if (${value}.toLowerCase() === '${decodedKey}') `, true);
           }
           writer.write(
             `return ${renderMatch(verb, route2, path4)}; // ${path4.path}
@@ -1611,7 +1634,9 @@ function logRoutesTable(routes, bundle, options) {
           entryType.push(kleur.yellow("page"));
           size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
-        const row = [kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))];
+        const row = [
+          kleur.bold(HttpVerbColors[verb](verb.toUpperCase()))
+        ];
         if (verbs.length === 1 || firstRow) {
           row.push({ rowSpan: verbs.length, content: prettyPath(path4.path) });
           firstRow = false;
@@ -1649,10 +1674,7 @@ function byteSize(source) {
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
-    return [
-      byteSize(chunk.source),
-      gzipSize(chunk.source)
-    ];
+    return [byteSize(chunk.source), gzipSize(chunk.source)];
   }
   const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
@@ -1685,6 +1707,8 @@ function prettyPath(path4) {
 }
 
 // src/vite/plugin.ts
+import createDebug from "debug";
+var debug = createDebug("@marko/run");
 var __dirname = path2.dirname(fileURLToPath(import.meta.url));
 var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
@@ -1739,17 +1763,15 @@ function markoRun(opts = {}) {
     const routerOptions = {
       trailingSlashes: opts.trailingSlashes || "RedirectWithout"
     };
-    if (!render) {
-      virtualFiles.clear();
-      isRendered = false;
-    }
     try {
       if (isStale) {
+        virtualFiles.clear();
+        isRendered = false;
         const buildStartTime = performance.now();
-        routes = await buildRoutes(
-          createFSWalker(resolvedRoutesDir),
-          routesDir
-        );
+        routes = await buildRoutes({
+          walker: createFSWalker(resolvedRoutesDir),
+          importPrefix: routesDir
+        });
         times.routesBuild = performance.now() - buildStartTime;
         if (!routes.list.length) {
           throw new Error("No routes generated");
@@ -1795,6 +1817,12 @@ function markoRun(opts = {}) {
       times.routesRender = performance.now() - renderStartTime;
       if (render) {
         await writeTypesFile(routes);
+        if (adapter == null ? void 0 : adapter.routesGenerated) {
+          await adapter.routesGenerated(routes, new Map(virtualFiles.entries()), {
+            buildTime: times.routesBuild,
+            renderTime: times.routesRender
+          });
+        }
         if (!isBuild) {
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
         }
@@ -2035,13 +2063,10 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           resolved = importee;
         } else if (virtualFilePath) {
-          const resolution = await this.resolve(
-            path2.resolve(__dirname, "..", virtualFilePath),
-            importer,
-            {
-              skipSelf: true
-            }
-          );
+          const filePath = path2.resolve(__dirname, "..", virtualFilePath);
+          const resolution = await this.resolve(filePath, importer, {
+            skipSelf: true
+          });
           return resolution;
         }
         return resolved || null;
@@ -2051,7 +2076,7 @@ function markoRun(opts = {}) {
           id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
-          if (!isRendered) {
+          if (isStale || !isRendered) {
             await buildVirtualFiles(true);
           }
           return virtualFiles.get(id);
@@ -2095,7 +2120,7 @@ function markoRun(opts = {}) {
           }
           await store.set(routeDataFilename, JSON.stringify(routeData));
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
-        } else {
+        } else if (process.env.MR_EXPLORER !== "true") {
           logRoutesTable(routes, bundle, options);
         }
       },
@@ -2202,19 +2227,19 @@ async function resolveAdapter(root, options, log) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
-          log && console.log(
+          log && debug(
             `Using adapter ${name} listed in your package.json dependecies`
           );
           return module2.default();
         } catch (err) {
-          log && console.warn(`Attempt to use package '${name}' failed`, err);
+          log && debug(`Attempt to use package '${name}' failed %O`, err);
         }
       }
     }
   }
   const defaultAdapter = "@marko/run/adapter";
   const module = await import(defaultAdapter);
-  log && console.log("Using default adapter");
+  log && debug("Using default adapter");
   return module.default();
 }
 var markoEntryFileRegex = /__marko-run__([^.]+)\.(.+)\.marko\.([^.]+)$/;
@@ -2233,7 +2258,7 @@ var __dirname2 = path3.dirname(fileURLToPath2(import.meta.url));
 var defaultPort = Number(process.env.PORT || 3e3);
 var defaultConfigFileBases = ["serve.config", "vite.config"];
 var defaultConfigFileExts = [".js", ".cjs", ".mjs", ".ts", ".mts"];
-async function preview(entry, cwd, configFile, port, outDir, envFile, args = []) {
+async function preview(sourceEntry, entry, cwd, configFile, port, outDir, envFile, args = []) {
   const resolvedConfig = await resolveConfig(
     { root: cwd, configFile, logLevel: "silent", build: { outDir } },
     "serve"
@@ -2257,7 +2282,8 @@ async function preview(entry, cwd, configFile, port, outDir, envFile, args = [])
     dir,
     args,
     port: availablePort,
-    envFile
+    envFile,
+    sourceEntry
   };
   return await adapter.startPreview(entryFile, options);
 }
@@ -2403,12 +2429,15 @@ prog.command("preview [entry]").describe("Start a production-like server for alr
   "-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) => {
+  var _a;
   process.env.NODE_ENV = "production";
+  (_a = process.env).MR_EXPLORER ?? (_a.MR_EXPLORER = "true");
   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(
+    entry,
     opts.file,
     cwd,
     config2,
@@ -2422,6 +2451,8 @@ prog.command("dev [entry]", "", { default: true }).describe("Start development s
   "-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) => {
+  var _a;
+  (_a = process.env).MR_EXPLORER ?? (_a.MR_EXPLORER = "true");
   const cwd = process.cwd();
   const args = process.argv.slice(entry ? 4 : 3);
   const config2 = await getViteConfig(cwd, opts.config);

package/dist/components/routes-explorer/+layout.marko

@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta
+      name="description"
+      content="Marko Run route explorer"
+    >
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Explore your routes</title>
+  </head>
+  <body>
+    <h2>Marko Run Route Explorer</h2>
+    <hr/>
+    <${input.renderBody} />
+  </body>
+</html>

package/dist/components/routes-explorer/+page.marko

@@ -0,0 +1 @@
+<h1>Hello World!!</h1>

package/dist/runtime/index.d.ts

@@ -1,7 +1,9 @@
+import { InlineConfig } from "vite";
 import { NotHandled, NotMatched } from "./namespace";
 import type { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, HandlerTypeFn, RuntimeModule, AnyRoute, AnyContext, AnyHandler } from "./types";
 declare global {
     var __marko_run__: RuntimeModule;
+    var __marko_run_vite_config__: InlineConfig | undefined;
     namespace MarkoRun {
         export const route: HandlerTypeFn;
         export { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, NotHandled, NotMatched, AnyRoute as Route, AnyContext as Context, AnyHandler as Handler, };

package/dist/vite/index.cjs

@@ -388,10 +388,7 @@ function matchRoutableFile(filename) {
 function isSpecialType(type) {
   return type === RoutableFileTypes.NotFound || type === RoutableFileTypes.Error;
 }
-async function buildRoutes(walk, basePath = "") {
-  if (basePath) {
-    basePath = basePath.replace(/^\/+|\/+$/g, "");
-  }
+async function buildRoutes(sources) {
   const uniqueRoutes = /* @__PURE__ */ new Map();
   const routes = [];
   const special = {};
@@ -401,23 +398,30 @@ async function buildRoutes(walk, basePath = "") {
   const currentMiddleware = /* @__PURE__ */ new Set();
   const root = new VDir();
   const dirStack = [];
-  let activeDirs = [root];
+  let basePath;
+  let importPrefix;
+  let activeDirs;
+  let isBaseDir;
   let nextFileId = 1;
   let nextRouteIndex = 1;
-  let isBaseDir = true;
-  await walk({
+  const walkOptions = {
     onEnter({ name }) {
-      if (!name || isBaseDir) {
+      const prevDirStackLength = dirStack.length;
+      if (isBaseDir) {
         isBaseDir = false;
-        return;
+        if (!basePath) {
+          return;
+        }
+        name = basePath;
+      } else {
+        dirStack.push(name);
       }
-      dirStack.push(name);
       const previousDirs = activeDirs;
       const paths = parseFlatRoute(name);
       activeDirs = VDir.addPaths(previousDirs, paths);
       return () => {
         activeDirs = previousDirs;
-        dirStack.pop();
+        dirStack.length = prevDirStackLength;
       };
     },
     onFile({ name, path: path3 }) {
@@ -445,14 +449,24 @@ async function buildRoutes(walk, basePath = "") {
         type,
         filePath: path3,
         relativePath,
-        importPath: `${basePath}/${relativePath}`,
+        importPath: `${importPrefix}/${relativePath}`,
         verbs: type === RoutableFileTypes.Page ? ["get"] : void 0
       };
       for (const dir of dirs) {
         dir.addFile(file);
       }
     }
-  });
+  };
+  if (!Array.isArray(sources)) {
+    sources = [sources];
+  }
+  for (const source of sources) {
+    importPrefix = source.importPrefix ? source.importPrefix.replace(/^\/+|\/+$/g, "") : "";
+    basePath = source.basePath || "";
+    activeDirs = [root];
+    isBaseDir = true;
+    await source.walker(walkOptions);
+  }
   traverse(root);
   return {
     list: routes,
@@ -1100,10 +1114,18 @@ export async function fetch(request, platform) {
     const route = match(request.method, pathname);
     return await invoke(route, request, platform, url);
   } catch (error) {
-    const body = import.meta.env.DEV
-      ? error.stack || error.message || "Internal Server Error"
-      : null;
-    return new Response(body, {
+    if (import.meta.env.DEV) {
+      let body;
+      if (error.cause) {
+        body = error.cause.stack || error.cause.message || error.cause;
+      } else {
+        body = error.stack || error.message || "Internal Server Error";
+      }
+      return new Response(body, {
+        status: 500
+      });
+    }
+    return new Response(null, {
       status: 500
     });
   }
@@ -1154,10 +1176,11 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
           writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
         }
         for (const { key, path: path3, route: route2 } of terminal) {
+          const decodedKey = decodeURIComponent(key);
           if (useSwitch) {
-            writer.write(`case '${key}': `, true);
+            writer.write(`case '${decodedKey}': `, true);
           } else {
-            writer.write(`if (${value}.toLowerCase() === '${key}') `, true);
+            writer.write(`if (${value}.toLowerCase() === '${decodedKey}') `, true);
           }
           writer.write(
             `return ${renderMatch(verb, route2, path3)}; // ${path3.path}
@@ -1596,7 +1619,9 @@ function logRoutesTable(routes, bundle, options) {
           entryType.push(import_kleur.default.yellow("page"));
           size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
         }
-        const row = [import_kleur.default.bold(HttpVerbColors[verb](verb.toUpperCase()))];
+        const row = [
+          import_kleur.default.bold(HttpVerbColors[verb](verb.toUpperCase()))
+        ];
         if (verbs.length === 1 || firstRow) {
           row.push({ rowSpan: verbs.length, content: prettyPath(path3.path) });
           firstRow = false;
@@ -1634,10 +1659,7 @@ function byteSize(source) {
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
-    return [
-      byteSize(chunk.source),
-      gzipSize(chunk.source)
-    ];
+    return [byteSize(chunk.source), gzipSize(chunk.source)];
   }
   const size = [byteSize(chunk.code), gzipSize(chunk.code)];
   for (const id of chunk.imports) {
@@ -1684,6 +1706,8 @@ var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, Plug
 var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterConfigKey);
 
 // src/vite/plugin.ts
+var import_debug = __toESM(require("debug"), 1);
+var debug = (0, import_debug.default)("@marko/run");
 var __dirname = import_path2.default.dirname((0, import_url2.fileURLToPath)(__importMetaURL));
 var PLUGIN_NAME_PREFIX = "marko-run-vite";
 var POSIX_SEP = "/";
@@ -1738,17 +1762,15 @@ function markoRun(opts = {}) {
     const routerOptions = {
       trailingSlashes: opts.trailingSlashes || "RedirectWithout"
     };
-    if (!render) {
-      virtualFiles.clear();
-      isRendered = false;
-    }
     try {
       if (isStale) {
+        virtualFiles.clear();
+        isRendered = false;
         const buildStartTime = performance.now();
-        routes = await buildRoutes(
-          createFSWalker(resolvedRoutesDir),
-          routesDir
-        );
+        routes = await buildRoutes({
+          walker: createFSWalker(resolvedRoutesDir),
+          importPrefix: routesDir
+        });
         times.routesBuild = performance.now() - buildStartTime;
         if (!routes.list.length) {
           throw new Error("No routes generated");
@@ -1794,6 +1816,12 @@ function markoRun(opts = {}) {
       times.routesRender = performance.now() - renderStartTime;
       if (render) {
         await writeTypesFile(routes);
+        if (adapter == null ? void 0 : adapter.routesGenerated) {
+          await adapter.routesGenerated(routes, new Map(virtualFiles.entries()), {
+            buildTime: times.routesBuild,
+            renderTime: times.routesRender
+          });
+        }
         if (!isBuild) {
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
         }
@@ -2034,13 +2062,10 @@ function markoRun(opts = {}) {
         if (virtualFiles.has(importee)) {
           resolved = importee;
         } else if (virtualFilePath) {
-          const resolution = await this.resolve(
-            import_path2.default.resolve(__dirname, "..", virtualFilePath),
-            importer,
-            {
-              skipSelf: true
-            }
-          );
+          const filePath = import_path2.default.resolve(__dirname, "..", virtualFilePath);
+          const resolution = await this.resolve(filePath, importer, {
+            skipSelf: true
+          });
           return resolution;
         }
         return resolved || null;
@@ -2050,7 +2075,7 @@ function markoRun(opts = {}) {
           id = id.slice(0, -serverEntryQuery.length);
         }
         if (virtualFiles.has(id)) {
-          if (!isRendered) {
+          if (isStale || !isRendered) {
             await buildVirtualFiles(true);
           }
           return virtualFiles.get(id);
@@ -2094,7 +2119,7 @@ function markoRun(opts = {}) {
           }
           await store.set(routeDataFilename, JSON.stringify(routeData));
           await ((_a = opts == null ? void 0 : opts.emitRoutes) == null ? void 0 : _a.call(opts, routes.list));
-        } else {
+        } else if (process.env.MR_EXPLORER !== "true") {
           logRoutesTable(routes, bundle, options);
         }
       },
@@ -2201,19 +2226,19 @@ async function resolveAdapter(root, options, log) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module3 = await import(name);
-          log && console.log(
+          log && debug(
             `Using adapter ${name} listed in your package.json dependecies`
           );
           return module3.default();
         } catch (err) {
-          log && console.warn(`Attempt to use package '${name}' failed`, err);
+          log && debug(`Attempt to use package '${name}' failed %O`, err);
         }
       }
     }
   }
   const defaultAdapter = "@marko/run/adapter";
   const module2 = await import(defaultAdapter);
-  log && console.log("Using default adapter");
+  log && debug("Using default adapter");
   return module2.default();
 }
 var markoEntryFileRegex = /__marko-run__([^.]+)\.(.+)\.marko\.([^.]+)$/;

package/dist/vite/index.d.ts

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