hono 1.6.4 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hono",
-  "version": "1.6.4",
+  "version": "2.0.2",
   "description": "Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,32 +9,30 @@
   ],
   "scripts": {
     "test": "jest",
+    "test:deno": "deno test --allow-read deno_test",
+    "test:bun": "bun wiptest bun_test/index.test.ts",
     "lint": "eslint --ext js,ts src .eslintrc.js",
     "lint:fix": "eslint --ext js,ts src .eslintrc.js --fix",
     "denoify": "rimraf deno_dist && denoify && rimraf 'deno_dist/**/*.test.ts'",
     "build": "rimraf dist && tsc --project tsconfig.build.esm.json && tsc --project tsconfig.build.json",
     "watch": "tsc --project tsconfig.build.json -w",
-    "prerelease": "yarn denoify && yarn build",
+    "prerelease": "yarn denoify && yarn test:deno && yarn build",
     "release": "np"
   },
   "exports": {
     ".": "./dist/index.js",
     "./basic-auth": "./dist/middleware/basic-auth/index.js",
     "./bearer-auth": "./dist/middleware/bearer-auth/index.js",
-    "./body-parse": "./dist/middleware/body-parse/index.js",
-    "./cookie": "./dist/middleware/cookie/index.js",
     "./cors": "./dist/middleware/cors/index.js",
     "./etag": "./dist/middleware/etag/index.js",
-    "./graphql-server": "./dist/middleware/graphql-server/index.js",
     "./html": "./dist/middleware/html/index.js",
     "./jsx": "./dist/middleware/jsx/index.js",
     "./jwt": "./dist/middleware/jwt/index.js",
     "./logger": "./dist/middleware/logger/index.js",
-    "./mustache": "./dist/middleware/mustache/index.js",
-    "./mustache.module": "./dist/middleware/mustache/module.mjs",
     "./powered-by": "./dist/middleware/powered-by/index.js",
     "./pretty-json": "./dist/middleware/pretty-json/index.js",
     "./serve-static": "./dist/middleware/serve-static/index.js",
+    "./serve-static.bun": "./dist/middleware/serve-static/bun.js",
     "./serve-static.module": "./dist/middleware/serve-static/module.mjs",
     "./router/trie-router": "./dist/router/trie-router/index.js",
     "./router/reg-exp-router": "./dist/router/reg-exp-router/index.js",
@@ -49,9 +47,6 @@
       "bearer-auth": [
         "./dist/middleware/bearer-auth"
       ],
-      "body-parse": [
-        "./dist/middleware/body-parse"
-      ],
       "cookie": [
         "./dist/middleware/cookie"
       ],
@@ -61,9 +56,6 @@
       "etag": [
         "./dist/middleware/etag"
       ],
-      "graphql-server": [
-        "./dist/middleware/graphql-server"
-      ],
       "html": [
         "./dist/middleware/html"
       ],
@@ -76,12 +68,6 @@
       "logger": [
         "./dist/middleware/logger"
       ],
-      "mustache": [
-        "./dist/middleware/mustache"
-      ],
-      "mustache.module": [
-        "./dist/middleware/mustache/module.d.mts"
-      ],
       "powered-by": [
         "./dist/middleware/powered-by"
       ],
@@ -91,6 +77,9 @@
       "serve-static": [
         "./dist/middleware/serve-static/index.d.ts"
       ],
+      "serve-static.bun": [
+        "./dist/middleware/serve-static/bun.d.ts"
+      ],
       "serve-static.module": [
         "./dist/middleware/serve-static/module.d.mts"
       ],
@@ -119,6 +108,7 @@
   },
   "homepage": "https://github.com/honojs/hono",
   "keywords": [
+    "hono",
     "web",
     "app",
     "http",
@@ -128,7 +118,9 @@
     "cloudflare",
     "workers",
     "fastly",
-    "compute@edge"
+    "compute@edge",
+    "deno",
+    "bun"
   ],
   "devDependencies": {
     "@cloudflare/workers-types": "^3.7.1",
@@ -149,13 +141,11 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "form-data": "^4.0.0",
-    "graphql": "^16.4.0",
     "jest": "27.5.1",
-    "jest-environment-miniflare": "^2.5.1",
+    "jest-environment-miniflare": "^2.6.0",
     "mustache": "^4.2.0",
     "np": "^7.6.2",
     "prettier": "^2.6.2",
-    "prettier-plugin-md-nocjsp": "^1.2.0",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.4",
     "typescript": "^4.6.3"

package/dist/middleware/body-parse/index.d.ts

@@ -1,8 +0,0 @@
-import type { Context } from '../../context';
-import type { Next } from '../../hono';
-declare global {
-    interface Request {
-        parsedBody: any;
-    }
-}
-export declare const bodyParse: () => (ctx: Context, next: Next) => Promise<void>;

package/dist/middleware/body-parse/index.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bodyParse = void 0;
-const body_1 = require("../../utils/body");
-const bodyParse = () => {
-    return async (ctx, next) => {
-        ctx.req.parsedBody = await (0, body_1.parseBody)(ctx.req);
-        await next();
-    };
-};
-exports.bodyParse = bodyParse;

package/dist/middleware/cookie/index.d.ts

@@ -1,27 +0,0 @@
-import type { Context } from '../../context';
-import type { Next } from '../../hono';
-declare global {
-    interface Request {
-        cookie: {
-            (name: string): string;
-            (): Record<string, string>;
-        };
-    }
-}
-declare module '../../context' {
-    interface Context {
-        cookie: (name: string, value: string, options?: CookieOptions) => void;
-    }
-}
-export declare type Cookie = Record<string, string>;
-export declare type CookieOptions = {
-    domain?: string;
-    expires?: Date;
-    httpOnly?: boolean;
-    maxAge?: number;
-    path?: string;
-    secure?: boolean;
-    signed?: boolean;
-    sameSite?: 'Strict' | 'Lax' | 'None';
-};
-export declare const cookie: () => (c: Context, next: Next) => Promise<void>;

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

@@ -1,28 +0,0 @@
-import { GraphQLError } from 'graphql';
-import type { GraphQLSchema, ValidationRule, GraphQLFormattedError } from 'graphql';
-import type { Context } from '../../context';
-import type { Next } from '../../hono';
-declare type Options = {
-    schema: GraphQLSchema;
-    rootValue?: unknown;
-    pretty?: boolean;
-    validationRules?: ReadonlyArray<ValidationRule>;
-};
-export declare const graphqlServer: (options: Options) => (c: Context, next: Next) => Promise<Response>;
-export interface GraphQLParams {
-    query: string | null;
-    variables: {
-        readonly [name: string]: unknown;
-    } | null;
-    operationName: string | null;
-    raw: boolean;
-}
-export declare const getGraphQLParams: (request: Request) => Promise<GraphQLParams>;
-export declare const errorMessages: (messages: string[], graphqlErrors?: readonly GraphQLError[] | readonly GraphQLFormattedError[] | undefined) => {
-    errors: readonly GraphQLError[] | readonly GraphQLFormattedError[];
-} | {
-    errors: {
-        message: string;
-    }[];
-};
-export {};

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

@@ -1,174 +0,0 @@
-"use strict";
-// Based on the code in the `express-graphql` package.
-// https://github.com/graphql/express-graphql/blob/main/src/index.ts
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.errorMessages = exports.getGraphQLParams = exports.graphqlServer = void 0;
-const graphql_1 = require("graphql");
-const parse_body_1 = require("./parse-body");
-const graphqlServer = (options) => {
-    const schema = options.schema;
-    const rootValue = options.rootValue;
-    const pretty = options.pretty ?? false;
-    const validationRules = options.validationRules ?? [];
-    // const showGraphiQL = options.graphiql ?? false
-    return async (c, next) => {
-        // GraphQL HTTP only supports GET and POST methods.
-        if (c.req.method !== 'GET' && c.req.method !== 'POST') {
-            return c.json((0, exports.errorMessages)(['GraphQL only supports GET and POST requests.']), 405, {
-                Allow: 'GET, POST',
-            });
-        }
-        let params;
-        try {
-            params = await (0, exports.getGraphQLParams)(c.req);
-        }
-        catch (e) {
-            if (e instanceof Error) {
-                console.error(`${e.stack || e.message}`);
-                return c.json((0, exports.errorMessages)([e.message], [e]), 400);
-            }
-            throw e;
-        }
-        const { query, variables, operationName } = params;
-        if (query == null) {
-            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.
-            return c.json((0, exports.errorMessages)(['GraphQL schema validation error.'], schemaValidationErrors), 500);
-        }
-        let documentAST;
-        try {
-            documentAST = (0, graphql_1.parse)(new graphql_1.Source(query, 'GraphQL request'));
-        }
-        catch (syntaxError) {
-            // Return 400: Bad Request if any syntax errors errors exist.
-            if (syntaxError instanceof Error) {
-                console.error(`${syntaxError.stack || syntaxError.message}`);
-                const e = new graphql_1.GraphQLError(syntaxError.message, {
-                    originalError: syntaxError,
-                });
-                return c.json((0, exports.errorMessages)(['GraphQL syntax error.'], [e]), 400);
-            }
-            throw syntaxError;
-        }
-        // 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.
-            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.
-            const operationAST = (0, graphql_1.getOperationAST)(documentAST, operationName);
-            if (operationAST && operationAST.operation !== 'query') {
-                /*
-                Now , does not support GraphiQL
-                if (showGraphiQL) {
-                  //return respondWithGraphiQL(response, graphiqlOptions, params)
-                }
-                */
-                // Otherwise, report a 405: Method Not Allowed error.
-                return c.json((0, exports.errorMessages)([
-                    `Can only perform a ${operationAST.operation} operation from a POST request.`,
-                ]), 405, { Allow: 'POST' });
-            }
-        }
-        let result;
-        try {
-            result = await (0, graphql_1.execute)({
-                schema,
-                document: documentAST,
-                rootValue,
-                variableValues: variables,
-                operationName: operationName,
-            });
-        }
-        catch (contextError) {
-            if (contextError instanceof Error) {
-                console.error(`${contextError.stack || contextError.message}`);
-                const e = new graphql_1.GraphQLError(contextError.message, {
-                    originalError: contextError,
-                    nodes: documentAST,
-                });
-                // Return 400: Bad Request if any execution context errors exist.
-                return c.json((0, exports.errorMessages)(['GraphQL execution context error.'], [e]), 400);
-            }
-            throw contextError;
-        }
-        if (!result.data) {
-            if (result.errors) {
-                return c.json((0, exports.errorMessages)([result.errors.toString()], result.errors), 500);
-            }
-        }
-        /*
-        Now, does not support GraphiQL
-        if (showGraphiQL) {
-        }
-        */
-        if (pretty) {
-            const payload = JSON.stringify(result, null, pretty ? 2 : 0);
-            return c.text(payload, 200, {
-                'Content-Type': 'application/json',
-            });
-        }
-        else {
-            return c.json(result);
-        }
-        await next(); // XXX
-    };
-};
-exports.graphqlServer = graphqlServer;
-const getGraphQLParams = async (request) => {
-    const urlData = new URLSearchParams(request.url.split('?')[1]);
-    const bodyData = await (0, parse_body_1.parseBody)(request);
-    // GraphQL Query string.
-    let query = urlData.get('query') ?? bodyData.query;
-    if (typeof query !== 'string') {
-        query = null;
-    }
-    // Parse the variables if needed.
-    let variables = (urlData.get('variables') ?? bodyData.variables);
-    if (typeof variables === 'string') {
-        try {
-            variables = JSON.parse(variables);
-        }
-        catch {
-            throw Error('Variables are invalid JSON.');
-        }
-    }
-    else if (typeof variables !== 'object') {
-        variables = null;
-    }
-    // Name of GraphQL operation to execute.
-    let operationName = urlData.get('operationName') ?? bodyData.operationName;
-    if (typeof operationName !== 'string') {
-        operationName = null;
-    }
-    const raw = urlData.get('raw') != null || bodyData.raw !== undefined;
-    const params = {
-        query: query,
-        variables: variables,
-        operationName: operationName,
-        raw: raw,
-    };
-    return params;
-};
-exports.getGraphQLParams = getGraphQLParams;
-const errorMessages = (messages, graphqlErrors) => {
-    if (graphqlErrors) {
-        return {
-            errors: graphqlErrors,
-        };
-    }
-    return {
-        errors: messages.map((message) => {
-            return {
-                message: message,
-            };
-        }),
-    };
-};
-exports.errorMessages = errorMessages;
-// export const graphiQLResponse = () => {}

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

