hono 2.1.4 → 2.2.0

package/dist/utils/url.js

@@ -1,17 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergePath = exports.isAbsoluteURL = exports.getQueryStringFromURL = exports.getPathFromURL = exports.getPattern = exports.splitPath = void 0;
-const URL_REGEXP = /^https?:\/\/[a-zA-Z0-9\-\.:]+(\/?[^?#]*)/;
-const splitPath = (path) => {
+export const splitPath = (path) => {
     const paths = path.split(/\//); // faster than path.split('/')
     if (paths[0] === '') {
         paths.shift();
     }
     return paths;
 };
-exports.splitPath = splitPath;
 const patternCache = {};
-const getPattern = (label) => {
+export const getPattern = (label) => {
     // *            => wildcard
     // :id{[0-9]+}  => ([0-9]+)
     // :id          => (.+)
@@ -33,8 +28,7 @@ const getPattern = (label) => {
     }
     return null;
 };
-exports.getPattern = getPattern;
-const getPathFromURL = (url, strict = true) => {
+export const getPathFromURL = (url, strict = true) => {
     const queryIndex = url.indexOf('?');
     const result = url.substring(url.indexOf('/', 8), queryIndex === -1 ? url.length : queryIndex);
     // if strict routing is false => `/hello/hey/` and `/hello/hey` are treated the same
@@ -44,22 +38,12 @@ const getPathFromURL = (url, strict = true) => {
     }
     return result;
 };
-exports.getPathFromURL = getPathFromURL;
-const getQueryStringFromURL = (url) => {
+export const getQueryStringFromURL = (url) => {
     const queryIndex = url.indexOf('?');
     const result = queryIndex !== -1 ? url.substring(queryIndex) : '';
     return result;
 };
-exports.getQueryStringFromURL = getQueryStringFromURL;
-const isAbsoluteURL = (url) => {
-    const match = url.match(URL_REGEXP);
-    if (match) {
-        return true;
-    }
-    return false;
-};
-exports.isAbsoluteURL = isAbsoluteURL;
-const mergePath = (...paths) => {
+export const mergePath = (...paths) => {
     let p = '';
     let endsWithSlash = false;
     for (let path of paths) {
@@ -86,4 +70,16 @@ const mergePath = (...paths) => {
     }
     return p;
 };
-exports.mergePath = mergePath;
+export const checkOptionalParameter = (path) => {
+    /*
+     If path is `/api/animals/:type?` it will return:
+     [`/api/animals`, `/api/animals/:type`]
+     in other cases it will return null
+     */
+    const match = path.match(/(^.+)(\/\:[^\/]+)\?$/);
+    if (!match)
+        return null;
+    const base = match[1];
+    const optional = base + match[2];
+    return [base, optional];
+};

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "hono",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "Ultrafast web framework for Cloudflare Workers.",
   "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
     "dist"
@@ -15,34 +16,111 @@
     "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",
+    "build": "rimraf dist && tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json",
     "watch": "tsc --project tsconfig.build.json -w",
     "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",
-    "./cache": "./dist/middleware/cache/index.js",
-    "./compress": "./dist/middleware/compress/index.js",
-    "./cors": "./dist/middleware/cors/index.js",
-    "./etag": "./dist/middleware/etag/index.js",
-    "./html": "./dist/middleware/html/index.js",
-    "./jsx": "./dist/middleware/jsx/index.js",
-    "./jsx/jsx-dev-runtime": "./dist/middleware/jsx/jsx-dev-runtime.js",
-    "./jsx/jsx-runtime": "./dist/middleware/jsx/jsx-runtime.js",
-    "./jwt": "./dist/middleware/jwt/index.js",
-    "./logger": "./dist/middleware/logger/index.js",
-    "./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",
-    "./utils/jwt": "./dist/utils/jwt/index.js",
-    "./utils/*": "./dist/utils/*.js"
+    ".": {
+      "import": "./dist/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./basic-auth": {
+      "import": "./dist/middleware/basic-auth/index.js",
+      "require": "./dist/cjs/middleware/basic-auth/index.js"
+    },
+    "./bearer-auth": {
+      "import": "./dist/middleware/bearer-auth/index.js",
+      "require": "./dist/cjs/middleware/bearer-auth/index.js"
+    },
+    "./cache": {
+      "import": "./dist/middleware/cache/index.js",
+      "require": "./dist/cjs/middleware/cache/index.js"
+    },
+    "./compress": {
+      "import": "./dist/middleware/compress/index.js",
+      "require": "./dist/cjs/middleware/compress/index.js"
+    },
+    "./cors": {
+      "import": "./dist/middleware/cors/index.js",
+      "require": "./dist/cjs/middleware/cors/index.js"
+    },
+    "./etag": {
+      "import": "./dist/middleware/etag/index.js",
+      "require": "./dist/cjs/middleware/etag/index.js"
+    },
+    "./html": {
+      "import": "./dist/middleware/html/index.js",
+      "require": "./dist/cjs/middleware/html/index.js"
+    },
+    "./jsx": {
+      "import": "./dist/middleware/jsx/index.js",
+      "require": "./dist/cjs/middleware/jsx/index.js"
+    },
+    "./jsx/jsx-dev-runtime": {
+      "import": "./dist/middleware/jsx/jsx-dev-runtime.js",
+      "require": "./dist/cjs/middleware/jsx/jsx-dev-runtime.js"
+    },
+    "./jsx/jsx-runtime": {
+      "import": "./dist/middleware/jsx/jsx-runtime.js",
+      "require": "./dist/cjs/middleware/jsx/jsx-runtime.js"
+    },
+    "./jwt": {
+      "import": "./dist/middleware/jwt/index.js",
+      "require": "./dist/cjs/middleware/jwt/index.js"
+    },
+    "./logger": {
+      "import": "./dist/middleware/logger/index.js",
+      "require": "./dist/cjs/middleware/logger/index.js"
+    },
+    "./powered-by": {
+      "import": "./dist/middleware/powered-by/index.js",
+      "require": "./dist/cjs/middleware/powered-by/index.js"
+    },
+    "./pretty-json": {
+      "import": "./dist/middleware/pretty-json/index.js",
+      "require": "./dist/cjs/middleware/pretty-json/index.js"
+    },
+    "./serve-static": {
+      "import": "./dist/middleware/serve-static/index.js",
+      "require": "./dist/cjs/middleware/serve-static/index.js"
+    },
+    "./serve-static.bun": {
+      "import": "./dist/middleware/serve-static/bun.js",
+      "require": "./dist/cjs/middleware/serve-static/bun.js"
+    },
+    "./serve-static.module": {
+      "import": "./dist/middleware/serve-static/module.mjs"
+    },
+    "./validator": {
+      "import": "./dist/middleware/validator/index.js",
+      "require": "./dist/cjs/middleware/validator/index.js"
+    },
+    "./router/reg-exp-router": {
+      "import": "./dist/router/reg-exp-router/index.js",
+      "require": "./dist/cjs/router/reg-exp-router/index.js"
+    },
+    "./router/smart-router": {
+      "import": "./dist/router/smart-router/index.js",
+      "require": "./dist/cjs/router/smart-router/index.js"
+    },
+    "./router/static-router": {
+      "import": "./dist/router/static-router/index.js",
+      "require": "./dist/cjs/router/static-router/index.js"
+    },
+    "./router/trie-router": {
+      "import": "./dist/router/trie-router/index.js",
+      "require": "./dist/cjs/router/trie-router/index.js"
+    },
+    "./utils/jwt": {
+      "import": "./dist/utils/jwt/index.js",
+      "require": "./dist/cjs/utils/jwt/index.js"
+    },
+    "./utils/*": {
+      "import": "./dist/utils/*.js",
+      "require": "./dist/cjs/utils/*.js"
+    }
   },
   "typesVersions": {
     "*": {
@@ -97,12 +175,21 @@
       "serve-static.module": [
         "./dist/middleware/serve-static/module.d.mts"
       ],
-      "router/trie-router": [
-        "./dist/router/trie-router/router.d.ts"
+      "validator": [
+        "./dist/middleware/validator"
       ],
       "router/reg-exp-router": [
         "./dist/router/reg-exp-router/router.d.ts"
       ],
+      "router/smart-router": [
+        "./dist/router/smart-router/router.d.ts"
+      ],
+      "router/static-router": [
+        "./dist/router/static-router/router.d.ts"
+      ],
+      "router/trie-router": [
+        "./dist/router/trie-router/router.d.ts"
+      ],
       "utils/jwt": [
         "./dist/utils/jwt/index.d.ts"
       ],
@@ -120,7 +207,7 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "homepage": "https://github.com/honojs/hono",
+  "homepage": "https://honojs.dev",
   "keywords": [
     "hono",
     "web",
@@ -137,14 +224,14 @@
     "bun"
   ],
   "devDependencies": {
-    "@cloudflare/workers-types": "^3.7.1",
+    "@cloudflare/workers-types": "^3.16.0",
     "@types/crypto-js": "^4.1.1",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "^29.0.2",
     "@types/node": "^17.0.29",
     "@typescript-eslint/eslint-plugin": "^5.21.0",
     "@typescript-eslint/parser": "^5.21.0",
     "crypto-js": "^4.1.1",
-    "denoify": "^0.11.1",
+    "denoify": "^1.1.1",
     "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-define-config": "^1.4.0",
@@ -154,15 +241,15 @@
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "form-data": "^4.0.0",
-    "jest": "27.5.1",
-    "jest-environment-miniflare": "^2.7.0",
+    "jest": "^29.0.3",
+    "jest-environment-miniflare": "2.7.1",
     "np": "^7.6.2",
     "prettier": "^2.6.2",
     "rimraf": "^3.0.2",
-    "ts-jest": "^27.1.4",
-    "typescript": "^4.6.3"
+    "ts-jest": "^29.0.1",
+    "typescript": "^4.8.3"
   },
   "engines": {
-    "node": ">=11.0.0"
+    "node": ">=16.0.0"
   }
 }