hono 3.11.11 → 3.11.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -22,17 +22,24 @@ __export(dev_exports, {
22
22
  showRoutes: () => showRoutes
23
23
  });
24
24
  module.exports = __toCommonJS(dev_exports);
25
+ var import_hono_base = require("../../hono-base");
25
26
  const isMiddleware = (handler) => handler.length > 1;
26
27
  const handlerName = (handler) => {
27
28
  return handler.name || (isMiddleware(handler) ? "[middleware]" : "[handler]");
28
29
  };
30
+ const findTargetHandler = (handler) => {
31
+ return handler[import_hono_base.COMPOSED_HANDLER] ? findTargetHandler(handler[import_hono_base.COMPOSED_HANDLER]) : handler;
32
+ };
29
33
  const inspectRoutes = (hono) => {
30
- return hono.routes.map(({ path, method, handler }) => ({
31
- path,
32
- method,
33
- name: handlerName(handler),
34
- isMiddleware: isMiddleware(handler)
35
- }));
34
+ return hono.routes.map(({ path, method, handler }) => {
35
+ const targetHandler = findTargetHandler(handler);
36
+ return {
37
+ path,
38
+ method,
39
+ name: handlerName(targetHandler),
40
+ isMiddleware: isMiddleware(targetHandler)
41
+ };
42
+ });
36
43
  };
