h3 0.3.8 → 0.4.1

package/README.md

@@ -21,6 +21,8 @@
 
 ✔️  **Extendable:** Ships with a set of composable utilities but can be extended
 
+✔️  **Router:** Super fast route matching using [unjs/radix3](https://github.com/unjs/radix3)
+
 ## Install
 
 ```bash
@@ -57,7 +59,29 @@ listen(app)
 ```
 </details>
 
-## Examples
+## Router
+
+The `app` instance created by `h3` uses a middleware stack (see [how it works](#how-it-works)) with the ability to match route prefix and apply matched middleware.
+
+To opt-in using a more advanced and convenient routing system, we can create a router instance and register it to app instance.
+
+```ts
+import { createApp, createRouter } from 'h3'
+
+const app = createApp()
+
+const router = createRouter()
+ .get('/', () => 'Hello World!')
+ .get('/hello/:name', req => `Hello ${req.params.name}!`)
+
+app.use(router)
+```
+
+**Tip:** We can register same route more than once with different methods.
+
+Routes are internally stored in a [Radix Tree](https://en.wikipedia.org/wiki/Radix_tree) and matched using [unjs/radix3](https://github.com/unjs/radix3).
+
+## More usage examples
 
 ```js
 // Handle can directly return object or Promise<object> for JSON response
@@ -92,11 +116,12 @@ Instead of adding helpers to `req` and `res`, h3 exposes them as composable util
 - `useCookies(req)`
 - `useCookie(req, name)`
 - `setCookie(res, name, value, opts?)`
+- `deleteCookie(res, name, opts?)`
 - `useQuery(req)`
 - `send(res, data, type?)`
 - `sendRedirect(res, location, code=302)`
 - `appendHeader(res, name, value)`
-- `createError({ statusCode, statusMessage, data? }`
+- `createError({ statusCode, statusMessage, data? })`
 - `sendError(res, error, debug?)`
 - `defineHandle(handle)`
 - `defineMiddleware(middlware)`

package/dist/index.cjs

@@ -2,106 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const PLUS_RE = /\+/g;
-function decode$1(text = "") {
-  try {
-    return decodeURIComponent("" + text);
-  } catch (_err) {
-    return "" + text;
-  }
-}
-function decodeQueryValue(text) {
-  return decode$1(text.replace(PLUS_RE, " "));
-}
+const ufo = require('ufo');
+const radix3 = require('radix3');
+const destr = require('destr');
+const cookieEs = require('cookie-es');
 
-function parseQuery(paramsStr = "") {
-  const obj = {};
-  if (paramsStr[0] === "?") {
-    paramsStr = paramsStr.substr(1);
-  }
-  for (const param of paramsStr.split("&")) {
-    const s = param.match(/([^=]+)=?(.*)/) || [];
-    if (s.length < 2) {
-      continue;
-    }
-    const key = decode$1(s[1]);
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = decodeQueryValue(s[2] || "");
-    if (obj[key]) {
-      if (Array.isArray(obj[key])) {
-        obj[key].push(value);
-      } else {
-        obj[key] = [obj[key], value];
-      }
-    } else {
-      obj[key] = value;
-    }
-  }
-  return obj;
-}
-function hasProtocol(inputStr, acceptProtocolRelative = false) {
-  return /^\w+:\/\/.+/.test(inputStr) || acceptProtocolRelative && /^\/\/[^/]+/.test(inputStr);
-}
-const TRAILING_SLASH_RE = /\/$|\/\?/;
-function hasTrailingSlash(input = "", queryParams = false) {
-  if (!queryParams) {
-    return input.endsWith("/");
-  }
-  return TRAILING_SLASH_RE.test(input);
-}
-function withoutTrailingSlash(input = "", queryParams = false) {
-  if (!queryParams) {
-    return (hasTrailingSlash(input) ? input.slice(0, -1) : input) || "/";
-  }
-  if (!hasTrailingSlash(input, true)) {
-    return input || "/";
-  }
-  const [s0, ...s] = input.split("?");
-  return (s0.slice(0, -1) || "/") + (s.length ? `?${s.join("?")}` : "");
-}
-function withoutBase(input, base) {
-  if (isEmptyURL(base)) {
-    return input;
-  }
-  const _base = withoutTrailingSlash(base);
-  if (input.startsWith(_base)) {
-    return input.substr(_base.length) || "/";
-  }
-  return input;
-}
-function getQuery(input) {
-  return parseQuery(parseURL(input).search);
-}
-function isEmptyURL(url) {
-  return !url || url === "/";
-}
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
-function parseURL(input = "", defaultProto) {
-  if (!hasProtocol(input, true)) {
-    return defaultProto ? parseURL(defaultProto + input) : parsePath(input);
-  }
-  const [protocol = "", auth, hostAndPath] = (input.match(/([^:/]+:)?\/\/([^/@]+@)?(.*)/) || []).splice(1);
-  const [host = "", path = ""] = (hostAndPath.match(/([^/?]*)(.*)?/) || []).splice(1);
-  const { pathname, search, hash } = parsePath(path);
-  return {
-    protocol,
-    auth: auth ? auth.substr(0, auth.length - 1) : "",
-    host,
-    pathname,
-    search,
-    hash
-  };
-}
-function parsePath(input = "") {
-  const [pathname = "", search = "", hash = ""] = (input.match(/([^#?]*)(\?[^#]*)?(#.*)?/) || []).splice(1);
-  return {
-    pathname,
-    search,
-    hash
-  };
-}
+const destr__default = /*#__PURE__*/_interopDefaultLegacy(destr);
 
 const defineHandle = (handler) => handler;
 const defineMiddleware = (middleware) => middleware;
@@ -139,64 +47,19 @@ function lazyHandle(handle, promisify) {
   };
 }
 function useBase(base, handle) {
-  base = withoutTrailingSlash(base);
+  base = ufo.withoutTrailingSlash(base);
   if (!base) {
     return handle;
   }
   return function(req, res) {
     req.originalUrl = req.originalUrl || req.url || "/";
-    req.url = withoutBase(req.url || "/", base);
+    req.url = ufo.withoutBase(req.url || "/", base);
     return handle(req, res);
   };
 }
 
-const suspectProtoRx = /"(?:_|\\u005[Ff])(?:_|\\u005[Ff])(?:p|\\u0070)(?:r|\\u0072)(?:o|\\u006[Ff])(?:t|\\u0074)(?:o|\\u006[Ff])(?:_|\\u005[Ff])(?:_|\\u005[Ff])"\s*:/;
-const suspectConstructorRx = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/;
-const JsonSigRx = /^["{[]|^-?[0-9][0-9.]{0,14}$/;
-function jsonParseTransform(key, value) {
-  if (key === "__proto__" || key === "constructor") {
-    return;
-  }
-  return value;
-}
-function destr(val) {
-  if (typeof val !== "string") {
-    return val;
-  }
-  const _lval = val.toLowerCase();
-  if (_lval === "true") {
-    return true;
-  }
-  if (_lval === "false") {
-    return false;
-  }
-  if (_lval === "null") {
-    return null;
-  }
-  if (_lval === "nan") {
-    return NaN;
-  }
-  if (_lval === "infinity") {
-    return Infinity;
-  }
-  if (_lval === "undefined") {
-    return void 0;
-  }
-  if (!JsonSigRx.test(val)) {
-    return val;
-  }
-  try {
-    if (suspectProtoRx.test(val) || suspectConstructorRx.test(val)) {
-      return JSON.parse(val, jsonParseTransform);
-    }
-    return JSON.parse(val);
-  } catch (_e) {
-    return val;
-  }
-}
-
 function useQuery(req) {
-  return getQuery(req.url || "");
+  return ufo.getQuery(req.url || "");
 }
 function useMethod(req, defaultMethod = "GET") {
   return (req.method || defaultMethod).toUpperCase();
@@ -253,7 +116,7 @@ async function useBody(req) {
     return req[ParsedBodySymbol];
   }
   const body = await useRawBody(req);
-  const json = destr(body);
+  const json = destr__default(body);
   req[ParsedBodySymbol] = json;
   return json;
 }
@@ -263,203 +126,6 @@ const MIMES = {
   json: "application/json"
 };
 
-/*!
- * cookie
- * Copyright(c) 2012-2014 Roman Shtylman
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/**
- * Module exports.
- * @public
- */
-
-var parse_1 = parse;
-var serialize_1 = serialize;
-
-/**
- * Module variables.
- * @private
- */
-
-var decode = decodeURIComponent;
-var encode = encodeURIComponent;
-var pairSplitRegExp = /; */;
-
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar   = VCHAR / obs-text
- * obs-text      = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
-/**
- * Parse a cookie header.
- *
- * Parse the given cookie header string into an object
- * The object has the various cookies as keys(names) => values
- *
- * @param {string} str
- * @param {object} [options]
- * @return {object}
- * @public
- */
-
-function parse(str, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('argument str must be a string');
-  }
-
-  var obj = {};
-  var opt = options || {};
-  var pairs = str.split(pairSplitRegExp);
-  var dec = opt.decode || decode;
-
-  for (var i = 0; i < pairs.length; i++) {
-    var pair = pairs[i];
-    var eq_idx = pair.indexOf('=');
-
-    // skip things that don't look like key=value
-    if (eq_idx < 0) {
-      continue;
-    }
-
-    var key = pair.substr(0, eq_idx).trim();
-    var val = pair.substr(++eq_idx, pair.length).trim();
-
-    // quoted values
-    if ('"' == val[0]) {
-      val = val.slice(1, -1);
-    }
-
-    // only assign once
-    if (undefined == obj[key]) {
-      obj[key] = tryDecode(val, dec);
-    }
-  }
-
-  return obj;
-}
-
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- *   => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
-  var opt = options || {};
-  var enc = opt.encode || encode;
-
-  if (typeof enc !== 'function') {
-    throw new TypeError('option encode is invalid');
-  }
-
-  if (!fieldContentRegExp.test(name)) {
-    throw new TypeError('argument name is invalid');
-  }
-
-  var value = enc(val);
-
-  if (value && !fieldContentRegExp.test(value)) {
-    throw new TypeError('argument val is invalid');
-  }
-
-  var str = name + '=' + value;
-
-  if (null != opt.maxAge) {
-    var maxAge = opt.maxAge - 0;
-    if (isNaN(maxAge)) throw new Error('maxAge should be a Number');
-    str += '; Max-Age=' + Math.floor(maxAge);
-  }
-
-  if (opt.domain) {
-    if (!fieldContentRegExp.test(opt.domain)) {
-      throw new TypeError('option domain is invalid');
-    }
-
-    str += '; Domain=' + opt.domain;
-  }
-
-  if (opt.path) {
-    if (!fieldContentRegExp.test(opt.path)) {
-      throw new TypeError('option path is invalid');
-    }
-
-    str += '; Path=' + opt.path;
-  }
-
-  if (opt.expires) {
-    if (typeof opt.expires.toUTCString !== 'function') {
-      throw new TypeError('option expires is invalid');
-    }
-
-    str += '; Expires=' + opt.expires.toUTCString();
-  }
-
-  if (opt.httpOnly) {
-    str += '; HttpOnly';
-  }
-
-  if (opt.secure) {
-    str += '; Secure';
-  }
-
-  if (opt.sameSite) {
-    var sameSite = typeof opt.sameSite === 'string'
-      ? opt.sameSite.toLowerCase() : opt.sameSite;
-
-    switch (sameSite) {
-      case true:
-        str += '; SameSite=Strict';
-        break;
-      case 'lax':
-        str += '; SameSite=Lax';
-        break;
-      case 'strict':
-        str += '; SameSite=Strict';
-        break;
-      case 'none':
-        str += '; SameSite=None';
-        break;
-      default:
-        throw new TypeError('option sameSite is invalid');
-    }
-  }
-
-  return str;
-}
-
-/**
- * Try decoding a string using a decoding function.
- *
- * @param {string} str
- * @param {function} decode
- * @private
- */
-
-function tryDecode(str, decode) {
-  try {
-    return decode(str);
-  } catch (e) {
-    return str;
-  }
-}
-
 const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
 function send(res, data, type) {
   if (type) {
@@ -495,15 +161,21 @@ function appendHeader(res, name, value) {
 }
 
 function useCookies(req) {
-  return parse_1(req.headers.cookie || "");
+  return cookieEs.parse(req.headers.cookie || "");
 }
 function useCookie(req, name) {
   return useCookies(req)[name];
 }
 function setCookie(res, name, value, serializeOptions) {
-  const cookieStr = serialize_1(name, value, serializeOptions);
+  const cookieStr = cookieEs.serialize(name, value, serializeOptions);
   appendHeader(res, "Set-Cookie", cookieStr);
 }
+function deleteCookie(res, name, serializeOptions) {
+  setCookie(res, name, "", {
+    ...serializeOptions,
+    maxAge: 0
+  });
+}
 
 class H3Error extends Error {
   constructor() {
@@ -513,11 +185,10 @@ class H3Error extends Error {
   }
 }
 function createError(input) {
-  var _a;
   if (input instanceof H3Error) {
     return input;
   }
-  const err = new H3Error((_a = input.message) != null ? _a : input.statusMessage);
+  const err = new H3Error(input.message ?? input.statusMessage);
   if (input.statusCode) {
     err.statusCode = input.statusCode;
   }
@@ -595,7 +266,7 @@ function createHandle(stack, options) {
         if (!reqUrl.startsWith(layer.route)) {
           continue;
         }
-        req.url = reqUrl.substr(layer.route.length) || "/";
+        req.url = reqUrl.slice(layer.route.length) || "/";
       } else {
         req.url = reqUrl;
       }
@@ -609,7 +280,7 @@ function createHandle(stack, options) {
       const type = typeof val;
       if (type === "string") {
         return send(res, val, MIMES.html);
-      } else if (type === "object" && val !== void 0) {
+      } else if (type === "object" || type === "boolean" || type === "number") {
         if (val && val.buffer) {
           return send(res, val);
         } else if (val instanceof Error) {
@@ -629,12 +300,53 @@ function normalizeLayer(layer) {
     layer.promisify = layer.handle.length > 2;
   }
   return {
-    route: withoutTrailingSlash(layer.route).toLocaleLowerCase(),
+    route: ufo.withoutTrailingSlash(layer.route),
     match: layer.match,
     handle: layer.lazy ? lazyHandle(layer.handle, layer.promisify) : layer.promisify ? promisifyHandle(layer.handle) : layer.handle
   };
 }
 
+const RouterMethods = ["connect", "delete", "get", "head", "options", "post", "put", "trace"];
+function createRouter() {
+  const _router = radix3.createRouter({});
+  const routes = {};
+  const router = {};
+  router.add = (path, handle, method = "all") => {
+    let route = routes[path];
+    if (!route) {
+      routes[path] = route = { handlers: {} };
+      _router.insert(path, route);
+    }
+    route.handlers[method] = handle;
+    return router;
+  };
+  for (const method of RouterMethods) {
+    router[method] = (path, handle) => router.add(path, handle, method);
+  }
+  router.handle = (req, res) => {
+    const matched = _router.lookup(req.url || "/");
+    if (!matched) {
+      throw createError({
+        statusCode: 404,
+        name: "Not Found",
+        statusMessage: `Cannot find any route matching ${req.url || "/"}.`
+      });
+    }
+    const method = (req.method || "get").toLowerCase();
+    const handler = matched.handlers[method] || matched.handlers.all;
+    if (!handler) {
+      throw createError({
+        statusCode: 405,
+        name: "Method Not Allowed",
+        statusMessage: `Method ${method} is not allowed on this route.`
+      });
+    }
+    req.params = matched.params || {};
+    return handler(req, res);
+  };
+  return router;
+}
+
 exports.H3Error = H3Error;
 exports.MIMES = MIMES;
 exports.appendHeader = appendHeader;
@@ -643,9 +355,11 @@ exports.callHandle = callHandle;
 exports.createApp = createApp;
 exports.createError = createError;
 exports.createHandle = createHandle;
+exports.createRouter = createRouter;
 exports.defaultContentType = defaultContentType;
 exports.defineHandle = defineHandle;
 exports.defineMiddleware = defineMiddleware;
+exports.deleteCookie = deleteCookie;
 exports.isMethod = isMethod;
 exports.lazyHandle = lazyHandle;
 exports.promisifyHandle = promisifyHandle;

package/dist/index.d.ts

@@ -3,11 +3,11 @@ import * as ufo from 'ufo';
 
 declare type Encoding = false | 'ascii' | 'utf8' | 'utf-8' | 'utf16le' | 'ucs2' | 'ucs-2' | 'base64' | 'latin1' | 'binary' | 'hex';
 
-declare type Handle<T = any> = (req: IncomingMessage, res: ServerResponse) => T;
+declare type Handle<T = any, ReqT = {}> = (req: IncomingMessage & ReqT, res: ServerResponse) => T;
 declare type PHandle = Handle<Promise<any>>;
 declare type Middleware = (req: IncomingMessage, res: ServerResponse, next: (err?: Error) => any) => any;
 declare type LazyHandle = () => Handle | Promise<Handle>;
-declare const defineHandle: <T>(handler: Handle<T>) => Handle<T>;
+declare const defineHandle: <T>(handler: Handle<T, {}>) => Handle<T, {}>;
 declare const defineMiddleware: (middleware: Middleware) => Middleware;
 declare function promisifyHandle(handle: Handle | Middleware): PHandle;
 declare function callHandle(handle: Middleware, req: IncomingMessage, res: ServerResponse): Promise<unknown>;
@@ -73,8 +73,8 @@ declare class H3Error extends Error {
  */
 declare function createError(input: Partial<H3Error>): H3Error;
 /**
- * Recieve an error and return the corresponding response.<br>
- *  H3 internally uses this fucntion to handle unhandled errors.<br>
+ * Receive an error and return the corresponding response.<br>
+ *  H3 internally uses this function to handle unhandled errors.<br>
  *  Note that calling this function will close the connection and no other data will be sent to client afterwards.
  *
  * @param res {ServerResponse} The ServerResponse object is passed as the second parameter in the handler function
@@ -232,9 +232,20 @@ declare function useCookie(req: IncomingMessage, name: string): string | undefin
  * ```
  */
 declare function setCookie(res: ServerResponse, name: string, value: string, serializeOptions?: CookieSerializeOptions): void;
+/**
+ * Set a cookie value by name.
+ * @param res {ServerResponse} A ServerResponse object created by [http.Server](https://nodejs.org/api/http.html#http_class_http_server)
+ * @param name Name of the cookie to delete
+ * @param serializeOptions {CookieSerializeOptions} Cookie options
+ * ```ts
+ * deleteCookie(res, 'SessionId')
+ * ```
+ */
+declare function deleteCookie(res: ServerResponse, name: string, serializeOptions?: CookieSerializeOptions): void;
 
-declare function useQuery(req: IncomingMessage): ufo.QueryObject;
 declare type HTTPMethod = 'GET' | 'HEAD' | 'POST' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE';
+
+declare function useQuery(req: IncomingMessage): ufo.QueryObject;
 declare function useMethod(req: IncomingMessage, defaultMethod?: HTTPMethod): HTTPMethod;
 declare function isMethod(req: IncomingMessage, expected: HTTPMethod | HTTPMethod[], allowHead?: boolean): boolean;
 declare function assertMethod(req: IncomingMessage, expected: HTTPMethod | HTTPMethod[], allowHead?: boolean): void;
@@ -244,4 +255,16 @@ declare function defaultContentType(res: ServerResponse, type?: string): void;
 declare function sendRedirect(res: ServerResponse, location: string, code?: number): Promise<unknown>;
 declare function appendHeader(res: ServerResponse, name: string, value: string): void;
 
-export { App, AppOptions, AppUse, H3Error, HTTPMethod, Handle, InputLayer, InputStack, Layer, LazyHandle, MIMES, Matcher, Middleware, PHandle, Stack, appendHeader, assertMethod, callHandle, createApp, createError, createHandle, defaultContentType, defineHandle, defineMiddleware, isMethod, lazyHandle, promisifyHandle, send, sendError, sendRedirect, setCookie, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };
+declare type RouterMethod = Lowercase<HTTPMethod>;
+declare type HandleWithParams = Handle<any, {
+    params: Record<string, string>;
+}>;
+declare type AddWithMethod = (path: string, handle: HandleWithParams) => Router;
+declare type AddRouteShortcuts = Record<Lowercase<HTTPMethod>, AddWithMethod>;
+interface Router extends AddRouteShortcuts {
+    add: (path: string, handle: HandleWithParams, method?: RouterMethod | 'all') => Router;
+    handle: Handle;
+}
+declare function createRouter(): Router;
+
+export { AddRouteShortcuts, AddWithMethod, App, AppOptions, AppUse, H3Error, Handle, HandleWithParams, InputLayer, InputStack, Layer, LazyHandle, MIMES, Matcher, Middleware, PHandle, Router, RouterMethod, Stack, appendHeader, assertMethod, callHandle, createApp, createError, createHandle, createRouter, defaultContentType, defineHandle, defineMiddleware, deleteCookie, isMethod, lazyHandle, promisifyHandle, send, sendError, sendRedirect, setCookie, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };

package/dist/index.mjs

@@ -1,103 +1,7 @@
-const PLUS_RE = /\+/g;
-function decode$1(text = "") {
-  try {
-    return decodeURIComponent("" + text);
-  } catch (_err) {
-    return "" + text;
-  }
-}
-function decodeQueryValue(text) {
-  return decode$1(text.replace(PLUS_RE, " "));
-}
-
-function parseQuery(paramsStr = "") {
-  const obj = {};
-  if (paramsStr[0] === "?") {
-    paramsStr = paramsStr.substr(1);
-  }
-  for (const param of paramsStr.split("&")) {
-    const s = param.match(/([^=]+)=?(.*)/) || [];
-    if (s.length < 2) {
-      continue;
-    }
-    const key = decode$1(s[1]);
-    if (key === "__proto__" || key === "constructor") {
-      continue;
-    }
-    const value = decodeQueryValue(s[2] || "");
-    if (obj[key]) {
-      if (Array.isArray(obj[key])) {
-        obj[key].push(value);
-      } else {
-        obj[key] = [obj[key], value];
-      }
-    } else {
-      obj[key] = value;
-    }
-  }
-  return obj;
-}
-function hasProtocol(inputStr, acceptProtocolRelative = false) {
-  return /^\w+:\/\/.+/.test(inputStr) || acceptProtocolRelative && /^\/\/[^/]+/.test(inputStr);
-}
-const TRAILING_SLASH_RE = /\/$|\/\?/;
-function hasTrailingSlash(input = "", queryParams = false) {
-  if (!queryParams) {
-    return input.endsWith("/");
-  }
-  return TRAILING_SLASH_RE.test(input);
-}
-function withoutTrailingSlash(input = "", queryParams = false) {
-  if (!queryParams) {
-    return (hasTrailingSlash(input) ? input.slice(0, -1) : input) || "/";
-  }
-  if (!hasTrailingSlash(input, true)) {
-    return input || "/";
-  }
-  const [s0, ...s] = input.split("?");
-  return (s0.slice(0, -1) || "/") + (s.length ? `?${s.join("?")}` : "");
-}
-function withoutBase(input, base) {
-  if (isEmptyURL(base)) {
-    return input;
-  }
-  const _base = withoutTrailingSlash(base);
-  if (input.startsWith(_base)) {
-    return input.substr(_base.length) || "/";
-  }
-  return input;
-}
-function getQuery(input) {
-  return parseQuery(parseURL(input).search);
-}
-function isEmptyURL(url) {
-  return !url || url === "/";
-}
-
-function parseURL(input = "", defaultProto) {
-  if (!hasProtocol(input, true)) {
-    return defaultProto ? parseURL(defaultProto + input) : parsePath(input);
-  }
-  const [protocol = "", auth, hostAndPath] = (input.match(/([^:/]+:)?\/\/([^/@]+@)?(.*)/) || []).splice(1);
-  const [host = "", path = ""] = (hostAndPath.match(/([^/?]*)(.*)?/) || []).splice(1);
-  const { pathname, search, hash } = parsePath(path);
-  return {
-    protocol,
-    auth: auth ? auth.substr(0, auth.length - 1) : "",
-    host,
-    pathname,
-    search,
-    hash
-  };
-}
-function parsePath(input = "") {
-  const [pathname = "", search = "", hash = ""] = (input.match(/([^#?]*)(\?[^#]*)?(#.*)?/) || []).splice(1);
-  return {
-    pathname,
-    search,
-    hash
-  };
-}
+import { withoutTrailingSlash, withoutBase, getQuery } from 'ufo';
+import { createRouter as createRouter$1 } from 'radix3';
+import destr from 'destr';
+import { parse, serialize } from 'cookie-es';
 
 const defineHandle = (handler) => handler;
 const defineMiddleware = (middleware) => middleware;
@@ -146,51 +50,6 @@ function useBase(base, handle) {
   };
 }
 
-const suspectProtoRx = /"(?:_|\\u005[Ff])(?:_|\\u005[Ff])(?:p|\\u0070)(?:r|\\u0072)(?:o|\\u006[Ff])(?:t|\\u0074)(?:o|\\u006[Ff])(?:_|\\u005[Ff])(?:_|\\u005[Ff])"\s*:/;
-const suspectConstructorRx = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/;
-const JsonSigRx = /^["{[]|^-?[0-9][0-9.]{0,14}$/;
-function jsonParseTransform(key, value) {
-  if (key === "__proto__" || key === "constructor") {
-    return;
-  }
-  return value;
-}
-function destr(val) {
-  if (typeof val !== "string") {
-    return val;
-  }
-  const _lval = val.toLowerCase();
-  if (_lval === "true") {
-    return true;
-  }
-  if (_lval === "false") {
-    return false;
-  }
-  if (_lval === "null") {
-    return null;
-  }
-  if (_lval === "nan") {
-    return NaN;
-  }
-  if (_lval === "infinity") {
-    return Infinity;
-  }
-  if (_lval === "undefined") {
-    return void 0;
-  }
-  if (!JsonSigRx.test(val)) {
-    return val;
-  }
-  try {
-    if (suspectProtoRx.test(val) || suspectConstructorRx.test(val)) {
-      return JSON.parse(val, jsonParseTransform);
-    }
-    return JSON.parse(val);
-  } catch (_e) {
-    return val;
-  }
-}
-
 function useQuery(req) {
   return getQuery(req.url || "");
 }
@@ -259,203 +118,6 @@ const MIMES = {
   json: "application/json"
 };
 
-/*!
- * cookie
- * Copyright(c) 2012-2014 Roman Shtylman
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/**
- * Module exports.
- * @public
- */
-
-var parse_1 = parse;
-var serialize_1 = serialize;
-
-/**
- * Module variables.
- * @private
- */
-
-var decode = decodeURIComponent;
-var encode = encodeURIComponent;
-var pairSplitRegExp = /; */;
-
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar   = VCHAR / obs-text
- * obs-text      = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
-/**
- * Parse a cookie header.
- *
- * Parse the given cookie header string into an object
- * The object has the various cookies as keys(names) => values
- *
- * @param {string} str
- * @param {object} [options]
- * @return {object}
- * @public
- */
-
-function parse(str, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('argument str must be a string');
-  }
-
-  var obj = {};
-  var opt = options || {};
-  var pairs = str.split(pairSplitRegExp);
-  var dec = opt.decode || decode;
-
-  for (var i = 0; i < pairs.length; i++) {
-    var pair = pairs[i];
-    var eq_idx = pair.indexOf('=');
-
-    // skip things that don't look like key=value
-    if (eq_idx < 0) {
-      continue;
-    }
-
-    var key = pair.substr(0, eq_idx).trim();
-    var val = pair.substr(++eq_idx, pair.length).trim();
-
-    // quoted values
-    if ('"' == val[0]) {
-      val = val.slice(1, -1);
-    }
-
-    // only assign once
-    if (undefined == obj[key]) {
-      obj[key] = tryDecode(val, dec);
-    }
-  }
-
-  return obj;
-}
-
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- *   => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
-  var opt = options || {};
-  var enc = opt.encode || encode;
-
-  if (typeof enc !== 'function') {
-    throw new TypeError('option encode is invalid');
-  }
-
-  if (!fieldContentRegExp.test(name)) {
-    throw new TypeError('argument name is invalid');
-  }
-
-  var value = enc(val);
-
-  if (value && !fieldContentRegExp.test(value)) {
-    throw new TypeError('argument val is invalid');
-  }
-
-  var str = name + '=' + value;
-
-  if (null != opt.maxAge) {
-    var maxAge = opt.maxAge - 0;
-    if (isNaN(maxAge)) throw new Error('maxAge should be a Number');
-    str += '; Max-Age=' + Math.floor(maxAge);
-  }
-
-  if (opt.domain) {
-    if (!fieldContentRegExp.test(opt.domain)) {
-      throw new TypeError('option domain is invalid');
-    }
-
-    str += '; Domain=' + opt.domain;
-  }
-
-  if (opt.path) {
-    if (!fieldContentRegExp.test(opt.path)) {
-      throw new TypeError('option path is invalid');
-    }
-
-    str += '; Path=' + opt.path;
-  }
-
-  if (opt.expires) {
-    if (typeof opt.expires.toUTCString !== 'function') {
-      throw new TypeError('option expires is invalid');
-    }
-
-    str += '; Expires=' + opt.expires.toUTCString();
-  }
-
-  if (opt.httpOnly) {
-    str += '; HttpOnly';
-  }
-
-  if (opt.secure) {
-    str += '; Secure';
-  }
-
-  if (opt.sameSite) {
-    var sameSite = typeof opt.sameSite === 'string'
-      ? opt.sameSite.toLowerCase() : opt.sameSite;
-
-    switch (sameSite) {
-      case true:
-        str += '; SameSite=Strict';
-        break;
-      case 'lax':
-        str += '; SameSite=Lax';
-        break;
-      case 'strict':
-        str += '; SameSite=Strict';
-        break;
-      case 'none':
-        str += '; SameSite=None';
-        break;
-      default:
-        throw new TypeError('option sameSite is invalid');
-    }
-  }
-
-  return str;
-}
-
-/**
- * Try decoding a string using a decoding function.
- *
- * @param {string} str
- * @param {function} decode
- * @private
- */
-
-function tryDecode(str, decode) {
-  try {
-    return decode(str);
-  } catch (e) {
-    return str;
-  }
-}
-
 const defer = typeof setImmediate !== "undefined" ? setImmediate : (fn) => fn();
 function send(res, data, type) {
   if (type) {
@@ -491,15 +153,21 @@ function appendHeader(res, name, value) {
 }
 
 function useCookies(req) {
-  return parse_1(req.headers.cookie || "");
+  return parse(req.headers.cookie || "");
 }
 function useCookie(req, name) {
   return useCookies(req)[name];
 }
 function setCookie(res, name, value, serializeOptions) {
-  const cookieStr = serialize_1(name, value, serializeOptions);
+  const cookieStr = serialize(name, value, serializeOptions);
   appendHeader(res, "Set-Cookie", cookieStr);
 }
+function deleteCookie(res, name, serializeOptions) {
+  setCookie(res, name, "", {
+    ...serializeOptions,
+    maxAge: 0
+  });
+}
 
 class H3Error extends Error {
   constructor() {
@@ -509,11 +177,10 @@ class H3Error extends Error {
   }
 }
 function createError(input) {
-  var _a;
   if (input instanceof H3Error) {
     return input;
   }
-  const err = new H3Error((_a = input.message) != null ? _a : input.statusMessage);
+  const err = new H3Error(input.message ?? input.statusMessage);
   if (input.statusCode) {
     err.statusCode = input.statusCode;
   }
@@ -591,7 +258,7 @@ function createHandle(stack, options) {
         if (!reqUrl.startsWith(layer.route)) {
           continue;
         }
-        req.url = reqUrl.substr(layer.route.length) || "/";
+        req.url = reqUrl.slice(layer.route.length) || "/";
       } else {
         req.url = reqUrl;
       }
@@ -605,7 +272,7 @@ function createHandle(stack, options) {
       const type = typeof val;
       if (type === "string") {
         return send(res, val, MIMES.html);
-      } else if (type === "object" && val !== void 0) {
+      } else if (type === "object" || type === "boolean" || type === "number") {
         if (val && val.buffer) {
           return send(res, val);
         } else if (val instanceof Error) {
@@ -625,10 +292,51 @@ function normalizeLayer(layer) {
     layer.promisify = layer.handle.length > 2;
   }
   return {
-    route: withoutTrailingSlash(layer.route).toLocaleLowerCase(),
+    route: withoutTrailingSlash(layer.route),
     match: layer.match,
     handle: layer.lazy ? lazyHandle(layer.handle, layer.promisify) : layer.promisify ? promisifyHandle(layer.handle) : layer.handle
   };
 }
 
-export { H3Error, MIMES, appendHeader, assertMethod, callHandle, createApp, createError, createHandle, defaultContentType, defineHandle, defineMiddleware, isMethod, lazyHandle, promisifyHandle, send, sendError, sendRedirect, setCookie, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };
+const RouterMethods = ["connect", "delete", "get", "head", "options", "post", "put", "trace"];
+function createRouter() {
+  const _router = createRouter$1({});
+  const routes = {};
+  const router = {};
+  router.add = (path, handle, method = "all") => {
+    let route = routes[path];
+    if (!route) {
+      routes[path] = route = { handlers: {} };
+      _router.insert(path, route);
+    }
+    route.handlers[method] = handle;
+    return router;
+  };
+  for (const method of RouterMethods) {
+    router[method] = (path, handle) => router.add(path, handle, method);
+  }
+  router.handle = (req, res) => {
+    const matched = _router.lookup(req.url || "/");
+    if (!matched) {
+      throw createError({
+        statusCode: 404,
+        name: "Not Found",
+        statusMessage: `Cannot find any route matching ${req.url || "/"}.`
+      });
+    }
+    const method = (req.method || "get").toLowerCase();
+    const handler = matched.handlers[method] || matched.handlers.all;
+    if (!handler) {
+      throw createError({
+        statusCode: 405,
+        name: "Method Not Allowed",
+        statusMessage: `Method ${method} is not allowed on this route.`
+      });
+    }
+    req.params = matched.params || {};
+    return handler(req, res);
+  };
+  return router;
+}
+
+export { H3Error, MIMES, appendHeader, assertMethod, callHandle, createApp, createError, createHandle, createRouter, defaultContentType, defineHandle, defineMiddleware, deleteCookie, isMethod, lazyHandle, promisifyHandle, send, sendError, sendRedirect, setCookie, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",
@@ -18,36 +18,38 @@
     "dist"
   ],
   "scripts": {
-    "build": "siroc build",
-    "dev": "jiti test/playground",
-    "lint": "eslint --ext ts .",
-    "profile": "0x -o -D .profile -P 'autocannon -c 100 -p 10 -d 40 http://localhost:$PORT' ./hello.js",
-    "release": "yarn test && yarn build && standard-version && npm publish && git push --follow-tags",
-    "test": "yarn lint && jest"
+    "build": "unbuild",
+    "dev": "jiti ./playground/index.ts",
+    "lint": "eslint --ext ts,mjs,cjs .",
+    "profile": "0x -o -D .profile -P 'autocannon -c 100 -p 10 -d 40 http://localhost:$PORT' ./playground/server.cjs",
+    "release": "yarn lint && yarn test && yarn build && standard-version && npm publish && git push --follow-tags",
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "cookie-es": "^0.5.0",
+    "destr": "^1.1.0",
+    "radix3": "^0.1.1",
+    "ufo": "^0.7.11"
   },
   "devDependencies": {
     "0x": "latest",
     "@nuxtjs/eslint-config-typescript": "latest",
     "@types/cookie": "latest",
     "@types/express": "latest",
-    "@types/jest": "latest",
     "@types/node": "latest",
     "@types/supertest": "latest",
     "autocannon": "latest",
+    "c8": "latest",
     "connect": "latest",
-    "cookie-es": "latest",
-    "destr": "latest",
     "eslint": "latest",
     "express": "latest",
     "get-port": "^5.0.0",
-    "jest": "latest",
     "jiti": "latest",
     "listhen": "latest",
-    "siroc": "latest",
     "standard-version": "latest",
     "supertest": "latest",
-    "ts-jest": "latest",
     "typescript": "latest",
-    "ufo": "latest"
+    "unbuild": "latest",
+    "vitest": "latest"
   }
 }