hono 1.4.0 → 1.4.1

package/dist/middleware/graphql-server/index.d.ts

@@ -8,7 +8,7 @@ declare type Options = {
     pretty?: boolean;
     validationRules?: ReadonlyArray<ValidationRule>;
 };
-export declare const graphqlServer: (options: Options) => (c: Context, next: Next) => Promise<void>;
+export declare const graphqlServer: (options: Options) => (c: Context, next: Next) => Promise<Response>;
 export interface GraphQLParams {
     query: string | null;
     variables: {

package/dist/middleware/graphql-server/index.js

@@ -13,13 +13,11 @@ const graphqlServer = (options) => {
     const validationRules = (_b = options.validationRules) !== null && _b !== void 0 ? _b : [];
     // const showGraphiQL = options.graphiql ?? false
     return async (c, next) => {
-        await next();
         // GraphQL HTTP only supports GET and POST methods.
         if (c.req.method !== 'GET' && c.req.method !== 'POST') {
-            c.res = c.json((0, exports.errorMessages)(['GraphQL only supports GET and POST requests.']), 405, {
+            return c.json((0, exports.errorMessages)(['GraphQL only supports GET and POST requests.']), 405, {
                 Allow: 'GET, POST',
             });
-            return;
         }
         let params;
         try {
@@ -28,20 +26,17 @@ const graphqlServer = (options) => {
         catch (e) {
             if (e instanceof Error) {
                 console.error(`${e.stack || e.message}`);
-                c.res = c.json((0, exports.errorMessages)([e.message], [e]), 400);
+                return c.json((0, exports.errorMessages)([e.message], [e]), 400);
             }
-            return;
         }
         const { query, variables, operationName } = params;
         if (query == null) {
-            c.res = c.json((0, exports.errorMessages)(['Must provide query string.']), 400);
-            return;
+            return c.json((0, exports.errorMessages)(['Must provide query string.']), 400);
         }
         const schemaValidationErrors = (0, graphql_1.validateSchema)(schema);
         if (schemaValidationErrors.length > 0) {
             // Return 500: Internal Server Error if invalid schema.
-            c.res = c.json((0, exports.errorMessages)(['GraphQL schema validation error.'], schemaValidationErrors), 500);
-            return;
+            return c.json((0, exports.errorMessages)(['GraphQL schema validation error.'], schemaValidationErrors), 500);
         }
         let documentAST;
         try {
@@ -54,16 +49,14 @@ const graphqlServer = (options) => {
                 const e = new graphql_1.GraphQLError(syntaxError.message, {
                     originalError: syntaxError,
                 });
-                c.res = c.json((0, exports.errorMessages)(['GraphQL syntax error.'], [e]), 400);
+                return c.json((0, exports.errorMessages)(['GraphQL syntax error.'], [e]), 400);
             }
-            return;
         }
         // Validate AST, reporting any errors.
         const validationErrors = (0, graphql_1.validate)(schema, documentAST, [...graphql_1.specifiedRules, ...validationRules]);
         if (validationErrors.length > 0) {
             // Return 400: Bad Request if any validation errors exist.
-            c.res = c.json((0, exports.errorMessages)(['GraphQL validation error.'], validationErrors), 400);
-            return;
+            return c.json((0, exports.errorMessages)(['GraphQL validation error.'], validationErrors), 400);
         }
         if (c.req.method === 'GET') {
             // Determine if this GET request will perform a non-query.
@@ -76,10 +69,9 @@ const graphqlServer = (options) => {
                 }
                 */
                 // Otherwise, report a 405: Method Not Allowed error.
-                c.res = c.json((0, exports.errorMessages)([
+                return c.json((0, exports.errorMessages)([
                     `Can only perform a ${operationAST.operation} operation from a POST request.`,
                 ]), 405, { Allow: 'POST' });
-                return;
             }
         }
         let result;
@@ -100,13 +92,11 @@ const graphqlServer = (options) => {
                     nodes: documentAST,
                 });
                 // Return 400: Bad Request if any execution context errors exist.
-                c.res = c.json((0, exports.errorMessages)(['GraphQL execution context error.'], [e]), 400);
+                return c.json((0, exports.errorMessages)(['GraphQL execution context error.'], [e]), 400);
             }
-            return;
         }
         if (result.data == null) {
-            c.res = c.json((0, exports.errorMessages)([result.errors.toString()], result.errors), 500);
-            return;
+            return c.json((0, exports.errorMessages)([result.errors.toString()], result.errors), 500);
         }
         /*
         Now, does not support GraphiQL
@@ -115,14 +105,14 @@ const graphqlServer = (options) => {
         */
         if (pretty) {
             const payload = JSON.stringify(result, null, pretty ? 2 : 0);
-            c.res = c.text(payload, 200, {
+            return c.text(payload, 200, {
                 'Content-Type': 'application/json',
             });
         }
         else {
-            c.res = c.json(result);
+            return c.json(result);
         }
-        return;
+        await next(); // XXX
     };
 };
 exports.graphqlServer = graphqlServer;

package/dist/router/reg-exp-router/router.js

@@ -158,7 +158,7 @@ class RegExpRouter {
         const handlerWithSortIndex = {
             index,
             handler,
-            componentsLength: hint.components.length,
+            componentsLength: hint.components.length || 1,
         };
         for (let i = 0, len = routes.length; i < len; i++) {
             if (routes[i].method === method && routes[i].path === path) {
@@ -315,7 +315,7 @@ class RegExpRouter {
                         }
                     }
                     if (routes[j].hint.components.length < routes[i].hint.components.length) {
-                        const componentsLength = routes[j].hint.components.length;
+                        const componentsLength = routes[j].hint.components.length || 1;
                         routes[j].middleware.push(...routes[i].handlers.map((h) => ({
                             componentsLength,
                             index: h.index,

package/dist/router/trie-router/node.js

@@ -70,7 +70,7 @@ class Node {
             score = score + this.order * 0.01;
         }
         else {
-            score = parts.length + 1 + this.order * 0.01;
+            score = parts.length + this.order * 0.01;
         }
         if (!curNode.methods.length) {
             curNode.methods = [];
@@ -107,11 +107,7 @@ class Node {
             if (pattern === '*') {
                 const astNode = node.children['*'];
                 if (astNode) {
-                    let wildcard = false;
-                    if (!Object.keys(astNode.children).length) {
-                        wildcard = true;
-                    }
-                    handlerSets.push(...this.getHandlerSets(astNode, method, wildcard));
+                    handlerSets.push(...this.getHandlerSets(astNode, method));
                     nextNodes.push(astNode);
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",