hono 4.12.9 → 4.12.12

package/dist/jsx/dom/css.js

@@ -100,22 +100,29 @@ var createCssJsxDomObjects = ({ id }) => {
   });
   return [cssObject, Style2];
 };
-var createCssContext = ({ id }) => {
+var createCssContext = ({
+  id,
+  classNameSlug,
+  onInvalidSlug
+}) => {
   const [cssObject, Style2] = createCssJsxDomObjects({ id });
   const newCssClassNameObject = (cssClassName) => {
     cssClassName.toString = cssObject.toString;
     return cssClassName;
   };
   const css2 = (strings, ...values) => {
-    return newCssClassNameObject(cssCommon(strings, values));
+    return newCssClassNameObject(cssCommon(strings, values, classNameSlug, onInvalidSlug));
   };
   const cx2 = (...args) => {
     args = cxCommon(args);
     return css2(Array(args.length).fill(""), ...args);
   };
-  const keyframes2 = keyframesCommon;
+  const keyframes2 = (strings, ...values) => keyframesCommon(strings, values, classNameSlug, onInvalidSlug);
   const viewTransition2 = ((strings, ...values) => {
-    return newCssClassNameObject(viewTransitionCommon(strings, values));
+    return newCssClassNameObject(
+      viewTransitionCommon(strings, values, classNameSlug, onInvalidSlug)
+      // eslint-disable-line @typescript-eslint/no-explicit-any
+    );
   });
   return {
     css: css2,

package/dist/jsx/dom/render.js

@@ -45,6 +45,16 @@ var getEventSpec = (key) => {
 };
 var toAttributeName = (element, key) => nameSpaceContext && element instanceof SVGElement && /[A-Z]/.test(key) && (key in element.style || // Presentation attributes are findable in style object. "clip-path", "font-size", "stroke-width", etc.
 key.match(/^(?:o|pai|str|u|ve)/)) ? key.replace(/([A-Z])/g, "-$1").toLowerCase() : key;
+var normalizeFormValue = (value) => value === null || value === void 0 || value === false ? null : value;
+var applySelectValue = (select, props) => {
+  if (!("value" in props)) {
+    return;
+  }
+  select.value = normalizeFormValue(props["value"]);
+  if (!select.multiple && select.selectedIndex === -1) {
+    select.selectedIndex = 0;
+  }
+};
 var applyProps = (container, attributes, oldAttributes) => {
   attributes ||= {};
   for (let key in attributes) {
@@ -88,18 +98,14 @@ var applyProps = (container, attributes, oldAttributes) => {
       } else {
         if (key === "value") {
           const nodeName = container.nodeName;
-          if (nodeName === "INPUT" || nodeName === "TEXTAREA" || nodeName === "SELECT") {
+          if (nodeName === "SELECT") {
+            continue;
+          } else if (nodeName === "INPUT" || nodeName === "TEXTAREA") {
             ;
-            container.value = value === null || value === void 0 || value === false ? null : value;
+            container.value = normalizeFormValue(value);
             if (nodeName === "TEXTAREA") {
               container.textContent = value;
               continue;
-            } else if (nodeName === "SELECT") {
-              if (container.selectedIndex === -1) {
-                ;
-                container.selectedIndex = 0;
-              }
-              continue;
             }
           }
         } else if (key === "checked" && container.nodeName === "INPUT" || key === "selected" && container.nodeName === "OPTION") {
@@ -268,6 +274,9 @@ var applyNodeObject = (node, container, isNew) => {
         el = child.e ||= child.n ? document.createElementNS(child.n, child.tag) : document.createElement(child.tag);
         applyProps(el, child.props, child.pP);
         applyNodeObject(child, el, isNewLocal);
+        if (child.tag === "select") {
+          applySelectValue(el, child.props);
+        }
       }
     }
     if (child.tag === HONO_PORTAL_ELEMENT) {

package/dist/middleware/compress/index.js

@@ -24,6 +24,10 @@ var compress = (options) => {
     ctx.res = new Response(ctx.res.body.pipeThrough(stream), ctx.res);
     ctx.res.headers.delete("Content-Length");
     ctx.res.headers.set("Content-Encoding", encoding);
+    const etag = ctx.res.headers.get("ETag");
+    if (etag && !etag.startsWith("W/")) {
+      ctx.res.headers.set("ETag", `W/${etag}`);
+    }
   };
 };
 var shouldCompress = (res) => {

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

@@ -1,10 +1,12 @@
 // src/middleware/ip-restriction/index.ts
 import { HTTPException } from "../../http-exception.js";
 import {
+  convertIPv4MappedIPv6ToIPv4,
   convertIPv4ToBinary,
   convertIPv6BinaryToString,
   convertIPv6ToBinary,
-  distinctRemoteAddr
+  distinctRemoteAddr,
+  isIPv4MappedIPv6
 } from "../../utils/ipaddr.js";
 var IS_CIDR_NOTATION_REGEX = /\/[0-9]{0,3}$/;
 var buildMatcher = (rules) => {
@@ -24,12 +26,17 @@ var buildMatcher = (rules) => {
         if (type2 === void 0) {
           throw new TypeError(`Invalid rule: ${rule}`);
         }
-        const isIPv4 = type2 === "IPv4";
-        const prefix = parseInt(separatedRule[1]);
+        let isIPv4 = type2 === "IPv4";
+        let prefix = parseInt(separatedRule[1]);
         if (isIPv4 ? prefix === 32 : prefix === 128) {
           rule = addrStr;
         } else {
-          const addr = (isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(addrStr);
+          let addr = (isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(addrStr);
+          if (type2 === "IPv6" && isIPv4MappedIPv6(addr) && prefix >= 96) {
+            isIPv4 = true;
+            addr = convertIPv4MappedIPv6ToIPv4(addr);
+            prefix -= 96;
+          }
           const mask = (1n << BigInt(prefix)) - 1n << BigInt((isIPv4 ? 32 : 128) - prefix);
           cidrRules.push([isIPv4, addr & mask, mask]);
           continue;
@@ -39,21 +46,38 @@ var buildMatcher = (rules) => {
       if (type === void 0) {
         throw new TypeError(`Invalid rule: ${rule}`);
       }
-      staticRules.add(
-        type === "IPv4" ? rule : convertIPv6BinaryToString(convertIPv6ToBinary(rule))
-        // normalize IPv6 address (e.g. 0000:0000:0000:0000:0000:0000:0000:0001 => ::1)
-      );
+      if (type === "IPv4") {
+        staticRules.add(rule);
+        staticRules.add(`::ffff:${rule}`);
+      } else {
+        const ipv6binary = convertIPv6ToBinary(rule);
+        const ipv6Addr = convertIPv6BinaryToString(ipv6binary);
+        staticRules.add(ipv6Addr);
+        if (isIPv4MappedIPv6(ipv6binary)) {
+          staticRules.add(ipv6Addr.substring(7));
+        }
+      }
     }
   }
   return (remote) => {
     if (staticRules.has(remote.addr)) {
       return true;
     }
+    const remoteAddr = remote.binaryAddr ||= (remote.isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(remote.addr);
+    const remoteIPv4Addr = remote.isIPv4 || isIPv4MappedIPv6(remoteAddr) ? remote.isIPv4 ? remoteAddr : convertIPv4MappedIPv6ToIPv4(remoteAddr) : void 0;
     for (const [isIPv4, addr, mask] of cidrRules) {
-      if (isIPv4 !== remote.isIPv4) {
+      if (isIPv4) {
+        if (remoteIPv4Addr === void 0) {
+          continue;
+        }
+        if ((remoteIPv4Addr & mask) === addr) {
+          return true;
+        }
+        continue;
+      }
+      if (remote.isIPv4) {
         continue;
       }
-      const remoteAddr = remote.binaryAddr ||= (isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(remote.addr);
       if ((remoteAddr & mask) === addr) {
         return true;
       }

package/dist/middleware/serve-static/index.js

@@ -24,7 +24,7 @@ var serveStatic = (options) => {
     } else {
       try {
         filename = tryDecodeURI(c.req.path);
-        if (/(?:^|[\/\\])\.\.(?:$|[\/\\])/.test(filename)) {
+        if (/(?:^|[\/\\])\.{1,2}(?:$|[\/\\])|[\/\\]{2,}/.test(filename)) {
           throw new Error();
         }
       } catch {