@marko/run 0.11.0-rc.1 → 0.11.0-rc.3

package/dist/runtime/internal.cjs

@@ -22,6 +22,7 @@ var internal_exports = {};
 __export(internal_exports, {
   NotHandled: () => NotHandled,
   NotMatched: () => NotMatched,
+  assertHandlerVerb: () => assertHandlerVerb,
   call: () => call,
   compose: () => compose,
   createContext: () => createContext,
@@ -58,6 +59,28 @@ var httpVerbs = [
   "options"
 ];
 
+// src/runtime/thenable.ts
+var kPromise = /* @__PURE__ */ Symbol("promise");
+var kReadFn = /* @__PURE__ */ Symbol("read fn");
+function thenFn(resolve, reject) {
+  return (this[kPromise] || (this[kPromise] = this[kReadFn]())).then(resolve, reject);
+}
+function catchFn(reject) {
+  return (this[kPromise] || (this[kPromise] = this[kReadFn]())).catch(reject);
+}
+function finallyFn(resolve) {
+  return (this[kPromise] || (this[kPromise] = this[kReadFn]())).finally(resolve);
+}
+function thenable(fn) {
+  return {
+    [kPromise]: null,
+    [kReadFn]: fn,
+    then: thenFn,
+    catch: catchFn,
+    finally: finallyFn
+  };
+}
+
 // src/runtime/url-builder.ts
 var encode = encodeURIComponent;
 var pathParts = /* @__PURE__ */ new Map();
@@ -162,18 +185,16 @@ globalThis.MarkoRun ?? (globalThis.MarkoRun = {
   NotHandled,
   NotMatched
 });
-if (!globalThis.Run) {
-  const namespace = {
-    href
-  };
-  for (const v of [...httpVerbs, "all"]) {
-    const verb = v.toUpperCase();
-    const def = createDefineHandler();
-    def.href = href;
-    namespace[verb] = def;
-  }
-  globalThis.Run = namespace;
-}
+globalThis.Run ?? (globalThis.Run = {
+  href,
+  ALL: createDefineHandler("ALL"),
+  ...Object.fromEntries(
+    httpVerbs.map((v) => {
+      const verb = v.toUpperCase();
+      return [v.toUpperCase(), createDefineHandler(verb)];
+    })
+  )
+});
 var toReadable = (rendered) => {
   toReadable = rendered.toReadable ? (rendered2) => rendered2.toReadable() : (rendered2) => {
     let cancelled = false;
@@ -241,6 +262,29 @@ async function readBodyWithLimit(request, maxBytes) {
     bytes.subarray(0, receivedBytes)
   );
 }
+async function readBody(route, context) {
+  const { request } = context;
+  const contentType = request.headers.get("Content-Type");
+  if (contentType == null ? void 0 : contentType.includes("application/json")) {
+    const { maxBytes: maxBytes2, validator: validator2 } = route.options.json;
+    const json = maxBytes2 < 0 ? await request.json() : JSON.parse(await readBodyWithLimit(request, maxBytes2));
+    return validator2 ? validator2(json) : json;
+  }
+  const { maxBytes, maxParts, maxFiles, maxFileBytes, onFile, validator } = route.options.form;
+  const data = searchParamsToObject(
+    (contentType == null ? void 0 : contentType.includes("multipart/form-data")) ? await (0, import_form_data_parser.parseFormData)(
+      request,
+      {
+        maxParts,
+        maxFiles,
+        maxFileSize: maxFileBytes,
+        maxTotalSize: maxBytes
+      },
+      onFile ? (file) => onFile(context, file) : void 0
+    ) : new import_node_url.URLSearchParams(await readBodyWithLimit(request, maxBytes))
+  );
+  return validator && validator(data);
+}
 function createContext(route, request, platform, url = new URL(request.url)) {
   const context = {
     route: (route == null ? void 0 : route.path) || "",
@@ -265,45 +309,7 @@ function createContext(route, request, platform, url = new URL(request.url)) {
       });
       return value;
     },
-    body: route && request.body ? async () => {
-      const contentType = request.headers.get("Content-Type");
-      let value;
-      if (contentType == null ? void 0 : contentType.includes("application/json")) {
-        const { maxBytes, validator } = route.options.json;
-        const json = maxBytes < 0 ? await request.json() : JSON.parse(await readBodyWithLimit(request, maxBytes));
-        value = validator ? validator(json) : json;
-      } else {
-        const {
-          maxBytes,
-          maxParts,
-          maxFiles,
-          maxFileBytes,
-          onFile,
-          validator
-        } = route.options.form;
-        const data = searchParamsToObject(
-          (contentType == null ? void 0 : contentType.includes("multipart/form-data")) ? await (0, import_form_data_parser.parseFormData)(
-            request,
-            {
-              maxParts,
-              maxFiles,
-              maxFileSize: maxFileBytes,
-              maxTotalSize: maxBytes
-            },
-            onFile ? (file) => onFile(context, file) : void 0
-          ) : new import_node_url.URLSearchParams(
-            await readBodyWithLimit(request, maxBytes)
-          )
-        );
-        value = validator ? validator(data) : validator;
-      }
-      Object.defineProperty(context, "body", {
-        configurable: true,
-        enumerable: true,
-        value
-      });
-      return value;
-    } : void 0,
+    body: route && request.body ? thenable(() => readBody(route, context)) : void 0,
     data: {},
     url,
     request,
@@ -357,11 +363,22 @@ function render(context, template, input, data) {
   }
   return context.render(template, input);
 }
+var handlerMethod = /* @__PURE__ */ new WeakMap();
 async function call(handler, next, context, data) {
   let response;
   if (data) {
     Object.assign(context.data, data);
   }
+  let method = handlerMethod.get(handler);
+  if (method === void 0) {
+    handlerMethod.set(
+      handler,
+      method = "verb" in handler && handler.verb !== "ALL" ? handler.verb : false
+    );
+  }
+  if (method && method !== context.method) {
+    return next(data);
+  }
   if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
     let nextCallCount = 0;
     let didThrow = false;
@@ -402,7 +419,7 @@ async function call(handler, next, context, data) {
   if (response === null || response === NotMatched || response === NotHandled) {
     throw response || NotMatched;
   }
-  return response || next();
+  return response || next(data);
 }
 function compose(handlers) {
   const len = handlers.length;
@@ -435,25 +452,37 @@ function normalizeHandler(obj) {
   }
   return passthrough;
 }
-function createDefineHandler() {
+function assertHandlerVerb(verb, handler) {
+  if ("verb" in handler && handler.verb !== verb) {
+    throw new Error(
+      `Expected verb ${verb} but handler was defined with Run.${handler.verb}`
+    );
+  }
+}
+function createDefineHandler(verb) {
   return (optionsOrHandlers, handlers) => {
     let handler;
     if (typeof optionsOrHandlers === "function") {
+      assertHandlerVerb(verb, optionsOrHandlers);
       handler = optionsOrHandlers;
-      handler.options = {};
+      handler.options ?? (handler.options = {});
     } else if (Array.isArray(optionsOrHandlers)) {
+      for (const h of optionsOrHandlers) assertHandlerVerb(verb, h);
       handler = compose(optionsOrHandlers);
-      handler.options = {};
+      handler.options = mergeOptions(...optionsOrHandlers);
     } else if (typeof handlers === "function") {
+      assertHandlerVerb(verb, handlers);
       handler = handlers;
-      handler.options = optionsOrHandlers;
+      handler.options = mergeOptions(handlers, optionsOrHandlers);
     } else if (Array.isArray(handlers)) {
+      for (const h of handlers) assertHandlerVerb(verb, h);
       handler = compose(handlers);
-      handler.options = optionsOrHandlers;
+      handler.options = mergeOptions(...handlers, optionsOrHandlers);
     } else {
       handler = passthroughHandler;
       handler.options = optionsOrHandlers;
     }
+    handler.verb = verb;
     return handler;
   };
 }
@@ -469,19 +498,24 @@ function normalizeValidator(validator) {
 var defaultMaxBytes = 1024 * 1024;
 var defaultMaxParts = 1e3;
 var defaultMaxFiles = 20;
-function mergeOptions(...fns) {
+function mergeOptions(...arr) {
   const merged = {};
-  for (const fn of fns) {
-    if (typeof fn === "function" && "options" in fn) {
-      const { options } = fn;
-      for (const k in options) {
-        const key = k;
-        const option = options[key];
-        if (typeof option === "object" && typeof merged[key] === "object") {
-          Object.assign(merged[key], option);
-        } else if (option) {
-          merged[key] = option;
-        }
+  for (const item of arr) {
+    let options;
+    if (typeof item === "object") {
+      options = item;
+    } else if ("options" in item) {
+      options = item.options;
+    } else {
+      continue;
+    }
+    for (const k in options) {
+      const key = k;
+      const option = options[key];
+      if (typeof option === "object" && typeof merged[key] === "object") {
+        Object.assign(merged[key], option);
+      } else if (option) {
+        merged[key] = option;
       }
     }
   }
@@ -540,6 +574,7 @@ function notMatched() {
 0 && (module.exports = {
   NotHandled,
   NotMatched,
+  assertHandlerVerb,
   call,
   compose,
   createContext,

package/dist/runtime/internal.d.ts

@@ -1,5 +1,5 @@
 import type { Awaitable, RouteHandler } from "./legacy-types";
-import type { Context, HandlerFunction, HandlerOptions, NextFunction, NormalizedHandler, NormalizedHandlerOptions, Platform, RouteData, RouteMatch, Validator } from "./types";
+import type { Context, HandlerFunction, HandlerOptions, HttpVerbOrAll, NextFunction, NormalizedHandler, NormalizedHandlerOptions, Platform, RouteData, RouteMatch, Validator } from "./types";
 export { getMetaDataLookup as normalizeMeta } from "../vite/utils/meta-data";
 export declare const NotHandled: typeof MarkoRun.NotHandled;
 export declare const NotMatched: typeof MarkoRun.NotMatched;
@@ -8,8 +8,9 @@ export declare function render<T>(context: Context, template: Marko.Template<T>,
 export declare function call(handler: HandlerFunction, next: NextFunction, context: Context, data?: RouteData): Promise<Response>;
 export declare function compose(handlers: HandlerFunction[]): HandlerFunction;
 export declare function normalizeHandler(obj: RouteHandler | RouteHandler[] | Promise<RouteHandler | RouteHandler[]>): RouteHandler;
+export declare function assertHandlerVerb(verb: HttpVerbOrAll, handler: HandlerFunction): void;
 export declare function normalizeValidator<T>(validator: Validator<T> | undefined): import("./types").ValidatorFn<T> | undefined;
-export declare function mergeOptions(...fns: (NormalizedHandler<Context, "ALL", any, HandlerOptions> | HandlerFunction)[]): NormalizedHandlerOptions;
+export declare function mergeOptions(...arr: (NormalizedHandler<Context, "ALL", any, HandlerOptions> | HandlerFunction | HandlerOptions)[]): NormalizedHandlerOptions;
 export declare function stripResponseBodySync(response: Response): Response;
 export declare function stripResponseBody(response: Awaitable<Response>): Awaitable<Response>;
 export declare function passthrough(): void;

package/dist/runtime/internal.js

@@ -13,6 +13,28 @@ var httpVerbs = [
   "options"
 ];
 
+// src/runtime/thenable.ts
+var kPromise = /* @__PURE__ */ Symbol("promise");
+var kReadFn = /* @__PURE__ */ Symbol("read fn");
+function thenFn(resolve, reject) {
+  return (this[kPromise] || (this[kPromise] = this[kReadFn]())).then(resolve, reject);
+}
+function catchFn(reject) {
+  return (this[kPromise] || (this[kPromise] = this[kReadFn]())).catch(reject);
+}
+function finallyFn(resolve) {
+  return (this[kPromise] || (this[kPromise] = this[kReadFn]())).finally(resolve);
+}
+function thenable(fn) {
+  return {
+    [kPromise]: null,
+    [kReadFn]: fn,
+    then: thenFn,
+    catch: catchFn,
+    finally: finallyFn
+  };
+}
+
 // src/runtime/url-builder.ts
 var encode = encodeURIComponent;
 var pathParts = /* @__PURE__ */ new Map();
@@ -117,18 +139,16 @@ globalThis.MarkoRun ?? (globalThis.MarkoRun = {
   NotHandled,
   NotMatched
 });
-if (!globalThis.Run) {
-  const namespace = {
-    href
-  };
-  for (const v of [...httpVerbs, "all"]) {
-    const verb = v.toUpperCase();
-    const def = createDefineHandler();
-    def.href = href;
-    namespace[verb] = def;
-  }
-  globalThis.Run = namespace;
-}
+globalThis.Run ?? (globalThis.Run = {
+  href,
+  ALL: createDefineHandler("ALL"),
+  ...Object.fromEntries(
+    httpVerbs.map((v) => {
+      const verb = v.toUpperCase();
+      return [v.toUpperCase(), createDefineHandler(verb)];
+    })
+  )
+});
 var toReadable = (rendered) => {
   toReadable = rendered.toReadable ? (rendered2) => rendered2.toReadable() : (rendered2) => {
     let cancelled = false;
@@ -196,6 +216,29 @@ async function readBodyWithLimit(request, maxBytes) {
     bytes.subarray(0, receivedBytes)
   );
 }
+async function readBody(route, context) {
+  const { request } = context;
+  const contentType = request.headers.get("Content-Type");
+  if (contentType == null ? void 0 : contentType.includes("application/json")) {
+    const { maxBytes: maxBytes2, validator: validator2 } = route.options.json;
+    const json = maxBytes2 < 0 ? await request.json() : JSON.parse(await readBodyWithLimit(request, maxBytes2));
+    return validator2 ? validator2(json) : json;
+  }
+  const { maxBytes, maxParts, maxFiles, maxFileBytes, onFile, validator } = route.options.form;
+  const data = searchParamsToObject(
+    (contentType == null ? void 0 : contentType.includes("multipart/form-data")) ? await parseFormData(
+      request,
+      {
+        maxParts,
+        maxFiles,
+        maxFileSize: maxFileBytes,
+        maxTotalSize: maxBytes
+      },
+      onFile ? (file) => onFile(context, file) : void 0
+    ) : new URLSearchParams2(await readBodyWithLimit(request, maxBytes))
+  );
+  return validator && validator(data);
+}
 function createContext(route, request, platform, url = new URL(request.url)) {
   const context = {
     route: (route == null ? void 0 : route.path) || "",
@@ -220,45 +263,7 @@ function createContext(route, request, platform, url = new URL(request.url)) {
       });
       return value;
     },
-    body: route && request.body ? async () => {
-      const contentType = request.headers.get("Content-Type");
-      let value;
-      if (contentType == null ? void 0 : contentType.includes("application/json")) {
-        const { maxBytes, validator } = route.options.json;
-        const json = maxBytes < 0 ? await request.json() : JSON.parse(await readBodyWithLimit(request, maxBytes));
-        value = validator ? validator(json) : json;
-      } else {
-        const {
-          maxBytes,
-          maxParts,
-          maxFiles,
-          maxFileBytes,
-          onFile,
-          validator
-        } = route.options.form;
-        const data = searchParamsToObject(
-          (contentType == null ? void 0 : contentType.includes("multipart/form-data")) ? await parseFormData(
-            request,
-            {
-              maxParts,
-              maxFiles,
-              maxFileSize: maxFileBytes,
-              maxTotalSize: maxBytes
-            },
-            onFile ? (file) => onFile(context, file) : void 0
-          ) : new URLSearchParams2(
-            await readBodyWithLimit(request, maxBytes)
-          )
-        );
-        value = validator ? validator(data) : validator;
-      }
-      Object.defineProperty(context, "body", {
-        configurable: true,
-        enumerable: true,
-        value
-      });
-      return value;
-    } : void 0,
+    body: route && request.body ? thenable(() => readBody(route, context)) : void 0,
     data: {},
     url,
     request,
@@ -312,11 +317,22 @@ function render(context, template, input, data) {
   }
   return context.render(template, input);
 }
+var handlerMethod = /* @__PURE__ */ new WeakMap();
 async function call(handler, next, context, data) {
   let response;
   if (data) {
     Object.assign(context.data, data);
   }
+  let method = handlerMethod.get(handler);
+  if (method === void 0) {
+    handlerMethod.set(
+      handler,
+      method = "verb" in handler && handler.verb !== "ALL" ? handler.verb : false
+    );
+  }
+  if (method && method !== context.method) {
+    return next(data);
+  }
   if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
     let nextCallCount = 0;
     let didThrow = false;
@@ -357,7 +373,7 @@ async function call(handler, next, context, data) {
   if (response === null || response === NotMatched || response === NotHandled) {
     throw response || NotMatched;
   }
-  return response || next();
+  return response || next(data);
 }
 function compose(handlers) {
   const len = handlers.length;
@@ -390,25 +406,37 @@ function normalizeHandler(obj) {
   }
   return passthrough;
 }
-function createDefineHandler() {
+function assertHandlerVerb(verb, handler) {
+  if ("verb" in handler && handler.verb !== verb) {
+    throw new Error(
+      `Expected verb ${verb} but handler was defined with Run.${handler.verb}`
+    );
+  }
+}
+function createDefineHandler(verb) {
   return (optionsOrHandlers, handlers) => {
     let handler;
     if (typeof optionsOrHandlers === "function") {
+      assertHandlerVerb(verb, optionsOrHandlers);
       handler = optionsOrHandlers;
-      handler.options = {};
+      handler.options ?? (handler.options = {});
     } else if (Array.isArray(optionsOrHandlers)) {
+      for (const h of optionsOrHandlers) assertHandlerVerb(verb, h);
       handler = compose(optionsOrHandlers);
-      handler.options = {};
+      handler.options = mergeOptions(...optionsOrHandlers);
     } else if (typeof handlers === "function") {
+      assertHandlerVerb(verb, handlers);
       handler = handlers;
-      handler.options = optionsOrHandlers;
+      handler.options = mergeOptions(handlers, optionsOrHandlers);
     } else if (Array.isArray(handlers)) {
+      for (const h of handlers) assertHandlerVerb(verb, h);
       handler = compose(handlers);
-      handler.options = optionsOrHandlers;
+      handler.options = mergeOptions(...handlers, optionsOrHandlers);
     } else {
       handler = passthroughHandler;
       handler.options = optionsOrHandlers;
     }
+    handler.verb = verb;
     return handler;
   };
 }
@@ -424,19 +452,24 @@ function normalizeValidator(validator) {
 var defaultMaxBytes = 1024 * 1024;
 var defaultMaxParts = 1e3;
 var defaultMaxFiles = 20;
-function mergeOptions(...fns) {
+function mergeOptions(...arr) {
   const merged = {};
-  for (const fn of fns) {
-    if (typeof fn === "function" && "options" in fn) {
-      const { options } = fn;
-      for (const k in options) {
-        const key = k;
-        const option = options[key];
-        if (typeof option === "object" && typeof merged[key] === "object") {
-          Object.assign(merged[key], option);
-        } else if (option) {
-          merged[key] = option;
-        }
+  for (const item of arr) {
+    let options;
+    if (typeof item === "object") {
+      options = item;
+    } else if ("options" in item) {
+      options = item.options;
+    } else {
+      continue;
+    }
+    for (const k in options) {
+      const key = k;
+      const option = options[key];
+      if (typeof option === "object" && typeof merged[key] === "object") {
+        Object.assign(merged[key], option);
+      } else if (option) {
+        merged[key] = option;
       }
     }
   }
@@ -494,6 +527,7 @@ function notMatched() {
 export {
   NotHandled,
   NotMatched,
+  assertHandlerVerb,
   call,
   compose,
   createContext,

package/dist/runtime/thenable.d.ts

@@ -0,0 +1,11 @@
+declare const kPromise: unique symbol;
+declare const kReadFn: unique symbol;
+export interface Thenable<T = any> extends Promise<T> {
+    [kPromise]: null | Promise<T>;
+    [kReadFn]: () => Promise<T>;
+    then: Promise<T>["then"];
+    catch: Promise<T>["catch"];
+    finally: Promise<T>["finally"];
+}
+export default function thenable<T>(fn: () => Promise<T>): Thenable<T>;
+export {};