diesel-core 1.7.0 → 1.7.1

package/dist/request_pipeline.js

@@ -1,5 +1,6 @@
 import { Context } from "./ctx";
 import { executeBunMiddlewares, generateErrorResponse, handleRouteNotFound, runFilter, runHooks } from "./utils/request.util";
+import { isPromise } from "./utils/promise";
 function extractBody(fn) {
     const src = fn.toString().trim();
     // Arrow function without braces: () => new Response("...")
@@ -95,55 +96,25 @@ const pushMiddlewares = (pipeline, globalMiddlewares) => {
 };
 export const buildRequestPipeline = (diesel) => {
     const pipeline = [];
-    const globalMiddlewares = diesel.globalMiddlewares || [];
-    // const onRequestHooks = config?.hasOnReqHook ? diesel.hooks.onRequest : [] as any;
     const PreHandlerHook = (diesel === null || diesel === void 0 ? void 0 : diesel.hasPreHandlerHook) ? diesel.hooks.preHandler : [];
     const OnSendHook = (diesel === null || diesel === void 0 ? void 0 : diesel.hasOnSendHook) ? diesel.hooks.onSend : [];
     // parse pathname
     pushParsePathname(pipeline);
     // finc routeHandler
     pipeline.push(`
-      const routeHandler = diesel.router.find(req.method, pathname);
+      const matchedRouteHandler = diesel.router.find(req.method, pathname);
     `);
-    // Hooks
-    // if (onRequestHooks && onRequestHooks.length > 0) {
-    //   pushHooks(pipeline, onRequestHooks, 'onRequest', 'req', 'pathname', 'server')
-    // }
     pipeline.push(`
           const ctx = new Context(
           req, 
           server, 
           pathname, 
-          routeHandler?.path,
-          routeHandler?.params,
+          matchedRouteHandler?.path,
+          matchedRouteHandler?.params,
           env,
           executionContext
           )
     `);
-    // Middlewares
-    // if (config?.hasMiddleware) {
-    //   if (globalMiddlewares.length > 0) {
-    //     pushMiddlewares(pipeline, globalMiddlewares as any)
-    //   }
-    //   // Local/path-specific middlewares still run via function
-    //   if (diesel.middlewares.size > 0) {
-    //     pipeline.push(`
-    //     const local = diesel.middlewares.get(pathname)
-    //     if (local && local.length) {
-    //       for (const middleware of local) {
-    //         const result = await middleware(ctx);
-    //         if (result) return result;
-    //       }
-    //     }
-    //       `)
-    //   }
-    //   // if (diesel.middlewares.size > 0) {
-    //   //   pipeline.push(`
-    //   //     const mwResult = await runMiddlewares(diesel, pathname, ctx);
-    //   //     if (mwResult) return mwResult;
-    //   //   `);
-    //   // }
-    // }
     // Filters
     if (diesel.hasFilterEnabled) {
         pipeline.push(`
@@ -157,13 +128,20 @@ export const buildRequestPipeline = (diesel) => {
     }
     // Actual route handler
     pipeline.push(`
-        let finalResult
-      let arr = routeHandler?.handler;
-      for (let i = 0; i < arr?.length; i++) {
-        const result = arr[i]?.(ctx)
-        finalResult = result instanceof Promise ? await result : result;
-        if (finalResult instanceof Response) break
-      }
+          let finalResult
+                const handlers = matchedRouteHandler?.handler;
+          
+                if (handlers.length === 1) {
+                  const result = handlers[0](ctx);
+                  finalResult = isPromise(result) ? await result : result;
+                }
+                else {
+                  for (let i = 0; i < handlers.length; i++) {
+                    const result = handlers[i](ctx);
+                    finalResult = isPromise(result) ? await result : result;
+                    if (finalResult) break;
+                  }
+                }
     `);
     // onSend
     if (diesel.hasOnSendHook) {
@@ -171,7 +149,7 @@ export const buildRequestPipeline = (diesel) => {
     }
     // Final response
     pipeline.push(`
-      if (finalResult instanceof Response) return finalResult;
+      if (finalResult) return finalResult;
     `);
     // Route not found check
     pipeline.push(`
@@ -182,7 +160,7 @@ export const buildRequestPipeline = (diesel) => {
           ${pipeline.join("\n")}
       }
     `;
-    const fnc = new Function("runFilter", "handleRouteNotFound", "generateErrorResponse", "Context", fnBody)(runFilter, handleRouteNotFound, generateErrorResponse, Context);
+    const fnc = new Function("runFilter", "handleRouteNotFound", "generateErrorResponse", "Context", "isPromise", fnBody)(runFilter, handleRouteNotFound, generateErrorResponse, Context, isPromise);
     // console.log(fnc.toString())
     return fnc;
 };