@marko/run 0.9.3 → 0.9.5

package/dist/adapter/utils.d.ts

@@ -9,7 +9,7 @@ export declare function prepareError(err: Error | RollupError): {
     pluginCode: string | undefined;
     loc: {
         column: number;
-        file?: string;
+        file?: string | undefined;
         line: number;
     } | undefined;
 };

package/dist/cli/commands.d.ts

@@ -5,4 +5,4 @@ export declare const defaultConfigFileExts: string[];
 export declare function preview(entry: string | undefined, distEntry: string | undefined, cwd: string, configFile: string, port?: number, outDir?: string, envFile?: string, args?: string[]): Promise<SpawnedServer>;
 export declare function dev(entry: string | undefined, cwd: string, configFile: string, port?: number, envFile?: string, args?: string[]): Promise<SpawnedServer>;
 export declare function build(entry: string | undefined, cwd: string, configFile: string, outDir?: string, envFile?: string): Promise<void>;
-export declare function getViteConfig(dir: string, configFile?: string, bases?: string[]): Promise<string>;
+export declare function getViteConfig(dir: string, configFile?: string, bases?: string[], fallback?: string): Promise<string>;

package/dist/cli/index.mjs

@@ -272,15 +272,22 @@ function normalizedRelativePath(from, to) {
   const relativePath = normalizePath(path2.relative(from, to));
   return relativePath.startsWith(".") ? relativePath : "./" + relativePath;
 }
