@marko/run 0.2.8 → 0.2.10

package/dist/adapter/index.js

@@ -1,5 +1,6 @@
 // src/adapter/index.ts
 import path from "path";
+import fs2 from "fs";
 import { fileURLToPath } from "url";
 
 // src/adapter/dev-server.ts
@@ -263,8 +264,7 @@ async function createDevServer(config2) {
     (request, platform) => globalThis.__marko_run__.fetch(request, platform)
   );
   devServer.middlewares.use(async (req, res, next) => {
-    await devServer.ssrLoadModule("@marko/run/router");
-    routerMiddleware(req, res, (err) => {
+    function handleError(err) {
       if (err) {
         res.statusCode = 500;
         if (err instanceof Error) {
@@ -276,7 +276,13 @@ async function createDevServer(config2) {
       } else {
         next == null ? void 0 : next();
       }
-    });
+    }
+    try {
+      await devServer.ssrLoadModule("@marko/run/router");
+    } catch (err) {
+      return handleError(err);
+    }
+    routerMiddleware(req, res, handleError);
   });
   return devServer;
 }
@@ -351,16 +357,22 @@ function getDevGlobal() {
 // src/adapter/utils.ts
 import supporsColor from "supports-color";
 import kleur from "kleur";
-function logInfoBox(address) {
+function logInfoBox(address, explorer) {
   const color = !!supporsColor.stdout;
   let message = kleur.bold("Marko Run");
   if (true) {
-    message += ` v${"0.2.8"}`;
+    message += ` v${"0.2.10"}`;
   }
   message += "\n\n";
   message += kleur.dim("Server listening at");
   message += "\n";
   message += kleur.cyan(kleur.underline(address));
+  if (explorer) {
+    message += "\n\n";
+    message += kleur.dim("Explore your routes");
+    message += "\n";
+    message += kleur.dim(kleur.green(kleur.underline(explorer)));
+  }
   const lines = drawMarkoBox(message, { color, fill: color });
   console.log(lines.join("\n"));
 }
@@ -380,7 +392,7 @@ function drawMarkoBox(message, options) {
   const hBorder = "\u2500".repeat(width);
   const vBorder = "\u2502";
   const lineDiff = logo.lines.length - textLines.length;
-  const textStartLine = lineDiff > 0 ? Math.floor(lineDiff / 2) : 1;
+  const textStartLine = lineDiff > 0 ? Math.max(Math.floor(lineDiff / 2), 1) : 1;
   const textEndLine = height - (lineDiff > 0 ? Math.ceil(lineDiff / 2) : 1);
   const logoEndLine = logo.lines.length;
   const logoFill = " ".repeat(logo.width);
@@ -536,7 +548,7 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     close
   };
 }
-async function spawnServerWorker(module, args = [], port = 0, env) {
+async function spawnServerWorker(module, args = [], port = 0, env, wait = true) {
   if (port <= 0) {
     port = await getAvailablePort();
   }
@@ -549,15 +561,18 @@ async function spawnServerWorker(module, args = [], port = 0, env) {
     cluster.settings.exec = module;
     cluster.settings.execArgv = args;
     const worker = cluster.fork({ ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` });
-    return new Promise((resolve) => {
-      function ready(message) {
-        if (message === "ready") {
-          worker.off("message", ready);
-          resolve(worker);
+    if (wait) {
+      return new Promise((resolve) => {
+        function ready(message) {
+          if (message === "ready") {
+            worker.off("message", ready);
+            resolve(worker);
+          }
         }
-      }
-      worker.on("message", ready);
-    });
+        worker.on("message", ready);
+      });
+    }
+    return worker;
   } finally {
     cluster.settings.exec = originalExec;
     cluster.settings.execArgv = originalArgs;
@@ -632,7 +647,14 @@ function sleep(ms) {
 }
 
 // src/adapter/index.ts
+import { createRequire } from "module";
 import parseNodeArgs from "parse-node-args";
+
+// src/vite/constants.ts
+var markoRunFilePrefix = "__marko-run__";
+var virtualFilePrefix = "virtual:marko-run";
+
+// src/adapter/index.ts
 var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var defaultEntry = path.join(__dirname, "default-entry");
 var loadDevWorker = path.join(__dirname, "load-dev-worker.mjs");
@@ -645,6 +667,7 @@ function adapter() {
     async startDev(entry, config2, options) {
       const { port = 3e3, envFile } = options;
       globalThis.__marko_run_vite_config__ = config2;
+      const explorerPromise = startExplorer();
       if (entry) {
         const { nodeArgs } = parseNodeArgs(options.args);
         let worker;
@@ -675,41 +698,116 @@ function adapter() {
           }
           worker = nextWorker;
         }
-        await start();
+        const [explorer2] = await Promise.all([explorerPromise, start()]);
         return {
           port,
-          close() {
-            worker.kill();
+          async close() {
+            await Promise.all([worker.kill(), explorer2 == null ? void 0 : explorer2.close()]);
           }
         };
       }
       const devServer = await createDevServer(config2);
       envFile && await loadEnv(envFile);
-      return new Promise((resolve) => {
+      const listen = new Promise((resolve) => {
         const listener = devServer.middlewares.listen(port, () => {
-          const address = listener.address();
-          logInfoBox(`http://localhost:${address.port}`);
-          resolve({
-            port,
-            async close() {
-              await devServer.close();
-            }
-          });
+          resolve(listener.address());
         });
       });
+      const [explorer, address] = await Promise.all([explorerPromise, listen]);
+      logInfoBox(
+        `http://localhost:${address.port}`,
+        explorer && `http://localhost:${explorer.port}`
+      );
+      return {
+        port: address.port,
+        async close() {
+          await Promise.all([devServer.close(), explorer == null ? void 0 : explorer.close()]);
+        }
+      };
     },
     async startPreview(entry, options) {
       const { port = 3e3, envFile } = options;
       const { nodeArgs } = parseNodeArgs(options.args);
       const args = [...nodeArgs, entry];
-      const server = await spawnServer("node", args, port, envFile);
+      const [explorer, server] = await Promise.all([
+        startExplorer(),
+        spawnServer("node", args, port, envFile)
+      ]);
       if (!options.sourceEntry) {
-        logInfoBox(`http://localhost:${port}`);
+        logInfoBox(
+          `http://localhost:${port}`,
+          explorer && `http://localhost:${explorer.port}`
+        );
+      }
+      return explorer ? {
+        port: server.port,
+        async close() {
+          await Promise.all([server.close(), explorer.close()]);
+        }
+      } : server;
+    },
+    async routesGenerated(routes, virtualFiles, meta) {
+      if (process.env.MR_EXPLORER !== "true") {
+        return;
+      }
+      const promises = [];
+      const cacheDir = path.resolve(__dirname, "../../.cache/explorer");
+      const codeDir = path.join(cacheDir, "code");
+      if (fs2.existsSync(codeDir)) {
+        await fs2.promises.rm(codeDir, { recursive: true });
+      }
+      await fs2.promises.mkdir(codeDir, { recursive: true });
+      const data = {
+        meta,
+        routes: {},
+        files: {}
+      };
+      for (const [name, code] of virtualFiles) {
+        let fileName = "";
+        let index = name.indexOf(markoRunFilePrefix);
+        if (index >= 0) {
+          fileName = name.slice(index);
+          data.files[fileName] = `${virtualFilePrefix}/${fileName}`;
+        } else if (name.startsWith("@marko/run")) {
+          fileName = name.slice(11);
+          data.files[fileName] = name;
+        }
+        if (fileName) {
+          promises.push(
+            fs2.promises.writeFile(path.join(codeDir, fileName), code, {})
+          );
+        }
+      }
+      for (const route of routes.list) {
+        data.routes[route.index] = route;
+      }
+      for (const [id, route] of Object.entries(routes.special)) {
+        data.routes["s" + id] = route;
       }
-      return server;
+      promises.push(
+        fs2.promises.writeFile(
+          path.join(cacheDir, "data.json"),
+          JSON.stringify(data),
+          {}
+        )
+      );
+      await Promise.all(promises);
     }
   };
 }
