html-validate 10.3.0 → 10.4.0

package/dist/esm/elements.js

@@ -4,7 +4,8 @@ const {
   allowedIfAttributeIsPresent,
   allowedIfAttributeIsAbsent,
   allowedIfAttributeHasValue,
-  allowedIfParentIsPresent
+  allowedIfParentIsPresent,
+  hasKeyword
 } = metadataHelper;
 const validId = "/\\S+/";
 const ReferrerPolicy = [
@@ -97,7 +98,9 @@ var html5 = {
       return node.hasAttribute("href");
     },
     phrasing: true,
-    interactive: true,
+    interactive(node) {
+      return node.hasAttribute("href");
+    },
     transparent: true,
     attributes: {
       charset: {
@@ -223,7 +226,12 @@ var html5 = {
         deprecated: true
       }
     },
-    permittedDescendants: [{ exclude: "@interactive" }],
+    permittedDescendants: [
+      /* "Transparent, but there must be no interactive content descendant, a
+       * element descendant, or descendant with the tabindex attribute
+       * specified." */
+      { exclude: ["@interactive", "a"] }
+    ],
     aria: {
       implicitRole(node) {
         return node.hasAttribute("href") ? "link" : "generic";
@@ -1650,9 +1658,46 @@ var html5 = {
         boolean: true
       },
       href: {
-        required: true,
+        required(node) {
+          if (node.hasAttribute("imagesrcset")) {
+            return false;
+          }
+          return `{{ tagName }} is missing required "href" or "imagesrcset" attribute`;
+        },
         enum: ["/.+/"]
       },
+      imagesrcset: {
+        allowed(node) {
+          const rel = node.getAttribute("rel");
+          const as = node.getAttribute("as");
+          if (!rel || typeof rel === "string" && !hasKeyword(rel, "preload")) {
+            return `"rel" attribute must be "preload"`;
+          }
+          if (!as || typeof as === "string" && as !== "image") {
+            return `"as" attribute must be "image"`;
+          }
+          return null;
+        }
+      },
+      imagesizes: {
+        allowed(node) {
+          const rel = node.getAttribute("rel");
+          const as = node.getAttribute("as");
+          if (!rel || typeof rel === "string" && !hasKeyword(rel, "preload")) {
+            return `"rel" attribute must be "preload"`;
+          }
+          if (!as || typeof as === "string" && as !== "image") {
+            return `"as" attribute must be "image"`;
+          }
+          return null;
+        },
+        required(node) {
+          if (node.hasAttribute("imagesrcset")) {
+            return `{{ tagName }} requires "{{ attr }}" attribute when "imagesrcset" attribute is set`;
+          }
+          return false;
+        }
+      },
       integrity: {
         allowed: allowedIfAttributeHasValue("rel", ["stylesheet", "preload", "modulepreload"]),
         enum: ["/.+/"]
@@ -2284,6 +2329,14 @@ var html5 = {
         return "combobox";
       }
     },
+    /* "Zero or one button elements if the select is a drop-down box, followed
+     * by zero or more select element inner content element."
+     *
+     * "The following are select element inner content elements:
+     * option, optgroup, hr, script-supporting elements, noscript, div"
+     *
+     * https://html.spec.whatwg.org/multipage/form-elements.html#the-select-element
+     */
     permittedContent: [
       "@script",
       "button?",
@@ -2291,9 +2344,10 @@ var html5 = {
       "datafld",
       "dataformatas",
       "option",
-      "optgroup"
+      "optgroup",
+      "hr"
     ],
-    permittedOrder: ["button", "option, optgroup"]
+    permittedOrder: ["button", "option, optgroup, hr"]
   },
   selectedcontent: {
     phrasing: true,