hono 2.2.5 → 2.3.1

package/dist/cjs/middleware/basic-auth/index.js

@@ -36,13 +36,12 @@ const basicAuth = (options, ...users) => {
                 }
             }
         }
-        ctx.res = new Response('Unauthorized', {
+        return new Response('Unauthorized', {
             status: 401,
             headers: {
                 'WWW-Authenticate': 'Basic realm="' + options.realm?.replace(/"/g, '\\"') + '"',
             },
         });
-        await next();
     };
 };
 exports.basicAuth = basicAuth;

package/dist/cjs/middleware/bearer-auth/index.js

@@ -19,7 +19,7 @@ const bearerAuth = (options) => {
         const headerToken = c.req.headers.get('Authorization');
         if (!headerToken) {
             // No Authorization header
-            c.res = new Response('Unauthorized', {
+            return new Response('Unauthorized', {
                 status: 401,
                 headers: {
                     'WWW-Authenticate': `${options.prefix} realm="` + realm + '"',
@@ -31,7 +31,7 @@ const bearerAuth = (options) => {
             const match = regexp.exec(headerToken);
             if (!match) {
                 // Invalid Request
-                c.res = new Response('Bad Request', {
+                return new Response('Bad Request', {
                     status: 400,
                     headers: {
                         'WWW-Authenticate': `${options.prefix} error="invalid_request"`,
@@ -42,7 +42,7 @@ const bearerAuth = (options) => {
                 const equal = await (0, buffer_1.timingSafeEqual)(options.token, match[1], options.hashFunction);
                 if (!equal) {
                     // Invalid Token
-                    c.res = new Response('Unauthorized', {
+                    return new Response('Unauthorized', {
                         status: 401,
                         headers: {
                             'WWW-Authenticate': `${options.prefix} error="invalid_token"`,

package/dist/cjs/middleware/compress/index.js

@@ -12,7 +12,7 @@ const compress = (options) => {
         }
         const encoding = match[0];
         const stream = new CompressionStream(encoding);
-        ctx.res = new Response(ctx.res.body.pipeThrough(stream), ctx.res.clone());
+        ctx.res = new Response(ctx.res.body.pipeThrough(stream), ctx.res);
         ctx.res.headers.set('Content-Encoding', encoding);
     };
 };

package/dist/cjs/middleware/jwt/index.js

@@ -15,13 +15,12 @@ const jwt = (options) => {
         if (credentials) {
             const parts = credentials.split(/\s+/);
             if (parts.length !== 2) {
-                ctx.res = new Response('Unauthorized', {
+                return new Response('Unauthorized', {
                     status: 401,
                     headers: {
                         'WWW-Authenticate': `Bearer realm="${ctx.req.url}",error="invalid_request",error_description="invalid credentials structure"`,
                     },
                 });
-                return;
             }
             else {
                 token = parts[1];
@@ -31,13 +30,12 @@ const jwt = (options) => {
             token = ctx.req.cookie(options.cookie);
         }
         if (!token) {
-            ctx.res = new Response('Unauthorized', {
+            return new Response('Unauthorized', {
                 status: 401,
                 headers: {
                     'WWW-Authenticate': `Bearer realm="${ctx.req.url}",error="invalid_request",error_description="no authorization included in request"`,
                 },
             });
-            return;
         }
         let authorized = false;
         let msg = '';
@@ -48,14 +46,13 @@ const jwt = (options) => {
             msg = `${e}`;
         }
         if (!authorized) {
-            ctx.res = new Response('Unauthorized', {
+            return new Response('Unauthorized', {
                 status: 401,
                 statusText: msg,
                 headers: {
                     'WWW-Authenticate': `Bearer realm="${ctx.req.url}",error="invalid_token",error_description="token verification failure"`,
                 },
             });
-            return;
         }
         await next();
     };

package/dist/cjs/middleware/serve-static/bun.js

@@ -14,6 +14,7 @@ const serveStatic = (options = { root: '' }) => {
         // Do nothing if Response is already set
         if (c.finalized) {
             await next();
+            return;
         }
         const url = new URL(c.req.url);
         let path = (0, filepath_1.getFilePath)({

package/dist/cjs/middleware/serve-static/serve-static.js

@@ -11,6 +11,7 @@ const serveStatic = (options = { root: '' }) => {
         // Do nothing if Response is already set
         if (c.finalized) {
             await next();
+            return;
         }
         const url = new URL(c.req.url);
         const path = (0, filepath_1.getFilePath)({

package/dist/cjs/middleware/validator/middleware.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatorMiddleware = void 0;
 const http_status_1 = require("../../utils/http-status");
+const object_1 = require("../../utils/object");
 const validator_1 = require("./validator");
 const validatorMiddleware = (validationFunction, options) => {
     const v = new validator_1.Validator();
@@ -11,27 +12,56 @@ const validatorMiddleware = (validationFunction, options) => {
             messages: [],
             results: [],
         };
-        const validatorList = getValidatorList(validationFunction(v, c));
+        const schema = validationFunction(v, c);
+        const validatorList = getValidatorList(schema);
+        let data = {};
         for (const [keys, validator] of validatorList) {
-            let result;
+            let results;
             try {
-                result = await validator.validate(c.req);
+                results = await validator.validate(c.req);
             }
             catch (e) {
                 // Invalid JSON request
                 return c.text((0, http_status_1.getStatusText)(400), 400);
             }
-            if (result.isValid) {
-                // Set data on request object
-                c.req.valid(keys, result.value);
+            let isValid = true;
+            const value = results[0].value;
+            const jsonData = results[0].jsonData;
+            for (const result of results) {
+                if (!result.isValid) {
+                    isValid = false;
+                    resultSet.hasError = true;
+                    if (result.ruleType === 'value' && result.message !== undefined) {
+                        resultSet.messages.push(result.message);
+                    }
+                }
+                resultSet.results.push(result);
             }
-            else {
-                resultSet.hasError = true;
-                if (result.message !== undefined) {
-                    resultSet.messages.push(result.message);
+            // If it's invalid but it has no "value" messages, have to set the "type" messages.
+            // This approach is verbose, but if do not so, the response body will be empty.
+            if (!isValid && resultSet.messages.length === 0) {
+                resultSet.results.map((r) => {
+                    if (!r.isValid && r.ruleType === 'type' && r.message) {
+                        resultSet.messages.push(r.message);
+                    }
+                });
+            }
+            // Set data on request object
+            if (isValid) {
+                // Set data on request object
+                if (jsonData) {
+                    const dst = data;
+                    data = (0, object_1.mergeObjects)(dst, jsonData);
+                }
+                else {
+                    c.req.valid(keys, value);
                 }
             }
-            resultSet.results.push(result);
+        }
+        if (!resultSet.hasError) {
+            Object.keys(data).map((key) => {
+                c.req.valid(key, data[key]);
+            });
         }
         if (options && options.done) {
             const res = options.done(resultSet, c);
@@ -50,7 +80,13 @@ exports.validatorMiddleware = validatorMiddleware;
 function getValidatorList(schema) {
     const map = [];
     for (const [key, value] of Object.entries(schema)) {
-        if (value instanceof validator_1.VBase) {
+        if (value instanceof validator_1.VObjectBase) {
+            const validators = value.getValidators();
+            for (const validator of validators) {
+                map.push([value.keys, validator]);
+            }
+        }
+        else if (value instanceof validator_1.VBase) {
             map.push([[key], value]);
         }
         else {