h3 0.5.0 → 0.5.1

package/dist/index.cjs

@@ -68,7 +68,11 @@ function defineLazyEventHandler(factory) {
     }
     if (!_promise) {
       _promise = Promise.resolve(factory()).then((r) => {
-        _resolved = r.default || r;
+        const handler = r.default || r;
+        if (typeof handler !== "function") {
+          throw new TypeError("Invalid lazy handler result. It should be a function:", handler);
+        }
+        _resolved = toEventHandler(r.default || r);
         return _resolved;
       });
     }
@@ -88,6 +92,9 @@ function toEventHandler(handler) {
   if (isEventHandler(handler)) {
     return handler;
   }
+  if (typeof handler !== "function") {
+    throw new TypeError("Invalid handler. It should be a function:", handler);
+  }
   return defineEventHandler((event) => {
     return callHandler(handler, event.req, event.res);
   });
@@ -305,6 +312,7 @@ function createApp(options = {}) {
     }
   };
   const app = nodeHandler;
+  app.nodeHandler = nodeHandler;
   app.stack = stack;
   app.handler = handler;
   app.use = (arg1, arg2, arg3) => use(app, arg1, arg2, arg3);
@@ -366,14 +374,13 @@ function createAppEventHandler(stack, options) {
   });
 }
 function normalizeLayer(input) {
-  let handler = input.handler;
+  let handler = input.handler || input.handle;
   if (handler.handler) {
     handler = handler.handler;
   }
-  if (!isEventHandler(handler)) {
-    if (input.lazy) {
-      handler = defineLazyHandler(handler);
-    }
+  if (input.lazy) {
+    handler = defineLazyEventHandler(handler);
+  } else if (!isEventHandler(handler)) {
     handler = toEventHandler(handler);
   }
   return {

package/dist/index.d.ts

@@ -21,7 +21,8 @@ interface EventHandler {
     (event: CompatibilityEvent): H3Response | Promise<H3Response>;
 }
 declare function defineEventHandler(handler: EventHandler): EventHandler;
-declare function defineLazyEventHandler(factory: () => EventHandler | Promise<EventHandler>): EventHandler;
+declare type LazyEventHandler = () => EventHandler | Promise<EventHandler>;
+declare function defineLazyEventHandler(factory: LazyEventHandler): EventHandler;
 declare function isEventHandler(input: any): input is EventHandler;
 declare type CompatibilityEventHandler = EventHandler | Handler | Middleware;
 declare function toEventHandler(handler: CompatibilityEventHandler): EventHandler;
@@ -58,11 +59,11 @@ declare type Stack = Layer[];
 interface InputLayer {
     route?: string;
     match?: Matcher;
-    handler: Handler | LazyHandler;
+    handler: Handler | LazyHandler | EventHandler | LazyEventHandler;
     lazy?: boolean;
-    /**
-     * @deprecated
-     */
+    /** @deprecated */
+    handle?: Handler;
+    /** @deprecated */
     promisify?: boolean;
 }
 declare type InputStack = InputLayer[];
@@ -72,10 +73,11 @@ interface AppUse {
     (handler: CompatibilityEventHandler | CompatibilityEventHandler[], options?: Partial<InputLayer>): App;
     (options: InputLayer): App;
 }
-declare type NodeHandler = (req: http.IncomingMessage, res: http.ServerResponse) => void | Promise<void>;
+declare type NodeHandler = (req: http.IncomingMessage, res: http.ServerResponse) => Promise<void>;
 interface App extends NodeHandler {
     stack: Stack;
     handler: EventHandler;
+    nodeHandler: NodeHandler;
     use: AppUse;
 }
 interface AppOptions {
@@ -128,10 +130,10 @@ declare function promisifyHandler(handler: Handler | Middleware): PromisifiedHan
 /** @deprecated Use defineHandler */
 declare const promisifyHandle: typeof promisifyHandler;
 declare function callHandler(handler: Middleware, req: IncomingMessage, res: ServerResponse): Promise<unknown>;
-declare function defineLazyHandler(handler: LazyHandler, promisify?: boolean): PromisifiedHandler;
+declare function defineLazyHandler(handler: LazyHandler, promisify?: boolean): Handler;
 /** @deprecated Use defineLazyHandler */
 declare const lazyHandle: typeof defineLazyHandler;
-declare function useBase(base: string, handler: PromisifiedHandler): PromisifiedHandler;
+declare function useBase(base: string, handler: Handler): Handler;
 
 /**
  * Reads body of the request and returns encoded raw string (default) or `Buffer` if encoding if falsy.
@@ -222,4 +224,4 @@ interface Router extends AddRouteShortcuts {
 }
 declare function createRouter(): Router;
 
-export { AddRouteShortcuts, App, AppOptions, AppUse, CompatibilityEvent, CompatibilityEventHandler, EventHandler, H3Error, H3Event, H3Response, InputLayer, InputStack, JSONValue, Layer, MIMES, Matcher, NodeHandler, Router, RouterMethod, RouterUse, Stack, _JSONValue, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, isEvent, isEventHandler, isMethod, isStream, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };
+export { AddRouteShortcuts, App, AppOptions, AppUse, CompatibilityEvent, CompatibilityEventHandler, Encoding, EventHandler, H3Error, H3Event, H3Response, HTTPMethod, Handler, IncomingMessage, InputLayer, InputStack, JSONValue, Layer, LazyEventHandler, LazyHandler, MIMES, Matcher, Middleware, NodeHandler, PromisifiedHandler, Router, RouterMethod, RouterUse, ServerResponse, Stack, _JSONValue, appendHeader, assertMethod, callHandler, createApp, createAppEventHandler, createError, createEvent, createRouter, defaultContentType, defineEventHandler, defineHandle, defineHandler, defineLazyEventHandler, defineLazyHandler, defineMiddleware, deleteCookie, isEvent, isEventHandler, isMethod, isStream, lazyHandle, promisifyHandle, promisifyHandler, send, sendError, sendRedirect, sendStream, setCookie, toEventHandler, use, useBase, useBody, useCookie, useCookies, useMethod, useQuery, useRawBody };

package/dist/index.mjs

@@ -60,7 +60,11 @@ function defineLazyEventHandler(factory) {
     }
     if (!_promise) {
       _promise = Promise.resolve(factory()).then((r) => {
-        _resolved = r.default || r;
+        const handler = r.default || r;
+        if (typeof handler !== "function") {
+          throw new TypeError("Invalid lazy handler result. It should be a function:", handler);
+        }
+        _resolved = toEventHandler(r.default || r);
         return _resolved;
       });
     }
@@ -80,6 +84,9 @@ function toEventHandler(handler) {
   if (isEventHandler(handler)) {
     return handler;
   }
+  if (typeof handler !== "function") {
+    throw new TypeError("Invalid handler. It should be a function:", handler);
+  }
   return defineEventHandler((event) => {
     return callHandler(handler, event.req, event.res);
   });
@@ -297,6 +304,7 @@ function createApp(options = {}) {
     }
   };
   const app = nodeHandler;
+  app.nodeHandler = nodeHandler;
   app.stack = stack;
   app.handler = handler;
   app.use = (arg1, arg2, arg3) => use(app, arg1, arg2, arg3);
@@ -358,14 +366,13 @@ function createAppEventHandler(stack, options) {
   });
 }
 function normalizeLayer(input) {
-  let handler = input.handler;
+  let handler = input.handler || input.handle;
   if (handler.handler) {
     handler = handler.handler;
   }
-  if (!isEventHandler(handler)) {
-    if (input.lazy) {
-      handler = defineLazyHandler(handler);
-    }
+  if (input.lazy) {
+    handler = defineLazyEventHandler(handler);
+  } else if (!isEventHandler(handler)) {
     handler = toEventHandler(handler);
   }
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h3",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Tiny JavaScript Server",
   "repository": "unjs/h3",
   "license": "MIT",