@marko/run 0.0.1-beta6 → 0.0.1-beta7

package/dist/vite/index.js

@@ -123,7 +123,14 @@ async function buildRoutes(walk, basePath) {
       if (handler || page) {
         const key = path3.replace(/(\$\$?)[^\/]*/g, "$1").replace(/^\/+/, "").replace(/[^a-z0-9_$\/]+/gi, "").replace(/\//g, "__") || "index";
         if (routes.has(key)) {
-          console.warn(`Duplicate route for path ${path3} -- ignoring`, current);
+          const existing = routes.get(key);
+          const existingFiles = [existing.handler, existing.page].filter(Boolean).map((f) => f.filePath);
+          const currentFiles = [handler, page].filter(Boolean).map((f) => f.filePath);
+          throw new Error(`Duplicate routes for path ${path3} were defined. A route established by:
+  ${existingFiles}
+    collides with
+  ${currentFiles.join(" and ")}
+  `);
         } else {
           const index = nextRouteIndex++;
           routes.set(key, {
@@ -171,14 +178,16 @@ async function buildRoutes(walk, basePath) {
       const prevChildren = children;
       const prevCurrent = current;
       const prevIsRoot = isRoot;
-      if (name.charCodeAt(0) === 95 || name.charCodeAt(0) === 40 && name.charCodeAt(name.length - 1) === 41 || name.toLowerCase() === "index") {
+      if (name.charCodeAt(0) === 95) {
       } else {
         if (name.charCodeAt(0) === 36) {
           if (name.charCodeAt(1) === 36) {
-            paramStack.push({
-              name: name.slice(2) || "rest",
-              index: -1
-            });
+            if (name.length > 2) {
+              paramStack.push({
+                name: name.slice(2),
+                index: -1
+              });
+            }
           } else if (name.length > 1) {
             paramStack.push({
               name: name.slice(1),
@@ -497,7 +506,7 @@ function renderRouteEntry(route) {
     );
   }
   if (middleware.length) {
-    const names = middleware.map((m) => `mware$${m.id}`);
+    const names = middleware.map((m) => `mware${m.id}`);
     imports.writeLines(
       `import { ${names.join(
         ", "
@@ -508,9 +517,9 @@ function renderRouteEntry(route) {
     writer.writeLines("");
     const names = [];
     for (const verb of handler.verbs) {
-      const name = verb === "delete" ? "del" : verb;
-      names.push(name);
-      writer.writeLines(`const handler$${name} = normalize(${name});`);
+      const importName = verb.toUpperCase();
+      names.push(importName);
+      writer.writeLines(`const ${verb}Handler = normalize(${importName});`);
     }
     imports.writeLines(
       `import { ${names.join(", ")} } from './${handler.importPath}';`
@@ -523,7 +532,7 @@ function renderRouteEntry(route) {
   }
   if (meta) {
     imports.writeLines(
-      `export { default as meta$${index} } from './${meta.importPath}';`
+      `export { default as meta${index} } from './${meta.importPath}';`
     );
   }
   for (const verb of verbs) {
@@ -554,14 +563,19 @@ function writeRouteEntryHandler(writer, route, verb) {
   let nextName;
   let currentName;
   let hasBody = false;
-  writer.writeLines("").writeBlockStart(
-    `export async function ${verb}$${index}(context, buildInput) {`
-  );
+  writer.writeLines("");
+  if (page) {
+    writer.writeBlockStart(
+      `export async function ${verb}${index}(context, buildInput) {`
+    );
+  } else {
+    writer.writeBlockStart(`export async function ${verb}${index}(context) {`);
+  }
   const continuations = writer.branch("cont");
   if (page && verb === "get") {
     currentName = "__page";
     if ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes(verb)) {
-      const name = `handler$${verb}`;
+      const name = `${verb}Handler`;
       writePageResponse(continuations, currentName);
       if (len) {
         nextName = currentName;
@@ -579,7 +593,7 @@ function writeRouteEntryHandler(writer, route, verb) {
       hasBody = true;
     }
   } else if (handler) {
-    const name = `handler$${verb}`;
+    const name = `${verb}Handler`;
     currentName = `__${name}`;
     nextName = "noContent";
     if (len) {
@@ -595,7 +609,7 @@ function writeRouteEntryHandler(writer, route, verb) {
     let i = len;
     while (i--) {
       const { id } = middleware[i];
-      const name = `mware$${id}`;
+      const name = `mware${id}`;
       nextName = currentName;
       currentName = i ? `__${name}` : "";
       writeMiddleware(continuations, name, nextName, currentName);
@@ -611,12 +625,12 @@ function renderRouter(routes, options = {
   writer.writeLines(`// @marko/run/router`);
   const imports = writer.branch("imports");
   imports.writeLines(
-    `import { RequestNotHandled, RequestNotMatched, createInput } from 'virtual:marko-run/internal';`
+    `import { NotHandled, NotMatched, createInput } from 'virtual:marko-run/internal';`
   );
   for (const route of routes.list) {
     const verbs = getVerbs(route);
-    const names = verbs.map((verb) => `${verb}$${route.index}`);
-    route.meta && names.push(`meta$${route.index}`);
+    const names = verbs.map((verb) => `${verb}${route.index}`);
+    route.meta && names.push(`meta${route.index}`);
     imports.writeLines(
       `import { ${names.join(
         ", "
@@ -625,10 +639,16 @@ function renderRouter(routes, options = {
   }
   for (const { key } of Object.values(routes.special)) {
     imports.writeLines(
-      `import page$${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
+      `import page${key} from '${virtualFilePrefix}/${markoRunFilePrefix}special__${key}.marko${serverEntryQuery}';`
     );
   }
-  writer.writeLines(``).writeBlockStart(`function findRoute(method, pathname) {`).writeBlockStart(`switch (method.toLowerCase()) {`);
+  writer.writeLines(``).writeBlockStart(`export function match(method, pathname) {`).writeLines(
+    `if (!pathname) {
+    pathname = '/';
+  } else if (pathname.charAt(0) !== '/') {
+    pathname = '/' + pathname;
+  }`
+  ).writeBlockStart(`switch (method.toLowerCase()) {`);
   for (const verb of httpVerbs) {
     const filteredRoutes = routes.list.filter((route) => hasVerb(route, verb));
     if (filteredRoutes.length) {
@@ -640,16 +660,12 @@ function renderRouter(routes, options = {
   }
   writer.writeBlockEnd("}").writeLines("return null;").writeBlockEnd("}");
   writer.write(`
-export function matchRoute(method, pathname) {
-  if (!pathname) {
-    pathname = '/';
-  } else if (pathname.charAt(0) !== '/') {
-    pathname = '/' + pathname;
-  }
-  return findRoute(method, pathname);
-}
-
-export async function invokeRoute(route, context) {
+export async function invoke(route, request, platform, url = new URL(request.url)) {
+  const context = {
+    url,
+    request,
+    platform
+  };
 	try {
     const buildInput = createInput(context);
 		if (route) {
@@ -659,9 +675,9 @@ export async function invokeRoute(route, context) {
 				const response = await route.handler(context, buildInput);
 				if (response) return response;
 			} catch (error) {
-				if (error === RequestNotHandled) {
+				if (error === NotHandled) {
 					return;
-				} else if (error !== RequestNotMatched) {
+				} else if (error !== NotMatched) {
 					throw error;
 				}
 			}
@@ -673,7 +689,7 @@ export async function invokeRoute(route, context) {
       context.meta = {};
     }
     if (context.request.headers.get('Accept')?.includes('text/html')) {
-      return new Response(page$404.stream(buildInput()), {
+      return new Response(page404.stream(buildInput()), {
         status: 404,
         headers: { "content-type": "text/html;charset=UTF-8" },
       });
@@ -689,7 +705,7 @@ export async function invokeRoute(route, context) {
     writer.writeBlockStart(
       `if (context.request.headers.get('Accept')?.includes('text/html')) {`
     ).writeBlock(
-      `return new Response(page$500.stream(buildInput({ error })), {`,
+      `return new Response(page500.stream(buildInput({ error })), {`,
       [
         `status: 500,`,
         `headers: { "content-type": "text/html;charset=UTF-8" },`
@@ -698,9 +714,9 @@ export async function invokeRoute(route, context) {
     ).writeBlockEnd("}");
   }
   writer.writeLines(`throw error;`).writeBlockEnd("}").writeBlockEnd("}").write(`
-export async function router(context) {
+export async function fetch(request, platform) {
   try {
-    const { url, method } = context;
+    const url = new URL(request.url);
     let { pathname } = url;`);
   switch (options.trailingSlashes) {
     case "RedirectWithout":
@@ -732,8 +748,8 @@ export async function router(context) {
   }
   writer.write(`   
 
-    const route = matchRoute(method, pathname);
-    return await invokeRoute(route, context);
+    const route = match(request.method, pathname);
+    return await invoke(route, request, platform, url);
   } catch (error) {
     const message = import.meta.env.DEV
       ? \`Internal Server Error (\${error.message})\`
@@ -911,9 +927,9 @@ function renderParamsInfoType(params) {
 }
 function renderMatch(verb, route, pathIndex) {
   var _a;
-  const handler = `${verb}$${route.index}`;
+  const handler = `${verb}${route.index}`;
   const params = ((_a = route.params) == null ? void 0 : _a.length) ? renderParamsInfo(route.params, pathIndex) : "{}";
-  const meta = route.meta ? `meta$${route.index}` : "{}";
+  const meta = route.meta ? `meta${route.index}` : "{}";
   return `{ handler: ${handler}, params: ${params}, meta: ${meta} }`;
 }
 function renderMiddleware(middleware) {
@@ -925,9 +941,9 @@ function renderMiddleware(middleware) {
   imports.writeLines(`import { normalize } from 'virtual:marko-run/internal';`);
   writer.writeLines("");
   for (const { id, importPath } of middleware) {
-    const importName = `mware${id}`;
+    const importName = `middleware${id}`;
     imports.writeLines(`import ${importName} from './${importPath}';`);
-    writer.writeLines(`export const mware$${id} = normalize(${importName});`);
+    writer.writeLines(`export const mware${id} = normalize(${importName});`);
   }
   imports.join();
   return writer.end();
@@ -942,7 +958,7 @@ function stripTsExtension(path3) {
   }
   return path3;
 }
-function renderRouteTypeInfo(routes, pathPrefix = ".") {
+function renderRouteTypeInfo(routes, pathPrefix = ".", adapterTypes = "") {
   var _a, _b;
   const writer = createStringWriter();
   writer.writeLines(
@@ -950,8 +966,10 @@ function renderRouteTypeInfo(routes, pathPrefix = ".") {
   WARNING: This file is automatically generated and any changes made to it will be overwritten without warning.
   Do NOT manually edit this file or your changes will be lost.
 */
-  `,
-    `import type { HandlerLike, Route, RouteContext, ValidatePath, ValidateHref } from "@marko/run";
+`,
+    `import type { HandlerLike, Route, RouteContext, ValidatePath, ValidateHref } from "@marko/run";`,
+    adapterTypes,
+    `
 
 declare global {
   namespace MarkoRun {`
@@ -1021,7 +1039,7 @@ declare module '${pathPrefix}/${page.relativePath}' {
 
   namespace MarkoRun {
     type CurrentRoute = ${routeType};
-    type CurrentContext = RouteContext<CurrentRoute>;
+    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
   }
 }`);
     }
@@ -1086,7 +1104,7 @@ declare module '${pathPrefix}/${file.relativePath}' {
 
   namespace MarkoRun {
     type CurrentRoute = ${routeTypes.join(" | ")};
-    type CurrentContext = RouteContext<CurrentRoute>;
+    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
   }
 }`);
   }
@@ -1104,7 +1122,7 @@ declare module '${pathPrefix}/${route.page.relativePath}' {
 
   namespace MarkoRun {
     type CurrentRoute = Route;
-    type CurrentContext = RouteContext<CurrentRoute>;
+    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
   }
 }`);
     }
@@ -1117,7 +1135,7 @@ function writeRouteTypeModule(writer, pathPrefix, path3, routeType) {
 declare module '${pathPrefix}/${stripTsExtension(path3)}' {
   namespace MarkoRun {
     type CurrentRoute = ${routeType};
-    type CurrentContext = RouteContext<CurrentRoute>;
+    type CurrentContext = RouteContext<RouteContext['platform'], CurrentRoute>;
     type Handler<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']> = HandlerLike<CurrentRoute>;
     function route(handler: Handler): typeof handler;
     function route<_Params = CurrentRoute['params'], _Meta = CurrentRoute['meta']>(handler: Handler): typeof handler;
@@ -1347,7 +1365,7 @@ function markoServe(opts = {}) {
     ))) {
       const filepath = path2.join(typesDir, "routes.d.ts");
       const adapterTypeInfo = (adapter == null ? void 0 : adapter.writeTypeInfo) && await (adapter == null ? void 0 : adapter.writeTypeInfo());
-      const data = renderRouteTypeInfo(routes, path2.relative(typesDir, routesDir)) + adapterTypeInfo;
+      const data = renderRouteTypeInfo(routes, path2.relative(typesDir, routesDir), adapterTypeInfo);
       if (data !== typesFile || !fs2.existsSync(filepath)) {
         await ensureDir(typesDir);
         await fs2.promises.writeFile(filepath, typesFile = data);
@@ -1614,8 +1632,8 @@ async function getVerbsFromFileBuild(context, filePath) {
   if (result) {
     const exportIds = getExportIdentifiers(result.ast);
     for (const id of exportIds) {
-      const verb = id === "del" ? "delete" : id;
-      if (httpVerbs.includes(verb)) {
+      const verb = id.toLowerCase();
+      if (id === verb.toUpperCase() && httpVerbs.includes(verb)) {
         verbs.push(verb);
       }
     }
@@ -1626,12 +1644,19 @@ async function getVerbsFromFileDev(devServer, filePath) {
   const verbs = [];
   const result = await devServer.transformRequest(filePath, { ssr: true });
   if (result && result.code) {
-    const verbMatchReg = /__vite_ssr_exports__,\s+["'](get|post|put|del)["']/g;
+    const verbMatchReg = /__vite_ssr_exports__,\s+["'](GET|POST|PUT|DELETE)["']/gi;
     let match = verbMatchReg.exec(result.code);
     while (match) {
-      const verb = match[1] === "del" ? "delete" : match[1];
+      const id = match[1];
+      const verb = id.toLowerCase();
       if (httpVerbs.includes(verb)) {
-        verbs.push(verb);
+        if (id === verb.toUpperCase()) {
+          verbs.push(verb);
+        } else {
+          console.warn(
+            `Found export '${id}' in handler ${filePath} which is close to '${verb.toUpperCase()}'. Exported handlers need to be uppercase: GET, POST, PUT or DELETE.`
+          );
+        }
       }
       match = verbMatchReg.exec(result.code);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.0.1-beta6",
+  "version": "0.0.1-beta7",
   "description": "File-based routing for Marko based on Vite",
   "keywords": [],
   "author": "Ryan Turnquist <rturnq@gmail.com>",