bxo 0.0.5-dev.12 → 0.0.5-dev.15

package/index.ts

@@ -43,7 +43,7 @@ export type Context<TConfig extends RouteConfig = {}> = {
 };
 
 // Handler function type
-type Handler<TConfig extends RouteConfig = {}> = (ctx: Context<TConfig>) => Promise<any> | any;
+type Handler<TConfig extends RouteConfig = {}, EC = {}> = (ctx: Context<TConfig> & EC) => Promise<any> | any;
 
 // Route definition
 interface Route {
@@ -231,9 +231,28 @@ export default class BXO {
     return this;
   }
 
+  // Helper methods to get all routes including plugin routes
+  private getAllRoutes(): Route[] {
+    const allRoutes = [...this._routes];
+    for (const plugin of this.plugins) {
+      allRoutes.push(...plugin._routes);
+    }
+    return allRoutes;
+  }
+
+  private getAllWSRoutes(): WSRoute[] {
+    const allWSRoutes = [...this._wsRoutes];
+    for (const plugin of this.plugins) {
+      allWSRoutes.push(...plugin._wsRoutes);
+    }
+    return allWSRoutes;
+  }
+
   // Route matching utility
   private matchRoute(method: string, pathname: string): { route: Route; params: Record<string, string> } | null {
-    for (const route of this._routes) {
+    const allRoutes = this.getAllRoutes();
+
+    for (const route of allRoutes) {
       if (route.method !== method) continue;
 
       const routeSegments = route.path.split('/').filter(Boolean);
@@ -244,7 +263,7 @@ export default class BXO {
 
       // Handle wildcard at the end (catch-all)
       const hasWildcardAtEnd = routeSegments.length > 0 && routeSegments[routeSegments.length - 1] === '*';
-      
+
       if (hasWildcardAtEnd) {
         // For catch-all wildcard, path must have at least as many segments as route (minus the wildcard)
         if (pathSegments.length < routeSegments.length - 1) continue;
@@ -297,7 +316,9 @@ export default class BXO {
 
   // WebSocket route matching utility
   private matchWSRoute(pathname: string): { route: WSRoute; params: Record<string, string> } | null {
-    for (const route of this._wsRoutes) {
+    const allWSRoutes = this.getAllWSRoutes();
+
+    for (const route of allWSRoutes) {
       const routeSegments = route.path.split('/').filter(Boolean);
       const pathSegments = pathname.split('/').filter(Boolean);
 
@@ -306,7 +327,7 @@ export default class BXO {
 
       // Handle wildcard at the end (catch-all)
       const hasWildcardAtEnd = routeSegments.length > 0 && routeSegments[routeSegments.length - 1] === '*';
-      
+
       if (hasWildcardAtEnd) {
         // For catch-all wildcard, path must have at least as many segments as route (minus the wildcard)
         if (pathSegments.length < routeSegments.length - 1) continue;
@@ -727,7 +748,7 @@ export default class BXO {
     }));
 
     // Get routes from all plugins
-    const pluginRoutes = this.plugins.flatMap((plugin, pluginIndex) => 
+    const pluginRoutes = this.plugins.flatMap((plugin, pluginIndex) =>
       plugin._routes.map((route: Route) => ({
         method: route.method,
         path: route.path,
@@ -756,7 +777,7 @@ export default class BXO {
     }));
 
     // Get WebSocket routes from all plugins
-    const pluginWsRoutes = this.plugins.flatMap((plugin, pluginIndex) => 
+    const pluginWsRoutes = this.plugins.flatMap((plugin, pluginIndex) =>
       plugin._wsRoutes.map((route: WSRoute) => ({
         path: route.path,
         hasHandlers: {
@@ -781,7 +802,7 @@ const error = (error: Error | string, status: number = 500) => {
 // File helper function (like Elysia)
 const file = (path: string, options?: { type?: string; headers?: Record<string, string> }) => {
   const bunFile = Bun.file(path);
-  
+
   if (options?.type) {
     // Create a wrapper to override the MIME type
     return {
@@ -790,7 +811,7 @@ const file = (path: string, options?: { type?: string; headers?: Record<string,
       headers: options.headers
     };
   }
-  
+
   return bunFile;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bxo",
   "module": "index.ts",
-  "version": "0.0.5-dev.12",
+  "version": "0.0.5-dev.15",
   "description": "A simple and lightweight web framework for Bun",
   "type": "module",
   "devDependencies": {