tezx 1.0.58 → 1.0.60

package/adapter/bun.js

@@ -2,8 +2,8 @@ import { GlobalConfig } from "../core/config.js";
 import { Context } from "../core/context.js";
 export function bunAdapter(TezX, options = {}) {
     function listen(...arg) {
-        let port = typeof arg?.[0] === "number" ? arg?.[0] : undefined;
-        let callback = typeof arg[0] == "function" ? arg[0] : arg?.[1];
+        const port = typeof arg[0] === "function" ? undefined : arg[0];
+        const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
         const serve = typeof Bun !== "undefined" ? Bun.serve : null;
         try {
             if (!serve) {
@@ -21,7 +21,7 @@ export function bunAdapter(TezX, options = {}) {
                     })
                     : serve({
                         error: (error) => {
-                            return (options?.error)(server, error);
+                            return options?.error?.(server, error);
                         },
                         development: options?.development,
                         hostname: options?.hostname,

package/adapter/deno.js

@@ -1,8 +1,8 @@
 import { GlobalConfig } from "../core/config.js";
 export function denoAdapter(TezX, options = {}) {
     function listen(...arg) {
-        let port = typeof arg?.[0] === "number" ? arg?.[0] : undefined;
-        let callback = typeof arg[0] == "function" ? arg[0] : arg?.[1];
+        const port = typeof arg[0] === "function" ? undefined : arg[0];
+        const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
         const isDeno = typeof Deno !== "undefined";
         try {
             async function handleRequest(req, connInfo) {

package/adapter/node.d.ts

@@ -11,9 +11,9 @@ type SSLOptions = ServerOptions & TlsOptions & {
 type TezXServerOptions = UnixSocketOptions | SSLOptions;
 export declare function nodeAdapter<T extends Record<string, any> = {}>(TezX: TezX<T>, options?: TezXServerOptions): {
     listen: {
-        (callback?: (message: string) => void): any;
+        (callback?: () => void): any;
         (port?: number): any;
-        (port?: number, callback?: (message: string) => void): any;
+        (port?: number, callback?: () => void): any;
     };
 };
 export {};

package/adapter/node.js

@@ -58,7 +58,7 @@ export function nodeAdapter(TezX, options = {}) {
                     }
                 }
             });
-            const port = typeof arg[0] === "number" ? arg[0] : undefined;
+            const port = typeof arg[0] === "function" ? undefined : arg[0];
             const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
             server.listen(options?.unix || port || 0, () => {
                 const protocol = ssl ? "\x1b[1;35mhttps\x1b[0m" : "\x1b[1;34mhttp\x1b[0m";
@@ -67,12 +67,9 @@ export function nodeAdapter(TezX, options = {}) {
                     ? `\x1b[1mNodeJS TezX Server running at unix://${address}\x1b[0m`
                     : `\x1b[1mNodeJS TezX Server running at ${protocol}://localhost:${address?.port}/\x1b[0m`;
                 GlobalConfig.server = server;
-                if (typeof callback == "function") {
-                    callback(message);
-                }
-                else {
-                    GlobalConfig.debugging.success(message);
-                }
+                GlobalConfig.debugging.success(message);
+                if (typeof callback == "function")
+                    callback();
                 return server;
             });
         })

package/cjs/adapter/bun.js

@@ -5,8 +5,8 @@ const config_js_1 = require("../core/config.js");
 const context_js_1 = require("../core/context.js");
 function bunAdapter(TezX, options = {}) {
     function listen(...arg) {
-        let port = typeof arg?.[0] === "number" ? arg?.[0] : undefined;
-        let callback = typeof arg[0] == "function" ? arg[0] : arg?.[1];
+        const port = typeof arg[0] === "function" ? undefined : arg[0];
+        const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
         const serve = typeof Bun !== "undefined" ? Bun.serve : null;
         try {
             if (!serve) {
@@ -24,7 +24,7 @@ function bunAdapter(TezX, options = {}) {
                     })
                     : serve({
                         error: (error) => {
-                            return (options?.error)(server, error);
+                            return options?.error?.(server, error);
                         },
                         development: options?.development,
                         hostname: options?.hostname,

package/cjs/adapter/deno.js

@@ -4,8 +4,8 @@ exports.denoAdapter = denoAdapter;
 const config_js_1 = require("../core/config.js");
 function denoAdapter(TezX, options = {}) {
     function listen(...arg) {
-        let port = typeof arg?.[0] === "number" ? arg?.[0] : undefined;
-        let callback = typeof arg[0] == "function" ? arg[0] : arg?.[1];
+        const port = typeof arg[0] === "function" ? undefined : arg[0];
+        const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
         const isDeno = typeof Deno !== "undefined";
         try {
             async function handleRequest(req, connInfo) {

package/cjs/adapter/node.js

@@ -60,7 +60,7 @@ function nodeAdapter(TezX, options = {}) {
                     }
                 }
             });
-            const port = typeof arg[0] === "number" ? arg[0] : undefined;
+            const port = typeof arg[0] === "function" ? undefined : arg[0];
             const callback = typeof arg[0] === "function" ? arg[0] : arg[1];
             server.listen(options?.unix || port || 0, () => {
                 const protocol = ssl ? "\x1b[1;35mhttps\x1b[0m" : "\x1b[1;34mhttp\x1b[0m";
@@ -69,12 +69,9 @@ function nodeAdapter(TezX, options = {}) {
                     ? `\x1b[1mNodeJS TezX Server running at unix://${address}\x1b[0m`
                     : `\x1b[1mNodeJS TezX Server running at ${protocol}://localhost:${address?.port}/\x1b[0m`;
                 config_js_1.GlobalConfig.server = server;
-                if (typeof callback == "function") {
-                    callback(message);
-                }
-                else {
-                    config_js_1.GlobalConfig.debugging.success(message);
-                }
+                config_js_1.GlobalConfig.debugging.success(message);
+                if (typeof callback == "function")
+                    callback();
                 return server;
             });
         })

package/cjs/core/config.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlobalConfig = void 0;
 const debugging_js_1 = require("../utils/debugging.js");
+const environment_js_1 = require("./environment.js");
 let GlobalConfig = class {
     static notFound = (ctx) => {
         const { method, urlRef: { pathname }, } = ctx.req;
@@ -14,7 +15,7 @@ let GlobalConfig = class {
     static overwriteMethod = true;
     static debugMode = false;
     static server;
-    static adapter;
+    static adapter = environment_js_1.EnvironmentDetector.getEnvironment;
     static get debugging() {
         return this.debugMode
             ? {

package/cjs/core/context.js

@@ -93,8 +93,7 @@ class Context {
         this.#rawRequest = req;
         this.method = req?.method?.toUpperCase();
         this.#requestHeaders = new header_js_1.HeadersParser(req?.headers);
-        if (environment_js_1.EnvironmentDetector.getEnvironment == "node" ||
-            config_js_1.GlobalConfig.adapter == "node") {
+        if (config_js_1.GlobalConfig.adapter == "node") {
             let encrypted = req?.socket?.encrypted;
             const protocol = typeof encrypted === "boolean"
                 ? encrypted
@@ -286,7 +285,7 @@ class Context {
             let fileExists = false;
             const runtime = environment_js_1.EnvironmentDetector.getEnvironment;
             if (runtime === "node") {
-                const { existsSync } = await Promise.resolve().then(() => require("fs"));
+                const { existsSync } = await Promise.resolve().then(() => require("node:fs"));
                 fileExists = existsSync(filePath);
             }
             else if (runtime === "bun") {
@@ -306,7 +305,7 @@ class Context {
             }
             let fileBuffer;
             if (runtime === "node") {
-                const { readFileSync } = await Promise.resolve().then(() => require("fs"));
+                const { readFileSync } = await Promise.resolve().then(() => require("node:fs"));
                 fileBuffer = await readFileSync(filePath);
             }
             else if (runtime === "bun") {
@@ -336,7 +335,7 @@ class Context {
             const resolvedPath = filePath;
             let fileExists = false;
             if (runtime === "node") {
-                const { existsSync } = await Promise.resolve().then(() => require("fs"));
+                const { existsSync } = await Promise.resolve().then(() => require("node:fs"));
                 fileExists = existsSync(resolvedPath);
             }
             else if (runtime === "bun") {
@@ -356,7 +355,7 @@ class Context {
             }
             let fileSize = 0;
             if (runtime === "node") {
-                const { statSync } = await Promise.resolve().then(() => require("fs"));
+                const { statSync } = await Promise.resolve().then(() => require("node:fs"));
                 fileSize = statSync(resolvedPath).size;
             }
             else if (runtime === "bun") {
@@ -370,7 +369,7 @@ class Context {
             const mimeType = staticFile_js_1.mimeTypes[ext] || staticFile_js_1.defaultMimeType;
             let fileStream;
             if (runtime === "node") {
-                const { createReadStream } = await Promise.resolve().then(() => require("fs"));
+                const { createReadStream } = await Promise.resolve().then(() => require("node:fs"));
                 fileStream = createReadStream(resolvedPath);
             }
             else if (runtime === "bun") {

package/cjs/core/header.js

@@ -70,7 +70,7 @@ class HeadersParser {
     }
     forEach(callback) {
         for (const [key, value] of this.headers) {
-            callback(key, value);
+            callback(value, key);
         }
     }
     toObject() {

package/cjs/core/request.js

@@ -83,10 +83,11 @@ class Request {
             return (0, formData_js_1.parseUrlEncodedBody)(this.rawRequest);
         }
         else if (contentType.includes("multipart/form-data")) {
-            const boundary = contentType?.split("; ")?.[1]?.split("=")?.[1];
-            if (!boundary) {
-                throw Error("Boundary not found");
+            const boundaryMatch = contentType.match(/boundary=([^;]+)/);
+            if (!boundaryMatch) {
+                throw new Error("Boundary not found in multipart/form-data");
             }
+            const boundary = boundaryMatch[1];
             return await (0, formData_js_1.parseMultipartBody)(this.rawRequest, boundary, options);
         }
         else {

package/cjs/core/router.js

@@ -25,14 +25,13 @@ class Router extends MiddlewareConfigure_js_1.default {
         this.basePath = basePath;
         this.env = { ...env };
         this.triRouter = new TrieRouter(basePath);
-        this.get.bind(this);
-        this.post.bind(this);
-        this.put.bind(this);
-        this.delete.bind(this);
-        this.all.bind(this);
-        this.#routeAddTriNode.bind(this);
-        this.addRouter.bind(this);
-        this.group.bind(this);
+        this.get = this.get.bind(this);
+        this.post = this.post.bind(this);
+        this.put = this.put.bind(this);
+        this.delete = this.delete.bind(this);
+        this.all = this.all.bind(this);
+        this.addRouter = this.addRouter.bind(this);
+        this.group = this.group.bind(this);
     }
     static(...args) {
         let route = "";
@@ -179,7 +178,7 @@ class Router extends MiddlewareConfigure_js_1.default {
             finalMiddleware = new Set(middlewares);
         }
         let p = parts.join("/");
-        if (/(\/\*|\?)/.test(`/${p}`)) {
+        if (url_js_1.wildcardOrOptionalParamRegex.test(`/${p}`)) {
             let handler = this.routers.get(p);
             if (!handler) {
                 handler = new Map();

package/cjs/core/server.js

@@ -122,18 +122,22 @@ class TezX extends router_js_1.Router {
         }
         return middlewares;
     }
-    async #handleRequest(req, options) {
-        let ctx = new context_js_1.Context(req, options);
-        const urlRef = ctx.req.urlRef;
-        const { pathname } = urlRef;
+    async #resolvePath(pathname) {
         let resolvePath = pathname;
         if (this.#onPathResolve) {
-            resolvePath = this.#onPathResolve(pathname);
+            resolvePath = await this.#onPathResolve(pathname);
             config_js_1.GlobalConfig.debugging.warn(`${colors_js_1.COLORS.white} PATH RESOLVE ${colors_js_1.COLORS.reset} ${colors_js_1.COLORS.red}${pathname}${colors_js_1.COLORS.reset} ➞ ${colors_js_1.COLORS.cyan}${resolvePath}${colors_js_1.COLORS.reset}`);
         }
         if (typeof resolvePath !== "string") {
             throw new Error(`Path resolution failed: expected a string, got ${typeof resolvePath}`);
         }
+        return resolvePath;
+    }
+    async #handleRequest(req, options) {
+        let ctx = new context_js_1.Context(req, options);
+        const urlRef = ctx.req.urlRef;
+        const { pathname } = urlRef;
+        let resolvePath = await this.#resolvePath(pathname);
         let middlewares = this.#findMiddleware(resolvePath);
         ctx.env = this.env;
         try {
@@ -179,15 +183,18 @@ class TezX extends router_js_1.Router {
             return finalResponse()(ctx);
         }
         catch (err) {
-            let error = err;
-            if (err instanceof Error) {
-                error = err.stack;
-            }
-            config_js_1.GlobalConfig.debugging.error(`${colors_js_1.COLORS.bgRed} ${ctx.pathname}, Method: ${ctx.method} ${colors_js_1.COLORS.reset}`, `${context_js_1.httpStatusMap[500]}: ${error} `);
-            let res = await config_js_1.GlobalConfig.onError(error, ctx);
-            ctx.setStatus = res.status;
-            return res;
+            return this.#handleError(err, ctx);
+        }
+    }
+    async #handleError(err, ctx) {
+        let error = err;
+        if (err instanceof Error) {
+            error = err.stack;
         }
+        config_js_1.GlobalConfig.debugging.error(`${colors_js_1.COLORS.bgRed} ${ctx.pathname}, Method: ${ctx.method} ${colors_js_1.COLORS.reset}`, `${context_js_1.httpStatusMap[500]}: ${error} `);
+        let res = await config_js_1.GlobalConfig.onError(error, ctx);
+        ctx.setStatus = res.status;
+        return res;
     }
     async serve(req, options) {
         return this.#handleRequest(req, options);

package/cjs/index.js

@@ -7,4 +7,4 @@ var server_js_1 = require("./core/server.js");
 Object.defineProperty(exports, "TezX", { enumerable: true, get: function () { return server_js_1.TezX; } });
 var params_js_1 = require("./utils/params.js");
 Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return params_js_1.useParams; } });
-exports.version = "1.0.58";
+exports.version = "1.0.60";

package/cjs/utils/formData.js

@@ -4,9 +4,9 @@ exports.parseJsonBody = parseJsonBody;
 exports.parseTextBody = parseTextBody;
 exports.parseUrlEncodedBody = parseUrlEncodedBody;
 exports.parseMultipartBody = parseMultipartBody;
-const environment_js_1 = require("../core/environment.js");
+const config_js_1 = require("../core/config.js");
 async function parseJsonBody(req) {
-    const runtime = environment_js_1.EnvironmentDetector.getEnvironment;
+    const runtime = config_js_1.GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";
@@ -31,7 +31,7 @@ async function parseJsonBody(req) {
     }
 }
 async function parseTextBody(req) {
-    const runtime = environment_js_1.EnvironmentDetector.getEnvironment;
+    const runtime = config_js_1.GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";
@@ -56,7 +56,7 @@ async function parseTextBody(req) {
     }
 }
 async function parseUrlEncodedBody(req) {
-    const runtime = environment_js_1.EnvironmentDetector.getEnvironment;
+    const runtime = config_js_1.GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";
@@ -92,7 +92,7 @@ async function parseUrlEncodedBody(req) {
     }
 }
 async function parseMultipartBody(req, boundary, options) {
-    const runtime = environment_js_1.EnvironmentDetector.getEnvironment;
+    const runtime = config_js_1.GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";

package/cjs/utils/staticFile.js

@@ -126,8 +126,8 @@ async function getFiles(dir, basePath = "/", ref, option) {
         }
     }
     else {
-        const fs = await Promise.resolve().then(() => require("fs/promises"));
-        const path = await Promise.resolve().then(() => require("path"));
+        const fs = await Promise.resolve().then(() => require("node:fs/promises"));
+        const path = await Promise.resolve().then(() => require("node:path"));
         const entries = await fs.readdir(dir, { withFileTypes: true });
         for (const entry of entries) {
             const fullPath = path.join(dir, entry.name);

package/cjs/utils/url.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.wildcardOrOptionalParamRegex = void 0;
 exports.sanitizePathSplit = sanitizePathSplit;
 exports.urlParse = urlParse;
 function sanitizePathSplit(basePath, path) {
@@ -9,6 +10,7 @@ function sanitizePathSplit(basePath, path) {
         .filter(Boolean);
     return parts;
 }
+exports.wildcardOrOptionalParamRegex = /\/\*|:[^/]+[?*]/;
 function urlParse(url) {
     let u = URL.parse(url);
     let query = {};

package/core/MiddlewareConfigure.d.ts

@@ -10,7 +10,7 @@ export declare class TriMiddleware {
     constructor(pathname?: string);
 }
 export default class MiddlewareConfigure<T extends Record<string, any> = {}> extends CommonHandler {
-    triMiddlewares: TriMiddleware;
+    protected triMiddlewares: TriMiddleware;
     protected basePath: string;
     constructor(basePath?: string);
     protected addMiddleware(pathname: string, middlewares: Middleware<T>[]): void;

package/core/config.js

@@ -1,4 +1,5 @@
 import { loggerOutput } from "../utils/debugging.js";
+import { EnvironmentDetector } from "./environment.js";
 export let GlobalConfig = class {
     static notFound = (ctx) => {
         const { method, urlRef: { pathname }, } = ctx.req;
@@ -11,7 +12,7 @@ export let GlobalConfig = class {
     static overwriteMethod = true;
     static debugMode = false;
     static server;
-    static adapter;
+    static adapter = EnvironmentDetector.getEnvironment;
     static get debugging() {
         return this.debugMode
             ? {

package/core/context.js

@@ -90,8 +90,7 @@ export class Context {
         this.#rawRequest = req;
         this.method = req?.method?.toUpperCase();
         this.#requestHeaders = new HeadersParser(req?.headers);
-        if (EnvironmentDetector.getEnvironment == "node" ||
-            GlobalConfig.adapter == "node") {
+        if (GlobalConfig.adapter == "node") {
             let encrypted = req?.socket?.encrypted;
             const protocol = typeof encrypted === "boolean"
                 ? encrypted
@@ -283,7 +282,7 @@ export class Context {
             let fileExists = false;
             const runtime = EnvironmentDetector.getEnvironment;
             if (runtime === "node") {
-                const { existsSync } = await import("fs");
+                const { existsSync } = await import("node:fs");
                 fileExists = existsSync(filePath);
             }
             else if (runtime === "bun") {
@@ -303,7 +302,7 @@ export class Context {
             }
             let fileBuffer;
             if (runtime === "node") {
-                const { readFileSync } = await import("fs");
+                const { readFileSync } = await import("node:fs");
                 fileBuffer = await readFileSync(filePath);
             }
             else if (runtime === "bun") {
@@ -333,7 +332,7 @@ export class Context {
             const resolvedPath = filePath;
             let fileExists = false;
             if (runtime === "node") {
-                const { existsSync } = await import("fs");
+                const { existsSync } = await import("node:fs");
                 fileExists = existsSync(resolvedPath);
             }
             else if (runtime === "bun") {
@@ -353,7 +352,7 @@ export class Context {
             }
             let fileSize = 0;
             if (runtime === "node") {
-                const { statSync } = await import("fs");
+                const { statSync } = await import("node:fs");
                 fileSize = statSync(resolvedPath).size;
             }
             else if (runtime === "bun") {
@@ -367,7 +366,7 @@ export class Context {
             const mimeType = mimeTypes[ext] || defaultMimeType;
             let fileStream;
             if (runtime === "node") {
-                const { createReadStream } = await import("fs");
+                const { createReadStream } = await import("node:fs");
                 fileStream = createReadStream(resolvedPath);
             }
             else if (runtime === "bun") {

package/core/header.d.ts

@@ -62,7 +62,7 @@ export declare class HeadersParser {
      * Iterates over headers and executes a callback function.
      * @param callback - Function to execute for each header.
      */
-    forEach(callback: (key: string, value: string[]) => void): void;
+    forEach(callback: (value: string[], key: string) => void): void;
     /**
      * Converts headers into a plain object.
      * @returns A record of headers where single-value headers are returned as a string.

package/core/header.js

@@ -67,7 +67,7 @@ export class HeadersParser {
     }
     forEach(callback) {
         for (const [key, value] of this.headers) {
-            callback(key, value);
+            callback(value, key);
         }
     }
     toObject() {

package/core/request.d.ts

@@ -128,7 +128,7 @@ export declare class Request {
          *   console.log(key, value);
          * });
          */
-        forEach: (callback: (key: string, value: string[]) => void) => void;
+        forEach: (callback: (value: string[], key: string) => void) => void;
         /**
          * Converts all headers into a plain JavaScript object.
          * Single-value headers are represented as a string, and multi-value headers as an array.

package/core/request.js

@@ -80,10 +80,11 @@ export class Request {
             return parseUrlEncodedBody(this.rawRequest);
         }
         else if (contentType.includes("multipart/form-data")) {
-            const boundary = contentType?.split("; ")?.[1]?.split("=")?.[1];
-            if (!boundary) {
-                throw Error("Boundary not found");
+            const boundaryMatch = contentType.match(/boundary=([^;]+)/);
+            if (!boundaryMatch) {
+                throw new Error("Boundary not found in multipart/form-data");
             }
+            const boundary = boundaryMatch[1];
             return await parseMultipartBody(this.rawRequest, boundary, options);
         }
         else {

package/core/router.js

@@ -1,5 +1,5 @@
 import { getFiles } from "../utils/staticFile.js";
-import { sanitizePathSplit } from "../utils/url.js";
+import { sanitizePathSplit, wildcardOrOptionalParamRegex } from "../utils/url.js";
 import { GlobalConfig } from "./config.js";
 import MiddlewareConfigure, { TriMiddleware, } from "./MiddlewareConfigure.js";
 class TrieRouter {
@@ -22,14 +22,13 @@ export class Router extends MiddlewareConfigure {
         this.basePath = basePath;
         this.env = { ...env };
         this.triRouter = new TrieRouter(basePath);
-        this.get.bind(this);
-        this.post.bind(this);
-        this.put.bind(this);
-        this.delete.bind(this);
-        this.all.bind(this);
-        this.#routeAddTriNode.bind(this);
-        this.addRouter.bind(this);
-        this.group.bind(this);
+        this.get = this.get.bind(this);
+        this.post = this.post.bind(this);
+        this.put = this.put.bind(this);
+        this.delete = this.delete.bind(this);
+        this.all = this.all.bind(this);
+        this.addRouter = this.addRouter.bind(this);
+        this.group = this.group.bind(this);
     }
     static(...args) {
         let route = "";
@@ -176,7 +175,7 @@ export class Router extends MiddlewareConfigure {
             finalMiddleware = new Set(middlewares);
         }
         let p = parts.join("/");
-        if (/(\/\*|\?)/.test(`/${p}`)) {
+        if (wildcardOrOptionalParamRegex.test(`/${p}`)) {
             let handler = this.routers.get(p);
             if (!handler) {
                 handler = new Map();

package/core/server.js

@@ -119,18 +119,22 @@ export class TezX extends Router {
         }
         return middlewares;
     }
-    async #handleRequest(req, options) {
-        let ctx = new Context(req, options);
-        const urlRef = ctx.req.urlRef;
-        const { pathname } = urlRef;
+    async #resolvePath(pathname) {
         let resolvePath = pathname;
         if (this.#onPathResolve) {
-            resolvePath = this.#onPathResolve(pathname);
+            resolvePath = await this.#onPathResolve(pathname);
             GlobalConfig.debugging.warn(`${COLORS.white} PATH RESOLVE ${COLORS.reset} ${COLORS.red}${pathname}${COLORS.reset} ➞ ${COLORS.cyan}${resolvePath}${COLORS.reset}`);
         }
         if (typeof resolvePath !== "string") {
             throw new Error(`Path resolution failed: expected a string, got ${typeof resolvePath}`);
         }
+        return resolvePath;
+    }
+    async #handleRequest(req, options) {
+        let ctx = new Context(req, options);
+        const urlRef = ctx.req.urlRef;
+        const { pathname } = urlRef;
+        let resolvePath = await this.#resolvePath(pathname);
         let middlewares = this.#findMiddleware(resolvePath);
         ctx.env = this.env;
         try {
@@ -176,15 +180,18 @@ export class TezX extends Router {
             return finalResponse()(ctx);
         }
         catch (err) {
-            let error = err;
-            if (err instanceof Error) {
-                error = err.stack;
-            }
-            GlobalConfig.debugging.error(`${COLORS.bgRed} ${ctx.pathname}, Method: ${ctx.method} ${COLORS.reset}`, `${httpStatusMap[500]}: ${error} `);
-            let res = await GlobalConfig.onError(error, ctx);
-            ctx.setStatus = res.status;
-            return res;
+            return this.#handleError(err, ctx);
+        }
+    }
+    async #handleError(err, ctx) {
+        let error = err;
+        if (err instanceof Error) {
+            error = err.stack;
         }
+        GlobalConfig.debugging.error(`${COLORS.bgRed} ${ctx.pathname}, Method: ${ctx.method} ${COLORS.reset}`, `${httpStatusMap[500]}: ${error} `);
+        let res = await GlobalConfig.onError(error, ctx);
+        ctx.setStatus = res.status;
+        return res;
     }
     async serve(req, options) {
         return this.#handleRequest(req, options);

package/index.js

@@ -1,4 +1,4 @@
 export { Router } from "./core/router.js";
 export { TezX } from "./core/server.js";
 export { useParams } from "./utils/params.js";
-export let version = "1.0.58";
+export let version = "1.0.60";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tezx",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "description": "TezX is a high-performance, lightweight JavaScript framework designed for speed, scalability, and flexibility. It enables efficient routing, middleware management, and static file serving with minimal configuration. Fully compatible with Node.js, Deno, and Bun.",
   "main": "cjs/index.js",
   "module": "index.js",

package/utils/formData.js

@@ -1,6 +1,6 @@
-import { EnvironmentDetector } from "../core/environment.js";
+import { GlobalConfig } from "../core/config.js";
 export async function parseJsonBody(req) {
-    const runtime = EnvironmentDetector.getEnvironment;
+    const runtime = GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";
@@ -25,7 +25,7 @@ export async function parseJsonBody(req) {
     }
 }
 export async function parseTextBody(req) {
-    const runtime = EnvironmentDetector.getEnvironment;
+    const runtime = GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";
@@ -50,7 +50,7 @@ export async function parseTextBody(req) {
     }
 }
 export async function parseUrlEncodedBody(req) {
-    const runtime = EnvironmentDetector.getEnvironment;
+    const runtime = GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";
@@ -86,7 +86,7 @@ export async function parseUrlEncodedBody(req) {
     }
 }
 export async function parseMultipartBody(req, boundary, options) {
-    const runtime = EnvironmentDetector.getEnvironment;
+    const runtime = GlobalConfig.adapter;
     if (runtime === "node") {
         return new Promise((resolve, reject) => {
             let body = "";

package/utils/staticFile.js

@@ -122,8 +122,8 @@ export async function getFiles(dir, basePath = "/", ref, option) {
         }
     }
     else {
-        const fs = await import("fs/promises");
-        const path = await import("path");
+        const fs = await import("node:fs/promises");
+        const path = await import("node:path");
         const entries = await fs.readdir(dir, { withFileTypes: true });
         for (const entry of entries) {
             const fullPath = path.join(dir, entry.name);

package/utils/url.d.ts

@@ -10,4 +10,5 @@ export type UrlRef = {
     pathname: string | undefined;
 };
 export declare function sanitizePathSplit(basePath: string, path: string): string[];
+export declare const wildcardOrOptionalParamRegex: RegExp;
 export declare function urlParse(url: string): UrlRef;

package/utils/url.js

@@ -5,6 +5,7 @@ export function sanitizePathSplit(basePath, path) {
         .filter(Boolean);
     return parts;
 }
+export const wildcardOrOptionalParamRegex = /\/\*|:[^/]+[?*]/;
 export function urlParse(url) {
     let u = URL.parse(url);
     let query = {};