@marko/run 0.9.5 → 0.9.7

package/dist/vite/index.cjs

@@ -43,6 +43,7 @@ __export(vite_exports, {
   defaultConfigPlugin: () => defaultConfigPlugin,
   getApi: () => getApi,
   getAvailablePort: () => getAvailablePort,
+  getMetaDataForVerb: () => getMetaDataForVerb,
   getPackageData: () => getPackageData,
   isPortInUse: () => isPortInUse,
   loadEnv: () => loadEnv,
@@ -72,6 +73,7 @@ var import_kleur = __toESM(require("kleur"), 1);
 var import_supports_color = __toESM(require("supports-color"), 1);
 function stripAnsi(string) {
   return string.replace(
+    /* cspell:disable-next-line */
     /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
     ""
   );
@@ -354,7 +356,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");
@@ -386,7 +391,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)}";`
@@ -398,8 +405,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) {
@@ -518,10 +535,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)) {
@@ -813,14 +836,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) {
@@ -828,7 +851,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();
@@ -987,7 +1012,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>;
   }`);
@@ -1352,12 +1382,12 @@ var VDir = _VDir;
 // src/vite/routes/builder.ts
 var markoFiles = `(${RoutableFileTypes.Layout}|${RoutableFileTypes.Page}|${RoutableFileTypes.NotFound}|${RoutableFileTypes.Error})\\.(?:.*\\.)?(marko)`;
 var nonMarkoFiles = `(${RoutableFileTypes.Middleware}|${RoutableFileTypes.Handler}|${RoutableFileTypes.Meta})\\.(?:.*\\.)?(.+)`;
-var routeableFileRegex = new RegExp(
+var RoutableFileRegex = new RegExp(
   `[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
 function matchRoutableFile(filename) {
-  const match = filename.match(routeableFileRegex);
+  const match = filename.match(RoutableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
 }
 async function buildRoutes(sources, outDir) {
@@ -1399,7 +1429,7 @@ async function buildRoutes(sources, outDir) {
     },
     onFile(file) {
       const { name } = file;
-      const match = name.match(routeableFileRegex);
+      const match = name.match(RoutableFileRegex);
       if (!match) {
         return;
       }
@@ -2173,9 +2203,15 @@ function markoRun(opts = {}) {
           }
           rollupOutputOptions = mergeOutputOptions(
             {
-              assetFileNames: `${assetsDir}/[name]-[hash].[ext]`,
+              assetFileNames(info) {
+                var _a2;
+                const name = ((_a2 = info.names) == null ? void 0 : _a2[0]) && cleanFileName(info.names[0]);
+                return name ? `${assetsDir}/${name}-[hash].[ext]` : `${assetsDir}/_[hash].[ext]`;
+              },
               entryFileNames(info) {
-                return `${assetsDir}/${getEntryFileName(info.name) || "[name]"}-[hash].js`;
+                const raw = getEntryFileName(info.name) || info.name;
+                const name = raw && cleanFileName(raw);
+                return name ? `${assetsDir}/${name}-[hash].js` : `${assetsDir}/_[hash].js`;
               },
               chunkFileNames: isSSRBuild ? `_[hash].js` : `${assetsDir}/_[hash].js`
             },
@@ -2457,11 +2493,11 @@ async function resolveAdapter(root, options, log) {
   }
   const pkg = await getPackageData(root);
   if (pkg) {
-    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    let dependencies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
     if (pkg.devDependencies) {
-      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+      dependencies = dependencies.concat(Object.keys(pkg.devDependencies));
     }
-    for (const name of dependecies) {
+    for (const name of dependencies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module3 = await import(
@@ -2469,7 +2505,7 @@ async function resolveAdapter(root, options, log) {
             name
           );
           log && debug(
-            `Using adapter ${name} listed in your package.json dependecies`
+            `Using adapter ${name} listed in your package.json dependencies`
           );
           return module3.default();
         } catch (err) {
@@ -2491,6 +2527,9 @@ function getEntryFileName(file) {
   const match = file && markoEntryFileRegex.exec(file);
   return match ? match[1] : void 0;
 }
+function cleanFileName(name) {
+  return name.replace(/\.[^/.]+$/, "").replace(/[^a-zA-Z0-9._[\]-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-|-$/g, "");
+}
 function getPlugin(config2) {
   return config2.plugins.find(
     (plugin) => plugin.name === `${PLUGIN_NAME_PREFIX}:pre`
@@ -2528,6 +2567,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
 var import_child_process = __toESM(require("child_process"), 1);
 var import_cluster = __toESM(require("cluster"), 1);
@@ -2640,7 +2704,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `Timeout while wating for server to start on port "${port}".`
+        `Timeout while waiting for server to start on port "${port}".`
       );
     }
   }
@@ -2678,6 +2742,7 @@ function sleep(ms) {
   defaultConfigPlugin,
   getApi,
   getAvailablePort,
+  getMetaDataForVerb,
   getPackageData,
   isPortInUse,
   loadEnv,

package/dist/vite/index.d.ts

@@ -1,4 +1,4 @@
 export { default, defaultConfigPlugin, getApi, getPackageData } from "./plugin";
 export type { Adapter, AdapterConfig, BuiltRoutes, ExplorerData, ExternalRoutes, HttpVerb, Options, PackageData, PathInfo, RoutableFile, RoutableFileType, Route, RouteGenerationData, } from "./types";
-export type { SpawnedServer } from "./utils/server";
-export { getAvailablePort, isPortInUse, loadEnv, parseEnv, spawnServer, spawnServerWorker, } from "./utils/server";
+export { getMetaDataForVerb } from "./utils/meta-data";
+export { getAvailablePort, isPortInUse, loadEnv, parseEnv, type SpawnedServer, spawnServer, spawnServerWorker, } from "./utils/server";

package/dist/vite/index.js

@@ -25,9 +25,10 @@ import {
 
 // src/adapter/utils.ts
 import kleur from "kleur";
-import supporsColor from "supports-color";
+import supportsColor from "supports-color";
 function stripAnsi(string) {
   return string.replace(
+    /* cspell:disable-next-line */
     /([\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><])/g,
     ""
   );
@@ -310,7 +311,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 +346,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 +360,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 +490,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 +791,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 +806,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 +967,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>;
   }`);
@@ -1308,12 +1337,12 @@ var VDir = _VDir;
 // src/vite/routes/builder.ts
 var markoFiles = `(${RoutableFileTypes.Layout}|${RoutableFileTypes.Page}|${RoutableFileTypes.NotFound}|${RoutableFileTypes.Error})\\.(?:.*\\.)?(marko)`;
 var nonMarkoFiles = `(${RoutableFileTypes.Middleware}|${RoutableFileTypes.Handler}|${RoutableFileTypes.Meta})\\.(?:.*\\.)?(.+)`;
-var routeableFileRegex = new RegExp(
+var RoutableFileRegex = new RegExp(
   `[+](?:${markoFiles}|${nonMarkoFiles})$`,
   "i"
 );
 function matchRoutableFile(filename) {
-  const match = filename.match(routeableFileRegex);
+  const match = filename.match(RoutableFileRegex);
   return match && (match[1] || match[3]).toLowerCase();
 }
 async function buildRoutes(sources, outDir) {
@@ -1355,7 +1384,7 @@ async function buildRoutes(sources, outDir) {
     },
     onFile(file) {
       const { name } = file;
-      const match = name.match(routeableFileRegex);
+      const match = name.match(RoutableFileRegex);
       if (!match) {
         return;
       }
@@ -2129,9 +2158,15 @@ function markoRun(opts = {}) {
           }
           rollupOutputOptions = mergeOutputOptions(
             {
-              assetFileNames: `${assetsDir}/[name]-[hash].[ext]`,
+              assetFileNames(info) {
+                var _a2;
+                const name = ((_a2 = info.names) == null ? void 0 : _a2[0]) && cleanFileName(info.names[0]);
+                return name ? `${assetsDir}/${name}-[hash].[ext]` : `${assetsDir}/_[hash].[ext]`;
+              },
               entryFileNames(info) {
-                return `${assetsDir}/${getEntryFileName(info.name) || "[name]"}-[hash].js`;
+                const raw = getEntryFileName(info.name) || info.name;
+                const name = raw && cleanFileName(raw);
+                return name ? `${assetsDir}/${name}-[hash].js` : `${assetsDir}/_[hash].js`;
               },
               chunkFileNames: isSSRBuild ? `_[hash].js` : `${assetsDir}/_[hash].js`
             },
@@ -2413,11 +2448,11 @@ async function resolveAdapter(root, options, log) {
   }
   const pkg = await getPackageData(root);
   if (pkg) {
-    let dependecies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
+    let dependencies = pkg.dependencies ? Object.keys(pkg.dependencies) : [];
     if (pkg.devDependencies) {
-      dependecies = dependecies.concat(Object.keys(pkg.devDependencies));
+      dependencies = dependencies.concat(Object.keys(pkg.devDependencies));
     }
-    for (const name of dependecies) {
+    for (const name of dependencies) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(
@@ -2425,7 +2460,7 @@ async function resolveAdapter(root, options, log) {
             name
           );
           log && debug(
-            `Using adapter ${name} listed in your package.json dependecies`
+            `Using adapter ${name} listed in your package.json dependencies`
           );
           return module2.default();
         } catch (err) {
@@ -2447,6 +2482,9 @@ function getEntryFileName(file) {
   const match = file && markoEntryFileRegex.exec(file);
   return match ? match[1] : void 0;
 }
+function cleanFileName(name) {
+  return name.replace(/\.[^/.]+$/, "").replace(/[^a-zA-Z0-9._[\]-]+/g, "-").replace(/-{2,}/g, "-").replace(/^-|-$/g, "");
+}
 function getPlugin(config2) {
   return config2.plugins.find(
     (plugin) => plugin.name === `${PLUGIN_NAME_PREFIX}:pre`
@@ -2484,6 +2522,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";
@@ -2596,7 +2659,7 @@ async function waitForServer(port, wait = 0) {
       await sleep(100);
     } else {
       throw new Error(
-        `Timeout while wating for server to start on port "${port}".`
+        `Timeout while waiting for server to start on port "${port}".`
       );
     }
   }
@@ -2634,6 +2697,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.5",
+  "version": "0.9.7",
   "description": "The Marko application framework.",
   "keywords": [
     "marko"