37
44
  const showRoutes = (hono, opts) => {
38
45
  const routeData = {};
@@ -36,6 +36,7 @@ var __privateSet = (obj, member, value, setter) => {
36
36
  };
37
37
  var hono_base_exports = {};
38
38
  __export(hono_base_exports, {
39
+ COMPOSED_HANDLER: () => COMPOSED_HANDLER,
39
40
  HonoBase: () => Hono
40
41
  });
41
42
  module.exports = __toCommonJS(hono_base_exports);
@@ -46,6 +47,7 @@ var import_request = require("./request");
46
47
  var import_router = require("./router");
47
48
  var import_url = require("./utils/url");
48
49
  var _path;
50
+ const COMPOSED_HANDLER = Symbol("composedHandler");
49
51
  function defineDynamicClass() {
50
52
  return class {
51
53
  };
@@ -161,7 +163,13 @@ const _Hono = class extends defineDynamicClass() {
161
163
  return subApp;
162
164
  }
163
165
  app.routes.map((r) => {
164
- const handler = app.errorHandler === errorHandler ? r.handler : async (c, next) => (await (0, import_compose.compose)([], app.errorHandler)(c, () => r.handler(c, next))).res;
166
+ let handler;
167
+ if (app.errorHandler === errorHandler) {
168
+ handler = r.handler;
169
+ } else {
170
+ handler = async (c, next) => (await (0, import_compose.compose)([], app.errorHandler)(c, () => r.handler(c, next))).res;
171
+ handler[COMPOSED_HANDLER] = r.handler;
172
+ }
165
173
  subApp.addRoute(r.method, r.path, handler);
166
174
  });
167
175
  return this;
@@ -282,5 +290,6 @@ let Hono = _Hono;
282
290
  _path = new WeakMap();
283
291
  // Annotate the CommonJS export names for ESM import in node:
284
292
  0 && (module.exports = {
293
+ COMPOSED_HANDLER,
285
294
  HonoBase
286
295
  });
@@ -1,15 +1,22 @@
1
1
  // src/helper/dev/index.ts
2
+ import { COMPOSED_HANDLER } from "../../hono-base.js";
2
3
  var isMiddleware = (handler) => handler.length > 1;
3
4
  var handlerName = (handler) => {
4
5
  return handler.name || (isMiddleware(handler) ? "[middleware]" : "[handler]");
5
6
  };
7
+ var findTargetHandler = (handler) => {
8
+ return handler[COMPOSED_HANDLER] ? findTargetHandler(handler[COMPOSED_HANDLER]) : handler;
9
+ };
6
10
  var inspectRoutes = (hono) => {
7
- return hono.routes.map(({ path, method, handler }) => ({
8
- path,
9
- method,
10
- name: handlerName(handler),
11
- isMiddleware: isMiddleware(handler)
12
- }));
11
+ return hono.routes.map(({ path, method, handler }) => {
12
+ const targetHandler = findTargetHandler(handler);
13
+ return {
14
+ path,
15
+ method,
16
+ name: handlerName(targetHandler),
17
+ isMiddleware: isMiddleware(targetHandler)
18
+ };
19
+ });
13
20
  };
14
21
  var showRoutes = (hono, opts) => {
15
22
  const routeData = {};
package/dist/hono-base.js CHANGED
@@ -24,6 +24,7 @@ import { HTTPException } from "./http-exception.js";
24
24
  import { HonoRequest } from "./request.js";
25
25
  import { METHOD_NAME_ALL, METHOD_NAME_ALL_LOWERCASE, METHODS } from "./router.js";
26
26
  import { getPath, getPathNoStrict, getQueryStrings, mergePath } from "./utils/url.js";
27
+ var COMPOSED_HANDLER = Symbol("composedHandler");
27
28
  function defineDynamicClass() {
28
29
  return class {
29
30
  };
@@ -140,7 +141,13 @@ var _Hono = class extends defineDynamicClass() {
140
141
  return subApp;
141
142
  }
142
143
  app.routes.map((r) => {
143
- const handler = app.errorHandler === errorHandler ? r.handler : async (c, next) => (await compose([], app.errorHandler)(c, () => r.handler(c, next))).res;
144
+ let handler;
145
+ if (app.errorHandler === errorHandler) {
146
+ handler = r.handler;
147
+ } else {
148
+ handler = async (c, next) => (await compose([], app.errorHandler)(c, () => r.handler(c, next))).res;
149
+ handler[COMPOSED_HANDLER] = r.handler;
150
+ }
144
151
  subApp.addRoute(r.method, r.path, handler);
145
152
  });
146
153
  return this;
@@ -260,5 +267,6 @@ var _Hono = class extends defineDynamicClass() {
260
267
  var Hono = _Hono;
261
268
  _path = new WeakMap();
262
269
  export {
270
+ COMPOSED_HANDLER,
263
271
  Hono as HonoBase
264
272
  };
@@ -2,6 +2,7 @@ import { Context } from './context';
2
2
  import type { ExecutionContext } from './context';
3
3
  import type { Router } from './router';
4
4
  import type { Env, ErrorHandler, H, HandlerInterface, MiddlewareHandlerInterface, NotFoundHandler, OnHandlerInterface, MergePath, MergeSchemaPath, FetchEventLike, Schema, RouterRoute } from './types';
5
+ export declare const COMPOSED_HANDLER: unique symbol;
5
6
  type GetPath<E extends Env> = (request: Request, options?: {
6
7
  env?: E['Bindings'];
7
8
  }) => string;
@@ -11,9 +11,11 @@ export type JSONObject = {
11
11
  [key: string]: JSONPrimitive | JSONArray | JSONObject | object;
12
12
  };
13
13
  export type JSONValue = JSONObject | JSONArray | JSONPrimitive;
14
- export type JSONParsed<T> = {
15
- [k in keyof T]: T[k] extends JSONValue ? T[k] : string;
16
- };
14
+ export type JSONParsed<T> = T extends {
15
+ toJSON(): infer J;
16
+ } ? (() => J) extends () => JSONObject ? J : JSONParsed<J> : T extends JSONPrimitive ? T : T extends Array<infer U> ? Array<JSONParsed<U>> : T extends object ? {
17
+ [K in keyof T]: JSONParsed<T[K]>;
18
+ } : never;
17
19
  export type InterfaceToType<T> = T extends Function ? T : {
18
20
  [K in keyof T]: InterfaceToType<T[K]>;
19
21
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hono",
3
- "version": "3.11.11",
3
+ "version": "3.11.12",
4
4
  "description": "Ultrafast web framework for the Edges",
5
5
  "main": "dist/cjs/index.js",
6
6
  "type": "module",