hanni 1.0.3 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hanni",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Minimalist Bun web framework with built-in Swagger UI",
   "type": "module",
   "main": "./src/hanni.js",

package/src/hanni.js

@@ -1,18 +1,20 @@
-import { Router } from './router.js'
+import { Router as _Router } from './router.js'
 import { createContext } from './context.js'
 import { buildSpec, swaggerHTML } from './swagger.js'
 import { compose } from './middleware.js'
 import { parseBody, corsHeaders } from './utils.js'
 
+export { _Router as Router }
+
 export function Hanni(config = {}) {
-  const router = new Router()
+  const router = new _Router()
   const middlewares = []
+  const mounts = []
   const swaggerCfg = config.swagger
 
   const app = {}
 
   const methods = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS', 'ALL']
-
   for (const m of methods) {
     app[m.toLowerCase()] = (path, handler, meta) => {
       router.add(m, path, handler, meta)
@@ -20,8 +22,12 @@ export function Hanni(config = {}) {
     }
   }
 
-  app.use = fn => {
-    middlewares.push(fn)
+  app.use = (arg1, arg2) => {
+    if (typeof arg1 === 'string' && arg2 && arg2.list) {
+      mounts.push({ path: arg1, router: arg2 })
+    } else if (typeof arg1 === 'function') {
+      middlewares.push(arg1)
+    }
     return app
   }
 
@@ -33,26 +39,31 @@ export function Hanni(config = {}) {
 
         if (swaggerCfg) {
           const base = swaggerCfg.path
-
           if (url.pathname === base || url.pathname === base + '/') {
-            return new Response(
-              swaggerHTML(base + '/json', swaggerCfg),
-              { headers: { 'Content-Type': 'text/html' } }
-            )
+            return new Response(swaggerHTML(base + '/json', swaggerCfg), { headers: { 'Content-Type': 'text/html' } })
           }
-
           if (url.pathname === base + '/json') {
-            return Response.json(
-              buildSpec(router.list(), swaggerCfg)
-            )
+            const allRoutes = [
+              ...router.list(),
+              ...mounts.flatMap(mount => mount.router.list().map(r => ({ ...r, path: mount.path + r.path })))
+            ]
+            return Response.json(buildSpec(allRoutes, swaggerCfg))
           }
         }
 
-        if (config.cors && req.method === 'OPTIONS') {
-          return new Response(null, { headers: corsHeaders() })
+        if (config.cors && req.method === 'OPTIONS') return new Response(null, { headers: corsHeaders() })
+
+        let match = router.match(req.method, url.pathname)
+        if (!match) {
+          for (const mount of mounts) {
+            if (url.pathname.startsWith(mount.path)) {
+              const subPath = url.pathname.slice(mount.path.length) || '/'
+              match = mount.router.match(req.method, subPath)
+              if (match) break
+            }
+          }
         }
 
-        const match = router.match(req.method, url.pathname)
         if (!match) return new Response('Not Found', { status: 404 })
 
         const ctx = createContext(req, match.params)
@@ -61,17 +72,11 @@ export function Hanni(config = {}) {
         const handler = compose(middlewares, match.handler)
         const res = await handler(ctx)
 
-        if (config.cors) {
-          Object.entries(corsHeaders()).forEach(([k, v]) =>
-            res.headers.set(k, v)
-          )
-        }
+        if (config.cors) Object.entries(corsHeaders()).forEach(([k, v]) => res.headers.set(k, v))
 
         return res
       }
     })
-
-    //console.log(`hanni.js running on ${port}`)
   }
 
   return app

package/src/router.js

@@ -1,19 +1,22 @@
 export class Router {
   constructor() {
     this.routes = []
+    const methods = ['GET','POST','PUT','PATCH','DELETE','HEAD','OPTIONS','ALL']
+    for (const m of methods) {
+      this[m.toLowerCase()] = (path, handler, meta = {}) => this.add(m, path, handler, meta)
+    }
   }
 
   add(method, path, handler, meta = {}) {
     const keys = []
     const regex = new RegExp(
       '^' +
-        path.replace(/\/:([^/]+)/g, (_, k) => {
-          keys.push(k)
-          return '/([^/]+)'
-        }) +
-        '$'
+      path.replace(/\/:([^/]+)/g, (_, k) => {
+        keys.push(k)
+        return '/([^/]+)'
+      }) +
+      '$'
     )
-
     this.routes.push({ method, path, regex, keys, handler, meta })
   }
 
@@ -24,7 +27,7 @@ export class Router {
       if (!m) continue
 
       const params = {}
-      r.keys.forEach((k, i) => (params[k] = m[i + 1]))
+      r.keys.forEach((k,i) => params[k] = m[i+1])
       return { handler: r.handler, params, meta: r.meta }
     }
   }

package/src/swagger.js

@@ -30,7 +30,6 @@ function extractQueryParams(meta) {
 function buildRequestBody(meta, method) {
   if (!meta?.body) return undefined
   if (method === 'get' || method === 'head') return undefined
-
   return {
     required: true,
     content: {
@@ -46,13 +45,12 @@ export function buildSpec(routes, cfg = {}) {
   const tagsMap = new Map()
 
   for (const r of routes) {
+    if (r.meta?.swagger === false) continue
     const openPath = normalizePath(r.path)
     if (!paths[openPath]) paths[openPath] = {}
 
     const methods =
-      r.method === 'ALL'
-        ? HTTP_METHODS
-        : [r.method.toLowerCase()]
+      r.method === 'ALL' ? HTTP_METHODS : [r.method.toLowerCase()]
 
     const routeTags =
       Array.isArray(r.meta?.tags) && r.meta.tags.length
@@ -105,7 +103,7 @@ export function swaggerHTML(jsonPath, cfg = {}) {
   const title = cfg.title || 'Hanni Docs'
   const favicon =
     cfg.favicon ||
-    `data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='black'><path d='M12 2L2 7l10 5 10-5-10-5z'/></svg>`
+    `https://cdn.2mathewww.my.id/f/614b9f1c86c5fa177f22513bc320eaaa6e5f51c111bf93f7ce2dcfa4d0dcd7f6.jpg`
 
   return `
 <!doctype html>
@@ -113,44 +111,22 @@ export function swaggerHTML(jsonPath, cfg = {}) {
 <head>
 <meta charset="utf-8"/>
 <title>${title}</title>
-
 <link rel="icon" href="${favicon}">
-
-<!-- Tailwind CDN -->
 <script src="https://cdn.tailwindcss.com"></script>
-
-<!-- Font Awesome -->
-<link
-  rel="stylesheet"
-  href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"
-/>
-
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"/>
 <link rel="stylesheet" href="https://unpkg.com/swagger-ui-dist/swagger-ui.css">
-
 <style>
 body.dark .swagger-ui {
   filter: invert(1) hue-rotate(180deg);
 }
 </style>
 </head>
-
 <body class="bg-white text-slate-900 transition-all">
-
-<!-- Toggle Button -->
-<button
-  id="theme-toggle"
-  class="fixed top-4 right-4 z-50 w-11 h-11 rounded-xl
-         bg-blue-600 text-white flex items-center justify-center
-         shadow-lg hover:bg-blue-700 transition"
-  aria-label="Toggle theme"
->
+<button id="theme-toggle" class="fixed top-4 right-4 z-50 w-11 h-11 rounded-xl bg-blue-600 text-white flex items-center justify-center shadow-lg hover:bg-blue-700 transition" aria-label="Toggle theme">
   <i class="fa-solid fa-moon"></i>
 </button>
-
 <div id="swagger"></div>
-
 <script src="https://unpkg.com/swagger-ui-dist/swagger-ui-bundle.js"></script>
-
 <script>
 const btn = document.getElementById('theme-toggle')
 const icon = btn.querySelector('i')
@@ -160,23 +136,14 @@ function setTheme(theme) {
   document.body.classList.toggle('bg-slate-950', theme === 'dark')
   document.body.classList.toggle('text-slate-100', theme === 'dark')
   document.body.classList.toggle('bg-white', theme !== 'dark')
-
-  icon.className =
-    theme === 'dark'
-      ? 'fa-solid fa-sun'
-      : 'fa-solid fa-moon'
-
+  icon.className = theme === 'dark' ? 'fa-solid fa-sun' : 'fa-solid fa-moon'
   localStorage.setItem('swagger-theme', theme)
 }
 
 setTheme(localStorage.getItem('swagger-theme') || 'light')
 
 btn.onclick = () => {
-  setTheme(
-    document.body.classList.contains('dark')
-      ? 'light'
-      : 'dark'
-  )
+  setTheme(document.body.classList.contains('dark') ? 'light' : 'dark')
 }
 
 SwaggerUIBundle({