html-validate 8.10.0 → 8.11.0

package/dist/es/core-browser.js

@@ -1,4 +1,4 @@
-import { G as compatibilityCheckImpl, v as version } from './core.js';
+import { I as compatibilityCheckImpl, v as version } from './core.js';
 
 const defaults = {
   silent: false,

package/dist/es/core-nodejs.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { a as ConfigError, b as ConfigLoader, C as Config, G as compatibilityCheckImpl, v as version } from './core.js';
+import { a as ConfigError, b as ConfigLoader, C as Config, I as compatibilityCheckImpl, v as version } from './core.js';
 import { createRequire } from 'node:module';
 import kleur from 'kleur';
 

package/dist/es/core.js

@@ -584,8 +584,13 @@ const patternProperties = {
 			implicitRole: {
 				title: "Implicit ARIA role for this element",
 				description: "Some elements have implicit ARIA roles.",
+				deprecated: true,
 				"function": true
 			},
+			aria: {
+				title: "WAI-ARIA properties for this element",
+				$ref: "#/definitions/Aria"
+			},
 			scriptSupporting: {
 				title: "Mark element as script-supporting",
 				description: "Script-supporting elements are elements which can be inserted where othersise not permitted to assist in templating",
@@ -682,6 +687,39 @@ const patternProperties = {
 	}
 };
 const definitions = {
+	Aria: {
+		type: "object",
+		additionalProperties: false,
+		properties: {
+			implicitRole: {
+				title: "Implicit ARIA role for this element",
+				description: "Some elements have implicit ARIA roles.",
+				anyOf: [
+					{
+						type: "string"
+					},
+					{
+						"function": true
+					}
+				]
+			},
+			naming: {
+				title: "Prohibit or allow this element to be named by aria-label or aria-labelledby",
+				anyOf: [
+					{
+						type: "string",
+						"enum": [
+							"prohibited",
+							"allowed"
+						]
+					},
+					{
+						"function": true
+					}
+				]
+			}
+		}
+	},
 	contentCategory: {
 		anyOf: [
 			{
@@ -982,6 +1020,7 @@ const MetaCopyableProperty = [
   "formAssociated",
   "labelable",
   "attributes",
+  "aria",
   "permittedContent",
   "permittedDescendants",
   "permittedOrder",
@@ -1042,7 +1081,27 @@ function migrateAttributes(src) {
   });
   return Object.fromEntries(entries);
 }
+function normalizeAriaImplicitRole(value) {
+  if (!value) {
+    return () => null;
+  }
+  if (typeof value === "string") {
+    return () => value;
+  }
+  return value;
+}
+function normalizeAriaNaming(value) {
+  if (!value) {
+    return () => "allowed";
+  }
+  if (typeof value === "string") {
+    return () => value;
+  }
+  return value;
+}
 function migrateElement(src) {
+  var _a, _b;
+  const implicitRole = normalizeAriaImplicitRole(src.implicitRole ?? ((_a = src.aria) == null ? void 0 : _a.implicitRole));
   const result = {
     ...src,
     ...{
@@ -1051,7 +1110,11 @@ function migrateElement(src) {
     attributes: migrateAttributes(src),
     textContent: src.textContent,
     focusable: src.focusable ?? false,
-    implicitRole: src.implicitRole ?? (() => null)
+    implicitRole,
+    aria: {
+      implicitRole,
+      naming: normalizeAriaNaming((_b = src.aria) == null ? void 0 : _b.naming)
+    }
   };
   delete result.deprecatedAttributes;
   delete result.requiredAttributes;
@@ -1893,8 +1956,30 @@ function factory$1(name, context) {
 function stripslashes(value) {
   return value.replace(/\\(.)/g, "$1");
 }
+function unescapeCodepoint(value) {
+  const replacement = {
+    "\\9 ": "	",
+    "\\a ": "\n",
+    "\\d ": "\r"
+  };
+  return value.replace(
+    /(\\[\u0039\u0061\u0064] )/g,
+    (_, codepoint) => replacement[codepoint]
+  );
+}
 function escapeSelectorComponent(text) {
-  return text.toString().replace(/([^a-z0-9_-])/gi, "\\$1");
+  const codepoints = {
+    "	": "\\9 ",
+    "\n": "\\a ",
+    "\r": "\\d "
+  };
+  return text.toString().replace(/([\t\n\r]|[^a-z0-9_-])/gi, (_, ch) => {
+    if (codepoints[ch]) {
+      return codepoints[ch];
+    } else {
+      return `\\${ch}`;
+    }
+  });
 }
 function generateIdSelector(id) {
   const escaped = escapeSelectorComponent(id);
@@ -2009,7 +2094,10 @@ class PseudoClassMatcher extends Matcher {
 }
 class Pattern {
   constructor(pattern) {
-    const match = pattern.match(/^([~+\->]?)((?:[*]|[^.#[:]+)?)(.*)$/);
+    const match = pattern.match(/^([~+\->]?)((?:[*]|[^.#[:]+)?)([^]*)$/);
+    if (!match) {
+      throw new Error(`Failed to create selector pattern from "${pattern}"`);
+    }
     match.shift();
     this.selector = pattern;
     this.combinator = parseCombinator(match.shift(), pattern);
@@ -2065,10 +2153,10 @@ class Selector {
   static parse(selector) {
     selector = selector.replace(/([+~>]) /g, "$1");
     let begin = 0;
-    const delimiter = /((?:[^\\]) +|$)/g;
+    const delimiter = /((?:[^\\\u0039\u0061\u0064]) +|$)/g;
     return Array.from(selector.matchAll(delimiter), (match) => {
       const end = match.index + 1;
-      const part = selector.slice(begin, end);
+      const part = unescapeCodepoint(selector.slice(begin, end));
       begin = end + 1;
       return new Pattern(part);
     });
@@ -2401,7 +2489,8 @@ class HtmlElement extends DOMNode {
       return this.cacheSet(ROLE, role.value);
     }
     if (this.metaElement) {
-      const implicitRole = this.metaElement.implicitRole(this._adapter);
+      const { aria } = this.metaElement;
+      const implicitRole = aria.implicitRole(this._adapter);
       return this.cacheSet(ROLE, implicitRole);
     }
     return this.cacheSet(ROLE, null);
@@ -3143,6 +3232,48 @@ function interpolate(text, data) {
   });
 }
 
+const cacheKey = Symbol("aria-naming");
+const defaultValue = "allowed";
+const prohibitedRoles = [
+  "caption",
+  "code",
+  "deletion",
+  "emphasis",
+  "generic",
+  "insertion",
+  "paragraph",
+  "presentation",
+  "strong",
+  "subscript",
+  "superscript"
+];
+function byRole(role) {
+  return prohibitedRoles.includes(role) ? "prohibited" : "allowed";
+}
+function byMeta(element, meta) {
+  return meta.aria.naming(element._adapter);
+}
+function ariaNaming(element) {
+  var _a;
+  const cached = element.cacheGet(cacheKey);
+  if (cached) {
+    return cached;
+  }
+  const role = (_a = element.getAttribute("role")) == null ? void 0 : _a.value;
+  if (role) {
+    if (role instanceof DynamicValue) {
+      return element.cacheSet(cacheKey, defaultValue);
+    } else {
+      return element.cacheSet(cacheKey, byRole(role));
+    }
+  }
+  const meta = element.meta;
+  if (!meta) {
+    return element.cacheSet(cacheKey, defaultValue);
+  }
+  return element.cacheSet(cacheKey, byMeta(element, meta));
+}
+
 const patternCache = /* @__PURE__ */ new Map();
 function compileStringPattern(pattern) {
   const regexp = pattern.replace(/[*]+/g, ".+");
@@ -3661,7 +3792,7 @@ class Rule {
   }
 }
 
-const defaults$u = {
+const defaults$v = {
   allowExternal: true,
   allowRelative: true,
   allowAbsolute: true,
@@ -3702,7 +3833,7 @@ function matchList(value, list) {
 }
 class AllowedLinks extends Rule {
   constructor(options) {
-    super({ ...defaults$u, ...options });
+    super({ ...defaults$v, ...options });
     this.allowExternal = parseAllow(this.options.allowExternal);
     this.allowRelative = parseAllow(this.options.allowRelative);
     this.allowAbsolute = parseAllow(this.options.allowAbsolute);
@@ -3866,7 +3997,7 @@ class AllowedLinks extends Rule {
   }
 }
 
-const defaults$t = {
+const defaults$u = {
   accessible: true
 };
 function findByTarget(target, siblings) {
@@ -3896,7 +4027,7 @@ function getDescription$1(context) {
 }
 class AreaAlt extends Rule {
   constructor(options) {
-    super({ ...defaults$t, ...options });
+    super({ ...defaults$u, ...options });
   }
   static schema() {
     return {
@@ -3975,6 +4106,9 @@ class AriaHiddenBody extends Rule {
   }
 }
 
+const defaults$t = {
+  allowAnyNamable: false
+};
 const whitelisted = [
   "main",
   "nav",
@@ -4013,6 +4147,9 @@ function isValidUsage(target, meta) {
   return false;
 }
 class AriaLabelMisuse extends Rule {
+  constructor(options) {
+    super({ ...defaults$t, ...options });
+  }
   documentation() {
     const valid = [
       "Interactive elements",
@@ -4055,6 +4192,9 @@ ${lines}`,
     if (isValidUsage(target, meta)) {
       return;
     }
+    if (this.options.allowAnyNamable && ariaNaming(target) === "allowed") {
+      return;
+    }
     this.report(target, `"aria-label" cannot be used on this element`, attr.keyLocation);
   }
 }
@@ -7552,7 +7692,7 @@ class NoRedundantRole extends Rule {
       if (!meta) {
         return;
       }
-      const implicitRole = meta.implicitRole(target._adapter);
+      const implicitRole = meta.aria.implicitRole(target._adapter);
       if (!implicitRole) {
         return;
       }
@@ -9334,7 +9474,7 @@ const config$4 = {
   rules: {
     "area-alt": ["error", { accessible: true }],
     "aria-hidden-body": "error",
-    "aria-label-misuse": "error",
+    "aria-label-misuse": ["error", { allowAnyNamable: false }],
     "deprecated-rule": "warn",
     "empty-heading": "error",
     "empty-title": "error",
@@ -9386,7 +9526,7 @@ const config$1 = {
   rules: {
     "area-alt": ["error", { accessible: true }],
     "aria-hidden-body": "error",
-    "aria-label-misuse": "error",
+    "aria-label-misuse": ["error", { allowAnyNamable: false }],
     "attr-case": "error",
     "attr-delimiter": "error",
     "attr-quotes": "error",
@@ -9467,6 +9607,7 @@ var recommended = config$1;
 const config = {
   rules: {
     "area-alt": ["error", { accessible: false }],
+    "aria-label-misuse": ["error", { allowAnyNamable: true }],
     "attr-spacing": "error",
     "attribute-allowed-values": "error",
     "attribute-misuse": "error",
@@ -11719,7 +11860,7 @@ class HtmlValidate {
 }
 
 const name = "html-validate";
-const version = "8.10.0";
+const version = "8.11.0";
 const bugs = "https://gitlab.com/html-validate/html-validate/issues/new";
 
 function definePlugin(plugin) {
@@ -12596,5 +12737,5 @@ function compatibilityCheckImpl(name, declared, options) {
   return false;
 }
 
-export { Attribute as A, Parser as B, Config as C, DOMNode as D, ruleExists as E, EventHandler as F, compatibilityCheckImpl as G, HtmlValidate as H, codeframe as I, name as J, bugs as K, MetaCopyableProperty as M, NodeClosed as N, Presets as P, ResolvedConfig as R, Severity as S, TextNode as T, UserError as U, Validator as V, WrappedError as W, ConfigError as a, ConfigLoader as b, defineConfig as c, deepmerge$1 as d, ensureError as e, StaticConfigLoader as f, getFormatter as g, DOMTokenList as h, ignore$1 as i, DOMTree as j, DynamicValue as k, HtmlElement as l, NodeType as m, NestedError as n, SchemaValidationError as o, MetaTable as p, TextContent$1 as q, Rule as r, staticResolver as s, TextClassification as t, classifyNodeText as u, version as v, keywordPatternMatcher as w, sliceLocation as x, Reporter as y, definePlugin as z };
+export { Attribute as A, definePlugin as B, Config as C, DOMNode as D, Parser as E, ruleExists as F, EventHandler as G, HtmlValidate as H, compatibilityCheckImpl as I, codeframe as J, name as K, bugs as L, MetaCopyableProperty as M, NodeClosed as N, Presets as P, ResolvedConfig as R, Severity as S, TextNode as T, UserError as U, Validator as V, WrappedError as W, ConfigError as a, ConfigLoader as b, defineConfig as c, deepmerge$1 as d, ensureError as e, StaticConfigLoader as f, getFormatter as g, DOMTokenList as h, ignore$1 as i, DOMTree as j, DynamicValue as k, HtmlElement as l, NodeType as m, NestedError as n, SchemaValidationError as o, MetaTable as p, TextContent$1 as q, Rule as r, staticResolver as s, ariaNaming as t, TextClassification as u, version as v, classifyNodeText as w, keywordPatternMatcher as x, sliceLocation as y, Reporter as z };
 //# sourceMappingURL=core.js.map