+var require2 = createRequire(import.meta.url);
+async function startExplorer() {
+  if (process.env.MR_EXPLORER === "true") {
+    const entry = require2.resolve("@marko/run-explorer");
+    const worker = await spawnServerWorker(entry, [], 1234, void 0, false);
+    return {
+      port: 1234,
+      async close() {
+        worker.kill();
+      }
+    };
+  }
+}
 export {
   createDevServer,
   createViteDevMiddleware,

package/dist/adapter/load-dev-worker.mjs

@@ -18,10 +18,25 @@ async function start(entry, config) {
   const loader = await createServer({
     ...config,
     ssr: { external: ["@marko/run/router"] },
-  })
+  });
 
   await loader.listen(0);
-  await loader.ssrLoadModule(entry);
+  loader.ssrLoadModule(entry).catch((err) => {
+    loader.ssrFixStacktrace(err);
+
+    console.error(err);
+
+    const devGlobal = getDevGlobal();
+    for (const devServer of devGlobal.devServers) {
+      const { message, stack = "" } = err;
+      devServer.ws.send(
+        JSON.stringify({
+          type: "error",
+          err: { message, stack },
+        })
+      );
+    }
+  });
 
   loader.watcher.on("change", (path) => {
     if (!changed && loader.moduleGraph.getModulesByFile(path)) {

package/dist/adapter/utils.d.ts

@@ -1,4 +1,4 @@
-export declare function logInfoBox(address: string): void;
+export declare function logInfoBox(address: string, explorer?: string): void;
 export declare function drawMarkoBox(message: string, options?: LogoOptions): string[];
 export interface LogoOptions {
     fill?: boolean;

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,
@@ -1017,12 +1031,13 @@ globalThis.__marko_run__ = { match, fetch, invoke };
   } else if (pathname.charAt(0) !== '/') {
     pathname = '/' + pathname;
   }`
-  ).writeBlockStart(`switch (method.toLowerCase()) {`);
+  ).writeBlockStart(`switch (method) {`);
   for (const verb of httpVerbs) {
     const filteredRoutes = routes.list.filter((route) => hasVerb(route, verb));
     if (filteredRoutes.length) {
       const trie = createRouteTrie(filteredRoutes);
-      writer.writeBlockStart(`case '${verb}': {`);
+      writer.writeLines(`case '${verb.toUpperCase()}':`);
+      writer.writeBlockStart(`case '${verb.toLowerCase()}': {`);
       writeRouterVerb(writer, trie, verb);
       writer.writeBlockEnd("}");
     }
@@ -1174,13 +1189,14 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
       if (terminal) {
         const useSwitch = terminal.length > 1;
         if (useSwitch) {
-          writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
+          writer.writeBlockStart(`switch (${value}) {`);
         }
         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} === '${decodedKey}') `, true);
           }
           writer.write(
             `return ${renderMatch(verb, route2, path4)}; // ${path4.path}
@@ -1217,7 +1233,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
       if (children) {
         const useSwitch = children.length > 1;
         if (useSwitch) {
-          writer.writeBlockStart(`switch (${value}.toLowerCase()) {`);
+          writer.writeBlockStart(`switch (${value}) {`);
         }
         for (const child of children) {
           const decodedKey = decodeURIComponent(child.key);
@@ -1225,7 +1241,7 @@ function writeRouterVerb(writer, trie, verb, level = 0, offset = 1) {
             writer.writeBlockStart(`case '${decodedKey}': {`);
           } else {
             writer.writeBlockStart(
-              `if (${value}.toLowerCase() === '${decodedKey}') {`
+              `if (${value} === '${decodedKey}') {`
             );
           }
           const nextOffset = typeof offset === "string" ? index : offset + child.key.length + 1;
@@ -1692,6 +1708,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 = "/";
@@ -1751,10 +1769,10 @@ function markoRun(opts = {}) {
         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");
@@ -1800,6 +1818,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));
         }
@@ -2097,7 +2121,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);
         }
       },
@@ -2204,19 +2228,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\.([^.]+)$/;
@@ -2406,7 +2430,9 @@ 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);
@@ -2426,6 +2452,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>