html-validate 6.9.0 → 6.11.0

package/dist/es/core.js

@@ -243,6 +243,42 @@ var ajvSchemaDraft = {
 }
 };
 
+function stringify(value) {
+    if (typeof value === "string") {
+        return String(value);
+    }
+    else {
+        return JSON.stringify(value);
+    }
+}
+/**
+ * Represents an `Error` created from arbitrary values.
+ *
+ * @public
+ */
+class WrappedError extends Error {
+    constructor(message) {
+        super(stringify(message));
+    }
+}
+
+/**
+ * Ensures the value is an Error.
+ *
+ * If the passed value is not an `Error` instance a [[WrappedError]] is
+ * constructed with the stringified value.
+ *
+ * @internal
+ */
+function ensureError(value) {
+    if (value instanceof Error) {
+        return value;
+    }
+    else {
+        return new WrappedError(value);
+    }
+}
+
 class NestedError extends Error {
     constructor(message, nested) {
         super(message);
@@ -296,6 +332,32 @@ class SchemaValidationError extends UserError {
     }
 }
 
+/**
+ * Computes hash for given string.
+ *
+ * @internal
+ */
+function cyrb53(str) {
+    const a = 2654435761;
+    const b = 1597334677;
+    const c = 2246822507;
+    const d = 3266489909;
+    const e = 4294967296;
+    const f = 2097151;
+    const seed = 0;
+    let h1 = 0xdeadbeef ^ seed;
+    let h2 = 0x41c6ce57 ^ seed;
+    for (let i = 0, ch; i < str.length; i++) {
+        ch = str.charCodeAt(i);
+        h1 = Math.imul(h1 ^ ch, a);
+        h2 = Math.imul(h2 ^ ch, b);
+    }
+    h1 = Math.imul(h1 ^ (h1 >>> 16), c) ^ Math.imul(h2 ^ (h2 >>> 13), d);
+    h2 = Math.imul(h2 ^ (h2 >>> 16), c) ^ Math.imul(h1 ^ (h1 >>> 13), d);
+    return e * (f & h2) + (h1 >>> 0);
+}
+const computeHash = cyrb53;
+
 const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../");
 			const legacyRequire = createRequire(import.meta.url);
 			const distFolder = path.resolve(projectRoot, "dist/es");
@@ -700,6 +762,35 @@ var schema = {
 	definitions: definitions
 };
 
+/**
+ * AJV keyword "regexp" to validate the type to be a regular expression.
+ * Injects errors with the "type" keyword to give the same output.
+ */
+/* istanbul ignore next: manual testing */
+const ajvRegexpValidate = function (data, dataCxt) {
+    const valid = data instanceof RegExp;
+    if (!valid) {
+        ajvRegexpValidate.errors = [
+            {
+                instancePath: dataCxt === null || dataCxt === void 0 ? void 0 : dataCxt.instancePath,
+                schemaPath: undefined,
+                keyword: "type",
+                message: "should be a regular expression",
+                params: {
+                    keyword: "type",
+                },
+            },
+        ];
+    }
+    return valid;
+};
+const ajvRegexpKeyword = {
+    keyword: "regexp",
+    schema: false,
+    errors: true,
+    validate: ajvRegexpValidate,
+};
+
 var TextContent$1;
 (function (TextContent) {
     /* forbid node to have text content, inter-element whitespace is ignored */
@@ -807,6 +898,43 @@ function migrateElement(src) {
     return result;
 }
 
+/**
+ * Returns true if given element is a descendant of given tagname.
+ *
+ * @internal
+ */
+function isDescendant(node, tagName) {
+    let cur = node.parent;
+    while (cur && !cur.isRootElement()) {
+        if (cur.is(tagName)) {
+            return true;
+        }
+        cur = cur.parent;
+    }
+    return false;
+}
+
+/**
+ * Returns true if given element has given attribute (no matter the value, null,
+ * dynamic, etc).
+ */
+function hasAttribute(node, attr) {
+    return node.hasAttribute(attr);
+}
+
+/**
+ * Matches attribute against value.
+ */
+function matchAttribute(node, key, op, value) {
+    const nodeValue = (node.getAttributeValue(key) || "").toLowerCase();
+    switch (op) {
+        case "!=":
+            return nodeValue !== value;
+        case "=":
+            return nodeValue === value;
+    }
+}
+
 const dynamicKeys = [
     "metadata",
     "flow",
@@ -818,44 +946,17 @@ const dynamicKeys = [
     "labelable",
 ];
 const functionTable = {
-    isDescendant,
-    hasAttribute,
-    matchAttribute,
+    isDescendant: isDescendantFacade,
+    hasAttribute: hasAttributeFacade,
+    matchAttribute: matchAttributeFacade,
 };
+const schemaCache = new Map();
 function clone(src) {
     return JSON.parse(JSON.stringify(src));
 }
 function overwriteMerge$1(a, b) {
     return b;
 }
-/**
- * AJV keyword "regexp" to validate the type to be a regular expression.
- * Injects errors with the "type" keyword to give the same output.
- */
-/* istanbul ignore next: manual testing */
-const ajvRegexpValidate = function (data, dataCxt) {
-    const valid = data instanceof RegExp;
-    if (!valid) {
-        ajvRegexpValidate.errors = [
-            {
-                instancePath: dataCxt === null || dataCxt === void 0 ? void 0 : dataCxt.instancePath,
-                schemaPath: undefined,
-                keyword: "type",
-                message: "should be regexp",
-                params: {
-                    keyword: "type",
-                },
-            },
-        ];
-    }
-    return valid;
-};
-const ajvRegexpKeyword = {
-    keyword: "regexp",
-    schema: false,
-    errors: true,
-    validate: ajvRegexpValidate,
-};
 /**
  * @public
  */
@@ -931,7 +1032,7 @@ class MetaTable {
             if (err instanceof SchemaValidationError) {
                 throw err;
             }
-            throw new UserError(`Failed to load element metadata from "${filename}"`, err);
+            throw new UserError(`Failed to load element metadata from "${filename}"`, ensureError(err));
         }
     }
     /**
@@ -992,11 +1093,20 @@ class MetaTable {
      * Construct a new AJV schema validator.
      */
     getSchemaValidator() {
-        const ajv = new Ajv({ strict: true, strictTuples: true, strictTypes: true });
-        ajv.addMetaSchema(ajvSchemaDraft);
-        ajv.addKeyword(ajvRegexpKeyword);
-        ajv.addKeyword({ keyword: "copyable" });
-        return ajv.compile(this.schema);
+        const hash = computeHash(JSON.stringify(this.schema));
+        const cached = schemaCache.get(hash);
+        if (cached) {
+            return cached;
+        }
+        else {
+            const ajv = new Ajv({ strict: true, strictTuples: true, strictTypes: true });
+            ajv.addMetaSchema(ajvSchemaDraft);
+            ajv.addKeyword(ajvRegexpKeyword);
+            ajv.addKeyword({ keyword: "copyable" });
+            const validate = ajv.compile(this.schema);
+            schemaCache.set(hash, validate);
+            return validate;
+        }
     }
     /**
      * @public
@@ -1098,36 +1208,27 @@ function parseExpression(expr) {
         return [func, options];
     }
 }
-function isDescendant(node, tagName) {
+function isDescendantFacade(node, tagName) {
     if (typeof tagName !== "string") {
         throw new Error(`Property expression "isDescendant" must take string argument when evaluating metadata for <${node.tagName}>`);
     }
-    let cur = node.parent;
-    while (cur && !cur.isRootElement()) {
-        if (cur.is(tagName)) {
-            return true;
-        }
-        cur = cur.parent;
-    }
-    return false;
+    return isDescendant(node, tagName);
 }
-function hasAttribute(node, attr) {
+function hasAttributeFacade(node, attr) {
     if (typeof attr !== "string") {
         throw new Error(`Property expression "hasAttribute" must take string argument when evaluating metadata for <${node.tagName}>`);
     }
-    return node.hasAttribute(attr);
+    return hasAttribute(node, attr);
 }
-function matchAttribute(node, match) {
+function matchAttributeFacade(node, match) {
     if (!Array.isArray(match) || match.length !== 3) {
         throw new Error(`Property expression "matchAttribute" must take [key, op, value] array as argument when evaluating metadata for <${node.tagName}>`);
     }
     const [key, op, value] = match.map((x) => x.toLowerCase());
-    const nodeValue = (node.getAttributeValue(key) || "").toLowerCase();
     switch (op) {
         case "!=":
-            return nodeValue !== value;
         case "=":
-            return nodeValue === value;
+            return matchAttribute(node, key, op, value);
         default:
             throw new Error(`Property expression "matchAttribute" has invalid operator "${op}" when evaluating metadata for <${node.tagName}>`);
     }
@@ -2981,7 +3082,7 @@ var TRANSFORMER_API;
 /** @public */
 const name = "html-validate";
 /** @public */
-const version = "6.9.0";
+const version = "6.11.0";
 /** @public */
 const homepage = "https://html-validate.org";
 /** @public */
@@ -3969,9 +4070,6 @@ class Lexer {
 }
 
 const whitespace = /(\s+)/;
-function isRelevant$3(event) {
-    return event.type === TokenType.ATTR_VALUE;
-}
 class AttrDelimiter extends Rule {
     documentation() {
         return {
@@ -3980,8 +4078,12 @@ class AttrDelimiter extends Rule {
         };
     }
     setup() {
-        this.on("token", isRelevant$3, (event) => {
-            const delimiter = event.data[1];
+        this.on("token", (event) => {
+            const { token } = event;
+            if (token.type !== TokenType.ATTR_VALUE) {
+                return;
+            }
+            const delimiter = token.data[1];
             const match = whitespace.exec(delimiter);
             if (match) {
                 const location = sliceLocation(event.location, 0, delimiter.length);
@@ -10077,7 +10179,7 @@ class ResolvedConfig {
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
-                throw new NestedError(`When transforming "${source.filename}": ${message}`, err);
+                throw new NestedError(`When transforming "${source.filename}": ${message}`, ensureError(err));
             }
         }
         else {
@@ -10149,7 +10251,7 @@ function loadFromFile(filename) {
         json = requireUncached(filename);
     }
     catch (err) {
-        throw new ConfigError(`Failed to read configuration from "${filename}"`, err);
+        throw new ConfigError(`Failed to read configuration from "${filename}"`, ensureError(err));
     }
     /* expand any relative paths */
     for (const key of ["extends", "elements", "plugins"]) {
@@ -10354,7 +10456,7 @@ class Config {
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
-                throw new ConfigError(`Failed to load elements from "${entry}": ${message}`, err);
+                throw new ConfigError(`Failed to load elements from "${entry}": ${message}`, ensureError(err));
             }
         }
         metaTable.init();
@@ -10431,7 +10533,7 @@ class Config {
             }
             catch (err) {
                 const message = err instanceof Error ? err.message : String(err);
-                throw new ConfigError(`Failed to load plugin "${moduleName}": ${message}`, err);
+                throw new ConfigError(`Failed to load plugin "${moduleName}": ${message}`, ensureError(err));
             }
         });
     }
@@ -10524,7 +10626,7 @@ class Config {
                     throw new ConfigError(`Failed to load transformer "${name}": ${err.message}`, err);
                 }
                 else {
-                    throw new ConfigError(`Failed to load transformer "${name}"`, err);
+                    throw new ConfigError(`Failed to load transformer "${name}"`, ensureError(err));
                 }
             }
         });
@@ -11248,6 +11350,7 @@ class Parser {
                 location: token.location,
                 type: token.type,
                 data: Array.from(token.data),
+                token,
             });
         }
         return it;
@@ -11566,8 +11669,9 @@ class Engine {
     getRuleDocumentation(ruleId, context // eslint-disable-line @typescript-eslint/explicit-module-boundary-types
     ) {
         const rules = this.config.getRules();
-        if (rules.has(ruleId)) {
-            const [, options] = rules.get(ruleId);
+        const ruleData = rules.get(ruleId);
+        if (ruleData) {
+            const [, options] = ruleData;
             const rule = this.instantiateRule(ruleId, options);
             return rule.documentation(context);
         }
@@ -12498,5 +12602,5 @@ function getFormatter(name) {
     return (_a = availableFormatters[name]) !== null && _a !== void 0 ? _a : null;
 }
 
-export { Config as C, DynamicValue as D, EventHandler as E, FileSystemConfigLoader as F, HtmlValidate as H, MetaTable as M, NodeClosed as N, Parser as P, Rule as R, Severity as S, TextNode as T, UserError as U, ConfigError as a, ConfigLoader as b, StaticConfigLoader as c, HtmlElement as d, SchemaValidationError as e, MetaCopyableProperty as f, Reporter as g, TemplateExtractor as h, getFormatter as i, compatibilityCheck as j, codeframe as k, legacyRequire as l, bugs as m, name as n, presets as p, ruleExists as r, version as v };
+export { Config as C, DynamicValue as D, EventHandler as E, FileSystemConfigLoader as F, HtmlValidate as H, MetaTable as M, NodeClosed as N, Parser as P, Rule as R, Severity as S, TextNode as T, UserError as U, WrappedError as W, ConfigError as a, ConfigLoader as b, StaticConfigLoader as c, HtmlElement as d, SchemaValidationError as e, NestedError as f, MetaCopyableProperty as g, Reporter as h, TemplateExtractor as i, getFormatter as j, ensureError as k, legacyRequire as l, compatibilityCheck as m, codeframe as n, name as o, presets as p, bugs as q, ruleExists as r, version as v };
 //# sourceMappingURL=core.js.map