resolve if both root and path set

Co-authored-by: Taku Amano <[email protected]>

Author: yusukebe

src/serve-static.ts

@@ -91,7 +91,7 @@ export const serveStatic = <E extends Env = any>(
 
     if (optionPath) {
       // Use path option directly if specified
-      path = resolve(optionPath)
+      path = resolve(optionRoot, optionPath)
     } else {
       // Build with root + requestPath
       path = resolve(join(optionRoot, requestPath))

test/serve-static.test.ts

@@ -263,6 +263,34 @@ describe('Serve Static Middleware', () => {
     })
   })
 
+  describe('Root and path combination tests', () => {
+    const rootPaths = [
+      path.join(__dirname, 'assets'),
+      path.join(__dirname, 'assets'),
+      __dirname + path.sep + '..' + path.sep + 'test' + path.sep + 'assets',
+    ]
+    rootPaths.forEach((root) => {
+      describe(root, () => {
+        const app = new Hono()
+        const server = createAdaptorServer(app)
+
+        app.use(
+          '/favicon.ico',
+          serveStatic({
+            root: './test/assets',
+            path: 'favicon.ico',
+          })
+        )
+
+        it('Should return 200 response if both root and path set', async () => {
+          const res = await request(server).get('/favicon.ico')
+          expect(res.status).toBe(200)
+          expect(res.headers['content-type']).toBe('image/x-icon')
+        })
+      })
+    })
+  })
+
   describe('Security tests', () => {
     const app = new Hono()
     const server = createAdaptorServer(app)