@tinyhttp/app 2.0.6 → 2.0.12

package/dist/app.d.ts

@@ -18,7 +18,7 @@ export declare type AppSettings = Partial<{
  * Function that processes the template
  */
 export declare type TemplateFunc<O> = (path: string, locals: Record<string, any>, opts: TemplateEngineOptions<O>, cb: (err: Error, html: unknown) => void) => void;
-export declare type TemplateEngineOptions<O extends any> = Partial<{
+export declare type TemplateEngineOptions<O> = Partial<{
     cache: boolean;
     ext: string;
     renderOptions: Partial<O>;
@@ -67,7 +67,7 @@ export declare class App<RenderOptions = any, Req extends Request = Request, Res
      * @param setting setting name
      * @param value setting value
      */
-    set(setting: string, value: any): this;
+    set<T = unknown>(setting: string, value: T): this;
     /**
      * Enable app setting
      * @param setting Setting name
@@ -85,7 +85,7 @@ export declare class App<RenderOptions = any, Req extends Request = Request, Res
      * @param options Template engine options
      * @param cb Callback that consumes error and html
      */
-    render(file: string, data: Record<string, any>, cb: (err: unknown, html: unknown) => void, options?: TemplateEngineOptions<RenderOptions>): this;
+    render(file: string, data: Record<string, unknown>, cb: (err: unknown, html: unknown) => void, options?: TemplateEngineOptions<RenderOptions>): this;
     use(...args: UseMethodParams<Req, Res, App>): this;
     /**
      * Register a template engine with extension

package/dist/index.js

@@ -223,12 +223,11 @@ class App extends Router {
         var _a;
         const base = args[0];
         const fns = args.slice(1).flat();
-        if (base instanceof App) {
-            // Set App parent to current App
-            base.parent = this;
-            // Mount on root
-            base.mountpath = '/';
-            this.apps['/'] = base;
+        if (typeof base === 'function' || base instanceof App) {
+            fns.unshift(base);
+        }
+        else if (Array.isArray(base)) {
+            fns.unshift(...base);
         }
         const path = typeof base === 'string' ? base : '/';
         let regex;
@@ -240,40 +239,29 @@ class App extends Router {
                 fn.parent = this;
             }
         }
-        if (base === '/') {
-            for (const fn of fns)
-                super.use(base, mount(fn));
-        }
-        else if (typeof base === 'function' || base instanceof App) {
-            super.use('/', [base, ...fns].map(mount));
-        }
-        else if (Array.isArray(base)) {
-            super.use('/', [...base, ...fns].map(mount));
-        }
-        else {
-            const handlerPaths = [];
-            const handlerFunctions = [];
-            for (const fn of fns) {
-                if (fn instanceof App && ((_a = fn.middleware) === null || _a === void 0 ? void 0 : _a.length)) {
-                    for (const mw of fn.middleware) {
-                        handlerPaths.push(lead(base) + lead(mw.path));
-                        handlerFunctions.push(fn);
-                    }
-                }
-                else {
-                    handlerPaths.push('');
+        const handlerPaths = [];
+        const handlerFunctions = [];
+        const handlerPathBase = path === '/' ? '' : lead(path);
+        for (const fn of fns) {
+            if (fn instanceof App && ((_a = fn.middleware) === null || _a === void 0 ? void 0 : _a.length)) {
+                for (const mw of fn.middleware) {
+                    handlerPaths.push(handlerPathBase + lead(mw.path));
                     handlerFunctions.push(fn);
                 }
             }
-            pushMiddleware(this.middleware)({
-                path: base,
-                regex,
-                type: 'mw',
-                handler: mount(handlerFunctions[0]),
-                handlers: handlerFunctions.slice(1).map(mount),
-                fullPaths: handlerPaths
-            });
+            else {
+                handlerPaths.push('');
+                handlerFunctions.push(fn);
+            }
         }
+        pushMiddleware(this.middleware)({
+            path,
+            regex,
+            type: 'mw',
+            handler: mount(handlerFunctions[0]),
+            handlers: handlerFunctions.slice(1).map(mount),
+            fullPaths: handlerPaths
+        });
         return this;
     }
     /**

package/dist/request.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { ParsedUrlQuery } from 'querystring';
-import { Ranges } from 'header-range-parser';
+import { Options, Ranges } from 'header-range-parser';
 import { App } from './app';
 import type { Middleware, Handler } from '@tinyhttp/router';
 import type { Response } from './response';
 import type { URLParams } from '@tinyhttp/req';
 export { getURLParams } from '@tinyhttp/req';
-export declare const getRouteFromApp: ({ middleware }: App, h: Handler<Request, Response>) => Middleware<Request, Response<any>>;
+export declare const getRouteFromApp: ({ middleware }: App, h: Handler<Request, Response>) => Middleware<Request, Response>;
 export declare const getProtocol: (req: Request) => Protocol;
 export declare const getHostname: (req: Request) => string | undefined;
 export declare const getIP: (req: Pick<IncomingMessage, 'headers' | 'connection'>) => string | undefined;
@@ -18,7 +18,7 @@ export declare type Connection = IncomingMessage['socket'] & {
 };
 export declare type Protocol = 'http' | 'https' | string;
 export type { URLParams };
-declare type AcceptsReturns = string | false | string[];
+declare type AcceptsReturns = string | boolean | string[];
 export interface Request extends IncomingMessage {
     originalUrl: string;
     path: string;
@@ -35,7 +35,7 @@ export interface Request extends IncomingMessage {
     ips?: string[];
     subdomains?: string[];
     get: (header: string) => string | string[] | undefined;
-    range: (size: number, options?: any) => -1 | -2 | -3 | Ranges | undefined;
+    range: (size: number, options?: Options) => -1 | -2 | -3 | Ranges | undefined;
     accepts: (...types: string[]) => AcceptsReturns;
     acceptsEncodings: (...encodings: string[]) => AcceptsReturns;
     acceptsCharsets: (...charsets: string[]) => AcceptsReturns;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinyhttp/app",
-  "version": "2.0.6",
+  "version": "2.0.12",
   "description": "0-legacy, tiny & fast web framework as a replacement of Express",
   "type": "module",
   "homepage": "https://tinyhttp.v1rtl.site",
@@ -32,11 +32,12 @@
   "author": "v1rtl",
   "license": "MIT",
   "dependencies": {
-    "@tinyhttp/cookie": "2.0.2",
+    "@tinyhttp/cookie": "2.0.3",
     "@tinyhttp/proxy-addr": "2.0.2",
-    "@tinyhttp/req": "2.0.4",
-    "@tinyhttp/res": "2.0.5",
-    "@tinyhttp/router": "2.0.2",
+    "@tinyhttp/req": "2.0.8",
+    "@tinyhttp/res": "2.0.9",
+    "@tinyhttp/router": "2.0.4",
+    "header-range-parser": "^1.1.1",
     "regexparam": "^2.0.0"
   },
   "scripts": {