hono 4.6.8 → 4.6.9

package/dist/cjs/jsx/dom/render.js

@@ -258,13 +258,19 @@ const applyNodeObject = (node, container, isNew) => {
   remove.forEach(removeNode);
   const childNodes = isNew ? void 0 : container.childNodes;
   let offset;
+  let insertBeforeNode = null;
   if (isNew) {
     offset = -1;
+  } else if (!childNodes.length) {
+    offset = 0;
   } else {
-    offset = (childNodes.length && (findChildNodeIndex(childNodes, findInsertBefore(node.nN)) ?? findChildNodeIndex(
-      childNodes,
-      next.find((n) => n.tag !== HONO_PORTAL_ELEMENT && n.e)?.e
-    ))) ?? -1;
+    const offsetByNextNode = findChildNodeIndex(childNodes, findInsertBefore(node.nN));
+    if (offsetByNextNode !== void 0) {
+      insertBeforeNode = childNodes[offsetByNextNode];
+      offset = offsetByNextNode;
+    } else {
+      offset = findChildNodeIndex(childNodes, next.find((n) => n.tag !== HONO_PORTAL_ELEMENT && n.e)?.e) ?? -1;
+    }
     if (offset === -1) {
       isNew = true;
     }
@@ -299,7 +305,7 @@ const applyNodeObject = (node, container, isNew) => {
       if (childNodes[offset + 1] === el) {
         container.appendChild(childNodes[offset]);
       } else {
-        container.insertBefore(el, childNodes[offset] || null);
+        container.insertBefore(el, insertBeforeNode || childNodes[offset] || null);
       }
     }
   }
@@ -381,12 +387,8 @@ const build = (context, node, children) => {
             if (typeof child.tag === "function") {
               oldChild[import_constants.DOM_STASH][2] = child[import_constants.DOM_STASH][2] || [];
               oldChild[import_constants.DOM_STASH][3] = child[import_constants.DOM_STASH][3];
-              if (!oldChild.f) {
-                const prevPropsKeys = Object.keys(pP);
-                const currentProps = oldChild.props;
-                if (prevPropsKeys.length === Object.keys(currentProps).length && prevPropsKeys.every((k) => k in currentProps && currentProps[k] === pP[k])) {
-                  oldChild.s = true;
-                }
+              if (!oldChild.f && ((oldChild.o || oldChild) === child.o || oldChild.tag[import_constants.DOM_MEMO]?.(pP, oldChild.props))) {
+                oldChild.s = true;
               }
             }
             child = oldChild;
@@ -473,7 +475,8 @@ const buildNode = (node) => {
         key: node.key,
         f: node.f,
         type: node.tag,
-        ref: node.props.ref
+        ref: node.props.ref,
+        o: node.o || node
       };
     }
     if (typeof node.tag === "function") {

package/dist/cjs/middleware/etag/digest.js

@@ -0,0 +1,59 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var digest_exports = {};
+__export(digest_exports, {
+  generateDigest: () => generateDigest
+});
+module.exports = __toCommonJS(digest_exports);
+const mergeBuffers = (buffer1, buffer2) => {
+  if (!buffer1) {
+    return buffer2;
+  }
+  const merged = new Uint8Array(buffer1.byteLength + buffer2.byteLength);
+  merged.set(new Uint8Array(buffer1), 0);
+  merged.set(buffer2, buffer1.byteLength);
+  return merged;
+};
+const generateDigest = async (stream) => {
+  if (!stream || !crypto || !crypto.subtle) {
+    return null;
+  }
+  let result = void 0;
+  const reader = stream.getReader();
+  for (; ; ) {
+    const { value, done } = await reader.read();
+    if (done) {
+      break;
+    }
+    result = await crypto.subtle.digest(
+      {
+        name: "SHA-1"
+      },
+      mergeBuffers(result, value)
+    );
+  }
+  if (!result) {
+    return null;
+  }
+  return Array.prototype.map.call(new Uint8Array(result), (x) => x.toString(16).padStart(2, "0")).join("");
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateDigest
+});

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

@@ -22,7 +22,7 @@ __export(etag_exports, {
   etag: () => etag
 });
 module.exports = __toCommonJS(etag_exports);
-var import_crypto = require("../../utils/crypto");
+var import_digest = require("./digest");
 const RETAINED_304_HEADERS = [
   "cache-control",
   "content-location",
@@ -43,7 +43,10 @@ const etag = (options) => {
     const res = c.res;
     let etag3 = res.headers.get("ETag");
     if (!etag3) {
-      const hash = await (0, import_crypto.sha1)(res.clone().body || "");
+      const hash = await (0, import_digest.generateDigest)(res.clone().body);
+      if (hash === null) {
+        return;
+      }
       etag3 = weak ? `W/"${hash}"` : `"${hash}"`;
     }
     if (etagMatches(etag3, ifNoneMatch)) {

package/dist/cjs/middleware/ip-restriction/index.js

@@ -35,14 +35,14 @@ const buildMatcher = (rules) => {
       functionRules.push(rule);
     } else {
       if (IS_CIDR_NOTATION_REGEX.test(rule)) {
-        const splittedRule = rule.split("/");
-        const addrStr = splittedRule[0];
+        const separatedRule = rule.split("/");
+        const addrStr = separatedRule[0];
         const type2 = (0, import_ipaddr.distinctRemoteAddr)(addrStr);
         if (type2 === void 0) {
           throw new TypeError(`Invalid rule: ${rule}`);
         }
         const isIPv4 = type2 === "IPv4";
-        const prefix = parseInt(splittedRule[1]);
+        const prefix = parseInt(separatedRule[1]);
         if (isIPv4 ? prefix === 32 : prefix === 128) {
           rule = addrStr;
         } else {

package/dist/cjs/middleware/jsx-renderer/index.js

@@ -32,7 +32,8 @@ const createRenderer = (c, Layout, component, options) => (children, props) => {
   const currentLayout = component ? (0, import_jsx.jsx)(
     (props2) => component(props2, c),
     {
-      ...{ Layout, ...props }
+      Layout,
+      ...props
     },
     children
   ) : children;

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

@@ -40,17 +40,19 @@ const time = (start) => {
 };
 const colorStatus = (status) => {
   const colorEnabled = (0, import_color.getColorEnabled)();
-  const out = {
-    7: colorEnabled ? `\x1B[35m${status}\x1B[0m` : `${status}`,
-    5: colorEnabled ? `\x1B[31m${status}\x1B[0m` : `${status}`,
-    4: colorEnabled ? `\x1B[33m${status}\x1B[0m` : `${status}`,
-    3: colorEnabled ? `\x1B[36m${status}\x1B[0m` : `${status}`,
-    2: colorEnabled ? `\x1B[32m${status}\x1B[0m` : `${status}`,
-    1: colorEnabled ? `\x1B[32m${status}\x1B[0m` : `${status}`,
-    0: colorEnabled ? `\x1B[33m${status}\x1B[0m` : `${status}`
-  };
-  const calculateStatus = status / 100 | 0;
-  return out[calculateStatus];
+  if (colorEnabled) {
+    switch (status / 100 | 0) {
+      case 5:
+        return `\x1B[31m${status}\x1B[0m`;
+      case 4:
+        return `\x1B[33m${status}\x1B[0m`;
+      case 3:
+        return `\x1B[36m${status}\x1B[0m`;
+      case 2:
+        return `\x1B[32m${status}\x1B[0m`;
+    }
+  }
+  return `${status}`;
 };
 function log(fn, prefix, method, path, status = 0, elapsed) {
   const out = prefix === "<--" /* Incoming */ ? `${prefix} ${method} ${path}` : `${prefix} ${method} ${path} ${colorStatus(status)} ${elapsed}`;

package/dist/cjs/middleware/timing/timing.js

@@ -34,13 +34,11 @@ const getTime = () => {
 };
 const timing = (config) => {
   const options = {
-    ...{
-      total: true,
-      enabled: true,
-      totalDescription: "Total Response Time",
-      autoEnd: true,
-      crossOrigin: false
-    },
+    total: true,
+    enabled: true,
+    totalDescription: "Total Response Time",
+    autoEnd: true,
+    crossOrigin: false,
     ...config
   };
   return async function timing2(c, next) {

package/dist/cjs/request.js

@@ -23,6 +23,7 @@ __export(request_exports, {
 module.exports = __toCommonJS(request_exports);
 var import_body = require("./utils/body");
 var import_url = require("./utils/url");
+const tryDecodeURIComponent = (str) => (0, import_url.tryDecode)(str, import_url.decodeURIComponent_);
 class HonoRequest {
   raw;
   #validatedData;
@@ -37,25 +38,25 @@ class HonoRequest {
     this.#validatedData = {};
   }
   param(key) {
-    return key ? this.getDecodedParam(key) : this.getAllDecodedParams();
+    return key ? this.#getDecodedParam(key) : this.#getAllDecodedParams();
   }
-  getDecodedParam(key) {
+  #getDecodedParam(key) {
     const paramKey = this.#matchResult[0][this.routeIndex][1][key];
-    const param = this.getParamValue(paramKey);
-    return param ? /\%/.test(param) ? (0, import_url.decodeURIComponent_)(param) : param : void 0;
+    const param = this.#getParamValue(paramKey);
+    return param ? /\%/.test(param) ? tryDecodeURIComponent(param) : param : void 0;
   }
-  getAllDecodedParams() {
+  #getAllDecodedParams() {
     const decoded = {};
     const keys = Object.keys(this.#matchResult[0][this.routeIndex][1]);
     for (const key of keys) {
-      const value = this.getParamValue(this.#matchResult[0][this.routeIndex][1][key]);
+      const value = this.#getParamValue(this.#matchResult[0][this.routeIndex][1][key]);
       if (value && typeof value === "string") {
-        decoded[key] = /\%/.test(value) ? (0, import_url.decodeURIComponent_)(value) : value;
+        decoded[key] = /\%/.test(value) ? tryDecodeURIComponent(value) : value;
       }
     }
     return decoded;
   }
-  getParamValue(paramKey) {
+  #getParamValue(paramKey) {
     return this.#matchResult[1] ? this.#matchResult[1][paramKey] : paramKey;
   }
   query(key) {
@@ -77,7 +78,7 @@ class HonoRequest {
   async parseBody(options) {
     return this.bodyCache.parsedBody ??= await (0, import_body.parseBody)(this, options);
   }
-  cachedBody = (key) => {
+  #cachedBody = (key) => {
     const { bodyCache, raw } = this;
     const cachedBody = bodyCache[key];
     if (cachedBody) {
@@ -95,19 +96,19 @@ class HonoRequest {
     return bodyCache[key] = raw[key]();
   };
   json() {
-    return this.cachedBody("json");
+    return this.#cachedBody("json");
   }
   text() {
-    return this.cachedBody("text");
+    return this.#cachedBody("text");
   }
   arrayBuffer() {
-    return this.cachedBody("arrayBuffer");
+    return this.#cachedBody("arrayBuffer");
   }
   blob() {
-    return this.cachedBody("blob");
+    return this.#cachedBody("blob");
   }
   formData() {
-    return this.cachedBody("formData");
+    return this.#cachedBody("formData");
   }
   addValidatedData(target, data) {
     this.#validatedData[target] = data;

package/dist/cjs/router/pattern-router/router.js

@@ -24,7 +24,7 @@ module.exports = __toCommonJS(router_exports);
 var import_router = require("../../router");
 class PatternRouter {
   name = "PatternRouter";
-  routes = [];
+  #routes = [];
   add(method, path, handler) {
     const endsWithWildcard = path[path.length - 1] === "*";
     if (endsWithWildcard) {
@@ -46,12 +46,12 @@ class PatternRouter {
     } catch {
       throw new import_router.UnsupportedPathError();
     }
-    this.routes.push([re, method, handler]);
+    this.#routes.push([re, method, handler]);
   }
   match(method, path) {
     const handlers = [];
-    for (let i = 0, len = this.routes.length; i < len; i++) {
-      const [pattern, routeMethod, handler] = this.routes[i];
+    for (let i = 0, len = this.#routes.length; i < len; i++) {
+      const [pattern, routeMethod, handler] = this.#routes[i];
       if (routeMethod === method || routeMethod === import_router.METHOD_NAME_ALL) {
         const match = pattern.exec(path);
         if (match) {

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

@@ -173,7 +173,7 @@ class RegExpRouter {
   }
   match(method, path) {
     clearWildcardRegExpCache();
-    const matchers = this.buildAllMatchers();
+    const matchers = this.#buildAllMatchers();
     this.match = (method2, path2) => {
       const matcher = matchers[method2] || matchers[import_router.METHOD_NAME_ALL];
       const staticMatch = matcher[2][path2];
@@ -189,15 +189,15 @@ class RegExpRouter {
     };
     return this.match(method, path);
   }
-  buildAllMatchers() {
+  #buildAllMatchers() {
     const matchers = /* @__PURE__ */ Object.create(null);
-    [...Object.keys(this.routes), ...Object.keys(this.middleware)].forEach((method) => {
-      matchers[method] ||= this.buildMatcher(method);
+    Object.keys(this.routes).concat(Object.keys(this.middleware)).forEach((method) => {
+      matchers[method] ||= this.#buildMatcher(method);
     });
     this.middleware = this.routes = void 0;
     return matchers;
   }
-  buildMatcher(method) {
+  #buildMatcher(method) {
     const routes = [];
     let hasOwnRoute = method === import_router.METHOD_NAME_ALL;
     [this.middleware, this.routes].forEach((r) => {

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

@@ -63,11 +63,11 @@ class Trie {
     const indexReplacementMap = [];
     const paramReplacementMap = [];
     regexp = regexp.replace(/#(\d+)|@(\d+)|\.\*\$/g, (_, handlerIndex, paramIndex) => {
-      if (typeof handlerIndex !== "undefined") {
+      if (handlerIndex !== void 0) {
         indexReplacementMap[++captureIndex] = Number(handlerIndex);
         return "$()";
       }
-      if (typeof paramIndex !== "undefined") {
+      if (paramIndex !== void 0) {
         paramReplacementMap[Number(paramIndex)] = ++captureIndex;
         return "";
       }

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

@@ -75,7 +75,7 @@ class Node {
     curNode.methods.push(m);
     return curNode;
   }
-  gHSets(node, method, nodeParams, params) {
+  #gHSets(node, method, nodeParams, params) {
     const handlerSets = [];
     for (let i = 0, len = node.methods.length; i < len; i++) {
       const m = node.methods[i];
@@ -112,10 +112,10 @@ class Node {
           if (isLast) {
             if (nextNode.children["*"]) {
               handlerSets.push(
-                ...this.gHSets(nextNode.children["*"], method, node.params, /* @__PURE__ */ Object.create(null))
+                ...this.#gHSets(nextNode.children["*"], method, node.params, /* @__PURE__ */ Object.create(null))
               );
             }
-            handlerSets.push(...this.gHSets(nextNode, method, node.params, /* @__PURE__ */ Object.create(null)));
+            handlerSets.push(...this.#gHSets(nextNode, method, node.params, /* @__PURE__ */ Object.create(null)));
           } else {
             tempNodes.push(nextNode);
           }
@@ -126,7 +126,7 @@ class Node {
           if (pattern === "*") {
             const astNode = node.children["*"];
             if (astNode) {
-              handlerSets.push(...this.gHSets(astNode, method, node.params, /* @__PURE__ */ Object.create(null)));
+              handlerSets.push(...this.#gHSets(astNode, method, node.params, /* @__PURE__ */ Object.create(null)));
               tempNodes.push(astNode);
             }
             continue;
@@ -139,16 +139,18 @@ class Node {
           const restPathString = parts.slice(i).join("/");
           if (matcher instanceof RegExp && matcher.test(restPathString)) {
             params[name] = restPathString;
-            handlerSets.push(...this.gHSets(child, method, node.params, params));
+            handlerSets.push(...this.#gHSets(child, method, node.params, params));
             continue;
           }
           if (matcher === true || matcher.test(part)) {
             if (typeof key === "string") {
               params[name] = part;
               if (isLast) {
-                handlerSets.push(...this.gHSets(child, method, params, node.params));
+                handlerSets.push(...this.#gHSets(child, method, params, node.params));
                 if (child.children["*"]) {
-                  handlerSets.push(...this.gHSets(child.children["*"], method, params, node.params));
+                  handlerSets.push(
+                    ...this.#gHSets(child.children["*"], method, params, node.params)
+                  );
                 }
               } else {
                 child.params = params;

package/dist/cjs/utils/color.js

@@ -23,7 +23,7 @@ __export(color_exports, {
 module.exports = __toCommonJS(color_exports);
 function getColorEnabled() {
   const { process, Deno } = globalThis;
-  const isNoColor = typeof Deno?.noColor === "boolean" ? Deno.noColor : typeof process !== "undefined" ? "NO_COLOR" in process?.env : false;
+  const isNoColor = typeof Deno?.noColor === "boolean" ? Deno.noColor : process !== void 0 ? "NO_COLOR" in process?.env : false;
   return !isNoColor;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/utils/cookie.js

@@ -50,16 +50,20 @@ const verifySignature = async (base64Signature, value, secret) => {
 const validCookieNameRegEx = /^[\w!#$%&'*.^`|~+-]+$/;
 const validCookieValueRegEx = /^[ !#-:<-[\]-~]*$/;
 const parse = (cookie, name) => {
+  if (name && cookie.indexOf(name) === -1) {
+    return {};
+  }
   const pairs = cookie.trim().split(";");
-  return pairs.reduce((parsedCookie, pairStr) => {
+  const parsedCookie = {};
+  for (let pairStr of pairs) {
     pairStr = pairStr.trim();
     const valueStartPos = pairStr.indexOf("=");
     if (valueStartPos === -1) {
-      return parsedCookie;
+      continue;
     }
     const cookieName = pairStr.substring(0, valueStartPos).trim();
     if (name && name !== cookieName || !validCookieNameRegEx.test(cookieName)) {
-      return parsedCookie;
+      continue;
     }
     let cookieValue = pairStr.substring(valueStartPos + 1).trim();
     if (cookieValue.startsWith('"') && cookieValue.endsWith('"')) {
@@ -67,9 +71,12 @@ const parse = (cookie, name) => {
     }
     if (validCookieValueRegEx.test(cookieValue)) {
       parsedCookie[cookieName] = (0, import_url.decodeURIComponent_)(cookieValue);
+      if (name) {
+        break;
+      }
     }
-    return parsedCookie;
-  }, {});
+  }
+  return parsedCookie;
 };
 const parseSigned = async (cookie, secret, name) => {
   const parsedCookie = {};
@@ -111,7 +118,7 @@ const _serialize = (name, value, opt = {}) => {
         "Cookies Max-Age SHOULD NOT be greater than 400 days (34560000 seconds) in duration."
       );
     }
-    cookie += `; Max-Age=${Math.floor(opt.maxAge)}`;
+    cookie += `; Max-Age=${opt.maxAge | 0}`;
   }
   if (opt.domain && opt.prefix !== "host") {
     cookie += `; Domain=${opt.domain}`;

package/dist/cjs/utils/crypto.js

@@ -41,15 +41,6 @@ const md5 = async (data) => {
 };
 const createHash = async (data, algorithm) => {
   let sourceBuffer;
-  if (data instanceof ReadableStream) {
-    let body = "";
-    const reader = data.getReader();
-    await reader?.read().then(async (chuck) => {
-      const value = await createHash(chuck.value || "", algorithm);
-      body += value;
-    });
-    return body;
-  }
   if (ArrayBuffer.isView(data) || data instanceof ArrayBuffer) {
     sourceBuffer = data;
   } else {

package/dist/cjs/utils/jwt/jwt.js

@@ -56,7 +56,7 @@ const verify = async (token, publicKey, alg = "HS256") => {
   if (!isTokenHeader(header)) {
     throw new import_types.JwtHeaderInvalid(header);
   }
-  const now = Math.floor(Date.now() / 1e3);
+  const now = Date.now() / 1e3 | 0;
   if (payload.nbf && payload.nbf > now) {
     throw new import_types.JwtTokenNotBefore(token);
   }

package/dist/cjs/utils/mime.js

@@ -42,7 +42,7 @@ const getExtension = (mimeType) => {
     }
   }
 };
-const baseMimes = {
+const _baseMimes = {
   aac: "audio/aac",
   avi: "video/x-msvideo",
   avif: "image/avif",
@@ -99,6 +99,7 @@ const baseMimes = {
   gltf: "model/gltf+json",
   glb: "model/gltf-binary"
 };
+const baseMimes = _baseMimes;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getExtension,

package/dist/cjs/utils/url.js

@@ -28,7 +28,8 @@ __export(url_exports, {
   getQueryStrings: () => getQueryStrings,
   mergePath: () => mergePath,
   splitPath: () => splitPath,
-  splitRoutingPath: () => splitRoutingPath
+  splitRoutingPath: () => splitRoutingPath,
+  tryDecode: () => tryDecode
 });
 module.exports = __toCommonJS(url_exports);
 const splitPath = (path) => {
@@ -82,19 +83,20 @@ const getPattern = (label) => {
   }
   return null;
 };
-const tryDecodeURI = (str) => {
+const tryDecode = (str, decoder) => {
   try {
-    return decodeURI(str);
+    return decoder(str);
   } catch {
     return str.replace(/(?:%[0-9A-Fa-f]{2})+/g, (match) => {
       try {
-        return decodeURI(match);
+        return decoder(match);
       } catch {
         return match;
       }
     });
   }
 };
+const tryDecodeURI = (str) => tryDecode(str, decodeURI);
 const getPath = (request) => {
   const url = request.url;
   const start = url.indexOf("/", 8);
@@ -175,7 +177,7 @@ const _decodeURI = (value) => {
   if (value.indexOf("+") !== -1) {
     value = value.replace(/\+/g, " ");
   }
-  return /%/.test(value) ? decodeURIComponent_(value) : value;
+  return value.indexOf("%") !== -1 ? decodeURIComponent_(value) : value;
 };
 const _getQueryParam = (url, key, multiple) => {
   let encoded;
@@ -258,5 +260,6 @@ const decodeURIComponent_ = decodeURIComponent;
   getQueryStrings,
   mergePath,
   splitPath,
-  splitRoutingPath
+  splitRoutingPath,
+  tryDecode
 });

package/dist/client/client.js

@@ -65,8 +65,8 @@ var ClientRequestImpl = class {
     }
     let methodUpperCase = this.method.toUpperCase();
     const headerValues = {
-      ...args?.header ?? {},
-      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers ? opt.headers : {}
+      ...args?.header,
+      ...typeof opt?.headers === "function" ? await opt.headers() : opt?.headers
     };
     if (args?.cookie) {
       const cookies = [];
@@ -157,7 +157,7 @@ var hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
   const req = new ClientRequestImpl(url, method);
   if (method) {
     options ??= {};
-    const args = deepMerge(options, { ...opts.args[1] ?? {} });
+    const args = deepMerge(options, { ...opts.args[1] });
     return req.fetch(opts.args[0], args);
   }
   return req;

package/dist/compose.js

@@ -3,6 +3,7 @@ import { Context } from "./context.js";
 var compose = (middleware, onError, onNotFound) => {
   return (context, next) => {
     let index = -1;
+    const isContext = context instanceof Context;
     return dispatch(0);
     async function dispatch(i) {
       if (i <= index) {
@@ -14,14 +15,14 @@ var compose = (middleware, onError, onNotFound) => {
       let handler;
       if (middleware[i]) {
         handler = middleware[i][0][0];
-        if (context instanceof Context) {
+        if (isContext) {
           context.req.routeIndex = i;
         }
       } else {
         handler = i === middleware.length && next || void 0;
       }
       if (!handler) {
-        if (context instanceof Context && context.finalized === false && onNotFound) {
+        if (isContext && context.finalized === false && onNotFound) {
           res = await onNotFound(context);
         }
       } else {
@@ -30,7 +31,7 @@ var compose = (middleware, onError, onNotFound) => {
             return dispatch(i + 1);
           });
         } catch (err) {
-          if (err instanceof Error && context instanceof Context && onError) {
+          if (err instanceof Error && isContext && onError) {
             context.error = err;
             res = await onError(err, context);
             isError = true;