princejs 1.7.0 → 1.7.2

package/dist/prince.d.ts

@@ -2,22 +2,13 @@ type Next = () => Promise<Response>;
 type Middleware = (req: PrinceRequest, next: Next) => Promise<Response | undefined> | Response | undefined;
 type HandlerResult = Response | Record<string, any> | string | Uint8Array;
 export interface PrinceRequest extends Request {
-    body: BodyInit | null;
-    json(): Promise<any>;
-    text(): Promise<string>;
-    formData(): Promise<FormData>;
-    arrayBuffer(): Promise<ArrayBuffer>;
+    parsedBody?: any;
+    files?: Record<string, File>;
     user?: any;
     params?: Record<string, string>;
     query?: URLSearchParams;
     [key: string]: any;
 }
-export interface WebSocketHandler {
-    open?: (ws: any) => void;
-    message?: (ws: any, msg: string | Buffer) => void;
-    close?: (ws: any, code?: number, reason?: string) => void;
-    drain?: (ws: any) => void;
-}
 type RouteHandler = (req: PrinceRequest) => Promise<HandlerResult> | HandlerResult;
 declare class ResponseBuilder {
     private _status;
@@ -29,7 +20,6 @@ declare class ResponseBuilder {
     text(data: string): Response;
     html(data: string): Response;
     redirect(url: string, status?: number): Response;
-    stream(cb: (push: (chunk: string) => void, close: () => void) => void): Response;
     build(): Response;
 }
 export declare class Prince {
@@ -40,24 +30,27 @@ export declare class Prince {
     private wsRoutes;
     private openapiData;
     private router;
+    private staticRoutes;
+    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;
-    ws(path: string, options: Partial<WebSocketHandler>): this;
-    openapi(path?: string): this;
     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;
     private add;
-    private isWildcard;
-    private parseUrl;
-    private parseBody;
     private buildRouter;
-    private compilePipeline;
+    private insertRoute;
+    private findRoute;
+    private matchPath;
+    private matchRoute;
+    private parseBody;
+    private executeHandler;
     handleFetch(req: Request): Promise<Response>;
     fetch(req: Request): Promise<Response>;
     listen(port?: number): void;

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

@@ -1,13 +1,5 @@
 // @bun
 // src/prince.ts
-class TrieNode {
-  children = Object.create(null);
-  paramChild;
-  wildcardChild;
-  catchAllChild;
-  handlers = null;
-}
-
 class ResponseBuilder {
   _status = 200;
   _headers = {};
@@ -40,15 +32,6 @@ class ResponseBuilder {
     this._headers["Location"] = url;
     return this.build();
   }
-  stream(cb) {
-    const encoder = new TextEncoder;
-    const stream = new ReadableStream({
-      start(controller) {
-        cb((chunk) => controller.enqueue(encoder.encode(chunk)), () => controller.close());
-      }
-    });
-    return new Response(stream, { status: this._status, headers: this._headers });
-  }
   build() {
     return new Response(this._body, { status: this._status, headers: this._headers });
   }
@@ -62,6 +45,8 @@ class Prince {
   wsRoutes = {};
   openapiData = null;
   router = null;
+  staticRoutes = new Map;
+  routeCache = new Map;
   constructor(devMode = false) {
     this.devMode = devMode;
   }
@@ -82,27 +67,6 @@ class Prince {
   response() {
     return new ResponseBuilder;
   }
-  ws(path, options) {
-    this.wsRoutes[path] = options;
-    return this;
-  }
-  openapi(path = "/docs") {
-    const paths = {};
-    for (const route of this.rawRoutes) {
-      paths[route.path] ??= {};
-      paths[route.path][route.method.toLowerCase()] = {
-        summary: "",
-        responses: { 200: { description: "OK" } }
-      };
-    }
-    this.openapiData = {
-      openapi: "3.1.0",
-      info: { title: "PrinceJS API", version: "1.0.0" },
-      paths
-    };
-    this.get(path, () => this.openapiData);
-    return this;
-  }
   get(path, handler) {
     return this.add("GET", path, handler);
   }
@@ -118,6 +82,9 @@ class Prince {
   patch(path, handler) {
     return this.add("PATCH", path, handler);
   }
+  options(path, handler) {
+    return this.add("OPTIONS", path, handler);
+  }
   add(method, path, handler) {
     if (!path.startsWith("/"))
       path = "/" + path;
@@ -125,175 +92,257 @@ class Prince {
       path = path.slice(0, -1);
     const parts = path === "/" ? [""] : path.split("/").slice(1);
     this.rawRoutes.push({ method, path, parts, handler });
-    if (method !== "OPTIONS" && !this.rawRoutes.some((r) => r.path === path && r.method === "OPTIONS")) {
-      this.rawRoutes.push({
-        method: "OPTIONS",
-        path,
-        parts,
-        handler: () => new Response(null, { status: 204 })
-      });
+    const isStaticRoute = !parts.some((part) => part.includes(":") || part.includes("*") || part.includes("("));
+    if (isStaticRoute) {
+      const staticKey = `${method}:${path}`;
+      this.staticRoutes.set(staticKey, handler);
     }
+    this.routeCache.clear();
     this.router = null;
     return this;
   }
-  isWildcard(part) {
-    return part === "*" || part === "**";
+  buildRouter() {
+    if (this.router)
+      return this.router;
+    const root = {
+      pattern: "",
+      handlers: {},
+      children: []
+    };
+    for (const route of this.rawRoutes) {
+      if (this.staticRoutes.has(`${route.method}:${route.path}`)) {
+        continue;
+      }
+      this.insertRoute(root, route);
+    }
+    this.router = root;
+    return root;
   }
-  parseUrl(req) {
-    const url = new URL(req.url);
-    const query = {};
-    for (const [k, v] of url.searchParams.entries())
-      query[k] = v;
-    return { pathname: url.pathname, query };
+  insertRoute(node, route) {
+    let currentNode = node;
+    for (let i = 0;i < route.parts.length; i++) {
+      const part = route.parts[i];
+      let found = false;
+      for (const child of currentNode.children) {
+        if (child.pattern === part) {
+          currentNode = child;
+          found = true;
+          break;
+        }
+      }
+      if (!found) {
+        const newNode = {
+          pattern: part,
+          handlers: {},
+          children: []
+        };
+        if (part.startsWith(":")) {
+          newNode.paramName = part.slice(1);
+        } else if (part === "*") {
+          newNode.isWildcard = true;
+        } else if (part === "**") {
+          newNode.isCatchAll = true;
+        }
+        currentNode.children.push(newNode);
+        currentNode = newNode;
+      }
+    }
+    currentNode.handlers[route.method] = route.handler;
   }
-  async parseBody(req) {
-    const ct = req.headers.get("content-type") || "";
-    if (ct.includes("application/json"))
-      return await req.json();
-    if (ct.includes("application/x-www-form-urlencoded"))
-      return Object.fromEntries(new URLSearchParams(await req.text()).entries());
-    if (ct.startsWith("multipart/form-data")) {
-      const fd = await req.formData();
-      const files = {};
-      const fields = {};
-      for (const [k, v] of fd.entries()) {
-        if (v instanceof File)
-          files[k] = v;
-        else
-          fields[k] = v;
+  findRoute(method, pathname) {
+    const cacheKey = `${method}:${pathname}`;
+    if (this.routeCache.has(cacheKey)) {
+      return this.routeCache.get(cacheKey);
+    }
+    const staticKey = `${method}:${pathname}`;
+    const staticHandler = this.staticRoutes.get(staticKey);
+    if (staticHandler) {
+      const result2 = { handler: staticHandler, params: {} };
+      this.routeCache.set(cacheKey, result2);
+      return result2;
+    }
+    const allowedMethods = new Set;
+    let pathExists = false;
+    for (const route of this.rawRoutes) {
+      if (this.matchPath(route.path, pathname)) {
+        pathExists = true;
+        allowedMethods.add(route.method);
       }
-      return { files, fields };
     }
-    if (ct.startsWith("text/"))
-      return await req.text();
+    if (!pathExists) {
+      this.routeCache.set(cacheKey, null);
+      return null;
+    }
+    const segments = pathname === "/" ? [""] : pathname.split("/").slice(1);
+    const result = this.matchRoute(this.buildRouter(), segments, method);
+    if (result) {
+      this.routeCache.set(cacheKey, result);
+      return result;
+    }
+    if (pathExists) {
+      const methodNotAllowed = {
+        handler: null,
+        params: {},
+        allowedMethods: Array.from(allowedMethods)
+      };
+      this.routeCache.set(cacheKey, methodNotAllowed);
+      return methodNotAllowed;
+    }
+    this.routeCache.set(cacheKey, null);
     return null;
   }
-  buildRouter() {
-    if (this.router)
-      return this.router;
-    const root = new TrieNode;
-    const sortedRoutes = [...this.rawRoutes].sort((a, b) => {
-      const aHasWildcard = a.parts.some((p) => this.isWildcard(p));
-      const bHasWildcard = b.parts.some((p) => this.isWildcard(p));
-      const aHasParam = a.parts.some((p) => p.startsWith(":"));
-      const bHasParam = b.parts.some((p) => p.startsWith(":"));
-      if (aHasWildcard && !bHasWildcard)
-        return 1;
-      if (!aHasWildcard && bHasWildcard)
-        return -1;
-      if (aHasParam && !bHasParam)
-        return 1;
-      if (!aHasParam && bHasParam)
-        return -1;
-      return 0;
-    });
-    for (const r of sortedRoutes) {
-      let node = root;
-      if (r.parts.length === 1 && r.parts[0] === "") {
-        node.handlers ??= {};
-        node.handlers[r.method] = r.handler;
+  matchPath(routePath, requestPath) {
+    const routeParts = routePath === "/" ? [""] : routePath.split("/").slice(1);
+    const requestParts = requestPath === "/" ? [""] : requestPath.split("/").slice(1);
+    if (routeParts.length !== requestParts.length) {
+      if (routeParts.includes("**")) {
+        return true;
+      }
+      return false;
+    }
+    for (let i = 0;i < routeParts.length; i++) {
+      const routePart = routeParts[i];
+      const requestPart = requestParts[i];
+      if (routePart.startsWith(":") || routePart === "*" || routePart === "**") {
         continue;
       }
-      for (let i = 0;i < r.parts.length; i++) {
-        const part = r.parts[i];
-        if (part === "*") {
-          node.wildcardChild ??= new TrieNode;
-          node = node.wildcardChild;
-        } else if (part === "**") {
-          node.catchAllChild ??= { node: new TrieNode };
-          node = node.catchAllChild.node;
-        } else if (part.startsWith(":")) {
-          const name = part.slice(1);
-          node.paramChild ??= { name, node: new TrieNode };
-          node = node.paramChild.node;
-        } else {
-          node.children[part] ??= new TrieNode;
-          node = node.children[part];
+      if (routePart !== requestPart) {
+        return false;
+      }
+    }
+    return true;
+  }
+  matchRoute(node, segments, method, params = {}, index = 0) {
+    if (index === segments.length) {
+      const handler = node.handlers[method];
+      return handler ? { handler, params } : null;
+    }
+    const segment = segments[index];
+    for (const child of node.children) {
+      if (!child.paramName && !child.isWildcard && !child.isCatchAll) {
+        if (child.pattern === segment) {
+          const result = this.matchRoute(child, segments, method, params, index + 1);
+          if (result)
+            return result;
         }
       }
-      node.handlers ??= {};
-      node.handlers[r.method] = r.handler;
     }
-    this.router = root;
-    return root;
+    for (const child of node.children) {
+      if (child.paramName) {
+        params[child.paramName] = segment;
+        const result = this.matchRoute(child, segments, method, params, index + 1);
+        if (result)
+          return result;
+        delete params[child.paramName];
+      }
+    }
+    for (const child of node.children) {
+      if (child.isWildcard) {
+        const result = this.matchRoute(child, segments, method, params, index + 1);
+        if (result)
+          return result;
+      }
+    }
+    for (const child of node.children) {
+      if (child.isCatchAll) {
+        const handler = child.handlers[method];
+        if (handler) {
+          return { handler, params };
+        }
+      }
+    }
+    return null;
   }
-  compilePipeline(handler) {
-    return async (req, params, query) => {
-      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)) {
-        const parsed = await this.parseBody(req);
-        if (parsed && typeof parsed === "object" && "files" in parsed && "fields" in parsed) {
-          Object.defineProperty(req, "body", { value: parsed.fields, writable: true, configurable: true });
+  async parseBody(req) {
+    const ct = req.headers.get("content-type") || "";
+    const clonedReq = req.clone();
+    try {
+      if (ct.includes("application/json")) {
+        return await clonedReq.json();
+      }
+      if (ct.includes("application/x-www-form-urlencoded")) {
+        const text = await clonedReq.text();
+        return Object.fromEntries(new URLSearchParams(text));
+      }
+      if (ct.startsWith("multipart/form-data")) {
+        const fd = await clonedReq.formData();
+        const files = {};
+        const fields = {};
+        for (const [k, v] of fd.entries()) {
+          if (v instanceof File)
+            files[k] = v;
+          else
+            fields[k] = v;
+        }
+        return { files, fields };
+      }
+      if (ct.startsWith("text/")) {
+        return await clonedReq.text();
+      }
+    } catch (error) {
+      console.error("Body parsing error:", error);
+      return null;
+    }
+    return null;
+  }
+  async executeHandler(req, handler, params, query) {
+    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)) {
+      const parsed = await this.parseBody(req);
+      if (parsed) {
+        if (typeof parsed === "object" && "files" in parsed && "fields" in parsed) {
+          Object.defineProperty(req, "parsedBody", { value: parsed.fields, writable: true, configurable: true });
           Object.defineProperty(req, "files", { value: parsed.files, writable: true, configurable: true });
         } else {
-          Object.defineProperty(req, "body", { value: parsed, writable: true, configurable: true });
+          Object.defineProperty(req, "parsedBody", { value: parsed, writable: true, configurable: true });
         }
       }
-      let i = 0;
-      const next = async () => {
-        while (i < this.middlewares.length) {
-          const result = await this.middlewares[i++](req, next);
-          if (result instanceof Response)
-            return result;
-        }
-        const res = await handler(req);
-        if (res instanceof Response)
-          return res;
-        if (typeof res === "string")
-          return new Response(res);
-        if (res instanceof Uint8Array)
-          return new Response(res);
-        return this.json(res);
-      };
-      return next();
+    }
+    Object.defineProperty(req, "body", {
+      get: () => req.parsedBody,
+      set: (value) => {
+        req.parsedBody = value;
+      },
+      configurable: true
+    });
+    let i = 0;
+    const next = async () => {
+      while (i < this.middlewares.length) {
+        const result = await this.middlewares[i++](req, next);
+        if (result instanceof Response)
+          return result;
+      }
+      const res = await handler(req);
+      if (res instanceof Response)
+        return res;
+      if (typeof res === "string")
+        return new Response(res);
+      if (res instanceof Uint8Array)
+        return new Response(res);
+      return this.json(res);
     };
+    return next();
   }
   async handleFetch(req) {
     const url = new URL(req.url);
     const r = req;
-    if (req.method === "OPTIONS") {
-      return new Response(null, {
-        status: 204,
+    const method = req.method;
+    const pathname = url.pathname;
+    const routeMatch = this.findRoute(method, pathname);
+    if (!routeMatch) {
+      return this.json({ error: "Not Found" }, 404);
+    }
+    if (routeMatch.allowedMethods && !routeMatch.handler) {
+      return new Response(JSON.stringify({ error: "Method Not Allowed" }), {
+        status: 405,
         headers: {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, PATCH, OPTIONS",
-          "Access-Control-Allow-Headers": "Content-Type, Authorization",
-          "Access-Control-Max-Age": "86400"
+          Allow: routeMatch.allowedMethods.join(", "),
+          "Content-Type": "application/json"
         }
       });
     }
-    Object.defineProperty(r, "query", {
-      value: url.searchParams,
-      writable: true,
-      configurable: true
-    });
-    const pathname = url.pathname;
-    const segments = pathname === "/" ? [] : pathname.slice(1).split("/");
-    const router = this.buildRouter();
-    let node = router;
-    let params = {};
-    for (let i = 0;i < segments.length; i++) {
-      const seg = segments[i];
-      if (node.children[seg]) {
-        node = node.children[seg];
-      } else if (node.paramChild) {
-        params[node.paramChild.name] = seg;
-        node = node.paramChild.node;
-      } else if (node.wildcardChild) {
-        node = node.wildcardChild;
-      } else if (node.catchAllChild) {
-        node = node.catchAllChild.node;
-        break;
-      } else {
-        return this.json({ error: "Not Found" }, 404);
-      }
-    }
-    const handler = node.handlers?.[req.method];
-    if (!handler)
-      return this.json({ error: "Method Not Allowed" }, 405);
-    const pipeline = this.compilePipeline(handler);
-    return pipeline(r, params, new URLSearchParams(url.search));
+    return this.executeHandler(r, routeMatch.handler, routeMatch.params, url.searchParams);
   }
   async fetch(req) {
     try {
@@ -312,36 +361,7 @@ class Prince {
     const self = this;
     Bun.serve({
       port,
-      fetch(req, server) {
-        const { pathname } = new URL(req.url);
-        const ws = self.wsRoutes[pathname];
-        if (ws && server.upgrade(req, { data: { ws } })) {
-          return;
-        }
-        return self.handleFetch(req).catch((err) => {
-          if (self.errorHandler)
-            return self.errorHandler(err, req);
-          if (self.devMode) {
-            console.error("Error:", err);
-            return self.json({ error: String(err), stack: err.stack }, 500);
-          }
-          return self.json({ error: "Internal Server Error" }, 500);
-        });
-      },
-      websocket: {
-        open(ws) {
-          ws.data?.ws?.open?.(ws);
-        },
-        message(ws, msg) {
-          ws.data?.ws?.message?.(ws, msg);
-        },
-        close(ws, code, reason) {
-          ws.data?.ws?.close?.(ws, code, reason);
-        },
-        drain(ws) {
-          ws.data?.ws?.drain?.(ws);
-        }
-      }
+      fetch: (req, server) => self.fetch(req)
     });
     console.log(`\uD83D\uDE80 PrinceJS running on http://localhost:${port}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "princejs",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "An easy and fast backend framework — by a 13yo developer, for developers.",
   "main": "dist/prince.js",
   "types": "dist/prince.d.ts",
@@ -24,6 +24,10 @@
     "./scheduler": {
       "import": "./dist/scheduler.js",
       "types": "./dist/scheduler.d.ts"
+    },
+    "./jsx": {
+      "import": "./dist/jsx.js",
+      "types": "./dist/jsx.d.ts"
     }
   },
   "files": [
@@ -44,7 +48,9 @@
     "websocket",
     "middleware",
     "scheduler",
-    "fast"
+    "fast",
+    "lightweight",
+    "ssr"
   ],
   "author": "Matthew Michael (MatthewTheCoder1218)",
   "license": "MIT",
@@ -80,7 +86,7 @@
     "jose": "^6.1.2"
   },
   "scripts": {
-    "build:js": "bun build src/prince.ts --outdir dist --target bun && bun build src/middleware.ts --outdir dist --target bun && bun build src/helpers.ts --outdir dist --target bun && bun build src/scheduler.ts --outdir dist --target bun && bun build bin/create.ts --outdir dist --target bun --format esm",
+    "build:js": "bun build src/prince.ts --outdir dist --target bun && bun build src/middleware.ts --outdir dist --target bun && bun build src/helpers.ts --outdir dist --target bun && bun build src/scheduler.ts --outdir dist --target bun && bun build bin/create.ts --outdir dist --target bun && bun build src/jsx.ts --outdir dist --target bun --format esm",
     "build:types": "tsc --emitDeclarationOnly --skipLibCheck",
     "build": "bun run build:js && bun run build:types",
     "test": "bun test",