@marko/run 0.2.7 → 0.2.9

package/dist/vite/index.js

@@ -344,10 +344,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 = {};
@@ -357,23 +354,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 }) {
@@ -401,14 +405,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,
@@ -1056,10 +1070,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
     });
   }
@@ -1110,10 +1132,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}
@@ -1552,7 +1575,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(path3.path) });
           firstRow = false;
@@ -1590,10 +1615,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) {
@@ -1640,6 +1662,8 @@ var setExternalPluginOptions = (viteConfig, value) => setConfig(viteConfig, Plug
 var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterConfigKey);
 
 // 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 = "/";
@@ -1694,17 +1718,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");
@@ -1750,6 +1772,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));
         }
@@ -1990,13 +2018,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;
@@ -2006,7 +2031,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);
@@ -2050,7 +2075,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);
         }
       },
@@ -2157,19 +2182,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\.([^.]+)$/;

package/dist/vite/routes/builder.d.ts

@@ -3,4 +3,9 @@ import type { Walker } from "./walk";
 export declare function isRoutableFile(filename: string): boolean;
 export declare function matchRoutableFile(filename: string): RoutableFileType | null;
 export declare function isSpecialType(type: RoutableFileType): type is keyof SpecialRoutes;
-export declare function buildRoutes(walk: Walker, basePath?: string): Promise<BuiltRoutes>;
+export interface RouteSource {
+    walker: Walker;
+    importPrefix?: string;
+    basePath?: string;
+}
+export declare function buildRoutes(sources: RouteSource | RouteSource[]): Promise<BuiltRoutes>;

package/dist/vite/types.d.ts

@@ -19,6 +19,7 @@ export interface StartDevOptions extends StartOptions {
 }
 export interface StartPreviewOptions extends StartOptions {
     dir: string;
+    sourceEntry?: string;
 }
 export interface Adapter {
     readonly name: string;
@@ -30,6 +31,7 @@ export interface Adapter {
     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;
+    routesGenerated?(routes: BuiltRoutes, virtualFiles: Map<string, string>, data: RouteGenerationData): Promise<void> | void;
 }
 export interface RouterOptions {
     trailingSlashes: "Ignore" | "RedirectWithout" | "RedirectWith" | "RewriteWithout" | "RewriteWith";
@@ -82,3 +84,12 @@ export interface PackageData {
     dependencies?: Record<string, string>;
     devDependencies?: Record<string, string>;
 }
+export interface RouteGenerationData {
+    buildTime: number;
+    renderTime: number;
+}
+export interface ExplorerData {
+    meta: RouteGenerationData;
+    routes: Record<string, Route>;
+    files: Record<string, string>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -92,42 +92,47 @@
     "@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/human-format": "^1.0.2",
+    "@types/jsdom": "^21.1.4",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^20.3.1",
+    "@types/node": "^20.8.7",
     "acorn": "^8.8.0",
+    "body-parser": "^1.20.2",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.19.0",
+    "esbuild": "^0.19.5",
+    "express": "^4.18.2",
     "jsdom": "^21.1.1",
-    "marko": "^5.23.0",
     "mocha": "^10.2.0",
     "mocha-snap": "^4.3.0",
-    "playwright": "^1.29.1",
+    "playwright": "^1.39.0",
     "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",
+    "tsx": "^3.14.0",
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@marko/vite": "^3",
+    "@marko/run-explorer": "^0.1.0",
+    "@marko/vite": "^3.1.4",
     "browserslist": "^4.22.1",
     "cli-table3": "^0.6.3",
     "compression": "^1.7.4",
+    "debug": "^4.3.4",
     "dotenv": "^16.0.3",
     "esbuild-plugin-browserslist": "^0.9.1",
     "glob": "^8.1.0",
-    "human-format": "^1.0.0",
+    "human-format": "^1.0.2",
     "kleur": "^4.1.5",
+    "marko": "^5",
     "parse-node-args": "^1.1.2",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "strip-ansi": "^7.0.1",
-    "undici": "^5.20.0",
-    "vite": "^4.4.0",
+    "supports-color": "^9.4.0",
+    "undici": "^5.26.3",
+    "vite": "^4.5.0",
     "warp10": "^2.1.0"
   }
 }