@marko/run 0.9.4 → 0.9.6

package/dist/vite/index.js

@@ -310,7 +310,10 @@ function renderRouteEntry(route, rootDir) {
   const imports = writer.branch("imports");
   const runtimeImports = [];
   if (handler) {
-    runtimeImports.push("normalize");
+    runtimeImports.push("normalizeHandler");
+  }
+  if (meta) {
+    runtimeImports.push("normalizeMeta");
   }
   if (handler || middleware.length) {
     runtimeImports.push("call");
@@ -342,7 +345,9 @@ function renderRouteEntry(route, rootDir) {
     for (const verb of handler.verbs) {
       const importName = verb.toUpperCase();
       names.push(importName);
-      writer.writeLines(`const ${verb}Handler = normalize(${importName});`);
+      writer.writeLines(
+        `const ${verb}Handler = normalizeHandler(${importName});`
+      );
     }
     imports.writeLines(
       `import { ${names.join(", ")} } from "${normalizedRelativePath(rootDir, handler.filePath)}";`
@@ -354,8 +359,18 @@ function renderRouteEntry(route, rootDir) {
     );
   }
   if (meta) {
+    const metaName = `meta${index}`;
+    const metaVerbsExports = verbs.map((verb) => {
+      var _a2;
+      const name = verb === "head" && !((_a2 = handler == null ? void 0 : handler.verbs) == null ? void 0 : _a2.includes(verb)) ? "GET" : verb.toUpperCase();
+      return `${name}: ${verb}${index}_meta`;
+    }).join(", ");
+    writer.writeLines("");
     imports.writeLines(
-      `export { default as meta${index} } from "${normalizedRelativePath(rootDir, meta.filePath)}";`
+      `import ${metaName} from "${normalizedRelativePath(rootDir, meta.filePath)}";`
+    );
+    writer.writeLines(
+      `export const { ${metaVerbsExports} } = normalizeMeta(${metaName});`
     );
   }
   for (const verb of verbs) {
@@ -474,10 +489,16 @@ function renderRouter(routes, rootDir, runtimeInclude, options = {
   );
   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 routeImports = [];
+    for (const verb of verbs) {
+      const verbName = `${verb}${route.index}`;
+      routeImports.push(verbName);
+      if (route.meta) {
+        routeImports.push(`${verbName}_meta`);
+      }
+    }
     imports.writeLines(
-      `import { ${names.join(", ")} } from "${virtualFilePrefix}/${getRouteVirtualFileName(route)}";`
+      `import { ${routeImports.join(", ")} } from "${virtualFilePrefix}/${getRouteVirtualFileName(route)}";`
     );
   }
   for (const route of Object.values(routes.special)) {
@@ -769,14 +790,14 @@ function renderParams(params, pathIndex) {
 function renderMatch(verb, route, path7, pathIndex) {
   const handler = `${verb}${route.index}`;
   const params = path7.params ? renderParams(path7.params, pathIndex) : "{}";
-  const meta = route.meta ? `meta${route.index}` : "{}";
+  const meta = route.meta ? `${verb}${route.index}_meta` : "{}";
   return `{ handler: ${handler}, params: ${params}, meta: ${meta}, path: '${path7.path}' }`;
 }
 function renderMiddleware(middleware, rootDir) {
   const writer = createStringWriter();
   const imports = writer.branch("imports");
   imports.writeLines(
-    `import { normalize } from "${virtualFilePrefix}/runtime/internal";`
+    `import { normalizeHandler } from "${virtualFilePrefix}/runtime/internal";`
   );
   writer.writeLines("");
   for (const { id, filePath } of middleware) {
@@ -784,7 +805,9 @@ function renderMiddleware(middleware, rootDir) {
     imports.writeLines(
       `import ${importName} from "${normalizedRelativePath(rootDir, filePath)}";`
     );
-    writer.writeLines(`export const mware${id} = normalize(${importName});`);
+    writer.writeLines(
+      `export const mware${id} = normalizeHandler(${importName});`
+    );
   }
   imports.join();
   return writer.end();
@@ -943,7 +966,12 @@ function writeModuleDeclaration(writer, name, routeType, moduleTypes) {
     export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
     export type Route = ${routeType};
     export type Context = Run.MultiRouteContext<Route>${isMarko ? " & Marko.Global" : ""};
-    export type Handler = Run.HandlerLike<Route>;
+    export type Handler = Run.HandlerLike<Route>;`);
+    for (const verb of httpVerbs) {
+      writer.write(`
+    export type ${verb.toUpperCase()} = Run.HandlerLike<Route, "${verb.toUpperCase()}">;`);
+    }
+    writer.write(`
     /** @deprecated use \`((context, next) => { ... }) satisfies MarkoRun.Handler\` instead */
     export const route: Run.HandlerTypeFn<Route>;
   }`);
@@ -1544,7 +1572,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)) {
@@ -2484,6 +2512,31 @@ var defaultConfigPlugin = {
   }
 };
 
+// src/vite/utils/meta-data.ts
+var verbKeys = new Set(httpVerbs.map((v) => v.toUpperCase()));
+function isObject(obj) {
+  return obj && typeof obj === "object" && !Array.isArray(obj);
+}
+function getMetaDataForVerb(data, verb) {
+  if (!httpVerbs.includes(verb.toLowerCase())) {
+    throw new Error(
+      `Invalid argument 'verb': expected one of ${[...verbKeys].join(", ")} but received ${verb}`
+    );
+  }
+  if (isObject(data)) {
+    return Object.keys(data).reduce(
+      (result, key) => {
+        if (!(key in result || verbKeys.has(key))) {
+          result[key] = data[key];
+        }
+        return result;
+      },
+      isObject(data[verb]) ? { ...data[verb] } : {}
+    );
+  }
+  return data;
+}
+
 // src/vite/utils/server.ts
 import cp from "child_process";
 import cluster from "cluster";
@@ -2634,6 +2687,7 @@ export {
   defaultConfigPlugin,
   getApi,
   getAvailablePort,
+  getMetaDataForVerb,
   getPackageData,
   isPortInUse,
   loadEnv,

package/dist/vite/utils/meta-data.d.ts

@@ -0,0 +1,3 @@
+import { NormalizedMeta, NormalizedMetaLookup, Verb } from "../../runtime/types";
+export declare function getMetaDataForVerb<T, TVerb extends Verb>(data: T, verb: TVerb): NormalizedMeta<T, TVerb>;
+export declare function getMetaDataLookup<T>(data: T): NormalizedMetaLookup<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "The Marko application framework.",
   "keywords": [
     "marko"