@@ -1 +0,0 @@
-export declare function parseBody(req: Request): Promise<Record<string, unknown>>;

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

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseBody = void 0;
-async function parseBody(req) {
-    const contentType = req.headers.get('content-type');
-    switch (contentType) {
-        case 'application/graphql':
-            return { query: await req.text() };
-        case 'application/json':
-            try {
-                return await req.json();
-            }
-            catch (e) {
-                if (e instanceof Error) {
-                    console.error(`${e.stack || e.message}`);
-                }
-                throw Error(`POST body sent invalid JSON: ${e}`);
-            }
-        case 'application/x-www-form-urlencoded':
-            return parseFormURL(req);
-    }
-    return {};
-}
-exports.parseBody = parseBody;
-const parseFormURL = async (req) => {
-    const text = await req.text();
-    const searchParams = new URLSearchParams(text);
-    const res = {};
-    searchParams.forEach((v, k) => (res[k] = v));
-    return res;
-};

package/dist/middleware/mustache/index.d.ts

@@ -1 +0,0 @@
-export { mustache } from './mustache';

package/dist/middleware/mustache/index.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mustache = void 0;
-var mustache_1 = require("./mustache");
-Object.defineProperty(exports, "mustache", { enumerable: true, get: function () { return mustache_1.mustache; } });

