hono 0.5.6 → 0.5.9

package/dist/context.d.ts

@@ -11,6 +11,7 @@ export declare class Context<RequestParamKeyType = string> {
     private _headers;
     private _status;
     private _statusText;
+    private _pretty;
     render: (template: string, params?: object, options?: object) => Promise<Response>;
     notFound: () => Response | Promise<Response>;
     constructor(req: Request<RequestParamKeyType>, opts?: {
@@ -20,6 +21,7 @@ export declare class Context<RequestParamKeyType = string> {
     });
     header(name: string, value: string): void;
     status(number: number): void;
+    pretty(prettyJSON: boolean): void;
     newResponse(data: Data, init?: ResponseInit): Response;
     body(data: Data, status?: number, headers?: Headers): Response;
     text(text: string, status?: number, headers?: Headers): Response;

package/dist/context.js

@@ -34,6 +34,9 @@ class Context {
         this._status = number;
         this._statusText = (0, http_status_1.getStatusText)(number);
     }
+    pretty(prettyJSON) {
+        this._pretty = prettyJSON;
+    }
     newResponse(data, init = {}) {
         init.status = init.status || this._status || 200;
         init.statusText = init.statusText || this._statusText || (0, http_status_1.getStatusText)(init.status);
@@ -69,7 +72,7 @@ class Context {
         if (typeof object !== 'object') {
             throw new TypeError('json method arg must be a object!');
         }
-        const body = JSON.stringify(object);
+        const body = this._pretty ? JSON.stringify(object, null, 2) : JSON.stringify(object);
         headers['Content-Type'] || (headers['Content-Type'] = 'application/json; charset=UTF-8');
         return this.body(body, status, headers);
     }

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

@@ -1,5 +1,6 @@
 import type { Context } from '../../context';
-import type { GraphQLSchema, ValidationRule } from 'graphql';
+import { GraphQLError } from 'graphql';
+import type { GraphQLSchema, ValidationRule, GraphQLFormattedError } from 'graphql';
 declare type Options = {
     schema: GraphQLSchema;
     rootValue?: unknown;
@@ -16,7 +17,9 @@ export interface GraphQLParams {
     raw: boolean;
 }
 export declare const getGraphQLParams: (request: Request) => Promise<GraphQLParams>;
-export declare const errorMessages: (messages: string[]) => {
+export declare const errorMessages: (messages: string[], graphqlErrors?: readonly GraphQLError[] | readonly GraphQLFormattedError[]) => {
+    errors: readonly GraphQLError[] | readonly GraphQLFormattedError[];
+} | {
     errors: {
         message: string;
     }[];

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

@@ -27,7 +27,7 @@ const graphqlServer = (options) => {
         }
         catch (e) {
             if (e instanceof Error) {
-                c.res = c.json((0, exports.errorMessages)([e.message]), 400);
+                c.res = c.json((0, exports.errorMessages)([e.message], [e]), 400);
             }
             return;
         }
@@ -39,7 +39,7 @@ const graphqlServer = (options) => {
         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.']), 500);
+            c.res = c.json((0, exports.errorMessages)(['GraphQL schema validation error.'], schemaValidationErrors), 500);
             return;
         }
         let documentAST;
@@ -48,14 +48,19 @@ const graphqlServer = (options) => {
         }
         catch (syntaxError) {
             // Return 400: Bad Request if any syntax errors errors exist.
-            c.res = c.json((0, exports.errorMessages)(['GraphQL syntax error.']), 400);
+            if (syntaxError instanceof Error) {
+                const e = new graphql_1.GraphQLError(syntaxError.message, {
+                    originalError: syntaxError,
+                });
+                c.res = 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.']), 400);
+            c.res = c.json((0, exports.errorMessages)(['GraphQL validation error.'], validationErrors), 400);
             return;
         }
         if (c.req.method === 'GET') {
@@ -85,13 +90,19 @@ const graphqlServer = (options) => {
                 operationName: operationName,
             });
         }
-        catch (error) {
-            // Return 400: Bad Request if any execution context errors exist.
-            c.res = c.json((0, exports.errorMessages)(['GraphQL execution context error.']), 400);
+        catch (contextError) {
+            if (contextError instanceof Error) {
+                const e = new graphql_1.GraphQLError(contextError.message, {
+                    originalError: contextError,
+                    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;
         }
         if (result.data == null) {
-            c.res = c.json((0, exports.errorMessages)([result.errors.toString()]), 500);
+            c.res = c.json((0, exports.errorMessages)([result.errors.toString()], result.errors), 500);
             return;
         }
         /*
@@ -149,14 +160,18 @@ const getGraphQLParams = async (request) => {
     return params;
 };
 exports.getGraphQLParams = getGraphQLParams;
-const errorMessages = (messages) => {
-    const errors = messages.map((message) => {
+const errorMessages = (messages, graphqlErrors) => {
+    if (graphqlErrors) {
         return {
-            message: message,
+            errors: graphqlErrors,
         };
-    });
+    }
     return {
-        errors: errors,
+        errors: messages.map((message) => {
+            return {
+                message: message,
+            };
+        }),
     };
 };
 exports.errorMessages = errorMessages;

package/dist/utils/crypto.d.ts

@@ -6,5 +6,6 @@ declare type Data = string | object | boolean;
 export declare const sha256: (data: Data) => Promise<string>;
 export declare const sha1: (data: Data) => Promise<string>;
 export declare const createHash: (data: Data, algorithm: Algorithm) => Promise<string>;
+export declare const encodeBase64: (str: string) => any;
 export declare const decodeBase64: (str: string) => any;
 export {};

package/dist/utils/crypto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeBase64 = exports.createHash = exports.sha1 = exports.sha256 = void 0;
+exports.decodeBase64 = exports.encodeBase64 = exports.createHash = exports.sha1 = exports.sha256 = void 0;
 const sha256 = async (data) => {
     const algorithm = { name: 'SHA-256', alias: 'sha256' };
     const hash = await (0, exports.createHash)(data, algorithm);
@@ -34,6 +34,28 @@ const createHash = async (data, algorithm) => {
     }
 };
 exports.createHash = createHash;
+const encodeBase64 = (str) => {
+    try {
+        const encoder = new TextEncoder();
+        const bytes = encoder.encode(str);
+        const length = bytes.byteLength;
+        let binary = '';
+        for (let i = 0; i < length; i++) {
+            binary += String.fromCharCode(bytes[i]);
+        }
+        return btoa(binary);
+    }
+    catch (_a) { }
+    try {
+        const { Buffer } = require('buffer');
+        return Buffer.from(str).toString('base64');
+    }
+    catch (e) {
+        console.error('If you want to do "encodeBase64", polyfill "buffer" module.');
+        throw e;
+    }
+};
+exports.encodeBase64 = encodeBase64;
 const decodeBase64 = (str) => {
     try {
         const text = atob(str);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "0.5.6",
+  "version": "0.5.9",
   "description": "[炎] Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,10 @@
     "./powered-by": "./dist/middleware/powered-by/powered-by.js",
     "./serve-static": "./dist/middleware/serve-static/serve-static.js",
     "./router/trie-router": "./dist/router/trie-router/router.js",
-    "./router/reg-exp-router": "./dist/router/reg-exp-router/index.js"
+    "./router/reg-exp-router": "./dist/router/reg-exp-router/index.js",
+    "./utils/cloudflare": "./dist/utils/cloudflare.js",
+    "./utils/crypto": "./dist/utils/crypto.js",
+    "./utils/mime": "./dist/utils/mime.js"
   },
   "typesVersions": {
     "*": {
@@ -66,6 +69,15 @@
       ],
       "router/reg-exp-router": [
         "./dist/router/reg-exp-router/router.d.ts"
+      ],
+      "utils/cloudflare": [
+        "./dist/utils/cloudflare.d.ts"
+      ],
+      "utils/crypto": [
+        "./dist/utils/crypto.d.ts"
+      ],
+      "utils/mime": [
+        "./dist/utils/mime.d.ts"
       ]
     }
   },