devflare 1.0.0-next.14 → 1.0.0-next.16

package/dist/{index-8gtqgb3q.js → index-hjy8ctpc.js}

@@ -2,7 +2,7 @@ import {
   createFetchEvent,
   getContextOrNull,
   runWithEventContext
-} from "./index-5yxg30va.js";
+} from "./index-cgbvmse6.js";
 
 // src/runtime/validation.ts
 class ContextAccessError extends Error {
@@ -113,25 +113,22 @@ var event = createReadonlyProxy(() => getContextOrNull()?.event, "event");
 var locals = createContextProxy(() => getContextOrNull()?.locals, "locals");
 // src/runtime/middleware.ts
 var FETCH_SEQUENCE_SYMBOL = Symbol.for("devflare.fetch-sequence");
-var FETCH_INVOCATION_MODE_SYMBOL = Symbol.for("devflare.fetch-invocation-mode");
+var FETCH_RESOLVE_STYLE_SYMBOL = Symbol.for("devflare.fetch-resolve-style");
 function createNotFoundResponse() {
   return new Response("Not Found", { status: 404 });
 }
 function isFunction(value) {
   return typeof value === "function";
 }
-function markFetchInvocationMode(handler, mode) {
-  Object.defineProperty(handler, FETCH_INVOCATION_MODE_SYMBOL, {
-    value: mode,
+function markResolveStyle(handler) {
+  Object.defineProperty(handler, FETCH_RESOLVE_STYLE_SYMBOL, {
+    value: true,
     enumerable: false,
     configurable: true,
     writable: false
   });
   return handler;
 }
-function getFetchInvocationMode(handler) {
-  return handler[FETCH_INVOCATION_MODE_SYMBOL] ?? null;
-}
 function splitParameterList(source) {
   const parameters = [];
   let current = "";
@@ -169,9 +166,8 @@ function getFunctionParameterNames(handler) {
   return [];
 }
 function isResolveStyleFunction(handler) {
-  const mode = getFetchInvocationMode(handler);
-  if (mode) {
-    return mode === "resolve";
+  if (handler[FETCH_RESOLVE_STYLE_SYMBOL]) {
+    return true;
   }
   if (handler[FETCH_SEQUENCE_SYMBOL]) {
     return true;
@@ -192,32 +188,7 @@ function bindMethod(target, key) {
     return null;
   }
   const boundHandler = value.bind(target);
-  if (isResolveStyleFunction(value)) {
-    return markFetchInvocationMode(boundHandler, "resolve");
-  }
-  return boundHandler;
-}
-function createLegacySequence(middlewares) {
-  return (handler) => {
-    if (middlewares.length === 0) {
-      return async () => {
-        const response = await handler();
-        return response ?? createNotFoundResponse();
-      };
-    }
-    return async () => {
-      let index = 0;
-      const executeMiddleware = async () => {
-        if (index < middlewares.length) {
-          const middleware = middlewares[index++];
-          return middleware(executeMiddleware);
-        }
-        const response = await handler();
-        return response ?? createNotFoundResponse();
-      };
-      return executeMiddleware();
-    };
-  };
+  return isResolveStyleFunction(value) ? markResolveStyle(boundHandler) : boundHandler;
 }
 function createFetchSequence(middlewares) {
   return async (event2, resolve = async () => createNotFoundResponse()) => {
@@ -234,38 +205,14 @@ function createFetchSequence(middlewares) {
   };
 }
 function sequence(...middlewares) {
-  const legacySequence = createLegacySequence(middlewares);
-  const fetchSequence = createFetchSequence(middlewares);
-  const composed = (...args) => {
-    if (args.length === 1 && isFunction(args[0])) {
-      return legacySequence(args[0]);
-    }
-    return fetchSequence(args[0], args[1] ?? (async () => createNotFoundResponse()));
-  };
+  const composed = createFetchSequence(middlewares);
   Object.defineProperty(composed, FETCH_SEQUENCE_SYMBOL, {
     value: true,
     enumerable: false,
     configurable: false,
     writable: false
   });
-  return composed;
-}
-function handle(...handlers) {
-  return async () => {
-    for (const handler of handlers) {
-      const response = await handler();
-      if (response !== null) {
-        return response;
-      }
-    }
-    return null;
-  };
-}
-function resolve(...handlers) {
-  return handle(...handlers);
-}
-function pipe(middlewares, handlers) {
-  return createLegacySequence(middlewares)(handle(...handlers));
+  return markResolveStyle(composed);
 }
 function getDefaultHandleHandler(module) {
   return bindMethod(module.default, "handle");
@@ -347,18 +294,9 @@ async function invokeResolvedFetchHandler(handler, event2) {
   if (isResolveStyleFunction(handler)) {
     return handler(event2, async () => createNotFoundResponse());
   }
-  if (handler.length >= 4) {
-    return handler(event2, event2.env, event2.ctx, event2.params);
-  }
-  if (handler.length === 3) {
-    return handler(event2, event2.env, event2.ctx);
-  }
   if (handler.length === 2) {
     return handler(event2, event2.params);
   }
-  if (handler.length === 0) {
-    return handler();
-  }
   return handler(event2);
 }
 function resolveFetchHandler(module) {
@@ -366,28 +304,12 @@ function resolveFetchHandler(module) {
   assertSinglePrimaryFetchEntry(candidates);
   return candidates[0]?.handler ?? null;
 }
-async function invokeFetchHandler(handler, event2, resolve2 = async () => createNotFoundResponse()) {
+async function invokeFetchHandler(handler, event2, resolve = async () => createNotFoundResponse()) {
   if (!isFunction(handler)) {
-    return resolve2(event2);
+    return resolve(event2);
   }
   if (isResolveStyleFunction(handler)) {
-    const response2 = await handler(event2, resolve2);
-    return response2 ?? createNotFoundResponse();
-  }
-  if (handler.length >= 4) {
-    const response2 = await handler(event2, event2.env, event2.ctx, event2.params);
-    return response2 ?? createNotFoundResponse();
-  }
-  if (handler.length === 3) {
-    const response2 = await handler(event2, event2.env, event2.ctx);
-    return response2 ?? createNotFoundResponse();
-  }
-  if (handler.length === 2) {
-    const response2 = await handler(event2, event2.env);
-    return response2 ?? createNotFoundResponse();
-  }
-  if (handler.length === 0) {
-    const response2 = await handler();
+    const response2 = await handler(event2, resolve);
     return response2 ?? createNotFoundResponse();
   }
   const response = await handler(event2);
@@ -526,4 +448,4 @@ function createRouteResolve(routes, initialEvent) {
     return invokeRouteModules(routes, nextEvent);
   };
 }
-export { ContextAccessError, createContextProxy, env, ctx, event, locals, sequence, handle, resolve, pipe, resolveFetchHandler, invokeFetchHandler, createResolveFetch, invokeFetchModule, matchFetchRoute, invokeRouteModules, createRouteResolve };
+export { ContextAccessError, createContextProxy, env, ctx, event, locals, sequence, resolveFetchHandler, invokeFetchHandler, createResolveFetch, invokeFetchModule, matchFetchRoute, invokeRouteModules, createRouteResolve };