hono 4.13.9 → 4.13.10

package/dist/cjs/validator/validator.js

@@ -1,108 +1,65 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var validator_exports = {};
-__export(validator_exports, {
-  validator: () => validator
-});
-module.exports = __toCommonJS(validator_exports);
-var import_cookie = require("../helper/cookie");
-var import_http_exception = require("../http-exception");
-var import_buffer = require("../utils/buffer");
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_http_exception = require("../http-exception.js");
+const require_utils_buffer = require("../utils/buffer.js");
+const require_helper_cookie_index = require("../helper/cookie/index.js");
+//#region src/validator/validator.ts
 const jsonRegex = /^application\/([a-z-\.]+\+)?json(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
 const multipartRegex = /^multipart\/form-data(;\s?boundary=[a-zA-Z0-9'"()+_,\-./:=?]+)?$/i;
 const urlencodedRegex = /^application\/x-www-form-urlencoded(;\s*[a-zA-Z0-9\-]+\=([^;]+))*$/i;
 const validator = (target, validationFunc) => {
-  return async (c, next) => {
-    let value = {};
-    const contentType = c.req.header("Content-Type");
-    switch (target) {
-      case "json":
-        if (!contentType || !jsonRegex.test(contentType)) {
-          break;
-        }
-        try {
-          value = await c.req.json();
-        } catch {
-          const message = "Malformed JSON in request body";
-          throw new import_http_exception.HTTPException(400, { message });
-        }
-        break;
-      case "form": {
-        if (!contentType || !(multipartRegex.test(contentType) || urlencodedRegex.test(contentType))) {
-          break;
-        }
-        let formData;
-        if (c.req.bodyCache.formData) {
-          formData = await c.req.bodyCache.formData;
-        } else {
-          try {
-            const arrayBuffer = await c.req.arrayBuffer();
-            formData = await (0, import_buffer.bufferToFormData)(arrayBuffer, contentType);
-            c.req.bodyCache.formData = formData;
-          } catch (e) {
-            let message = "Malformed FormData request.";
-            message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;
-            throw new import_http_exception.HTTPException(400, { message });
-          }
-        }
-        const form = /* @__PURE__ */ Object.create(null);
-        formData.forEach((value2, key) => {
-          if (key.endsWith("[]")) {
-            ;
-            (form[key] ??= []).push(value2);
-          } else if (Array.isArray(form[key])) {
-            ;
-            form[key].push(value2);
-          } else if (Object.hasOwn(form, key)) {
-            form[key] = [form[key], value2];
-          } else {
-            form[key] = value2;
-          }
-        });
-        value = form;
-        break;
-      }
-      case "query":
-        value = Object.fromEntries(
-          Object.entries(c.req.queries()).map(([k, v]) => {
-            return v.length === 1 ? [k, v[0]] : [k, v];
-          })
-        );
-        break;
-      case "param":
-        value = c.req.param();
-        break;
-      case "header":
-        value = c.req.header();
-        break;
-      case "cookie":
-        value = (0, import_cookie.getCookie)(c);
-        break;
-    }
-    const res = await validationFunc(value, c);
-    if (res instanceof Response) {
-      return res;
-    }
-    c.req.addValidatedData(target, res);
-    return await next();
-  };
+	return async (c, next) => {
+		let value = {};
+		const contentType = c.req.header("Content-Type");
+		switch (target) {
+			case "json":
+				if (!contentType || !jsonRegex.test(contentType)) break;
+				try {
+					value = await c.req.json();
+				} catch {
+					throw new require_http_exception.HTTPException(400, { message: "Malformed JSON in request body" });
+				}
+				break;
+			case "form": {
+				if (!contentType || !(multipartRegex.test(contentType) || urlencodedRegex.test(contentType))) break;
+				let formData;
+				if (c.req.bodyCache.formData) formData = await c.req.bodyCache.formData;
+				else try {
+					const arrayBuffer = await c.req.arrayBuffer();
+					formData = await require_utils_buffer.bufferToFormData(arrayBuffer, contentType);
+					c.req.bodyCache.formData = formData;
+				} catch (e) {
+					let message = "Malformed FormData request.";
+					message += e instanceof Error ? ` ${e.message}` : ` ${String(e)}`;
+					throw new require_http_exception.HTTPException(400, { message });
+				}
+				const form = Object.create(null);
+				formData.forEach((value, key) => {
+					if (key.endsWith("[]")) (form[key] ??= []).push(value);
+					else if (Array.isArray(form[key])) form[key].push(value);
+					else if (Object.hasOwn(form, key)) form[key] = [form[key], value];
+					else form[key] = value;
+				});
+				value = form;
+				break;
+			}
+			case "query":
+				value = Object.fromEntries(Object.entries(c.req.queries()).map(([k, v]) => {
+					return v.length === 1 ? [k, v[0]] : [k, v];
+				}));
+				break;
+			case "param":
+				value = c.req.param();
+				break;
+			case "header":
+				value = c.req.header();
+				break;
+			case "cookie": value = require_helper_cookie_index.getCookie(c);
+		}
+		const res = await validationFunc(value, c);
+		if (res instanceof Response) return res;
+		c.req.addValidatedData(target, res);
+		return await next();
+	};
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  validator
-});
+//#endregion
+exports.validator = validator;

package/dist/client/client.js

@@ -1,203 +1,144 @@
-// src/client/client.ts
 import { serialize } from "../utils/cookie.js";
-import {
-  buildSearchParams,
-  deepMerge,
-  mergePath,
-  removeIndexString,
-  replaceUrlParam,
-  replaceUrlProtocol
-} from "./utils.js";
-var createProxy = (callback, path) => {
-  const proxy = new Proxy(() => {
-  }, {
-    get(_obj, key) {
-      if (typeof key !== "string" || key === "then") {
-        return void 0;
-      }
-      return createProxy(callback, [...path, key]);
-    },
-    apply(_1, _2, args) {
-      return callback({
-        path,
-        args
-      });
-    }
-  });
-  return proxy;
+import { buildSearchParams, deepMerge, mergePath, removeIndexString, replaceUrlParam, replaceUrlProtocol } from "./utils.js";
+//#region src/client/client.ts
+const createProxy = (callback, path) => {
+	return new Proxy(() => {}, {
+		get(_obj, key) {
+			if (typeof key !== "string" || key === "then") return;
+			return createProxy(callback, [...path, key]);
+		},
+		apply(_1, _2, args) {
+			return callback({
+				path,
+				args
+			});
+		}
+	});
 };
-var appendQueryParams = (url, searchParams) => {
-  const queryString = searchParams.toString();
-  return queryString ? `${url}?${queryString}` : url;
+const appendQueryParams = (url, searchParams) => {
+	const queryString = searchParams.toString();
+	return queryString ? `${url}?${queryString}` : url;
 };
 var ClientRequestImpl = class {
-  url;
-  method;
-  buildSearchParams;
-  queryParams = void 0;
-  pathParams = {};
-  rBody;
-  cType = void 0;
-  constructor(url, method, options) {
-    this.url = url;
-    this.method = method;
-    this.buildSearchParams = options.buildSearchParams;
-  }
-  fetch = async (args, opt) => {
-    if (args) {
-      if (args.query) {
-        this.queryParams = this.buildSearchParams(args.query);
-      }
-      if (args.form) {
-        const form = new FormData();
-        for (const [k, v] of Object.entries(args.form)) {
-          if (v === void 0) {
-            continue;
-          }
-          if (Array.isArray(v)) {
-            for (const v2 of v) {
-              if (v2 === void 0) {
-                continue;
-              }
-              form.append(k, v2);
-            }
-          } else {
-            form.append(k, v);
-          }
-        }
-        this.rBody = form;
-      }
-      if (args.json !== void 0) {
-        this.rBody = JSON.stringify(args.json);
-        this.cType = "application/json";
-      }
-      if (args.param) {
-        this.pathParams = args.param;
-      }
-    }
-    let methodUpperCase = this.method.toUpperCase();
-    const headerValues = {
-      ...args?.header,
-      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers
-    };
-    if (args?.cookie) {
-      const cookies = [];
-      for (const [key, value] of Object.entries(args.cookie)) {
-        if (value === void 0) {
-          continue;
-        }
-        cookies.push(serialize(key, value));
-      }
-      if (cookies.length > 0) {
-        headerValues["Cookie"] = cookies.join("; ");
-      }
-    }
-    if (this.cType) {
-      headerValues["Content-Type"] = this.cType;
-    }
-    const headers = new Headers();
-    for (const [key, value] of Object.entries(headerValues)) {
-      if (value !== void 0) {
-        headers.set(key, value);
-      }
-    }
-    let url = this.url;
-    url = removeIndexString(url);
-    url = replaceUrlParam(url, this.pathParams);
-    if (this.queryParams) {
-      url = appendQueryParams(url, this.queryParams);
-    }
-    methodUpperCase = this.method.toUpperCase();
-    const setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
-    return (opt?.fetch || fetch)(url, {
-      body: setBody ? this.rBody : void 0,
-      method: methodUpperCase,
-      headers,
-      ...opt?.init
-    });
-  };
+	url;
+	method;
+	buildSearchParams;
+	queryParams = void 0;
+	pathParams = {};
+	rBody;
+	cType = void 0;
+	constructor(url, method, options) {
+		this.url = url;
+		this.method = method;
+		this.buildSearchParams = options.buildSearchParams;
+	}
+	fetch = async (args, opt) => {
+		if (args) {
+			if (args.query) this.queryParams = this.buildSearchParams(args.query);
+			if (args.form) {
+				const form = new FormData();
+				for (const [k, v] of Object.entries(args.form)) {
+					if (v === void 0) continue;
+					if (Array.isArray(v)) for (const v2 of v) {
+						if (v2 === void 0) continue;
+						form.append(k, v2);
+					}
+					else form.append(k, v);
+				}
+				this.rBody = form;
+			}
+			if (args.json !== void 0) {
+				this.rBody = JSON.stringify(args.json);
+				this.cType = "application/json";
+			}
+			if (args.param) this.pathParams = args.param;
+		}
+		let methodUpperCase = this.method.toUpperCase();
+		const headerValues = {
+			...args?.header,
+			...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers
+		};
+		if (args?.cookie) {
+			const cookies = [];
+			for (const [key, value] of Object.entries(args.cookie)) {
+				if (value === void 0) continue;
+				cookies.push(serialize(key, value));
+			}
+			if (cookies.length > 0) headerValues["Cookie"] = cookies.join("; ");
+		}
+		if (this.cType) headerValues["Content-Type"] = this.cType;
+		const headers = new Headers();
+		for (const [key, value] of Object.entries(headerValues)) if (value !== void 0) headers.set(key, value);
+		let url = this.url;
+		url = removeIndexString(url);
+		url = replaceUrlParam(url, this.pathParams);
+		if (this.queryParams) url = appendQueryParams(url, this.queryParams);
+		methodUpperCase = this.method.toUpperCase();
+		const setBody = !(methodUpperCase === "GET" || methodUpperCase === "HEAD");
+		return (opt?.fetch || fetch)(url, {
+			body: setBody ? this.rBody : void 0,
+			method: methodUpperCase,
+			headers,
+			...opt?.init
+		});
+	};
 };
-var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
-  const buildSearchParamsOption = options?.buildSearchParams ?? buildSearchParams;
-  const parts = [...opts.path];
-  const lastParts = parts.slice(-3).reverse();
-  if (lastParts[0] === "toString") {
-    if (lastParts[1] === "name") {
-      return lastParts[2] || "";
-    }
-    return proxyCallback.toString();
-  }
-  if (lastParts[0] === "valueOf") {
-    if (lastParts[1] === "name") {
-      return lastParts[2] || "";
-    }
-    return proxyCallback;
-  }
-  let method = "";
-  if (/^\$/.test(lastParts[0])) {
-    const last = parts.pop();
-    if (last) {
-      method = last.replace(/^\$/, "");
-    }
-  }
-  const path = parts.join("/");
-  const url = mergePath(baseUrl, path);
-  if (method === "url" || method === "path") {
-    let result = removeIndexString(url);
-    if (opts.args[0]) {
-      if (opts.args[0].param) {
-        result = replaceUrlParam(result, opts.args[0].param);
-      }
-      if (opts.args[0].query) {
-        result = appendQueryParams(result, buildSearchParamsOption(opts.args[0].query));
-      }
-    }
-    if (method === "url") {
-      return new URL(result);
-    }
-    return result.slice(baseUrl.replace(/\/+$/, "").length).replace(/^\/?/, "/");
-  }
-  if (method === "ws") {
-    const normalizedUrl = removeIndexString(url);
-    const webSocketUrl = replaceUrlProtocol(
-      opts.args[0]?.param ? replaceUrlParam(normalizedUrl, opts.args[0].param) : normalizedUrl,
-      "ws"
-    );
-    const targetUrl = new URL(webSocketUrl);
-    const queryParams = opts.args[0]?.query;
-    if (queryParams) {
-      const searchParams = buildSearchParamsOption(queryParams);
-      searchParams.forEach((value, key) => {
-        targetUrl.searchParams.append(key, value);
-      });
-    }
-    const establishWebSocket = (...args) => {
-      if (options?.webSocket !== void 0 && typeof options.webSocket === "function") {
-        return options.webSocket(...args);
-      }
-      return new WebSocket(...args);
-    };
-    return establishWebSocket(targetUrl.toString());
-  }
-  const req = new ClientRequestImpl(url, method, {
-    buildSearchParams: buildSearchParamsOption
-  });
-  if (method) {
-    options ??= {};
-    const reqOptions = { ...opts.args[1] };
-    const baseHeaders = options.headers;
-    const reqHeaders = reqOptions.headers;
-    if (baseHeaders && reqHeaders) {
-      reqOptions.headers = async () => ({
-        ...typeof baseHeaders === "function" ? await baseHeaders() : baseHeaders,
-        ...typeof reqHeaders === "function" ? await reqHeaders() : reqHeaders
-      });
-    }
-    const args = deepMerge(options, reqOptions);
-    return req.fetch(opts.args[0], args);
-  }
-  return req;
+const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
+	const buildSearchParamsOption = options?.buildSearchParams ?? buildSearchParams;
+	const parts = [...opts.path];
+	const lastParts = parts.slice(-3).reverse();
+	if (lastParts[0] === "toString") {
+		if (lastParts[1] === "name") return lastParts[2] || "";
+		return proxyCallback.toString();
+	}
+	if (lastParts[0] === "valueOf") {
+		if (lastParts[1] === "name") return lastParts[2] || "";
+		return proxyCallback;
+	}
+	let method = "";
+	if (/^\$/.test(lastParts[0])) {
+		const last = parts.pop();
+		if (last) method = last.replace(/^\$/, "");
+	}
+	const path = parts.join("/");
+	const url = mergePath(baseUrl, path);
+	if (method === "url" || method === "path") {
+		let result = removeIndexString(url);
+		if (opts.args[0]) {
+			if (opts.args[0].param) result = replaceUrlParam(result, opts.args[0].param);
+			if (opts.args[0].query) result = appendQueryParams(result, buildSearchParamsOption(opts.args[0].query));
+		}
+		if (method === "url") return new URL(result);
+		return result.slice(baseUrl.replace(/\/+$/, "").length).replace(/^\/?/, "/");
+	}
+	if (method === "ws") {
+		const normalizedUrl = removeIndexString(url);
+		const webSocketUrl = replaceUrlProtocol(opts.args[0]?.param ? replaceUrlParam(normalizedUrl, opts.args[0].param) : normalizedUrl, "ws");
+		const targetUrl = new URL(webSocketUrl);
+		const queryParams = opts.args[0]?.query;
+		if (queryParams) buildSearchParamsOption(queryParams).forEach((value, key) => {
+			targetUrl.searchParams.append(key, value);
+		});
+		const establishWebSocket = (...args) => {
+			if (options?.webSocket !== void 0 && typeof options.webSocket === "function") return options.webSocket(...args);
+			return new WebSocket(...args);
+		};
+		return establishWebSocket(targetUrl.toString());
+	}
+	const req = new ClientRequestImpl(url, method, { buildSearchParams: buildSearchParamsOption });
+	if (method) {
+		options ??= {};
+		const reqOptions = { ...opts.args[1] };
+		const baseHeaders = options.headers;
+		const reqHeaders = reqOptions.headers;
+		if (baseHeaders && reqHeaders) reqOptions.headers = async () => ({
+			...typeof baseHeaders === "function" ? await baseHeaders() : baseHeaders,
+			...typeof reqHeaders === "function" ? await reqHeaders() : reqHeaders
+		});
+		const args = deepMerge(options, reqOptions);
+		return req.fetch(opts.args[0], args);
+	}
+	return req;
 }, []);
-export {
-  hc
-};
+//#endregion
+export { hc };

package/dist/client/fetch-result-please.js

@@ -1,62 +1,65 @@
-// src/client/fetch-result-please.ts
-var nullBodyResponses = /* @__PURE__ */ new Set([101, 204, 205, 304]);
+//#region src/client/fetch-result-please.ts
+/**
+* @description This file is a modified version of `fetch-result-please` (`ofetch`), minimalized and adapted to Hono's custom needs.
+*
+* @link https://www.npmjs.com/package/fetch-result-please
+*/
+const nullBodyResponses = /* @__PURE__ */ new Set([
+	101,
+	204,
+	205,
+	304
+]);
+/**
+* Smartly parses and return the consumable result from a fetch `Response`.
+*
+* Throwing a structured error if the response is not `ok`. ({@link DetailedError})
+*/
 async function fetchRP(fetchRes) {
-  const _fetchRes = await fetchRes;
-  const hasBody = (_fetchRes.body || _fetchRes._bodyInit) && !nullBodyResponses.has(_fetchRes.status);
-  if (hasBody) {
-    const responseType = detectResponseType(_fetchRes);
-    _fetchRes._data = await _fetchRes[responseType]();
-  }
-  if (!_fetchRes.ok) {
-    throw new DetailedError(`${_fetchRes.status} ${_fetchRes.statusText}`, {
-      statusCode: _fetchRes?.status,
-      detail: {
-        data: _fetchRes?._data,
-        statusText: _fetchRes?.statusText
-      }
-    });
-  }
-  return _fetchRes._data;
+	const _fetchRes = await fetchRes;
+	if ((_fetchRes.body || _fetchRes._bodyInit) && !nullBodyResponses.has(_fetchRes.status)) _fetchRes._data = await _fetchRes[detectResponseType(_fetchRes)]();
+	if (!_fetchRes.ok) throw new DetailedError(`${_fetchRes.status} ${_fetchRes.statusText}`, {
+		statusCode: _fetchRes?.status,
+		detail: {
+			data: _fetchRes?._data,
+			statusText: _fetchRes?.statusText
+		}
+	});
+	return _fetchRes._data;
 }
 var DetailedError = class extends Error {
-  /**
-   * Additional `message` that will be logged AND returned to client
-   */
-  detail;
-  /**
-   * Additional `code` that will be logged AND returned to client
-   */
-  code;
-  /**
-   * Additional value that will be logged AND NOT returned to client
-   */
-  log;
-  /**
-   * Optionally set the status code to return, in a web server context
-   */
-  statusCode;
-  constructor(message, options = {}) {
-    super(message);
-    this.name = "DetailedError";
-    this.log = options.log;
-    this.detail = options.detail;
-    this.code = options.code;
-    this.statusCode = options.statusCode;
-  }
+	/**
+	* Additional `message` that will be logged AND returned to client
+	*/
+	detail;
+	/**
+	* Additional `code` that will be logged AND returned to client
+	*/
+	code;
+	/**
+	* Additional value that will be logged AND NOT returned to client
+	*/
+	log;
+	/**
+	* Optionally set the status code to return, in a web server context
+	*/
+	statusCode;
+	constructor(message, options = {}) {
+		super(message);
+		this.name = "DetailedError";
+		this.log = options.log;
+		this.detail = options.detail;
+		this.code = options.code;
+		this.statusCode = options.statusCode;
+	}
 };
-var jsonRegex = /^application\/(?:[\w!#$%&*.^`~-]*\+)?json(?:;.+)?$/i;
+const jsonRegex = /^application\/(?:[\w!#$%&*.^`~-]*\+)?json(?:;.+)?$/i;
 function detectResponseType(response) {
-  const _contentType = response.headers.get("content-type");
-  if (!_contentType) {
-    return "text";
-  }
-  const contentType = _contentType.split(";").shift();
-  if (jsonRegex.test(contentType)) {
-    return "json";
-  }
-  return "text";
+	const _contentType = response.headers.get("content-type");
+	if (!_contentType) return "text";
+	const contentType = _contentType.split(";").shift();
+	if (jsonRegex.test(contentType)) return "json";
+	return "text";
 }
-export {
-  DetailedError,
-  fetchRP
-};
+//#endregion
+export { DetailedError, fetchRP };

package/dist/client/index.js

@@ -1,8 +1,4 @@
-// src/client/index.ts
+import { DetailedError } from "./fetch-result-please.js";
+import { parseResponse } from "./utils.js";
 import { hc } from "./client.js";
-import { parseResponse, DetailedError } from "./utils.js";
-export {
-  DetailedError,
-  hc,
-  parseResponse
-};
+export { DetailedError, hc, parseResponse };

package/dist/client/types.js

@@ -0,0 +1 @@
+export {};