package/dist/middleware/mustache/module.d.mts

@@ -1,5 +0,0 @@
-import type { MustacheOptions } from './mustache';
-declare const module: (options?: MustacheOptions) => (c: import("../../context").Context<string, {
-    [x: string]: any;
-}>, next: import("../../hono").Next) => Promise<void>;
-export { module as mustache };

package/dist/middleware/mustache/module.mjs

@@ -1,12 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-// For ES module mode
-import manifest from '__STATIC_CONTENT_MANIFEST';
-import { mustache } from './mustache';
-const module = (options = { root: '' }) => {
-    return mustache({
-        root: options.root,
-        manifest: options.manifest ? options.manifest : manifest,
-    });
-};
-export { module as mustache };

package/dist/middleware/mustache/mustache.d.ts

@@ -1,14 +0,0 @@
-/// <reference types="@cloudflare/workers-types" />
-import type { Context } from '../../context';
-import type { Next } from '../../hono';
-declare module '../../context' {
-    interface Context {
-        render: (content: string, params?: object, options?: object) => Response | Promise<Response>;
-    }
-}
-export declare type MustacheOptions = {
-    root: string;
-    manifest?: object | string;
-    namespace?: KVNamespace;
-};
-export declare const mustache: (init?: MustacheOptions) => (c: Context, next: Next) => Promise<void>;

