@marko/run 0.2.8 → 0.2.10

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,
@@ -1002,12 +1016,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("}");
     }
@@ -1159,13 +1174,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: 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} === '${decodedKey}') `, true);
           }
           writer.write(
             `return ${renderMatch(verb, route2, path3)}; // ${path3.path}
@@ -1202,7 +1218,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);
@@ -1210,7 +1226,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;
@@ -1691,6 +1707,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 = "/";
@@ -1750,10 +1768,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");
@@ -1799,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));
         }
@@ -2096,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);
         }
       },
@@ -2203,19 +2227,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";

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,
@@ -958,12 +972,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("}");
     }
@@ -1115,13 +1130,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: 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} === '${decodedKey}') `, true);
           }
           writer.write(
             `return ${renderMatch(verb, route2, path3)}; // ${path3.path}
@@ -1158,7 +1174,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);
@@ -1166,7 +1182,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;
@@ -1647,6 +1663,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 = "/";
@@ -1706,10 +1724,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");
@@ -1755,6 +1773,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));
         }
@@ -2052,7 +2076,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);
         }
       },
@@ -2159,19 +2183,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

@@ -31,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";
@@ -83,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/dist/vite/utils/server.d.ts

@@ -11,7 +11,7 @@ export interface SpawnedServer {
 export declare function parseEnv(envFile: string): Promise<import("dotenv").DotenvParseOutput | undefined>;
 export declare function loadEnv(envFile: string): void;
 export declare function spawnServer(cmd: string, args?: string[], port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number, stdio?: StdioOptions): Promise<SpawnedServer>;
-export declare function spawnServerWorker(module: string, args?: string[], port?: number, env?: string | Record<string, string>): Promise<Worker>;
+export declare function spawnServerWorker(module: string, args?: string[], port?: number, env?: string | Record<string, string>, wait?: boolean): Promise<Worker>;
 export declare function waitForError(proc: ChildProcess, port: number): Promise<void>;
 export declare function waitForServer(port: number, wait?: number): Promise<Socket>;
 export declare function waitForWorker(worker: Worker, port: number): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",
@@ -102,7 +102,6 @@
     "esbuild": "^0.19.5",
     "express": "^4.18.2",
     "jsdom": "^21.1.1",
-    "marko": "^5.31.12",
     "mocha": "^10.2.0",
     "mocha-snap": "^4.3.0",
     "playwright": "^1.39.0",
@@ -115,15 +114,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
+    "@marko/compiler": "^5.33.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.2",
     "kleur": "^4.1.5",
+    "marko": "^5",
     "parse-node-args": "^1.1.2",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",

package/dist/adapter/runtime.cjs

@@ -1,22 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/adapter/runtime.ts
-var runtime_exports = {};
-module.exports = __toCommonJS(runtime_exports);
-
-// scripts/importMetaURL.js
-var import_url = require("url");
-var __importMetaURL = (0, import_url.pathToFileURL)(__filename);

package/dist/adapter/runtime.d.ts

@@ -1 +0,0 @@
-export {};