@stacksjs/bun-router 0.0.7 → 0.0.9

package/dist/index.js

@@ -66,7 +66,7 @@ import {
   signRequest,
   singleFileUpload,
   verifySignature
-} from "./chunk-jhsk5c5b.js";
+} from "./chunk-n5pvpz7q.js";
 
 // src/auth.ts
 function base64UrlEncode(str) {
@@ -2787,7 +2787,8 @@ function request() {
 // src/response/response-factory.ts
 var response = {
   json: (data, options = {}) => {
-    const { status = 200, headers = {}, pretty = false } = options;
+    const opts = typeof options === "number" ? { status: options } : options;
+    const { status = 200, headers = {}, pretty = false } = opts;
     const body = pretty ? JSON.stringify(data, null, 2) : JSON.stringify(data);
     return new Response(body, {
       status,
@@ -9276,6 +9277,10 @@ class Router {
     enhancedReq.header = (name) => {
       return req.headers.get(name) || req.headers.get(name.toLowerCase()) || null;
     };
+    enhancedReq.cookie = (name, defaultValue) => {
+      const value = getCookies()[name];
+      return value !== undefined ? value : defaultValue ?? null;
+    };
     enhancedReq.getParam = (name, defaultValue) => {
       const value = params?.[name];
       return value !== undefined ? value : defaultValue;
@@ -9530,40 +9535,358 @@ class RouteGroupBuilder2 {
     return this;
   }
 }
+var _enhancementHost = null;
+function getEnhancementHost() {
+  if (_enhancementHost === null)
+    _enhancementHost = new Router;
+  return _enhancementHost;
+}
+function applyRequestEnhancements(req, params = {}) {
+  if (typeof req.bearerToken === "function")
+    return req;
+  return getEnhancementHost().enhanceRequest(req, params);
+}
 
-// src/router/server.ts
-function registerServerHandling(RouterClass) {
-  Object.defineProperties(RouterClass.prototype, {
-    serve: {
-      async value(options = {}) {
-        if (this._initFileRoutes) {
-          await this._initFileRoutes();
-        }
-        if (this._initApiRoutes) {
-          await this._initApiRoutes();
-        }
-        this.invalidateCache();
-        const serverOptions = {
-          idleTimeout: 255,
-          ...options,
-          fetch: this.handleRequest.bind(this)
-        };
-        const staticRouteMap = {};
-        if (this.staticResponses && this.staticResponses.size > 0) {
-          for (const [path, response2] of this.staticResponses) {
-            staticRouteMap[path] = response2;
-          }
-        }
-        if (options.static) {
-          Object.assign(staticRouteMap, options.static);
-        }
-        if (Object.keys(staticRouteMap).length > 0) {
-          serverOptions.static = staticRouteMap;
-        }
-        if (options.development !== undefined) {
-          serverOptions.development = options.development;
+// src/request/macros.ts
+class RequestMacroRegistry {
+  macros = new Map;
+  register(name, handler) {
+    this.macros.set(name, { name, handler });
+  }
+  get(name) {
+    return this.macros.get(name);
+  }
+  has(name) {
+    return this.macros.has(name);
+  }
+  all() {
+    return Array.from(this.macros.values());
+  }
+  remove(name) {
+    return this.macros.delete(name);
+  }
+  clear() {
+    this.macros.clear();
+  }
+}
+var requestMacroRegistry = new RequestMacroRegistry;
+
+class RequestWithMacros {
+  static macro(name, handler) {
+    requestMacroRegistry.register(name, handler);
+  }
+  static applyMacros(request2) {
+    const macros = requestMacroRegistry.all();
+    macros.forEach((macro) => {
+      request2[macro.name] = macro.handler.bind(request2);
+    });
+    return request2;
+  }
+  static hasMacro(name) {
+    return requestMacroRegistry.has(name);
+  }
+}
+var BuiltInRequestMacros = {
+  wantsJson() {
+    const accept = this.headers.get("accept") || "";
+    return accept.includes("application/json") || accept.includes("json");
+  },
+  wantsHtml() {
+    const accept = this.headers.get("accept") || "";
+    return accept.includes("text/html") || accept.includes("html");
+  },
+  wantsXml() {
+    const accept = this.headers.get("accept") || "";
+    return accept.includes("application/xml") || accept.includes("xml");
+  },
+  expectsJson() {
+    return this.wantsJson() || this.isAjax() || this.isPjax();
+  },
+  isAjax() {
+    return this.headers.get("x-requested-with") === "XMLHttpRequest";
+  },
+  isPjax() {
+    return this.headers.get("x-pjax") === "true";
+  },
+  isMobile() {
+    const userAgent = this.headers.get("user-agent") || "";
+    const mobileRegex = /Mobile|Android|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i;
+    return mobileRegex.test(userAgent);
+  },
+  isBot() {
+    const userAgent = this.headers.get("user-agent") || "";
+    const botRegex = /bot|crawler|spider|crawling/i;
+    return botRegex.test(userAgent);
+  },
+  isSecure() {
+    return this.url.startsWith("https://") || this.headers.get("x-forwarded-proto") === "https" || this.headers.get("x-forwarded-ssl") === "on";
+  },
+  ip() {
+    return this.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || this.headers.get("x-real-ip") || this.headers.get("cf-connecting-ip") || this.headers.get("x-client-ip") || "unknown";
+  },
+  ips() {
+    const forwardedFor = this.headers.get("x-forwarded-for");
+    if (forwardedFor) {
+      return forwardedFor.split(",").map((ip) => ip.trim());
+    }
+    return [BuiltInRequestMacros.ip.call(this)];
+  },
+  userAgent() {
+    return this.headers.get("user-agent") || "";
+  },
+  referer() {
+    return this.headers.get("referer") || this.headers.get("referrer") || null;
+  },
+  bearerToken() {
+    const auth2 = this.headers.get("authorization");
+    if (auth2 && auth2.startsWith("Bearer ")) {
+      return auth2.substring(7);
+    }
+    return null;
+  },
+  basicAuth() {
+    const auth2 = this.headers.get("authorization");
+    if (auth2 && auth2.startsWith("Basic ")) {
+      try {
+        const decoded = atob(auth2.substring(6));
+        const [username, password] = decoded.split(":");
+        return { username, password };
+      } catch {
+        return null;
+      }
+    }
+    return null;
+  },
+  hasHeader(name) {
+    return this.headers.has(name.toLowerCase());
+  },
+  header(name, defaultValue) {
+    return this.headers.get(name.toLowerCase()) || defaultValue || null;
+  },
+  allHeaders() {
+    const headers = {};
+    this.headers.forEach((value, key) => {
+      headers[key] = value;
+    });
+    return headers;
+  },
+  input(key, defaultValue) {
+    if (this.validated && key in this.validated) {
+      return this.validated[key];
+    }
+    if (this.query && key in this.query) {
+      return this.query[key];
+    }
+    if (this.params && key in this.params) {
+      return this.params[key];
+    }
+    if (this.jsonBody && typeof this.jsonBody === "object" && key in this.jsonBody) {
+      return this.jsonBody[key];
+    }
+    if (this.formBody && typeof this.formBody === "object" && key in this.formBody) {
+      return this.formBody[key];
+    }
+    return defaultValue;
+  },
+  all() {
+    return {
+      ...this.params,
+      ...this.query,
+      ...typeof this.jsonBody === "object" && this.jsonBody !== null ? this.jsonBody : {},
+      ...typeof this.formBody === "object" && this.formBody !== null ? this.formBody : {},
+      ...typeof this.validated === "object" && this.validated !== null ? this.validated : {}
+    };
+  },
+  only(keys) {
+    const all = this.all();
+    const result = {};
+    keys.forEach((key) => {
+      if (key in all) {
+        result[key] = all[key];
+      }
+    });
+    return result;
+  },
+  except(keys) {
+    const all = this.all();
+    const result = {};
+    Object.keys(all).forEach((key) => {
+      if (!keys.includes(key)) {
+        result[key] = all[key];
+      }
+    });
+    return result;
+  },
+  has(key) {
+    const all = this.all();
+    return key in all && all[key] !== undefined && all[key] !== null && all[key] !== "";
+  },
+  hasAny(keys) {
+    return keys.some((key) => this.has(key));
+  },
+  missing(key) {
+    return !this.has(key);
+  },
+  filled(key) {
+    const value = this.input(key);
+    if (value === null || value === undefined)
+      return false;
+    if (typeof value === "string")
+      return value.trim().length > 0;
+    if (Array.isArray(value))
+      return value.length > 0;
+    if (typeof value === "object")
+      return Object.keys(value).length > 0;
+    return true;
+  },
+  getQuery(key, defaultValue) {
+    if (!key)
+      return this.query || {};
+    return this.query?.[key] || defaultValue;
+  },
+  param(key, defaultValue) {
+    return this.params?.[key] || defaultValue;
+  },
+  cookie(name, defaultValue) {
+    const cookies = this.headers.get("cookie");
+    if (!cookies)
+      return defaultValue || null;
+    const cookieArray = cookies.split(";");
+    for (const cookie of cookieArray) {
+      const [key, value] = cookie.trim().split("=");
+      if (key === name) {
+        return decodeURIComponent(value);
+      }
+    }
+    return defaultValue || null;
+  },
+  cookies() {
+    const cookies = {};
+    const cookieHeader = this.headers.get("cookie");
+    if (cookieHeader) {
+      cookieHeader.split(";").forEach((cookie) => {
+        const [key, value] = cookie.trim().split("=");
+        if (key && value) {
+          cookies[key] = decodeURIComponent(value);
         }
-        if (this.wsConfig) {
+      });
+    }
+    return cookies;
+  },
+  file(name) {
+    return this.files?.find((f) => f.fieldName === name);
+  },
+  hasFile(name) {
+    return !!this.files?.find((f) => f.fieldName === name);
+  },
+  path() {
+    return new URL(this.url).pathname;
+  },
+  fullUrl() {
+    return this.url;
+  },
+  root() {
+    const url2 = new URL(this.url);
+    return `${url2.protocol}//${url2.host}`;
+  },
+  is(pattern) {
+    const path = this.path();
+    const regexPattern = pattern.replace(/\*/g, ".*").replace(/\?/g, ".");
+    const regex = new RegExp(`^${regexPattern}$`);
+    return regex.test(path);
+  },
+  route() {
+    return this.routeName || null;
+  },
+  fingerprint() {
+    const url2 = new URL(this.url);
+    const data = {
+      method: this.method,
+      path: url2.pathname,
+      query: url2.search,
+      ip: BuiltInRequestMacros.ip.call(this)
+    };
+    return btoa(JSON.stringify(data));
+  },
+  signature(secret) {
+    const data = `${this.method}${this.url}${BuiltInRequestMacros.ip.call(this)}${secret}`;
+    let hash = 0;
+    for (let i = 0;i < data.length; i++) {
+      const char = data.charCodeAt(i);
+      hash = (hash << 5) - hash + char;
+      hash = hash & hash;
+    }
+    return Math.abs(hash).toString(36);
+  },
+  merge(data) {
+    if (!this.validated) {
+      this.validated = {};
+    }
+    Object.assign(this.validated, data);
+  },
+  replace(data) {
+    this.validated = { ...data };
+  },
+  age() {
+    const startTime = this.startTime || Date.now();
+    return Date.now() - startTime;
+  },
+  isFromTrustedProxy(trustedProxies = []) {
+    const ip = BuiltInRequestMacros.ip.call(this);
+    return trustedProxies.includes(ip);
+  },
+  contentLength() {
+    const length = this.headers.get("content-length");
+    return length ? Number.parseInt(length, 10) : 0;
+  },
+  contentType() {
+    return this.headers.get("content-type");
+  },
+  isContentType(type) {
+    const contentType = this.contentType();
+    return contentType ? contentType.includes(type) : false;
+  }
+};
+function registerBuiltInRequestMacros() {
+  Object.entries(BuiltInRequestMacros).forEach(([name, handler]) => {
+    RequestWithMacros.macro(name, handler);
+  });
+}
+registerBuiltInRequestMacros();
+
+// src/router/server.ts
+function registerServerHandling(RouterClass) {
+  Object.defineProperties(RouterClass.prototype, {
+    serve: {
+      async value(options = {}) {
+        if (this._initFileRoutes) {
+          await this._initFileRoutes();
+        }
+        if (this._initApiRoutes) {
+          await this._initApiRoutes();
+        }
+        this.invalidateCache();
+        const serverOptions = {
+          idleTimeout: 255,
+          ...options,
+          fetch: this.handleRequest.bind(this)
+        };
+        const staticRouteMap = {};
+        if (this.staticResponses && this.staticResponses.size > 0) {
+          for (const [path, response2] of this.staticResponses) {
+            staticRouteMap[path] = response2;
+          }
+        }
+        if (options.static) {
+          Object.assign(staticRouteMap, options.static);
+        }
+        if (Object.keys(staticRouteMap).length > 0) {
+          serverOptions.static = staticRouteMap;
+        }
+        if (options.development !== undefined) {
+          serverOptions.development = options.development;
+        }
+        if (this.wsConfig) {
           serverOptions.websocket = this.wsConfig;
         }
         this.serverInstance = Bun.serve(serverOptions);
@@ -9761,6 +10084,7 @@ function registerServerHandling(RouterClass) {
           _cookiesToSet: [],
           _cookiesToDelete: []
         });
+        RequestWithMacros.applyMacros(enhancedReq);
         Object.assign(enhancedReq, { cookies: { ...getCookies(), ...cookies } });
         return enhancedReq;
       },
@@ -10038,313 +10362,6 @@ function registerWebSocketHandling(RouterClass) {
     }
   });
 }
-// src/request/macros.ts
-class RequestMacroRegistry {
-  macros = new Map;
-  register(name, handler) {
-    this.macros.set(name, { name, handler });
-  }
-  get(name) {
-    return this.macros.get(name);
-  }
-  has(name) {
-    return this.macros.has(name);
-  }
-  all() {
-    return Array.from(this.macros.values());
-  }
-  remove(name) {
-    return this.macros.delete(name);
-  }
-  clear() {
-    this.macros.clear();
-  }
-}
-var requestMacroRegistry = new RequestMacroRegistry;
-
-class RequestWithMacros {
-  static macro(name, handler) {
-    requestMacroRegistry.register(name, handler);
-  }
-  static applyMacros(request2) {
-    const macros = requestMacroRegistry.all();
-    macros.forEach((macro) => {
-      request2[macro.name] = macro.handler.bind(request2);
-    });
-    return request2;
-  }
-  static hasMacro(name) {
-    return requestMacroRegistry.has(name);
-  }
-}
-var BuiltInRequestMacros = {
-  wantsJson() {
-    const accept = this.headers.get("accept") || "";
-    return accept.includes("application/json") || accept.includes("json");
-  },
-  wantsHtml() {
-    const accept = this.headers.get("accept") || "";
-    return accept.includes("text/html") || accept.includes("html");
-  },
-  wantsXml() {
-    const accept = this.headers.get("accept") || "";
-    return accept.includes("application/xml") || accept.includes("xml");
-  },
-  expectsJson() {
-    return this.wantsJson() || this.isAjax() || this.isPjax();
-  },
-  isAjax() {
-    return this.headers.get("x-requested-with") === "XMLHttpRequest";
-  },
-  isPjax() {
-    return this.headers.get("x-pjax") === "true";
-  },
-  isMobile() {
-    const userAgent = this.headers.get("user-agent") || "";
-    const mobileRegex = /Mobile|Android|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i;
-    return mobileRegex.test(userAgent);
-  },
-  isBot() {
-    const userAgent = this.headers.get("user-agent") || "";
-    const botRegex = /bot|crawler|spider|crawling/i;
-    return botRegex.test(userAgent);
-  },
-  isSecure() {
-    return this.url.startsWith("https://") || this.headers.get("x-forwarded-proto") === "https" || this.headers.get("x-forwarded-ssl") === "on";
-  },
-  ip() {
-    return this.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || this.headers.get("x-real-ip") || this.headers.get("cf-connecting-ip") || this.headers.get("x-client-ip") || "unknown";
-  },
-  ips() {
-    const forwardedFor = this.headers.get("x-forwarded-for");
-    if (forwardedFor) {
-      return forwardedFor.split(",").map((ip) => ip.trim());
-    }
-    return [BuiltInRequestMacros.ip.call(this)];
-  },
-  userAgent() {
-    return this.headers.get("user-agent") || "";
-  },
-  referer() {
-    return this.headers.get("referer") || this.headers.get("referrer") || null;
-  },
-  bearerToken() {
-    const auth2 = this.headers.get("authorization");
-    if (auth2 && auth2.startsWith("Bearer ")) {
-      return auth2.substring(7);
-    }
-    return null;
-  },
-  basicAuth() {
-    const auth2 = this.headers.get("authorization");
-    if (auth2 && auth2.startsWith("Basic ")) {
-      try {
-        const decoded = atob(auth2.substring(6));
-        const [username, password] = decoded.split(":");
-        return { username, password };
-      } catch {
-        return null;
-      }
-    }
-    return null;
-  },
-  hasHeader(name) {
-    return this.headers.has(name.toLowerCase());
-  },
-  header(name, defaultValue) {
-    return this.headers.get(name.toLowerCase()) || defaultValue || null;
-  },
-  allHeaders() {
-    const headers = {};
-    this.headers.forEach((value, key) => {
-      headers[key] = value;
-    });
-    return headers;
-  },
-  input(key, defaultValue) {
-    if (this.validated && key in this.validated) {
-      return this.validated[key];
-    }
-    if (this.query && key in this.query) {
-      return this.query[key];
-    }
-    if (this.params && key in this.params) {
-      return this.params[key];
-    }
-    if (this.jsonBody && typeof this.jsonBody === "object" && key in this.jsonBody) {
-      return this.jsonBody[key];
-    }
-    if (this.formBody && typeof this.formBody === "object" && key in this.formBody) {
-      return this.formBody[key];
-    }
-    return defaultValue;
-  },
-  all() {
-    return {
-      ...this.params,
-      ...this.query,
-      ...typeof this.jsonBody === "object" && this.jsonBody !== null ? this.jsonBody : {},
-      ...typeof this.formBody === "object" && this.formBody !== null ? this.formBody : {},
-      ...typeof this.validated === "object" && this.validated !== null ? this.validated : {}
-    };
-  },
-  only(keys) {
-    const all = this.all();
-    const result = {};
-    keys.forEach((key) => {
-      if (key in all) {
-        result[key] = all[key];
-      }
-    });
-    return result;
-  },
-  except(keys) {
-    const all = this.all();
-    const result = {};
-    Object.keys(all).forEach((key) => {
-      if (!keys.includes(key)) {
-        result[key] = all[key];
-      }
-    });
-    return result;
-  },
-  has(key) {
-    const all = this.all();
-    return key in all && all[key] !== undefined && all[key] !== null && all[key] !== "";
-  },
-  hasAny(keys) {
-    return keys.some((key) => this.has(key));
-  },
-  missing(key) {
-    return !this.has(key);
-  },
-  filled(key) {
-    const value = this.input(key);
-    if (value === null || value === undefined)
-      return false;
-    if (typeof value === "string")
-      return value.trim().length > 0;
-    if (Array.isArray(value))
-      return value.length > 0;
-    if (typeof value === "object")
-      return Object.keys(value).length > 0;
-    return true;
-  },
-  getQuery(key, defaultValue) {
-    if (!key)
-      return this.query || {};
-    return this.query?.[key] || defaultValue;
-  },
-  param(key, defaultValue) {
-    return this.params?.[key] || defaultValue;
-  },
-  cookie(name, defaultValue) {
-    const cookies = this.headers.get("cookie");
-    if (!cookies)
-      return defaultValue || null;
-    const cookieArray = cookies.split(";");
-    for (const cookie of cookieArray) {
-      const [key, value] = cookie.trim().split("=");
-      if (key === name) {
-        return decodeURIComponent(value);
-      }
-    }
-    return defaultValue || null;
-  },
-  cookies() {
-    const cookies = {};
-    const cookieHeader = this.headers.get("cookie");
-    if (cookieHeader) {
-      cookieHeader.split(";").forEach((cookie) => {
-        const [key, value] = cookie.trim().split("=");
-        if (key && value) {
-          cookies[key] = decodeURIComponent(value);
-        }
-      });
-    }
-    return cookies;
-  },
-  file(name) {
-    return this.files?.find((f) => f.fieldName === name);
-  },
-  hasFile(name) {
-    return !!this.files?.find((f) => f.fieldName === name);
-  },
-  path() {
-    return new URL(this.url).pathname;
-  },
-  fullUrl() {
-    return this.url;
-  },
-  root() {
-    const url2 = new URL(this.url);
-    return `${url2.protocol}//${url2.host}`;
-  },
-  is(pattern) {
-    const path = this.path();
-    const regexPattern = pattern.replace(/\*/g, ".*").replace(/\?/g, ".");
-    const regex = new RegExp(`^${regexPattern}$`);
-    return regex.test(path);
-  },
-  route() {
-    return this.routeName || null;
-  },
-  fingerprint() {
-    const url2 = new URL(this.url);
-    const data = {
-      method: this.method,
-      path: url2.pathname,
-      query: url2.search,
-      ip: BuiltInRequestMacros.ip.call(this)
-    };
-    return btoa(JSON.stringify(data));
-  },
-  signature(secret) {
-    const data = `${this.method}${this.url}${BuiltInRequestMacros.ip.call(this)}${secret}`;
-    let hash = 0;
-    for (let i = 0;i < data.length; i++) {
-      const char = data.charCodeAt(i);
-      hash = (hash << 5) - hash + char;
-      hash = hash & hash;
-    }
-    return Math.abs(hash).toString(36);
-  },
-  merge(data) {
-    if (!this.validated) {
-      this.validated = {};
-    }
-    Object.assign(this.validated, data);
-  },
-  replace(data) {
-    this.validated = { ...data };
-  },
-  age() {
-    const startTime = this.startTime || Date.now();
-    return Date.now() - startTime;
-  },
-  isFromTrustedProxy(trustedProxies = []) {
-    const ip = BuiltInRequestMacros.ip.call(this);
-    return trustedProxies.includes(ip);
-  },
-  contentLength() {
-    const length = this.headers.get("content-length");
-    return length ? Number.parseInt(length, 10) : 0;
-  },
-  contentType() {
-    return this.headers.get("content-type");
-  },
-  isContentType(type) {
-    const contentType = this.contentType();
-    return contentType ? contentType.includes(type) : false;
-  }
-};
-function registerBuiltInRequestMacros() {
-  Object.entries(BuiltInRequestMacros).forEach(([name, handler]) => {
-    RequestWithMacros.macro(name, handler);
-  });
-}
-registerBuiltInRequestMacros();
-
 // src/response/macros.ts
 import process4 from "process";
 
@@ -13815,6 +13832,7 @@ export {
   authMocks,
   authHelpers,
   auth,
+  applyRequestEnhancements,
   apiKeyAuth,
   WebSocketTester,
   ValidationMiddlewareBuilder,