html-validate 9.2.1 → 9.3.0

package/dist/es/core.js

@@ -436,7 +436,7 @@ class UserError extends NestedError {
    */
   /* istanbul ignore next: default implementation */
   prettyFormat() {
-    return undefined;
+    return void 0;
   }
 }
 
@@ -943,7 +943,7 @@ const ajvRegexpValidate = function(data, dataCxt) {
     ajvRegexpValidate.errors = [
       {
         instancePath: dataCxt?.instancePath,
-        schemaPath: undefined,
+        schemaPath: void 0,
         keyword: "type",
         message: "should be a regular expression",
         params: {
@@ -970,7 +970,7 @@ const ajvFunctionValidate = function(data, dataCxt) {
           /* istanbul ignore next */
           dataCxt?.instancePath
         ),
-        schemaPath: undefined,
+        schemaPath: void 0,
         keyword: "type",
         message: "should be a function",
         params: {
@@ -1025,7 +1025,7 @@ function isSet(value) {
   return typeof value !== "undefined";
 }
 function flag(value) {
-  return value ? true : undefined;
+  return value ? true : void 0;
 }
 function stripUndefined(src) {
   const entries = Object.entries(src).filter(([, value]) => isSet(value));
@@ -1035,8 +1035,8 @@ function migrateSingleAttribute(src, key) {
   const result = {};
   result.deprecated = flag(src.deprecatedAttributes?.includes(key));
   result.required = flag(src.requiredAttributes?.includes(key));
-  result.omit = undefined;
-  const attr = src.attributes ? src.attributes[key] : undefined;
+  result.omit = void 0;
+  const attr = src.attributes ? src.attributes[key] : void 0;
   if (typeof attr === "undefined") {
     return stripUndefined(result);
   }
@@ -1092,7 +1092,7 @@ function migrateElement(src) {
   const result = {
     ...src,
     ...{
-      formAssociated: undefined
+      formAssociated: void 0
     },
     attributes: migrateAttributes(src),
     textContent: src.textContent,
@@ -1630,7 +1630,7 @@ class DOMNode {
     if (this.cache) {
       return this.cache.get(key);
     } else {
-      return undefined;
+      return void 0;
     }
   }
   cacheSet(key, value) {
@@ -1890,7 +1890,7 @@ function parseCombinator(combinator, pattern) {
     return 5 /* SCOPE */;
   }
   switch (combinator) {
-    case undefined:
+    case void 0:
     case null:
     case "":
       return 1 /* DESCENDANT */;
@@ -2122,7 +2122,7 @@ class AttrMatcher extends Matcher {
     const attr = node.getAttribute(this.key, true);
     return attr.some((cur) => {
       switch (this.op) {
-        case undefined:
+        case void 0:
           return true;
         /* attribute exists */
         case "=":
@@ -2595,7 +2595,7 @@ class HtmlElement extends DOMNode {
    */
   get role() {
     const cached = this.cacheGet(ROLE);
-    if (cached !== undefined) {
+    if (cached !== void 0) {
       return cached;
     }
     const role = this.getAttribute("role");
@@ -2653,7 +2653,7 @@ class HtmlElement extends DOMNode {
    */
   get tabIndex() {
     const cached = this.cacheGet(TABINDEX);
-    if (cached !== undefined) {
+    if (cached !== void 0) {
       return cached;
     }
     const tabindex = this.getAttribute("tabindex");
@@ -4598,7 +4598,7 @@ const MATCH_DOCTYPE_OPEN = /^<!(DOCTYPE)\s/i;
 const MATCH_DOCTYPE_VALUE = /^[^>]+/;
 const MATCH_DOCTYPE_CLOSE = /^>/;
 const MATCH_XML_TAG = /^<\?xml.*?\?>\s+/;
-const MATCH_TAG_OPEN = /^<(\/?)([a-zA-Z0-9\-:]+)/;
+const MATCH_TAG_OPEN = /^<(\/?)([a-zA-Z0-9\-_:]+)/;
 const MATCH_TAG_CLOSE = /^\/?>/;
 const MATCH_TEXT = /^[^]*?(?=(?:[ \t]*(?:\r\n|\r|\n)|<[^ ]|$))/;
 const MATCH_TEMPLATING = /^(?:<%.*?%>|<\?.*?\?>|<\$.*?\$>)/s;
@@ -6598,7 +6598,7 @@ const defaults$j = {
   minInitialRank: "h1",
   sectioningRoots: ["dialog", '[role="dialog"]', '[role="alertdialog"]']
 };
-function isRelevant$6(event) {
+function isRelevant$5(event) {
   const node = event.target;
   return Boolean(node.meta?.heading);
 }
@@ -6667,7 +6667,7 @@ class HeadingLevel extends Rule {
     };
   }
   setup() {
-    this.on("tag:start", isRelevant$6, (event) => {
+    this.on("tag:start", isRelevant$5, (event) => {
       this.onTagStart(event);
     });
     this.on("tag:ready", (event) => {
@@ -7323,7 +7323,7 @@ class MapDupName extends Rule {
   }
 }
 
-function isRelevant$5(event) {
+function isRelevant$4(event) {
   return event.target.is("map");
 }
 function hasStaticValue(attr) {
@@ -7337,7 +7337,7 @@ class MapIdName extends Rule {
     };
   }
   setup() {
-    this.on("tag:ready", isRelevant$5, (event) => {
+    this.on("tag:ready", isRelevant$4, (event) => {
       const { target } = event;
       const id = target.getAttribute("id");
       const name = target.getAttribute("name");
@@ -7461,7 +7461,7 @@ const abstractRoles = [
   "widget",
   "window"
 ];
-function isRelevant$4(event) {
+function isRelevant$3(event) {
   return event.key === "role";
 }
 class NoAbstractRole extends Rule {
@@ -7480,7 +7480,7 @@ class NoAbstractRole extends Rule {
     };
   }
   setup() {
-    this.on("attr", isRelevant$4, (event) => {
+    this.on("attr", isRelevant$3, (event) => {
       const roles = event.value;
       if (!roles || roles instanceof DynamicValue) {
         return;
@@ -7681,17 +7681,25 @@ class NoDupID extends Rule {
   setup() {
     this.on("dom:ready", (event) => {
       const { document } = event;
+      const rootExisting = getExisting(document.root, document.root);
+      const useRootExisting = !document.querySelector("template");
       const elements = document.querySelectorAll("[id]");
-      const relevant = elements.filter(isRelevant$3);
-      for (const el of relevant) {
+      for (const el of elements) {
         const attr = el.getAttribute("id");
-        if (!attr?.value) {
+        if (!attr) {
+          continue;
+        }
+        if (!attr.value) {
+          continue;
+        }
+        if (attr.isDynamic) {
           continue;
         }
         const id = attr.value.toString();
-        const existing = getExisting(el, document.root);
+        const existing = useRootExisting ? rootExisting : getExisting(el, document.root);
         if (existing.has(id)) {
           this.report(el, `Duplicate ID "${id}"`, attr.valueLocation);
+          continue;
         }
         existing.add(id);
       }
@@ -7708,19 +7716,6 @@ function getExisting(element, root) {
     return group.cacheSet(CACHE_KEY, existing2);
   }
 }
-function isRelevant$3(element) {
-  const attr = element.getAttribute("id");
-  if (!attr) {
-    return false;
-  }
-  if (!attr.value) {
-    return false;
-  }
-  if (attr.isDynamic) {
-    return false;
-  }
-  return true;
-}
 
 function isRelevant$2(event) {
   return event.target.is("button");
@@ -9961,14 +9956,15 @@ class ValidID extends Rule {
   }
   documentation(context) {
     const { relaxed } = this.options;
-    const message = this.messages[context].replace("id", "ID").replace(/^(.)/, (m) => m.toUpperCase());
+    const { kind, id } = context;
+    const message = this.messages[kind].replace(`"{{ id }}"`, "`{{ id }}`").replace("id", "ID").replace(/^(.)/, (m) => m.toUpperCase());
     const relaxedDescription = relaxed ? [] : [
       "  - ID must begin with a letter",
       "  - ID must only contain letters, digits, `-` and `_`"
     ];
     return {
       description: [
-        `${message}.`,
+        `${interpolate(message, { id })}.`,
         "",
         "Under the current configuration the following rules are applied:",
         "",
@@ -9986,13 +9982,13 @@ class ValidID extends Rule {
         return;
       }
       if (value === "") {
-        const context = 1 /* EMPTY */;
-        this.report(event.target, this.messages[context], event.location, context);
+        const context = { kind: 1 /* EMPTY */, id: value };
+        this.report(event.target, this.messages[context.kind], event.location, context);
         return;
       }
       if (value.match(/\s/)) {
-        const context = 2 /* WHITESPACE */;
-        this.report(event.target, this.messages[context], event.valueLocation, context);
+        const context = { kind: 2 /* WHITESPACE */, id: value };
+        this.report(event.target, this.messages[context.kind], event.valueLocation, context);
         return;
       }
       const { relaxed } = this.options;
@@ -10000,22 +9996,22 @@ class ValidID extends Rule {
         return;
       }
       if (value.match(/^[^\p{L}]/u)) {
-        const context = 3 /* LEADING_CHARACTER */;
-        this.report(event.target, this.messages[context], event.valueLocation, context);
+        const context = { kind: 3 /* LEADING_CHARACTER */, id: value };
+        this.report(event.target, this.messages[context.kind], event.valueLocation, context);
         return;
       }
       if (value.match(/[^\p{L}\p{N}_-]/u)) {
-        const context = 4 /* DISALLOWED_CHARACTER */;
-        this.report(event.target, this.messages[context], event.valueLocation, context);
+        const context = { kind: 4 /* DISALLOWED_CHARACTER */, id: value };
+        this.report(event.target, this.messages[context.kind], event.valueLocation, context);
       }
     });
   }
   get messages() {
     return {
-      [1 /* EMPTY */]: "element id must not be empty",
-      [2 /* WHITESPACE */]: "element id must not contain whitespace",
-      [3 /* LEADING_CHARACTER */]: "element id must begin with a letter",
-      [4 /* DISALLOWED_CHARACTER */]: "element id must only contain letters, digits, dash and underscore characters"
+      [1 /* EMPTY */]: `element id "{{ id }}" must not be empty`,
+      [2 /* WHITESPACE */]: `element id "{{ id }}" must not contain whitespace`,
+      [3 /* LEADING_CHARACTER */]: `element id "{{ id }}" must begin with a letter`,
+      [4 /* DISALLOWED_CHARACTER */]: `element id "{{ id }}" must only contain letters, digits, dash and underscore characters`
     };
   }
   isRelevant(event) {
@@ -10080,29 +10076,41 @@ class VoidStyle extends Rule {
     };
   }
   setup() {
+    const { style } = this;
+    const validateStyle = {
+      [1 /* AlwaysOmit */]: this.validateOmitted.bind(this),
+      [2 /* AlwaysSelfclose */]: this.validateSelfClosed.bind(this)
+    }[style];
     this.on("tag:end", (event) => {
       const active = event.previous;
       if (active.meta) {
-        this.validateActive(active);
+        validateStyle(active);
       }
     });
   }
-  validateActive(node) {
+  validateOmitted(node) {
     if (!node.voidElement) {
       return;
     }
-    if (this.shouldBeOmitted(node)) {
-      this.reportError(
-        node,
-        `Expected omitted end tag <${node.tagName}> instead of self-closing element <${node.tagName}/>`
-      );
+    if (node.closed !== NodeClosed.VoidSelfClosed) {
+      return;
     }
-    if (this.shouldBeSelfClosed(node)) {
-      this.reportError(
-        node,
-        `Expected self-closing element <${node.tagName}/> instead of omitted end-tag <${node.tagName}>`
-      );
+    this.reportError(
+      node,
+      `Expected omitted end tag <${node.tagName}> instead of self-closing element <${node.tagName}/>`
+    );
+  }
+  validateSelfClosed(node) {
+    if (!node.voidElement) {
+      return;
+    }
+    if (node.closed !== NodeClosed.VoidOmitted) {
+      return;
     }
+    this.reportError(
+      node,
+      `Expected self-closing element <${node.tagName}/> instead of omitted end-tag <${node.tagName}>`
+    );
   }
   reportError(node, message) {
     const context = {
@@ -10111,12 +10119,6 @@ class VoidStyle extends Rule {
     };
     super.report(node, message, null, context);
   }
-  shouldBeOmitted(node) {
-    return this.style === 1 /* AlwaysOmit */ && node.closed === NodeClosed.VoidSelfClosed;
-  }
-  shouldBeSelfClosed(node) {
-    return this.style === 2 /* AlwaysSelfclose */ && node.closed === NodeClosed.VoidOmitted;
-  }
 }
 function parseStyle(name) {
   switch (name) {
@@ -11956,7 +11958,7 @@ class Parser {
    */
   getAttributeLocation(key, value) {
     const begin = key.location;
-    const end = value && value.type === TokenType.ATTR_VALUE ? value.location : undefined;
+    const end = value && value.type === TokenType.ATTR_VALUE ? value.location : void 0;
     return {
       filename: begin.filename,
       line: begin.line,
@@ -11995,8 +11997,8 @@ class Parser {
       actionOffset,
       actionOffset + action.length
     );
-    const optionsLocation = data ? sliceLocation(token.location, optionsOffset, optionsOffset + data.length) : undefined;
-    const commentLocation = comment ? sliceLocation(token.location, commentOffset, commentOffset + comment.length) : undefined;
+    const optionsLocation = data ? sliceLocation(token.location, optionsOffset, optionsOffset + data.length) : void 0;
+    const commentLocation = comment ? sliceLocation(token.location, commentOffset, commentOffset + comment.length) : void 0;
     this.trigger("directive", {
       action,
       data,
@@ -12363,7 +12365,7 @@ class Engine {
         rules
       };
       parser.trigger("config:ready", configEvent);
-      const { ...sourceData } = source;
+      const { hooks: _, ...sourceData } = source;
       const sourceEvent = {
         location,
         source: sourceData
@@ -12937,13 +12939,13 @@ function isConfigData(value) {
 class HtmlValidate {
   configLoader;
   constructor(arg) {
-    const [loader, config] = arg instanceof ConfigLoader ? [arg, undefined] : [undefined, arg];
+    const [loader, config] = arg instanceof ConfigLoader ? [arg, void 0] : [void 0, arg];
     this.configLoader = loader ?? new StaticConfigLoader(config);
   }
   /* eslint-enable @typescript-eslint/unified-signatures */
   validateString(str, arg1, arg2, arg3) {
     const filename = typeof arg1 === "string" ? arg1 : "inline";
-    const options = isConfigData(arg1) ? arg1 : isConfigData(arg2) ? arg2 : undefined;
+    const options = isConfigData(arg1) ? arg1 : isConfigData(arg2) ? arg2 : void 0;
     const hooks = isSourceHooks(arg1) ? arg1 : isSourceHooks(arg2) ? arg2 : arg3;
     const source = {
       data: str,
@@ -12958,7 +12960,7 @@ class HtmlValidate {
   /* eslint-enable @typescript-eslint/unified-signatures */
   validateStringSync(str, arg1, arg2, arg3) {
     const filename = typeof arg1 === "string" ? arg1 : "inline";
-    const options = isConfigData(arg1) ? arg1 : isConfigData(arg2) ? arg2 : undefined;
+    const options = isConfigData(arg1) ? arg1 : isConfigData(arg2) ? arg2 : void 0;
     const hooks = isSourceHooks(arg1) ? arg1 : isSourceHooks(arg2) ? arg2 : arg3;
     const source = {
       data: str,
@@ -13339,7 +13341,7 @@ class HtmlValidate {
 }
 
 const name = "html-validate";
-const version = "9.2.1";
+const version = "9.3.0";
 const bugs = "https://gitlab.com/html-validate/html-validate/issues/new";
 
 function definePlugin(plugin) {