princejs 1.8.2 → 1.8.3

package/dist/prince.d.ts

@@ -7,6 +7,9 @@ export interface PrinceRequest extends Request {
     user?: any;
     params?: Record<string, string>;
     query?: URLSearchParams;
+    session?: any;
+    apiKey?: string;
+    sseSend?: (data: any, event?: string, id?: string) => void;
     [key: string]: any;
 }
 interface WebSocketHandler {
@@ -37,18 +40,19 @@ export declare class Prince {
     private openapiData;
     private router;
     private staticRoutes;
+    private staticMiddlewares;
     private routeCache;
     constructor(devMode?: boolean);
     use(mw: Middleware): this;
     error(fn: (err: any, req: PrinceRequest) => Response): this;
     json(data: any, status?: number): Response;
     response(): ResponseBuilder;
-    get(path: string, handler: RouteHandler): this;
-    post(path: string, handler: RouteHandler): this;
-    put(path: string, handler: RouteHandler): this;
-    delete(path: string, handler: RouteHandler): this;
-    patch(path: string, handler: RouteHandler): this;
-    options(path: string, handler: RouteHandler): this;
+    get(path: string, ...args: (RouteHandler | Middleware)[]): this;
+    post(path: string, ...args: (RouteHandler | Middleware)[]): this;
+    put(path: string, ...args: (RouteHandler | Middleware)[]): this;
+    delete(path: string, ...args: (RouteHandler | Middleware)[]): this;
+    patch(path: string, ...args: (RouteHandler | Middleware)[]): this;
+    options(path: string, ...args: (RouteHandler | Middleware)[]): this;
     ws(path: string, handlers: WebSocketHandler): this;
     private add;
     private buildRouter;

package/dist/prince.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prince.d.ts","sourceRoot":"","sources":["../src/prince.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prince.d.ts","sourceRoot":"","sources":["../src/prince.ts"],"names":[],"mappings":"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"}

package/dist/prince.js

@@ -46,6 +46,7 @@ class Prince {
   openapiData = null;
   router = null;
   staticRoutes = new Map;
+  staticMiddlewares = new Map;
   routeCache = new Map;
   constructor(devMode = false) {
     this.devMode = devMode;
@@ -67,39 +68,44 @@ class Prince {
   response() {
     return new ResponseBuilder;
   }
-  get(path, handler) {
-    return this.add("GET", path, handler);
+  get(path, ...args) {
+    return this.add("GET", path, args);
   }
-  post(path, handler) {
-    return this.add("POST", path, handler);
+  post(path, ...args) {
+    return this.add("POST", path, args);
   }
-  put(path, handler) {
-    return this.add("PUT", path, handler);
+  put(path, ...args) {
+    return this.add("PUT", path, args);
   }
-  delete(path, handler) {
-    return this.add("DELETE", path, handler);
+  delete(path, ...args) {
+    return this.add("DELETE", path, args);
   }
-  patch(path, handler) {
-    return this.add("PATCH", path, handler);
+  patch(path, ...args) {
+    return this.add("PATCH", path, args);
   }
-  options(path, handler) {
-    return this.add("OPTIONS", path, handler);
+  options(path, ...args) {
+    return this.add("OPTIONS", path, args);
   }
   ws(path, handlers) {
     this.wsRoutes[path] = handlers;
     return this;
   }
-  add(method, path, handler) {
+  add(method, path, args) {
     if (!path.startsWith("/"))
       path = "/" + path;
     if (path !== "/" && path.endsWith("/"))
       path = path.slice(0, -1);
     const parts = path === "/" ? [""] : path.split("/").slice(1);
-    this.rawRoutes.push({ method, path, parts, handler });
+    const handler = args[args.length - 1];
+    const middlewares = args.slice(0, -1);
+    this.rawRoutes.push({ method, path, parts, handler, middlewares });
     const isStaticRoute = !parts.some((part) => part.includes(":") || part.includes("*") || part.includes("("));
     if (isStaticRoute) {
       const staticKey = `${method}:${path}`;
       this.staticRoutes.set(staticKey, handler);
+      if (middlewares.length > 0) {
+        this.staticMiddlewares.set(staticKey, middlewares);
+      }
     }
     this.routeCache.clear();
     this.router = null;
@@ -111,6 +117,7 @@ class Prince {
     const root = {
       pattern: "",
       handlers: {},
+      middlewares: {},
       children: []
     };
     for (const route of this.rawRoutes) {
@@ -138,6 +145,7 @@ class Prince {
         const newNode = {
           pattern: part,
           handlers: {},
+          middlewares: {},
           children: []
         };
         if (part.startsWith(":")) {
@@ -152,6 +160,9 @@ class Prince {
       }
     }
     currentNode.handlers[route.method] = route.handler;
+    if (route.middlewares.length > 0) {
+      currentNode.middlewares[route.method] = route.middlewares;
+    }
   }
   findRoute(method, pathname) {
     const cacheKey = `${method}:${pathname}`;
@@ -161,7 +172,11 @@ class Prince {
     const staticKey = `${method}:${pathname}`;
     const staticHandler = this.staticRoutes.get(staticKey);
     if (staticHandler) {
-      const result2 = { handler: staticHandler, params: {} };
+      const result2 = {
+        handler: staticHandler,
+        params: {},
+        middlewares: this.staticMiddlewares.get(staticKey) || []
+      };
       this.routeCache.set(cacheKey, result2);
       return result2;
     }
@@ -187,6 +202,7 @@ class Prince {
       const methodNotAllowed = {
         handler: null,
         params: {},
+        middlewares: [],
         allowedMethods: Array.from(allowedMethods)
       };
       this.routeCache.set(cacheKey, methodNotAllowed);
@@ -199,9 +215,8 @@ class Prince {
     const routeParts = routePath === "/" ? [""] : routePath.split("/").slice(1);
     const requestParts = requestPath === "/" ? [""] : requestPath.split("/").slice(1);
     if (routeParts.length !== requestParts.length) {
-      if (routeParts.includes("**")) {
+      if (routeParts.includes("**"))
         return true;
-      }
       return false;
     }
     for (let i = 0;i < routeParts.length; i++) {
@@ -219,7 +234,8 @@ class Prince {
   matchRoute(node, segments, method, params = {}, index = 0) {
     if (index === segments.length) {
       const handler = node.handlers[method];
-      return handler ? { handler, params } : null;
+      const middlewares = node.middlewares[method] || [];
+      return handler ? { handler, params, middlewares } : null;
     }
     const segment = segments[index];
     for (const child of node.children) {
@@ -250,8 +266,9 @@ class Prince {
     for (const child of node.children) {
       if (child.isCatchAll) {
         const handler = child.handlers[method];
+        const middlewares = child.middlewares[method] || [];
         if (handler) {
-          return { handler, params };
+          return { handler, params, middlewares };
         }
       }
     }
@@ -289,10 +306,10 @@ class Prince {
     }
     return null;
   }
-  async executeHandler(req, handler, params, query) {
+  async executeHandler(req, handler, params, query, routeMiddlewares) {
     Object.defineProperty(req, "params", { value: params, writable: true, configurable: true });
     Object.defineProperty(req, "query", { value: query, writable: true, configurable: true });
-    if (["POST", "PUT", "PATCH"].includes(req.method)) {
+    if (["POST", "PUT", "PATCH"].includes(req.method) && !req.parsedBody) {
       const parsed = await this.parseBody(req);
       if (parsed) {
         if (typeof parsed === "object" && "files" in parsed && "fields" in parsed) {
@@ -310,10 +327,11 @@ class Prince {
       },
       configurable: true
     });
+    const allMiddlewares = routeMiddlewares.length > 0 ? [...this.middlewares, ...routeMiddlewares] : this.middlewares;
     let i = 0;
     const next = async () => {
-      while (i < this.middlewares.length) {
-        const result = await this.middlewares[i++](req, next);
+      while (i < allMiddlewares.length) {
+        const result = await allMiddlewares[i++](req, next);
         if (result instanceof Response)
           return result;
       }
@@ -346,7 +364,7 @@ class Prince {
         }
       });
     }
-    return this.executeHandler(r, routeMatch.handler, routeMatch.params, url.searchParams);
+    return this.executeHandler(r, routeMatch.handler, routeMatch.params, url.searchParams, routeMatch.middlewares);
   }
   async fetch(req) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "princejs",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "An easy and fast backend framework that is among the top three — by a 13yo developer, for developers.",
   "main": "dist/prince.js",
   "types": "dist/prince.d.ts",