package/dist/middleware/mustache/mustache.js

@@ -1,53 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mustache = void 0;
-const mustache_1 = __importDefault(require("mustache"));
-const buffer_1 = require("../../utils/buffer");
-const cloudflare_1 = require("../../utils/cloudflare");
-const filepath_1 = require("../../utils/filepath");
-const EXTENSION = '.mustache';
-const DEFAULT_DOCUMENT = 'index.mustache';
-const mustache = (init = { root: '' }) => {
-    const { root } = init;
-    return async (c, next) => {
-        c.render = async (filename, params = {}, options) => {
-            const path = (0, filepath_1.getFilePath)({
-                filename: `${filename}${EXTENSION}`,
-                root: root,
-                defaultDocument: DEFAULT_DOCUMENT,
-            });
-            const kvAssetOptions = {
-                manifest: init.manifest,
-                namespace: init.namespace ? init.namespace : c.env ? c.env.__STATIC_CONTENT : undefined,
-            };
-            const buffer = await (0, cloudflare_1.getContentFromKVAsset)(path, kvAssetOptions);
-            if (!buffer) {
-                throw new Error(`Template "${path}" is not found or blank.`);
-            }
-            const content = (0, buffer_1.bufferToString)(buffer);
-            const partialArgs = {};
-            if (options) {
-                const partials = options;
-                for (const key of Object.keys(partials)) {
-                    const partialPath = (0, filepath_1.getFilePath)({
-                        filename: `${partials[key]}${EXTENSION}`,
-                        root: root,
-                        defaultDocument: DEFAULT_DOCUMENT,
-                    });
-                    const partialBuffer = await (0, cloudflare_1.getContentFromKVAsset)(partialPath, kvAssetOptions);
-                    if (!partialBuffer) {
-                        throw new Error(`Partial Template "${partialPath}" is not found or blank.`);
-                    }
-                    partialArgs[key] = (0, buffer_1.bufferToString)(partialBuffer);
-                }
-            }
-            const output = mustache_1.default.render(content, params, partialArgs);
-            return c.html(output);
-        };
-        await next();
-    };
-};
-exports.mustache = mustache;