-function renderRouteTemplate(route, rootDir) {
+function renderRouteTemplate(route, markoApi) {
   if (!route.page) {
     throw new Error(`Route ${route.key} has no page to render`);
   }
   if (!route.templateFilePath) {
     throw new Error(`Route ${route.key} has no template file path`);
   }
-  return renderEntryTemplate(
-    normalizedRelativePath(rootDir, route.templateFilePath),
+  const writer = createStringWriter();
+  if (markoApi) {
+    writer.writeLines(`<!-- use ${markoApi} -->
+`);
+  }
+  writer.branch("imports");
+  writer.writeLines("");
+  writeEntryTemplateTag(
+    writer,
     [...route.layouts, route.page].map(
       (file) => normalizedRelativePath(
         path2.dirname(route.templateFilePath),
@@ -289,16 +296,6 @@ function renderRouteTemplate(route, rootDir) {
     ),
     route.key === RoutableFileTypes.Error ? ["error"] : []
   );
-}
-function renderEntryTemplate(name, files, pageInputs = []) {
-  if (!files.length) {
-    throw new Error(`Invalid argument - 'files' cannot be empty`);
-  }
-  const writer = createStringWriter();
-  writer.writeLines(`// ${name}`);
-  writer.branch("imports");
-  writer.writeLines("");
-  writeEntryTemplateTag(writer, files, pageInputs);
   return writer.end();
 }
 function writeEntryTemplateTag(writer, [file, ...rest], pageInputs, index = 1) {
@@ -326,7 +323,6 @@ function renderRouteEntry(route, rootDir) {
     );
   }
   const writer = createStringWriter();
-  writer.writeLines(`// ${virtualFilePrefix}${getRouteVirtualFileName(route)}`);
   const imports = writer.branch("imports");
   const runtimeImports = [];
   if (handler) {
@@ -485,7 +481,6 @@ function renderRouter(routes, rootDir, runtimeInclude, options = {
   const writer = createStringWriter();
   const hasErrorPage = Boolean(routes.special[RoutableFileTypes.Error]);
   const hasNotFoundPage = Boolean(routes.special[RoutableFileTypes.NotFound]);
-  writer.writeLines(`// @marko/run/router`);
   const imports = writer.branch("imports");
   if (runtimeInclude) {
     imports.writeLines(`import "${normalizePath(runtimeInclude)}";`);
@@ -795,9 +790,6 @@ function renderMatch(verb, route, path10, pathIndex) {
 }
 function renderMiddleware(middleware, rootDir) {
   const writer = createStringWriter();
-  writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}middleware.js`
-  );
   const imports = writer.branch("imports");
   imports.writeLines(
     `import { normalize } from "${virtualFilePrefix}/runtime/internal";`
@@ -823,9 +815,6 @@ function stripTsExtension(path10) {
   }
   return path10;
 }
-function decodePath(path10) {
-  return path10;
-}
 async function renderRouteTypeInfo(routes, outDir, adapter) {
   var _a, _b, _c, _d;
   const writer = createStringWriter();
@@ -878,7 +867,7 @@ async function renderRouteTypeInfo(routes, outDir, adapter) {
       }
       routeDefinition += " }";
     }
-    const pathType = `"${decodePath(route.path.path)}"`;
+    const pathType = `"${route.path.path}"`;
     routeType += routeType ? " | " + pathType : pathType;
     routesWriter.writeLines(`${pathType}: ${routeDefinition};`);
     for (const file of [route.handler, route.page]) {
@@ -1571,7 +1560,7 @@ function createFSWalker(dir) {
 }
 
 // src/vite/utils/ast.ts
-import * as t from "@babel/types";
+import { types as t } from "@marko/compiler";
 function getExportIdentifiers(astProgramNode) {
   const result = [];
   if (t.isProgram(astProgramNode)) {
@@ -1620,7 +1609,6 @@ var setExternalAdapterOptions = (viteConfig, value) => setConfig(viteConfig, Ada
 
 // src/vite/utils/log.ts
 import zlib from "node:zlib";
-import { Blob } from "buffer";
 import Table from "cli-table3";
 import format from "human-format";
 import kleur2 from "kleur";
@@ -1879,6 +1867,13 @@ function markoRun(opts = {}) {
     routesBuild: 0,
     routesRender: 0
   };
+  async function loadModule(context, id) {
+    if ("transformRequest" in context.environment) {
+      await context.environment.transformRequest(id);
+      return context.getModuleInfo(id);
+    }
+    return await context.load({ id });
+  }
   async function getExportsFromFile(context, filePath) {
     if (devServer) {
       const result2 = await devServer.transformRequest(filePath, { ssr: false });
@@ -1890,6 +1885,17 @@ function markoRun(opts = {}) {
     });
     return result.exports || [];
   }
+  let routeMarkoApiCache;
+  async function getMarkoApiForRoute(context, route) {
+    var _a, _b;
+    routeMarkoApiCache ?? (routeMarkoApiCache = /* @__PURE__ */ new Map());
+    if (!routeMarkoApiCache.has(route)) {
+      const markoAPI = route.templateFilePath && ((_b = (_a = await loadModule(context, normalizePath(route.layouts[0].filePath))) == null ? void 0 : _a.meta) == null ? void 0 : _b.markoAPI);
+      routeMarkoApiCache.set(route, markoAPI);
+      return markoAPI;
+    }
+    return routeMarkoApiCache.get(route);
+  }
   async function writeTypesFile(routes2) {
     if (routes2 && (tsConfigExists ?? (tsConfigExists = await globFileExists(
       root,
@@ -2002,7 +2008,10 @@ function markoRun(opts = {}) {
             });
             fs3.writeFileSync(
               route.templateFilePath,
-              renderRouteTemplate(route, root)
+              renderRouteTemplate(
+                route,
+                await getMarkoApiForRoute(context, route)
+              )
             );
           }
           virtualFiles.set(
@@ -2017,7 +2026,10 @@ function markoRun(opts = {}) {
             });
             fs3.writeFileSync(
               route.templateFilePath,
-              renderRouteTemplate(route, root)
+              renderRouteTemplate(
+                route,
+                await getMarkoApiForRoute(context, route)
+              )
             );
           }
         }
@@ -2242,6 +2254,7 @@ function markoRun(opts = {}) {
             if (type === "add" || type === "unlink" || type === "change" && (routableFileType === RoutableFileTypes.Handler || routableFileType === RoutableFileTypes.Middleware || filename === runtimeInclude)) {
               buildVirtualFilesResult = void 0;
               renderVirtualFilesResult = void 0;
+              routeMarkoApiCache = void 0;
               const module = devServer.moduleGraph.getModuleById(filename);
               const importers = module && getImporters(module, filename);
               if (importers == null ? void 0 : importers.size) {
@@ -2315,8 +2328,7 @@ function markoRun(opts = {}) {
           await renderVirtualFiles(this);
         }
         if (virtualFiles.has(id)) {
-          const file = virtualFiles.get(id);
-          return file;
+          return virtualFiles.get(id);
         } else if (!id.startsWith(entryFilesDirPosix) && /[/\\]__marko-run__[^?/\\]+\.(js|marko)$/.exec(id)) {
           return "";
         }
@@ -2736,7 +2748,7 @@ function findFileWithExt(dir, base, extensions = defaultConfigFileExts) {
   }
   return void 0;
 }
-async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
+async function getViteConfig(dir, configFile, bases = defaultConfigFileBases, fallback = path9.join(__dirname3, "default.config.mjs")) {
   if (configFile) {
     const configFilePath = path9.join(dir, configFile);
     if (!fs6.existsSync(configFilePath)) {
@@ -2750,7 +2762,7 @@ async function getViteConfig(dir, configFile, bases = defaultConfigFileBases) {
       return configFile;
     }
   }
-  return path9.join(__dirname3, "default.config.mjs");
+  return fallback;
 }
 
 // src/cli/index.ts

package/dist/runtime/internal.cjs

@@ -206,9 +206,9 @@ function compose(handlers) {
   }
   return (context, next) => {
     let i = 0;
-    return function nextHandler() {
+    return (function nextHandler() {
       return i < len ? call(handlers[i++], nextHandler, context) : next();
-    }();
+    })();
   };
 }
 function normalize(obj) {

package/dist/runtime/internal.js

@@ -165,9 +165,9 @@ function compose(handlers) {
   }
   return (context, next) => {
     let i = 0;
-    return function nextHandler() {
+    return (function nextHandler() {
       return i < len ? call(handlers[i++], nextHandler, context) : next();
-    }();
+    })();
   };
 }
 function normalize(obj) {

package/dist/vite/codegen/index.d.ts

@@ -1,6 +1,6 @@
 import type { Adapter, BuiltRoutes, RoutableFile, Route, RouterOptions } from "../types";
-export declare function renderRouteTemplate(route: Route, rootDir: string): string;
+export declare function renderRouteTemplate(route: Route, markoApi?: string): string;
 export declare function renderRouteEntry(route: Route, rootDir: string): string;
-export declare function renderRouter(routes: BuiltRoutes, rootDir: string, runtimeInclude: string | undefined, options?: RouterOptions): string;
+export declare function renderRouter(routes: BuiltRoutes, rootDir: string, runtimeInclude?: string, options?: RouterOptions): string;
 export declare function renderMiddleware(middleware: RoutableFile[], rootDir: string): string;
 export declare function renderRouteTypeInfo(routes: BuiltRoutes, outDir: string, adapter?: Adapter | null): Promise<string>;

package/dist/vite/index.cjs

@@ -300,15 +300,22 @@ function normalizedRelativePath(from, to) {
   const relativePath = normalizePath(import_path2.default.relative(from, to));
   return relativePath.startsWith(".") ? relativePath : "./" + relativePath;
 }
-function renderRouteTemplate(route, rootDir) {
+function renderRouteTemplate(route, markoApi) {
   if (!route.page) {
     throw new Error(`Route ${route.key} has no page to render`);
   }
   if (!route.templateFilePath) {
     throw new Error(`Route ${route.key} has no template file path`);
   }
-  return renderEntryTemplate(
-    normalizedRelativePath(rootDir, route.templateFilePath),
+  const writer = createStringWriter();
+  if (markoApi) {
+    writer.writeLines(`<!-- use ${markoApi} -->
+`);
+  }
+  writer.branch("imports");
+  writer.writeLines("");
+  writeEntryTemplateTag(
+    writer,
     [...route.layouts, route.page].map(
       (file) => normalizedRelativePath(
         import_path2.default.dirname(route.templateFilePath),
@@ -317,16 +324,6 @@ function renderRouteTemplate(route, rootDir) {
     ),
     route.key === RoutableFileTypes.Error ? ["error"] : []
   );
-}
-function renderEntryTemplate(name, files, pageInputs = []) {
-  if (!files.length) {
-    throw new Error(`Invalid argument - 'files' cannot be empty`);
-  }
-  const writer = createStringWriter();
-  writer.writeLines(`// ${name}`);
-  writer.branch("imports");
-  writer.writeLines("");
-  writeEntryTemplateTag(writer, files, pageInputs);
   return writer.end();
 }
 function writeEntryTemplateTag(writer, [file, ...rest], pageInputs, index = 1) {
@@ -354,7 +351,6 @@ function renderRouteEntry(route, rootDir) {
     );
   }
   const writer = createStringWriter();
-  writer.writeLines(`// ${virtualFilePrefix}${getRouteVirtualFileName(route)}`);
   const imports = writer.branch("imports");
   const runtimeImports = [];
   if (handler) {
@@ -513,7 +509,6 @@ function renderRouter(routes, rootDir, runtimeInclude, options = {
   const writer = createStringWriter();
   const hasErrorPage = Boolean(routes.special[RoutableFileTypes.Error]);
   const hasNotFoundPage = Boolean(routes.special[RoutableFileTypes.NotFound]);
-  writer.writeLines(`// @marko/run/router`);
   const imports = writer.branch("imports");
   if (runtimeInclude) {
     imports.writeLines(`import "${normalizePath(runtimeInclude)}";`);
@@ -823,9 +818,6 @@ function renderMatch(verb, route, path7, pathIndex) {
 }
 function renderMiddleware(middleware, rootDir) {
   const writer = createStringWriter();
-  writer.writeLines(
-    `// ${virtualFilePrefix}/${markoRunFilePrefix}middleware.js`
-  );
   const imports = writer.branch("imports");
   imports.writeLines(
     `import { normalize } from "${virtualFilePrefix}/runtime/internal";`
@@ -851,9 +843,6 @@ function stripTsExtension(path7) {
   }
   return path7;
 }
-function decodePath(path7) {
-  return path7;
-}
 async function renderRouteTypeInfo(routes, outDir, adapter) {
   var _a, _b, _c, _d;
   const writer = createStringWriter();
@@ -906,7 +895,7 @@ async function renderRouteTypeInfo(routes, outDir, adapter) {
       }
       routeDefinition += " }";
     }
-    const pathType = `"${decodePath(route.path.path)}"`;
+    const pathType = `"${route.path.path}"`;
     routeType += routeType ? " | " + pathType : pathType;
     routesWriter.writeLines(`${pathType}: ${routeDefinition};`);
     for (const file of [route.handler, route.page]) {
@@ -1599,31 +1588,31 @@ function createFSWalker(dir) {
 }
 
 // src/vite/utils/ast.ts
-var t = __toESM(require("@babel/types"), 1);
+var import_compiler = require("@marko/compiler");
 function getExportIdentifiers(astProgramNode) {
   const result = [];
-  if (t.isProgram(astProgramNode)) {
+  if (import_compiler.types.isProgram(astProgramNode)) {
     for (const node of astProgramNode.body) {
-      if (t.isExportNamedDeclaration(node)) {
+      if (import_compiler.types.isExportNamedDeclaration(node)) {
         const { declaration, specifiers } = node;
         if (declaration) {
-          if (t.isFunctionDeclaration(declaration) && declaration.id) {
+          if (import_compiler.types.isFunctionDeclaration(declaration) && declaration.id) {
             result.push(declaration.id.name);
-          } else if (t.isVariableDeclaration(declaration)) {
+          } else if (import_compiler.types.isVariableDeclaration(declaration)) {
             for (const declarator of declaration.declarations) {
-              if (t.isIdentifier(declarator.id)) {
+              if (import_compiler.types.isIdentifier(declarator.id)) {
                 result.push(declarator.id.name);
               }
             }
           }
         } else if (specifiers) {
           for (const specifier of specifiers) {
-            if (t.isExportSpecifier(specifier) && t.isIdentifier(specifier.exported)) {
+            if (import_compiler.types.isExportSpecifier(specifier) && import_compiler.types.isIdentifier(specifier.exported)) {
               result.push(specifier.exported.name);
             }
           }
         }
-      } else if (t.isExportDefaultDeclaration(node)) {
+      } else if (import_compiler.types.isExportDefaultDeclaration(node)) {
         result.push("default");
       }
     }
@@ -1647,7 +1636,6 @@ var getExternalAdapterOptions = (viteConfig) => getConfig(viteConfig, AdapterCon
 
 // src/vite/utils/log.ts
 var import_node_zlib = __toESM(require("node:zlib"), 1);
-var import_buffer = require("buffer");
 var import_cli_table3 = __toESM(require("cli-table3"), 1);
 var import_human_format = __toESM(require("human-format"), 1);
 var import_kleur2 = __toESM(require("kleur"), 1);
@@ -1781,7 +1769,7 @@ function gzipSize(source) {
   return import_node_zlib.default.gzipSync(source, { level: 9 }).length;
 }
 function byteSize(source) {
-  return new import_buffer.Blob([source]).size;
+  return new Blob([source]).size;
 }
 function computeChunkSize(chunk, bundle, seen = /* @__PURE__ */ new Set()) {
   if (chunk.type === "asset") {
@@ -1906,6 +1894,13 @@ function markoRun(opts = {}) {
     routesBuild: 0,
     routesRender: 0
   };
+  async function loadModule(context, id) {
+    if ("transformRequest" in context.environment) {
+      await context.environment.transformRequest(id);
+      return context.getModuleInfo(id);
+    }
+    return await context.load({ id });
+  }
   async function getExportsFromFile(context, filePath) {
     if (devServer) {
       const result2 = await devServer.transformRequest(filePath, { ssr: false });
@@ -1917,6 +1912,17 @@ function markoRun(opts = {}) {
     });
     return result.exports || [];
   }
+  let routeMarkoApiCache;
+  async function getMarkoApiForRoute(context, route) {
+    var _a, _b;
+    routeMarkoApiCache ?? (routeMarkoApiCache = /* @__PURE__ */ new Map());
+    if (!routeMarkoApiCache.has(route)) {
+      const markoAPI = route.templateFilePath && ((_b = (_a = await loadModule(context, normalizePath(route.layouts[0].filePath))) == null ? void 0 : _a.meta) == null ? void 0 : _b.markoAPI);
+      routeMarkoApiCache.set(route, markoAPI);
+      return markoAPI;
+    }
+    return routeMarkoApiCache.get(route);
+  }
   async function writeTypesFile(routes2) {
     if (routes2 && (tsConfigExists ?? (tsConfigExists = await globFileExists(
       root,
@@ -2029,7 +2035,10 @@ function markoRun(opts = {}) {
             });
             import_fs4.default.writeFileSync(
               route.templateFilePath,
-              renderRouteTemplate(route, root)
+              renderRouteTemplate(
+                route,
+                await getMarkoApiForRoute(context, route)
+              )
             );
           }
           virtualFiles.set(
@@ -2044,7 +2053,10 @@ function markoRun(opts = {}) {
             });
             import_fs4.default.writeFileSync(
               route.templateFilePath,
-              renderRouteTemplate(route, root)
+              renderRouteTemplate(
+                route,
+                await getMarkoApiForRoute(context, route)
+              )
             );
           }
         }
@@ -2269,6 +2281,7 @@ function markoRun(opts = {}) {
             if (type === "add" || type === "unlink" || type === "change" && (routableFileType === RoutableFileTypes.Handler || routableFileType === RoutableFileTypes.Middleware || filename === runtimeInclude)) {
               buildVirtualFilesResult = void 0;
               renderVirtualFilesResult = void 0;
+              routeMarkoApiCache = void 0;
               const module2 = devServer.moduleGraph.getModuleById(filename);
               const importers = module2 && getImporters(module2, filename);
               if (importers == null ? void 0 : importers.size) {
@@ -2342,8 +2355,7 @@ function markoRun(opts = {}) {
           await renderVirtualFiles(this);
         }
         if (virtualFiles.has(id)) {
-          const file = virtualFiles.get(id);
-          return file;
+          return virtualFiles.get(id);
         } else if (!id.startsWith(entryFilesDirPosix) && /[/\\]__marko-run__[^?/\\]+\.(js|marko)$/.exec(id)) {
           return "";
         }
@@ -2545,9 +2557,12 @@ async function spawnServer(cmd, args = [], port = 0, env, cwd = process.cwd(), w
     windowsHide: true,
     env: { ...env, NODE_ENV: "development", ...process.env, PORT: `${port}` }
   });
-  const close = () => {
+  const close = async () => {
     proc.unref();
     proc.kill();
+    if (!await waitForExit(proc, 500)) {
+      proc.kill("SIGKILL");
+    }
   };
   try {
     await Promise.race([waitForError(proc, port), waitForServer(port, wait)]);
@@ -2595,6 +2610,15 @@ async function spawnServerWorker(module2, args = [], port = 0, env, wait = true)
     import_cluster.default.settings.execArgv = originalArgs;
   }
 }
+async function waitForExit(proc, wait = 0) {
+  if (proc.exitCode !== null) return;
+  return await new Promise((resolve) => {
+    proc.once("exit", resolve), proc.once("close", resolve);
+    if (wait) {
+      setTimeout(resolve, wait, null);
+    }
+  });
+}
 async function waitForError(proc, port) {
   return new Promise((_, reject) => {
     proc.once("error", reject);