@tinyhttp/app 2.0.11 → 2.0.16

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinyhttp/app",
-  "version": "2.0.11",
+  "version": "2.0.16",
   "description": "0-legacy, tiny & fast web framework as a replacement of Express",
   "type": "module",
   "homepage": "https://tinyhttp.v1rtl.site",
@@ -33,14 +33,15 @@
   "license": "MIT",
   "dependencies": {
     "@tinyhttp/cookie": "2.0.3",
-    "@tinyhttp/proxy-addr": "2.0.2",
-    "@tinyhttp/req": "2.0.8",
-    "@tinyhttp/res": "2.0.9",
-    "@tinyhttp/router": "2.0.3",
-    "header-range-parser": "^1.1.1",
+    "@tinyhttp/proxy-addr": "2.0.3",
+    "@tinyhttp/req": "2.0.11",
+    "@tinyhttp/res": "2.0.12",
+    "@tinyhttp/router": "2.0.4",
+    "header-range-parser": "1.1.1",
     "regexparam": "^2.0.0"
   },
   "scripts": {
     "build": "rollup -c"
-  }
+  },
+  "readme": "# @tinyhttp/app\n\nThe core of tinyhttp. Contains the `App`, `Request` and `Response`. Additionally, it provides special tinyhttp-specific types.\n\n## Install\n\n```sh\npnpm i @tinyhttp/app\n```\n\n## Example\n\n```ts\nimport { App } from '@tinyhttp/app'\nimport type { Request, Response, NextFunction } from '@tinyhttp/app'\n\nnew App()\n  .use((req: Request, res: Response, next: NextFunction) => {\n    console.log('Did a request')\n    next()\n  })\n  .get('/', (_, res) => res.send('<h1>Hello World</h1>'))\n  .get('/page/:page', (req, res) => res.send(`You opened ${req.params.page}`))\n  .listen(3000)\n```\n"
 }