@marko/run 0.5.14 → 0.5.16

package/dist/vite/index.js

@@ -52,7 +52,15 @@ import path from "path";
 // src/vite/constants.ts
 var markoRunFilePrefix = "__marko-run__";
 var virtualFilePrefix = "virtual:marko-run";
-var httpVerbs = ["get", "post", "put", "delete"];
+var httpVerbs = [
+  "get",
+  "head",
+  "post",
+  "put",
+  "delete",
+  "patch",
+  "options"
+];
 var serverEntryQuery = "?marko-server-entry";
 var RoutableFileTypes = {
   Page: "page",
@@ -65,17 +73,27 @@ var RoutableFileTypes = {
 };
 
 // src/vite/utils/route.ts
-function getVerbs(route) {
-  var _a, _b;
-  const verbs = ((_b = (_a = route.handler) == null ? void 0 : _a.verbs) == null ? void 0 : _b.slice()) || [];
-  if (route.page && !verbs.includes("get")) {
-    verbs.unshift("get");
+var httpVerbOrder = httpVerbs.reduce(
+  (order, verb, index) => {
+    order[verb] = index;
+    return order;
+  },
+  {}
+);
+function getVerbs(route, noAutoHead) {
+  var _a;
+  const verbs = new Set((_a = route.handler) == null ? void 0 : _a.verbs);
+  if (route.page) {
+    verbs.add("get");
   }
-  return verbs;
+  if (!noAutoHead && verbs.has("get")) {
+    verbs.add("head");
+  }
+  return [...verbs].sort((a, b) => httpVerbOrder[a] - httpVerbOrder[b]);
 }
 function hasVerb(route, verb) {
   var _a, _b;
-  return verb === "get" && route.page || ((_b = (_a = route.handler) == null ? void 0 : _a.verbs) == null ? void 0 : _b.includes(verb));
+  return verb === "get" && !!route.page || ((_b = (_a = route.handler) == null ? void 0 : _a.verbs) == null ? void 0 : _b.includes(verb)) || verb === "head" && hasVerb(route, "get");
 }
 
 // src/vite/codegen/writer.ts
@@ -279,12 +297,15 @@ function renderRouteEntry(route, entriesDir) {
   if (handler || middleware.length) {
     runtimeImports.push("call");
   }
-  if (!page || verbs.length > 1) {
+  if (!page || verbs.some((verb) => verb !== "get" && verb !== "head")) {
     runtimeImports.push("noContent");
   }
   if (page) {
     runtimeImports.push("pageResponse");
   }
+  if (verbs.includes("head")) {
+    runtimeImports.push("stripResponseBody");
+  }
   if (runtimeImports.length) {
     imports.writeLines(
       `import { ${runtimeImports.join(
@@ -328,66 +349,80 @@ function renderRouteEntry(route, entriesDir) {
   }
   return writer.end();
 }
-function writePageResponse(writer, wrapFn) {
-  writer.writeLines(
-    `${wrapFn ? `const ${wrapFn} = () =>` : `return`} pageResponse(page, buildInput());`
-  );
-}
-function writeMiddleware(writer, middleware, next, wrapFn) {
-  if (wrapFn) {
-    writer.writeLines(
-      `const ${wrapFn} = () => call(${middleware}, ${next}, context);`
-    );
-  } else {
-    writer.writeLines(`return call(${middleware}, ${next}, context);`);
-  }
-}
 function writeRouteEntryHandler(writer, route, verb) {
-  var _a;
+  var _a, _b, _c, _d;
   const { key, index, page, handler, middleware } = route;
   const len = middleware.length;
   let nextName;
   let currentName;
   let hasBody = false;
   writer.writeLines("");
-  if (page) {
+  if (page && (verb === "get" || verb === "head")) {
     writer.writeBlockStart(
-      `export async function ${verb}${index}(context, buildInput) {`
+      `export function ${verb}${index}(context, buildInput) {`
     );
   } else {
-    writer.writeBlockStart(`export async function ${verb}${index}(context) {`);
+    writer.writeBlockStart(`export function ${verb}${index}(context) {`);
   }
   const continuations = writer.branch("cont");
-  if (page && verb === "get") {
+  if (page && (verb === "get" || verb === "head")) {
     currentName = "__page";
     if ((_a = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a.includes(verb)) {
       const name = `${verb}Handler`;
-      writePageResponse(continuations, currentName);
+      continuations.writeLines(
+        `const ${currentName} = () => pageResponse(page, buildInput());`
+      );
       if (len) {
         nextName = currentName;
         currentName = `__${name}`;
-        writeMiddleware(continuations, name, nextName, currentName);
+        continuations.writeLines(
+          `const ${currentName} = () => call(${name}, ${nextName}, context);`
+        );
       } else {
-        writeMiddleware(writer, name, currentName);
+        if (verb === "head") {
+          writer.writeLines(
+            `return stripResponseBody(call(${name}, ${currentName}, context));`
+          );
+        } else {
+          writer.writeLines(`return call(${name}, ${currentName}, context);`);
+        }
         hasBody = true;
       }
+    } else if (verb === "head") {
+      writer.writeLines(
+        `return stripResponseBody(get${index}(context, buildInput));`
+      );
+      hasBody = true;
     } else if (len) {
-      writePageResponse(continuations, currentName);
+      continuations.writeLines(
+        `const ${currentName} = () => pageResponse(page, buildInput());`
+      );
       nextName = currentName;
     } else {
-      writePageResponse(continuations);
+      writer.writeLines(`return pageResponse(page, buildInput());`);
       hasBody = true;
     }
-  } else if (handler) {
+  } else if ((_b = handler == null ? void 0 : handler.verbs) == null ? void 0 : _b.includes(verb)) {
     const name = `${verb}Handler`;
     currentName = `__${name}`;
     nextName = "noContent";
     if (len) {
-      writeMiddleware(continuations, name, nextName, currentName);
+      continuations.writeLines(
+        `const ${currentName} = () => call(${name}, ${nextName}, context);`
+      );
     } else {
-      writeMiddleware(writer, name, nextName);
+      if (verb === "head") {
+        writer.writeLines(
+          `return stripResponseBody(call(${name}, ${nextName}, context));`
+        );
+      } else {
+        writer.writeLines(`return call(${name}, ${nextName}, context);`);
+      }
       hasBody = true;
     }
+  } else if (verb === "head" && ((_d = (_c = route.handler) == null ? void 0 : _c.verbs) == null ? void 0 : _d.includes("get"))) {
+    writer.writeLines(`return stripResponseBody(get${index}(context));`);
+    hasBody = true;
   } else {
     throw new Error(`Route ${key} has no handler for ${verb} requests`);
   }
@@ -398,7 +433,17 @@ function writeRouteEntryHandler(writer, route, verb) {
       const name = `mware${id}`;
       nextName = currentName;
       currentName = i ? `__${name}` : "";
-      writeMiddleware(continuations, name, nextName, currentName);
+      if (currentName) {
+        continuations.writeLines(
+          `const ${currentName} = () => call(${name}, ${nextName}, context);`
+        );
+      } else if (verb === "head") {
+        continuations.writeLines(
+          `return stripResponseBody(call(${name}, ${nextName}, context));`
+        );
+      } else {
+        continuations.writeLines(`return call(${name}, ${nextName}, context);`);
+      }
     }
   }
   continuations.join();
@@ -1295,7 +1340,7 @@ async function buildRoutes(sources) {
         filePath: path5,
         relativePath,
         importPath: `${importPrefix}/${relativePath}`,
-        verbs: type === RoutableFileTypes.Page ? ["get"] : void 0
+        verbs: type === RoutableFileTypes.Page ? ["get", "head"] : void 0
       };
       for (const dir of dirs) {
         dir.addFile(file);
@@ -1536,17 +1581,16 @@ import format from "human-format";
 import kleur2 from "kleur";
 var HttpVerbColors = {
   get: kleur2.green,
+  head: kleur2.dim().green,
   post: kleur2.magenta,
   put: kleur2.cyan,
   delete: kleur2.red,
-  other: kleur2.white
-};
-var HttpVerbOrder = {
-  get: 0,
-  post: 1,
-  put: 2,
-  delete: 3
+  patch: kleur2.yellow,
+  options: kleur2.grey
 };
+function verbColor(verb) {
+  return verb in HttpVerbColors ? HttpVerbColors[verb] : kleur2.gray;
+}
 function logRoutesTable(routes, bundle, options) {
   function getRouteChunkName(route) {
     return options.sanitizeFileName(`${route.entryName}.marko`);
@@ -1573,23 +1617,27 @@ function logRoutesTable(routes, bundle, options) {
   });
   for (const route of routes.list) {
     for (const path5 of route.paths) {
-      const verbs = getVerbs(route).sort(
-        (a, b) => HttpVerbOrder[a] - HttpVerbOrder[b]
-      );
+      const verbs = getVerbs(route, true);
       let firstRow = true;
       for (const verb of verbs) {
-        let size = "";
         const entryType = [];
+        let size = "";
+        let verbCell = verbColor(verb)(verb.toUpperCase());
+        if (verb === "get" && !verbs.includes("head")) {
+          verbCell += kleur2.dim(`,${verbColor(verb)("HEAD")}`);
+        }
         if (route.handler) {
           entryType.push(kleur2.blue("handler"));
         }
-        if (verb === "get" && route.page) {
+        if (route.page && (verb === "get" || verb === "head")) {
           entryType.push(kleur2.yellow("page"));
-          size = prettySize(computeRouteSize(getRouteChunkName(route), bundle));
+          if (verb === "get") {
+            size = prettySize(
+              computeRouteSize(getRouteChunkName(route), bundle)
+            );
+          }
         }
-        const row = [
-          kleur2.bold(HttpVerbColors[verb](verb.toUpperCase()))
-        ];
+        const row = [verbCell];
         if (verbs.length === 1 || firstRow) {
           row.push({ rowSpan: verbs.length, content: prettyPath(path5.path) });
           firstRow = false;
@@ -2125,8 +2173,7 @@ function markoRun(opts = {}) {
       },
       async resolveId(importee, importer) {
         if (importee === "@marko/run/router") {
-          console.log("plugin resolveId router");
-          return path4.resolve(root, ROUTER_FILENAME);
+          return normalizePath(path4.resolve(root, ROUTER_FILENAME));
         } else if (importee.endsWith(".marko") && importee.includes(relativeEntryFilesDirPosix)) {
           if (!importee.startsWith(root)) {
             importee = path4.resolve(root, "." + importee);

package/dist/vite/utils/route.d.ts

@@ -1,3 +1,3 @@
 import type { HttpVerb, Route } from "../types";
-export declare function getVerbs(route: Route): ("get" | "post" | "put" | "delete")[];
-export declare function hasVerb(route: Route, verb: HttpVerb): boolean | import("..").RoutableFile | undefined;
+export declare function getVerbs(route: Route, noAutoHead?: boolean): HttpVerb[];
+export declare function hasVerb(route: Route, verb: HttpVerb): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.5.14",
+  "version": "0.5.16",
   "description": "The Marko application framework.",
   "keywords": [
     "marko"
@@ -51,11 +51,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "rm -rf ./dist && tsc -b && tsx scripts/build.ts",
-    "test": "cross-env NODE_ENV=test NODE_OPTIONS='$NODE_OPTIONS --import tsx' mocha \"./src/**/__tests__/*.test.?(c)ts\"",
-    "test:inspect": "npm test -- --inspect",
-    "test:update": "npm test -- --update",
-    "test:watch": "npm test -- --watch"
+    "build": "rm -rf ./dist && tsc -b && tsx scripts/build.ts"
   },
   "dependencies": {
     "@marko/run-explorer": "^0.1.2",